@reforgium/data-grid 3.2.0 → 3.2.3

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [3.2.3]: 13.05.2026
+
+### Fix:
+- `DataGrid`: source/infinity — `totalRowCount` no longer collapses to `0` (empty state) after the internal page buffer evicts early pages on long scrolls when the source does not return `totalElements`; row-count knowledge is now tracked via a monotonic high-water mark (`knownRowCount`) plus end-of-data state (`endReached` / `confirmedTotal`) updated when each page lands, instead of walking the eviction-bound `sourcePages` map
+- `DataGrid`: source/infinity — buffer eviction now anchors `pageBase` and never evicts it, so `localToAbsolutePage` and contiguous-loaded-row accounting stay correct after scrolling past `MAX_BUFFERED_PAGES`
+
+### Test:
+- added regression coverage: monotonic `totalRowCount` without `totalElements` (optimistic probe page, fixed end after short page, post-end full page does not unwind the total), 120-page scroll past `MAX_BUFFERED_PAGES` keeps `totalRowCount` stable, and anchor page survives eviction
+
+### Docs:
+- `GridPagedDataSource.version`: tightened JSDoc — without `totalElements` the grid pins end-of-data on the first short/empty page, so the source must bump `version` on dataset growth/replacement to clear the pin; mutating `items()` in place without a bump leaves the grid with a stale row count
+
+---
+
+## [3.2.1]: 17.04.2026
+
+### Fix:
+- `DataGrid`: source/pagination now respects exact `totalElements` when it is provided instead of collapsing paginator state to the current page payload length
+- `DataGrid`: source/pagination without `totalElements` now exposes one optimistic extra page when the current page is full (`items.length === pageSize`), so the consumer can perform the final probe request and detect the real end on the first short/empty page
+
+### Docs:
+- `README`: documented `GridPagedDataSource.totalElements` behavior for source-driven pagination without a known total
+
+### Test:
+- added regression coverage for source/pagination with exact `totalElements` and for the full-page-without-total probe flow
+
+---
+
 ## [3.2.0]: 14.04.2026
 
 ### Feat:

package/README.md

@@ -303,7 +303,9 @@ Data source guidance:
 - Use `data` when the parent already owns the full rendered collection.
 - Use `source` for server-driven pagination or infinity flows where the parent should expose only the current page.
 - In `mode="infinity"` + `source`, the grid uses `totalElements` for scroll height when available and stores loaded page chunks internally instead of forcing the parent to append rows into one large array.
-- `GridPagedDataSource.totalElements` is optional for infinity sources. If omitted, the grid keeps requesting pages until it receives a short page (`items.length < pageSize`) and then treats that page as the end of the dataset.
+- `GridPagedDataSource.totalElements` is optional for source-driven infinity and pagination flows.
+- In `mode="infinity"`, if `totalElements` is omitted, the grid keeps requesting pages until it receives a short page (`items.length < pageSize`) and then treats that page as the end of the dataset.
+- In `mode="pagination"`, if `totalElements` is omitted, the grid exposes one optimistic extra page while the current page is full. The final size becomes known only after a short page is returned.
 - In `source` mode, initialize the source from the parent after all filters / params are ready; the grid does not perform an automatic first fetch on mount.
 - `GridPagedDataSource.error` is optional and can be used by consumers that want to project source-level error UI near the grid.
 - `GridPagedDataSource.sort`, `updateSort(...)`, and `updateSorts(...)` let the grid use source-owned sort state instead of forcing a separate parent bridge.
@@ -388,21 +390,21 @@ Notes:
 
 The optional `source` input accepts a page-oriented contract:
 
