Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .changeset/fix-emoji-display-name-color.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
default: patch
---

Fix emoji color bleeding into adjacent text in read receipt display names on Safari/WebKit
90 changes: 70 additions & 20 deletions src/app/features/room/RoomViewFollowing.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -89,56 +89,106 @@ export const RoomViewFollowing = as<'div', RoomViewFollowingProps>(
<Text size="T300" truncate>
{names.length === 1 && (
<>
<b>{names[0]}</b>
<Text as="span" size="Inherit" priority="300">
<b style={{ WebkitTextFillColor: 'inherit' }}>{names[0]}</b>
Copy link
Member

@dozro dozro Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is there a reason why we mix raw html <b> and react components <Text> here, i always wondered lol

<Text
as="span"
size="Inherit"
priority="300"
style={{ WebkitTextFillColor: 'currentColor' }}
>
{' is following the conversation.'}
</Text>
</>
)}
{names.length === 2 && (
<>
<b>{names[0]}</b>
<Text as="span" size="Inherit" priority="300">
<b style={{ WebkitTextFillColor: 'inherit' }}>{names[0]}</b>
<Text
as="span"
size="Inherit"
priority="300"
style={{ WebkitTextFillColor: 'currentColor' }}
>
{' and '}
</Text>
<b>{names[1]}</b>
<Text as="span" size="Inherit" priority="300">
<b style={{ WebkitTextFillColor: 'inherit' }}>{names[1]}</b>
<Text
as="span"
size="Inherit"
priority="300"
style={{ WebkitTextFillColor: 'currentColor' }}
>
{' are following the conversation.'}
</Text>
</>
)}
{names.length === 3 && (
<>
<b>{names[0]}</b>
<Text as="span" size="Inherit" priority="300">
<b style={{ WebkitTextFillColor: 'inherit' }}>{names[0]}</b>
<Text
as="span"
size="Inherit"
priority="300"
style={{ WebkitTextFillColor: 'currentColor' }}
>
{', '}
</Text>
<b>{names[1]}</b>
<Text as="span" size="Inherit" priority="300">
<b style={{ WebkitTextFillColor: 'inherit' }}>{names[1]}</b>
<Text
as="span"
size="Inherit"
priority="300"
style={{ WebkitTextFillColor: 'currentColor' }}
>
{' and '}
</Text>
<b>{names[2]}</b>
<Text as="span" size="Inherit" priority="300">
<b style={{ WebkitTextFillColor: 'inherit' }}>{names[2]}</b>
<Text
as="span"
size="Inherit"
priority="300"
style={{ WebkitTextFillColor: 'currentColor' }}
>
{' are following the conversation.'}
</Text>
</>
)}
{names.length > 3 && (
<>
<b>{names[0]}</b>
<Text as="span" size="Inherit" priority="300">
<b style={{ WebkitTextFillColor: 'inherit' }}>{names[0]}</b>
<Text
as="span"
size="Inherit"
priority="300"
style={{ WebkitTextFillColor: 'currentColor' }}
>
{', '}
</Text>
<b>{names[1]}</b>
<Text as="span" size="Inherit" priority="300">
<b style={{ WebkitTextFillColor: 'inherit' }}>{names[1]}</b>
<Text
as="span"
size="Inherit"
priority="300"
style={{ WebkitTextFillColor: 'currentColor' }}
>
{', '}
</Text>
<b>{names[2]}</b>
<Text as="span" size="Inherit" priority="300">
<b style={{ WebkitTextFillColor: 'inherit' }}>{names[2]}</b>
<Text
as="span"
size="Inherit"
priority="300"
style={{ WebkitTextFillColor: 'currentColor' }}
>
{' and '}
</Text>
<b>{names.length - 3} others</b>
<Text as="span" size="Inherit" priority="300">
<b style={{ WebkitTextFillColor: 'inherit' }}>{names.length - 3} others</b>
<Text
as="span"
size="Inherit"
priority="300"
style={{ WebkitTextFillColor: 'currentColor' }}
>
{' are following the conversation.'}
</Text>
</>
Expand Down
Loading