Skip to content

fix: scroll to search focused tree item #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 30, 2020
Merged

fix: scroll to search focused tree item #756

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9edd1a
Fix ignoreOneTreeUpdate in static search method
Jul 16, 2020
69451bf
Apply suggestions from code review
wuweiweiwu Jul 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/react-sortable-tree.js
View file
Open in desktop
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