fix: call start drag on unmount

procraft · Jan 24, 2024 · f2694a4 · f2694a4
1 parent e787ab7
commit f2694a4
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/src/components/DragDropContextRootView.tsx b/src/components/DragDropContextRootView.tsx
@@ -133,6 +133,18 @@ export function DragDropContextRootView(props: DragDropContextRootViewProps) {
     [startDragMeasureInfo]
   );
 
+  const onDragEnd = useCallback(() => {
+    'worklet';
+    modify(
+      startDragMeasureInfo,
+      () => {
+        'worklet';
+        return null;
+      },
+      true
+    );
+  }, [startDragMeasureInfo]);
+
   const value = useMemo<DragDropContextType>(
     () => ({ registerDragDropArea, removeDragDropArea, startDrag }),
     [registerDragDropArea, removeDragDropArea, startDrag]
@@ -142,7 +154,8 @@ export function DragDropContextRootView(props: DragDropContextRootViewProps) {
     isMoving,
     dragDropItemInfo,
     hoveredItemMeasurement,
-    dragDropAreas
+    dragDropAreas,
+    onDragEnd
   );
 
   return (

diff --git a/src/hooks/useDragDropMove.ts b/src/hooks/useDragDropMove.ts
@@ -18,7 +18,8 @@ export function useDragDropMove(
   isMoving: SharedValue<boolean>,
   dragDropItemInfo: SharedValue<DragDropItemInfo | null>,
   hoveredItemMeasurement: SharedValue<MeasuredDimensions | null>,
-  dragDropAreas: SharedValue<DragDropAreas>
+  dragDropAreas: SharedValue<DragDropAreas>,
+  onDragEnd: () => void
 ) {
   const { clearHoveredItem, moveHoveredItem, measureHoveredItem } =
     useContext(HoveredItemContext);
@@ -90,6 +91,7 @@ export function useDragDropMove(
 
     stopScroll();
     runOnJS(clearHoveredItem)();
+    onDragEnd();
 
     if (dragDropItemInfo.value != null) {
       dragDropItemInfo.value.onEnd?.();
@@ -102,7 +104,7 @@ export function useDragDropMove(
         true
       );
     }
-  }, [dragDropItemInfo, clearHoveredItem, stopScroll]);
+  }, [dragDropItemInfo, clearHoveredItem, stopScroll, onDragEnd]);
 
   const prevIsMoving = useSharedValue(isMoving.value);
   useDerivedValue(() => {