quilt-vanilla 0.3.0 → 0.4.0

package/dist/actions.d.ts

@@ -0,0 +1,14 @@
+import type { Group, Pane } from 'quilt-core';
+import type { ActionContext, ResolvedLayoutOptions, WorkspaceAction } from './types.js';
+export declare function createActions(options: ResolvedLayoutOptions, dependencies: {
+    context(): ActionContext;
+    disposed(): boolean;
+    create(action: WorkspaceAction, group: Group, pane: Pane | undefined): void;
+    close(id: string, kind?: 'pane' | 'group'): Promise<boolean>;
+    popout(id: string): Promise<boolean>;
+    report(error: unknown): void;
+}): {
+    canExecuteAction: (action: WorkspaceAction, context?: ActionContext) => boolean;
+    executeAction: (action: WorkspaceAction, context?: ActionContext) => Promise<boolean>;
+};
+//# sourceMappingURL=actions.d.ts.map

package/dist/actions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,aAAa,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGxF,wBAAgB,aAAa,CAC3B,OAAO,EAAE,qBAAqB,EAC9B,YAAY,EAAE;IACZ,OAAO,IAAI,aAAa,CAAC;IACzB,QAAQ,IAAI,OAAO,CAAC;IACpB,MAAM,CAAC,MAAM,EAAE,eAAe,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,IAAI,CAAC;IAC5E,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7D,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;CAC9B;+BAsBiC,eAAe,YAAY,aAAa,KAAG,OAAO;4BAgC/C,eAAe,YAAY,aAAa,KAAG,OAAO,CAAC,OAAO,CAAC;EAwDjG"}

package/dist/actions.js

@@ -0,0 +1,115 @@
+import { findNode, findParent, groups, paneIds } from 'quilt-core';
+import { actionOrder } from './shortcut-registration.js';
+export function createActions(options, dependencies) {
+    function resolve(context) {
+        const layout = options.store.getSnapshot();
+        const target = context?.groupId !== undefined || context?.paneId !== undefined
+            ? context
+            : dependencies.context();
+        const id = target.groupId ??
+            (target.paneId === undefined
+                ? undefined
+                : groups(layout.root).find((group) => group.panes.includes(target.paneId))?.id);
+        const node = id === undefined ? undefined : findNode(layout.root, id);
+        const group = node?.kind === 'group' ? node : undefined;
+        const paneId = target.paneId ?? group?.active;
+        const pane = paneId ? layout.panes[paneId] : undefined;
+        const valid = !(target.groupId !== undefined && !group) &&
+            !(target.paneId !== undefined && (!pane || !group?.panes.includes(target.paneId)));
+        return { layout, group, pane, valid };
+    }
+    function canExecuteAction(action, context) {
+        if (dependencies.disposed() || !actionOrder.includes(action))
+            return false;
+        const { layout, group, pane, valid } = resolve(context);
+        if (!valid)
+            return false;
+        if (action === 'restoreClosedTab')
+            return options.store.canRestoreClosedTab();
+        if (!group)
+            return false;
+        const allowed = (cap) => group.panes.every((id) => options.store.can(id, cap));
+        switch (action) {
+            case 'addTab':
+                return !!options.tabs?.list().length && allowed('move');
+            case 'splitLeft':
+            case 'splitRight':
+            case 'splitUp':
+            case 'splitDown':
+                return (!group.panes.length || !!options.tabs?.list().length) && allowed('split');
+            case 'closeActiveTab':
+                return !!pane && options.store.can(pane.id, 'close');
+            case 'closePane':
+                return !!group.panes.length && allowed('close');
+            case 'closeEmptyPane':
+                return !group.panes.length && group.id !== layout.root.id;
+            case 'popout':
+                return options.popouts !== false && !!pane && options.store.can(pane.id, 'popout');
+            case 'joinSiblingRegion': {
+                const parent = findParent(layout.root, group.id);
+                return !!parent && paneIds(parent).every((id) => options.store.can(id, 'join'));
+            }
+            default:
+                return true;
+        }
+    }
+    async function executeAction(action, context) {
+        try {
+            if (!canExecuteAction(action, context))
+                return false;
+            const { layout, group, pane } = resolve(context);
+            switch (action) {
+                case 'restoreClosedTab':
+                    options.store.restoreClosedTab();
+                    break;
+                case 'maximize':
+                    options.store.maximize(layout.maximized === group.id ? null : group.id);
+                    break;
+                case 'addTab':
+                case 'splitLeft':
+                case 'splitRight':
+                case 'splitUp':
+                case 'splitDown':
+                    dependencies.create(action, group, pane);
+                    break;
+                case 'closeActiveTab':
+                    return await dependencies.close(pane.id);
+                case 'closePane':
+                    return await dependencies.close(group.id, 'group');
+                case 'closeEmptyPane':
+                    options.store.removeEmptyGroup(group.id);
+                    break;
+                case 'popout':
+                    return await dependencies.popout(pane.id);
+                case 'joinSiblingRegion':
+                    options.store.join(group.id, { source: 'user' });
+                    break;
+                case 'tabOrientationDefault':
+                    options.store.setTabPlacement(group.id, undefined);
+                    break;
+                case 'tabOrientationHorizontal':
+                    options.store.setTabPlacement(group.id, 'top');
+                    break;
+                case 'tabOrientationVertical':
+                    options.store.setTabPlacement(group.id, 'left');
+                    break;
+                case 'tabDisplayDefault':
+                    options.store.setTabDisplay(group.id, undefined);
+                    break;
+                case 'tabDisplayAutomatic':
+                    options.store.setTabDisplay(group.id, 'automatic');
+                    break;
+                case 'tabDisplayCompact':
+                    options.store.setTabDisplay(group.id, 'compact');
+                    break;
+            }
+            return true;
+        }
+        catch (error) {
+            dependencies.report(error);
+            return false;
+        }
+    }
+    return { canExecuteAction, executeAction };
+}
+//# sourceMappingURL=actions.js.map

