Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-30 18:05:55 +01:00
Code Issues Packages Projects Releases Activity

avoid scrolling to active node without a reason, fixes #4031

Browse Source
This commit is contained in:
zadam
2023-06-18 21:50:22 +02:00
parent 6f16b4caec
commit bbe3f436d3
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/public/app/widgets/note_tree.js
View File

@@ -1002,6 +1002,13 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
this.activityDetected(); this.activityDetected();
const oldActiveNode = this.getActiveNode(); const oldActiveNode = this.getActiveNode();
const newActiveNode = this.noteContext?.notePath
&& !this.noteContext.note?.isDeleted
&& (!treeService.isNotePathInHiddenSubtree(this.noteContext.notePath) || await hoistedNoteService.isHoistedInHiddenSubtree())
&& await this.getNodeFromPath(this.noteContext.notePath);
if (newActiveNode !== oldActiveNode) {
let oldActiveNodeFocused = false; let oldActiveNodeFocused = false;
if (oldActiveNode) { if (oldActiveNode) {
@@ -1011,13 +1018,6 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
oldActiveNode.setFocus(false); oldActiveNode.setFocus(false);
} }
if (this.noteContext
&& this.noteContext.notePath
&& !this.noteContext.note?.isDeleted
&& (!treeService.isNotePathInHiddenSubtree(this.noteContext.notePath) || await hoistedNoteService.isHoistedInHiddenSubtree())
) {
const newActiveNode = await this.getNodeFromPath(this.noteContext.notePath);
if (newActiveNode) { if (newActiveNode) {
if (!newActiveNode.isVisible()) { if (!newActiveNode.isVisible()) {
await this.expandToNote(this.noteContext.notePath); await this.expandToNote(this.noteContext.notePath);