@shival99/z-ui 1.7.15 → 1.7.17

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

@@ -825,6 +825,12 @@ const resolveConfigValue = (config, row, defaultValue) => {
     }
     return typeof config === 'function' ? config(row) : config;
 };
+const pickDefined = (obj, keys) => keys.reduce((acc, key) => {
+    if (obj[key] !== undefined) {
+        acc[key] = obj[key];
+    }
+    return acc;
+}, {});
 
 class ZTableEditCellComponent {
     _destroyRef = inject(DestroyRef);
@@ -3166,6 +3172,13 @@ class ZTableComponent {
             overscan: virtual.overscan ?? Z_DEFAULT_VIRTUAL_OVERSCAN,
             groupSize: virtual.groupSize ?? Z_DEFAULT_GROUP_SIZE,
             dynamicSize: virtual.dynamicSize ?? false,
+            initialOffset: virtual.initialOffset,
+            scrollMargin: virtual.scrollMargin,
+            gap: virtual.gap,
+            isScrollingResetDelay: virtual.isScrollingResetDelay,
+            useScrollendEvent: virtual.useScrollendEvent,
+            getItemKey: virtual.getItemKey,
+            rangeExtractor: virtual.rangeExtractor,
         };
     }, ...(ngDevMode ? [{ debugName: "_virtualConfig" }] : []));
     virtualRowHeight = computed(() => this._virtualConfig().size ?? Z_DEFAULT_ROW_HEIGHT, ...(ngDevMode ? [{ debugName: "virtualRowHeight" }] : []));
@@ -3547,14 +3560,12 @@ class ZTableComponent {
         const totalRows = untracked(() => this.table.getRowModel().rows.length);
         return Math.ceil(totalRows / this.groupSize());
     }, ...(ngDevMode ? [{ debugName: "_virtualGroupCount" }] : []));
-    _virtualResetVersion = signal(0, ...(ngDevMode ? [{ debugName: "_virtualResetVersion" }] : []));
     virtualizer = injectVirtualizer(() => {
-        // Track reset version to force virtualizer re-initialization
-        this._virtualResetVersion();
         const groups = this.dynamicGroups();
         const rowHeight = this.virtualRowHeight();
         const groupSize = this.groupSize();
         const scrollElement = this.tbodyWrapper()?.nativeElement;
+        const virtualConfig = this._virtualConfig();
         return {
             scrollElement,
             count: groups.length > 0 ? groups.length : this._virtualGroupCount(),
@@ -3569,8 +3580,16 @@ class ZTableComponent {
                 return groupSize * rowHeight;
             },
             measureElement: (element) => element.getBoundingClientRect().height,
-            overscan: this._virtualConfig().overscan ?? Z_DEFAULT_VIRTUAL_OVERSCAN,
-            initialOffset: 0,
+            overscan: virtualConfig.overscan ?? Z_DEFAULT_VIRTUAL_OVERSCAN,
+            initialOffset: virtualConfig.initialOffset ?? 0,
+            ...pickDefined(virtualConfig, [
+                'scrollMargin',
+                'gap',
+                'isScrollingResetDelay',
+                'useScrollendEvent',
+                'getItemKey',
+                'rangeExtractor',
+            ]),
         };
     });
     _measureVirtualItems = effect(() => {
@@ -3697,25 +3716,18 @@ class ZTableComponent {
         });
         explicitEffect([this.columnFilters, this.globalFilter, this.pagination, this.sorting, this._data], () => {
             if (this.isVirtual()) {
-                // Reset scroll position synchronously
                 const wrapperEl = this.tbodyWrapper()?.nativeElement;
                 if (wrapperEl) {
                     wrapperEl.scrollTop = 0;
                 }
-                const scrollbar = this.tbodyScrollbar();
-                if (scrollbar) {
-                    void scrollbar.scrollTo({ top: 0, duration: 0 });
-                }
-                // Reset virtualizer to offset 0
                 this.virtualizer.scrollToOffset(0);
-                // Force recalculate dynamic groups immediately
-                this._dynamicGroupsVersion.update(v => v + 1);
-                // Force virtualizer to reset with initialOffset: 0
-                this._virtualResetVersion.update(v => v + 1);
             }
             queueMicrotask(() => {
                 this._checkVerticalScroll();
                 this._checkHorizontalScroll();
+                if (this.isVirtual()) {
+                    this._dynamicGroupsVersion.update(v => v + 1);
+                }
             });
         });
         explicitEffect([this.virtualizer.getVirtualItems], () => {
@@ -3733,21 +3745,27 @@ class ZTableComponent {
                 const wrapperEl = this.tbodyWrapper()?.nativeElement;
                 if (wrapperEl) {
                     this._savedScrollLeft.set(wrapperEl.scrollLeft);
+                    wrapperEl.scrollTop = 0;
+                }
+                const scrollbar = this.tbodyScrollbar();
+                if (scrollbar) {
+                    void scrollbar.scrollTo({ top: 0, left: this._savedScrollLeft(), duration: 0 });
                 }
                 return;
             }
-            // Loading finished - reset scroll positions
             queueMicrotask(() => {
                 const wrapperEl = this.tbodyWrapper()?.nativeElement;
                 if (wrapperEl) {
                     wrapperEl.scrollTop = 0;
                     wrapperEl.scrollLeft = this._savedScrollLeft();
                 }
-                // Critical: Reset virtualizer when loading finishes in server mode
                 if (this.isVirtual()) {
+                    const scrollbar = this.tbodyScrollbar();
+                    if (scrollbar) {
+                        void scrollbar.scrollTo({ top: 0, left: this._savedScrollLeft(), duration: 0 });
+                    }
                     this.virtualizer.scrollToOffset(0);
                     this._dynamicGroupsVersion.update(v => v + 1);
-                    this._virtualResetVersion.update(v => v + 1);
                 }
                 this._checkScrollState();
             });