package/dist/actions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"actions.js","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAGnE,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD,MAAM,UAAU,aAAa,CAC3B,OAA8B,EAC9B,YAOC;IAED,SAAS,OAAO,CAAC,OAAuB;QACtC,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,MAAM,GACV,OAAO,EAAE,OAAO,KAAK,SAAS,IAAI,OAAO,EAAE,MAAM,KAAK,SAAS;YAC7D,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC7B,MAAM,EAAE,GACN,MAAM,CAAC,OAAO;YACd,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS;gBAC1B,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACrF,MAAM,IAAI,GAAG,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QACxD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,EAAE,MAAM,CAAC;QAC9C,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACvD,MAAM,KAAK,GACT,CAAC,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC;YACzC,CAAC,CAAC,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACrF,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IACxC,CAAC;IACD,SAAS,gBAAgB,CAAC,MAAuB,EAAE,OAAuB;QACxE,IAAI,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC;QAC3E,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QACzB,IAAI,MAAM,KAAK,kBAAkB;YAAE,OAAO,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC;QAC9E,IAAI,CAAC,KAAK;YAAE,OAAO,KAAK,CAAC;QACzB,MAAM,OAAO,GAAG,CAAC,GAA+B,EAAE,EAAE,CAClD,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;QACxD,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,QAAQ;gBACX,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC;YAC1D,KAAK,WAAW,CAAC;YACjB,KAAK,YAAY,CAAC;YAClB,KAAK,SAAS,CAAC;YACf,KAAK,WAAW;gBACd,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;YACpF,KAAK,gBAAgB;gBACnB,OAAO,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YACvD,KAAK,WAAW;gBACd,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;YAClD,KAAK,gBAAgB;gBACnB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,EAAE,KAAK,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAC5D,KAAK,QAAQ;gBACX,OAAO,OAAO,CAAC,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;YACrF,KAAK,mBAAmB,EAAE,CAAC;gBACzB,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;gBACjD,OAAO,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;YAClF,CAAC;YACD;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC;IACD,KAAK,UAAU,aAAa,CAAC,MAAuB,EAAE,OAAuB;QAC3E,IAAI,CAAC;YACH,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC;gBAAE,OAAO,KAAK,CAAC;YACrD,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;YACjD,QAAQ,MAAM,EAAE,CAAC;gBACf,KAAK,kBAAkB;oBACrB,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;oBACjC,MAAM;gBACR,KAAK,UAAU;oBACb,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,KAAK,KAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAM,CAAC,EAAE,CAAC,CAAC;oBAC1E,MAAM;gBACR,KAAK,QAAQ,CAAC;gBACd,KAAK,WAAW,CAAC;gBACjB,KAAK,YAAY,CAAC;gBAClB,KAAK,SAAS,CAAC;gBACf,KAAK,WAAW;oBACd,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,KAAM,EAAE,IAAI,CAAC,CAAC;oBAC1C,MAAM;gBACR,KAAK,gBAAgB;oBACnB,OAAO,MAAM,YAAY,CAAC,KAAK,CAAC,IAAK,CAAC,EAAE,CAAC,CAAC;gBAC5C,KAAK,WAAW;oBACd,OAAO,MAAM,YAAY,CAAC,KAAK,CAAC,KAAM,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;gBACtD,KAAK,gBAAgB;oBACnB,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAM,CAAC,EAAE,CAAC,CAAC;oBAC1C,MAAM;gBACR,KAAK,QAAQ;oBACX,OAAO,MAAM,YAAY,CAAC,MAAM,CAAC,IAAK,CAAC,EAAE,CAAC,CAAC;gBAC7C,KAAK,mBAAmB;oBACtB,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,KAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;oBAClD,MAAM;gBACR,KAAK,uBAAuB;oBAC1B,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAM,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;oBACpD,MAAM;gBACR,KAAK,0BAA0B;oBAC7B,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;oBAChD,MAAM;gBACR,KAAK,wBAAwB;oBAC3B,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,KAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;oBACjD,MAAM;gBACR,KAAK,mBAAmB;oBACtB,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,KAAM,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;oBAClD,MAAM;gBACR,KAAK,qBAAqB;oBACxB,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,KAAM,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC;oBACpD,MAAM;gBACR,KAAK,mBAAmB;oBACtB,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,KAAM,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;oBAClD,MAAM;YACV,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC3B,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,CAAC;AAC7C,CAAC","sourcesContent":["import { findNode, findParent, groups, paneIds } from 'quilt-core';\nimport type { Group, Pane } from 'quilt-core';\nimport type { ActionContext, ResolvedLayoutOptions, WorkspaceAction } from './types.js';\nimport { actionOrder } from './shortcut-registration.js';\n\nexport function createActions(\n  options: ResolvedLayoutOptions,\n  dependencies: {\n    context(): ActionContext;\n    disposed(): boolean;\n    create(action: WorkspaceAction, group: Group, pane: Pane | undefined): void;\n    close(id: string, kind?: 'pane' | 'group'): Promise<boolean>;\n    popout(id: string): Promise<boolean>;\n    report(error: unknown): void;\n  },\n) {\n  function resolve(context?: ActionContext) {\n    const layout = options.store.getSnapshot();\n    const target =\n      context?.groupId !== undefined || context?.paneId !== undefined\n        ? context\n        : dependencies.context();\n    const id =\n      target.groupId ??\n      (target.paneId === undefined\n        ? undefined\n        : groups(layout.root).find((group) => group.panes.includes(target.paneId!))?.id);\n    const node = id === undefined ? undefined : findNode(layout.root, id);\n    const group = node?.kind === 'group' ? node : undefined;\n    const paneId = target.paneId ?? group?.active;\n    const pane = paneId ? layout.panes[paneId] : undefined;\n    const valid =\n      !(target.groupId !== undefined && !group) &&\n      !(target.paneId !== undefined && (!pane || !group?.panes.includes(target.paneId)));\n    return { layout, group, pane, valid };\n  }\n  function canExecuteAction(action: WorkspaceAction, context?: ActionContext): boolean {\n    if (dependencies.disposed() || !actionOrder.includes(action)) return false;\n    const { layout, group, pane, valid } = resolve(context);\n    if (!valid) return false;\n    if (action === 'restoreClosedTab') return options.store.canRestoreClosedTab();\n    if (!group) return false;\n    const allowed = (cap: 'split' | 'move' | 'close') =>\n      group.panes.every((id) => options.store.can(id, cap));\n    switch (action) {\n      case 'addTab':\n        return !!options.tabs?.list().length && allowed('move');\n      case 'splitLeft':\n      case 'splitRight':\n      case 'splitUp':\n      case 'splitDown':\n        return (!group.panes.length || !!options.tabs?.list().length) && allowed('split');\n      case 'closeActiveTab':\n        return !!pane && options.store.can(pane.id, 'close');\n      case 'closePane':\n        return !!group.panes.length && allowed('close');\n      case 'closeEmptyPane':\n        return !group.panes.length && group.id !== layout.root.id;\n      case 'popout':\n        return options.popouts !== false && !!pane && options.store.can(pane.id, 'popout');\n      case 'joinSiblingRegion': {\n        const parent = findParent(layout.root, group.id);\n        return !!parent && paneIds(parent).every((id) => options.store.can(id, 'join'));\n      }\n      default:\n        return true;\n    }\n  }\n  async function executeAction(action: WorkspaceAction, context?: ActionContext): Promise<boolean> {\n    try {\n      if (!canExecuteAction(action, context)) return false;\n      const { layout, group, pane } = resolve(context);\n      switch (action) {\n        case 'restoreClosedTab':\n          options.store.restoreClosedTab();\n          break;\n        case 'maximize':\n          options.store.maximize(layout.maximized === group!.id ? null : group!.id);\n          break;\n        case 'addTab':\n        case 'splitLeft':\n        case 'splitRight':\n        case 'splitUp':\n        case 'splitDown':\n          dependencies.create(action, group!, pane);\n          break;\n        case 'closeActiveTab':\n          return await dependencies.close(pane!.id);\n        case 'closePane':\n          return await dependencies.close(group!.id, 'group');\n        case 'closeEmptyPane':\n          options.store.removeEmptyGroup(group!.id);\n          break;\n        case 'popout':\n          return await dependencies.popout(pane!.id);\n        case 'joinSiblingRegion':\n          options.store.join(group!.id, { source: 'user' });\n          break;\n        case 'tabOrientationDefault':\n          options.store.setTabPlacement(group!.id, undefined);\n          break;\n        case 'tabOrientationHorizontal':\n          options.store.setTabPlacement(group!.id, 'top');\n          break;\n        case 'tabOrientationVertical':\n          options.store.setTabPlacement(group!.id, 'left');\n          break;\n        case 'tabDisplayDefault':\n          options.store.setTabDisplay(group!.id, undefined);\n          break;\n        case 'tabDisplayAutomatic':\n          options.store.setTabDisplay(group!.id, 'automatic');\n          break;\n        case 'tabDisplayCompact':\n          options.store.setTabDisplay(group!.id, 'compact');\n          break;\n      }\n      return true;\n    } catch (error) {\n      dependencies.report(error);\n      return false;\n    }\n  }\n  return { canExecuteAction, executeAction };\n}\n"]}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { Workspace } from './workspace-api.js';
 export type { WorkspaceHandle, WorkspaceOptions, WorkspaceOptionUpdates, WorkspaceEvents, WorkspaceChange, PaneHandle, PaneType, PaneTypes, AddPaneOptions, CloseOptions, } from './workspace-api.js';
