@acorex-platform/framework-client 0.0.57 → 0.0.59

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

@@ -3,8 +3,8 @@ 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, untracked, Output } from '@angular/core';
 import * as i4 from '@acorex-platform/framework-client/core';
-import { AXPHookService, resolveDialogActionShortcuts, DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS, DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS, AXP_SETTINGS_DEFINITION_DIALOG_OPENER, findOverlayContainerAncestor, getNestedVisibleOverlayPanes, getTopVisibleOverlayContainer, AXPExpressionEvaluatorService, AXPKeyboardShortcutRegistry, normalizeDialogActionShortcutChord, isDialogShortcutAllowedInEditableField, resolveConfiguredFooterActionShortcuts, AXPComponentSlotModule, AXPContextStore } from '@acorex-platform/framework-client/core';
-export { DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS, DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS } from '@acorex-platform/framework-client/core';
+import { AXPHookService, AXPDialogOpener, resolveDialogActionShortcuts, DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS, DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS, AXP_SETTINGS_DEFINITION_DIALOG_OPENER, findOverlayContainerAncestor, getNestedVisibleOverlayPanes, getTopVisibleOverlayContainer, AXPExpressionEvaluatorService, AXPKeyboardShortcutRegistry, normalizeDialogActionShortcutChord, isDialogShortcutAllowedInEditableField, resolveConfiguredFooterActionShortcuts, AXPComponentSlotModule, AXPContextStore } from '@acorex-platform/framework-client/core';
+export { AXPDialogOpener, AXP_ROOT_LOADING, DEFAULT_CANCEL_DIALOG_ACTION_SHORTCUTS, DEFAULT_SUBMIT_DIALOG_ACTION_SHORTCUTS } from '@acorex-platform/framework-client/core';
 import { provideCommandSetups, AXPCommandService } from '@acorex-platform/framework-client/runtime';
 import { toAxpGridItemWidgetOptions, AXP_PREVIEW_WIDGET_FIELD_COMMAND_KEY, createRandomUuid, AXPKeyboardShortcutPriority } from '@acorex-platform/framework-shared/core';
 import { AXPopupService } from '@acorex/components/popup';
