Use styled mxids in member list v2 (#8110)

* Revert "Revert "Use styled mxids in member list (#6328)" (#8107)"

This reverts commit 709e6e78d2.

* Fix disambiguated profile for bubbles

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>

src/components/views/messages/DisambiguatedProfile.tsx

@@ -0,0 +1,71 @@
+/*
+Copyright 2021 Šimon Brandner <simon.bra.ag@gmail.com>
+Copyright 2022 The Matrix.org Foundation C.I.C.
+
+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 classNames from 'classnames';
+
+import { getUserNameColorClass } from '../../../utils/FormattingUtils';
+import UserIdentifier from "../../../customisations/UserIdentifier";
+
+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">
+                    { UserIdentifier.getDisplayUserIdentifier(
+                        mxid, { withDisplayName: true, roomId: member.roomId },
+                    ) }
+                </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

@@ -21,10 +21,9 @@ import { RoomStateEvent } from "matrix-js-sdk/src/models/room-state";
 
 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 UserIdentifier from '../../../customisations/UserIdentifier';
+import DisambiguatedProfile from "./DisambiguatedProfile";
 import RoomContext, { TimelineRenderingType } from '../../../contexts/RoomContext';
 import SettingsStore from "../../../settings/SettingsStore";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
@@ -106,9 +105,8 @@ 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 msgtype = mxEvent.getContent().msgtype;
 
         let member = mxEvent.sender;
         if (SettingsStore.getValue("feature_use_only_current_profiles")) {
@@ -118,10 +116,6 @@ export default class SenderProfile extends React.Component<IProps, IState> {
             }
         }
 
-        const disambiguate = member?.disambiguate || mxEvent.sender?.disambiguate;
-        const displayName = member?.rawDisplayName || mxEvent.getSender() || "";
-        const mxid = member?.userId || mxEvent.getSender() || "";
-
         return <RoomContext.Consumer>
             { roomContext => {
                 if (msgtype === MsgType.Emote &&
@@ -130,17 +124,6 @@ export default class SenderProfile extends React.Component<IProps, IState> {
                     return null; // emote message must include the name so don't duplicate it
                 }
 
-                let mxidElement;
-                if (disambiguate) {
-                    mxidElement = (
-                        <span className="mx_SenderProfile_mxid">
-                            { UserIdentifier.getDisplayUserIdentifier(
-                                mxid, { withDisplayName: true, roomId: mxEvent.getRoomId() },
-                            ) }
-                        </span>
-                    );
-                }
-
                 let flair;
                 if (this.props.enableFlair) {
                     const displayedGroups = this.getDisplayedGroups(
@@ -151,13 +134,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={member}
+                        colored={true}
+                        emphasizeDisplayName={true}
+                    />
                 );
             } }
         </RoomContext.Consumer>;

src/components/views/rooms/EntityTile.tsx

@@ -64,6 +64,7 @@ function presenceClassForMember(presenceState: string, lastActiveAgo: number, sh
 
 interface IProps {
     name?: string;
+    nameJSX?: JSX.Element;
     title?: string;
     avatarJsx?: JSX.Element; // <BaseAvatar />
     className?: string;
@@ -117,7 +118,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

@@ -33,6 +33,7 @@ import { Action } from "../../../dispatcher/actions";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import EntityTile, { PowerStatus } from "./EntityTile";
 import MemberAvatar from "./../avatars/MemberAvatar";
+import DisambiguatedProfile from "../messages/DisambiguatedProfile";
 import UserIdentifierCustomisations from '../../../customisations/UserIdentifier';
 
 interface IProps {
@@ -258,6 +259,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}
@@ -268,6 +276,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}