-export type { PaneContext, PaneView, PaneRenderer, TabBarStyle, TabBarOptions, InitialConfiguration, WorkspaceSettings, KeyBinding, CloseRequest, } from './types.js';
+export type { PaneContext, PaneView, PaneRenderer, TabBarStyle, TabBarOptions, InitialConfiguration, WorkspaceSettings, KeyBinding, WorkspaceAction, ActionContext, RegisteredShortcut, ShortcutRegistration, CloseRequest, } from './types.js';
 export { TabRegistry } from './registry.js';
 export type { TabRegistration } from './registry.js';
 export { themes, themeFamilies } from './theme.js';
@@ -14,4 +14,5 @@ export type { WorkspacePreset } from './workspace.js';
 export { themeProperties } from './theme.js';
 export { defaultMessages } from './messages.js';
 export type { Messages } from './messages.js';
+export { formatShortcut } from './shortcut-registration.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,YAAY,EACV,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,EACf,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,EACT,cAAc,EACd,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EACV,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,aAAa,EACb,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,YAAY,GACb,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACnD,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC9E,YAAY,EACV,YAAY,EACZ,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,KAAK,EACL,IAAI,EACJ,eAAe,EACf,MAAM,EACN,MAAM,IAAI,cAAc,EACxB,KAAK,EACL,cAAc,EACd,MAAM,EACN,MAAM,EACN,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5D,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,YAAY,EACV,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,EACf,eAAe,EACf,UAAU,EACV,QAAQ,EACR,SAAS,EACT,cAAc,EACd,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,YAAY,EACV,WAAW,EACX,QAAQ,EACR,YAAY,EACZ,WAAW,EACX,aAAa,EACb,oBAAoB,EACpB,iBAAiB,EACjB,UAAU,EACV,eAAe,EACf,aAAa,EACb,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,GACb,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACnD,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC9E,YAAY,EACV,YAAY,EACZ,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,IAAI,EACJ,KAAK,EACL,KAAK,EACL,IAAI,EACJ,eAAe,EACf,MAAM,EACN,MAAM,IAAI,cAAc,EACxB,KAAK,EACL,cAAc,EACd,MAAM,EACN,MAAM,EACN,WAAW,GACZ,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,YAAY,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5D,YAAY,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAE9C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC"}

