@acorex/platform 21.0.0-next.88 → 21.0.0-next.90

package/fesm2022/acorex-platform-layout-builder.mjs

@@ -1,11 +1,12 @@
 import * as i5 from '@angular/common';
 import { CommonModule, DOCUMENT } from '@angular/common';
 import * as i0 from '@angular/core';
-import { Injectable, inject, input, model, signal, computed, effect, output, viewChild, ChangeDetectionStrategy, Component, NgModule, EventEmitter, ElementRef, DestroyRef, Output } from '@angular/core';
+import { Injectable, inject, input, model, signal, computed, effect, output, viewChild, ChangeDetectionStrategy, Component, NgModule, EventEmitter, ElementRef, DestroyRef, untracked, Output } from '@angular/core';
 import { provideCommandSetups, AXPCommandService } from '@acorex/platform/runtime';
 import { AXPopupService } from '@acorex/components/popup';
 import * as i4 from '@acorex/platform/core';
-import { normalizeKeyboardShortcuts, AXPHookService, findOverlayContainerAncestor, getNestedVisibleOverlayPanes, getTopVisibleOverlayContainer, AXPExpressionEvaluatorService, AXPComponentSlotModule, AXPContextStore } from '@acorex/platform/core';
+import { AXPHookService, resolveDialogActionShortcuts, DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS, DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS, findOverlayContainerAncestor, getNestedVisibleOverlayPanes, getTopVisibleOverlayContainer, AXPExpressionEvaluatorService, AXPKeyboardShortcutRegistry, AXPKeyboardShortcutPriority, normalizeDialogActionShortcutChord, isDialogShortcutAllowedInEditableField, resolveConfiguredFooterActionShortcuts, AXPComponentSlotModule, AXPContextStore } from '@acorex/platform/core';
+export { DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS, DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS } from '@acorex/platform/core';
 import * as i1 from '@acorex/platform/layout/widget-core';
 import { AXPWidgetSerializationHelper, AXPWidgetContainerComponent, AXPPageStatus, AXPWidgetCoreModule, AXPWidgetRegistryService } from '@acorex/platform/layout/widget-core';
 import { cloneDeep, isNil, set, isEqual, merge } from 'lodash-es';
@@ -26,150 +27,7 @@ import { AXTranslationService, AXTranslationModule } from '@acorex/core/translat
 import { AXPUnsavedChangesConfirmService } from '@acorex/platform/common';
 import { AXP_ENTITY_DEFINITION_CRUD_SERVICE } from '@acorex/platform/domain';
 
