Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Table] Fixing selectAll functionality a bit #4589

Closed
wants to merge 1 commit into from
Closed

[Table] Fixing selectAll functionality a bit #4589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/Table/Table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,14 @@ class Table extends Component {
allRowsSelected: this.props.allRowsSelected,
};

componentWillReceiveProps(nextProps) {
if (typeof nextProps.allRowsSelected !== 'undefined' && this.props.allRowsSelected !== nextProps.allRowsSelected) {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here we are allowing for the maintaining of allRowsSelected from outside of the component. This is necessary if utilizing "selected" on the data.

When maintaining the "selected" state outside of the table, you should expect to have to maintain the "all selected" state as well I believe.

this.setState({
allRowsSelected: nextProps.selectAllSelected,
});
}
}

isScrollbarVisible() {
const tableDivHeight = this.refs.tableDiv.clientHeight;
const tableBodyHeight = this.refs.tableBody.clientHeight;
Expand Down
8 changes: 6 additions & 2 deletions src/Table/TableBody.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,11 @@ class TableBody extends Component {
};

componentWillReceiveProps(nextProps) {
if (this.props.allRowsSelected && !nextProps.allRowsSelected) {
if (!this.props.allRowsSelected && nextProps.allRowsSelected) {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is to clear out the selected state within the component when the allRowsSelected checkbox is checked. This allows for correct handling when it is unchecked or a single row is checked.

this.setState({
selectedRows: [],
});
} else if (this.props.allRowsSelected && !nextProps.allRowsSelected) {
this.setState({
selectedRows: this.state.selectedRows.length > 0 ?
[this.state.selectedRows[this.state.selectedRows.length - 1]] : [],
Expand All @@ -139,7 +143,7 @@ class TableBody extends Component {
}

handleClickAway = () => {
if (this.props.deselectOnClickaway && this.state.selectedRows.length) {
if (this.props.deselectOnClickaway && (this.state.selectedRows.length || this.props.allRowsSelected)) {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we clear the selectedRows when allRowsSelected is set, we need to check for that flag as well and deselect all if either is true.

this.setState({
selectedRows: [],
});
Expand Down