@acorex/platform 20.3.0-next.19 → 20.3.0-next.20

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

@@ -7,7 +7,7 @@ import * as i1 from '@acorex/platform/layout/widget-core';
 import { AXPWidgetContainerComponent, AXPPageStatus, AXPWidgetCoreModule } from '@acorex/platform/layout/widget-core';
 import * as i2 from '@acorex/components/form';
 import { AXFormComponent, AXFormModule } from '@acorex/components/form';
-import { isEqual, get } from 'lodash-es';
+import { isEqual, get, cloneDeep } from 'lodash-es';
 import { AXPExpressionEvaluatorService } from '@acorex/platform/core';
 import { Subject, debounceTime, distinctUntilChanged, startWith } from 'rxjs';
 import * as i2$1 from '@acorex/components/button';
@@ -232,8 +232,11 @@ class BaseContainerBuilder {
         }
         // Remove name and path from options
         const { name: _, path: __, ...cleanOptions } = widgetOptions;
-        child.options(cleanOptions);
+        // IMPORTANT: Apply inheritance context BEFORE setting options
+        // This ensures that inherited properties (readonly, disabled, etc.) are applied first
+        // Then user-provided options will override them if explicitly set
         child.withInheritanceContext(this.inheritanceContext);
+        child.options(cleanOptions);
         this.ensureChildren();
         this.containerState.children.push(child.build());
         return this;
@@ -712,10 +715,11 @@ class FormFieldBuilder extends LayoutContainerMixin {
         child.path(widgetPath);
         // Remove name from options since it's now in state
         const { name: _, ...cleanOptions } = (options || {});
-        child.options(cleanOptions);
         child.withInheritanceContext(this.inheritanceContext);
-        this.ensureChildren();
-        this.containerState.children.push(child.build());
+        child.options(cleanOptions);
+        // IMPORTANT: Store the widget builder, don't build it yet!
+        // This allows properties set after this method (like disabled, readonly) to be applied
+        this.childWidget = child;
         this.hasWidget = true;
         return this;
     }
@@ -755,6 +759,62 @@ class FormFieldBuilder extends LayoutContainerMixin {
     customWidget(type, options) {
         return this.addSingleWidget(type, options);
     }
+    // Override property setters to propagate changes to child widget
+    disabled(condition) {
+        super.disabled(condition);
+        if (this.childWidget) {
+            this.childWidget.withInheritanceContext(this.inheritanceContext);
+        }
+        return this;
+    }
+    readonly(condition) {
+        super.readonly(condition);
+        if (this.childWidget) {
+            this.childWidget.withInheritanceContext(this.inheritanceContext);
+        }
+        return this;
+    }
+    visible(condition) {
+        super.visible(condition);
+        if (this.childWidget) {
+            this.childWidget.withInheritanceContext(this.inheritanceContext);
+        }
+        return this;
+    }
+    direction(direction) {
+        super.direction(direction);
+        if (this.childWidget) {
+            this.childWidget.withInheritanceContext(this.inheritanceContext);
+        }
+        return this;
+    }
+    mode(mode) {
+        super.mode(mode);
+        if (this.childWidget) {
+            this.childWidget.withInheritanceContext(this.inheritanceContext);
+        }
+        return this;
+    }
+    // Override withInheritanceContext to pass it to the child widget if it exists
+    withInheritanceContext(context) {
+        // Call parent implementation first
+        super.withInheritanceContext(context);
+        // If we have a child widget, update its inheritance context too
+        if (this.childWidget) {
+            this.childWidget.withInheritanceContext(this.inheritanceContext);
+        }
+        return this;
+    }
+    // Override build() to build the child widget at the last moment
+    build() {
+        // Build the child widget and add it to children before building the form field
+        if (this.childWidget) {
+            this.ensureChildren();
+            this.containerState.children.push(this.childWidget.build());
+        }
+        // Call parent build
+        return super.build();
+    }
 }
 /**
  * Fieldset Container Builder - Liskov Substitution Principle
@@ -1039,7 +1099,8 @@ class WidgetBuilder {
         return this;
     }
     options(options) {
-        this.widgetState.options = options;
+        // Merge options instead of replacing to preserve inherited properties
+        this.widgetState.options = { ...this.widgetState.options, ...options };
         return this;
     }
     layout(value) {
@@ -1101,21 +1162,23 @@ class WidgetBuilder {
         this.inheritanceContext = mergeInheritanceContext(context);
         // Apply inherited properties to widget state
         const resolved = resolveInheritedProperties(context, this.inheritanceContext);
-        if (resolved.mode && !this.widgetState.mode) {
+        // Always apply inherited properties (remove the conditions that check if already set)
+        // This allows properties to be updated when inheritance context changes
+        if (resolved.mode) {
             this.widgetState.mode = resolved.mode;
         }
         if (!this.widgetState.options)
             this.widgetState.options = {};
-        if (resolved.disabled !== undefined && !this.widgetState.options['disabled']) {
+        if (resolved.disabled !== undefined) {
             this.widgetState.options['disabled'] = resolved.disabled;
         }
-        if (resolved.readonly !== undefined && !this.widgetState.options['readonly']) {
+        if (resolved.readonly !== undefined) {
             this.widgetState.options['readonly'] = resolved.readonly;
         }
-        if (resolved.direction !== undefined && !this.widgetState.options['direction']) {
+        if (resolved.direction !== undefined) {
             this.widgetState.options['direction'] = resolved.direction;
         }
-        if (resolved.visible !== undefined && !this.widgetState.options['visible']) {
+        if (resolved.visible !== undefined) {
             this.widgetState.options['visible'] = resolved.visible;
         }
         return this;
@@ -1527,6 +1590,10 @@ class AXPLayoutRendererComponent {
          * Internal context signal for reactivity
          */
         this.internalContext = signal({}, ...(ngDevMode ? [{ debugName: "internalContext" }] : []));
+        /**
+         * Initial context for reset functionality
+         */
+        this.initialContext = {};
         //#endregion
         //#region ----   Effects   ----
         /**
@@ -1576,7 +1643,10 @@ class AXPLayoutRendererComponent {
     //#region ----   Lifecycle Methods   ----
     ngOnInit() {
         // Initialize internal context with input context
-        this.internalContext.set(this.context() ?? {});
+        const ctx = this.context() ?? {};
+        this.internalContext.set(ctx);
+        // Store initial context for reset functionality
+        this.initialContext = cloneDeep(ctx);
         // Setup RxJS streams for context management
         this.setupContextStreams();
     }
@@ -1651,6 +1721,25 @@ class AXPLayoutRendererComponent {
             rules: [],
         };
     }
+    /**
+     * Clear the form context
+     */
+    clear() {
+        // Clear internal context
+        this.internalContext.set({});
+        // Update the model signal
+        this.context.set({});
+    }
+    /**
+     * Reset the form to its initial state
+     */
+    reset() {
+        // Reset to initial context
+        const resetContext = cloneDeep(this.initialContext);
+        this.internalContext.set(resetContext);
+        // Update the model signal
+        this.context.set(resetContext);
+    }
     //#endregion
     //#region ----   RxJS Stream Setup   ----
     /**