From a8b2803922739ba4d0fff566567560a625cd24e5 Mon Sep 17 00:00:00 2001 From: lounsbrough Date: Fri, 11 Dec 2020 16:42:00 -0600 Subject: [PATCH 1/5] Attempt to resolve issue 1604 --- src/components/TableHead.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/TableHead.js b/src/components/TableHead.js index 08488b20c..59a744ded 100644 --- a/src/components/TableHead.js +++ b/src/components/TableHead.js @@ -125,7 +125,7 @@ const TableHead = ({ selectableRowsHeader={options.selectableRowsHeader} selectableRowsHideCheckboxes={options.selectableRowsHideCheckboxes} onExpand={toggleAllExpandableRows} - isRowSelectable={true} + isRowSelectable={() => true} components={components} /> {orderedColumns.map( From be347c9f7b765d0dc657db2daf6c2db978a6ec79 Mon Sep 17 00:00:00 2001 From: lounsbrough Date: Fri, 11 Dec 2020 16:50:25 -0600 Subject: [PATCH 2/5] Revert last commit --- src/components/TableHead.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/TableHead.js b/src/components/TableHead.js index 59a744ded..08488b20c 100644 --- a/src/components/TableHead.js +++ b/src/components/TableHead.js @@ -125,7 +125,7 @@ const TableHead = ({ selectableRowsHeader={options.selectableRowsHeader} selectableRowsHideCheckboxes={options.selectableRowsHideCheckboxes} onExpand={toggleAllExpandableRows} - isRowSelectable={() => true} + isRowSelectable={true} components={components} /> {orderedColumns.map( From 60433760a03c9fe44a9ef06d67676a04825c030c Mon Sep 17 00:00:00 2001 From: lounsbrough Date: Fri, 11 Dec 2020 16:51:05 -0600 Subject: [PATCH 3/5] prop appears to be boolean --- src/components/TableSelectCell.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/TableSelectCell.js b/src/components/TableSelectCell.js index b3f0f90a6..57de8ce01 100644 --- a/src/components/TableSelectCell.js +++ b/src/components/TableSelectCell.js @@ -160,7 +160,7 @@ TableSelectCell.propTypes = { /** Is selectable option enabled */ selectableOn: PropTypes.string, /** Select cell disabled on/off */ - isRowSelectable: PropTypes.func, + isRowSelectable: PropTypes.bool, }; export default TableSelectCell; From dab5f3bce6f13ebf3c5151bd8ae83332d6814fad Mon Sep 17 00:00:00 2001 From: David Lounsbrough Date: Fri, 11 Dec 2020 17:32:19 -0600 Subject: [PATCH 4/5] isRowSelectable should be function not bool --- src/components/TableBody.js | 2 +- src/components/TableHead.js | 3 +-- src/components/TableSelectCell.js | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/components/TableBody.js b/src/components/TableBody.js index 3d32cff4c..5fa27aa34 100644 --- a/src/components/TableBody.js +++ b/src/components/TableBody.js @@ -287,7 +287,7 @@ class TableBody extends React.Component { selectableOn={options.selectableRows} selectableRowsHideCheckboxes={options.selectableRowsHideCheckboxes} isRowExpanded={this.isRowExpanded(dataIndex)} - isRowSelectable={isRowSelectable} + isRowSelectable={() => isRowSelectable} dataIndex={dataIndex} id={'MUIDataTableSelectCell-' + dataIndex} components={components} diff --git a/src/components/TableHead.js b/src/components/TableHead.js index 08488b20c..3cd421f3d 100644 --- a/src/components/TableHead.js +++ b/src/components/TableHead.js @@ -6,7 +6,6 @@ import TableHeadCell from './TableHeadCell'; import TableHeadRow from './TableHeadRow'; import TableSelectCell from './TableSelectCell'; - const useStyles = makeStyles( theme => ({ main: {}, @@ -125,7 +124,7 @@ const TableHead = ({ selectableRowsHeader={options.selectableRowsHeader} selectableRowsHideCheckboxes={options.selectableRowsHideCheckboxes} onExpand={toggleAllExpandableRows} - isRowSelectable={true} + isRowSelectable={() => true} components={components} /> {orderedColumns.map( diff --git a/src/components/TableSelectCell.js b/src/components/TableSelectCell.js index 57de8ce01..6691cb13c 100644 --- a/src/components/TableSelectCell.js +++ b/src/components/TableSelectCell.js @@ -116,7 +116,7 @@ const TableSelectCell = ({ data-description={isHeaderCell ? 'row-select-header' : 'row-select'} data-index={dataIndex || null} color="primary" - disabled={!isRowSelectable} + disabled={!isRowSelectable()} {...otherProps} /> ); @@ -160,7 +160,7 @@ TableSelectCell.propTypes = { /** Is selectable option enabled */ selectableOn: PropTypes.string, /** Select cell disabled on/off */ - isRowSelectable: PropTypes.bool, + isRowSelectable: PropTypes.func, }; export default TableSelectCell; From 91160b220187ad5366a89f476c42ed94c1c34cdd Mon Sep 17 00:00:00 2001 From: David Lounsbrough Date: Fri, 11 Dec 2020 17:34:58 -0600 Subject: [PATCH 5/5] Revert "isRowSelectable should be function not bool" This reverts commit dab5f3bce6f13ebf3c5151bd8ae83332d6814fad. --- src/components/TableBody.js | 2 +- src/components/TableHead.js | 3 ++- src/components/TableSelectCell.js | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/TableBody.js b/src/components/TableBody.js index 5fa27aa34..3d32cff4c 100644 --- a/src/components/TableBody.js +++ b/src/components/TableBody.js @@ -287,7 +287,7 @@ class TableBody extends React.Component { selectableOn={options.selectableRows} selectableRowsHideCheckboxes={options.selectableRowsHideCheckboxes} isRowExpanded={this.isRowExpanded(dataIndex)} - isRowSelectable={() => isRowSelectable} + isRowSelectable={isRowSelectable} dataIndex={dataIndex} id={'MUIDataTableSelectCell-' + dataIndex} components={components} diff --git a/src/components/TableHead.js b/src/components/TableHead.js index 3cd421f3d..08488b20c 100644 --- a/src/components/TableHead.js +++ b/src/components/TableHead.js @@ -6,6 +6,7 @@ import TableHeadCell from './TableHeadCell'; import TableHeadRow from './TableHeadRow'; import TableSelectCell from './TableSelectCell'; + const useStyles = makeStyles( theme => ({ main: {}, @@ -124,7 +125,7 @@ const TableHead = ({ selectableRowsHeader={options.selectableRowsHeader} selectableRowsHideCheckboxes={options.selectableRowsHideCheckboxes} onExpand={toggleAllExpandableRows} - isRowSelectable={() => true} + isRowSelectable={true} components={components} /> {orderedColumns.map( diff --git a/src/components/TableSelectCell.js b/src/components/TableSelectCell.js index 6691cb13c..57de8ce01 100644 --- a/src/components/TableSelectCell.js +++ b/src/components/TableSelectCell.js @@ -116,7 +116,7 @@ const TableSelectCell = ({ data-description={isHeaderCell ? 'row-select-header' : 'row-select'} data-index={dataIndex || null} color="primary" - disabled={!isRowSelectable()} + disabled={!isRowSelectable} {...otherProps} /> ); @@ -160,7 +160,7 @@ TableSelectCell.propTypes = { /** Is selectable option enabled */ selectableOn: PropTypes.string, /** Select cell disabled on/off */ - isRowSelectable: PropTypes.func, + isRowSelectable: PropTypes.bool, }; export default TableSelectCell;