Merge pull request mui#1325 from hiddentao/v0.11-row-selection

v0.11 - [Table] If `selected` key for some rows gets changed ensure table internal selection array gets updated
atroche · Aug 13, 2015 · 534b23d · 534b23d
2 parents 81f2d98 + 19107c9
commit 534b23d
Showing 1 changed file with 29 additions and 19 deletions.
diff --git a/src/table/table-body.jsx b/src/table/table-body.jsx
@@ -39,33 +39,23 @@ let TableBody = React.createClass({
   },
 
   getInitialState() {
-    // Determine what rows are 'pre-selected'.
-    let preSelectedRows = [];
-    if (this.props.selectable && this.props.preScanRows) {
-      let index = 0;
-      React.Children.forEach(this.props.children, (child) => {
-        if (React.isValidElement(child)) {
-          if (child.props.selected && (preSelectedRows.length === 0 || this.props.multiSelectable)) {
-            preSelectedRows.push(index);
-          }
-
-          index++;
-        }
-      });
-    }
-
     return {
-      selectedRows: preSelectedRows,
+      selectedRows: this._calculatePreselectedRows(this.props),
     };
   },
 
   componentWillReceiveProps(nextProps) {
+    let newState = {};
+
     if (this.props.allRowsSelected && !nextProps.allRowsSelected) {
-      let lastSelectedRow = (this.state.selectedRows.length) ?
-        this.state.selectedRows[this.state.selectedRows.length - 1] : undefined;
+      let lastSelectedRow = this.state.selectedRows.length ? this.state.selectedRows[this.state.selectedRows.length - 1] : undefined;
 
-      this.setState({ selectedRows: [lastSelectedRow] });
+      newState.selectedRows = [lastSelectedRow];
+    } else {
+      newState.selectedRows = this._calculatePreselectedRows(nextProps);
     }
+
+    this.setState(newState);
   },
 
   componentClickAway() {
@@ -151,6 +141,26 @@ let TableBody = React.createClass({
     );
   },
 
+  _calculatePreselectedRows (props) {
+    // Determine what rows are 'pre-selected'.
+    let preSelectedRows = [];
+
+    if (props.selectable && props.preScanRows) {
+      let index = 0;
+      React.Children.forEach(props.children, (child) => {
+        if (React.isValidElement(child)) {
+          if (child.props.selected && (preSelectedRows.length === 0 || props.multiSelectable)) {
+            preSelectedRows.push(index);
+          }
+
+          index++;
+        }
+      });
+    }
+
+    return preSelectedRows;
+  },
+
   _isRowSelected(rowNumber) {
     if (this.props.allRowsSelected) {
       return true;