-//#region ----   Dialog Action Shortcut Utilities   ----
-const DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS = ['Esc'];
-const DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS = ['Enter', 'ctrl+s'];
-const PRIMARY_DIALOG_ACTION_COMMANDS = new Set(['submit', 'create', 'entity-form-done']);
-/**
- * Parses a shortcut string such as `Enter`, `Escape`, or `ctrl+shift+s`.
- */
-function parseDialogActionShortcut(shortcut) {
-    const parts = shortcut
-        .trim()
-        .toLowerCase()
-        .split('+')
-        .map((part) => part.trim())
-        .filter(Boolean);
-    const key = normalizeShortcutToken(parts.pop() ?? '');
-    return {
-        ctrl: parts.includes('ctrl') || parts.includes('control'),
-        shift: parts.includes('shift'),
-        alt: parts.includes('alt') || parts.includes('option'),
-        meta: parts.includes('meta') || parts.includes('cmd') || parts.includes('command'),
-        key,
-    };
-}
-/**
- * Returns true when the keyboard event matches the given shortcut definition.
- */
-function matchesDialogActionShortcut(event, shortcut) {
-    const parsed = parseDialogActionShortcut(shortcut);
-    if (parsed.ctrl !== event.ctrlKey) {
-        return false;
-    }
-    if (parsed.shift !== event.shiftKey) {
-        return false;
-    }
-    if (parsed.alt !== event.altKey) {
-        return false;
-    }
-    if (parsed.meta !== event.metaKey) {
-        return false;
-    }
-    return normalizeShortcutKey(event) === normalizeShortcutToken(parsed.key);
-}
-/**
- * Resolves footer action shortcuts: defaults when omitted, merge when extras are provided, none when `[]`.
- */
-function resolveDialogActionShortcuts(defaults, overrides) {
-    if (overrides !== undefined) {
-        if (overrides.length === 0) {
-            return undefined;
-        }
-        return flattenDialogActionShortcutChords([...defaults, ...overrides]);
-    }
-    return flattenDialogActionShortcutChords(defaults);
-}
-/**
- * Applies built-in footer shortcuts when actions are declared without `shortcuts`
- * (e.g. workflow `show-layout-popup` raw action config).
- */
-function resolveConfiguredFooterActionShortcuts(command, explicit) {
-    if (explicit !== undefined) {
-        return resolveDialogActionShortcuts([], explicit);
-    }
-    if (command === 'cancel') {
-        return resolveDialogActionShortcuts(DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS, undefined);
-    }
-    if (command && PRIMARY_DIALOG_ACTION_COMMANDS.has(command)) {
-        return resolveDialogActionShortcuts(DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS, undefined);
-    }
-    return undefined;
-}
-function flattenDialogActionShortcutChords(shortcuts) {
-    const chords = normalizeKeyboardShortcuts(shortcuts).flatMap((shortcut) => shortcut.keys);
-    const deduped = dedupeDialogActionShortcuts(chords);
-    return deduped.length ? deduped : undefined;
-}
-function dedupeDialogActionShortcuts(shortcuts) {
-    const seen = new Set();
-    const result = [];
-    for (const shortcut of shortcuts) {
-        const token = normalizeShortcutToken(shortcut);
-        if (!token || seen.has(token)) {
-            continue;
-        }
-        seen.add(token);
-        result.push(shortcut.trim());
-    }
-    return result;
-}
-function normalizeShortcutToken(key) {
-    const normalized = key.trim().toLowerCase();
-    if (normalized === 'esc') {
-        return 'escape';
-    }
-    return normalized;
-}
-/**
- * Whether a shortcut should fire given the current focus target.
- * Enter without modifiers is suppressed in multiline / rich-text fields.
- */
-function shouldTriggerDialogActionShortcut(event, shortcut) {
-    const parsed = parseDialogActionShortcut(shortcut);
-    const isPlainEnter = parsed.key === 'enter' && !parsed.ctrl && !parsed.shift && !parsed.alt && !parsed.meta;
-    if (!isPlainEnter) {
-        return true;
-    }
-    return !isKeyboardTargetMultilineEditable(event.target);
-}
-function normalizeShortcutKey(event) {
-    if (event.key === 'Enter') {
-        return 'enter';
-    }
-    if (event.key === 'Escape') {
-        return 'escape';
-    }
-    if (event.key === ' ') {
-        return 'space';
-    }
-    if (event.key.length === 1) {
-        return event.key.toLowerCase();
-    }
-    const codeMatch = event.code.match(/^Key([A-Z])$/);
-    if (codeMatch) {
-        return codeMatch[1].toLowerCase();
-    }
-    const digitMatch = event.code.match(/^Digit([0-9])$/);
-    if (digitMatch) {
-        return digitMatch[1];
-    }
-    return event.key.toLowerCase();
-}
-function isKeyboardTargetMultilineEditable(target) {
-    if (!(target instanceof HTMLElement)) {
-        return false;
-    }
-    if (target.isContentEditable) {
-        return true;
-    }
-    const textarea = target.closest('textarea');
-    if (textarea && !textarea.readOnly && !textarea.disabled) {
-        return true;
-    }
-    const richText = target.closest('[contenteditable="true"]');
-    return richText instanceof HTMLElement;
-}
+//#region ---- Dialog Action Shortcut Utilities (re-export) ----
 //#endregion
 
 /** Fallback {@link AXPDialogRef} when the popup is dismissed without a footer action (e.g. header close). */
@@ -2658,6 +2516,7 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
         this.translationService = inject(AXTranslationService);
         this.document = inject(DOCUMENT);
         this.host = inject((ElementRef));
