From 648f6a95828609f70d4e8a61e0c430753e9cf124 Mon Sep 17 00:00:00 2001 From: HgAlexx Date: Fri, 22 Feb 2019 12:30:37 +0100 Subject: [PATCH 1/3] Fix issue #369 --- src/react-sortable-tree.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/react-sortable-tree.js b/src/react-sortable-tree.js index 126b833f..6de01e6a 100644 --- a/src/react-sortable-tree.js +++ b/src/react-sortable-tree.js @@ -155,10 +155,12 @@ class ReactSortableTree extends Component { const { instanceProps } = prevState; const newState = {}; + let isEqualResult = isEqual(instanceProps.treeData, nextProps.treeData); + // make sure we have the most recent version of treeData instanceProps.treeData = nextProps.treeData; - if (!isEqual(instanceProps.treeData, nextProps.treeData)) { + if (!isEqualResult) { if (instanceProps.ignoreOneTreeUpdate) { instanceProps.ignoreOneTreeUpdate = false; } else { From f63675ad128512e34a0f0cc61e391606e45f597b Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Thu, 28 Feb 2019 10:37:19 +0100 Subject: [PATCH 2/3] Better naming, use of const Co-Authored-By: HgAlexx --- src/react-sortable-tree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/react-sortable-tree.js b/src/react-sortable-tree.js index 6de01e6a..e4285430 100644 --- a/src/react-sortable-tree.js +++ b/src/react-sortable-tree.js @@ -155,7 +155,7 @@ class ReactSortableTree extends Component { const { instanceProps } = prevState; const newState = {}; - let isEqualResult = isEqual(instanceProps.treeData, nextProps.treeData); + const isTreeDataEqual = isEqual(instanceProps.treeData, nextProps.treeData); // make sure we have the most recent version of treeData instanceProps.treeData = nextProps.treeData; From 6709d275bb9340fbeb2efde70e4cb103d6d939b1 Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Thu, 28 Feb 2019 10:37:30 +0100 Subject: [PATCH 3/3] Better naming Co-Authored-By: HgAlexx --- src/react-sortable-tree.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/react-sortable-tree.js b/src/react-sortable-tree.js index e4285430..697f2351 100644 --- a/src/react-sortable-tree.js +++ b/src/react-sortable-tree.js @@ -160,7 +160,7 @@ class ReactSortableTree extends Component { // make sure we have the most recent version of treeData instanceProps.treeData = nextProps.treeData; - if (!isEqualResult) { + if (!isTreeDataEqual) { if (instanceProps.ignoreOneTreeUpdate) { instanceProps.ignoreOneTreeUpdate = false; } else {