package/dist/index.js

@@ -6,4 +6,5 @@ export { PaneRegistry } from './registry.js';
 export { parseWorkspace, dockLayout } from './workspace.js';
 export { themeProperties } from './theme.js';
 export { defaultMessages } from './messages.js';
+export { formatShortcut } from './shortcut-registration.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAyB/C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAmB9E,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC","sourcesContent":["export { Workspace } from './workspace-api.js';\nexport type {\n  WorkspaceHandle,\n  WorkspaceOptions,\n  WorkspaceOptionUpdates,\n  WorkspaceEvents,\n  WorkspaceChange,\n  PaneHandle,\n  PaneType,\n  PaneTypes,\n  AddPaneOptions,\n  CloseOptions,\n} from './workspace-api.js';\nexport type {\n  PaneContext,\n  PaneView,\n  PaneRenderer,\n  TabBarStyle,\n  TabBarOptions,\n  InitialConfiguration,\n  WorkspaceSettings,\n  KeyBinding,\n  CloseRequest,\n} from './types.js';\n\nexport { TabRegistry } from './registry.js';\nexport type { TabRegistration } from './registry.js';\nexport { themes, themeFamilies } from './theme.js';\nexport type { LayoutTheme } from './theme.js';\nexport { LayoutError, createLayout, parseLayout, validate } from 'quilt-core';\nexport type {\n  AutoCollapse,\n  Json,\n  Capability,\n  Axis,\n  Pane,\n  Group,\n  Split,\n  Node,\n  WindowPlacement,\n  Popout,\n  Layout as LayoutSnapshot,\n  Issue,\n  CommandOptions,\n  Change,\n  Bounds,\n  JoinOptions,\n} from 'quilt-core';\nexport { PaneRegistry } from './registry.js';\nexport type { PaneRegistration } from './registry.js';\nexport { parseWorkspace, dockLayout } from './workspace.js';\nexport type { WorkspacePreset } from './workspace.js';\nexport { themeProperties } from './theme.js';\nexport { defaultMessages } from './messages.js';\nexport type { Messages } from './messages.js';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AA6B/C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAmB9E,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAGhD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC","sourcesContent":["export { Workspace } from './workspace-api.js';\nexport type {\n  WorkspaceHandle,\n  WorkspaceOptions,\n  WorkspaceOptionUpdates,\n  WorkspaceEvents,\n  WorkspaceChange,\n  PaneHandle,\n  PaneType,\n  PaneTypes,\n  AddPaneOptions,\n  CloseOptions,\n} from './workspace-api.js';\nexport type {\n  PaneContext,\n  PaneView,\n  PaneRenderer,\n  TabBarStyle,\n  TabBarOptions,\n  InitialConfiguration,\n  WorkspaceSettings,\n  KeyBinding,\n  WorkspaceAction,\n  ActionContext,\n  RegisteredShortcut,\n  ShortcutRegistration,\n  CloseRequest,\n} from './types.js';\n\nexport { TabRegistry } from './registry.js';\nexport type { TabRegistration } from './registry.js';\nexport { themes, themeFamilies } from './theme.js';\nexport type { LayoutTheme } from './theme.js';\nexport { LayoutError, createLayout, parseLayout, validate } from 'quilt-core';\nexport type {\n  AutoCollapse,\n  Json,\n  Capability,\n  Axis,\n  Pane,\n  Group,\n  Split,\n  Node,\n  WindowPlacement,\n  Popout,\n  Layout as LayoutSnapshot,\n  Issue,\n  CommandOptions,\n  Change,\n  Bounds,\n  JoinOptions,\n} from 'quilt-core';\nexport { PaneRegistry } from './registry.js';\nexport type { PaneRegistration } from './registry.js';\nexport { parseWorkspace, dockLayout } from './workspace.js';\nexport type { WorkspacePreset } from './workspace.js';\nexport { themeProperties } from './theme.js';\nexport { defaultMessages } from './messages.js';\nexport type { Messages } from './messages.js';\n\nexport { formatShortcut } from './shortcut-registration.js';\n"]}

