Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Show displayname in non-narrow thread summeries #8036

Merged
merged 5 commits into from
Mar 11, 2022
Merged

Show displayname in non-narrow thread summeries #8036

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
85444a8
Show displayname in non-narrow thread summeries
t3chguy Mar 11, 2022
babcf0c
Iterate PR
t3chguy Mar 11, 2022
3be697f
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Mar 11, 2022
c046660
Iterate PR to use line-height based approach
t3chguy Mar 11, 2022
70f7e19
Fix hover/focus chevron on thread summary relying on font character
t3chguy Mar 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions res/css/views/rooms/_EventTile.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,11 @@ $left-gutter: 64px;
width: initial;
}

.mx_ThreadInfo_sender {
margin-left: 8px;
font-weight: $font-semi-bold;
}

.mx_ThreadInfo_content {
text-overflow: ellipsis;
overflow: hidden;
Expand Down
12 changes: 10 additions & 2 deletions src/components/views/rooms/ThreadSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,17 @@ const ThreadSummary = ({ mxEvent, thread }: IProps) => {
<span className="mx_ThreadInfo_threads-amount">
{ countSection }
</span>
<ThreadMessagePreview thread={thread} />
<ThreadMessagePreview thread={thread} showDisplayname={!roomContext.narrow} />
</AccessibleButton>
);
};

export const ThreadMessagePreview = ({ thread }: Pick<IProps, "thread">) => {
interface IPreviewProps {
thread: Thread;
showDisplayname?: boolean;
}

export const ThreadMessagePreview = ({ thread, showDisplayname = false }: IPreviewProps) => {
const cli = useContext(MatrixClientContext);
const lastReply = useTypedEventEmitterState(thread, ThreadEvent.Update, () => thread.replyToEvent);
const preview = useAsyncMemo(async () => {
Expand All @@ -85,6 +90,9 @@ export const ThreadMessagePreview = ({ thread }: Pick<IProps, "thread">) => {
height={24}
className="mx_ThreadInfo_avatar"
/>
{ showDisplayname && <div className="mx_ThreadInfo_sender">
{ sender?.name ?? lastReply.getSender() }
</div> }
<div className="mx_ThreadInfo_content">
<span className="mx_ThreadInfo_message-preview">
{ preview }
Expand Down