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 2 commits into
base: staging
Choose a base branch
from
+12 −0
Open

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

Changes from all commits
Commits
Show all changes
2 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
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
12 changes: 12 additions & 0 deletions 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 @@ -616,6 +616,18 @@ 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)) handleDragEnd()
}
container.addEventListener('dragleave', onLeave)
return () => container.removeEventListener('dragleave', onLeave)
}, [isDragging, handleDragEnd])
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.

Full drag state reset corrupts re-entry behavior

Medium Severity

The dragleave handler calls handleDragEnd() which resets all drag state — including draggedSourceFolderRef, dropIndicatorRef, and siblingsCacheRef. But the browser's native drag operation continues (user is still holding the mouse). If the cursor re-enters the container, initDragOver re-sets isDragging to true, but draggedSourceFolderRef stays null. This causes isSameFolder/isSameParent checks in createWorkflowDragHandlers and createFolderDragHandlers to return incorrect results, leading to wrong drop indicators and potentially incorrect item reordering for non-root items.

Additional Locations (1)
Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit d2270a6. Configure here.


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