@acorex/platform 21.0.0-next.5 → 21.0.0-next.51

package/fesm2022/acorex-platform-layout-widget-core.mjs

@@ -1,10 +1,10 @@
 import * as i0 from '@angular/core';
-import { computed, signal, Injectable, InjectionToken, inject, ElementRef, effect, untracked, Injector, ChangeDetectorRef, ViewChild, Input, ChangeDetectionStrategy, Component, EventEmitter, Output, input, output, ViewContainerRef, Directive, Optional, Inject, NgModule } from '@angular/core';
+import { signal, computed, Injectable, InjectionToken, inject, ElementRef, effect, untracked, Injector, ChangeDetectorRef, ViewChild, Input, ChangeDetectionStrategy, Component, EventEmitter, Output, input, output, ViewContainerRef, Directive, NgModule } from '@angular/core';
 import { convertArrayToDataSource, AXDataSource } from '@acorex/cdk/common';
-import { setSmart, AXPDataSourceDefinitionProviderService, extractValue, AXPExpressionEvaluatorService, getSmart } from '@acorex/platform/core';
-import { cloneDeep, isEqual, has, get, set, merge, isNil, isUndefined, isObjectLike, sum, isEmpty, isString } from 'lodash-es';
+import { AXPContextStore, AXPDataSourceDefinitionProviderService, extractValue, AXPExpressionEvaluatorService, getSmart } from '@acorex/platform/core';
+export { normalizeDefinitionCategories } from '@acorex/platform/core';
+import { set, merge, cloneDeep, isNil, get, isEqual, isUndefined, isObjectLike, sum, isEmpty, isString } from 'lodash-es';
 import { Subject, BehaviorSubject, filter } from 'rxjs';
-import { signalStore, withState, withComputed, withMethods, patchState } from '@ngrx/signals';
 import * as i1$1 from '@acorex/components/skeleton';
 import { AXSkeletonModule } from '@acorex/components/skeleton';
 import * as i2 from '@acorex/core/translation';
@@ -15,122 +15,6 @@ import { CommonModule } from '@angular/common';
 import { AXDataTableColumnComponent, AXBaseDataTable } from '@acorex/components/data-table';
 import { AXUnsubscriber } from '@acorex/core/utils';
 
-class AXPWidgetCoreContextChangeEvent {
-}
-const AXPWidgetCoreContextStore = signalStore(
-// Initial State
-withState(() => ({
-    data: {}, // Shared context data
-    state: 'initiated', // Current state
-    initialSnapshot: {}, // Snapshot of the first initialized state
-    previousSnapshot: {}, // Snapshot of the previous state
-    lastChange: {
-        state: 'initiated',
-    }, // Last change event
-})), 
-// Computed Signals
-withComputed(({ data, state, lastChange, initialSnapshot, previousSnapshot }) => ({
-    isChanged: computed(() => state() === 'changed'),
-    isReset: computed(() => state() === 'restored'),
-    isInitiated: computed(() => state() === 'initiated'),
-    isEmpty: computed(() => Object.keys(data()).length === 0),
-    isDirty: computed(() => !isEqual(data(), previousSnapshot())),
-    snapshot: computed(() => cloneDeep(data())), // Current data snapshot
-    initial: computed(() => cloneDeep(initialSnapshot())), // Initial snapshot
-    previous: computed(() => cloneDeep(previousSnapshot())), // Previous snapshot
-    changeEvent: computed(() => lastChange()), // Reactive last change event
-})), 
-// Methods for State Management
-withMethods((store) => ({
-    // Update a specific value
-    update(path, value) {
-        const currentData = cloneDeep(store.data());
-        const oldValue = get(currentData, path);
-        // Skip if the value hasn't changed
-        if (isEqual(oldValue, value)) {
-            return;
-        }
-        // Update the value and prepare the change event
-        const updatedData = setSmart(currentData, path, value);
-        const changeEvent = {
-            oldValue,
-            newValue: value,
-            path,
-            state: 'changed',
-            data: updatedData,
-        };
-        // Patch the state
-        patchState(store, {
-            previousSnapshot: store.snapshot(), // Save the previous state
-            data: updatedData,
-            state: 'changed',
-            lastChange: changeEvent,
-        });
-    },
-    patch(context) {
-        const currentData = cloneDeep(store.data());
-        // Update the value and prepare the change event
-        const updatedData = { ...currentData, ...context };
-        const changeEvent = {
-            state: 'patch',
-            data: updatedData,
-        };
-        // Patch the state
-        patchState(store, {
-            previousSnapshot: store.snapshot(), // Save the previous state
-            data: updatedData,
-            state: 'changed',
-            lastChange: changeEvent,
-        });
-    },
-    // Reset to the initial state
-    reset() {
-        const initialData = store.initial();
-        const changeEvent = {
-            oldValue: cloneDeep(store.data()), // Current data becomes old value
-            newValue: cloneDeep(initialData), // Reset to the initial state
-            path: '',
-            state: 'restored',
-            data: initialData,
-        };
-        patchState(store, {
-            previousSnapshot: store.snapshot(), // Save the previous state
-            data: initialData,
-            state: 'restored',
-            lastChange: changeEvent,
-        });
-    },
-    // Initialize the state
-    set(initialData) {
-        const currentData = store.data();
-        if (isEqual(currentData, initialData)) {
-            return; // Skip if the current state matches the initial state
-        }
-        const changeEvent = {
-            oldValue: null,
-            newValue: cloneDeep(initialData),
-            path: '',
-            state: 'initiated',
-            data: initialData,
-        };
-        patchState(store, {
-            initialSnapshot: cloneDeep(initialData), // Save the initial state
-            previousSnapshot: store.snapshot(), // Save the current state as the previous
-            data: initialData,
-            state: 'initiated',
-            lastChange: changeEvent,
-        });
-    },
-    // Get a specific value
-    getValue(path) {
-        return get(store.data(), path);
-    },
-    // Check if a path exists in the context
-    hasValue(path) {
-        return has(store.data(), path);
-    },
-})));
-
 var AXPPageStatus;
 (function (AXPPageStatus) {
     // Idle statuses
@@ -170,17 +54,17 @@ class AXPWidgetCoreElement {
 }
 class AXPWidgetCoreService {
     constructor() {
-        this.variables$ = signal({}, ...(ngDevMode ? [{ debugName: "variables$" }] : []));
-        this.functions$ = signal({}, ...(ngDevMode ? [{ debugName: "functions$" }] : []));
+        this.variables$ = signal({}, ...(ngDevMode ? [{ debugName: "variables$" }] : /* istanbul ignore next */ []));
+        this.functions$ = signal({}, ...(ngDevMode ? [{ debugName: "functions$" }] : /* istanbul ignore next */ []));
         this.onRefresh = new Subject();
         this.widgets = new Map();
         this.onWidgetRegistered = new Subject();
-        this.status$ = signal(AXPPageStatus.Rendering, ...(ngDevMode ? [{ debugName: "status$" }] : []));
+        this.status$ = signal(AXPPageStatus.Rendering, ...(ngDevMode ? [{ debugName: "status$" }] : /* istanbul ignore next */ []));
         this.status = this.status$.asReadonly();
         this.isBusy = computed(() => {
             return [AXPPageStatus.Processing, AXPPageStatus.Submitting, AXPPageStatus.Rendering].includes(this.status());
-        }, ...(ngDevMode ? [{ debugName: "isBusy" }] : []));
-        this.registeredWidgetsCount = signal(0, ...(ngDevMode ? [{ debugName: "registeredWidgetsCount" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "isBusy" }] : /* istanbul ignore next */ []));
+        this.registeredWidgetsCount = signal(0, ...(ngDevMode ? [{ debugName: "registeredWidgetsCount" }] : /* istanbul ignore next */ []));
     }
     get variables() {
         return this.variables$();
@@ -285,13 +169,16 @@ class AXPWidgetCoreService {
         return Array.from(this.widgets.keys());
     }
     ngOnDestroy() { }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetCoreService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetCoreService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetCoreService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetCoreService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetCoreService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetCoreService, decorators: [{
             type: Injectable
         }] });
 
+//
+// @deprecated
+// Prefer AXPWidgetsList from @acorex/modules/common; dashboard widget type ids live in dashboard-management RootConfig.widgets.
 const AXPWidgetsCatalog = {
     timeDuration: 'time-duration',
     timeDurationFilter: 'time-duration-filter',
@@ -315,6 +202,7 @@ const AXPWidgetsCatalog = {
     pageLayout: 'page-layout',
     repeaterLayout: 'repeater-layout',
     textBlockLayout: 'text-block-layout',
+    alertBoxLayout: 'alert-box-layout',
     fileUploader: 'file-uploader',
     fileTypeExtension: 'file-type-extension',
     map: 'map',
@@ -343,7 +231,6 @@ const AXPWidgetsCatalog = {
     tableLayout: 'table-layout',
     tableItem: 'table-item-layout',
     avatar: 'avatar',
-    themePaletteChooser: 'theme-palette-chooser',
     themeModeChooser: 'theme-mode-chooser',
     menuOrientationChooser: 'menu-orientation-chooser',
     fontStyleChooser: 'font-style-chooser',
@@ -371,31 +258,22 @@ const AXPWidgetsCatalog = {
     betweenValidation: 'between-validation',
     equalValidation: 'equal-validation',
     callbackValidation: 'callback-validation',
-    donutChart: 'donut-chart',
-    lineChart: 'line-chart',
-    barChart: 'bar-chart',
-    gaugeChart: 'gauge-chart',
-    stickyNote: 'sticky-note',
-    clockCalendar: 'clock-calendar',
-    analogClock: 'analog-clock',
-    weather: 'weather',
-    minimalWeather: 'minimal-weather',
-    advancedWeather: 'advanced-weather',
     metaData: 'meta-data-editor',
     templateEditor: 'template-box-editor',
+    templateContentEditor: 'template-content-editor',
     panel: 'panel',
     notification: 'notification',
-    taskBoard: 'task-board',
     comment: 'comment',
     dataList: 'data-list',
     listToolbar: 'list-toolbar',
     entityList: 'entity-list',
     editorJs: 'editor-js-editor',
     documentUploader: 'document-uploader',
-    signatureList: 'signature-list',
     stepWizard: 'step-wizard',
     progressBar: 'progress-bar-editor',
-    rate: 'rate-picker-editor'
+    rate: 'rate-picker-editor',
+    documentFileTypeFilter: 'document-file-type-filter',
+    entityDefinitionProvider: 'entity-definition-provider-editor',
 };
 
 function cloneProperty(property, values) {
@@ -450,7 +328,10 @@ function createBooleanProperty(ctor) {
                 type: AXPWidgetsCatalog.toggle,
             },
         },
-        visible: ctor.visible ?? true,
+        visible: !isNil(ctor.visible) ? ctor.visible : true,
+        binding: {
+            enabled: true,
+        },
     };
 }
 function createSelectProperty(ctor) {
@@ -474,7 +355,7 @@ function createSelectProperty(ctor) {
                 },
             },
         },
-        visible: ctor.visible ?? true,
+        visible: !isNil(ctor.visible) ? ctor.visible : true,
     };
 }
 const AXP_WIDGET_TOKEN = new InjectionToken('AXP_WIDGET_TOKEN');
