@shival99/z-ui 2.6.6 → 2.6.7

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

@@ -21,7 +21,7 @@ import { ZTooltipDirective } from '@shival99/z-ui/components/z-tooltip';
 import { ZSafeHtmlPipe, ZFormatNumPipe } from '@shival99/z-ui/pipes';
 import { ZTranslateService, ZCacheService } from '@shival99/z-ui/services';
 import { ZExcelService } from '@shival99/z-ui/services/excel';
-import { zMergeClasses } from '@shival99/z-ui/utils';
+import { zMergeClasses, zCreateDestroySafeTimeout } from '@shival99/z-ui/utils';
 import { tableFeatures, createSortedRowModel, createPaginatedRowModel, createFilteredRowModel, createFacetedUniqueValues, createFacetedRowModel, createFacetedMinMaxValues, createExpandedRowModel, stockFeatures, injectTable, FlexRenderDirective } from '@tanstack/angular-table';
 import { injectVirtualizer, defaultRangeExtractor, elementScroll } from '@tanstack/angular-virtual';
 import { NgScrollbar } from 'ngx-scrollbar';
@@ -5624,6 +5624,7 @@ class ZTableComponent {
     _zTranslate = inject(ZTranslateService);
     _overlayService = inject(ZOverlayService);
     _viewContainerRef = inject(ViewContainerRef);
+    _destroyRef = inject(DestroyRef);
     /** Prevents recursive scroll sync between thead/tbody/tfoot */
     _isSyncingScroll = signal(false, /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "_isSyncingScroll" }] : /* istanbul ignore next */ []));
