@next-buildr/editor 2.0.1 → 3.0.0-rc.0

package/dist/shortcuts/actions.js

@@ -1,14 +1,25 @@
 import { createIndex } from '@next-buildr/core';
+import { structureLockedIds } from '../store/index.js';
+import { hasDescendants, overlayOpen, parentSelection } from './navigation.js';
 /** The selected nodes that can be acted on: the root is never removed, duplicated or moved. */
 function actionable(store) {
     const { doc, selectedIds } = store.getState();
     return selectedIds.filter((id) => id !== doc.root && Object.hasOwn(doc.nodes, id));
 }
-function moveSelected(store, delta) {
+/** True (after saying why) when one of the ids is locked for structure: the key is then taken but nothing changes. */
+function refuseLocked(store, ids, notify) {
+    if (structureLockedIds(store.getState().doc, ids).length === 0)
+        return false;
+    notify?.(ids);
+    return true;
+}
+function moveSelected(store, delta, notify) {
     const ids = actionable(store);
     const [id] = ids;
     if (ids.length !== 1 || id === undefined)
         return false;
+    if (refuseLocked(store, ids, notify))
+        return true;
     const { doc } = store.getState();
     const index = createIndex(doc);
     const parentId = index.parentOf[id];
@@ -46,27 +57,71 @@ function selectAll(store) {
  * cannot run (nothing selected, a locked node the command refuses) returns `false`, so the key is
  * not swallowed.
  */
-export function bindEditorActions(registry, store, external = {}) {
+export function bindEditorActions(registry, store, external = {}, host = {}) {
+    /**
+     * Every shortcut but Escape is left alone while a menu, list or dialog is open: the key belongs to
+     * it (Delete must not remove the node behind a dialog, Ctrl+Z is a text field's own undo).
+     */
+    const bind = (action, handler) => registry.bind(action, () => (overlayOpen() ? false : handler()));
+    /** A UI-only key: not taken (`false`) outside the editor or when the host gave no callback. */
+    const ui = (pick) => () => {
+        if (host.uiAllowed?.() === false)
+            return false;
+        const run = pick(host.callbacks?.() ?? {});
+        if (run === undefined)
+            return false;
+        run();
+        return true;
+    };
+    const locked = (ids) => host.onLocked?.()?.(ids);
+    const device = (key) => ui((callbacks) => callbacks.setDevice && (() => callbacks.setDevice?.(key)));
     const stops = [
-        registry.bind('edit.undo', () => store.undo().ok),
-        registry.bind('edit.redo', () => store.redo().ok),
-        registry.bind('edit.duplicate', () => {
+        bind('edit.undo', () => store.undo().ok),
+        bind('edit.redo', () => store.redo().ok),
+        bind('edit.duplicate', () => {
             const ids = actionable(store);
-            return ids.length > 0 && store.dispatch({ type: 'node.duplicate', payload: { ids } }).ok;
+            if (ids.length === 0)
+                return false;
+            if (refuseLocked(store, ids, locked))
+                return true;
+            return store.dispatch({ type: 'node.duplicate', payload: { ids } }).ok;
         }),
-        registry.bind('edit.delete', () => {
+        bind('edit.delete', () => {
             const ids = actionable(store);
-            return ids.length > 0 && store.dispatch({ type: 'node.remove', payload: { ids } }).ok;
+            if (ids.length === 0)
+                return false;
+            if (refuseLocked(store, ids, locked))
+                return true;
+            const onRemove = host.onRemove?.();
+            if (onRemove !== undefined) {
+                onRemove({ ids, hasDescendants: hasDescendants(store.getState().doc, ids) });
+                return true;
+            }
+            return store.dispatch({ type: 'node.remove', payload: { ids } }).ok;
         }),
-        registry.bind('node.moveUp', () => moveSelected(store, -1)),
-        registry.bind('node.moveDown', () => moveSelected(store, 1)),
-        registry.bind('selection.all', () => selectAll(store)),
-        registry.bind('selection.clear', () => {
-            if (store.getState().selectedIds.length === 0)
+        bind('node.moveUp', () => moveSelected(store, -1, locked)),
+        bind('node.moveDown', () => moveSelected(store, 1, locked)),
+        bind('selection.all', () => selectAll(store)),
+        // Escape goes up one level and clears at the top level; an open menu or dialog gets it first.
+        bind('selection.clear', () => {
+            if (overlayOpen())
+                return false;
+            const { doc, selectedIds } = store.getState();
+            if (selectedIds.length === 0)
                 return false;
-            store.clearSelection();
+            const parent = parentSelection(doc, selectedIds);
+            if (parent === null)
+                store.clearSelection();
+            else
+                store.select(parent);
             return true;
         }),
+        bind('ui.device1', device('1')),
+        bind('ui.device2', device('2')),
+        bind('ui.device3', device('3')),
+        bind('ui.panels', ui((callbacks) => callbacks.togglePanels && (() => callbacks.togglePanels?.()))),
+        bind('ui.guides', ui((callbacks) => callbacks.toggleGuides ?? store.view.getState().toggleOutlines)),
+        bind('ui.findBlock', ui((callbacks) => callbacks.focusBlockSearch && (() => callbacks.focusBlockSearch?.()))),
     ];
     const optional = {
         'edit.copy': external.copy,
@@ -76,7 +131,7 @@ export function bindEditorActions(registry, store, external = {}) {
     };
     for (const [action, handler] of Object.entries(optional)) {
         if (handler !== undefined)
-            stops.push(registry.bind(action, handler));
+            stops.push(bind(action, handler));
     }
     return () => {
         for (const stop of stops)

package/dist/shortcuts/help.d.ts

@@ -0,0 +1,11 @@
+import { type Platform } from './keys.ts';
+import type { ShortcutRegistry } from './registry.ts';
+export interface ShortcutsDialogProps {
+    readonly open: boolean;
+    readonly onOpenChange: (open: boolean) => void;
+    readonly registry: ShortcutRegistry;
+    readonly platform: Platform;
+}
+/** The shortcuts dialog (`?`): four groups of rows, one `Kbd` per key, and the note for Mac users. */
+export declare function ShortcutsDialog({ open, onOpenChange, registry, platform }: ShortcutsDialogProps): import("react").JSX.Element;
+//# sourceMappingURL=help.d.ts.map

package/dist/shortcuts/help.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/shortcuts/help.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAgB,KAAK,QAAQ,EAAE,MAAM,WAAW,CAAC;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAqFtD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;IAC/C,QAAQ,CAAC,QAAQ,EAAE,gBAAgB,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;CAC7B;AAED,sGAAsG;AACtG,wBAAgB,eAAe,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,oBAAoB,+BAgC/F"}

package/dist/shortcuts/help.js

@@ -0,0 +1,77 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { useT } from '../messages/index.js';
+import { Dialog, Kbd } from '../ui/index.js';
+import { displayCombo } from './keys.js';
+/** The tokens of an action's first combination; `shift` is dropped before `?`, which already implies it. */
+function tokensOf(registry, action) {
+    const combo = registry.keysFor(action)[0];
+    if (combo === undefined)
+        return undefined;
+    const parts = combo.split('+');
+    return parts.at(-1) === '?' ? ['?'] : parts;
+}
+/** The rows of the help dialog, from the registry (so overrides show) plus the canvas-only keys. */
+function helpGroups(registry) {
+    const row = (label, ...actions) => {
+        const groups = actions.map((action) => tokensOf(registry, action));
+        return groups.every((group) => group !== undefined)
+            ? { label, groups: groups }
+            : undefined;
+    };
+    const copyPaste = row('shortcut.copyPaste', 'edit.copy', 'edit.paste');
+    const device1 = tokensOf(registry, 'ui.device1');
+    const device = device1 === undefined
+        ? undefined
+        : { label: 'shortcut.device', groups: [[...device1, '2', '3']] };
+    const defined = (rows) => rows.filter((entry) => entry !== undefined);
+    return [
+        {
+            id: 'general',
+            title: 'shortcut.group.general',
+            rows: defined([
+                row('shortcut.save', 'file.save'),
+                row('shortcut.undo', 'edit.undo'),
+                row('shortcut.redo', 'edit.redo'),
+                row('shortcut.findBlock', 'ui.findBlock'),
+                row('shortcut.help', 'help.shortcuts'),
+            ]),
+        },
+        {
+            id: 'selection',
+            title: 'shortcut.group.selection',
+            rows: [
+                { label: 'shortcut.selectBlock', groups: [['enter']] },
+                ...defined([row('shortcut.selectAll', 'selection.all')]),
+                ...defined([row('shortcut.selectParent', 'selection.clear')]),
+                { label: 'shortcut.nextBlock', groups: [['tab']] },
+                { label: 'shortcut.prevBlock', groups: [['shift', 'tab']] },
+            ],
+        },
+        {
+            id: 'edit',
+            title: 'shortcut.group.edit',
+            rows: defined([
+                row('shortcut.duplicate', 'edit.duplicate'),
+                row('shortcut.delete', 'edit.delete'),
+                copyPaste,
+                row('shortcut.cut', 'edit.cut'),
+                row('shortcut.moveUp', 'node.moveUp'),
+                row('shortcut.moveDown', 'node.moveDown'),
+            ]),
+        },
+        {
+            id: 'view',
+            title: 'shortcut.group.view',
+            rows: defined([
+                device,
+                row('shortcut.togglePanels', 'ui.panels'),
+                row('shortcut.guides', 'ui.guides'),
+            ]),
+        },
+    ];
+}
+/** The shortcuts dialog (`?`): four groups of rows, one `Kbd` per key, and the note for Mac users. */
+export function ShortcutsDialog({ open, onOpenChange, registry, platform }) {
+    const t = useT();
+    return (_jsx(Dialog, { open: open, onOpenChange: onOpenChange, title: t('shortcut.title'), wide: true, children: _jsxs("div", { className: "bd-shortcut-help", children: [helpGroups(registry).map((group) => (_jsxs("section", { children: [_jsx("h3", { children: t(group.title) }), _jsx("dl", { children: group.rows.map((entry) => (_jsxs("div", { className: "bd-shortcut-row", children: [_jsx("dt", { children: t(entry.label) }), _jsx("dd", { children: entry.groups.map((keys, at) => (_jsxs("span", { children: [at > 0 ? ' / ' : '', keys.map((token, index) => (_jsx(Kbd, { children: displayCombo(token, platform) }, `${token}-${index}`)))] }, keys.join('+')))) })] }, entry.label))) })] }, group.id))), _jsx("p", { children: t('shortcut.macNote') })] }) }));
+}

package/dist/shortcuts/index.d.ts

@@ -1,11 +1,14 @@
-export type { ExternalActions } from './actions.ts';
+export type { ExternalActions, HostHooks } from './actions.ts';
 export { bindEditorActions } from './actions.ts';
+export type { ShortcutsDialogProps } from './help.tsx';
+export { ShortcutsDialog } from './help.tsx';
 export type { KeyInput, Platform } from './keys.ts';
 export { comboOf, detectPlatform, displayCombo, isTypingTarget, normalizeCombo } from './keys.ts';
 export type { ShortcutDef } from './map.ts';
 export { applyOverrides, DEFAULT_SHORTCUTS } from './map.ts';
+export { descendantCount, hasDescendants, overlayOpen, parentSelection } from './navigation.ts';
 export type { ShortcutHandler, ShortcutRegistry, ShortcutRegistryOptions } from './registry.ts';
 export { createShortcutRegistry } from './registry.ts';
 export type { ShortcutProviderProps } from './shortcuts.tsx';
-export { ShortcutProvider, useForwardedKeys, useOptionalShortcutRegistry, useShortcutHint, useShortcutRegistry, } from './shortcuts.tsx';
+export { ShortcutProvider, useForwardedKeys, useOpenShortcuts, useOptionalShortcutRegistry, useShortcutHint, useShortcutRegistry, } from './shortcuts.tsx';
 //# sourceMappingURL=index.d.ts.map

package/dist/shortcuts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shortcuts/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAClG,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7D,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAChG,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,2BAA2B,EAC3B,eAAe,EACf,mBAAmB,GACpB,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shortcuts/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,YAAY,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAClG,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAChG,YAAY,EAAE,eAAe,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAC;AAChG,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACvD,YAAY,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,2BAA2B,EAC3B,eAAe,EACf,mBAAmB,GACpB,MAAM,iBAAiB,CAAC"}

package/dist/shortcuts/index.js

@@ -1,5 +1,7 @@
 export { bindEditorActions } from './actions.js';
+export { ShortcutsDialog } from './help.js';
 export { comboOf, detectPlatform, displayCombo, isTypingTarget, normalizeCombo } from './keys.js';
 export { applyOverrides, DEFAULT_SHORTCUTS } from './map.js';
+export { descendantCount, hasDescendants, overlayOpen, parentSelection } from './navigation.js';
 export { createShortcutRegistry } from './registry.js';
-export { ShortcutProvider, useForwardedKeys, useOptionalShortcutRegistry, useShortcutHint, useShortcutRegistry, } from './shortcuts.js';
+export { ShortcutProvider, useForwardedKeys, useOpenShortcuts, useOptionalShortcutRegistry, useShortcutHint, useShortcutRegistry, } from './shortcuts.js';

package/dist/shortcuts/map.d.ts

@@ -2,7 +2,7 @@ import type { MessageKey } from '../messages/index.tsx';
 export interface ShortcutDef {
     readonly action: string;
     readonly label: MessageKey;
-    readonly group: 'edit' | 'selection' | 'file' | 'help';
+    readonly group: 'general' | 'selection' | 'edit' | 'view';
     /** Canonical combinations (`mod+z`); the first is the one the help dialog shows first. */
     readonly keys: readonly string[];
 }

package/dist/shortcuts/map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../../src/shortcuts/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC;IACvD,0FAA0F;IAC1F,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC;AASD,2EAA2E;AAC3E,eAAO,MAAM,iBAAiB,EAAE,SAAS,WAAW,EAcnD,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAC1C,WAAW,EAAE,CAMf"}
+{"version":3,"file":"map.d.ts","sourceRoot":"","sources":["../../src/shortcuts/map.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAGxD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC;IAC1D,0FAA0F;IAC1F,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC;AASD,2EAA2E;AAC3E,eAAO,MAAM,iBAAiB,EAAE,SAAS,WAAW,EAoBnD,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,SAAS,WAAW,EAAE,EAChC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAC1C,WAAW,EAAE,CAMf"}

package/dist/shortcuts/map.js

@@ -2,19 +2,25 @@ import { normalizeCombo } from './keys.js';
 const def = (action, label, group, ...keys) => ({ action, label, group, keys: keys.map(normalizeCombo) });
 /** The shortcuts of the MVP (docs/editor.md#keyboard-shortcuts-pb-084). */
 export const DEFAULT_SHORTCUTS = [
-    def('edit.undo', 'shortcut.undo', 'edit', 'mod+z'),
-    def('edit.redo', 'shortcut.redo', 'edit', 'mod+shift+z', 'mod+y'),
+    def('file.save', 'shortcut.save', 'general', 'mod+s'),
+    def('edit.undo', 'shortcut.undo', 'general', 'mod+z'),
+    def('edit.redo', 'shortcut.redo', 'general', 'mod+shift+z', 'mod+y'),
+    def('ui.findBlock', 'shortcut.findBlock', 'general', '/'),
+    def('help.shortcuts', 'shortcut.help', 'general', 'shift+?'),
+    def('selection.clear', 'shortcut.selectParent', 'selection', 'escape'),
+    def('selection.all', 'shortcut.selectAll', 'selection', 'mod+a'),
+    def('edit.duplicate', 'shortcut.duplicate', 'edit', 'mod+d'),
+    def('edit.delete', 'shortcut.delete', 'edit', 'delete', 'backspace'),
     def('edit.copy', 'shortcut.copy', 'edit', 'mod+c'),
     def('edit.cut', 'shortcut.cut', 'edit', 'mod+x'),
     def('edit.paste', 'shortcut.paste', 'edit', 'mod+v'),
-    def('edit.duplicate', 'shortcut.duplicate', 'edit', 'mod+d'),
-    def('edit.delete', 'shortcut.delete', 'edit', 'delete', 'backspace'),
     def('node.moveUp', 'shortcut.moveUp', 'edit', 'alt+arrowup'),
     def('node.moveDown', 'shortcut.moveDown', 'edit', 'alt+arrowdown'),
-    def('selection.all', 'shortcut.selectAll', 'selection', 'mod+a'),
-    def('selection.clear', 'shortcut.clearSelection', 'selection', 'escape'),
-    def('file.save', 'shortcut.save', 'file', 'mod+s'),
-    def('help.shortcuts', 'shortcut.help', 'help', 'shift+?'),
+    def('ui.device1', 'shortcut.device', 'view', 'mod+1'),
+    def('ui.device2', 'shortcut.device', 'view', 'mod+2'),
+    def('ui.device3', 'shortcut.device', 'view', 'mod+3'),
+    def('ui.panels', 'shortcut.togglePanels', 'view', 'mod+.'),
+    def('ui.guides', 'shortcut.guides', 'view', 'mod+shift+o'),
 ];
 /**
  * The map with the host's overrides applied (`config.shortcuts`, by action id): an override

package/dist/shortcuts/navigation.d.ts

@@ -0,0 +1,13 @@
+import type { BuilderDocument, NodeId } from '@next-buildr/core';
+/**
+ * What Escape selects: the parent of the first selected node, or `null` when the selection should
+ * be cleared instead (nothing selected, the node is at the top level, or it is not in the
+ * document). The page root is never selected this way.
+ */
+export declare function parentSelection(doc: BuilderDocument, selectedIds: readonly NodeId[]): NodeId | null;
+/** How many nodes lie below `ids` (their own descendants, each counted once; `ids` excluded). */
+export declare function descendantCount(doc: BuilderDocument, ids: readonly NodeId[]): number;
+export declare const hasDescendants: (doc: BuilderDocument, ids: readonly NodeId[]) => boolean;
+/** Whether a menu, list, popover or dialog is open: a key then belongs to it (Escape closes it). */
+export declare function overlayOpen(scope?: ParentNode): boolean;
+//# sourceMappingURL=navigation.d.ts.map

package/dist/shortcuts/navigation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/shortcuts/navigation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEjE;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,eAAe,EACpB,WAAW,EAAE,SAAS,MAAM,EAAE,GAC7B,MAAM,GAAG,IAAI,CAQf;AAED,iGAAiG;AACjG,wBAAgB,eAAe,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAgBpF;AAED,eAAO,MAAM,cAAc,QAAS,eAAe,OAAO,SAAS,MAAM,EAAE,KAAG,OAC/C,CAAC;AAShC,oGAAoG;AACpG,wBAAgB,WAAW,CAAC,KAAK,GAAE,UAAqB,GAAG,OAAO,CAEjE"}

package/dist/shortcuts/navigation.js

@@ -0,0 +1,48 @@
+/**
+ * What Escape selects: the parent of the first selected node, or `null` when the selection should
+ * be cleared instead (nothing selected, the node is at the top level, or it is not in the
+ * document). The page root is never selected this way.
+ */
+export function parentSelection(doc, selectedIds) {
+    const [first] = selectedIds;
+    if (first === undefined || first === doc.root)
+        return null;
+    for (const [id, node] of Object.entries(doc.nodes)) {
+        if (id === doc.root)
+            continue;
+        if (Object.values(node.slots ?? {}).some((children) => children.includes(first)))
+            return id;
+    }
+    return null;
+}
+/** How many nodes lie below `ids` (their own descendants, each counted once; `ids` excluded). */
+export function descendantCount(doc, ids) {
+    const own = new Set(ids);
+    const seen = new Set();
+    const stack = [...ids];
+    while (stack.length > 0) {
+        const id = stack.pop();
+        if (id === undefined)
+            continue;
+        for (const children of Object.values(doc.nodes[id]?.slots ?? {})) {
+            for (const child of children) {
+                if (seen.has(child) || own.has(child) || !Object.hasOwn(doc.nodes, child))
+                    continue;
+                seen.add(child);
+                stack.push(child);
+            }
+        }
+    }
+    return seen.size;
+}
+export const hasDescendants = (doc, ids) => descendantCount(doc, ids) > 0;
+const OVERLAY_SELECTOR = [
+    '[role="menu"][data-state="open"]',
+    '[role="listbox"][data-state="open"]',
+    '[role="dialog"][data-state="open"]',
+    '[role="alertdialog"][data-state="open"]',
+].join(', ');
+/** Whether a menu, list, popover or dialog is open: a key then belongs to it (Escape closes it). */
+export function overlayOpen(scope = document) {
+    return scope.querySelector(OVERLAY_SELECTOR) !== null;
+}

package/dist/shortcuts/shortcuts.d.ts

@@ -1,7 +1,14 @@
 import { type ReactNode } from 'react';
+import type { RemoveRequest, ShortcutCallbacks } from '../app/contracts.ts';
 import { type ExternalActions } from './actions.ts';
 import { type KeyInput, type Platform } from './keys.ts';
 import { type ShortcutRegistry } from './registry.ts';
+/**
+ * Opens the shortcuts dialog directly (the host's `openShortcuts` callback, else the built-in
+ * dialog), without going through a key combination another action may have taken. `undefined`
+ * outside a `<ShortcutProvider>`.
+ */
+export declare function useOpenShortcuts(): (() => void) | undefined;
 /** The registry of the enclosing `<ShortcutProvider>`, or `undefined` outside one (a toolbar shown without shortcuts). */
 export declare function useOptionalShortcutRegistry(): ShortcutRegistry | undefined;
 /** The registry of the enclosing `<ShortcutProvider>`, for modules that bind actions of their own. */
@@ -18,6 +25,10 @@ export interface ShortcutProviderProps {
     /** The actions other modules provide: clipboard (PB-085) and save (PB-087). */
     readonly actions?: ExternalActions;
     readonly platform?: Platform;
+    /** The shortcuts that change only the UI (device, panels, outlines, search, help); missing ones do nothing. */
+    readonly callbacks?: Partial<ShortcutCallbacks>;
+    /** Called instead of removing on Delete/Backspace, so the host can confirm or offer Undo. */
+    readonly onRemove?: (request: RemoveRequest) => void;
     readonly children: ReactNode;
 }
 /**
@@ -26,7 +37,7 @@ export interface ShortcutProviderProps {
  * A key press whose focus is in a text field is never handled, and a handled one gets
  * `preventDefault`, so the browser does not also act on it.
  */
-export declare function ShortcutProvider({ overrides, actions, platform, children, }: ShortcutProviderProps): import("react").JSX.Element;
+export declare function ShortcutProvider({ overrides, actions, platform, callbacks, onRemove, children, }: ShortcutProviderProps): import("react").JSX.Element;
 /** How the first key of `action` is written on this platform (`Ctrl+Z`), for tooltips; `undefined` when it has none. */
 export declare function useShortcutHint(action: string): string | undefined;
 //# sourceMappingURL=shortcuts.d.ts.map

package/dist/shortcuts/shortcuts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shortcuts.d.ts","sourceRoot":"","sources":["../../src/shortcuts/shortcuts.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EAMf,MAAM,OAAO,CAAC;AAIf,OAAO,EAAqB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACvE,OAAO,EAIL,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,WAAW,CAAC;AACnB,OAAO,EAA0B,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAI9E,0HAA0H;AAC1H,wBAAgB,2BAA2B,IAAI,gBAAgB,GAAG,SAAS,CAE1E;AAED,sGAAsG;AACtG,wBAAgB,mBAAmB,IAAI,gBAAgB,CAMtD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,CAAC,KAAK,EAAE,QAAQ,KAAK,OAAO,CAG/D;AAED,MAAM,WAAW,qBAAqB;IACpC,mDAAmD;IACnD,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD,+EAA+E;IAC/E,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;CAC9B;AAOD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,SAAS,EACT,OAAO,EACP,QAAQ,EACR,QAAQ,GACT,EAAE,qBAAqB,+BAkFvB;AAED,wHAAwH;AACxH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMlE"}
+{"version":3,"file":"shortcuts.d.ts","sourceRoot":"","sources":["../../src/shortcuts/shortcuts.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,SAAS,EAOf,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG5E,OAAO,EAAqB,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AAEvE,OAAO,EAIL,KAAK,QAAQ,EACb,KAAK,QAAQ,EACd,MAAM,WAAW,CAAC;AAEnB,OAAO,EAA0B,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAK9E;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAE3D;AAeD,0HAA0H;AAC1H,wBAAgB,2BAA2B,IAAI,gBAAgB,GAAG,SAAS,CAE1E;AAED,sGAAsG;AACtG,wBAAgB,mBAAmB,IAAI,gBAAgB,CAMtD;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,IAAI,CAAC,KAAK,EAAE,QAAQ,KAAK,OAAO,CAG/D;AAED,MAAM,WAAW,qBAAqB;IACpC,mDAAmD;IACnD,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACtD,+EAA+E;IAC/E,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAC7B,+GAA+G;IAC/G,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChD,6FAA6F;IAC7F,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,aAAa,KAAK,IAAI,CAAC;IACrD,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC;CAC9B;AAOD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,SAAS,EACT,OAAO,EACP,QAAQ,EACR,SAAS,EACT,QAAQ,EACR,QAAQ,GACT,EAAE,qBAAqB,+BAwFvB;AAED,wHAAwH;AACxH,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMlE"}

package/dist/shortcuts/shortcuts.js

@@ -1,12 +1,33 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { createContext, useContext, useEffect, useMemo, useRef, useState, } from 'react';
-import { useT } from '../messages/index.js';
+import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState, } from 'react';
 import { useEditor } from '../store/index.js';
-import { Dialog } from '../ui/index.js';
+import { useStructureLockedNotice } from '../ui/structure-locked.js';
 import { bindEditorActions } from './actions.js';
+import { ShortcutsDialog } from './help.js';
 import { detectPlatform, displayCombo, isTypingTarget, } from './keys.js';
+import { overlayOpen } from './navigation.js';
 import { createShortcutRegistry } from './registry.js';
 const RegistryContext = createContext(undefined);
+const OpenShortcutsContext = createContext(undefined);
+/**
+ * Opens the shortcuts dialog directly (the host's `openShortcuts` callback, else the built-in
+ * dialog), without going through a key combination another action may have taken. `undefined`
+ * outside a `<ShortcutProvider>`.
+ */
+export function useOpenShortcuts() {
+    return useContext(OpenShortcutsContext);
+}
+const EDITOR_ROOT = '.buildr-editor';
+const OWN_KEYS = '[role="dialog"], [role="alertdialog"], [role="menu"], [role="listbox"]';
+const inOverlay = (target) => target instanceof Element && target.closest(OWN_KEYS) !== null;
+/** Whether a key press is aimed at a control of the host page outside the editor (body and the document are not). */
+function outsideEditor(target) {
+    if (!(target instanceof Element))
+        return false;
+    if (target === document.body || target === document.documentElement)
+        return false;
+    return target.closest(EDITOR_ROOT) === null;
+}
 /** The registry of the enclosing `<ShortcutProvider>`, or `undefined` outside one (a toolbar shown without shortcuts). */
 export function useOptionalShortcutRegistry() {
     return useContext(RegistryContext);
@@ -38,24 +59,39 @@ const toInput = (event) => ({
  * A key press whose focus is in a text field is never handled, and a handled one gets
  * `preventDefault`, so the browser does not also act on it.
  */
-export function ShortcutProvider({ overrides, actions, platform, children, }) {
+export function ShortcutProvider({ overrides, actions, platform, callbacks, onRemove, children, }) {
     const store = useEditor();
-    const t = useT();
+    const notifyLocked = useStructureLockedNotice();
     const [helpOpen, setHelpOpen] = useState(false);
     const detected = useMemo(() => platform ?? detectPlatform(), [platform]);
     const registry = useMemo(() => createShortcutRegistry({ platform: detected, overrides: overrides ?? {} }), [detected, overrides]);
     // The handlers read the latest actions without rebinding on every render.
     const external = useRef({});
     external.current = actions ?? {};
+    const host = useRef({ callbacks, onRemove, notifyLocked });
+    host.current = { callbacks, onRemove, notifyLocked };
+    // Set while a key press aimed outside the editor is handled: the UI-only keys then stay out of it.
+    const outside = useRef(false);
     useEffect(() => {
         const unbind = bindEditorActions(registry, store, {
             copy: () => external.current.copy?.() ?? false,
             cut: () => external.current.cut?.() ?? false,
             paste: () => external.current.paste?.() ?? false,
             save: () => external.current.save?.() ?? false,
+        }, {
+            callbacks: () => host.current.callbacks,
+            onRemove: () => host.current.onRemove,
+            uiAllowed: () => !outside.current,
+            onLocked: () => host.current.notifyLocked,
         });
         const unbindHelp = registry.bind('help.shortcuts', () => {
-            setHelpOpen(true);
+            if (overlayOpen())
+                return false;
+            const open = host.current.callbacks?.openShortcuts;
+            if (open === undefined)
+                setHelpOpen(true);
+            else
+                open();
             return true;
         });
         return () => {
@@ -70,20 +106,31 @@ export function ShortcutProvider({ overrides, actions, platform, children, }) {
         const onKeyDown = (event) => {
             if (event.defaultPrevented || event.isComposing)
                 return;
-            const handled = registry.handle(toInput(event), { typing: isTypingTarget(event.target) });
+            // A dialog, menu or list keeps its own keys (Delete, Ctrl+Z); Escape is its own to handle.
+            if (inOverlay(event.target))
+                return;
+            outside.current = outsideEditor(event.target);
+            let handled;
+            try {
+                handled = registry.handle(toInput(event), { typing: isTypingTarget(event.target) });
+            }
+            finally {
+                outside.current = false;
+            }
             if (handled)
                 event.preventDefault();
         };
         document.addEventListener('keydown', onKeyDown);
         return () => document.removeEventListener('keydown', onKeyDown);
     }, [registry]);
-    const groups = ['edit', 'selection', 'file', 'help'].map((group) => ({
-        group,
-        items: registry.shortcuts.filter((shortcut) => shortcut.group === group && shortcut.keys.length > 0),
-    }));
-    return (_jsxs(RegistryContext.Provider, { value: registry, children: [children, _jsx(Dialog, { open: helpOpen, onOpenChange: setHelpOpen, title: t('shortcut.title'), children: _jsx("div", { className: "bd-shortcut-help", children: groups
-                        .filter(({ items }) => items.length > 0)
-                        .map(({ group, items }) => (_jsxs("section", { children: [_jsx("h4", { children: t(`shortcut.group.${group}`) }), _jsx("dl", { children: items.map((shortcut) => (_jsxs("div", { className: "bd-shortcut-row", children: [_jsx("dt", { children: t(shortcut.label) }), _jsx("dd", { children: shortcut.keys.map((combo, index) => (_jsxs("span", { children: [index > 0 ? ' / ' : '', _jsx("kbd", { children: displayCombo(combo, detected) })] }, combo))) })] }, shortcut.action))) })] }, group))) }) })] }));
+    const openShortcuts = useCallback(() => {
+        const open = host.current.callbacks?.openShortcuts;
+        if (open === undefined)
+            setHelpOpen(true);
+        else
+            open();
+    }, []);
+    return (_jsx(RegistryContext.Provider, { value: registry, children: _jsxs(OpenShortcutsContext.Provider, { value: openShortcuts, children: [children, _jsx(ShortcutsDialog, { open: helpOpen, onOpenChange: setHelpOpen, registry: registry, platform: detected })] }) }));
 }
 /** How the first key of `action` is written on this platform (`Ctrl+Z`), for tooltips; `undefined` when it has none. */
 export function useShortcutHint(action) {