@@ -486,22 +367,22 @@ class AXPBaseWidgetComponent extends AXPWidgetCoreElement {
         this.token = inject(AXP_WIDGET_TOKEN);
         this.host = inject(ElementRef).nativeElement;
         this.layoutService = inject(AXPWidgetCoreService);
-        this.contextService = inject(AXPWidgetCoreContextStore);
+        this.contextService = inject(AXPContextStore);
         this.config = this.token.config;
         this.node = this.token.node;
         this.name = this.token.node.name;
         this.component = this;
-        this._options = signal(this.token.options ?? {}, ...(ngDevMode ? [{ debugName: "_options" }] : []));
+        this._options = signal(this.token.options ?? {}, ...(ngDevMode ? [{ debugName: "_options" }] : /* istanbul ignore next */ []));
         this.options = this._options.asReadonly();
         this.onOptionsChanged = new Subject();
-        this._status = signal(AXPWidgetStatus.Rendering, ...(ngDevMode ? [{ debugName: "_status" }] : []));
+        this._status = signal(AXPWidgetStatus.Rendering, ...(ngDevMode ? [{ debugName: "_status" }] : /* istanbul ignore next */ []));
         this.status = this._status.asReadonly();
         this.onStatusChanged = new BehaviorSubject(this._status());
         this.#statusEffect = effect(() => {
             this.onStatusChanged.next(this.status());
-        }, ...(ngDevMode ? [{ debugName: "#statusEffect" }] : []));
-        this.isBusy = computed(() => [AXPWidgetStatus.Rendering, AXPWidgetStatus.Processing].includes(this.status()), ...(ngDevMode ? [{ debugName: "isBusy" }] : []));
-        this._children = signal(this.token.node.children ?? [], ...(ngDevMode ? [{ debugName: "_children" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "#statusEffect" }] : /* istanbul ignore next */ []));
+        this.isBusy = computed(() => [AXPWidgetStatus.Rendering, AXPWidgetStatus.Processing].includes(this.status()), ...(ngDevMode ? [{ debugName: "isBusy" }] : /* istanbul ignore next */ []));
+        this._children = signal(this.token.node.children ?? [], ...(ngDevMode ? [{ debugName: "_children" }] : /* istanbul ignore next */ []));
         this.children = this._children.asReadonly();
     }
     get id() {
@@ -530,7 +411,7 @@ class AXPBaseWidgetComponent extends AXPWidgetCoreElement {
     output(name) {
         const outputs = this.outputs().map((c) => (typeof c == 'string' ? { name: c, value: c } : c));
         if (outputs.some((c) => c.name == name)) {
-            const opt = get(this, name);
+            const opt = outputs.find((c) => c.name == name)?.value;
             if (typeof opt == 'function') {
                 return opt();
             }
@@ -548,10 +429,10 @@ class AXPBaseWidgetComponent extends AXPWidgetCoreElement {
         this._children.set([...children]);
     }
     onAdded() { }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPBaseWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPBaseWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBaseWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBaseWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPBaseWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBaseWidgetComponent, decorators: [{
             type: Injectable
         }] });
 class AXPLayoutBaseWidgetComponent extends AXPBaseWidgetComponent {
@@ -562,10 +443,10 @@ class AXPLayoutBaseWidgetComponent extends AXPBaseWidgetComponent {
         }
         super.ngOnInit();
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLayoutBaseWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLayoutBaseWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutBaseWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutBaseWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPLayoutBaseWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPLayoutBaseWidgetComponent, decorators: [{
             type: Injectable
         }] });
 class AXPValueWidgetComponent extends AXPLayoutBaseWidgetComponent {
@@ -576,11 +457,11 @@ class AXPValueWidgetComponent extends AXPLayoutBaseWidgetComponent {
         this._isValueWidget = false;
         this.isValueWidget = () => this._isValueWidget;
         this.onValueChanged = new Subject();
-        this.fullPath = signal(null, ...(ngDevMode ? [{ debugName: "fullPath" }] : []));
-        this.parentPath = signal(null, ...(ngDevMode ? [{ debugName: "parentPath" }] : []));
+        this.fullPath = signal(null, ...(ngDevMode ? [{ debugName: "fullPath" }] : /* istanbul ignore next */ []));
+        this.parentPath = signal(null, ...(ngDevMode ? [{ debugName: "parentPath" }] : /* istanbul ignore next */ []));
         this.getValue = computed(() => {
             return this.fullPath() ? this.extractValue(this.fullPath()) : null;
-        }, ...(ngDevMode ? [{ debugName: "getValue", equal: isEqual }] : [{ equal: isEqual }]));
+        }, { ...(ngDevMode ? { debugName: "getValue" } : /* istanbul ignore next */ {}), equal: isEqual });
         this.validationRules = computed(() => {
             const validationsRaw = this.options()['validations'];
             if (validationsRaw == null) {
@@ -593,7 +474,7 @@ class AXPValueWidgetComponent extends AXPLayoutBaseWidgetComponent {
                 message: c.message,
                 options: c.options,
             }));
-        }, ...(ngDevMode ? [{ debugName: "validationRules" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "validationRules" }] : /* istanbul ignore next */ []));
     }
     ngOnInit() {
         this._isValueWidget = this.config.properties?.some((c) => c.name == 'path') ?? false;
@@ -623,7 +504,12 @@ class AXPValueWidgetComponent extends AXPLayoutBaseWidgetComponent {
         if (isNil(value) && isNil(oldValue)) {
             return;
         }
-        if (isEqual(oldValue, value)) {
+        // Reordered arrays must persist even when items are deep-equal (e.g. empty row objects).
+        const isArrayReorder = Array.isArray(oldValue) &&
+            Array.isArray(value) &&
+            oldValue.length === value.length &&
+            oldValue.some((v, i) => v !== value[i]);
+        if (!isArrayReorder && isEqual(oldValue, value)) {
             return;
         }
         if (this.fullPath()) {
@@ -670,23 +556,23 @@ class AXPValueWidgetComponent extends AXPLayoutBaseWidgetComponent {
             this.setValue(e.value);
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPValueWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPValueWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPValueWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPValueWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPValueWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPValueWidgetComponent, decorators: [{
             type: Injectable
         }] });
 class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
     constructor() {
         super(...arguments);
         this.dataService = inject(AXPDataSourceDefinitionProviderService);
-        this.textField = computed(() => this.options()['textField'] ?? 'title', ...(ngDevMode ? [{ debugName: "textField" }] : []));
-        this.valueField = computed(() => this.options()['valueField'] ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : []));
+        this.textField = computed(() => this.options()['textField'] ?? 'title', ...(ngDevMode ? [{ debugName: "textField" }] : /* istanbul ignore next */ []));
+        this.valueField = computed(() => this.options()['valueField'] ?? 'id', ...(ngDevMode ? [{ debugName: "valueField" }] : /* istanbul ignore next */ []));
         this.textTemplate = computed(() => isNil(this.options()['textTemplate'])
             ? undefined
-            : this.options()['textTemplate'].replace(/{/g, '{{').replace(/}/g, '}}'), ...(ngDevMode ? [{ debugName: "textTemplate" }] : []));
-        this.dataSource = signal(convertArrayToDataSource([]), ...(ngDevMode ? [{ debugName: "dataSource" }] : []));
-        this.selectedItems = signal([], ...(ngDevMode ? [{ debugName: "selectedItems" }] : []));
+            : this.options()['textTemplate'].replace(/{/g, '{{').replace(/}/g, '}}'), ...(ngDevMode ? [{ debugName: "textTemplate" }] : /* istanbul ignore next */ []));
+        this.dataSource = signal(convertArrayToDataSource([]), ...(ngDevMode ? [{ debugName: "dataSource" }] : /* istanbul ignore next */ []));
+        this.selectedItems = signal([], ...(ngDevMode ? [{ debugName: "selectedItems" }] : /* istanbul ignore next */ []));
         //#region ----   DataSource Loading Effect   ----
         /**
          * Track the last loaded string dataSource reference to prevent infinite loops
@@ -766,7 +652,7 @@ class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
                     this.dataSource.set(convertArrayToDataSource([]));
                 }
             });
-        }, ...(ngDevMode ? [{ debugName: "rf" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "rf" }] : /* istanbul ignore next */ []));
         this.effect2 = effect(async () => {
             const value = this.getValue();
             const items = [];
@@ -777,7 +663,7 @@ class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
                 items.push(await this.extractItem(value));
             }
             this.selectedItems.set(items.filter((c) => c != null));
-        }, ...(ngDevMode ? [{ debugName: "effect2" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "effect2" }] : /* istanbul ignore next */ []));
     }
     //#endregion
     async extractItem(item) {
@@ -802,10 +688,10 @@ class AXPDataListWidgetComponent extends AXPValueWidgetComponent {
                 [this.textField()]: item,
             };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPDataListWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPDataListWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDataListWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDataListWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPDataListWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPDataListWidgetComponent, decorators: [{
             type: Injectable
         }] });
 class AXPColumnWidgetComponent {
@@ -813,20 +699,22 @@ class AXPColumnWidgetComponent {
         this.token = inject(AXP_WIDGET_COLUMN_TOKEN);
         this.path = this.token.path;
         this.options = this.token.options ?? {};
+        /** Column header caption when rendered inside `axp-widget-column-renderer`. */
+        this.columnCaption = this.token.caption;
         this.rawValue = null;
         this.nullText = this.options['nullText'];
         this.nullValue = this.options['nullValue'];
-        this.value = computed(() => {
+        this.value = () => {
             if (isNil(this.rawValue) && !isNil(this.nullValue)) {
                 return this.nullValue;
             }
             return this.rawValue;
-        }, ...(ngDevMode ? [{ debugName: "value" }] : []));
+        };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPColumnWidgetComponent, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPColumnWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPColumnWidgetComponent, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPColumnWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPColumnWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPColumnWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
@@ -855,7 +743,7 @@ class AXPBoxModelLayoutWidgetComponent extends AXPLayoutBaseWidgetComponent {
             style['overflow-y'] = overflowY ?? '';
             style['direction'] = direction ?? '';
             return style;
-        }, ...(ngDevMode ? [{ debugName: "hostBoxStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostBoxStyle" }] : /* istanbul ignore next */ []));
         this.blockStyle = computed(() => {
             const options = this.options();
             const style = { ...this.hostBoxStyle() };
@@ -872,47 +760,47 @@ class AXPBoxModelLayoutWidgetComponent extends AXPLayoutBaseWidgetComponent {
             style['height'] = height ?? '';
             style['max-height'] = maxHeight ?? '';
             return style;
-        }, ...(ngDevMode ? [{ debugName: "blockStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "blockStyle" }] : /* istanbul ignore next */ []));
         this.inlineStyle = computed(() => {
             return { ...this.hostBoxStyle() };
-        }, ...(ngDevMode ? [{ debugName: "inlineStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "inlineStyle" }] : /* istanbul ignore next */ []));
         this.blockClass = computed(() => {
             return {
                 'ax-block': true,
                 'ax-w-full': true,
                 // 'ax-widget-outline': true,
             };
-        }, ...(ngDevMode ? [{ debugName: "blockClass" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "blockClass" }] : /* istanbul ignore next */ []));
         this.inlineClass = computed(() => {
             return {
                 'ax-inline-block': true,
             };
-        }, ...(ngDevMode ? [{ debugName: "inlineClass" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "inlineClass" }] : /* istanbul ignore next */ []));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPBoxModelLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPBoxModelLayoutWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBoxModelLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBoxModelLayoutWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPBoxModelLayoutWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBoxModelLayoutWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
 class AXPBlockBaseLayoutWidgetComponent extends AXPBoxModelLayoutWidgetComponent {
     constructor() {
         super(...arguments);
-        this.hostClass = computed(() => this.blockClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : []));
-        this.hostStyle = computed(() => this.blockStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : []));
+        this.hostClass = computed(() => this.blockClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : /* istanbul ignore next */ []));
+        this.hostStyle = computed(() => this.blockStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : /* istanbul ignore next */ []));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPBlockBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPBlockBaseLayoutWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBlockBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBlockBaseLayoutWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPBlockBaseLayoutWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPBlockBaseLayoutWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
 class AXPFlexBaseLayoutWidgetComponent extends AXPBlockBaseLayoutWidgetComponent {
     constructor() {
         super(...arguments);
-        this.flex = computed(() => this.options(), ...(ngDevMode ? [{ debugName: "flex" }] : []));
+        this.flex = computed(() => this.options(), ...(ngDevMode ? [{ debugName: "flex" }] : /* istanbul ignore next */ []));
         this.hostFlexStyle = computed(() => {
             const blockStyle = this.blockStyle();
             const style = { ...blockStyle };
@@ -951,45 +839,45 @@ class AXPFlexBaseLayoutWidgetComponent extends AXPBlockBaseLayoutWidgetComponent
                 style['gap'] = flex.gap;
             }
             return style;
-        }, ...(ngDevMode ? [{ debugName: "hostFlexStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostFlexStyle" }] : /* istanbul ignore next */ []));
         this.hostFlexClass = computed(() => {
             return {
                 ...this.blockClass(),
                 'ax-flex': true,
                 'ax-h-full': true,
             };
-        }, ...(ngDevMode ? [{ debugName: "hostFlexClass" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostFlexClass" }] : /* istanbul ignore next */ []));
         this.hostClass = computed(() => {
             return this.hostFlexClass();
-        }, ...(ngDevMode ? [{ debugName: "hostClass" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostClass" }] : /* istanbul ignore next */ []));
         this.hostStyle = computed(() => {
             return this.hostFlexStyle();
-        }, ...(ngDevMode ? [{ debugName: "hostStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostStyle" }] : /* istanbul ignore next */ []));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPFlexBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPFlexBaseLayoutWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPFlexBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPFlexBaseLayoutWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPFlexBaseLayoutWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPFlexBaseLayoutWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
 class AXPInlineBaseLayoutWidgetComponent extends AXPBoxModelLayoutWidgetComponent {
     constructor() {
         super(...arguments);
-        this.hostClass = computed(() => this.inlineClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : []));
-        this.hostStyle = computed(() => this.inlineStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : []));
+        this.hostClass = computed(() => this.inlineClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : /* istanbul ignore next */ []));
+        this.hostStyle = computed(() => this.inlineStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : /* istanbul ignore next */ []));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPInlineBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPInlineBaseLayoutWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPInlineBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPInlineBaseLayoutWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPInlineBaseLayoutWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPInlineBaseLayoutWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
 class AXPFlexItemBaseLayoutWidgetComponent extends AXPInlineBaseLayoutWidgetComponent {
     constructor() {
         super(...arguments);
-        this.flexItem = computed(() => this.options(), ...(ngDevMode ? [{ debugName: "flexItem" }] : []));
+        this.flexItem = computed(() => this.options(), ...(ngDevMode ? [{ debugName: "flexItem" }] : /* istanbul ignore next */ []));
         this.hostFlexItemStyle = computed(() => {
             const inlineStyle = this.blockStyle();
             const style = { ...inlineStyle };
@@ -1025,37 +913,37 @@ class AXPFlexItemBaseLayoutWidgetComponent extends AXPInlineBaseLayoutWidgetComp
                 style['align-self'] = fi.alignSelf;
             }
             return style;
-        }, ...(ngDevMode ? [{ debugName: "hostFlexItemStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostFlexItemStyle" }] : /* istanbul ignore next */ []));
         this.hostFlexItemClass = computed(() => {
             return {
                 ...this.blockClass(),
             };
-        }, ...(ngDevMode ? [{ debugName: "hostFlexItemClass" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostFlexItemClass" }] : /* istanbul ignore next */ []));
         this.hostClass = computed(() => {
             return this.hostFlexItemClass();
-        }, ...(ngDevMode ? [{ debugName: "hostClass" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostClass" }] : /* istanbul ignore next */ []));
         this.hostStyle = computed(() => {
             return this.hostFlexItemStyle();
-        }, ...(ngDevMode ? [{ debugName: "hostStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostStyle" }] : /* istanbul ignore next */ []));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPFlexItemBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPFlexItemBaseLayoutWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPFlexItemBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPFlexItemBaseLayoutWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPFlexItemBaseLayoutWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPFlexItemBaseLayoutWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
 class AXPGridBaseLayoutWidgetComponent extends AXPBlockBaseLayoutWidgetComponent {
     constructor() {
         super(...arguments);
-        this.grid = computed(() => this.options()?.['grid'], ...(ngDevMode ? [{ debugName: "grid" }] : []));
+        this.grid = computed(() => this.options()?.['grid'], ...(ngDevMode ? [{ debugName: "grid" }] : /* istanbul ignore next */ []));
         this.hostGridStyle = computed(() => {
             const style = { ...this.inlineStyle() };
             const g = this.grid()?.default;
             if (g?.gap)
                 style['gap'] = g.gap;
             return style;
-        }, ...(ngDevMode ? [{ debugName: "hostGridStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostGridStyle" }] : /* istanbul ignore next */ []));
         this.hostGridClass = computed(() => {
             const cls = {
                 ...this.inlineClass(),
@@ -1064,8 +952,7 @@ class AXPGridBaseLayoutWidgetComponent extends AXPBlockBaseLayoutWidgetComponent
             const g = this.grid()?.default;
             if (g?.columns)
                 cls[`lg:ax-grid-cols-${g.columns}`] = true;
-            if (g?.rows)
-                cls[`lg:ax-grid-rows-${g.rows}`] = true;
+            // if (g?.rows) cls[`lg:ax-grid-rows-${g.rows}`] = true;
             if (g?.justifyItems)
                 cls[`lg:ax-justify-items-${g.justifyItems}`] = true;
             if (g?.alignItems)
@@ -1073,21 +960,21 @@ class AXPGridBaseLayoutWidgetComponent extends AXPBlockBaseLayoutWidgetComponent
             if (g?.autoFlow)
                 cls[`lg:ax-grid-flow-${g.autoFlow}`] = true;
             return cls;
-        }, ...(ngDevMode ? [{ debugName: "hostGridClass" }] : []));
-        this.hostClass = computed(() => this.hostGridClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : []));
-        this.hostStyle = computed(() => this.hostGridStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostGridClass" }] : /* istanbul ignore next */ []));
+        this.hostClass = computed(() => this.hostGridClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : /* istanbul ignore next */ []));
+        this.hostStyle = computed(() => this.hostGridStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : /* istanbul ignore next */ []));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPGridBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPGridBaseLayoutWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPGridBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPGridBaseLayoutWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPGridBaseLayoutWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPGridBaseLayoutWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
 class AXPGridItemBaseLayoutWidgetComponent extends AXPFlexBaseLayoutWidgetComponent {
     constructor() {
         super(...arguments);
-        this.gridItem = computed(() => this.options(), ...(ngDevMode ? [{ debugName: "gridItem" }] : []));
+        this.gridItem = computed(() => this.options(), ...(ngDevMode ? [{ debugName: "gridItem" }] : /* istanbul ignore next */ []));
         this.hostGridItemStyle = computed(() => {
             const style = { ...this.hostFlexStyle() };
             const g = this.gridItem();
@@ -1096,10 +983,13 @@ class AXPGridItemBaseLayoutWidgetComponent extends AXPFlexBaseLayoutWidgetCompon
             if (g?.justifySelf)
                 style['justify-self'] = g.justifySelf;
             return style;
-        }, ...(ngDevMode ? [{ debugName: "hostGridItemStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostGridItemStyle" }] : /* istanbul ignore next */ []));
         this.hostGridItemClass = computed(() => {
             const cls = { ...this.hostFlexClass() };
             const g = this.gridItem();
+            // Mobile-first: full width on small screens so items stack vertically and don't overflow
+            cls['ax-col-span-12'] = true;
+            // Large screens: apply defined placement so multi-column layout works on desktop
             if (g?.colSpan)
                 cls[`lg:ax-col-span-${g.colSpan}`] = true;
             if (g?.colStart)
@@ -1113,14 +1003,14 @@ class AXPGridItemBaseLayoutWidgetComponent extends AXPFlexBaseLayoutWidgetCompon
             if (g?.rowEnd)
                 cls[`lg:ax-row-end-${g.rowEnd}`] = true;
             return cls;
-        }, ...(ngDevMode ? [{ debugName: "hostGridItemClass" }] : []));
-        this.hostClass = computed(() => this.hostGridItemClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : []));
-        this.hostStyle = computed(() => this.hostGridItemStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostGridItemClass" }] : /* istanbul ignore next */ []));
+        this.hostClass = computed(() => this.hostGridItemClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : /* istanbul ignore next */ []));
+        this.hostStyle = computed(() => this.hostGridItemStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : /* istanbul ignore next */ []));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPGridItemBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPGridItemBaseLayoutWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPGridItemBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPGridItemBaseLayoutWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPGridItemBaseLayoutWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPGridItemBaseLayoutWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
@@ -1129,27 +1019,27 @@ class AXPTableBaseLayoutWidgetComponent extends AXPBlockBaseLayoutWidgetComponen
         super(...arguments);
         this.hostTableClass = computed(() => ({
             ...this.blockClass(),
-        }), ...(ngDevMode ? [{ debugName: "hostTableClass" }] : []));
+        }), ...(ngDevMode ? [{ debugName: "hostTableClass" }] : /* istanbul ignore next */ []));
         this.hostTableStyle = computed(() => {
             const style = { ...this.blockStyle() };
             style['overflow-x'] = 'auto';
             return style;
-        }, ...(ngDevMode ? [{ debugName: "hostTableStyle" }] : []));
-        this.hostClass = computed(() => this.hostTableClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : []));
-        this.hostStyle = computed(() => this.hostTableStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "hostTableStyle" }] : /* istanbul ignore next */ []));
+        this.hostClass = computed(() => this.hostTableClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : /* istanbul ignore next */ []));
+        this.hostStyle = computed(() => this.hostTableStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : /* istanbul ignore next */ []));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPTableBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPTableBaseLayoutWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPTableBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPTableBaseLayoutWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPTableBaseLayoutWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPTableBaseLayoutWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
 class AXPTableItemOpsBaseLayoutWidgetComponent extends AXPBlockBaseLayoutWidgetComponent {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPTableItemOpsBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPTableItemOpsBaseLayoutWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPTableItemOpsBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPTableItemOpsBaseLayoutWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPTableItemOpsBaseLayoutWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPTableItemOpsBaseLayoutWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
@@ -1159,57 +1049,105 @@ class AXPTableItemBaseLayoutWidgetComponent extends AXPTableItemOpsBaseLayoutWid
         this.colSpan = computed(() => {
             const v = this.options()?.colSpan;
             return v ? Math.max(1, v) : 1;
-        }, ...(ngDevMode ? [{ debugName: "colSpan" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "colSpan" }] : /* istanbul ignore next */ []));
         this.rowSpan = computed(() => {
             const v = this.options()?.rowSpan;
             return v ? Math.max(1, v) : 1;
-        }, ...(ngDevMode ? [{ debugName: "rowSpan" }] : []));
-        this.hostClass = computed(() => this.blockClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : []));
-        this.hostStyle = computed(() => this.blockStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "rowSpan" }] : /* istanbul ignore next */ []));
+        this.hostClass = computed(() => this.blockClass(), ...(ngDevMode ? [{ debugName: "hostClass" }] : /* istanbul ignore next */ []));
+        this.hostStyle = computed(() => this.blockStyle(), ...(ngDevMode ? [{ debugName: "hostStyle" }] : /* istanbul ignore next */ []));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPTableItemBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPTableItemBaseLayoutWidgetComponent }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPTableItemBaseLayoutWidgetComponent, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPTableItemBaseLayoutWidgetComponent }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPTableItemBaseLayoutWidgetComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPTableItemBaseLayoutWidgetComponent, decorators: [{
             type: Injectable
         }] });
 
+//#region ----   Imports   ----
+/**
+ * Injection token for widget definition providers.
+ * Modules register their widget providers using this token (multi: true).
+ */
+const AXP_WIDGET_DEFINITION_PROVIDER = new InjectionToken('AXP_WIDGET_DEFINITION_PROVIDER', {
+    factory: () => [],
+});
+//#endregion
+
+//#region ----   Build widget map (shared with tooling / snapshot scripts)   ----
+//TODO RECHECK THIS FUNCTION s.hosseini
+/**
+ * Merges core + extended widgets the same way as AXPWidgetRegistryService.ensureBuilt().
+ * Use with concrete providers (e.g. AXPCoreWidgetsProvider, AXPEntityWidgetsProvider) in Node scripts without DI.
+ */
+function buildWidgetRegistryMapFromProviders(providers) {
+    const types = new Map();
+    const AXPExtendedWidgets = [];
+    for (const provider of providers) {
+        const widgets = provider.getWidgets?.() ?? [];
+        for (const w of widgets) {
+            types.set(w.name, w);
+        }
+        const extended = provider.getExtendedWidgets?.() ?? [];
+        AXPExtendedWidgets.push(...extended);
+    }
+    for (const { parentName, widget } of AXPExtendedWidgets) {
+        const parent = types.get(parentName);
+        if (parent) {
+            const merged = merge({}, parent, widget);
+            merged.name = widget.name;
+            types.set(merged.name, merged);
+        }
+    }
+    return types;
+}
+//#endregion
+//#region ----   Widget Registry Service (Token-Based)   ----
+/**
+ * Aggregates widgets from all AXP_WIDGET_DEFINITION_PROVIDER instances.
+ * Token-based like AXP_MENU_PROVIDER / AXP_PERMISSION_DEFINITION_PROVIDER / AXP_SETTING_DEFINITION_PROVIDER.
+ * No separate registry - widgets come solely from providers.
+ */
 class AXPWidgetRegistryService {
-    /**
-     *
-     */
     constructor() {
-        this.types = new Map();
-        AXPWidgetRegistryService.instance = this;
-    }
-    register(widget) {
-        this.types.set(widget.name, widget);
+        this._providers = inject(AXP_WIDGET_DEFINITION_PROVIDER, { optional: true }) ?? [];
+        this._types = null;
     }
-    extend(parentName, widget) {
-        const parentWidget = this.resolve(parentName);
-        const newWidget = merge({}, parentWidget, widget);
-        newWidget.name = widget.name;
-        this.register(newWidget);
+    /**
+     * Lazy-build widget map from all providers.
+     */
+    ensureBuilt() {
+        if (this._types)
+            return this._types;
+        this._types = buildWidgetRegistryMapFromProviders(this._providers);
+        return this._types;
     }
     resolve(name) {
-        const widget = this.types.get(name);
+        const widget = this.ensureBuilt().get(name);
         if (!widget) {
             throw new Error(`Widget with name "${name}" does not exist.`);
         }
         return widget;
     }
+    /**
+     * Registered widget config when present; otherwise `undefined`. Does not throw — use when
+     * {@link resolve}'s value may be a non-widget id (e.g. data-source row id in dynamic field configurator).
+     */
+    getOptional(name) {
+        return this.ensureBuilt().get(name);
+    }
     all() {
-        return Array.from(this.types.values());
+        return Array.from(this.ensureBuilt().values());
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetRegistryService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetRegistryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetRegistryService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetRegistryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetRegistryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetRegistryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: () => [] });
+        }] });
 
 class AXPWidgetColumnRendererComponent extends AXDataTableColumnComponent {
     constructor() {
@@ -1217,8 +1155,8 @@ class AXPWidgetColumnRendererComponent extends AXDataTableColumnComponent {
         this.widgetRegistery = inject(AXPWidgetRegistryService);
         this.grid = inject(AXBaseDataTable);
         this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
-        this.mergedOptions = signal({}, ...(ngDevMode ? [{ debugName: "mergedOptions" }] : []));
-        this.loadingRow = signal(null, ...(ngDevMode ? [{ debugName: "loadingRow" }] : []));
+        this.mergedOptions = signal({}, ...(ngDevMode ? [{ debugName: "mergedOptions" }] : /* istanbul ignore next */ []));
+        this.loadingRow = signal(null, ...(ngDevMode ? [{ debugName: "loadingRow" }] : /* istanbul ignore next */ []));
         this.rowInjectorsCache = new Map();
         this.hasExpressions = false;
         this.pendingEvaluations = new Set();
@@ -1239,6 +1177,19 @@ class AXPWidgetColumnRendererComponent extends AXDataTableColumnComponent {
     get renderCellTemplate() {
         return this.cellTemplate ?? this._contentCellTemplate;
     }
+    /**
+     * True when the row should show the expand icon: either hasChild is true (from server/initial load)
+     * or the row has loaded children (e.g. after refreshItemChildren when children go from 0 to 1).
+     */
+    hasExpandableRow(row) {
+        const data = row?.data;
+        if (!data)
+            return false;
+        if (data['hasChild'] === true)
+            return true;
+        const children = data['__meta__']?.['children'];
+        return Array.isArray(children) && children.length > 0;
+    }
     async handleExpandRow(row) {
         this.loadingRow.set(row);
         await this.grid.expandRow(row);
@@ -1250,6 +1201,56 @@ class AXPWidgetColumnRendererComponent extends AXDataTableColumnComponent {
     get renderHeaderTemplate() {
         return this.headerTemplate ?? this._contentHeaderTemplate;
     }
+    //#region ---- Column alignment (header / cell) ----
+    /**
+     * Resolves `options.align`: string applies to header and cell; object uses optional `header` / `cell` (default start).
+     * Supports designer select values `{ id: 'center' }`.
+     */
+    getHeaderTextAlign() {
+        return this.resolveAlignForSide('header');
+    }
+    /**
+     * When true, the cell body uses flex so `justify-content` can place content on the main axis.
+     */
+    getCellUseFlexLayout() {
+        return !!this.expandHandler || this.resolveAlignForSide('cell') !== 'start';
+    }
+    /**
+     * Flex `justify-content` for the cell wrapper; omit when not using flex layout.
+     */
+    getCellJustifyContent() {
+        if (!this.getCellUseFlexLayout()) {
+            return null;
+        }
+        return this.resolveAlignForSide('cell');
+    }
+    resolveAlignForSide(side) {
+        const align = this.mergedOptions().align;
+        if (align == null || align === '') {
+            return 'start';
+        }
+        if (typeof align === 'string') {
+            return this.normalizeColumnAlignment(align);
+        }
+        if (typeof align === 'object' && !Array.isArray(align)) {
+            const raw = side === 'header' ? align.header : align.cell;
+            return this.normalizeColumnAlignment(raw);
+        }
+        return 'start';
+    }
+    normalizeColumnAlignment(value) {
+        if (value === 'center' || value === 'end' || value === 'start') {
+            return value;
+        }
+        if (value && typeof value === 'object' && 'id' in value) {
+            const id = value.id;
+            if (id === 'center' || id === 'end' || id === 'start') {
+                return id;
+            }
+        }
+        return 'start';
+    }
+    //#endregion
     get loadingEnabled() {
         return true;
     }
@@ -1274,6 +1275,7 @@ class AXPWidgetColumnRendererComponent extends AXDataTableColumnComponent {
         const tokenValue = {
             path: this.node.path,
             options: this.mergedOptions(),
+            caption: this.caption,
         };
         this.widgetInjector = Injector.create({
             parent: this.injector,
@@ -1372,6 +1374,7 @@ class AXPWidgetColumnRendererComponent extends AXDataTableColumnComponent {
                 const tokenValue = {
                     path: this.node.path,
                     options: this.mergedOptions(),
+                    caption: this.caption,
                 };
                 rowInjector = Injector.create({
                     parent: this.injector,
@@ -1404,6 +1407,7 @@ class AXPWidgetColumnRendererComponent extends AXDataTableColumnComponent {
                     const tokenValue = {
                         path: this.node.path,
                         options: evaluatedOptions,
+                        caption: this.caption,
                     };
                     const newInjector = Injector.create({
                         parent: this.injector,
@@ -1430,6 +1434,7 @@ class AXPWidgetColumnRendererComponent extends AXDataTableColumnComponent {
             const tokenValue = {
                 path: this.node.path,
                 options: this.mergedOptions(),
+                caption: this.caption,
             };
             rowInjector = Injector.create({
                 parent: this.injector,
@@ -1446,19 +1451,27 @@ class AXPWidgetColumnRendererComponent extends AXDataTableColumnComponent {
         }
         return rowInjector;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetColumnRendererComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "20.3.12", type: AXPWidgetColumnRendererComponent, isStandalone: false, selector: "axp-widget-column-renderer", inputs: { caption: "caption", customExpandIcon: "customExpandIcon", customCollapseIcon: "customCollapseIcon", customWidth: "customWidth", node: "node", footerTemplate: "footerTemplate", expandHandler: "expandHandler", cellTemplate: "cellTemplate", headerTemplate: "headerTemplate" }, providers: [
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetColumnRendererComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "17.0.0", version: "21.2.9", type: AXPWidgetColumnRendererComponent, isStandalone: false, selector: "axp-widget-column-renderer", inputs: { caption: "caption", customExpandIcon: "customExpandIcon", customCollapseIcon: "customCollapseIcon", customWidth: "customWidth", node: "node", footerTemplate: "footerTemplate", expandHandler: "expandHandler", cellTemplate: "cellTemplate", headerTemplate: "headerTemplate" }, providers: [
             AXPWidgetCoreService,
             { provide: AXDataTableColumnComponent, useExisting: AXPWidgetColumnRendererComponent },
         ], viewQueries: [{ propertyName: "_contentFooterTemplate", first: true, predicate: ["footer"], descendants: true }, { propertyName: "_contentCellTemplate", first: true, predicate: ["cell"], descendants: true }, { propertyName: "_contentHeaderTemplate", first: true, predicate: ["header"], descendants: true }], usesInheritance: true, ngImport: i0, template: `
-    <ng-template #header>{{ caption | translate | async }}</ng-template>
+    <ng-template #header>
+      <div class="ax-w-full" [style.text-align]="getHeaderTextAlign()">{{ caption | translate | async }}</div>
+    </ng-template>
     <ng-template #cell let-row>
-      <div [class]="expandHandler ? 'ax-flex ax-gap-2 ax-items-center' : ''">
+      <div
+        class="ax-w-full"
+        [class.ax-flex]="getCellUseFlexLayout()"
+        [class.ax-gap-2]="expandHandler"
+        [class.ax-items-center]="getCellUseFlexLayout()"
+        [style.justify-content]="getCellJustifyContent()"
+      >
         @if (expandHandler) {
           <div
             (click)="handleExpandRow(row)"
             class="ax-expand-handler"
-            [class.ax-invisible]="row.data.hasChild === false"
+            [class.ax-invisible]="!hasExpandableRow(row)"
             id="ax-expand-handler-container"
             [style.padding-inline-start.rem]="row.data?.__meta__?.level * 2"
           >
@@ -1481,21 +1494,29 @@ class AXPWidgetColumnRendererComponent extends AXDataTableColumnComponent {
       </div>
     </ng-template>
     <ng-template #footer></ng-template>
-  `, isInline: true, dependencies: [{ kind: "directive", type: i1.NgComponentOutlet, selector: "[ngComponentOutlet]", inputs: ["ngComponentOutlet", "ngComponentOutletInputs", "ngComponentOutletInjector", "ngComponentOutletEnvironmentInjector", "ngComponentOutletContent", "ngComponentOutletNgModule", "ngComponentOutletNgModuleFactory"], exportAs: ["ngComponentOutlet"] }, { kind: "pipe", type: i1.AsyncPipe, name: "async" }, { kind: "pipe", type: i2.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+  `, isInline: true, dependencies: [{ kind: "directive", type: i1.NgComponentOutlet, selector: "[ngComponentOutlet]", inputs: ["ngComponentOutlet", "ngComponentOutletInputs", "ngComponentOutletInjector", "ngComponentOutletEnvironmentInjector", "ngComponentOutletContent", "ngComponentOutletNgModule"], exportAs: ["ngComponentOutlet"] }, { kind: "pipe", type: i1.AsyncPipe, name: "async" }, { kind: "pipe", type: i2.AXTranslatorPipe, name: "translate" }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetColumnRendererComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetColumnRendererComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'axp-widget-column-renderer',
                     template: `
-    <ng-template #header>{{ caption | translate | async }}</ng-template>
+    <ng-template #header>
+      <div class="ax-w-full" [style.text-align]="getHeaderTextAlign()">{{ caption | translate | async }}</div>
+    </ng-template>
     <ng-template #cell let-row>
-      <div [class]="expandHandler ? 'ax-flex ax-gap-2 ax-items-center' : ''">
+      <div
+        class="ax-w-full"
+        [class.ax-flex]="getCellUseFlexLayout()"
+        [class.ax-gap-2]="expandHandler"
+        [class.ax-items-center]="getCellUseFlexLayout()"
+        [style.justify-content]="getCellJustifyContent()"
+      >
         @if (expandHandler) {
           <div
             (click)="handleExpandRow(row)"
             class="ax-expand-handler"
-            [class.ax-invisible]="row.data.hasChild === false"
+            [class.ax-invisible]="!hasExpandableRow(row)"
             id="ax-expand-handler-container"
             [style.padding-inline-start.rem]="row.data?.__meta__?.level * 2"
           >
@@ -1563,15 +1584,15 @@ class AXPWidgetContainerComponent {
         this.builderService.setFunctions(v);
     }
     constructor() {
-        this.contextService = inject(AXPWidgetCoreContextStore);
+        this.contextService = inject(AXPContextStore);
         this.builderService = inject(AXPWidgetCoreService);
         this.onContextChanged = new EventEmitter();
         this.status = computed(() => {
             return this.builderService.status();
-        }, ...(ngDevMode ? [{ debugName: "status" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "status" }] : /* istanbul ignore next */ []));
         this.isBusy = computed(() => {
             return this.builderService.isBusy();
-        }, ...(ngDevMode ? [{ debugName: "isBusy" }] : []));
+        }, ...(ngDevMode ? [{ debugName: "isBusy" }] : /* istanbul ignore next */ []));
         effect(() => {
             if (this.contextService.isChanged()) {
                 this.onContextChanged.emit(this.contextService.changeEvent());
@@ -1584,17 +1605,17 @@ class AXPWidgetContainerComponent {
     find(name) {
         return this.builderService.waitForWidget(name);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetContainerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.12", type: AXPWidgetContainerComponent, isStandalone: false, selector: "axp-widgets-container", inputs: { context: "context", functions: "functions" }, outputs: { onContextChanged: "onContextChanged" }, host: { styleAttribute: "display: contents;" }, providers: [AXPWidgetCoreService, AXPWidgetCoreContextStore], ngImport: i0, template: `<ng-content></ng-content>`, isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetContainerComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "21.2.9", type: AXPWidgetContainerComponent, isStandalone: false, selector: "axp-widgets-container", inputs: { context: "context", functions: "functions" }, outputs: { onContextChanged: "onContextChanged" }, host: { styleAttribute: "display: contents;" }, providers: [AXPWidgetCoreService, AXPContextStore], ngImport: i0, template: `<ng-content></ng-content>`, isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetContainerComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetContainerComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'axp-widgets-container',
                     template: `<ng-content></ng-content>`,
                     changeDetection: ChangeDetectionStrategy.OnPush,
                     host: { style: 'display: contents;' },
-                    providers: [AXPWidgetCoreService, AXPWidgetCoreContextStore],
+                    providers: [AXPWidgetCoreService, AXPContextStore],
                     standalone: false,
                 }]
         }], ctorParameters: () => [], propDecorators: { onContextChanged: [{
@@ -1606,12 +1627,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
             }] } });
 
 class AXPWidgetPlaceholderComponent {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetPlaceholderComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "20.3.12", type: AXPWidgetPlaceholderComponent, isStandalone: true, selector: "axp-widget-placeholder", ngImport: i0, template: `<div>
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetPlaceholderComponent, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "21.2.9", type: AXPWidgetPlaceholderComponent, isStandalone: true, selector: "axp-widget-placeholder", ngImport: i0, template: `<div>
     <ax-skeleton class="ax-w-full ax-h-10 ax-rounded-md"></ax-skeleton>
   </div>`, isInline: true, dependencies: [{ kind: "ngmodule", type: AXSkeletonModule }, { kind: "component", type: i1$1.AXSkeletonComponent, selector: "ax-skeleton", inputs: ["animated"] }], changeDetection: i0.ChangeDetectionStrategy.OnPush }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetPlaceholderComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetPlaceholderComponent, decorators: [{
             type: Component,
             args: [{
                     selector: 'axp-widget-placeholder',
@@ -1628,11 +1649,11 @@ class AXPWidgetRendererDirective {
     //#endregion
     //#endregion
     constructor() {
-        this.parentNode = input(...(ngDevMode ? [undefined, { debugName: "parentNode" }] : []));
-        this.index = input(...(ngDevMode ? [undefined, { debugName: "index" }] : []));
-        this.mode = input.required(...(ngDevMode ? [{ debugName: "mode" }] : []));
-        this.node = input.required(...(ngDevMode ? [{ debugName: "node" }] : []));
-        this._options = signal({}, ...(ngDevMode ? [{ debugName: "_options" }] : []));
+        this.parentNode = input(...(ngDevMode ? [undefined, { debugName: "parentNode" }] : /* istanbul ignore next */ []));
+        this.index = input(...(ngDevMode ? [undefined, { debugName: "index" }] : /* istanbul ignore next */ []));
+        this.mode = input.required(...(ngDevMode ? [{ debugName: "mode" }] : /* istanbul ignore next */ []));
+        this.node = input.required(...(ngDevMode ? [{ debugName: "node" }] : /* istanbul ignore next */ []));
+        this._options = signal({}, ...(ngDevMode ? [{ debugName: "_options" }] : /* istanbul ignore next */ []));
         this.options = this._options.asReadonly();
         this.onOptionsChanged = output();
         this.onValueChanged = output();
@@ -1641,22 +1662,22 @@ class AXPWidgetRendererDirective {
         /**
          * Signal that emits the component reference when it's ready
          */
-        this._componentRefSignal = signal(null, ...(ngDevMode ? [{ debugName: "_componentRefSignal" }] : []));
+        this._componentRefSignal = signal(null, ...(ngDevMode ? [{ debugName: "_componentRefSignal" }] : /* istanbul ignore next */ []));
         this.componentRefSignal = this._componentRefSignal.asReadonly();
         //#endregion
         //#region ----   Properties   ----
-        this.mergedOptions = signal({}, ...(ngDevMode ? [{ debugName: "mergedOptions" }] : []));
+        this.mergedOptions = signal({}, ...(ngDevMode ? [{ debugName: "mergedOptions" }] : /* istanbul ignore next */ []));
         this.injector = inject(Injector);
         this.builderService = inject(AXPWidgetCoreService);
-        this.contextService = inject(AXPWidgetCoreContextStore);
+        this.contextService = inject(AXPContextStore);
         this.widgetRegistery = inject(AXPWidgetRegistryService);
         this.unsubscriber = inject(AXUnsubscriber);
         this.translateService = inject(AXTranslationService);
         this.widgetService = inject(AXPWidgetRegistryService);
         this.expressionEvaluator = inject(AXPExpressionEvaluatorService);
         this.viewContainerRef = inject(ViewContainerRef);
-        this.isLoading = signal(false, ...(ngDevMode ? [{ debugName: "isLoading" }] : []));
-        this.isVisible = signal(true, ...(ngDevMode ? [{ debugName: "isVisible" }] : []));
+        this.isLoading = signal(false, ...(ngDevMode ? [{ debugName: "isLoading" }] : /* istanbul ignore next */ []));
+        this.isVisible = signal(true, ...(ngDevMode ? [{ debugName: "isVisible" }] : /* istanbul ignore next */ []));
         this.expressionEvaluators = new Map();
         this.renderTimeoutId = null;
         this.hasInitialRender = false;
@@ -1703,12 +1724,12 @@ class AXPWidgetRendererDirective {
                     await this.updateOptionsBasedOnContext();
                     this.applyOptions();
                 }
-                await this.updateVisibility();
             }
             else if (changed.path && this.isRelevantContextChange(changed.path)) {
                 // console.log(`🎯 [${this.node().type}] Context change detected: ${changed.path}`);
                 this.queueContextUpdate(changed.path);
             }
+            await this.updateVisibility();
         });
         this.builderService.onRefresh.pipe(this.unsubscriber.takeUntilDestroy).subscribe(async () => {
             await this.processBatchedUpdates();
@@ -1834,77 +1855,88 @@ class AXPWidgetRendererDirective {
         }
         return false;
     }
+    /**
+     * True when a context store path used in an expression (`context.eval`, `context.options`) is
+     * affected by `changedPath`.
+     */
+    contextStorePathDependsOnChangedPath(evalPath, changedPath) {
+        const normalizePath = (p) => {
+            if (!p)
+                return p;
+            const parts = p.split('.');
+            const last = parts[parts.length - 1];
+            if (last && last.endsWith('Id')) {
+                parts.splice(parts.length - 1, 1, last.slice(0, -2), 'id');
+            }
+            return parts.join('.');
+        };
+        const isSegmentSuffix = (a, b) => {
+            if (!a || !b)
+                return false;
+            const pa = a.split('.');
+            const pb = b.split('.');
+            if (pb.length > pa.length)
+                return false;
+            for (let i = 1; i <= pb.length; i++) {
+                if (pa[pa.length - i] !== pb[pb.length - i])
+                    return false;
+            }
+            return true;
+        };
+        const evalNorm = normalizePath(evalPath);
+        const changedNorm = normalizePath(changedPath);
+        const rawMatch = evalPath === changedPath ||
+            evalPath.startsWith(changedPath + '.') ||
+            changedPath.startsWith(evalPath + '.') ||
+            isSegmentSuffix(evalPath, changedPath) ||
+            isSegmentSuffix(changedPath, evalPath);
+        const normMatch = evalNorm === changedNorm ||
+            evalNorm.startsWith(changedNorm + '.') ||
+            changedNorm.startsWith(evalNorm + '.') ||
+            isSegmentSuffix(evalNorm, changedNorm) ||
+            isSegmentSuffix(changedNorm, evalNorm);
+        if (rawMatch || normMatch) {
+            return true;
+        }
+        return this.isPathAlias(evalPath, changedPath);
+    }
+    /**
+     * Whether an expression template string reads context store paths affected by `changedPath`.
+     */
+    expressionTextDependsOnContextPath(expressionValue, changedPath) {
+        const contextEvalRegex = /context\.eval\(['"]([^'\"]+)['"]\)/g;
+        let match;
+        while ((match = contextEvalRegex.exec(expressionValue)) !== null) {
+            if (this.contextStorePathDependsOnChangedPath(match[1], changedPath)) {
+                return true;
+            }
+        }
+        const contextOptionsQuoted = /context\.options\(\s*['"]([^'"]*)['"]\s*\)/g;
+        while ((match = contextOptionsQuoted.exec(expressionValue)) !== null) {
+            const sub = match[1];
+            const evalPath = sub === '' ? 'options' : `options.${sub}`;
+            if (this.contextStorePathDependsOnChangedPath(evalPath, changedPath)) {
+                return true;
+            }
+        }
+        const contextOptionsEmpty = /context\.options\(\s*\)/g;
+        while ((match = contextOptionsEmpty.exec(expressionValue)) !== null) {
+            if (this.contextStorePathDependsOnChangedPath('options', changedPath)) {
+                return true;
+            }
+        }
+        return false;
+    }
     hasExpressionDependency(changedPath) {
-        // Check if any cached expressions depend on the changed path
         for (const [path, evaluator] of this.expressionEvaluators) {
-            // Check if the expression path itself contains the changed path
             if (path.includes(changedPath)) {
                 return true;
             }
-            // Parse the actual expression content to check for context.eval() calls
-            // We need to get the original expression string to analyze it
             const node = this.node();
             const expressionValue = this.getExpressionValueFromNode(node, path);
             if (expressionValue && typeof expressionValue === 'string') {
-                // Look for context.eval() calls that reference the changed path
-                const contextEvalRegex = /context\.eval\(['"]([^'\"]+)['"]\)/g;
-                let match;
-                while ((match = contextEvalRegex.exec(expressionValue)) !== null) {
-                    const evalPath = match[1];
-                    // Normalize Id-suffixed segments to dot-id form (e.g., 'typeId' -> 'type.id', 'person.typeId' -> 'person.type.id')
-                    const normalizePath = (p) => {
-                        if (!p)
-                            return p;
-                        const parts = p.split('.');
-                        const last = parts[parts.length - 1];
-                        if (last && last.endsWith('Id')) {
-                            parts.splice(parts.length - 1, 1, last.slice(0, -2), 'id');
-                        }
-                        return parts.join('.');
-                    };
-                    const isSegmentSuffix = (a, b) => {
-                        if (!a || !b)
-                            return false;
-                        const pa = a.split('.');
-                        const pb = b.split('.');
-                        if (pb.length > pa.length)
-                            return false;
-                        for (let i = 1; i <= pb.length; i++) {
-                            if (pa[pa.length - i] !== pb[pb.length - i])
-                                return false;
-                        }
-                        return true;
-                    };
-                    const evalNorm = normalizePath(evalPath);
-                    const changedNorm = normalizePath(changedPath);
-                    // Debug log for dependency check
-                    // console.log(
-                    //   `🧭 [${this.node().type}] dep-check expr='${path}', changed='${changedPath}', eval='${evalPath}', evalNorm='${evalNorm}', changedNorm='${changedNorm}'`,
-                    // );
-                    // Generic direct and hierarchical dependency checks (raw and normalized)
-                    const rawMatch = evalPath === changedPath ||
-                        evalPath.startsWith(changedPath + '.') ||
-                        changedPath.startsWith(evalPath + '.') ||
-                        isSegmentSuffix(evalPath, changedPath) ||
-                        isSegmentSuffix(changedPath, evalPath);
-                    const normMatch = evalNorm === changedNorm ||
-                        evalNorm.startsWith(changedNorm + '.') ||
-                        changedNorm.startsWith(evalNorm + '.') ||
-                        isSegmentSuffix(evalNorm, changedNorm) ||
-                        isSegmentSuffix(changedNorm, evalNorm);
-                    if (rawMatch || normMatch) {
-                        // console.log(
-                        //   `🔍 [${this.node().type}] Expression '${path}' depends on '${changedPath}' via context.eval('${evalPath}') (generic match)`,
-                        // );
-                        return true;
-                    }
-                    // Check for path aliases/mappings (e.g., typeId.id <-> type.id)
-                    if (this.isPathAlias(evalPath, changedPath)) {
-                        // console.log(
-                        //   `🔍 [${this.node().type}] Expression '${path}' depends on '${changedPath}' via context.eval('${evalPath}') (path alias)`,
-                        // );
-                        return true;
-                    }
+                if (this.expressionTextDependsOnContextPath(expressionValue, changedPath)) {
+                    return true;
                 }
             }
         }
@@ -1991,20 +2023,8 @@ class AXPWidgetRendererDirective {
         const visibility = node.options?.['visible'] || this.mergedOptions()?.visible;
         if (!visibility || typeof visibility !== 'string')
             return false;
-        // Check if visibility expression depends on the changed path
         if (this.expressionEvaluator.isExpression(visibility)) {
-            // Parse the visibility expression to check for context.eval() calls
-            const contextEvalRegex = /context\.eval\(['"]([^'\"]+)['"]\)/g;
-            let match;
-            while ((match = contextEvalRegex.exec(visibility)) !== null) {
-                const evalPath = match[1];
-                // Check for direct or hierarchical dependency
-                if (evalPath === changedPath ||
-                    evalPath.startsWith(changedPath + '.') ||
-                    changedPath.startsWith(evalPath + '.')) {
-                    return true;
-                }
-            }
+            return this.expressionTextDependsOnContextPath(visibility, changedPath);
         }
         return false;
     }
@@ -2285,8 +2305,13 @@ class AXPWidgetRendererDirective {
             const newValue = await evaluator();
             const evalTime = performance.now() - evalStartTime;
             // Check if result has actually changed using Lodash isEqual
+            // Important: We must check if the key exists in the map, not just compare values
+            // This handles the case where the expression evaluates to `undefined` for the first time
+            // Without this check, `undefined` would be incorrectly treated as "no change"
+            // because Map.get() returns `undefined` for non-existent keys
+            const hasLastValue = this.lastExpressionResults.has(path);
             const lastValue = this.lastExpressionResults.get(path);
-            const hasChanged = !isEqual(newValue, lastValue);
+            const hasChanged = !hasLastValue || !isEqual(newValue, lastValue);
             if (hasChanged) {
                 // console.log(
                 //   `📝 [${this.node().type}] Expression '${path}' evaluated in ${evalTime.toFixed(2)}ms - value changed`,
@@ -2365,7 +2390,8 @@ class AXPWidgetRendererDirective {
         if (!this.isVisible()) {
             this.isVisible.set(true);
             if (this.componentRef && this.componentRef.location) {
-                this.componentRef.location.nativeElement.style.display = '';
+                this.loadComponent();
+                // this.componentRef.location.nativeElement.style.display = '';
             }
         }
     }
@@ -2373,7 +2399,8 @@ class AXPWidgetRendererDirective {
         if (this.isVisible()) {
             this.isVisible.set(false);
             if (this.componentRef && this.componentRef.location) {
-                this.componentRef.location.nativeElement.style.display = 'none';
+                this.componentRef.destroy();
+                // this.componentRef.location.nativeElement.style.display = 'none';
             }
         }
     }
@@ -2413,34 +2440,46 @@ class AXPWidgetRendererDirective {
             isDirty: () => {
                 return this.contextService.isDirty();
             },
+            /**
+             * Host/widget-under-edit `options` from the shared context store (same values as
+             * `context.eval('options' + (path ? '.' + path : ''))`), not `widget.options` on the nested
+             * property field instance. Uses one `getValue` so smart-path behavior matches `context.eval`.
+             */
+            options: (path) => {
+                if (path == null || path === '') {
+                    return this.contextService.getValue('options');
+                }
+                return this.contextService.getValue(`options.${path}`);
+            },
         };
     }
     getEventScope() {
         return {
-            context: (path) => {
+            context: (...paths) => {
                 return this.onContextChanged.pipe(filter((c) => {
-                    // If no path filter specified, pass all events
-                    if (path == null || path === '') {
+                    const activePaths = paths.filter((p) => !!p && p.trim().length > 0);
+                    // If no path filters specified, pass all events
+                    if (activePaths.length === 0) {
                         return true;
                     }
                     // Ensure c.path exists
                     if (!c.path) {
                         return false;
                     }
-                    // Pattern: "prefix*" - matches paths that start with prefix
-                    if (path.endsWith('*')) {
-                        const prefix = path.substring(0, path.length - 1);
-                        return c.path.startsWith(prefix);
-                    }
-                    // Pattern: "*suffix" - matches paths that end with suffix
-                    else if (path.startsWith('*')) {
-                        const suffix = path.substring(1);
-                        return c.path.endsWith(suffix);
-                    }
-                    // Exact match
-                    else {
+                    return activePaths.some((path) => {
+                        // Pattern: "prefix*" - matches paths that start with prefix
+                        if (path.endsWith('*')) {
+                            const prefix = path.substring(0, path.length - 1);
+                            return c.path.startsWith(prefix);
+                        }
+                        // Pattern: "*suffix" - matches paths that end with suffix
+                        if (path.startsWith('*')) {
+                            const suffix = path.substring(1);
+                            return c.path.endsWith(suffix);
+                        }
+                        // Exact match
                         return c.path === path;
-                    }
+                    });
                 }));
             },
             from: (event) => get(this.instance.api(), event),
@@ -2451,6 +2490,16 @@ class AXPWidgetRendererDirective {
     }
     getWidgetScope() {
         return {
+            /** Resolved options for this renderer's widget instance (not the host / property-viewer target). */
+            options: (path) => {
+                const opts = this.instance && typeof this.instance.options === 'function'
+                    ? this.instance.options()
+                    : this.mergedOptions();
+                if (path == null || path === '') {
+                    return opts;
+                }
+                return getSmart(opts, path);
+            },
             call: (name, ...args) => {
                 this.instance.call(name, ...args);
             },
@@ -2471,7 +2520,7 @@ class AXPWidgetRendererDirective {
                 }
             },
             output: (name) => {
-                this.instance.output(name);
+                return this.instance.output(name);
             },
             find: (id) => {
                 return this.builderService.getWidget(id);
@@ -2556,14 +2605,14 @@ class AXPWidgetRendererDirective {
             // console.error('Error evaluating action expression:', templateExpression, error);
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetRendererDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
-    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "20.3.12", type: AXPWidgetRendererDirective, isStandalone: false, selector: "[axp-widget-renderer]", inputs: { parentNode: { classPropertyName: "parentNode", publicName: "parentNode", isSignal: true, isRequired: false, transformFunction: null }, index: { classPropertyName: "index", publicName: "index", isSignal: true, isRequired: false, transformFunction: null }, mode: { classPropertyName: "mode", publicName: "mode", isSignal: true, isRequired: true, transformFunction: null }, node: { classPropertyName: "node", publicName: "node", isSignal: true, isRequired: true, transformFunction: null } }, outputs: { onOptionsChanged: "onOptionsChanged", onValueChanged: "onValueChanged", onLoad: "onLoad" }, providers: [
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetRendererDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "17.1.0", version: "21.2.9", type: AXPWidgetRendererDirective, isStandalone: false, selector: "[axp-widget-renderer]", inputs: { parentNode: { classPropertyName: "parentNode", publicName: "parentNode", isSignal: true, isRequired: false, transformFunction: null }, index: { classPropertyName: "index", publicName: "index", isSignal: true, isRequired: false, transformFunction: null }, mode: { classPropertyName: "mode", publicName: "mode", isSignal: true, isRequired: true, transformFunction: null }, node: { classPropertyName: "node", publicName: "node", isSignal: true, isRequired: true, transformFunction: null } }, outputs: { onOptionsChanged: "onOptionsChanged", onValueChanged: "onValueChanged", onLoad: "onLoad" }, providers: [
             {
                 provide: AXUnsubscriber,
             },
         ], exportAs: ["widgetRenderer"], usesOnChanges: true, ngImport: i0 }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetRendererDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetRendererDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[axp-widget-renderer]',
@@ -2579,63 +2628,53 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImpo
 
 const COMPONENTS = [AXPWidgetContainerComponent, AXPWidgetColumnRendererComponent, AXPWidgetRendererDirective];
 class AXPWidgetCoreModule {
-    static forRoot(config) {
-        return {
-            ngModule: AXPWidgetCoreModule,
-            providers: [
-                {
-                    provide: 'AXPWidgetCoreModuleFactory',
-                    useFactory: (registry) => async () => {
-                        await Promise.all(config?.widgets?.map((w) => Promise.resolve(registry.register(w))) || []);
-                        await Promise.all(config?.extendedWidgets?.map((ew) => Promise.resolve(registry.extend(ew.parentName, ew.widget))) || []);
-                    },
-                    deps: [AXPWidgetRegistryService],
-                    multi: true,
-                },
-            ],
-        };
-    }
-    static forChild(config) {
-        return {
-            ngModule: AXPWidgetCoreModule,
-            providers: [
-                {
-                    provide: 'AXPWidgetCoreModuleFactory',
-                    useFactory: (registry) => async () => {
-                        await Promise.all(config?.widgets?.map((w) => Promise.resolve(registry.register(w))) || []);
-                        await Promise.all(config?.extendedWidgets?.map((ew) => Promise.resolve(registry.extend(ew.parentName, ew.widget))) || []);
-                    },
-                    deps: [AXPWidgetRegistryService],
-                    multi: true,
-                },
-            ],
-        };
-    }
-    /**
-     * @ignore
-     */
-    constructor(instances) {
-        instances?.forEach((f) => {
-            f();
-        });
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetCoreModule, deps: [{ token: 'AXPWidgetCoreModuleFactory', optional: true }], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetCoreModule, declarations: [AXPWidgetContainerComponent, AXPWidgetColumnRendererComponent, AXPWidgetRendererDirective], imports: [CommonModule, PortalModule, AXSkeletonModule, CommonModule, AXTranslationModule], exports: [AXPWidgetContainerComponent, AXPWidgetColumnRendererComponent, AXPWidgetRendererDirective] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetCoreModule, imports: [CommonModule, PortalModule, AXSkeletonModule, CommonModule, AXTranslationModule] }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetCoreModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetCoreModule, declarations: [AXPWidgetContainerComponent, AXPWidgetColumnRendererComponent, AXPWidgetRendererDirective], imports: [CommonModule, PortalModule, AXSkeletonModule, AXTranslationModule], exports: [AXPWidgetContainerComponent, AXPWidgetColumnRendererComponent, AXPWidgetRendererDirective] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetCoreModule, imports: [CommonModule, PortalModule, AXSkeletonModule, AXTranslationModule] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.12", ngImport: i0, type: AXPWidgetCoreModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.9", ngImport: i0, type: AXPWidgetCoreModule, decorators: [{
             type: NgModule,
             args: [{
-                    imports: [CommonModule, PortalModule, AXSkeletonModule, CommonModule, AXTranslationModule],
+                    imports: [CommonModule, PortalModule, AXSkeletonModule, AXTranslationModule],
                     exports: [...COMPONENTS],
                     declarations: [...COMPONENTS],
+                    providers: [],
                 }]
-        }], ctorParameters: () => [{ type: undefined, decorators: [{
-                    type: Optional
-                }, {
-                    type: Inject,
-                    args: ['AXPWidgetCoreModuleFactory']
-                }] }] });
+        }] });
+
+//#endregion
+//#region ---- Mapping ----
+/**
+ * Converts a domain {@link AXPProperty} into a {@link AXPWidgetProperty} row for
+ * the layout property viewer (`AXPPropertyViewerService` and `buildPropertyViewerTabsFromProperties`).
+ */
+function mapAXPPropertyToWidgetProperty(property, options) {
+    const { group, order, valuePathPrefix, resolveTitle, resolveDescription } = options;
+    const path = valuePathPrefix ? `${valuePathPrefix}.${property.name}` : property.name;
+    const iface = property.interface;
+    const widgetType = iface?.type ?? 'text-editor';
+    const description = resolveDescription?.(property);
+    return {
+        name: property.name,
+        title: resolveTitle(property),
+        ...(description !== undefined && description !== '' ? { description } : {}),
+        group,
+        order,
+        schema: {
+            dataType: property.dataType,
+            interface: {
+                path,
+                name: property.name,
+                type: widgetType,
+                options: iface?.options ?? {},
+                ...(iface?.triggers ? { triggers: iface.triggers } : {}),
+            },
+        },
+        validations: property.validations,
+        visible: true,
+    };
+}
+//#endregion
 
 class AXPPropertyEditorHelper {
     static expandShorthand(values) {
@@ -2812,31 +2851,255 @@ function findNonEmptyBreakpoints(values) {
     return nonEmptyBreakpoints;
 }
 
+//#region ----   Imports   ----
+//#endregion
+//#region ----   Helper Class   ----
+/**
+ * Helper class for serializing and deserializing AXPWidgetNode to/from JSON
+ */
+class AXPWidgetSerializationHelper {
+    /**
+     * Removes non-serializable properties from widget node
+     * @param node - The widget node to clean
+     * @param options - Serialization options
+     * @returns Cleaned widget node ready for JSON serialization
+     */
+    static cleanNode(node, options = {}) {
+        const { removeMeta = true, removeFunctions = true } = options;
+        // Deep clone to avoid mutating original
+        const cleaned = cloneDeep(node);
+        // Remove meta property if requested
+        if (removeMeta && 'meta' in cleaned) {
+            delete cleaned.meta;
+        }
+        // Remove functions from options, triggers, and valueTransforms
+        if (removeFunctions) {
+            this.removeFunctions(cleaned);
+        }
+        // Recursively clean children
+        if (cleaned.children && Array.isArray(cleaned.children)) {
+            cleaned.children = cleaned.children.map((child) => this.cleanNode(child, options));
+        }
+        return cleaned;
+    }
+    /**
+     * Recursively removes functions from object properties
+     */
+    static removeFunctions(obj) {
+        if (obj === null || obj === undefined) {
+            return;
+        }
+        if (Array.isArray(obj)) {
+            obj.forEach((item) => this.removeFunctions(item));
+            return;
+        }
+        if (typeof obj === 'object') {
+            for (const key in obj) {
+                if (typeof obj[key] === 'function') {
+                    delete obj[key];
+                }
+                else if (typeof obj[key] === 'object') {
+                    this.removeFunctions(obj[key]);
+                }
+            }
+        }
+    }
+    /**
+     * Converts AXPWidgetNode to JSON string
+     * @param node - The widget node to serialize
+     * @param options - Serialization options
+     * @returns JSON string representation of the widget node
+     */
+    static toJson(node, options = {}) {
+        const { pretty = false, ...cleanOptions } = options;
+        const cleaned = this.cleanNode(node, cleanOptions);
+        if (pretty) {
+            return JSON.stringify(cleaned, null, 2);
+        }
+        return JSON.stringify(cleaned);
+    }
+    /**
+     * Converts JSON string to AXPWidgetNode
+     * @param json - JSON string to deserialize
+     * @returns Parsed AXPWidgetNode object
+     * @throws Error if JSON is invalid or doesn't match AXPWidgetNode structure
+     */
+    static fromJson(json) {
+        try {
+            const parsed = JSON.parse(json);
+            // Basic validation - ensure it has at least a type property
+            if (!parsed || typeof parsed !== 'object') {
+                throw new Error('Invalid JSON: Expected an object');
+            }
+            if (!parsed.type) {
+                throw new Error('Invalid AXPWidgetNode: Missing required property "type"');
+            }
+            // Recursively validate and parse children if they exist
+            if (parsed.children && Array.isArray(parsed.children)) {
+                parsed.children = parsed.children.map((child) => this.fromJson(JSON.stringify(child)));
+            }
+            return parsed;
+        }
+        catch (error) {
+            if (error instanceof SyntaxError) {
+                throw new Error(`Invalid JSON string: ${error.message}`);
+            }
+            throw error;
+        }
+    }
+    /**
+     * Removes meta property from widget node (similar to designer service)
+     * @param node - The widget node to process
+     * @returns Widget node without meta property
+     */
+    static removeMeta(node) {
+        return this.cleanNode(node, { removeMeta: true, removeFunctions: false });
+    }
+}
+//#endregion
+
+//#region ---- Editor sub-categories (widget picker) ----
+const AXP_WIDGETS_EDITOR_SUB_TEXT_INPUTS = {
+    name: 'editor-text-inputs',
+    order: 1,
+    title: '@platform-layout-widgets:subcategories.editor-text-inputs.title',
+};
+const AXP_WIDGETS_EDITOR_SUB_NUMERIC = {
+    name: 'editor-numeric',
+    order: 2,
+    title: '@platform-layout-widgets:subcategories.editor-numeric.title',
+};
+const AXP_WIDGETS_EDITOR_SUB_DATETIME = {
+    name: 'editor-datetime',
+    order: 3,
+    title: '@platform-layout-widgets:subcategories.editor-datetime.title',
+};
+const AXP_WIDGETS_EDITOR_SUB_CHOICE = {
+    name: 'editor-choice',
+    order: 4,
+    title: '@platform-layout-widgets:subcategories.editor-choice.title',
+};
+const AXP_WIDGETS_EDITOR_SUB_RICH = {
+    name: 'editor-rich',
+    order: 5,
+    title: '@platform-layout-widgets:subcategories.editor-rich.title',
+};
+const AXP_WIDGETS_EDITOR_SUB_VISUAL = {
+    name: 'editor-visual',
+    order: 6,
+    title: '@platform-layout-widgets:subcategories.editor-visual.title',
+};
+const AXP_WIDGETS_EDITOR_SUB_COMPOSITE = {
+    name: 'editor-composite',
+    order: 7,
+    title: '@platform-layout-widgets:subcategories.editor-composite.title',
+};
+const AXP_WIDGETS_EDITOR_SUB_CONFIG = {
+    name: 'editor-config',
+    order: 8,
+    title: '@platform-layout-widgets:subcategories.editor-config.title',
+};
+//#endregion
+//#region ---- Layout sub-categories (widget picker) ----
+const AXP_WIDGETS_LAYOUT_SUB_SHELL = {
+    name: 'layout-shell',
+    order: 1,
+    title: '@platform-layout-widgets:subcategories.layout-shell.title',
+};
+const AXP_WIDGETS_LAYOUT_SUB_GRID = {
+    name: 'layout-grid',
+    order: 2,
+    title: '@platform-layout-widgets:subcategories.layout-grid.title',
+};
+const AXP_WIDGETS_LAYOUT_SUB_SURFACES = {
+    name: 'layout-surfaces',
+    order: 3,
+    title: '@platform-layout-widgets:subcategories.layout-surfaces.title',
+};
+const AXP_WIDGETS_LAYOUT_SUB_TABS = {
+    name: 'layout-tabs',
+    order: 4,
+    title: '@platform-layout-widgets:subcategories.layout-tabs.title',
+};
+const AXP_WIDGETS_LAYOUT_SUB_LISTS = {
+    name: 'layout-lists',
+    order: 5,
+    title: '@platform-layout-widgets:subcategories.layout-lists.title',
+};
+const AXP_WIDGETS_LAYOUT_SUB_UTILITY = {
+    name: 'layout-utility',
+    order: 6,
+    title: '@platform-layout-widgets:subcategories.layout-utility.title',
+};
+//#endregion
+//#region ---- Action sub-categories (widget picker) ----
+const AXP_WIDGETS_ACTION_SUB_CONTROLS = {
+    name: 'action-controls',
+    order: 1,
+    title: '@platform-layout-widgets:subcategories.action-controls.title',
+};
+//#endregion
+//#region ---- Advance sub-categories (widget picker) ----
+const AXP_WIDGETS_ADVANCE_SUB_MEDIA = {
+    name: 'advance-media',
+    order: 1,
+    title: '@platform-layout-widgets:subcategories.advance-media.title',
+};
+const AXP_WIDGETS_ADVANCE_SUB_INPUT = {
+    name: 'advance-input',
+    order: 2,
+    title: '@platform-layout-widgets:subcategories.advance-input.title',
+};
+const AXP_WIDGETS_ADVANCE_SUB_DATA = {
+    name: 'advance-data',
+    order: 3,
+    title: '@platform-layout-widgets:subcategories.advance-data.title',
+};
+const AXP_WIDGETS_ADVANCE_SUB_TOOLS = {
+    name: 'advance-tools',
+    order: 4,
+    title: '@platform-layout-widgets:subcategories.advance-tools.title',
+};
+//#endregion
+/** Normalizes widget categories to an array for iteration and serialization. */
+function normalizeWidgetCategories(categories) {
+    if (categories == null) {
+        return [];
+    }
+    return Array.isArray(categories) ? categories : [categories];
+}
 const AXP_WIDGETS_LAYOUT_CATEGORY = {
     name: 'layout',
     order: 1,
-    title: 'Layout',
+    title: '@platform-layout-widgets:categories.layout.title',
 };
 const AXP_WIDGETS_EDITOR_CATEGORY = {
     name: 'editor',
     order: 2,
-    title: 'Editors',
+    title: '@platform-layout-widgets:categories.editor.title',
 };
 const AXP_WIDGETS_ACTION_CATEGORY = {
     name: 'action',
     order: 3,
-    title: 'Action',
+    title: '@platform-layout-widgets:categories.action.title',
 };
 const AXP_WIDGETS_ADVANCE_CATEGORY = {
     name: 'advance',
     order: 4,
-    title: 'Advance',
+    title: '@platform-layout-widgets:categories.advance.title',
+};
+/** AI category tab in the widget picker (metadata); unrelated to Widgets:GetForAI listing scope. */
+const AXP_WIDGETS_AI_CATEGORY = {
+    name: 'ai',
+    order: 5,
+    title: '@platform-layout-widgets:categories.ai.title',
 };
 const AXP_WIDGETS_CATEGORIES = [
     AXP_WIDGETS_LAYOUT_CATEGORY,
     AXP_WIDGETS_EDITOR_CATEGORY,
     AXP_WIDGETS_ACTION_CATEGORY,
     AXP_WIDGETS_ADVANCE_CATEGORY,
+    AXP_WIDGETS_AI_CATEGORY,
 ];
 
 var AXPWidgetGroupEnum;
@@ -2849,11 +3112,12 @@ var AXPWidgetGroupEnum;
     AXPWidgetGroupEnum["SettingWidget"] = "setting-widget";
     AXPWidgetGroupEnum["EntityWidget"] = "entity-widget";
     AXPWidgetGroupEnum["UtilityWidget"] = "utility-widget";
+    AXPWidgetGroupEnum["BaseWidget"] = "base-widget";
 })(AXPWidgetGroupEnum || (AXPWidgetGroupEnum = {}));
 
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { AXPBaseWidgetComponent, AXPBlockBaseLayoutWidgetComponent, AXPBoxModelLayoutWidgetComponent, AXPColumnWidgetComponent, AXPDataListWidgetComponent, AXPFlexBaseLayoutWidgetComponent, AXPFlexItemBaseLayoutWidgetComponent, AXPGridBaseLayoutWidgetComponent, AXPGridItemBaseLayoutWidgetComponent, AXPInlineBaseLayoutWidgetComponent, AXPLayoutBaseWidgetComponent, AXPPageStatus, AXPPropertyEditorHelper, AXPTableBaseLayoutWidgetComponent, AXPTableItemBaseLayoutWidgetComponent, AXPTableItemOpsBaseLayoutWidgetComponent, AXPValueWidgetComponent, AXPWidgetColumnRendererComponent, AXPWidgetContainerComponent, AXPWidgetCoreContextChangeEvent, AXPWidgetCoreContextStore, AXPWidgetCoreElement, AXPWidgetCoreModule, AXPWidgetCoreService, AXPWidgetGroupEnum, AXPWidgetRegistryService, AXPWidgetRendererDirective, AXPWidgetStatus, AXPWidgetsCatalog, AXP_WIDGETS_ACTION_CATEGORY, AXP_WIDGETS_ADVANCE_CATEGORY, AXP_WIDGETS_CATEGORIES, AXP_WIDGETS_EDITOR_CATEGORY, AXP_WIDGETS_LAYOUT_CATEGORY, AXP_WIDGET_COLUMN_TOKEN, AXP_WIDGET_TOKEN, cloneProperty, createBooleanProperty, createNumberProperty, createSelectProperty, createStringProperty, findNonEmptyBreakpoints };
+export { AXPBaseWidgetComponent, AXPBlockBaseLayoutWidgetComponent, AXPBoxModelLayoutWidgetComponent, AXPColumnWidgetComponent, AXPDataListWidgetComponent, AXPFlexBaseLayoutWidgetComponent, AXPFlexItemBaseLayoutWidgetComponent, AXPGridBaseLayoutWidgetComponent, AXPGridItemBaseLayoutWidgetComponent, AXPInlineBaseLayoutWidgetComponent, AXPLayoutBaseWidgetComponent, AXPPageStatus, AXPPropertyEditorHelper, AXPTableBaseLayoutWidgetComponent, AXPTableItemBaseLayoutWidgetComponent, AXPTableItemOpsBaseLayoutWidgetComponent, AXPValueWidgetComponent, AXPWidgetColumnRendererComponent, AXPWidgetContainerComponent, AXPWidgetCoreElement, AXPWidgetCoreModule, AXPWidgetCoreService, AXPWidgetGroupEnum, AXPWidgetRegistryService, AXPWidgetRendererDirective, AXPWidgetSerializationHelper, AXPWidgetStatus, AXPWidgetsCatalog, AXP_WIDGETS_ACTION_CATEGORY, AXP_WIDGETS_ACTION_SUB_CONTROLS, AXP_WIDGETS_ADVANCE_CATEGORY, AXP_WIDGETS_ADVANCE_SUB_DATA, AXP_WIDGETS_ADVANCE_SUB_INPUT, AXP_WIDGETS_ADVANCE_SUB_MEDIA, AXP_WIDGETS_ADVANCE_SUB_TOOLS, AXP_WIDGETS_AI_CATEGORY, AXP_WIDGETS_CATEGORIES, AXP_WIDGETS_EDITOR_CATEGORY, AXP_WIDGETS_EDITOR_SUB_CHOICE, AXP_WIDGETS_EDITOR_SUB_COMPOSITE, AXP_WIDGETS_EDITOR_SUB_CONFIG, AXP_WIDGETS_EDITOR_SUB_DATETIME, AXP_WIDGETS_EDITOR_SUB_NUMERIC, AXP_WIDGETS_EDITOR_SUB_RICH, AXP_WIDGETS_EDITOR_SUB_TEXT_INPUTS, AXP_WIDGETS_EDITOR_SUB_VISUAL, AXP_WIDGETS_LAYOUT_CATEGORY, AXP_WIDGETS_LAYOUT_SUB_GRID, AXP_WIDGETS_LAYOUT_SUB_LISTS, AXP_WIDGETS_LAYOUT_SUB_SHELL, AXP_WIDGETS_LAYOUT_SUB_SURFACES, AXP_WIDGETS_LAYOUT_SUB_TABS, AXP_WIDGETS_LAYOUT_SUB_UTILITY, AXP_WIDGET_COLUMN_TOKEN, AXP_WIDGET_DEFINITION_PROVIDER, AXP_WIDGET_TOKEN, buildWidgetRegistryMapFromProviders, cloneProperty, createBooleanProperty, createNumberProperty, createSelectProperty, createStringProperty, findNonEmptyBreakpoints, mapAXPPropertyToWidgetProperty, normalizeWidgetCategories };
 //# sourceMappingURL=acorex-platform-layout-widget-core.mjs.map