@@ -5637,7 +5638,7 @@ class ZTableComponent {
     _settingsDebounceTimeout = null;
     _visibilityDebounceTimeout = null;
     /** Debounces filter change emissions to server */
-    _filterEmitDebounceTimeout = null;
+    _filterEmitDebounceTimer = zCreateDestroySafeTimeout(this._destroyRef);
     /** Keeps the bulk bar mounted long enough for its exit animation */
     _bulkBarTimer = null;
     _bulkBarOverlayRef = null;
@@ -6431,7 +6432,10 @@ class ZTableComponent {
         if (this.isServerGrouping()) {
             const selectedColumnId = this.groupingColumnIds()[0];
             const fallbackColumnId = this.serverGroupColumnId();
-            return selectedColumnId ? [selectedColumnId] : fallbackColumnId ? [fallbackColumnId] : [];
+            if (selectedColumnId) {
+                return [selectedColumnId];
+            }
+            return fallbackColumnId ? [fallbackColumnId] : [];
         }
         return this.groupingColumnIds();
     }, /* @ts-ignore */
@@ -7932,7 +7936,13 @@ class ZTableComponent {
         const stickyGroupMeta = this._stickyGroupHeaderMeta();
         // Estimate for not-yet-measured rows: learned height if available, else virtual.size.
         const dynamicRowEstimate = isDynamic && this._dynamicEstimateHeight !== null ? this._dynamicEstimateHeight : rowHeight;
-        const itemCount = isGrouping ? flatItems.length : groups.length > 0 ? groups.length : this._virtualGroupCount();
+        let itemCount = this._virtualGroupCount();
+        if (isGrouping) {
+            itemCount = flatItems.length;
+        }
+        if (!isGrouping && groups.length > 0) {
+            itemCount = groups.length;
+        }
         return {
             scrollElement,
             count: itemCount,
@@ -8306,11 +8316,13 @@ class ZTableComponent {
             // Virtual scroll windows the rows itself, so it needs the full row model — otherwise the
             // default pageSize of 10 leaves the paginated row model truncating the data it ever sees.
             const isVirtualConfig = !!cfg.virtual && (typeof cfg.virtual === 'boolean' ? cfg.virtual : cfg.virtual.enabled);
-            const configuredPageSize = cfg.pagination?.enabled
-                ? cfg.pagination.pageSize
-                : isVirtualConfig
-                    ? Number.MAX_SAFE_INTEGER
-                    : undefined;
+            let configuredPageSize;
+            if (cfg.pagination?.enabled) {
+                configuredPageSize = cfg.pagination.pageSize;
+            }
+            if (!cfg.pagination?.enabled && isVirtualConfig) {
+                configuredPageSize = Number.MAX_SAFE_INTEGER;
+            }
             const initialPageSize = cfg.initialState?.pagination?.pageSize;
             const paginationSchemaKey = `${this._getConfigCacheKey(key || 'initial-pagination')}:${configuredPageSize ?? ''}:${initialPageSize ?? ''}`;
             if (!cfg.initialState?.pagination &&
@@ -8567,11 +8579,13 @@ class ZTableComponent {
             updateItem: (id, updates, fieldKey) => {
                 const current = this.zConfig();
                 current.data = current.data.map((row, index) => {
-                    const rowId = fieldKey
-                        ? row[fieldKey]
-                        : current.getRowId
-                            ? current.getRowId(row, index, undefined, current.data)
-                            : row['id'];
+                    let rowId = row['id'];
+                    if (fieldKey) {
+                        rowId = row[fieldKey];
+                    }
+                    if (!fieldKey && current.getRowId) {
+                        rowId = current.getRowId(row, index, undefined, current.data);
+                    }
                     return rowId === id ? { ...row, ...updates } : row;
                 });
                 this._dataForceUpdate.update(v => v + 1);
@@ -8580,11 +8594,13 @@ class ZTableComponent {
             deleteItem: (id, fieldKey) => {
                 const current = this.zConfig();
                 current.data = current.data.filter((row, index) => {
-                    const rowId = fieldKey
-                        ? row[fieldKey]
-                        : current.getRowId
-                            ? current.getRowId(row, index, undefined, current.data)
-                            : row['id'];
+                    let rowId = row['id'];
+                    if (fieldKey) {
+                        rowId = row[fieldKey];
+                    }
+                    if (!fieldKey && current.getRowId) {
+                        rowId = current.getRowId(row, index, undefined, current.data);
+                    }
                     return rowId !== id;
                 });
                 this._dataForceUpdate.update(v => v + 1);
@@ -8826,10 +8842,7 @@ class ZTableComponent {
         }, this.zConfig().debounceTime ?? Z_DEFAULT_DEBOUNCE_TIME);
     }
     _emitFilterChangeDebounced(filters, search) {
-        if (this._filterEmitDebounceTimeout) {
-            clearTimeout(this._filterEmitDebounceTimeout);
-        }
-        this._filterEmitDebounceTimeout = setTimeout(() => {
+        this._filterEmitDebounceTimer.schedule(() => {
             this.zChange.emit({
                 type: 'filter',
                 data: { filters, search },
@@ -10076,7 +10089,7 @@ class ZTableComponent {
         if (!(target instanceof HTMLElement)) {
             return false;
         }
-        return !!target.closest('button, input, textarea, select, [contenteditable="true"], z-input, z-select, z-calendar, z-checkbox, z-switch');
+        return !!target.closest('button, input, textarea, select, [contenteditable="true"], z-input, z-select, z-calendar, z-checkbox, z-switch, scrollbar-thumb-x, scrollbar-thumb-y, scrollbar-track-x, scrollbar-track-y, scrollbarbutton');
     }
     _isCellSelectionDragTarget(target) {
         if (this._document.body.classList.contains('z-table-pointer-dragging')) {
@@ -10600,7 +10613,13 @@ class ZTableComponent {
         if (position && !this.pinAvailabilityMap()[columnId]?.[position]) {
             return;
         }
-        const tanStackPosition = position === 'left' ? 'start' : position === 'right' ? 'end' : false;
+        let tanStackPosition = false;
+        if (position === 'left') {
+            tanStackPosition = 'start';
+        }
+        if (position === 'right') {
+            tanStackPosition = 'end';
+        }
         column.pin(tanStackPosition);
         // A configured header colSpan renders as one solid block, so pinning (or unpinning) the
         // leading column must carry its covered columns along — otherwise unpinning only the