From b65333ed6614c48ecd0719ae746306996a0554b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20All=C3=A8ne?= Date: Tue, 31 Mar 2020 15:40:09 +0200 Subject: [PATCH 1/2] Use componentDidUpdate --- src/BarChart.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BarChart.js b/src/BarChart.js index a6db85f..ef510fd 100644 --- a/src/BarChart.js +++ b/src/BarChart.js @@ -36,8 +36,8 @@ class BarChart extends React.Component { } } - componentWillReceiveProps(nextProps) { - if (nextProps.start) { + componentDidUpdate(prevProps) { + if (this.props.start && !prevProps.start) { var intervalId = setInterval(this.update, this.props.timeout + this.props.delay); this.setState({intervalId: intervalId}); } From 762f526810b41dd02fa539d93199b3745d358918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christopher=20All=C3=A8ne?= Date: Tue, 31 Mar 2020 15:40:44 +0200 Subject: [PATCH 2/2] Fix data sort --- src/BarChart.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BarChart.js b/src/BarChart.js index ef510fd..f076d55 100644 --- a/src/BarChart.js +++ b/src/BarChart.js @@ -71,7 +71,7 @@ class BarChart extends React.Component { val: this.props.data[name][i] }; }); - toSort.sort((left, right) => descending ? left.val < right.val : left.val > right.val); + toSort.sort((left, right) => descending ? left.val < right.val ? 1: left.val > right.val ? -1 : 0 : left.val < right.val ? 1 : left.val < right.val ? -1 : 0); toSort = toSort.slice(0, this.maxItems); const maxVal = Math.max.apply(Math, toSort.map(item => item.val)); return [toSort.reduce((ret, item, idx) => ({ @@ -131,4 +131,4 @@ class BarChart extends React.Component { } } -export default BarChart; \ No newline at end of file +export default BarChart;