prehistoric-systems/Gitako
1
1
Fork 0
mirror of https://github.com/EnixCoda/Gitako.git synced 2026-03-11 08:54:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: reset expanded nodes on search

Browse source
This commit is contained in:
EnixCoda 2022-04-24 14:50:06 +08:00
parent 0dfb932d04
commit c8fcfa2120
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/utils/VisibleNodesGenerator/index.ts
View file

@ -251,13 +251,10 @@ class FlattenLayer extends CompressLayer {
}
barelySetExpand = (node: TreeNode, expand: boolean) => {
if (expand) {
if (node.type === 'tree') {
// expanding non-tree node could cause unexpected UX
this.expandedNodes.add(node.path)
}
} else {
this.expandedNodes.delete(node.path)
// expanding non-tree node could cause unexpected UX
if (node.type === 'tree') {
if (expand) this.expandedNodes.add(node.path)
else this.expandedNodes.delete(node.path)
}
}
@ -309,12 +306,13 @@ class FlattenLayer extends CompressLayer {
searchParams: Pick<SearchParams, 'matchNode'> | null,
restoreExpandedFolders?: boolean,
) => {
// backup expansion before search
if (searchParams) {
if (!this.isSearching) {
// backup expansion when start search
this.backupExpandedNodes.clear()
this.expandedNodes.forEach(path => this.backupExpandedNodes.add(path))
}
this.expandedNodes.clear() // Reset expansion on every search, ensure cleanest search result expansion
this.shake({
matchNode: searchParams.matchNode,
onChildMatch: node => this.$setExpand(node, true),