@tanstack/table-core 8.8.0 → 8.8.2

package/build/lib/index.mjs

@@ -1995,12 +1995,12 @@ const RowSelection = {
         return isAllRowsSelected;
       },
       getIsAllPageRowsSelected: () => {
-        const paginationFlatRows = table.getPaginationRowModel().flatRows;
+        const paginationFlatRows = table.getPaginationRowModel().flatRows.filter(row => row.getCanSelect());
         const {
           rowSelection
         } = table.getState();
         let isAllPageRowsSelected = !!paginationFlatRows.length;
-        if (isAllPageRowsSelected && paginationFlatRows.some(row => row.getCanSelect() && !rowSelection[row.id])) {
+        if (isAllPageRowsSelected && paginationFlatRows.some(row => !rowSelection[row.id])) {
           isAllPageRowsSelected = false;
         }
         return isAllPageRowsSelected;
@@ -2012,7 +2012,7 @@ const RowSelection = {
       },
       getIsSomePageRowsSelected: () => {
         const paginationFlatRows = table.getPaginationRowModel().flatRows;
-        return table.getIsAllPageRowsSelected() ? false : paginationFlatRows.some(d => d.getIsSelected() || d.getIsSomeSelected());
+        return table.getIsAllPageRowsSelected() ? false : paginationFlatRows.filter(row => row.getCanSelect()).some(d => d.getIsSelected() || d.getIsSomeSelected());
       },
       getToggleAllRowsSelectedHandler: () => {
         return e => {
@@ -2819,13 +2819,13 @@ function createCell(table, row, column, columnId) {
   return cell;
 }
 
-const createRow = (table, id, original, rowIndex, depth, subRows, parentRow) => {
+const createRow = (table, id, original, rowIndex, depth, subRows, parentId) => {
   let row = {
     id,
     index: rowIndex,
     original,
     depth,
-    parentRow,
+    parentId,
     _valuesCache: {},
     _uniqueValuesCache: {},
     getValue: columnId => {
@@ -2860,6 +2860,18 @@ const createRow = (table, id, original, rowIndex, depth, subRows, parentRow) =>
     },
     subRows: subRows != null ? subRows : [],
     getLeafRows: () => flattenBy(row.subRows, d => d.subRows),
+    getParentRow: () => row.parentId ? table.getRow(row.parentId) : undefined,
+    getParentRows: () => {
+      let parentRows = [];
+      let currentRow = row;
+      while (true) {
+        const parentRow = currentRow.getParentRow();
+        if (!parentRow) break;
+        parentRows.push(parentRow);
+        currentRow = parentRow;
+      }
+      return parentRows.reverse();
+    },
     getAllCells: memo(() => [table.getAllLeafColumns()], leafColumns => {
       return leafColumns.map(column => {
         return createCell(table, row, column, column.id);
@@ -2969,7 +2981,7 @@ function getCoreRowModel() {
         // }
 
         // Make the row
-        const row = createRow(table, table._getRowId(originalRows[i], i, parentRow), originalRows[i], i, depth, undefined, parentRow);
+        const row = createRow(table, table._getRowId(originalRows[i], i, parentRow), originalRows[i], i, depth, undefined, parentRow == null ? void 0 : parentRow.id);
 
         // Keep track of every row in a flat array
         rowModel.flatRows.push(row);
@@ -3016,7 +3028,7 @@ function filterRowModelFromLeafs(rowsToFilter, filterRow, table) {
   const newFilteredFlatRows = [];
   const newFilteredRowsById = {};
   const maxDepth = (_table$options$maxLea = table.options.maxLeafRowFilterDepth) != null ? _table$options$maxLea : 100;
-  const recurseFilterRows = function (rowsToFilter, depth, parentRow) {
+  const recurseFilterRows = function (rowsToFilter, depth) {
     if (depth === void 0) {
       depth = 0;
     }
@@ -3026,10 +3038,10 @@ function filterRowModelFromLeafs(rowsToFilter, filterRow, table) {
     for (let i = 0; i < rowsToFilter.length; i++) {
       var _row$subRows;
       let row = rowsToFilter[i];
-      const newRow = createRow(table, row.id, row.original, row.index, row.depth, undefined, parentRow);
+      const newRow = createRow(table, row.id, row.original, row.index, row.depth, undefined, row.parentId);
       newRow.columnFilters = row.columnFilters;
       if ((_row$subRows = row.subRows) != null && _row$subRows.length && depth < maxDepth) {
-        newRow.subRows = recurseFilterRows(row.subRows, depth + 1, newRow);
+        newRow.subRows = recurseFilterRows(row.subRows, depth + 1);
         row = newRow;
         if (filterRow(row) && !newRow.subRows.length) {
           rows.push(row);
@@ -3067,7 +3079,7 @@ function filterRowModelFromRoot(rowsToFilter, filterRow, table) {
   const maxDepth = (_table$options$maxLea2 = table.options.maxLeafRowFilterDepth) != null ? _table$options$maxLea2 : 100;
 
   // Filters top level and nested rows
-  const recurseFilterRows = function (rowsToFilter, depth, parentRow) {
+  const recurseFilterRows = function (rowsToFilter, depth) {
     if (depth === void 0) {
       depth = 0;
     }
@@ -3082,8 +3094,8 @@ function filterRowModelFromRoot(rowsToFilter, filterRow, table) {
       if (pass) {
         var _row$subRows2;
         if ((_row$subRows2 = row.subRows) != null && _row$subRows2.length && depth < maxDepth) {
-          const newRow = createRow(table, row.id, row.original, row.index, row.depth, undefined, parentRow);
-          newRow.subRows = recurseFilterRows(row.subRows, depth + 1, newRow);
+          const newRow = createRow(table, row.id, row.original, row.index, row.depth, undefined, row.parentId);
+          newRow.subRows = recurseFilterRows(row.subRows, depth + 1);
           row = newRow;
         }
         rows.push(row);
@@ -3394,7 +3406,7 @@ function getGroupedRowModel() {
     // const nonGroupedRowsById: Record<RowId, Row> = {};
 
     // Recursively group the data
-    const groupUpRecursively = function (rows, depth, parentRow, parentId) {
+    const groupUpRecursively = function (rows, depth, parentId) {
       if (depth === void 0) {
         depth = 0;
       }
@@ -3406,7 +3418,7 @@ function getGroupedRowModel() {
           groupedFlatRows.push(row);
           groupedRowsById[row.id] = row;
           if (row.subRows) {
-            row.subRows = groupUpRecursively(row.subRows, depth + 1, row);
+            row.subRows = groupUpRecursively(row.subRows, depth + 1, row.id);
           }
           return row;
         });
@@ -3423,11 +3435,11 @@ function getGroupedRowModel() {
         id = parentId ? `${parentId}>${id}` : id;
 
         // First, Recurse to group sub rows before aggregation
-        const subRows = groupUpRecursively(groupedRows, depth + 1, parentRow, id);
+        const subRows = groupUpRecursively(groupedRows, depth + 1, id);
 
         // Flatten the leaf rows of the rows in this group
         const leafRows = depth ? flattenBy(groupedRows, row => row.subRows) : groupedRows;
-        const row = createRow(table, id, leafRows[0].original, index, depth, undefined, parentRow);
+        const row = createRow(table, id, leafRows[0].original, index, depth, undefined, parentId);
         Object.assign(row, {
           groupingColumnId: columnId,
           groupingValue,
@@ -3474,7 +3486,7 @@ function getGroupedRowModel() {
       });
       return aggregatedGroupedRows;
     };
-    const groupedRows = groupUpRecursively(rowModel.rows, 0, undefined, '');
+    const groupedRows = groupUpRecursively(rowModel.rows, 0);
     groupedRows.forEach(subRow => {
       groupedFlatRows.push(subRow);
       groupedRowsById[subRow.id] = subRow;