@gridkitjs/core 0.14.0 → 0.14.1

package/dist/index.d.ts

@@ -3441,9 +3441,9 @@ declare function toggleColumnSort(sort: ColumnSortState, columnId: string, optio
 }): ColumnSortState;
 /**
  * `rows` ordered by `sort` — each entry read against `columns` for its
- * `field` and `type` — with `rowIndex` renumbered to match the new
- * positions, the invariant the rest of the grid relies on for keyboard
- * navigation and `aria-rowindex`.
+ * `field` and `type` — with `rowIndex` and `datasetIndex` renumbered to
+ * match the new positions, the invariant the rest of the grid relies on for
+ * keyboard navigation and `aria-rowindex`.
  *
  * Stable (`Array.prototype.sort` has been stable since ES2019), so rows
  * equal under every active key keep their relative order. A `null`/
@@ -3493,8 +3493,9 @@ declare function setColumnFilter<Row>(filter: FilterState<Row>, columnId: (Field
 declare function clearAllFilters<Row>(filter: FilterState<Row>): FilterState<Row>;
 /**
  * `rows` reduced to those matching every entry in `filter` (AND at the top
- * level — nest a `GroupFilterEntry` for OR). `rowIndex` is renumbered to
- * match the retained positions — the same invariant `sortRows` keeps,
+ * level — nest a `GroupFilterEntry` for OR). `rowIndex` and `datasetIndex`
+ * are renumbered to match the retained positions — the same invariant
+ * `sortRows` keeps,
  * needed here independently since `filterRows` runs before `sortRows` in
  * the composed pipeline (see `resolveShownRows`).
  *
@@ -3532,10 +3533,11 @@ declare function groupRowId(path: readonly unknown[]): string;
  * this only reshapes their output, and never changes which rows appear or
  * their relative order within a group.
  *
- * `rowIndex` is renumbered across the whole flattened output, header rows
- * included — the same invariant `sortRows`/`filterRows` keep for
- * `ResolvedRow.rowIndex`, extended to `ResolvedGroupRow.rowIndex` since
- * `GridBody` addresses both kinds by the same flat position.
+ * `rowIndex` and `datasetIndex` are renumbered across the whole flattened
+ * output, header rows included — the same invariant `sortRows`/`filterRows`
+ * keep for a `ResolvedRow`, extended to `ResolvedGroupRow` since `GridBody`
+ * addresses both kinds by the same flat position, and `aria-rowindex`
+ * counts both.
  *
  * Returns `rows` itself, untouched, when `groupBy` is empty or names only
  * columns absent from `columns` — a stored grouping tolerates a column
@@ -3640,9 +3642,9 @@ interface PaginatedRows<Row> {
  * state, matching `sortRows`/`filterRows`), and the returned page's
  * `rowIndex` is renumbered to be page-relative — 0-based from the top of the
  * page, header rows included, mirroring `groupRows`'s own renumbering
- * invariant. `datasetIndex` is left untouched: it is assigned once, ahead of
- * filter/sort/group/paginate, and reports each row's position in the whole
- * dataset regardless of which page is showing.
+ * invariant. `datasetIndex` is left untouched: the stages ahead of this one
+ * set it to each row's position in the whole displayed result, which stays
+ * the same whichever page is showing.
  */
 declare function paginateRows<Row>(rows: readonly DisplayRow<Row>[], pagination: PaginationState): PaginatedRows<Row>;
 

package/dist/index.js

@@ -102,6 +102,13 @@ function accessDotted(obj, path) {
   return path.split(".").reduce((value, key) => isNested(value) ? value[key] : void 0, obj);
 }
 
+// src/util/position.ts
+function renumberRows(entries) {
+  return entries.map(
+    (entry, index) => entry.rowIndex === index && entry.datasetIndex === index ? entry : { ...entry, rowIndex: index, datasetIndex: index }
+  );
+}
+
 // src/util/sorting.ts
 function isEmpty(value) {
   return value === null || value === void 0;
@@ -189,9 +196,7 @@ function sortRows(rows, sort, columns) {
     }
     return 0;
   });
-  return sorted.map(
-    (row, index) => row.rowIndex === index ? row : { ...row, rowIndex: index }
-  );
+  return renumberRows(sorted);
 }
 
 // src/util/grouping.ts
@@ -263,9 +268,7 @@ function buildLevel(rows, levels, parentPath, expansion, byId, out) {
       path,
       expanded,
       count: group.rows.length,
-      // Renumbered globally once `groupRows` has the whole flattened array —
-      // a header has no row of its own to carry a dataset position, so
-      // `datasetIndex` takes the same renumbered value `rowIndex` does.
+      // Both set by `groupRows` once it has the whole flattened array.
       rowIndex: -1,
       datasetIndex: -1,
       // Set by `withGroupAggregates`, downstream of grouping — empty here
@@ -289,12 +292,7 @@ function groupRows(rows, groupBy, expansion, columns) {
   }
   const out = [];
   buildLevel(rows, active, [], expansion, byId, out);
-  return out.map((entry, index) => {
-    if ("kind" in entry) {
-      return entry.rowIndex === index && entry.datasetIndex === index ? entry : { ...entry, rowIndex: index, datasetIndex: index };
-    }
-    return entry.rowIndex === index ? entry : { ...entry, rowIndex: index };
-  });
+  return renumberRows(out);
 }
 function toggleGroupExpansion(expansion, groupId) {
   return expansion.includes(groupId) ? expansion.filter((id) => id !== groupId) : [...expansion, groupId];
@@ -985,12 +983,7 @@ function withGroupAggregates(displayRows, flatRows, groupBy, specs, columns, dis
     display,
     out
   );
-  return out.map((entry, position) => {
-    if ("kind" in entry) {
-      return entry.rowIndex === position && entry.datasetIndex === position ? entry : { ...entry, rowIndex: position, datasetIndex: position };
-    }
-    return entry.rowIndex === position ? entry : { ...entry, rowIndex: position };
-  });
+  return renumberRows(out);
 }
 
 // src/util/filtering.ts
@@ -1151,9 +1144,7 @@ function filterRows(rows, filter, columns) {
     return rows;
   }
   const filtered = rows.filter((row) => test(row.row));
-  return filtered.map(
-    (row, index) => row.rowIndex === index ? row : { ...row, rowIndex: index }
-  );
+  return renumberRows(filtered);
 }
 
 // src/util/rows.ts