Fix: Improve tree all selection

material-table-core · Jan 10, 2023 · ba0fda9 · ba0fda9
1 parent 12a65dd
commit ba0fda9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/components/MTableHeader/index.js b/src/components/MTableHeader/index.js
@@ -355,7 +355,7 @@ export function MTableHeader({
               props.selectedCount > 0 && props.selectedCount < props.dataCount
             }
             checked={
-              props.dataCount > 0 && props.selectedCount === props.dataCount
+              props.dataCount > 0 && props.selectedCount >= props.dataCount
             }
             onChange={(event, checked) =>
               props.onAllSelected && props.onAllSelected(checked)

diff --git a/src/material-table.js b/src/material-table.js
@@ -1017,7 +1017,7 @@ export default class MaterialTable extends React.Component {
           selectedCount={this.state.selectedCount}
           dataCount={
             props.parentChildData
-              ? this.state.originalData.length
+              ? this.state.treefiedDataLength
               : this.state.columns.some((col) => col.tableData.groupOrder > -1)
               ? this.state.groupedDataLength
               : this.state.data.length
@@ -1184,6 +1184,7 @@ export default class MaterialTable extends React.Component {
             <Droppable droppableId="headers" direction="horizontal">
               {(provided, snapshot) => {
                 const table = this.renderTable(props);
+                console.log('state', this.state);
                 return (
                   <div ref={provided.innerRef}>
                     <div

diff --git a/src/utils/data-manager.js b/src/utils/data-manager.js
@@ -378,8 +378,16 @@ export default class DataManager {
 
       setCheck(this.groupedData);
     } else {
+      const checkChild = (row) => {
+        row.tableData.childRows &&
+          row.tableData.childRows.forEach((child) => {
+            child.tableData.checked = isChecked(row);
+            checkChild(child);
+          });
+      };
       this.searchedData.forEach((row) => {
         row.tableData.checked = isChecked(row);
+        checkChild(row);
       });
       selectedCount = this.searchedData.length;
     }