@@ -479,12 +479,13 @@ class AXPLayoutBuilderService {
     constructor() {
         this.popupService = inject(AXPopupService);
         this.hookService = inject(AXPHookService, { optional: true }) ?? undefined;
+        this.dialogOpener = inject(AXPDialogOpener);
     }
     /**
      * Create a new layout builder
      */
     create() {
-        return new LayoutBuilder(this.popupService, this.hookService);
+        return new LayoutBuilder(this.popupService, this.hookService, this.dialogOpener);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXPLayoutBuilderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "22.0.8", ngImport: i0, type: AXPLayoutBuilderService, providedIn: 'root' }); }
@@ -502,9 +503,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "22.0.8", ngImpor
  * Open/Closed: Extensible through container delegates
  */
 class LayoutBuilder {
-    constructor(popupService, hookService) {
+    constructor(popupService, hookService, dialogOpener) {
         this.popupService = popupService;
         this.hookService = hookService;
+        this.dialogOpener = dialogOpener;
         this.root = {
             children: [],
             mode: 'edit',
@@ -586,7 +588,7 @@ class LayoutBuilder {
         if (!this.popupService) {
             throw new Error('LayoutBuilder requires AXPopupService to create dialogs. Please inject it in the service constructor.');
         }
-        const container = new DialogContainerBuilder(this.popupService, this.hookService);
+        const container = new DialogContainerBuilder(this.popupService, this.hookService, this.dialogOpener);
         if (delegate) {
             delegate(container);
         }
@@ -1550,7 +1552,7 @@ class ListWidgetBuilder extends WidgetContainerMixin {
  * Uses composition instead of inheritance for cleaner separation
  */
 class DialogContainerBuilder {
-    constructor(popupService, hookService) {
+    constructor(popupService, hookService, dialogOpener) {
         this.dialogState = {
             type: 'flex-layout', // This will be overridden when content layout exists
             children: [],
@@ -1574,6 +1576,7 @@ class DialogContainerBuilder {
             this.popupService = inject(AXPopupService);
         }
         this.hookService = hookService ?? inject(AXPHookService, { optional: true }) ?? undefined;
+        this.dialogOpener = dialogOpener ?? inject(AXPDialogOpener);
     }
     setOptions(options) {
         this.dialogState.dialogOptions = { ...this.dialogState.dialogOptions, ...options };
@@ -1670,10 +1673,40 @@ class DialogContainerBuilder {
         return result;
     }
     // Dialog-specific methods
-    async show() {
+    async show(options) {
+        const outcome = await this.dialogOpener.run({
+            load: () => Promise.resolve().then(function () { return dialogRenderer_component; }).then((module) => module.AXPDialogRendererComponent),
+            data: this.dialogOpenKeyData(),
+            present: (notifyShown, component) => this.presentDialog(component, notifyShown, options),
+        });
+        if (outcome.duplicate) {
+            return createDismissedDialogRef();
+        }
+        return outcome.result;
+    }
+    dialogOpenKeyData() {
+        const dialogOptions = this.dialogState.dialogOptions;
+        return {
+            title: dialogOptions?.title ?? '',
+            size: String(dialogOptions?.size ?? 'md'),
+            widget: this.contentWidgetName(this.contentLayout),
+        };
+    }
+    contentWidgetName(node) {
+        if (!node) {
+            return '';
+        }
+        if (node.name) {
+            return node.name;
+        }
+        const child = node.children?.[0];
+        if (child) {
+            return this.contentWidgetName(child);
+        }
+        return node.type ?? '';
+    }
+    async presentDialog(component, notifyShown, options) {
         const dialogNode = this.build();
-        // Import the dialog renderer component dynamically
-        const { AXPDialogRendererComponent } = await Promise.resolve().then(function () { return dialogRenderer_component; });
         this.dialogState.dialogOptions ??= {};
         if (this.dialogState.dialogOptions.context == null || typeof this.dialogState.dialogOptions.context !== 'object') {
             this.dialogState.dialogOptions.context = {};
@@ -1692,11 +1725,8 @@ class DialogContainerBuilder {
             await hookService.runAsync(AXP_LAYOUT_BUILDER_DIALOG_BEFORE_OPEN_HOOK_KEY, beforePayload);
         }
         const confirmCloseWhenDirty = normalizeDialogCloseConfirmation(this.dialogState.dialogOptions?.confirmCloseWhenDirty);
-        // Create dialog configuration
         const dialogConfig = {
             title: this.dialogState.dialogOptions?.title || '',
-            //TODO: why we need message?
-            //message: this.dialogState.dialogOptions?.message,
             context: initialContext,
             definition: dialogNode,
             metadata: this.dialogState.dialogOptions.metadata,
@@ -1704,14 +1734,12 @@ class DialogContainerBuilder {
             onAction: this.dialogState.dialogOptions?.onAction,
             confirmCloseWhenDirty,
         };
-        // 
         if (hookService) {
             await hookService.runAsync(AXP_LAYOUT_BUILDER_DIALOG_CONFIG_HOOK_KEY, dialogConfig);
         }
-        // The Promise resolves when user clicks an action button
-        return new Promise(async (resolve) => {
+        return new Promise((resolve) => {
             let flag = false;
-            await this.popupService.open(AXPDialogRendererComponent, {
+            const opened = this.popupService.open(component, {
                 title: dialogConfig.title,
                 size: this.dialogState.dialogOptions?.size || 'md',
                 closeButton: this.dialogState.dialogOptions?.closeButton || false,
@@ -1725,9 +1753,17 @@ class DialogContainerBuilder {
                     },
                 },
             });
-            if (!flag) {
-                resolve(createDismissedDialogRef());
-            }
+            notifyShown();
+            options?.onShown?.();
+            void Promise.resolve(opened).then(() => {
+                if (!flag) {
+                    resolve(createDismissedDialogRef());
+                }
+            }, () => {
+                if (!flag) {
+                    resolve(createDismissedDialogRef());
+                }
+            });
         });
     }
 }