+        this.shortcutRegistry = inject(AXPKeyboardShortcutRegistry);
         /** Ensures `show()` resolves once when the dialog closes (footer action or header close). */
         this.callbackInvoked = false;
         /** Skips dirty confirmation on the next {@link onClosing} (successful submit / programmatic close). */
@@ -2679,44 +2538,15 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
             ? crypto.randomUUID()
             : `layout-dialog-ctx-${Date.now()}-${Math.random().toString(36).slice(2)}`;
         /**
-         * Capture-phase footer shortcuts — runs before widget editors (select, date, text) that stop keydown bubbling.
+         * Registers footer shortcuts on the platform registry at modal priority so they win over page
+         * bindings (e.g. Ctrl+S on entity details) and stop propagation.
          */
-        this.onDialogShortcutCapture = (event) => {
-            if (this.isDialogLoading()) {
-                return;
-            }
-            // Unsaved-changes confirm is modal — parent footer shortcuts must not run underneath it.
-            if (this.unsavedChangesConfirm.isConfirmPending()) {
-                return;
-            }
-            if (shouldDeferDialogShortcutsToNestedOverlay(this.document, this.host.nativeElement, this.overlayService)) {
-                return;
-            }
-            if (event.key === 'Escape' && this.config?.confirmCloseWhenDirty?.enabled) {
-                event.preventDefault();
-                event.stopImmediatePropagation();
-                this.requestDismiss();
-                return;
-            }
-            const actions = [...this.footerPrefixActions(), ...this.footerSuffixActions()];
-            for (const action of actions) {
-                if (action.disabled || action.hidden || !action.shortcuts?.length) {
-                    continue;
-                }
-                for (const shortcut of action.shortcuts) {
-                    if (event.key === 'Escape' && this.config?.confirmCloseWhenDirty?.enabled) {
-                        continue;
-                    }
-                    if (!matchesDialogActionShortcut(event, shortcut) || !shouldTriggerDialogActionShortcut(event, shortcut)) {
-                        continue;
-                    }
-                    event.preventDefault();
-                    event.stopImmediatePropagation();
-                    void this.executeAction(action);
-                    return;
-                }
-            }
-        };
+        this.#dialogShortcutsEffect = effect(() => {
+            this.footerPrefix();
+            this.footerSuffix();
+            this.isDialogLoading();
+            untracked(() => this.refreshDialogKeyboardShortcuts());
+        }, ...(ngDevMode ? [{ debugName: "#dialogShortcutsEffect" }] : /* istanbul ignore next */ []));
         //#endregion
         //#region ----   View Accessors   ----
         // Access the internal layout renderer to reach the widgets container injector
@@ -2738,18 +2568,92 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
             }, DIALOG_WIDGET_COUNT_STABLE_DELAY_MS);
         }, ...(ngDevMode ? [{ debugName: "#widgetActionsEffect" }] : /* istanbul ignore next */ []));
     }
+    /**
+     * Registers footer shortcuts on the platform registry at modal priority so they win over page
+     * bindings (e.g. Ctrl+S on entity details) and stop propagation.
+     */
+    #dialogShortcutsEffect;
     //#endregion
     //#region ----   Lifecycle   ----
     ngOnInit() {
         const initialContext = this.config?.context || {};
         this.context.set(initialContext);
-        this.document.addEventListener('keydown', this.onDialogShortcutCapture, true);
-        this.destroyRef.onDestroy(() => {
-            this.document.removeEventListener('keydown', this.onDialogShortcutCapture, true);
-        });
         void this.invokeLayoutContextChangedHooks();
     }
     //#endregion
