Skip to content

Commit

Permalink
fix: scroll to search focused tree item (#756)
Browse files Browse the repository at this point in the history
* Fix ignoreOneTreeUpdate in static search method

* Apply suggestions from code review

Co-authored-by: Aleksandr Khodykin <akhodykin@MacBook-Pro-Aleksandr.local>
Co-authored-by: wei <hello@weiweiwu.me>
  • Loading branch information
3 people authored Jul 30, 2020
1 parent 9aeaf3d commit e528a4c
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/react-sortable-tree.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down Expand Up @@ -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({
Expand All @@ -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);
}

Expand Down

0 comments on commit e528a4c

Please sign in to comment.