File tree Expand file tree Collapse file tree
app/javascript/flavours/glitch
features/notifications_v2/components Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11import { Emoji } from 'flavours/glitch/components/emoji' ;
2+ import { CustomEmojiProvider } from 'flavours/glitch/components/emoji/context' ;
23import { isUnicodeEmoji } from 'flavours/glitch/features/emoji/utils' ;
34import { useHovering } from 'flavours/glitch/hooks/useHovering' ;
45import { 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 }
Original file line number Diff line number Diff line change @@ -12,7 +12,10 @@ import {
1212} from '@/flavours/glitch/actions/interactions' ;
1313import { AnimatedNumber } from '@/flavours/glitch/components/animated_number' ;
1414import { 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' ;
1619import { isUnicodeEmoji } from '@/flavours/glitch/features/emoji/utils' ;
1720import { useIdentity } from '@/flavours/glitch/identity_context' ;
1821import {
@@ -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 } />
Original file line number Diff line number Diff line change @@ -6,7 +6,10 @@ import { Link } from 'react-router-dom';
66
77import MoodIcon from '@/material-icons/400-24px/mood.svg?react' ;
88import { 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' ;
1013import type { ExtraCustomEmojiMap } from 'flavours/glitch/features/emoji/types' ;
1114import { isUnicodeEmoji } from 'flavours/glitch/features/emoji/utils' ;
1215import 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 ''
You can’t perform that action at this time.
0 commit comments