Skip to content

fix(ui): stop scrolling on leaving workflow sidebar for drag-drop #4139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TheodoreSpeaks wants to merge 4 commits into
base: staging
Choose a base branch
from
+28 −1
Open

fix(ui): stop scrolling on leaving workflow sidebar for drag-drop #4139

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2270a6
fix(ui): stop scrolling on leaving workflow sidebar for drag-drop
TheodoreSpeaks Apr 13, 2026
6035091
Merge remote-tracking branch 'origin/staging' into fix/infinite-scrol…
TheodoreSpeaks Apr 14, 2026
63f6925
Merge remote-tracking branch 'origin/staging' into fix/infinite-scrol…
TheodoreSpeaks Apr 14, 2026
6d5cad0
Address comments, fix hover state
TheodoreSpeaks Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 28 additions & 1 deletion apps/sim/app/workspace/[workspaceId]/w/components/sidebar/hooks/use-drag-drop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,11 +252,13 @@ export function useDragDrop(options: UseDragDropOptions = {}) {
if (!isDragging) {
isDraggingRef.current = true
setIsDragging(true)
} else if (scrollAnimationRef.current === null) {
scrollAnimationRef.current = requestAnimationFrame(handleAutoScroll)
}

return true
},
[isDragging]
[isDragging, handleAutoScroll]
)

const getSiblingItems = useCallback(
Expand Down Expand Up @@ -616,6 +618,31 @@ export function useDragDrop(options: UseDragDropOptions = {}) {
siblingsCacheRef.current.clear()
}, [])

useEffect(() => {
if (!isDragging) return
const container = scrollContainerRef.current
if (!container) return
const onLeave = (e: DragEvent) => {
const related = e.relatedTarget as Node | null
if (related && container.contains(related)) return
if (scrollAnimationRef.current !== null) {
cancelAnimationFrame(scrollAnimationRef.current)
scrollAnimationRef.current = null
}
dropIndicatorRef.current = null
setDropIndicator(null)
setHoverFolderId(null)
}
container.addEventListener('dragleave', onLeave)
window.addEventListener('drop', handleDragEnd, true)
Copy link
Copy Markdown

@cursor cursor bot Apr 14, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Capture-phase window drop listener preempts React onDrop handler

High Severity

The window.addEventListener('drop', handleDragEnd, true) registers a capture-phase listener. When dropping inside the sidebar, this fires before React's onDrop handler (handleDrop). Since handleDragEnd sets dropIndicatorRef.current = null, the subsequent handleDrop reads a null indicator and returns early without processing the reorder. This breaks internal sidebar drag-and-drop reordering entirely.

Additional Locations (2)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit 6d5cad0. Configure here.

window.addEventListener('dragend', handleDragEnd, true)
return () => {
container.removeEventListener('dragleave', onLeave)
window.removeEventListener('drop', handleDragEnd, true)
window.removeEventListener('dragend', handleDragEnd, true)
}
}, [isDragging, handleDragEnd])

const setScrollContainer = useCallback((element: HTMLDivElement | null) => {
scrollContainerRef.current = element
}, [])
Expand Down
Loading