+    //#region ----   Keyboard Shortcuts   ----
+    refreshDialogKeyboardShortcuts() {
+        const shortcuts = this.buildDialogFooterShortcutBindings();
+        const dialogTitle = this.config?.title;
+        const scope = typeof dialogTitle === 'string' && dialogTitle.startsWith('@')
+            ? dialogTitle
+            : '@general:keyboard-shortcuts.groups.dialog';
+        this.shortcutRegistry.register({
+            owner: this.destroyRef,
+            elementRef: this.host,
+            id: 'layout-builder-dialog-footer',
+            priority: AXPKeyboardShortcutPriority.Modal,
+            scope,
+            when: () => this.isDialogShortcutRegistrationActive(),
+            shortcuts,
+        });
+    }
+    isDialogShortcutRegistrationActive() {
+        if (this.isDialogLoading()) {
+            return false;
+        }
+        if (this.unsavedChangesConfirm.isConfirmPending()) {
+            return false;
+        }
+        return !shouldDeferDialogShortcutsToNestedOverlay(this.document, this.host.nativeElement, this.overlayService);
+    }
+    buildDialogFooterShortcutBindings() {
+        const shortcuts = [];
+        const group = '@general:keyboard-shortcuts.groups.dialog';
+        const actions = [...this.footerPrefixActions(), ...this.footerSuffixActions()];
+        const confirmDirty = !!this.config?.confirmCloseWhenDirty?.enabled;
+        for (const action of actions) {
+            if (action.disabled || action.hidden || !action.shortcuts?.length) {
+                continue;
+            }
+            for (const shortcut of action.shortcuts) {
+                const chord = normalizeDialogActionShortcutChord(shortcut);
+                if (confirmDirty && chord === 'escape') {
+                    continue;
+                }
+                shortcuts.push({
+                    keys: [chord],
+                    title: action.title ?? '',
+                    group,
+                    allowInEditableFields: isDialogShortcutAllowedInEditableField(shortcut),
+                    when: () => this.isDialogFooterShortcutActive(action),
+                    handler: () => {
+                        void this.executeAction(action);
+                    },
+                });
+            }
+        }
+        if (confirmDirty) {
+            shortcuts.push({
+                keys: ['escape'],
+                title: '@general:actions.discard.title',
+                group,
+                allowInEditableFields: true,
+                when: () => this.isDialogShortcutRegistrationActive(),
+                handler: () => {
+                    this.requestDismiss();
+                },
+            });
+        }
+        return shortcuts;
+    }
+    isDialogFooterShortcutActive(action) {
+        if (!this.isDialogShortcutRegistrationActive()) {
+            return false;
+        }
+        return !action.disabled && !action.hidden;
+    }
+    //#endregion
     //#region ----   Popup Close Gate   ----
     /**
      * Popup shell hook — handles header **X** and **Esc** (when `closeButton` is enabled).
@@ -3099,7 +3003,12 @@ class AXPDialogRendererComponent extends AXBasePageComponent {
             try {
                 const widget = this.widgetCoreService.getWidget(name);
                 const widgetActs = widget?.actions?.() ?? [];
-                actions.push(...widgetActs);
+                for (const action of widgetActs) {
+                    actions.push({
+                        ...action,
+                        shortcuts: resolveConfiguredFooterActionShortcuts(this.resolveActionCommandName(action.command), action.shortcuts),
+                    });
+                }
             }
             catch { }
         }
@@ -3527,5 +3436,5 @@ var previewWidgetField_command = /*#__PURE__*/Object.freeze({
  * Generated bundle index. Do not edit.
  */
 
-export { AXPDialogRendererComponent, AXPLayoutBuilderService, AXPLayoutConversionService, AXPLayoutRendererComponent, AXPPreviewWidgetFieldCommand, AXP_LAYOUT_BUILDER_DIALOG_BEFORE_OPEN_HOOK_KEY, AXP_LAYOUT_BUILDER_DIALOG_CONFIG_HOOK_KEY, AXP_LAYOUT_BUILDER_DIALOG_CONTEXT_CHANGED_HOOK_KEY, DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS, DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS, LayoutBuilderModule, createDismissedDialogRef };
+export { AXPDialogRendererComponent, AXPLayoutBuilderService, AXPLayoutConversionService, AXPLayoutRendererComponent, AXPPreviewWidgetFieldCommand, AXP_LAYOUT_BUILDER_DIALOG_BEFORE_OPEN_HOOK_KEY, AXP_LAYOUT_BUILDER_DIALOG_CONFIG_HOOK_KEY, AXP_LAYOUT_BUILDER_DIALOG_CONTEXT_CHANGED_HOOK_KEY, LayoutBuilderModule, createDismissedDialogRef };
 //# sourceMappingURL=acorex-platform-layout-builder.mjs.map