Merge branch 'dinkinflicka/optimize-rerenders-on-click' of https://gi…

…thub.com/dinkinflickaa/dnd-kit into dinkinflicka/optimize-rerenders-on-click
clauderic · Oct 9, 2024 · 0923cc4 · 0923cc4
2 parents 8ea85a1 + cc865c6
commit 0923cc4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/packages/core/src/components/DndContext/DndContext.tsx b/packages/core/src/components/DndContext/DndContext.tsx
@@ -320,7 +320,6 @@ export const DndContext = memo(function DndContext({
   );
 
   const activeSensorRef = useRef<SensorInstance | null>(null);
-  const activatorEventRef = useRef<Event | null>(null);
   const instantiateSensor = useCallback(
     (
       event: React.SyntheticEvent,
@@ -388,7 +387,9 @@ export const DndContext = memo(function DndContext({
       });
 
       activeSensorRef.current = sensorInstance;
-      activatorEventRef.current = event.nativeEvent;
+
+      // Attach the sensor, this will call the onStart method if needed
+      sensorInstance.attach();
 
       function createHandler(type: Action.DragEnd | Action.DragCancel) {
         return async function handler() {
@@ -425,7 +426,6 @@ export const DndContext = memo(function DndContext({
             setActiveSensor(null);
             setActivatorEvent(null);
             activeSensorRef.current = null;
-            activatorEventRef.current = null;
 
             const eventName =
               type === Action.DragEnd ? 'onDragEnd' : 'onDragCancel';

diff --git a/packages/core/src/sensors/keyboard/KeyboardSensor.ts b/packages/core/src/sensors/keyboard/KeyboardSensor.ts
@@ -54,10 +54,9 @@ export class KeyboardSensor implements SensorInstance {
     this.handleKeyDown = this.handleKeyDown.bind(this);
     this.handleCancel = this.handleCancel.bind(this);
 
-    this.attach();
   }
 
-  private attach() {
+  public attach() {
     this.handleStart();
 
     this.windowListeners.add(EventName.Resize, this.handleCancel);

diff --git a/packages/core/src/sensors/types.ts b/packages/core/src/sensors/types.ts
@@ -52,8 +52,9 @@ export interface SensorProps<T> {
   onEnd(): void;
 }
 
-export type SensorInstance = {
+export interface SensorInstance {
   autoScrollEnabled: boolean;
+  attach(): void;
 };
 
 export type SensorActivatorFunction<T> = (