@tanstack/table-core 8.0.14 → 8.1.0

package/package.json

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

package/src/features/RowSelection.ts

@@ -37,6 +37,7 @@ export type RowSelectionOptions<TData extends RowData> = {
 export type RowSelectionRow = {
   getIsSelected: () => boolean
   getIsSomeSelected: () => boolean
+  getIsAllSubRowsSelected: () => boolean
   getCanSelect: () => boolean
   getCanMultiSelect: () => boolean
   getCanSelectSubRows: () => boolean
@@ -361,12 +362,17 @@ export const RowSelection: TableFeature = {
       },
       getIsSelected: () => {
         const { rowSelection } = table.getState()
-        return isRowSelected(row, rowSelection, table) === true
+        return isRowSelected(row, rowSelection)
       },
 
       getIsSomeSelected: () => {
         const { rowSelection } = table.getState()
-        return isRowSelected(row, rowSelection, table) === 'some'
+        return isSubRowSelected(row, rowSelection, table) === 'some'
+      },
+
+      getIsAllSubRowsSelected: () => {
+        const { rowSelection } = table.getState()
+        return isSubRowSelected(row, rowSelection, table) === 'all'
       },
 
       getCanSelect: () => {
@@ -421,6 +427,9 @@ const mutateRowIsSelected = <TData extends RowData>(
   //   (isGrouped && table.options.enableGroupingRowSelection)
   // ) {
   if (value) {
+    if (!row.getCanMultiSelect()) {
+      Object.keys(selectedRowIds).forEach(key => delete selectedRowIds[key])
+    }
     selectedRowIds[id] = true
   } else {
     delete selectedRowIds[id]
@@ -447,7 +456,7 @@ export function selectRowsFn<TData extends RowData>(
   const recurseRows = (rows: Row<TData>[], depth = 0): Row<TData>[] => {
     return rows
       .map(row => {
-        const isSelected = isRowSelected(row, rowSelection, table) === true
+        const isSelected = isRowSelected(row, rowSelection)
 
         if (isSelected) {
           newSelectedFlatRows.push(row)
@@ -476,14 +485,17 @@ export function selectRowsFn<TData extends RowData>(
 }
 
 export function isRowSelected<TData extends RowData>(
+  row: Row<TData>,
+  selection: Record<string, boolean>
+): boolean {
+  return selection[row.id] ?? false
+}
+
+export function isSubRowSelected<TData extends RowData>(
   row: Row<TData>,
   selection: Record<string, boolean>,
   table: Table<TData>
-): boolean | 'some' {
-  if (selection[row.id]) {
-    return true
-  }
-
+): boolean | 'some' | 'all' {
   if (row.subRows && row.subRows.length) {
     let allChildrenSelected = true
     let someSelected = false
@@ -494,14 +506,14 @@ export function isRowSelected<TData extends RowData>(
         return
       }
 
-      if (isRowSelected(subRow, selection, table)) {
+      if (isRowSelected(subRow, selection)) {
         someSelected = true
       } else {
         allChildrenSelected = false
       }
     })
 
-    return allChildrenSelected ? true : someSelected ? 'some' : false
+    return allChildrenSelected ? 'all' : someSelected ? 'some' : false
   }
 
   return false