pepepper/fluxer
1
0
Fork 0
mirror of https://github.com/fluxerapp/fluxer synced 2026-10-07 19:22:14 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix(app): stop pending stickers from reloading the channel (#2890)

Browse Source
This commit is contained in:
Hampus
2026-09-22 02:00:26 +02:00
committed by GitHub
parent 412a1ae79d
commit 31c53d2dff
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fluxer_app/src/features/channel/components/ChannelStickersArea.tsx
-11
View File
@@ -4,7 +4,6 @@ import * as ChannelStickerCommands from '@app/features/channel/commands/ChannelS
import styles from '@app/features/channel/components/ChannelStickersArea.module.css';
import ChannelSticker from '@app/features/channel/state/ChannelSticker';
import {useStickerAnimation} from '@app/features/emoji/hooks/useStickerAnimation';
import {ComponentBus} from '@app/features/platform/utils/ComponentBus';
import {StickerContextMenuItems} from '@app/features/ui/action_menu/items/StickerContextMenuItems';
import * as ContextMenuCommands from '@app/features/ui/commands/ContextMenuCommands';
import FocusRing from '@app/features/ui/focus_ring/FocusRing';
@@ -16,7 +15,6 @@ import {TrashIcon} from '@phosphor-icons/react';
import {clsx} from 'clsx';
import {observer} from 'mobx-react-lite';
import type React from 'react';
import {useEffect, useState} from 'react';
const REMOVE_STICKER_DESCRIPTOR = msg({
message: 'Remove sticker',
@@ -33,15 +31,6 @@ export const ChannelStickersArea: React.FC<ChannelStickersAreaProps> = observer(
const {i18n} = useLingui();
const sticker = ChannelSticker.getPendingSticker(channelId);
const {shouldAnimate, interactionHandlers} = useStickerAnimation({isAnimated: sticker?.animated ?? false});
const [previousSticker, setPreviousSticker] = useState(sticker);
useEffect(() => {
if (previousSticker && !sticker) {
ComponentBus.dispatch('FORCE_JUMP_TO_PRESENT');
} else if (!previousSticker && sticker) {
ComponentBus.dispatch('FORCE_JUMP_TO_PRESENT');
}
setPreviousSticker(sticker);
}, [sticker, previousSticker]);
if (!sticker) {
return null;
}
fluxer_app/src/features/channel/components/LexicalChannelTextareaContent.tsx
+2 -1
View File
@@ -707,7 +707,8 @@ export const LexicalChannelTextareaContent = observer(
const stickerBoundaryChanged = isSameChannel && previous.hasPendingSticker !== hasPendingSticker;
if (
wasAtBottomBeforeComposerBoundaryChange.current &&
(stickerBoundaryChanged || (attachmentBoundaryChanged && Messages.getMessages(channel.id).hasMoreAfter))
(stickerBoundaryChanged || attachmentBoundaryChanged) &&
Messages.getMessages(channel.id).hasMoreAfter
) {
ComponentBus.dispatch('FORCE_JUMP_TO_PRESENT', {channelId: channel.id});
}