fix: do not wrap consumer-defined handlers in batchedUpdates (#371)

clauderic · Jul 21, 2021 · 7006464 · 7006464
1 parent eeb990a
commit 7006464
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/.changeset/fix-batchedupdates-handlers.md b/.changeset/fix-batchedupdates-handlers.md
@@ -0,0 +1,5 @@
+---
+"@dnd-kit/core": patch
+---
+
+fix: do not wrap consumer-defined handlers in batchedUpdates
diff --git a/packages/core/src/components/DndContext/DndContext.tsx b/packages/core/src/components/DndContext/DndContext.tsx
@@ -342,8 +342,9 @@ export const DndContext = memo(function DndContext({
               active: id,
             });
             setMonitorState({type: Action.DragStart, event});
-            onDragStart?.(event);
           });
+
+          onDragStart?.(event);
         },
         onMove(coordinates) {
           dispatch({
@@ -392,14 +393,16 @@ export const DndContext = memo(function DndContext({
             setActivatorEvent(null);
 
             if (event) {
-              const {onDragCancel, onDragEnd} = latestProps.current;
-              const handler =
-                type === Action.DragEnd ? onDragEnd : onDragCancel;
-
               setMonitorState({type, event});
-              handler?.(event);
             }
           });
+
+          if (event) {
+            const {onDragCancel, onDragEnd} = latestProps.current;
+            const handler = type === Action.DragEnd ? onDragEnd : onDragCancel;
+
+            handler?.(event);
+          }
         };
       }
     },