Merge branch 'master' into dev

# Conflicts:
#	package-lock.json
#	package.json
#	src/public/app/widgets/dialogs/note_revisions.js
#	src/services/handlers.js
#	src/services/hidden_subtree.js
#	src/services/search/services/parse.js
This commit is contained in:
zadam
2023-01-17 22:20:10 +01:00
30 changed files with 167 additions and 36 deletions

View File

@@ -1309,6 +1309,8 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
await this.tree.reload([rootNode]);
});
await this.filterHoistedBranch();
if (activeNotePath) {
const node = await this.getNodeFromPath(activeNotePath, true);