Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2026-05-07 01:26:52 +02:00
Code Issues Packages Projects Releases Activity

fix(tree): deleting ancestor of the current note doesn't correctly navigate

Browse Source
This commit is contained in:
Elian Doran
2026-04-11 19:36:50 +03:00
parent 1c93636538
commit 14bb068626
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
apps/client/src/services/branches.ts
View File

@@ -120,7 +120,7 @@ async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = f
if (moveToParent) {
try {
await activateParentNotePath();
await activateParentNotePath(branchIdsToDelete);
} catch (e) {
console.error(e);
}
@@ -152,13 +152,28 @@ async function deleteNotes(branchIdsToDelete: string[], forceDeleteAllClones = f
return true;
}
async function activateParentNotePath() {
// this is not perfect, maybe we should find the next/previous sibling, but that's more complex
async function activateParentNotePath(branchIdsToDelete: string[]) {
const activeContext = appContext.tabManager.getActiveContext();
const parentNotePathArr = activeContext?.notePathArray.slice(0, -1);
const activeNotePath = activeContext?.notePathArray ?? [];
if (parentNotePathArr && parentNotePathArr.length > 0) {
activeContext?.setNote(parentNotePathArr.join("/"));
// Find the deleted branch that appears earliest in the active note's path
let earliestIndex = activeNotePath.length;
for (const branchId of branchIdsToDelete) {
const branch = froca.getBranch(branchId);
if (branch) {
const index = activeNotePath.indexOf(branch.noteId);
if (index !== -1 && index < earliestIndex) {
earliestIndex = index;
}
}
}
// Navigate to the parent of the highest deleted ancestor
if (earliestIndex < activeNotePath.length) {
const parentPath = activeNotePath.slice(0, earliestIndex);
if (parentPath.length > 0) {
await activeContext?.setNote(parentPath.join("/"));
}
}
}

9
apps/client/src/widgets/note_tree.ts
View File

@@ -1614,14 +1614,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
return;
}
// Only navigate to parent if deleting the currently active note
const activeNoteId = appContext.tabManager.getActiveContext()?.noteId;
const isDeletingActiveNote = branchIds.some((branchId) => {
const branch = froca.getBranch(branchId);
return branch?.noteId === activeNoteId;
});
await branchService.deleteNotes(branchIds, false, isDeletingActiveNote);
await branchService.deleteNotes(branchIds);
this.clearSelectedNodes();
}