@tanstack/react-table 8.2.2 → 8.2.5

package/build/cjs/table-core/build/esm/index.js

@@ -963,7 +963,7 @@ const Expanding = {
       getCanExpand: () => {
         var _table$options$getRow, _table$options$enable, _row$subRows;
 
-        return ((_table$options$getRow = table.options.getRowCanExpand == null ? void 0 : table.options.getRowCanExpand(row)) != null ? _table$options$getRow : true) && ((_table$options$enable = table.options.enableExpanding) != null ? _table$options$enable : true) && !!((_row$subRows = row.subRows) != null && _row$subRows.length);
+        return (_table$options$getRow = table.options.getRowCanExpand == null ? void 0 : table.options.getRowCanExpand(row)) != null ? _table$options$getRow : ((_table$options$enable = table.options.enableExpanding) != null ? _table$options$enable : true) && !!((_row$subRows = row.subRows) != null && _row$subRows.length);
       },
       getToggleExpandedHandler: () => {
         const canExpand = row.getCanExpand();
@@ -1993,6 +1993,10 @@ const RowSelection = {
 
           if (value) {
             preGroupedFlatRows.forEach(row => {
+              if (!row.getCanSelect()) {
+                return;
+              }
+
               rowSelection[row.id] = true;
             });
           } else {
@@ -2256,8 +2260,8 @@ const RowSelection = {
 const mutateRowIsSelected = (selectedRowIds, id, value, table) => {
   var _row$subRows;
 
-  const row = table.getRow(id);
-  row.getIsGrouped(); // if ( // TODO: enforce grouping row selection rules
+  const row = table.getRow(id); // const isGrouped = row.getIsGrouped()
+  // if ( // TODO: enforce grouping row selection rules
   //   !isGrouped ||
   //   (isGrouped && table.options.enableGroupingRowSelection)
   // ) {
@@ -2267,7 +2271,9 @@ const mutateRowIsSelected = (selectedRowIds, id, value, table) => {
       Object.keys(selectedRowIds).forEach(key => delete selectedRowIds[key]);
     }
 
-    selectedRowIds[id] = true;
+    if (row.getCanSelect()) {
+      selectedRowIds[id] = true;
+    }
   } else {
     delete selectedRowIds[id];
   } // }
@@ -3570,9 +3576,20 @@ function getGroupedRowModel() {
         depth = 0;
       }
 
-      // This is the last level, just return the rows
-      if (depth === existingGrouping.length) {
-        return rows;
+      // Grouping depth has been been met
+      // Stop grouping and simply rewrite thd depth and row relationships
+      if (depth >= existingGrouping.length) {
+        return rows.map(row => {
+          row.depth = depth;
+          groupedFlatRows.push(row);
+          groupedRowsById[row.id] = row;
+
+          if (row.subRows) {
+            row.subRows = groupUpRecursively(row.subRows, depth + 1);
+          }
+
+          return row;
+        });
       }
 
       const columnId = existingGrouping[depth]; // Group the rows together for this level