Skip to content

Commit 89344d9

Browse files
committed
Fix reaction custom emoji rendering
1 parent c9a3fab commit 89344d9

3 files changed

Lines changed: 21 additions & 7 deletions

File tree

app/javascript/flavours/glitch/components/avatar_overlay.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Emoji } from 'flavours/glitch/components/emoji';
2+
import { CustomEmojiProvider } from 'flavours/glitch/components/emoji/context';
23
import { isUnicodeEmoji } from 'flavours/glitch/features/emoji/utils';
34
import { useHovering } from 'flavours/glitch/hooks/useHovering';
45
import { autoPlayGif } from 'flavours/glitch/initial_state';
@@ -71,7 +72,9 @@ export const AvatarOverlay: React.FC<Props> = ({
7172

7273
overlayElement = (
7374
<div className='account__emoji' data-emoji-name={emoji.name}>
74-
<Emoji code={code} customEmoji={custom} />
75+
<CustomEmojiProvider emojis={custom}>
76+
<Emoji code={code} />
77+
</CustomEmojiProvider>
7578
</div>
7679
);
7780
}

app/javascript/flavours/glitch/components/status_reactions.tsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ import {
1212
} from '@/flavours/glitch/actions/interactions';
1313
import { AnimatedNumber } from '@/flavours/glitch/components/animated_number';
1414
import { Emoji } from '@/flavours/glitch/components/emoji';
15-
import { AnimateEmojiProvider } from '@/flavours/glitch/components/emoji/context';
15+
import {
16+
AnimateEmojiProvider,
17+
CustomEmojiProvider,
18+
} from '@/flavours/glitch/components/emoji/context';
1619
import { isUnicodeEmoji } from '@/flavours/glitch/features/emoji/utils';
1720
import { useIdentity } from '@/flavours/glitch/identity_context';
1821
import {
@@ -114,9 +117,11 @@ const Reaction: FC<{
114117
style={style}
115118
>
116119
<AnimateEmojiProvider>
117-
<span className='reactions-bar__item__emoji'>
118-
<Emoji code={code} customEmoji={custom} />
119-
</span>
120+
<CustomEmojiProvider emojis={custom}>
121+
<span className='reactions-bar__item__emoji'>
122+
<Emoji code={code} />
123+
</span>
124+
</CustomEmojiProvider>
120125
</AnimateEmojiProvider>
121126
<span className='reactions-bar__item__count'>
122127
<AnimatedNumber value={reaction.get('count') as number} />

app/javascript/flavours/glitch/features/notifications_v2/components/notification_reaction.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ import { Link } from 'react-router-dom';
66

77
import MoodIcon from '@/material-icons/400-24px/mood.svg?react';
88
import { Emoji } from 'flavours/glitch/components/emoji';
9-
import { AnimateEmojiProvider } from 'flavours/glitch/components/emoji/context';
9+
import {
10+
AnimateEmojiProvider,
11+
CustomEmojiProvider,
12+
} from 'flavours/glitch/components/emoji/context';
1013
import type { ExtraCustomEmojiMap } from 'flavours/glitch/features/emoji/types';
1114
import { isUnicodeEmoji } from 'flavours/glitch/features/emoji/utils';
1215
import type { NotificationGroupReaction } from 'flavours/glitch/models/notification_group';
@@ -53,7 +56,10 @@ export const NotificationReaction: React.FC<{
5356
e: (chunks) =>
5457
notification.reaction ? (
5558
<>
56-
{chunks} <Emoji code={code} customEmoji={custom} />
59+
{chunks}{' '}
60+
<CustomEmojiProvider emojis={custom}>
61+
<Emoji code={code} />
62+
</CustomEmojiProvider>
5763
</>
5864
) : (
5965
''

0 commit comments

Comments
 (0)