gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into next61

Browse Source 
# Conflicts:
#	src/public/app/widgets/note_tree.js
This commit is contained in:
zadam 2023-06-20 23:28:41 +02:00
commit 1f3b6feaff
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -980,22 +980,20 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
this.activityDetected();
const oldActiveNode = this.getActiveNode();
let oldActiveNodeFocused = false;
if (oldActiveNode) {
oldActiveNodeFocused = oldActiveNode.hasFocus();
const newActiveNode = this.noteContext?.notePath
&& (!treeService.isNotePathInHiddenSubtree(this.noteContext.notePath) || await hoistedNoteService.isHoistedInHiddenSubtree())
&& await this.getNodeFromPath(this.noteContext.notePath);
oldActiveNode.setActive(false);
oldActiveNode.setFocus(false);
}
if (newActiveNode !== oldActiveNode) {
let oldActiveNodeFocused = false;
if (this.noteContext?.notePath
&& (
!treeService.isNotePathInHiddenSubtree(this.noteContext.notePath)
|| await hoistedNoteService.isHoistedInHiddenSubtree()
)
) {
const newActiveNode = await this.getNodeFromPath(this.noteContext.notePath);
if (oldActiveNode) {
oldActiveNodeFocused = oldActiveNode.hasFocus();
oldActiveNode.setActive(false);
oldActiveNode.setFocus(false);
}
if (newActiveNode) {
if (!newActiveNode.isVisible()) {