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 828
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix broken threads list timestamp layout (#9922)
* Add option to show full identifier as tooltip on sender profiles * Show full user id as tooltip on threads list entries * Fix broken threads list timestamp layout Previously, thread list timestamps would overflow into the unread messages bubble on the right. This is fixed by resetting the width of the timestamp and ensuring both the timestamp and the display name can shrink if necessary. Both now also use ellipses if necessary.
- Loading branch information
Showing
5 changed files
with
40 additions
and
15 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
/* | ||
Copyright 2021 Šimon Brandner <[email protected]> | ||
Copyright 2022 The Matrix.org Foundation C.I.C. | ||
Copyright 2022-2023 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. | ||
|
@@ -19,6 +19,7 @@ import React from "react"; | |
import { RoomMember } from "matrix-js-sdk/src/models/room-member"; | ||
import classNames from "classnames"; | ||
|
||
import { _t } from "../../../languageHandler"; | ||
import { getUserNameColorClass } from "../../../utils/FormattingUtils"; | ||
import UserIdentifier from "../../../customisations/UserIdentifier"; | ||
|
||
|
@@ -28,35 +29,44 @@ interface IProps { | |
onClick?(): void; | ||
colored?: boolean; | ||
emphasizeDisplayName?: boolean; | ||
withTooltip?: boolean; | ||
} | ||
|
||
export default class DisambiguatedProfile extends React.Component<IProps> { | ||
public render(): JSX.Element { | ||
const { fallbackName, member, colored, emphasizeDisplayName, onClick } = this.props; | ||
const { fallbackName, member, colored, emphasizeDisplayName, withTooltip, onClick } = this.props; | ||
const rawDisplayName = member?.rawDisplayName || fallbackName; | ||
const mxid = member?.userId; | ||
|
||
let colorClass; | ||
let colorClass: string | undefined; | ||
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> | ||
); | ||
let title: string | undefined; | ||
|
||
if (mxid) { | ||
const identifier = | ||
UserIdentifier.getDisplayUserIdentifier?.(mxid, { | ||
withDisplayName: true, | ||
roomId: member.roomId, | ||
}) ?? mxid; | ||
if (member?.disambiguate) { | ||
mxidElement = <span className="mx_DisambiguatedProfile_mxid">{identifier}</span>; | ||
} | ||
title = _t("%(displayName)s (%(matrixId)s)", { | ||
displayName: rawDisplayName, | ||
matrixId: identifier, | ||
}); | ||
} | ||
|
||
const displayNameClasses = classNames({ | ||
const displayNameClasses = classNames(colorClass, { | ||
mx_DisambiguatedProfile_displayName: emphasizeDisplayName, | ||
[colorClass]: true, | ||
}); | ||
|
||
return ( | ||
<div className="mx_DisambiguatedProfile" onClick={onClick}> | ||
<div className="mx_DisambiguatedProfile" title={withTooltip ? title : undefined} onClick={onClick}> | ||
<span className={displayNameClasses} dir="auto"> | ||
{rawDisplayName} | ||
</span> | ||
|
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,5 @@ | ||
/* | ||
Copyright 2015 - 2022 The Matrix.org Foundation C.I.C. | ||
Copyright 2015 - 2023 The Matrix.org Foundation C.I.C. | ||
Copyright 2019 Michael Telatynski <[email protected]> | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
|
@@ -1091,6 +1091,8 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState> | |
this.context.timelineRenderingType === TimelineRenderingType.Thread | ||
) { | ||
sender = <SenderProfile onClick={this.onSenderProfileClick} mxEvent={this.props.mxEvent} />; | ||
} else if (this.context.timelineRenderingType === TimelineRenderingType.ThreadsList) { | ||
sender = <SenderProfile mxEvent={this.props.mxEvent} withTooltip />; | ||
} else { | ||
sender = <SenderProfile mxEvent={this.props.mxEvent} />; | ||
} | ||
|
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