refactor: fix direction collision by avoiding duplicate drop refs

measuredco · Oct 10, 2024 · 3786cfc · 3786cfc
1 parent be744d7
commit 3786cfc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/core/components/DraggableComponent/collision/dynamic/index.ts b/packages/core/components/DraggableComponent/collision/dynamic/index.ts
@@ -35,7 +35,6 @@ export const createDynamicCollisionDetector = (
   midpointOffset: number = 0.05
 ) =>
   ((input) => {
-    // console.log("checking collision", input);
     const { dragOperation, droppable } = input;
 
     const { position } = dragOperation;
@@ -66,6 +65,8 @@ export const createDynamicCollisionDetector = (
 
       const collision = directionalCollision(input, interval.previous);
 
+      collisionDebug(dragCenter, dropCenter, droppable.id.toString(), "yellow");
+
       if (collision) {
         return {
           ...collision,

diff --git a/packages/core/components/DropZone/index.tsx b/packages/core/components/DropZone/index.tsx
@@ -211,13 +211,12 @@ function DropZoneEdit({
       ref={(node) => {
         ref.current = node;
 
-        // dnd-kit gets confused if both drop and drag refs are assigned during a drag.
-        // Luckily, during a drag, isDropEnabled === false for this item, so we can
-        // remove the ref.
-        // TODO see if there's a fix for this upstream
-        // if (isDropEnabled) {
-        dropRef(node);
-        // }
+        // Don't apply dropRef if we have a dragRef, which is actually a
+        // sortableRef and so already includes drop reference. Including
+        // both confuses dnd-kit
+        if (!dragRef) {
+          dropRef(node);
+        }
 
         if (dragRef) dragRef(node);
       }}