This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use styled mxids in member list v2 (#8110)
* Revert "Revert "Use styled mxids in member list (#6328)" (#8107)" This reverts commit 709e6e7. * Fix disambiguated profile for bubbles Signed-off-by: Šimon Brandner <[email protected]>
- Loading branch information
1 parent
cfabcdd
commit bff1ef3
Showing
13 changed files
with
141 additions
and
55 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| Copyright 2021 Šimon Brandner <[email protected]> | ||
| 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> | ||
| ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.