Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(app): tag paused quick reaction emoji for theming (#3867)

Hampusf75b042cefd4
diff --git a/fluxer_app/src/features/channel/components/MessageActionBottomSheet.tsx b/fluxer_app/src/features/channel/components/MessageActionBottomSheet.tsx
index e903beadc..671535aca 100644
--- a/fluxer_app/src/features/channel/components/MessageActionBottomSheet.tsx
+++ b/fluxer_app/src/features/channel/components/MessageActionBottomSheet.tsx
@@ -135,7 +135,7 @@ export const MessageActionBottomSheet: React.FC<MessageActionBottomSheetProps> =
className={quickReactionStyles.button}
data-flx="channel.message-action-bottom-sheet.button.track-emoji"
>
- <QuickReactionEmoji emoji={emoji} />
+ <QuickReactionEmoji emoji={emoji} data-flx="channel.message-action-bottom-sheet.quick-reaction-emoji" />
</button>
);
})}
diff --git a/fluxer_app/src/features/channel/components/QuickReactionsRow.tsx b/fluxer_app/src/features/channel/components/QuickReactionsRow.tsx
index 5409168e3..62678d186 100644
--- a/fluxer_app/src/features/channel/components/QuickReactionsRow.tsx
+++ b/fluxer_app/src/features/channel/components/QuickReactionsRow.tsx
@@ -17,7 +17,7 @@ export const REACT_WITH_EMOJI_DESCRIPTOR = msg({
'Accessible label for a quick reaction emoji button. Preserve {emojiShortcode}; it is inserted by code, usually like :smile:.',
});
-export const QuickReactionEmoji: React.FC<{emoji: FlatEmoji}> = ({emoji}) => {
+export const QuickReactionEmoji: React.FC<{emoji: FlatEmoji; 'data-flx'?: string}> = ({emoji, 'data-flx': dataFlx}) => {
const emojiSrc = useReactionMenuEmojiSrc(emoji);
return (
<ReactionImage
@@ -26,7 +26,7 @@ export const QuickReactionEmoji: React.FC<{emoji: FlatEmoji}> = ({emoji}) => {
aria-hidden={true}
draggable={false}
className={styles.emojiImg}
- data-flx="channel.quick-reactions-row.render-quick-reaction-emoji.emoji-img"
+ data-flx={dataFlx ?? 'channel.quick-reactions-row.render-quick-reaction-emoji.emoji-img'}
/>
);
};
diff --git a/fluxer_app/src/features/guild/components/modals/guild_tabs/GuildAuditLogSentence.tsx b/fluxer_app/src/features/guild/components/modals/guild_tabs/GuildAuditLogSentence.tsx
index d90f7bd75..f3c9f3d98 100644
--- a/fluxer_app/src/features/guild/components/modals/guild_tabs/GuildAuditLogSentence.tsx
+++ b/fluxer_app/src/features/guild/components/modals/guild_tabs/GuildAuditLogSentence.tsx
@@ -181,7 +181,11 @@ function renderText(value: string): React.ReactNode {
);
}
-const AuditLogEmojiImage: React.FC<{id: string; animated: boolean}> = ({id, animated}) => {
+const AuditLogEmojiImage: React.FC<{id: string; animated: boolean; 'data-flx'?: string}> = ({
+ id,
+ animated,
+ 'data-flx': dataFlx,
+}) => {
const shouldAnimate = useShouldAnimate({kind: 'emoji', isAnimated: animated});
return (
<img
@@ -189,7 +193,7 @@ const AuditLogEmojiImage: React.FC<{id: string; animated: boolean}> = ({id, anim
alt=""
draggable={false}
className={styles.inlineEmojiImage}
- data-flx="guild.guild-tabs.guild-audit-log-sentence.render-emoji.inline-emoji-image"
+ data-flx={dataFlx ?? 'guild.guild-tabs.guild-audit-log-sentence.render-emoji.inline-emoji-image'}
/>
);
};
@@ -202,7 +206,11 @@ function renderEmoji({id, name}: EmojiPlaceholder): React.ReactNode {
}
return (
<span className={styles.inlineEmoji} data-flx="guild.guild-tabs.guild-audit-log-sentence.render-emoji.inline-emoji">
- <AuditLogEmojiImage id={id} animated={emoji.animated === true} />
+ <AuditLogEmojiImage
+ id={id}
+ animated={emoji.animated === true}
+ data-flx="guild.guild-tabs.guild-audit-log-sentence.render-emoji.audit-log-emoji-image"
+ />
<strong data-flx="guild.guild-tabs.guild-audit-log-sentence.render-emoji.strong--2">{label}</strong>
</span>
);
diff --git a/fluxer_app/src/features/ui/action_menu/MessageContextMenu.tsx b/fluxer_app/src/features/ui/action_menu/MessageContextMenu.tsx
index bb7352b8b..c23cd7aeb 100644
--- a/fluxer_app/src/features/ui/action_menu/MessageContextMenu.tsx
+++ b/fluxer_app/src/features/ui/action_menu/MessageContextMenu.tsx
@@ -270,7 +270,10 @@ const QuickReactionContextMenuItem = observer(
data-menu-shortcut={shortcut}
data-flx="ui.action-menu.message-context-menu.quick-reaction-context-menu-item.aria-menu-item"
>
- <QuickReactionEmoji emoji={emoji} />
+ <QuickReactionEmoji
+ emoji={emoji}
+ data-flx="ui.action-menu.message-context-menu.quick-reaction-context-menu-item.quick-reaction-emoji"
+ />
{shouldShowShortcut && (
<span
className={contextMenuStyles.quickReactionShortcut}