disableKeyboardA11y now correctly prevents escape key presses

2024-02-21 08:27:50 +01:00
parent 20e2d3d2ce
commit 62bfc7acc6
4 changed files with 10 additions and 7 deletions
@@ -178,6 +178,10 @@ export function NodeWrapper<NodeType extends Node>({
      return;
    }

+    if (disableKeyboardA11y) {
+      return;
+    }
+
    if (elementSelectionKeys.includes(event.key) && isSelectable) {
      const unselect = event.key === 'Escape';

@@ -187,12 +191,7 @@ export function NodeWrapper<NodeType extends Node>({
        unselect,
        nodeRef,
      });
-    } else if (
-      !disableKeyboardA11y &&
-      isDraggable &&
-      node.selected &&
-      Object.prototype.hasOwnProperty.call(arrowKeyDiffs, event.key)
-    ) {
+    } else if (isDraggable && node.selected && Object.prototype.hasOwnProperty.call(arrowKeyDiffs, event.key)) {
      store.setState({
        ariaLiveMessage: `Moved selected node ${event.key
          .replace('Arrow', '')