@tanstack/react-table 8.9.9 → 8.9.11

package/build/umd/index.development.js

@@ -2047,7 +2047,7 @@
         const isSelected = row.getIsSelected();
         table.setRowSelection(old => {
           value = typeof value !== 'undefined' ? value : !isSelected;
-          if (isSelected === value) {
+          if (row.getCanSelect() && isSelected === value) {
             return old;
           }
           const selectedRowIds = {
@@ -2168,23 +2168,37 @@
     return (_selection$row$id = selection[row.id]) != null ? _selection$row$id : false;
   }
   function isSubRowSelected(row, selection, table) {
-    if (row.subRows && row.subRows.length) {
-      let allChildrenSelected = true;
-      let someSelected = false;
-      row.subRows.forEach(subRow => {
-        // Bail out early if we know both of these
-        if (someSelected && !allChildrenSelected) {
-          return;
-        }
+    var _row$subRows3;
+    if (!((_row$subRows3 = row.subRows) != null && _row$subRows3.length)) return false;
+    let allChildrenSelected = true;
+    let someSelected = false;
+    row.subRows.forEach(subRow => {
+      // Bail out early if we know both of these
+      if (someSelected && !allChildrenSelected) {
+        return;
+      }
+      if (subRow.getCanSelect()) {
         if (isRowSelected(subRow, selection)) {
           someSelected = true;
         } else {
           allChildrenSelected = false;
         }
-      });
-      return allChildrenSelected ? 'all' : someSelected ? 'some' : false;
-    }
-    return false;
+      }
+
+      // Check row selection of nested subrows
+      if (subRow.subRows && subRow.subRows.length) {
+        const subRowChildrenSelected = isSubRowSelected(subRow, selection);
+        if (subRowChildrenSelected === 'all') {
+          someSelected = true;
+        } else if (subRowChildrenSelected === 'some') {
+          someSelected = true;
+          allChildrenSelected = false;
+        } else {
+          allChildrenSelected = false;
+        }
+      }
+    });
+    return allChildrenSelected ? 'all' : someSelected ? 'some' : false;
   }
 
   const reSplitAlphaNumeric = /([0-9]+)/gm;