Use styled mxids in member list

res/css/_components.scss

@@ -180,7 +180,7 @@
 @import "./views/messages/_ReactionsRowButton.scss";
 @import "./views/messages/_RedactedBody.scss";
 @import "./views/messages/_RoomAvatarEvent.scss";
-@import "./views/messages/_SenderProfile.scss";
+@import "./views/messages/_DisambiguatedProfile.scss";
 @import "./views/messages/_TextualEvent.scss";
 @import "./views/messages/_UnknownBody.scss";
 @import "./views/messages/_ViewSourceEvent.scss";

res/css/structures/_FilePanel.scss

@@ -88,7 +88,7 @@ limitations under the License.
     text-decoration: none;
 }
 
-.mx_FilePanel .mx_EventTile .mx_SenderProfile {
+.mx_FilePanel .mx_EventTile .mx_DisambiguatedProfile {
     flex: 1 1 auto;
     line-height: initial;
     padding: 0px;

res/css/structures/_NotificationPanel.scss

@@ -77,7 +77,7 @@ limitations under the License.
     display: none; // we don't need this in this view
 }
 
-.mx_NotificationPanel .mx_EventTile .mx_SenderProfile,
+.mx_NotificationPanel .mx_EventTile .mx_DisambiguatedProfile,
 .mx_NotificationPanel .mx_EventTile .mx_MessageTimestamp {
     color: $primary-fg-color;
     font-size: $font-12px;

res/css/views/messages/_SenderProfile.scss → res/css/views/messages/_DisambiguatedProfile.scss

@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2021 Šimon Brandner <[email protected]>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,13 +15,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-.mx_SenderProfile_displayName {
-    font-weight: 600;
-}
+.mx_DisambiguatedProfile {
+    overflow: hidden;
+    text-overflow: ellipsis;
+
+    .mx_DisambiguatedProfile_displayName {
+        font-weight: 600;
+    }
 
-.mx_SenderProfile_mxid {
-    font-weight: 600;
-    font-size: 1.1rem;
-    margin-left: 5px;
-    opacity: 0.5; // Match mx_TextualEvent
+    .mx_DisambiguatedProfile_mxid {
+        font-weight: 600;
+        font-size: 1.1rem;
+        margin-left: 5px;
+        opacity: 0.5; // Match mx_TextualEvent
+    }
 }

res/css/views/rooms/_EventTile.scss

@@ -69,7 +69,7 @@ $hover-select-border: 4px;
         max-width: calc(100% - $left-gutter);
     }
 
-    .mx_SenderProfile .mx_Flair {
+    .mx_DisambiguatedProfile .mx_Flair {
         opacity: 0.7;
         margin-left: 5px;
         display: inline-block;
@@ -84,6 +84,21 @@ $hover-select-border: 4px;
         }
     }
 
+    .mx_DisambiguatedProfile {
+        color: $primary-fg-color;
+        font-size: $font-14px;
+        display: inline-block; /* anti-zalgo, with overflow hidden */
+        overflow: hidden;
+        cursor: pointer;
+        padding-bottom: 0px;
+        padding-top: 0px;
+        margin: 0px;
+        /* the next three lines, along with overflow hidden, truncate long display names */
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        max-width: calc(100% - $left-gutter);
+    }
+
     &.mx_EventTile_isEditing .mx_MessageTimestamp {
         visibility: hidden;
     }

res/css/views/rooms/_GroupLayout.scss

@@ -19,7 +19,7 @@ $left-gutter: 64px;
 
 .mx_GroupLayout {
     .mx_EventTile {
-        > .mx_SenderProfile {
+        > .mx_DisambiguatedProfile {
             line-height: $font-20px;
             margin-left: $left-gutter;
         }
@@ -64,7 +64,7 @@ $left-gutter: 64px;
             }
         }
 
-        .mx_SenderProfile {
+        .mx_DisambiguatedProfile {
             font-size: $font-13px;
         }
 

res/css/views/rooms/_IRCLayout.scss

@@ -162,42 +162,42 @@ $irc-line-height: $font-18px;
         border-left: 0;
     }
 
-    .mx_SenderProfile {
+    .mx_DisambiguatedProfile {
         width: var(--name-width);
         display: flex;
         order: 2;
         flex-shrink: 0;
         justify-content: flex-start;
         align-items: center;
 
-        > .mx_SenderProfile_displayName {
+        > .mx_DisambiguatedProfile_displayName {
             width: 100%;
             text-align: end;
             overflow: hidden;
             text-overflow: ellipsis;
         }
 
-        > .mx_SenderProfile_mxid {
+        > .mx_DisambiguatedProfile_mxid {
             visibility: collapse;
         }
     }
 
-    .mx_SenderProfile:hover {
+    .mx_DisambiguatedProfile:hover {
         overflow: visible;
         z-index: 10;
 
-        > .mx_SenderProfile_displayName {
+        > .mx_DisambiguatedProfile_displayName {
             overflow: visible;
         }
 
-        > .mx_SenderProfile_mxid {
+        > .mx_DisambiguatedProfile_mxid {
             visibility: visible;
         }
     }
 
     .mx_ReplyThread {
         margin: 0;
-        .mx_SenderProfile {
+        .mx_DisambiguatedProfile {
             order: unset;
             max-width: unset;
             width: unset;

src/components/views/messages/DisambiguatedProfile.tsx

@@ -0,0 +1,66 @@
+/*
+Copyright 2021 Šimon Brandner <[email protected]>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import { RoomMember } from 'matrix-js-sdk/src/models/room-member';
+import { getUserNameColorClass } from '../../../utils/FormattingUtils';
+import classNames from 'classnames';
+
+interface IProps {
+    member?: RoomMember;
+    fallbackName: string;
+    flair?: JSX.Element;
+    onClick?(): void;
+    colored?: boolean;
+    emphasizeDisplayName?: boolean;
+}
+
+export default class DisambiguatedProfile extends React.Component<IProps> {
+    render() {
+        const { fallbackName, member, flair, colored, emphasizeDisplayName, onClick } = this.props;
+        const rawDisplayName = member?.rawDisplayName || fallbackName;
+        const mxid = member?.userId;
+
+        let colorClass;
+        if (colored) {
+            colorClass = getUserNameColorClass(fallbackName);
+        }
+
+        let mxidElement;
+        if (member?.disambiguate && mxid) {
+            mxidElement = (
+                <span className="mx_DisambiguatedProfile_mxid">
+                    { mxid }
+                </span>
+            );
+        }
+
+        const displayNameClasses = classNames({
+            "mx_DisambiguatedProfile_displayName": emphasizeDisplayName,
+            [colorClass]: true,
+        });
+
+        return (
+            <div className="mx_DisambiguatedProfile" dir="auto" onClick={onClick}>
+                <span className={displayNameClasses}>
+                    { rawDisplayName }
+                </span>
+                { mxidElement }
+                { flair }
+            </div>
+        );
+    }
+}

src/components/views/messages/SenderProfile.tsx

@@ -20,9 +20,9 @@ import { MsgType } from "matrix-js-sdk/src/@types/event";
 
 import Flair from '../elements/Flair';
 import FlairStore from '../../../stores/FlairStore';
-import { getUserNameColorClass } from '../../../utils/FormattingUtils';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
+import DisambiguatedProfile from "./DisambiguatedProfile";
 
 interface IProps {
     mxEvent: MatrixEvent;
@@ -100,26 +100,10 @@ export default class SenderProfile extends React.Component<IProps, IState> {
     }
 
     render() {
-        const { mxEvent } = this.props;
-        const colorClass = getUserNameColorClass(mxEvent.getSender());
-        const { msgtype } = mxEvent.getContent();
+        const { mxEvent, onClick } = this.props;
 
-        const disambiguate = mxEvent.sender?.disambiguate;
-        const displayName = mxEvent.sender?.rawDisplayName || mxEvent.getSender() || "";
-        const mxid = mxEvent.sender?.userId || mxEvent.getSender() || "";
-
-        if (msgtype === MsgType.Emote) {
-            return null; // emote message must include the name so don't duplicate it
-        }
-
-        let mxidElement;
-        if (disambiguate) {
-            mxidElement = (
-                <span className="mx_SenderProfile_mxid">
-                    { mxid }
-                </span>
-            );
-        }
+        // emote message must include the name so don't duplicate it
+        if (mxEvent.getContent()?.msgtype === MsgType.Emote) return null;
 
         let flair;
         if (this.props.enableFlair) {
@@ -134,13 +118,14 @@ export default class SenderProfile extends React.Component<IProps, IState> {
         }
 
         return (
-            <div className="mx_SenderProfile" dir="auto" onClick={this.props.onClick}>
-                <span className={`mx_SenderProfile_displayName ${colorClass}`}>
-                    { displayName }
-                </span>
-                { mxidElement }
-                { flair }
-            </div>
+            <DisambiguatedProfile
+                fallbackName={mxEvent.getSender() || ""}
+                flair={flair}
+                onClick={onClick}
+                member={mxEvent.sender}
+                colored={true}
+                emphasizeDisplayName={true}
+            />
         );
     }
 }

src/components/views/rooms/EntityTile.tsx

@@ -63,6 +63,7 @@ function presenceClassForMember(presenceState: string, lastActiveAgo: number, sh
 
 interface IProps {
     name?: string;
+    nameJSX?: JSX.Element;
     title?: string;
     avatarJsx?: JSX.Element; // <BaseAvatar />
     className?: string;
@@ -116,7 +117,7 @@ export default class EntityTile extends React.PureComponent<IProps, IState> {
         mainClassNames[presenceClass] = true;
 
         let nameEl;
-        const { name } = this.props;
+        const name = this.props.nameJSX || this.props.name;
 
         if (!this.props.suppressOnHover) {
             const activeAgo = this.props.presenceLastActiveAgo ?

src/components/views/rooms/MemberTile.tsx

@@ -28,6 +28,7 @@ import { EventType } from "matrix-js-sdk/src/@types/event";
 import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
 import EntityTile, { PowerStatus } from "./EntityTile";
 import MemberAvatar from "./../avatars/MemberAvatar";
+import DisambiguatedProfile from "../messages/DisambiguatedProfile";
 
 interface IProps {
     member: RoomMember;
@@ -252,6 +253,13 @@ export default class MemberTile extends React.Component<IProps, IState> {
             e2eStatus = this.state.e2eStatus;
         }
 
+        const nameJSX = (
+            <DisambiguatedProfile
+                member={member}
+                fallbackName={name || ""}
+            />
+        );
+
         return (
             <EntityTile
                 {...this.props}
@@ -262,6 +270,7 @@ export default class MemberTile extends React.Component<IProps, IState> {
                 avatarJsx={av}
                 title={this.getPowerLabel()}
                 name={name}
+                nameJSX={nameJSX}
                 powerStatus={powerStatus}
                 showPresence={this.props.showPresence}
                 subtextLabel={statusMessage}

test/end-to-end-tests/src/usecases/timeline.js

@@ -121,7 +121,7 @@ function getAllEventTiles(session) {
 }
 
 async function getMessageFromEventTile(eventTile) {
-    const senderElement = await eventTile.$(".mx_SenderProfile_displayName");
+    const senderElement = await eventTile.$(".mx_DisambiguatedProfile_displayName");
     const className = await (await eventTile.getProperty("className")).jsonValue();
     const classNames = className.split(" ");
     const bodyElement = await eventTile.$(".mx_EventTile_body");