Skip to content

Cleanup after drag and drop #2481

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

Merged
merged 2 commits into from
Sep 27, 2022
Merged

Cleanup after drag and drop #2481

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d16c73
Cleanup after drag and drop
Sep 27, 2022
f76faaa
Remove unecessary cleanups
Sep 27, 2022
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
38 changes: 24 additions & 14 deletions webview/src/shared/components/dragDrop/DragDropContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,29 +109,42 @@ export const DragDropContainer: React.FC<DragDropContainerProps> = ({
(state: PlotsState) => state.dragAndDrop
)
const draggedOverIdTimeout = useRef<number>(0)
const pickedUp = useRef<boolean>(false)
const dispatch = useDispatch()

const cleanup = useCallback(() => {
immediateDragLeave()
setDraggedOverId('')
setDraggedId('')
setDirection(defaultDragEnterDirection)
if (pickedUp.current) {
immediateDragLeave()
setDraggedOverId('')
setDraggedId('')
setDirection(defaultDragEnterDirection)
pickedUp.current = false
dispatch(changeRef(undefined))
}
}, [
setDraggedOverId,
setDirection,
defaultDragEnterDirection,
immediateDragLeave
immediateDragLeave,
dispatch
])

useEffect(() => {
const onMove = (e: MouseEvent) => {
if (!e.buttons && pickedUp.current) {
cleanup()
}
}
document.addEventListener('mousemove', onMove)
return () => {
clearTimeout(draggedOverIdTimeout.current)
document.removeEventListener('mousemove', onMove)
}
}, [])
}, [cleanup])

useEffect(() => {
cleanup()
}, [order, cleanup])
}, [cleanup])

useLayoutEffect(() => {
onLayoutChange?.()
Expand All @@ -142,6 +155,7 @@ export const DragDropContainer: React.FC<DragDropContainerProps> = ({
}

const handleDragStart = (e: DragEvent<HTMLElement>) => {
pickedUp.current = true
const { id } = e.currentTarget
const idx = order.indexOf(id)
let toIdx = shouldShowOnDrag ? idx : idx + 1
Expand Down Expand Up @@ -189,6 +203,7 @@ export const DragDropContainer: React.FC<DragDropContainerProps> = ({
dispatch(changeRef(undefined))

onDrop?.(oldDraggedId, draggedRef?.group || '', group, droppedIndex)
cleanup()
}

const handleOnDrop = (e: DragEvent<HTMLElement>) => {
Expand All @@ -201,7 +216,7 @@ export const DragDropContainer: React.FC<DragDropContainerProps> = ({
}, 0)
const dragged = draggedRef.itemId
if (dragged === draggedOverId) {
dispatch(changeRef(undefined))
cleanup()
return
}
const isNew = !order.includes(dragged)
Expand Down Expand Up @@ -246,11 +261,6 @@ export const DragDropContainer: React.FC<DragDropContainerProps> = ({
}
}

const handleDragEnd = () => {
dispatch(changeRef(undefined))
cleanup()
}

const handleDragLeave = () => {
deferedDragLeave()
}
Expand All @@ -262,7 +272,7 @@ export const DragDropContainer: React.FC<DragDropContainerProps> = ({
ref={(draggable as any).ref}
{...draggable.props}
onDragStart={handleDragStart}
onDragEnd={handleDragEnd}
onDragEnd={cleanup}
onDragOver={handleDragOver}
onDragEnter={handleDragEnter}
onDrop={handleOnDrop}
Expand Down