Merge pull request #1438 from wdh2100/enhancement/rowSelected

Enhancement/rowSelected options
gregnb · Jul 24, 2020 · d1c979e · d1c979e
2 parents b5697f3 + b2411a9
commit d1c979e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -212,7 +212,7 @@ The component accepts the following props:
 |**`rowsExpanded`**|array||User provided expanded rows.
 |**`rowsPerPage`**|number|10|Number of rows allowed per page.
 |**`rowsPerPageOptions`**|array|[10,15,100]|Options to provide in pagination for number of rows a user can select.
-|**`rowsSelected`**|array||User provided selected rows.
+|**`rowsSelected`**|array||User provided selected rows (must be provided an array of numbers only)
 |**`search`**|boolean|true|Show/hide search icon from toolbar.
 |**`searchPlaceholder`**|string||Search text placeholder. [Example](https://github.com/gregnb/mui-datatables/blob/master/examples/customize-search/index.js)
 |**`searchProps`**|object|{}|Props applied to the search text box. You can set method callbacks like onBlur, onKeyUp, etc, this way. [Example](https://github.com/gregnb/mui-datatables/blob/master/examples/customize-search/index.js)

diff --git a/src/MUIDataTable.js b/src/MUIDataTable.js
@@ -520,6 +520,9 @@ class MUIDataTable extends React.Component {
     if (options.expandableRows && options.renderExpandableRow === undefined) {
       throw Error('renderExpandableRow must be provided when using expandableRows option');
     }
+    if (options.rowsSelected && Array.isArray(options.rowsSelected) && options.rowsSelected.some(isNaN)) {
+      warnInfo('When using the rowsSelected option, must be provided an array of numbers only.');
+    }
   }
 
   setTableAction = action => {
@@ -799,19 +802,21 @@ class MUIDataTable extends React.Component {
     if (TABLE_LOAD.INITIAL) {
       // Multiple row selection customization
       if (this.options.rowsSelected && this.options.rowsSelected.length && this.options.selectableRows === 'multiple') {
-        this.options.rowsSelected.forEach(row => {
-          let rowPos = row;
-
-          for (let cIndex = 0; cIndex < this.state.displayData.length; cIndex++) {
-            if (this.state.displayData[cIndex].dataIndex === row) {
-              rowPos = cIndex;
-              break;
+        this.options.rowsSelected
+          .filter(selectedRowIndex => selectedRowIndex === 0 || (Number(selectedRowIndex) && selectedRowIndex > 0))
+          .forEach(row => {
+            let rowPos = row;
+
+            for (let cIndex = 0; cIndex < this.state.displayData.length; cIndex++) {
+              if (this.state.displayData[cIndex].dataIndex === row) {
+                rowPos = cIndex;
+                break;
+              }
             }
-          }
 
-          selectedRowsData.data.push({ index: rowPos, dataIndex: row });
-          selectedRowsData.lookup[row] = true;
-        });
+            selectedRowsData.data.push({ index: rowPos, dataIndex: row });
+            selectedRowsData.lookup[row] = true;
+          });
 
         // Single row selection customization
       } else if (