@shival99/z-ui 1.2.29 → 1.2.31

package/fesm2022/shival99-z-ui-components-z-table.mjs

@@ -2350,6 +2350,7 @@ class ZTableComponent {
     _dataForceUpdate = signal(0, ...(ngDevMode ? [{ debugName: "_dataForceUpdate" }] : []));
     _columnConfigCache = new Map();
     _lastColumnsRef = null;
+    _configCacheLoaded = false;
     pinnedColumnIds = computed(() => {
         this._columnPinVersion();
         return this.columnOrder().filter(id => {
@@ -3055,10 +3056,45 @@ class ZTableComponent {
         explicitEffect([this._zTranslate.currentLang], () => {
             this._dataForceUpdate.update(v => v + 1);
         });
-        explicitEffect([this.zKey], ([key]) => {
-            this._loadConfigCache();
+        explicitEffect([this.zKey, this.zConfig], ([key, config]) => {
+            // Only load config cache once when key and valid columns are available
+            if (key && config.columns && config.columns.length > 0 && !this._configCacheLoaded) {
+                this._loadConfigCache();
+                this._configCacheLoaded = true;
+            }
         });
         explicitEffect([this.zConfig], ([cfg]) => {
+            // Skip applying initialState for properties that were loaded from cache
+            // Cache values have priority over initialState
+            if (this._configCacheLoaded) {
+                // Only apply non-column-layout related initial state when cache is loaded
+                const initial = cfg.initialState;
+                if (initial) {
+                    // These are not stored in cache, so always apply them
+                    if (initial.sorting) {
+                        this.sorting.set(initial.sorting);
+                    }
+                    if (initial.columnFilters) {
+                        this.columnFilters.set(initial.columnFilters);
+                    }
+                    if (initial.globalFilter) {
+                        this.globalFilter.set(initial.globalFilter);
+                    }
+                    if (initial.expanded) {
+                        this.expanded.set(initial.expanded);
+                    }
+                    if (initial.rowSelection) {
+                        this.rowSelection.set(initial.rowSelection);
+                    }
+                    if (initial.rowPinning) {
+                        this.rowPinning.set(initial.rowPinning);
+                    }
+                    if (initial.pagination) {
+                        this.pagination.set(initial.pagination);
+                    }
+                }
+                return;
+            }
             const initial = cfg.initialState;
             if (initial) {
                 if (initial.columnPinning) {