@shival99/z-ui 1.2.30 → 1.2.31

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

@@ -20,7 +20,6 @@ import { ZSafeHtmlPipe } from '@shival99/z-ui/pipes';
 import { ZTranslateService, ZCacheService } from '@shival99/z-ui/services';
 import { createAngularTable, getFacetedMinMaxValues, getFacetedUniqueValues, getFacetedRowModel, getPaginationRowModel, getSortedRowModel, getFilteredRowModel, getExpandedRowModel, getCoreRowModel, FlexRenderDirective } from '@tanstack/angular-table';
 import { NgScrollbar } from 'ngx-scrollbar';
-import { effectOnceIf } from 'ngxtension/effect-once-if';
 import { explicitEffect } from 'ngxtension/explicit-effect';
 import { injectDestroy } from 'ngxtension/inject-destroy';
 import { ZDropdownMenuComponent } from '@shival99/z-ui/components/z-dropdown-menu';
@@ -3057,15 +3056,45 @@ class ZTableComponent {
         explicitEffect([this._zTranslate.currentLang], () => {
             this._dataForceUpdate.update(v => v + 1);
         });
-        effectOnceIf(computed(() => {
-            const key = this.zKey();
-            const config = this.zConfig();
-            return !!key && !!config.columns && config.columns.length > 0 && !this._configCacheLoaded;
-        }), () => {
-            this._loadConfigCache();
-            this._configCacheLoaded = true;
+        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) {