-| Field / method | Type | Description |
-|---|---|---|
-| `items` | `Signal<T[]>` | Current page items |
-| `loading` | `Signal<boolean>` | Source loading state |
-| `error` | `Signal<unknown \| null>` | Optional source error state |
-| `page` | `number` | Current page index |
-| `pageSize` | `number` | Current page size |
-| `totalElements` | `number \| undefined` | Optional total size |
-| `sort` | `ReadonlyArray<GridSortItem<T>> \| undefined` | Optional source-owned sort state |
-| `version` | `Signal<number> \| undefined` | Dataset reset marker for local buffer invalidation |
-| `updatePage(page)` | `(page: number) => Promise<unknown>` | Load a page |
-| `updatePageSize(size)` | `((size: number) => Promise<unknown>) \| undefined` | Optional page-size handler |
-| `updateSort(sort)` | `((sort?: GridSortItem<T> \| null) => Promise<unknown>) \| undefined` | Optional single-sort handler |
-| `updateSorts(sort)` | `((sort?: ReadonlyArray<GridSortItem<T>> \| null) => Promise<unknown>) \| undefined` | Optional multi-sort handler |
-| `prefetchMode` | `'sequential' \| 'parallel' \| undefined` | Infinity prefetch strategy |
+| Field / method         | Type                                                                                 | Description                                                                                                                                                       |
+|------------------------|--------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `items`                | `Signal<T[]>`                                                                        | Current page items                                                                                                                                                |
+| `loading`              | `Signal<boolean>`                                                                    | Source loading state                                                                                                                                              |
+| `error`                | `Signal<unknown \| null>`                                                            | Optional source error state                                                                                                                                       |
+| `page`                 | `number`                                                                             | Current page index                                                                                                                                                |
+| `pageSize`             | `number`                                                                             | Current page size                                                                                                                                                 |
+| `totalElements`        | `number \| undefined`                                                                | Optional exact total size; if omitted, `infinity` stops on the first short page and `pagination` exposes one optimistic extra page while the current page is full |
+| `sort`                 | `ReadonlyArray<GridSortItem<T>> \| undefined`                                        | Optional source-owned sort state                                                                                                                                  |
+| `version`              | `Signal<number> \| undefined`                                                        | Dataset reset marker for local buffer invalidation                                                                                                                |
+| `updatePage(page)`     | `(page: number) => Promise<unknown>`                                                 | Load a page                                                                                                                                                       |
+| `updatePageSize(size)` | `((size: number) => Promise<unknown>) \| undefined`                                  | Optional page-size handler                                                                                                                                        |
+| `updateSort(sort)`     | `((sort?: GridSortItem<T> \| null) => Promise<unknown>) \| undefined`                | Optional single-sort handler                                                                                                                                      |
+| `updateSorts(sort)`    | `((sort?: ReadonlyArray<GridSortItem<T>> \| null) => Promise<unknown>) \| undefined` | Optional multi-sort handler                                                                                                                                       |
+| `prefetchMode`         | `'sequential' \| 'parallel' \| undefined`                                            | Infinity prefetch strategy                                                                                                                                        |
 
 This contract is intentionally grid-like, not `statum`-specific, but `PagedQueryStore` already matches it well enough to be used directly.
 

package/fesm2022/{reforgium-data-grid-grid-overlay-scroll.feature-6tkNtIuO.mjs → reforgium-data-grid-grid-overlay-scroll.feature-DQp-sU6c.mjs}

