From a9edd1a74f56ff4acad609b0706da7de15245bb3 Mon Sep 17 00:00:00 2001 From: Aleksandr Khodykin Date: Thu, 16 Jul 2020 17:21:13 +0300 Subject: [PATCH 1/2] Fix ignoreOneTreeUpdate in static search method --- src/react-sortable-tree.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/react-sortable-tree.js b/src/react-sortable-tree.js index b83e16a0..611c336d 100644 --- a/src/react-sortable-tree.js +++ b/src/react-sortable-tree.js @@ -194,8 +194,8 @@ class ReactSortableTree extends Component { instanceProps.searchQuery = nextProps.searchQuery; instanceProps.searchFocusOffset = nextProps.searchFocusOffset; - newState.instanceProps = instanceProps; - + newState.instanceProps = {...instanceProps, ...newState.instanceProps }; + return newState; } @@ -313,7 +313,7 @@ class ReactSortableTree extends Component { return { searchMatches: [] }; } - const newState = {}; + const newState = { instanceProps: {} }; // if onlyExpandSearchedNodes collapse the tree and search const { treeData: expandedTreeData, matches: searchMatches } = find({ @@ -333,7 +333,7 @@ class ReactSortableTree extends Component { // Update the tree with data leaving all paths leading to matching nodes open if (expand) { - newState.ignoreOneTreeUpdate = true; // Prevents infinite loop + newState.instanceProps.ignoreOneTreeUpdate = true; // Prevents infinite loop onChange(expandedTreeData); } From 69451bf854f1967f87f913f503a335ad5a07d4f7 Mon Sep 17 00:00:00 2001 From: wei Date: Thu, 30 Jul 2020 01:14:21 -0700 Subject: [PATCH 2/2] Apply suggestions from code review --- 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 611c336d..d2b5fedb 100644 --- a/src/react-sortable-tree.js +++ b/src/react-sortable-tree.js @@ -195,7 +195,7 @@ class ReactSortableTree extends Component { instanceProps.searchQuery = nextProps.searchQuery; instanceProps.searchFocusOffset = nextProps.searchFocusOffset; newState.instanceProps = {...instanceProps, ...newState.instanceProps }; - + return newState; }