@tanstack/table-core 8.2.2 → 8.2.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tanstack/table-core",
   "author": "Tanner Linsley",
-  "version": "8.2.2",
+  "version": "8.2.5",
   "description": "Headless UI for building powerful tables & datagrids for TS/JS.",
   "license": "MIT",
   "homepage": "https://github.com/tanstack/table#readme",

package/src/features/Expanding.ts

@@ -218,9 +218,11 @@ export const Expanding: TableFeature = {
       },
       getCanExpand: () => {
         return (
-          (table.options.getRowCanExpand?.(row) ?? true) &&
-          (table.options.enableExpanding ?? true) &&
-          !!row.subRows?.length
+          table.options.getRowCanExpand?.(row) ??
+          (
+            (table.options.enableExpanding ?? true) &&
+            !!row.subRows?.length
+          )
         )
       },
       getToggleExpandedHandler: () => {

package/src/features/RowSelection.ts

@@ -108,6 +108,9 @@ export const RowSelection: TableFeature = {
           // All of the rows are flat already, so it wouldn't be worth it
           if (value) {
             preGroupedFlatRows.forEach(row => {
+              if (!row.getCanSelect()) {
+                return
+              }
               rowSelection[row.id] = true
             })
           } else {
@@ -420,7 +423,7 @@ const mutateRowIsSelected = <TData extends RowData>(
 ) => {
   const row = table.getRow(id)
 
-  const isGrouped = row.getIsGrouped()
+  // const isGrouped = row.getIsGrouped()
 
   // if ( // TODO: enforce grouping row selection rules
   //   !isGrouped ||
@@ -430,7 +433,9 @@ const mutateRowIsSelected = <TData extends RowData>(
     if (!row.getCanMultiSelect()) {
       Object.keys(selectedRowIds).forEach(key => delete selectedRowIds[key])
     }
-    selectedRowIds[id] = true
+    if (row.getCanSelect()) {
+      selectedRowIds[id] = true
+    }
   } else {
     delete selectedRowIds[id]
   }

package/src/utils/getGroupedRowModel.ts

@@ -29,11 +29,23 @@ export function getGroupedRowModel<TData extends RowData>(): (
         const groupUpRecursively = (
           rows: Row<TData>[],
           depth = 0,
-          parentId: string
+          parentId?: string
         ) => {
-          // 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]!