Fix keyboard sensor activating when focusing elements within

clauderic · Sep 19, 2024 · fe76033 · fe76033
1 parent 2c514fd
commit fe76033
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/.changeset/keyboard-sensor.md b/.changeset/keyboard-sensor.md
@@ -0,0 +1,5 @@
+---
+'@dnd-kit/dom': patch
+---
+
+Fixed a bug in the `KeyboardSensor` that would cause the sensor to activate when focusing elements within the sortable element other than the handle.
diff --git a/packages/dom/src/core/sensors/keyboard/KeyboardSensor.ts b/packages/dom/src/core/sensors/keyboard/KeyboardSensor.ts
@@ -93,21 +93,26 @@ export class KeyboardSensor extends Sensor<
       return;
     }
 
-    if (source.disabled || !source.element) {
+    if (source.disabled) {
       return;
     }
 
-    const {keyboardCodes = DEFAULT_KEYBOARD_CODES} = options ?? {};
+    if (
+      (!source.handle && source.element && event.target === source.element) ||
+      (source.handle && event.target === source.handle)
+    ) {
+      const {keyboardCodes = DEFAULT_KEYBOARD_CODES} = options ?? {};
 
-    if (!keyboardCodes.start.includes(event.code)) {
-      return;
-    }
+      if (!keyboardCodes.start.includes(event.code)) {
+        return;
+      }
 
-    if (!this.manager.dragOperation.status.idle) {
-      return;
-    }
+      if (!this.manager.dragOperation.status.idle) {
+        return;
+      }
 
-    this.handleStart(event, source, options);
+      this.handleStart(event, source, options);
+    }
   };
 
   protected handleStart(