@@ -1,4 +1,4 @@
-import { c as computeScrollbarState, a as clampThumbTop, m as mapThumbTopToScrollTop } from './reforgium-data-grid-reforgium-data-grid-Cb2oAQjG.mjs';
+import { c as computeScrollbarState, a as clampThumbTop, m as mapThumbTopToScrollTop } from './reforgium-data-grid-reforgium-data-grid-DUpCJ9P0.mjs';
 
 function createGridOverlayScrollFeature(ctx) {
     const showScrollbar = () => {
@@ -76,4 +76,4 @@ function createGridOverlayScrollFeature(ctx) {
 }
 
 export { createGridOverlayScrollFeature };
-//# sourceMappingURL=reforgium-data-grid-grid-overlay-scroll.feature-6tkNtIuO.mjs.map
+//# sourceMappingURL=reforgium-data-grid-grid-overlay-scroll.feature-DQp-sU6c.mjs.map

package/fesm2022/{reforgium-data-grid-reforgium-data-grid-Cb2oAQjG.mjs → reforgium-data-grid-reforgium-data-grid-DUpCJ9P0.mjs}

@@ -2162,6 +2162,12 @@ function createGridSourceDataFeature(ctx) {
     let requestGeneration = 0;
     let hasReceivedData = false;
     let pageBase = 0;
+    // Row knowledge accounting. Decoupled from `sourcePages` so that buffer eviction
+    // (MAX_BUFFERED_PAGES) cannot collapse totalRowCount back to 0 once a source
+    // without `totalElements` has scrolled past the buffer window.
+    let knownRowCount = 0;
+    let endReached = false;
+    let confirmedTotal = null;
     const hasSessionState = () => sourcePages.size > 0 || pendingPages.size > 0 || queuedPages.length > 0 || activeRequests > 0 || hasReceivedData;
     const resolvedLoading = () => ctx.getSource()?.loading() ?? ctx.getFallbackLoading();
     const totalRowCount = () => {
@@ -2177,16 +2183,19 @@ function createGridSourceDataFeature(ctx) {
                 const shiftedTotal = Math.max(0, knownTotal - pageBase * pageSize);
                 return shiftedTotal > 0 ? shiftedTotal : (source.items()?.length ?? 0);
             }
-            const loadedRows = contiguousLoadedRowCount(source);
-            if (loadedRows <= 0) {
-                return 0;
+            if (endReached) {
+                return confirmedTotal ?? 0;
             }
-            if (hasReachedInfinityEnd(source)) {
-                return loadedRows;
+            if (knownRowCount <= 0) {
+                return 0;
             }
-            return loadedRows + Math.max(1, source.pageSize || ctx.getFallbackPageSize());
+            return knownRowCount + Math.max(1, source.pageSize || ctx.getFallbackPageSize());
         }
-        return source.items()?.length ?? 0;
+        const knownTotal = resolvedTotalElements(source);
+        if (knownTotal !== null) {
+            return knownTotal;
+        }
+        return estimateOpenEndedPaginationTotal(source);
     };
     const selectionRows = () => {
         const source = ctx.getSource();
@@ -2337,7 +2346,10 @@ function createGridSourceDataFeature(ctx) {
         }
         pageBase = sourcePages.size === 0 ? Math.max(0, source.page || 0) : pageBase;
         const pageItems = source.items() ?? [];
-        sourcePages.set(Math.max(0, source.page || 0), pageItems);
+        const sourcePage = Math.max(0, source.page || 0);
+        const pageSize = Math.max(1, source.pageSize || ctx.getFallbackPageSize());
+        sourcePages.set(sourcePage, pageItems);
+        recordPageKnowledge(sourcePage, pageItems, pageSize);
         if (!hasReceivedData && pageItems.length > 0) {
             hasReceivedData = true;
         }
@@ -2359,8 +2371,37 @@ function createGridSourceDataFeature(ctx) {
         pendingPages.clear();
         activeRequests = 0;
         sourcePages.clear();
+        knownRowCount = 0;
+        endReached = false;
+        confirmedTotal = null;
         bufferVersion.update((current) => current + 1);
     };
+    const recordPageKnowledge = (sourcePage, pageItems, pageSize) => {
+        if (sourcePage < pageBase) {
+            return;
+        }
+        const relPage = sourcePage - pageBase;
+        if (pageItems.length === 0) {
+            // Empty page at or beyond the first known page implies the dataset ends here.
+            // For the initial empty sync (relPage === 0) we stay non-committal so that a
+            // later in-place items() update can still surface real rows.
+            if (relPage > 0) {
+                endReached = true;
+                const total = relPage * pageSize;
+                confirmedTotal = confirmedTotal === null ? total : Math.min(confirmedTotal, total);
+            }
+            return;
+        }
+        if (pageItems.length < pageSize) {
+            endReached = true;
+            const total = relPage * pageSize + pageItems.length;
+            confirmedTotal = confirmedTotal === null ? total : Math.min(confirmedTotal, total);
+            return;
+        }
+        if (!endReached) {
+            knownRowCount = Math.max(knownRowCount, (relPage + 1) * pageSize);
+        }
+    };
     const pushPage = (pages, page, maxPage) => {
         if (page < 0 || page > maxPage || pages.includes(page)) {
             return;
@@ -2400,7 +2441,10 @@ function createGridSourceDataFeature(ctx) {
                 // только последнюю из страниц, если несколько запросов завершились до
                 // того, как эффект успел выполниться, и все промежуточные страницы теряются.
                 if (ctx.getMode() === 'infinity' && !sourcePages.has(nextPage)) {
-                    sourcePages.set(nextPage, activeSource.items() ?? []);
+                    const capturedItems = activeSource.items() ?? [];
+                    const pageSize = Math.max(1, activeSource.pageSize || ctx.getFallbackPageSize());
+                    sourcePages.set(nextPage, capturedItems);
+                    recordPageKnowledge(nextPage, capturedItems, pageSize);
                 }
             })
                 .finally(() => {
@@ -2427,24 +2471,20 @@ function createGridSourceDataFeature(ctx) {
         }
         return loaded;
     };
-    const hasReachedInfinityEnd = (source) => {
-        const pageSize = Math.max(1, source.pageSize || ctx.getFallbackPageSize());
-        let page = pageBase;
-        while (sourcePages.has(page)) {
-            const items = sourcePages.get(page) ?? [];
-            if (items.length < pageSize) {
-                return true;
-            }
-            page++;
-        }
-        return false;
-    };
     const resolvedTotalElements = (source) => {
         if (typeof source.totalElements !== 'number' || !Number.isFinite(source.totalElements)) {
             return null;
         }
         return Math.max(0, source.totalElements);
     };
+    const estimateOpenEndedPaginationTotal = (source) => {
+        const pageSize = Math.max(1, source.pageSize || ctx.getFallbackPageSize());
+        const page = Math.max(0, source.page || 0);
+        const itemsCount = source.items()?.length ?? 0;
+        const loadedBefore = page * pageSize;
+        const hasUnknownNextPage = itemsCount === pageSize;
+        return loadedBefore + itemsCount + (hasUnknownNextPage ? pageSize : 0);
+    };
     const evictExcessPages = (keepPages) => {
         if (sourcePages.size <= MAX_BUFFERED_PAGES) {
             return;
@@ -2453,6 +2493,12 @@ function createGridSourceDataFeature(ctx) {
             if (sourcePages.size <= MAX_BUFFERED_PAGES) {
                 break;
             }
+            // Never evict the anchor page: `localToAbsolutePage` and the contiguous-loaded
+            // walk both start from `pageBase`, so dropping it would cascade into wrong
+            // request-progress numbers even though totalRowCount is now buffer-independent.
+            if (page === pageBase) {
+                continue;
+            }
             if (!keepPages.has(page)) {
                 sourcePages.delete(page);
             }
@@ -4075,7 +4121,7 @@ class DataGrid {
         if (this.overlayScrollFeaturePromise) {
             return this.overlayScrollFeaturePromise;
         }
-        this.overlayScrollFeaturePromise = import('./reforgium-data-grid-grid-overlay-scroll.feature-6tkNtIuO.mjs').then(({ createGridOverlayScrollFeature }) => {
+        this.overlayScrollFeaturePromise = import('./reforgium-data-grid-grid-overlay-scroll.feature-DQp-sU6c.mjs').then(({ createGridOverlayScrollFeature }) => {
             const feature = createGridOverlayScrollFeature({
                 getScrollElement: () => this.scrollEl()?.nativeElement ?? null,
                 getThumbTop: () => this.vm.thumbTopPx(),
@@ -4200,4 +4246,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.4", ngImpor
  */
 
 export { DataGridTypeCellTemplateDirective as D, clampThumbTop as a, DataGridCellTemplateDirective as b, computeScrollbarState as c, DataGridHeaderTemplateDirective as d, DataGridRowDirective as e, DataGridDeclarativeColumn as f, DataGridDeclarativeHeaderDirective as g, DataGridDeclarativeCellDirective as h, DataGridCellEmptyDirective as i, DataGridCellLoadingDirective as j, DataGridStickyRowDirective as k, DataGridSortIconDirective as l, mapThumbTopToScrollTop as m, DataGridExpanderIconDirective as n, DATA_GRID_CONFIG as o, DATA_GRID_HEADER_TEXT_RESOLVER as p, DATA_GRID_TYPE_RENDERERS as q, DATA_GRID_TYPE_TRANSFORMERS as r, DEFAULT_DATA_GRID_DEFAULTS as s, provideDataGridDefaults as t, provideDataGridHeaderTextResolver as u, provideDataGridHeaderTextResolverWithParent as v, provideDataGridTypeRenderers as w, provideDataGridTypeTransformers as x, DataGrid as y };
-//# sourceMappingURL=reforgium-data-grid-reforgium-data-grid-Cb2oAQjG.mjs.map
+//# sourceMappingURL=reforgium-data-grid-reforgium-data-grid-DUpCJ9P0.mjs.map

package/fesm2022/reforgium-data-grid.mjs

@@ -1,2 +1,2 @@
-export { o as DATA_GRID_CONFIG, p as DATA_GRID_HEADER_TEXT_RESOLVER, q as DATA_GRID_TYPE_RENDERERS, r as DATA_GRID_TYPE_TRANSFORMERS, s as DEFAULT_DATA_GRID_DEFAULTS, y as DataGrid, i as DataGridCellEmptyDirective, j as DataGridCellLoadingDirective, b as DataGridCellTemplateDirective, h as DataGridDeclarativeCellDirective, f as DataGridDeclarativeColumn, g as DataGridDeclarativeHeaderDirective, n as DataGridExpanderIconDirective, d as DataGridHeaderTemplateDirective, e as DataGridRowDirective, l as DataGridSortIconDirective, k as DataGridStickyRowDirective, D as DataGridTypeCellTemplateDirective, t as provideDataGridDefaults, u as provideDataGridHeaderTextResolver, v as provideDataGridHeaderTextResolverWithParent, w as provideDataGridTypeRenderers, x as provideDataGridTypeTransformers } from './reforgium-data-grid-reforgium-data-grid-Cb2oAQjG.mjs';
+export { o as DATA_GRID_CONFIG, p as DATA_GRID_HEADER_TEXT_RESOLVER, q as DATA_GRID_TYPE_RENDERERS, r as DATA_GRID_TYPE_TRANSFORMERS, s as DEFAULT_DATA_GRID_DEFAULTS, y as DataGrid, i as DataGridCellEmptyDirective, j as DataGridCellLoadingDirective, b as DataGridCellTemplateDirective, h as DataGridDeclarativeCellDirective, f as DataGridDeclarativeColumn, g as DataGridDeclarativeHeaderDirective, n as DataGridExpanderIconDirective, d as DataGridHeaderTemplateDirective, e as DataGridRowDirective, l as DataGridSortIconDirective, k as DataGridStickyRowDirective, D as DataGridTypeCellTemplateDirective, t as provideDataGridDefaults, u as provideDataGridHeaderTextResolver, v as provideDataGridHeaderTextResolverWithParent, w as provideDataGridTypeRenderers, x as provideDataGridTypeTransformers } from './reforgium-data-grid-reforgium-data-grid-DUpCJ9P0.mjs';
 //# sourceMappingURL=reforgium-data-grid.mjs.map

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.2.0",
+  "version": "3.2.3",
   "name": "@reforgium/data-grid",
   "description": "reforgium DataGrid component",
   "author": "rtommievich",

package/types/reforgium-data-grid.d.ts

@@ -759,11 +759,23 @@ interface GridPagedDataSource<Data extends AnyDict = AnyDict> {
     /**
      * Total number of rows available in the dataset.
      *
-     * Optional in infinity mode. When omitted, the grid treats the dataset as open-ended
-     * until it receives a short page (`items.length < pageSize`) and then fixes the final size.
+     * Optional in source-driven pagination/infinity mode.
+     *
+     * - In `infinity`, the grid treats the dataset as open-ended until it receives
+     *   a short page (`items.length < pageSize`) and then fixes the final size.
+     * - In `pagination`, the grid exposes one optimistic extra page while the current
+     *   page is full, because without `totalElements` the end can only be detected
+     *   after the next request returns a short page.
      */
     totalElements?: number;
-    /** Optional dataset revision signal. Increment to force the grid to clear its local page buffer. */
+    /**
+     * Optional dataset revision signal. Increment to force the grid to clear its local page buffer.
+     *
+     * Required (when present) to be incremented on any dataset growth, replacement, or filter/sort change:
+     * in `infinity` mode without `totalElements` the grid pins end-of-data state on the first short/empty
+     * page it sees, and only a version bump clears that pin. Mutating `items()` in place without bumping
+     * `version` will leave the grid with a stale row count.
+     */
     version?: Signal<number>;
     /** Current source-side sort state. */
     sort?: ReadonlyArray<GridSortItem<Data>>;