Skip to content

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

TypeScript fluxerfluxerapp

perf(app): pause animated emoji while the window is unfocused (#3864)

Hampus14244622fac4
diff --git a/fluxer_app/src/features/app/hooks/useShouldAnimate.ts b/fluxer_app/src/features/app/hooks/useShouldAnimate.ts
index 30e92418e..6e0018c87 100644
--- a/fluxer_app/src/features/app/hooks/useShouldAnimate.ts
+++ b/fluxer_app/src/features/app/hooks/useShouldAnimate.ts
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import Accessibility from '@app/features/accessibility/state/Accessibility';
+import {useAnimatedMediaPlaybackAllowed} from '@app/features/app/hooks/useAnimatedMediaPlayback';
import {useSaveData} from '@app/features/app/hooks/useSaveData';
import UserSettings from '@app/features/user/state/UserSettings';
import {StickerAnimationOptions} from '@fluxer/constants/src/UserConstants';
@@ -57,6 +58,7 @@ interface ShouldAnimateDecisionInput {
keptUnderReducedMotion: boolean;
isInteracting: boolean;
saveData: boolean;
+ windowActive: boolean;
}
function resolveShouldAnimateDecision({
@@ -66,8 +68,10 @@ function resolveShouldAnimateDecision({
keptUnderReducedMotion,
isInteracting,
saveData,
+ windowActive,
}: ShouldAnimateDecisionInput): boolean {
if (!isAnimated) return false;
+ if (!windowActive) return false;
if (saveData) return false;
if (allowance === 'NEVER') return false;
if (reducedMotion && !keptUnderReducedMotion) return isInteracting;
@@ -82,6 +86,7 @@ export function useShouldAnimate({
isFocused = false,
}: UseShouldAnimateOptions): boolean {
const saveData = useSaveData();
+ const windowActive = useAnimatedMediaPlaybackAllowed({isAnimated});
const allowance = getKindAllowance(kind);
return resolveShouldAnimateDecision({
isAnimated,
@@ -90,5 +95,6 @@ export function useShouldAnimate({
keptUnderReducedMotion: isKeptUnderReducedMotion(kind),
isInteracting: isHovering || isFocused,
saveData,
+ windowActive,
});
}
diff --git a/fluxer_app/src/features/channel/components/MessageActionBottomSheet.tsx b/fluxer_app/src/features/channel/components/MessageActionBottomSheet.tsx
index 6400b908d..e903beadc 100644
--- a/fluxer_app/src/features/channel/components/MessageActionBottomSheet.tsx
+++ b/fluxer_app/src/features/channel/components/MessageActionBottomSheet.tsx
@@ -4,8 +4,8 @@ import styles from '@app/features/channel/components/MessageActionBottomSheet.mo
import {useMessageActionMenuData} from '@app/features/channel/components/MessageActionMenu';
import {MessageReactionsSheet} from '@app/features/channel/components/MessageReactionsSheet';
import {
+ QuickReactionEmoji,
REACT_WITH_EMOJI_DESCRIPTOR,
- renderQuickReactionEmoji,
useReactionMenuImagePreload,
} from '@app/features/channel/components/QuickReactionsRow';
import quickReactionStyles from '@app/features/channel/components/QuickReactionsRow.module.css';
@@ -135,7 +135,7 @@ export const MessageActionBottomSheet: React.FC<MessageActionBottomSheetProps> =
className={quickReactionStyles.button}
data-flx="channel.message-action-bottom-sheet.button.track-emoji"
>
- {renderQuickReactionEmoji(emoji)}
+ <QuickReactionEmoji emoji={emoji} />
</button>
);
})}
diff --git a/fluxer_app/src/features/channel/components/QuickReactionsRow.tsx b/fluxer_app/src/features/channel/components/QuickReactionsRow.tsx
index 225ad7daf..5409168e3 100644
--- a/fluxer_app/src/features/channel/components/QuickReactionsRow.tsx
+++ b/fluxer_app/src/features/channel/components/QuickReactionsRow.tsx
@@ -17,13 +17,8 @@ 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:.',
});
-function getQuickReactionEmojiSrc(emoji: FlatEmoji): string {
- const {url: displayUrl} = getEmojiDisplayData(emoji);
- return emoji.id ? buildCustomEmojiURL({id: emoji.id, animated: emoji.animated === true}) : (displayUrl ?? '');
-}
-
-export function renderQuickReactionEmoji(emoji: FlatEmoji): React.ReactNode {
- const emojiSrc = getQuickReactionEmojiSrc(emoji);
+export const QuickReactionEmoji: React.FC<{emoji: FlatEmoji}> = ({emoji}) => {
+ const emojiSrc = useReactionMenuEmojiSrc(emoji);
return (
<ReactionImage
src={emojiSrc}
@@ -34,18 +29,18 @@ export function renderQuickReactionEmoji(emoji: FlatEmoji): React.ReactNode {
data-flx="channel.quick-reactions-row.render-quick-reaction-emoji.emoji-img"
/>
);
-}
+};
-function getReactionSubmenuEmojiSrc(emoji: FlatEmoji, animationAllowed: boolean): string {
+function getReactionMenuEmojiSrc(emoji: FlatEmoji, animationAllowed: boolean): string {
const {url: displayUrl} = getEmojiDisplayData(emoji);
return emoji.id
? buildCustomEmojiURL({id: emoji.id, animated: emoji.animated === true && animationAllowed})
: (displayUrl ?? '');
}
-export function useReactionSubmenuEmojiSrc(emoji: FlatEmoji): string {
+export function useReactionMenuEmojiSrc(emoji: FlatEmoji): string {
const animationAllowed = useShouldAnimate({kind: 'emoji', isAnimated: emoji.animated === true});
- return getReactionSubmenuEmojiSrc(emoji, animationAllowed);
+ return getReactionMenuEmojiSrc(emoji, animationAllowed);
}
const NO_SUBMENU_EMOJIS: ReadonlyArray<FlatEmoji> = [];
@@ -58,10 +53,11 @@ export function useReactionMenuImagePreload(
const urls = useMemo(
() =>
Array.from(
- new Set([
- ...quickReactionEmojis.map(getQuickReactionEmojiSrc),
- ...submenuReactionEmojis.map((emoji) => getReactionSubmenuEmojiSrc(emoji, animationAllowed)),
- ]),
+ new Set(
+ [...quickReactionEmojis, ...submenuReactionEmojis].map((emoji) =>
+ getReactionMenuEmojiSrc(emoji, animationAllowed),
+ ),
+ ),
).filter(Boolean),
[quickReactionEmojis, submenuReactionEmojis, animationAllowed],
);
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 59375719a..d90f7bd75 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
@@ -1,6 +1,7 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {EVERYONE_MENTION} from '@app/features/app/config/I18nDisplayConstants';
+import {useShouldAnimate} from '@app/features/app/hooks/useShouldAnimate';
import Channels from '@app/features/channel/state/Channels';
import Emoji from '@app/features/emoji/state/Emoji';
import styles from '@app/features/guild/components/modals/guild_tabs/GuildAuditLogTab.module.css';
@@ -180,6 +181,19 @@ function renderText(value: string): React.ReactNode {
);
}
+const AuditLogEmojiImage: React.FC<{id: string; animated: boolean}> = ({id, animated}) => {
+ const shouldAnimate = useShouldAnimate({kind: 'emoji', isAnimated: animated});
+ return (
+ <img
+ src={getEmojiURL({id, animated: animated && shouldAnimate})}
+ alt=""
+ draggable={false}
+ className={styles.inlineEmojiImage}
+ data-flx="guild.guild-tabs.guild-audit-log-sentence.render-emoji.inline-emoji-image"
+ />
+ );
+};
+
function renderEmoji({id, name}: EmojiPlaceholder): React.ReactNode {
const label = `:${name}:`;
const emoji = id === null ? undefined : Emoji.getEmojiById(id);
@@ -188,13 +202,7 @@ 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">
- <img
- src={getEmojiURL({id, animated: emoji.animated})}
- alt=""
- draggable={false}
- className={styles.inlineEmojiImage}
- data-flx="guild.guild-tabs.guild-audit-log-sentence.render-emoji.inline-emoji-image"
- />
+ <AuditLogEmojiImage id={id} animated={emoji.animated === true} />
<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 6dfdbec7d..bb7352b8b 100644
--- a/fluxer_app/src/features/ui/action_menu/MessageContextMenu.tsx
+++ b/fluxer_app/src/features/ui/action_menu/MessageContextMenu.tsx
@@ -4,10 +4,10 @@ import Accessibility from '@app/features/accessibility/state/Accessibility';
import {messageActionMenuItemIds, useMessageActionMenuData} from '@app/features/channel/components/MessageActionMenu';
import {getEffectiveContent, triggerAddReaction} from '@app/features/channel/components/MessageActionUtils';
import {
+ QuickReactionEmoji,
REACT_WITH_EMOJI_DESCRIPTOR,
- renderQuickReactionEmoji,
+ useReactionMenuEmojiSrc,
useReactionMenuImagePreload,
- useReactionSubmenuEmojiSrc,
} from '@app/features/channel/components/QuickReactionsRow';
import type {Channel} from '@app/features/channel/models/Channel';
import EmojiPicker from '@app/features/emoji/state/EmojiPicker';
@@ -196,7 +196,7 @@ RemoveReactionsSubmenu.displayName = 'RemoveReactionsSubmenu';
const AddReactionSubmenuItem = observer(
({emoji, onSelect}: {emoji: FlatEmoji; onSelect: (emoji: FlatEmoji) => void}) => {
const reactionEmoji = useMemo(() => toReactionEmoji(emoji), [emoji]);
- const emojiUrl = useReactionSubmenuEmojiSrc(emoji);
+ const emojiUrl = useReactionMenuEmojiSrc(emoji);
const label = getEmojiNameWithColons(reactionEmoji);
const renderEmojiPreview = () => {
if (emojiUrl) {
@@ -270,7 +270,7 @@ const QuickReactionContextMenuItem = observer(
data-menu-shortcut={shortcut}
data-flx="ui.action-menu.message-context-menu.quick-reaction-context-menu-item.aria-menu-item"
>
- {renderQuickReactionEmoji(emoji)}
+ <QuickReactionEmoji emoji={emoji} />
{shouldShowShortcut && (
<span
className={contextMenuStyles.quickReactionShortcut}