From b3112b95b40074ad6a2bdb12e0add995d8adbd73 Mon Sep 17 00:00:00 2001 From: Eduard Castellano Date: Mon, 14 Dec 2015 13:54:46 +0100 Subject: [PATCH 1/2] updateCurrentSort() fixes --- build/reactable.js | 4 ++-- lib/reactable/table.js | 4 ++-- src/reactable/table.jsx | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build/reactable.js b/build/reactable.js index f4a7b148..182f22b9 100644 --- a/build/reactable.js +++ b/build/reactable.js @@ -1181,9 +1181,9 @@ window.ReactDOM["default"] = window.ReactDOM; }, { key: 'updateCurrentSort', value: function updateCurrentSort(sortBy) { - if (sortBy !== false && sortBy.column !== this.state.currentSort.column && sortBy.direction !== this.state.currentSort.direction) { + if (sortBy !== false && (sortBy.column !== this.state.currentSort.column || sortBy.direction !== this.state.currentSort.direction)) { - this.setState({ currentSort: this.getCurrentSort(sortBy) }); + this.setState.currentSort = this.getCurrentSort(sortBy); } } }, { diff --git a/lib/reactable/table.js b/lib/reactable/table.js index ccc3c079..987db8fa 100644 --- a/lib/reactable/table.js +++ b/lib/reactable/table.js @@ -234,9 +234,9 @@ var Table = (function (_React$Component) { }, { key: 'updateCurrentSort', value: function updateCurrentSort(sortBy) { - if (sortBy !== false && sortBy.column !== this.state.currentSort.column && sortBy.direction !== this.state.currentSort.direction) { + if (sortBy !== false && (sortBy.column !== this.state.currentSort.column || sortBy.direction !== this.state.currentSort.direction)) { - this.setState({ currentSort: this.getCurrentSort(sortBy) }); + this.setState.currentSort = this.getCurrentSort(sortBy); } } }, { diff --git a/src/reactable/table.jsx b/src/reactable/table.jsx index 1278ba16..79d2358f 100644 --- a/src/reactable/table.jsx +++ b/src/reactable/table.jsx @@ -194,10 +194,10 @@ export class Table extends React.Component { updateCurrentSort(sortBy) { if (sortBy !== false && - sortBy.column !== this.state.currentSort.column && - sortBy.direction !== this.state.currentSort.direction) { + (sortBy.column !== this.state.currentSort.column || + sortBy.direction !== this.state.currentSort.direction)) { - this.setState({ currentSort: this.getCurrentSort(sortBy) }); + this.setState.currentSort = this.getCurrentSort(sortBy) } } From ce353de4890810f3dca0edc9c41bcb624eaae035 Mon Sep 17 00:00:00 2001 From: Eduard Castellano Date: Mon, 14 Dec 2015 14:31:47 +0100 Subject: [PATCH 2/2] fix --- build/reactable.js | 2 +- lib/reactable/table.js | 2 +- src/reactable/table.jsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/reactable.js b/build/reactable.js index 182f22b9..0c80f042 100644 --- a/build/reactable.js +++ b/build/reactable.js @@ -1183,7 +1183,7 @@ window.ReactDOM["default"] = window.ReactDOM; value: function updateCurrentSort(sortBy) { if (sortBy !== false && (sortBy.column !== this.state.currentSort.column || sortBy.direction !== this.state.currentSort.direction)) { - this.setState.currentSort = this.getCurrentSort(sortBy); + this.state.currentSort = this.getCurrentSort(sortBy); } } }, { diff --git a/lib/reactable/table.js b/lib/reactable/table.js index 987db8fa..0bac92de 100644 --- a/lib/reactable/table.js +++ b/lib/reactable/table.js @@ -236,7 +236,7 @@ var Table = (function (_React$Component) { value: function updateCurrentSort(sortBy) { if (sortBy !== false && (sortBy.column !== this.state.currentSort.column || sortBy.direction !== this.state.currentSort.direction)) { - this.setState.currentSort = this.getCurrentSort(sortBy); + this.state.currentSort = this.getCurrentSort(sortBy); } } }, { diff --git a/src/reactable/table.jsx b/src/reactable/table.jsx index 79d2358f..fc3d94d0 100644 --- a/src/reactable/table.jsx +++ b/src/reactable/table.jsx @@ -197,7 +197,7 @@ export class Table extends React.Component { (sortBy.column !== this.state.currentSort.column || sortBy.direction !== this.state.currentSort.direction)) { - this.setState.currentSort = this.getCurrentSort(sortBy) + this.state.currentSort = this.getCurrentSort(sortBy) } }