fix(app): recover lists stuck in drag mode (#4236)

This commit is contained in:
Hampus authored and GitHub committed 2026-11-20 03:19:45 +01:00
1 parent 96885e8306
commit 6c133ffab4
3 files changed
+49 -2

No files matched your search

@@ -11,6 +11,7 @@ import {
CollapsedCategoryVoiceParticipants,
CollapsedChannelAvatarStack,
} from '@app/features/app/components/layout/CollapsedCategoryVoiceParticipants';
import {useStaleDragRecovery} from '@app/features/app/components/layout/dnd/useStaleDragRecovery';
import {GenericChannelItem} from '@app/features/app/components/layout/GenericChannelItem';
import {GuildDetachedBanner} from '@app/features/app/components/layout/GuildDetachedBanner';
import {NullSpaceDropIndicator} from '@app/features/app/components/layout/NullSpaceDropIndicator';
@@ -190,6 +191,8 @@ export const ChannelListContent = observer(({guild, scrollY, banner}: ChannelLis
);
});
const [activeDragItem, setActiveDragItem] = useState<DragItem | null>(null);
const clearActiveDragItem = useCallback(() => setActiveDragItem(null), []);
useStaleDragRecovery(isDraggingAnything || activeDragItem != null, clearActiveDragItem);
const scrollerRef = useRef<ScrollerHandle>(null);
const showIntegratedBanner = banner.collapsible;
const channelGroupsContainerRef = useRef<HTMLDivElement | null>(null);
@@ -11,6 +11,7 @@ import {
consumeDirectSelection,
DirectSelectionSurface,
} from '@app/features/app/components/layout/DirectSelectionOrigin';
import {useStaleDragRecovery} from '@app/features/app/components/layout/dnd/useStaleDragRecovery';
import type {
FloatingUnreadTarget,
FloatingUnreadTargetBounds,
@@ -1732,9 +1733,29 @@ const GuildList = observer(() => {
},
[organizedItems],
);
const handleDragStateChange = useCallback((item: GuildDragItem | null) => {
setActiveDragItem(item);
const dragStartFrameRef = useRef<number | null>(null);
const cancelDragStartFrame = useCallback(() => {
if (dragStartFrameRef.current == null) return;
window.cancelAnimationFrame(dragStartFrameRef.current);
dragStartFrameRef.current = null;
}, []);
const handleDragStateChange = useCallback(
(item: GuildDragItem | null) => {
cancelDragStartFrame();
if (item == null) {
setActiveDragItem(null);
return;
}
dragStartFrameRef.current = window.requestAnimationFrame(() => {
dragStartFrameRef.current = null;
setActiveDragItem(item);
});
},
[cancelDragStartFrame],
);
useEffect(() => cancelDragStartFrame, [cancelDragStartFrame]);
const clearActiveDragItem = useCallback(() => handleDragStateChange(null), [handleDragStateChange]);
useStaleDragRecovery(isDragging, clearActiveDragItem);
const guildNavigationRows = useMemo(
() =>
createGuildNavigationRows({
@@ -0,0 +1,23 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {useEffect} from 'react';
import {useDragDropManager} from 'react-dnd';
export function useStaleDragRecovery(active: boolean, onRecover: () => void): void {
const dragDropManager = useDragDropManager();
useEffect(() => {
if (!active) return;
const recover = () => {
if (dragDropManager.getMonitor().isDragging()) {
dragDropManager.getActions().endDrag();
}
onRecover();
};
window.addEventListener('pointerdown', recover, true);
window.addEventListener('blur', recover);
return () => {
window.removeEventListener('pointerdown', recover, true);
window.removeEventListener('blur', recover);
};
}, [active, dragDropManager, onRecover]);
}