@dxos/keyboard 0.9.1-main.c7dcc2e112 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/keyboard",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.10.0",
   "description": "Keyboard bindings",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -26,16 +26,16 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/node-std": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112"
+    "@dxos/invariant": "0.10.0",
+    "@dxos/node-std": "0.10.0",
+    "@dxos/util": "0.10.0"
   },
   "devDependencies": {
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
-    "@dxos/storybook-utils": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112"
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
+    "@dxos/storybook-utils": "0.10.0",
+    "@dxos/react-ui": "0.10.0",
+    "@dxos/ui-theme": "0.10.0"
   },
   "publishConfig": {
     "access": "public"

package/src/keyboard.stories.tsx

@@ -8,7 +8,7 @@ import React, { useEffect, useState } from 'react';
 import { Input, Select } from '@dxos/react-ui';
 import { withTheme } from '@dxos/react-ui/testing';
 
-import { type KeyHandler, Keyboard } from './keyboard';
+import { Keyboard, type KeyHandler } from './keyboard';
 
 const contexts = ['/', '/space/1', '/space/2', '/space/2/a', '/space/2/b'];
 

package/src/keyboard.test.ts

@@ -2,14 +2,41 @@
 // Copyright 2023 DXOS.org
 //
 
-import { describe, expect, test } from 'vitest';
+import { describe, expect, test, vi } from 'vitest';
 
-import { Keyboard } from './keyboard';
+import { Keyboard, nestKeyboardContext } from './keyboard';
 
 describe('keyboard', () => {
-  test('should pass', () => {
+  test('binds shortcuts on the active context', () => {
     const keyboard = new Keyboard();
     keyboard.bind({ shortcut: 'meta+k', handler: () => true });
     expect(keyboard.getBindings()).to.have.length(1);
   });
+
+  test('child context inherits root bindings', async () => {
+    const keyboard = new Keyboard();
+    const handler = vi.fn();
+    keyboard.getContext('root').bind({ shortcut: 'shift+meta+f', handler });
+    keyboard.setCurrentContext('root/plank-1');
+
+    await keyboard.handleKeyDown({
+      altKey: false,
+      ctrlKey: false,
+      metaKey: true,
+      shiftKey: true,
+      key: 'F',
+      preventDefault: vi.fn(),
+      stopPropagation: vi.fn(),
+    } as unknown as KeyboardEvent);
+
+    expect(handler).toHaveBeenCalledOnce();
+  });
+
+  test('nestKeyboardContext nests attendable ids under graph root', ({ expect }) => {
+    expect(nestKeyboardContext(undefined)).to.equal('root');
+    expect(nestKeyboardContext('')).to.equal('root');
+    expect(nestKeyboardContext('root')).to.equal('root');
+    expect(nestKeyboardContext('plank-1')).to.equal('root/plank-1');
+    expect(nestKeyboardContext('root/plank-1')).to.equal('root/plank-1');
+  });
 });

package/src/keyboard.ts

@@ -57,6 +57,20 @@ class KeyboardContext {
 
 const ROOT = '';
 
+/** Graph root segment; matches `@dxos/plugin-graph` `Node.RootId`. */
+export const GRAPH_ROOT_ID = 'root';
+
+/**
+ * Nest an attendable segment under the graph root so plank context inherits root-level bindings.
+ * An empty/absent segment resolves to the graph root itself.
+ */
+export const nestKeyboardContext = (segment?: string): string =>
+  segment
+    ? segment === GRAPH_ROOT_ID || segment.startsWith(`${GRAPH_ROOT_ID}/`)
+      ? segment
+      : `${GRAPH_ROOT_ID}/${segment}`
+    : GRAPH_ROOT_ID;
+
 /**
  * Manages context-aware key bindings.
  */
@@ -123,10 +137,10 @@ export class Keyboard {
       const isInput =
         tagName === 'INPUT' || tagName === 'TEXTAREA' || (event.target as any)?.getAttribute('contenteditable');
 
-      // Normalized key binding (order matters, see note above).
-      const str = [ctrlKey && 'ctrl', shiftKey && 'shift', altKey && 'alt', metaKey && 'meta', key]
-        .filter(Boolean)
-        .join('+');
+      // Normalized key binding (order and case; see parseShortcut).
+      const str = parseShortcut(
+        [ctrlKey && 'ctrl', shiftKey && 'shift', altKey && 'alt', metaKey && 'meta', key].filter(Boolean).join('+'),
+      );
 
       // Scan matching contexts.
       for (let i = this._contexts.length - 1; i >= 0; --i) {