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

fix(DataTable): return correct sort direction in sort action callback #8048

Merged
merged 2 commits into from
Mar 11, 2021
Merged

fix(DataTable): return correct sort direction in sort action callback #8048

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9aeec9
fix(DataTable): return correct sort direction on sort header click
emyarod Mar 9, 2021
5adf99c
Merge branch 'main' into 4704-return-correct-sort-direction-in-datata…
kodiakhq[bot] Mar 10, 2021
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
21 changes: 11 additions & 10 deletions packages/react/src/components/DataTable/DataTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,17 +217,18 @@ export default class DataTable extends React.Component {
sortDirection,
isSortable,
isSortHeader: sortHeaderKey === header.key,
// Compose the event handlers so we don't overwrite a consumer's `onClick`
// handler
onClick: composeEventHandlers([
this.handleSortBy(header.key),
onClick
? this.handleOnHeaderClick(onClick, {
onClick: (event) => {
const nextSortState = getNextSortState(this.props, this.state, {
key: header.key,
});
this.setState(nextSortState, () => {
onClick &&
this.handleOnHeaderClick(onClick, {
sortHeaderKey: header.key,
sortDirection,
})
: null,
]),
sortDirection: nextSortState.sortDirection,
})(event);
});
},
};
};

Expand Down