package/dist/menu.d.ts

@@ -1,7 +1,13 @@
 import type { Group, Pane } from 'quilt-core';
-import type { ResolvedLayoutOptions } from './types.js';
-import type { Windows } from './windows.js';
-export declare function createPaneMenu(root: HTMLElement, options: ResolvedLayoutOptions, windows: Pick<Windows, 'open'>, refresh: () => void, report: (e: unknown) => void, requestClose: (id: string, kind?: 'pane' | 'group') => Promise<boolean>): {
+import type { ResolvedLayoutOptions, ActionContext } from './types.js';
+import type { createActions } from './actions.js';
+export declare function createPaneMenu(root: HTMLElement, options: ResolvedLayoutOptions, refresh: () => void, report: (e: unknown) => void, actions: ReturnType<typeof createActions>): {
+    getShortcutTarget: () => {
+        dialog: HTMLDialogElement;
+        context: ActionContext;
+        close(): void;
+    } | undefined;
+    refreshShortcuts: () => void;
     open: (anchor: HTMLElement, pane: Pane | undefined, group: Group, direction?: 'left' | 'right' | 'top' | 'bottom', ratio?: number, groupActions?: boolean, addTab?: boolean) => void;
     addTab(anchor: HTMLElement, group: Group): void;
     openEmpty(anchor: HTMLElement, group: Group): void;

package/dist/menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu.d.ts","sourceRoot":"","sources":["../src/menu.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AACxD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C,wBAAgB,cAAc,CAC5B,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,EAC9B,OAAO,EAAE,MAAM,IAAI,EACnB,MAAM,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,EAC5B,YAAY,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC;mBAsB7D,WAAW,QACb,IAAI,GAAG,SAAS,SACf,KAAK,cACA,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ;mBAybhC,WAAW,SAAS,KAAK;sBAYtB,WAAW,SAAS,KAAK;;EAW9C"}
+{"version":3,"file":"menu.d.ts","sourceRoot":"","sources":["../src/menu.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,qBAAqB,EAAmB,aAAa,EAAE,MAAM,YAAY,CAAC;AACxF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGlD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,qBAAqB,EAC9B,OAAO,EAAE,MAAM,IAAI,EACnB,MAAM,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,IAAI,EAC5B,OAAO,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC;;gBAM7B,iBAAiB;iBAAW,aAAa;iBAAW,IAAI;;;mBAkB1D,WAAW,QACb,IAAI,GAAG,SAAS,SACf,KAAK,cACA,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,QAAQ;mBAugBhC,WAAW,SAAS,KAAK;sBAYtB,WAAW,SAAS,KAAK;;EAW9C"}

package/dist/menu.js

@@ -2,10 +2,13 @@ import { message } from './messages.js';
 import { actionIcon } from './action-icons.js';
 import { fillTabPicker } from './picker.js';
 import { findNode, findParent, groups, paneIds } from 'quilt-core';
+import { registeredShortcuts, formatShortcut, ariaShortcut } from './shortcut-registration.js';
 import { el, Scope } from './lifetime.js';
-export function createPaneMenu(root, options, windows, refresh, report, requestClose) {
+export function createPaneMenu(root, options, refresh, report, actions) {
     const doc = root.ownerDocument, win = doc.defaultView;
     let current;
+    let shortcutTarget;
+    let refreshShortcuts = () => { };
     const persistentPickers = new Map();
     const act = (fn) => {
         try {
@@ -15,11 +18,10 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
             report(error);
         }
     };
-    function button(text, title, action) {
+    function button(text, label, action) {
         const b = el(doc, 'button', 'layouts-button', text);
         b.type = 'button';
-        b.title = title;
-        b.setAttribute('aria-label', title);
+        b.setAttribute('aria-label', label);
         b.onclick = () => act(action);
         return b;
     }
@@ -38,17 +40,35 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
             ? message(options, '{title} actions', { title: pane.title })
             : message(options, 'Empty pane actions'));
         local.add(() => dialog.remove());
-        const add = (icon, label, enabled, fn) => {
+        const context = {
+            groupId: group.id,
+            ...(pane && group.panes.includes(pane.id) ? { paneId: pane.id } : {}),
+        };
+        const hints = [];
+        const bindAction = (element, action) => {
+            hints.push({ element, action });
+            element.disabled = !actions.canExecuteAction(action, context);
+            element.onclick = () => {
+                local.dispose();
+                void actions.executeAction(action, context);
+            };
+        };
+        const add = (icon, label, enabled, fn, target = dialog) => {
             const b = button(label, label, () => {
                 local.dispose();
-                act(fn);
+                if (typeof fn === 'function')
+                    act(fn);
             });
             const glyph = el(doc, 'span', 'layouts-tab-icon');
             glyph.setAttribute('aria-hidden', 'true');
             act(() => glyph.append(actionIcon(doc, icon, options)));
             b.replaceChildren(glyph, el(doc, 'span', '', label.replace(/^\+ /, '')));
             b.disabled = !enabled;
-            dialog.append(b);
+            if (typeof fn === 'string')
+                bindAction(b, fn);
+            if (target !== dialog)
+                b.setAttribute('role', 'menuitem');
+            target.append(b);
             return b;
         };
         const allowed = (cap) => group.panes.every((id) => options.store.can(id, cap));
@@ -151,7 +171,7 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
             create(direction === 'left' || direction === 'right' ? 'horizontal' : 'vertical', direction === 'left' || direction === 'top');
             return;
         }
-        add('add-tab', message(options, '+ Add tab'), available && allowed('move'), () => create());
+        add('add-tab', message(options, '+ Add tab'), available && allowed('move'), 'addTab');
         const canCreate = !group.panes.length || available;
         const flyouts = [];
         let positionMenus = () => { };
@@ -170,7 +190,14 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
             flyout.setAttribute('role', 'menu');
             flyout.setAttribute('aria-label', label);
             flyouts.push({ trigger, flyout });
+            let closeTimer;
+            const cancelClose = () => {
+                win.clearTimeout(closeTimer);
+                closeTimer = undefined;
+            };
+            local.add(cancelClose);
             const setOpen = (open) => {
+                cancelClose();
                 if (open) {
                     for (const other of flyouts) {
                         other.flyout.hidden = true;
@@ -186,7 +213,11 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
                 if (!trigger.disabled)
                     setOpen(true);
             });
-            local.listen(container, 'pointerleave', () => setOpen(false));
+            // Allow the pointer to cross the dialog padding or move diagonally into the flyout.
+            local.listen(container, 'pointerleave', () => {
+                cancelClose();
+                closeTimer = win.setTimeout(() => setOpen(false), 300);
+            });
             local.listen(trigger, 'keydown', (event) => {
                 if (event.key === 'ArrowRight') {
                     event.preventDefault();
@@ -206,16 +237,14 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
             return flyout;
         }
         const flyout = submenu(message(options, 'Split'), 'split-right', canCreate && allowed('split'));
-        for (const [label, axis, before] of [
-            [message(options, 'Split left'), 'horizontal', true],
-            [message(options, 'Split right'), 'horizontal', false],
-            [message(options, 'Split up'), 'vertical', true],
-            [message(options, 'Split down'), 'vertical', false],
+        for (const [label, axis, action] of [
+            [message(options, 'Split left'), 'horizontal', 'splitLeft'],
+            [message(options, 'Split right'), 'horizontal', 'splitRight'],
+            [message(options, 'Split up'), 'vertical', 'splitUp'],
+            [message(options, 'Split down'), 'vertical', 'splitDown'],
         ]) {
-            const option = button(label, label, () => {
-                local.dispose();
-                create(axis, before);
-            });
+            const option = button(label, label, () => { });
+            bindAction(option, action);
             const icon = el(doc, 'span', 'layouts-tab-icon');
             icon.setAttribute('aria-hidden', 'true');
             icon.append(actionIcon(doc, axis === 'horizontal' ? 'split-right' : 'split-below', options));
@@ -224,7 +253,7 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
             flyout.append(option);
         }
         const joinParent = findParent(options.store.getSnapshot().root, group.id);
-        const join = add('join', message(options, 'Join sibling region'), Boolean(joinParent) && paneIds(joinParent).every((id) => options.store.can(id, 'join')), () => options.store.join(group.id, { source: 'user' }));
+        const join = add('join', message(options, 'Join sibling region'), Boolean(joinParent) && paneIds(joinParent).every((id) => options.store.can(id, 'join')), 'joinSiblingRegion');
         let preview;
         const clearPreview = () => {
             preview?.dispose();
@@ -284,12 +313,9 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
         local.listen(join, 'blur', clearPreview);
         add(options.store.getSnapshot().maximized === group.id ? 'restore' : 'maximize', options.store.getSnapshot().maximized === group.id
             ? message(options, 'Restore region')
-            : message(options, 'Maximize region'), true, () => options.store.maximize(options.store.getSnapshot().maximized === group.id ? null : group.id));
+            : message(options, 'Maximize region'), true, 'maximize');
         if (group.panes.length && pane && options.popouts !== false) {
-            add('popout', message(options, 'Open in window'), options.store.can(pane.id, 'popout'), () => {
-                void windows.open(pane.id);
-                refresh();
-            });
+            add('popout', message(options, 'Open in window'), options.store.can(pane.id, 'popout'), 'popout');
         }
         const orientation = submenu(message(options, 'Tab orientation'), 'tab-orientation');
         for (const [value, label] of [
@@ -298,10 +324,12 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
             ['left', message(options, 'Vertical')],
         ]) {
             const selected = group.tabPlacement === value;
-            const option = button(label, label, () => {
-                options.store.setTabPlacement(group.id, value);
-                local.dispose();
-            });
+            const option = button(label, label, () => { });
+            bindAction(option, value === 'top'
+                ? 'tabOrientationHorizontal'
+                : value === 'left'
+                    ? 'tabOrientationVertical'
+                    : 'tabOrientationDefault');
             option.setAttribute('role', 'menuitemradio');
             option.setAttribute('aria-checked', String(selected));
             const mark = el(doc, 'span', 'layouts-tab-icon', selected ? '✓' : '');
@@ -316,10 +344,12 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
             ['compact', message(options, 'Compact')],
         ]) {
             const selected = group.tabDisplay === value;
-            const option = button(label, label, () => {
-                options.store.setTabDisplay(group.id, value);
-                local.dispose();
-            });
+            const option = button(label, label, () => { });
+            bindAction(option, value === 'automatic'
+                ? 'tabDisplayAutomatic'
+                : value === 'compact'
+                    ? 'tabDisplayCompact'
+                    : 'tabDisplayDefault');
             option.setAttribute('role', 'menuitemradio');
             option.setAttribute('aria-checked', String(selected));
             const mark = el(doc, 'span', 'layouts-tab-icon', selected ? '✓' : '');
@@ -328,13 +358,14 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
             display.append(option);
         }
         if (group.panes.length && pane) {
-            add('close', message(options, 'Close active tab'), options.store.can(pane.id, 'close'), () => void requestClose(pane.id));
-            add('close', message(options, 'Close pane'), group.panes.every((id) => options.store.can(id, 'close')), () => void requestClose(group.id, 'group'));
+            const close = submenu(message(options, 'Close'), 'close');
+            add('close', message(options, 'Close active tab'), options.store.can(pane.id, 'close'), 'closeActiveTab', close);
+            add('close', message(options, 'Close pane'), group.panes.every((id) => options.store.can(id, 'close')), 'closePane', close);
         }
         else {
-            add('close', message(options, 'Close empty pane'), options.store.getSnapshot().root.id !== group.id, () => options.store.removeEmptyGroup(group.id));
+            add('close', message(options, 'Close empty pane'), options.store.getSnapshot().root.id !== group.id, 'closeEmptyPane');
         }
-        add('restore', message(options, 'Restore closed tab'), options.store.canRestoreClosedTab(), () => options.store.restoreClosedTab());
+        add('restore', message(options, 'Restore closed tab'), options.store.canRestoreClosedTab(), 'restoreClosedTab');
         add('cancel', message(options, 'Cancel'), true, () => { });
         root.append(dialog);
         // Measure after opening: theme density, labels, and available actions change the size.
@@ -380,8 +411,48 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
                     local.dispose();
             }
         });
+        const updateHints = () => {
+            const registrations = registeredShortcuts(options);
+            for (const { element, action } of hints) {
+                element.querySelector('.layouts-shortcut')?.remove();
+                element.removeAttribute('aria-keyshortcuts');
+                element.disabled = !actions.canExecuteAction(action, context);
+                const label = element.getAttribute('aria-label') ?? '';
+                const registration = registrations.find((entry) => entry.action === action);
+                element.removeAttribute('title');
+                if (!registration)
+                    continue;
+                const labels = registration.bindings.map((binding) => {
+                    try {
+                        return options.formatShortcut?.(binding) ?? formatShortcut(binding);
+                    }
+                    catch (error) {
+                        report(error);
+                        return formatShortcut(binding);
+                    }
+                });
+                const badge = el(doc, 'kbd', 'layouts-shortcut', labels[0]);
+                badge.setAttribute('aria-hidden', 'true');
+                element.append(badge);
+                element.title = `${label} (${labels.join(' / ')})`;
+                if (!element.disabled)
+                    element.setAttribute('aria-keyshortcuts', registration.bindings.map(ariaShortcut).join(' '));
+            }
+            positionMenus();
+        };
+        refreshShortcuts = updateHints;
+        local.add(() => {
+            if (refreshShortcuts === updateHints)
+                refreshShortcuts = () => { };
+        });
+        const target = { dialog, context, close: () => local.dispose() };
+        shortcutTarget = target;
+        local.add(() => {
+            if (shortcutTarget === target)
+                shortcutTarget = undefined;
+        });
         dialog.showModal();
-        positionMenus();
+        updateHints();
         const observer = new win.ResizeObserver(positionMenus);
         observer.observe(dialog);
         observer.observe(anchor);
@@ -397,6 +468,8 @@ export function createPaneMenu(root, options, windows, refresh, report, requestC
         dialog.focus({ preventScroll: true });
     }
     return {
+        getShortcutTarget: () => shortcutTarget,
+        refreshShortcuts: () => refreshShortcuts(),
         open,
         addTab(anchor, group) {
             const layout = options.store.getSnapshot();