StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed expanding root node too when expanding path

This commit is contained in:
jos 2017-01-05 15:00:05 +01:00
parent d5500bef89
commit a9a453f51f
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/TreeMode.js
View File

@ -334,8 +334,8 @@ export default class TreeMode extends Component {
data: expandPath(this.state.data, active.path)
})
// scroll to active search result
this.scrollTo(active.path)
// scroll to active search result (on next tick, after this path has been expanded)
setTimeout(() => this.scrollTo(active.path))
}
else {
this.setState({
@ -355,11 +355,8 @@ export default class TreeMode extends Component {
data: expandPath(this.state.data, next && next.path)
})
// scroll to the active result
const name = compileJSONPointer(next.path)
// scroll to the active result
this.scrollTo(next.path)
// scroll to the active result (on next tick, after this path has been expanded)
setTimeout(() => this.scrollTo(next.path))
}
}
@ -374,8 +371,8 @@ export default class TreeMode extends Component {
data: expandPath(this.state.data, previous && previous.path)
})
// scroll to the active result
this.scrollTo(previous.path)
// scroll to the active result (on next tick, after this path has been expanded)
setTimeout(() => this.scrollTo(previous.path))
}
}

3
src/jsonData.js
View File

@ -503,9 +503,10 @@ export function expandPath (data: JSONData, path: Path) {
let updatedData = data
if (path) {
updatedData = expand(updatedData, [], true) // expand root
for (let i = 0; i < path.length; i++) {
const pathPart = path.slice(0, i + 1)
// console.log('expandPath', path, i, pathPart)
updatedData = expand(updatedData, pathPart, true)
}
}