@shival99/z-ui 1.2.36 → 1.2.38

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

@@ -2350,7 +2350,6 @@ class ZTableComponent {
     _dataForceUpdate = signal(0, ...(ngDevMode ? [{ debugName: "_dataForceUpdate" }] : []));
     _columnConfigCache = new Map();
     _lastColumnsRef = null;
-    _configCacheLoaded = false;
     pinnedColumnIds = computed(() => {
         this._columnPinVersion();
         return this.columnOrder().filter(id => {
@@ -3056,22 +3055,20 @@ class ZTableComponent {
         explicitEffect([this._zTranslate.currentLang], () => {
             this._dataForceUpdate.update(v => v + 1);
         });
-        explicitEffect([this.zKey, this.zConfig], ([key, config]) => {
-            console.log('🚀 ~ key:', key);
-            if (key && config.columns && config.columns.length > 0) {
-                console.log('🚀 ~ key:', key);
-                this._loadConfigCache();
+        explicitEffect([this.zKey, this.zConfig], ([key, cfg]) => {
+            if (!cfg.columns || cfg.columns.length === 0) {
+                return;
             }
-        }, { defer: true });
-        explicitEffect([this.zConfig], ([cfg]) => {
+            const cacheLoaded = key ? this._loadConfigCache(key) : false;
             const initial = cfg.initialState;
-            console.log('🚀 ~ initial:', initial);
             if (initial) {
-                if (initial.columnPinning) {
-                    this.columnPinning.set(initial.columnPinning);
-                }
-                if (initial.columnVisibility) {
-                    this.columnVisibility.set(initial.columnVisibility);
+                if (!cacheLoaded) {
+                    if (initial.columnPinning) {
+                        this.columnPinning.set(initial.columnPinning);
+                    }
+                    if (initial.columnVisibility) {
+                        this.columnVisibility.set(initial.columnVisibility);
+                    }
                 }
                 if (initial.sorting) {
                     this.sorting.set(initial.sorting);
@@ -3095,7 +3092,9 @@ class ZTableComponent {
                     this.pagination.set(initial.pagination);
                 }
             }
-            this.showHeaderFooterShadow.set(cfg.showHeaderShadow ?? cfg.showFooterShadow ?? true);
+            if (!cacheLoaded) {
+                this.showHeaderFooterShadow.set(cfg.showHeaderShadow ?? cfg.showFooterShadow ?? true);
+            }
             const cols = cfg.columns ?? [];
             const leftPinned = [...(initial?.columnPinning?.left ?? [])];
             const rightPinned = [...(initial?.columnPinning?.right ?? [])];
@@ -3113,10 +3112,9 @@ class ZTableComponent {
                 }
             };
             collectPinnedColumns(cols);
-            if (leftPinned.length > 0 || rightPinned.length > 0) {
+            if (!cacheLoaded && (leftPinned.length > 0 || rightPinned.length > 0)) {
                 this.columnPinning.set({ left: leftPinned, right: rightPinned });
             }
-            console.log('🚀 ~ this.columnPinning:', this.columnPinning);
         });
         explicitEffect([this.zConfig], ([cfg]) => {
             if (cfg.enableRowPinning && !this.hasBodyRowSpan()) {
@@ -3160,10 +3158,21 @@ class ZTableComponent {
                 this.pagination.set(configPagination);
             }
         });
-        explicitEffect([this.columnFilters, this.globalFilter, this.pagination, this.sorting], () => {
+        explicitEffect([this.columnFilters, this.globalFilter, this.pagination, this.sorting, this._data], () => {
             queueMicrotask(() => {
                 this._checkVerticalScroll();
                 this._checkHorizontalScroll();
+                if (this.isVirtual()) {
+                    this._dynamicGroupsVersion.update(v => v + 1);
+                }
+            });
+        });
+        explicitEffect([this.virtualizer.getVirtualItems], () => {
+            if (!this.isVirtual()) {
+                return;
+            }
+            queueMicrotask(() => {
+                this._checkLastRowTouchesBottom();
             });
         });
         explicitEffect([this.zLoading, this.isProcessing], () => {
@@ -3318,6 +3327,29 @@ class ZTableComponent {
             this.lastRowTouchesBottom.set(true);
             return;
         }
+        if (this.isVirtual()) {
+            const virtualScrollInner = tbodyWrapperEl.querySelector('.z-virtual-scroll-inner');
+            if (!virtualScrollInner) {
+                this.lastRowTouchesBottom.set(true);
+                return;
+            }
+            const virtualRows = virtualScrollInner.querySelectorAll('.z-virtual-row');
+            if (virtualRows.length === 0) {
+                this.lastRowTouchesBottom.set(true);
+                return;
+            }
+            const lastVirtualRow = virtualRows[virtualRows.length - 1];
+            const lastTr = lastVirtualRow.querySelector('tbody tr:last-child');
+            if (!lastTr) {
+                this.lastRowTouchesBottom.set(true);
+                return;
+            }
+            const wrapperRect = tbodyWrapperEl.getBoundingClientRect();
+            const rowRect = lastTr.getBoundingClientRect();
+            const gap = wrapperRect.bottom - rowRect.bottom;
+            this.lastRowTouchesBottom.set(gap <= 2);
+            return;
+        }
         const tbody = tbodyWrapperEl.querySelector('tbody');
         if (!tbody) {
             this.lastRowTouchesBottom.set(true);
@@ -3648,21 +3680,18 @@ class ZTableComponent {
         collect(columns);
         return result;
     }
-    _loadConfigCache() {
-        const key = this.zKey();
+    _loadConfigCache(key) {
         if (!key) {
-            return;
+            return false;
         }
         try {
             const config = ZCacheService.get(`table-config-${key}`);
-            console.log('🚀 ~ config:', config);
             if (!config) {
-                return;
+                return false;
             }
             if (!this._isColumnConfigValid(config.columnInfo)) {
-                console.warn('Saved table config is invalid or outdated. Ignoring saved config.');
                 ZCacheService.delete(`table-config-${key}`);
-                return;
+                return false;
             }
             if (config.columnOrder && config.columnOrder.length > 0) {
                 this.columnOrder.set(config.columnOrder);
@@ -3685,10 +3714,11 @@ class ZTableComponent {
             if (config.columnSizing) {
                 this.table.setColumnSizing(config.columnSizing);
             }
-            console.log('zzz🚀 ~ config:', config);
+            return true;
         }
         catch (error) {
             console.error('Failed to load table config:', error);
+            return false;
         }
     }
     _isColumnConfigValid(cachedColumnInfo) {