Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-11-14 17:25:52 +01:00
Code Issues Packages Projects Releases Activity

fix(popup_editor): current tab events interfering

Browse Source
This commit is contained in:
Elian Doran
2025-07-10 14:57:32 +03:00
parent 5adca76a9a
commit 0c17a13462
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
apps/client/src/widgets/dialogs/popup_editor.ts
View File

@@ -1,3 +1,4 @@
import type { EventNames, EventData } from "../../components/app_context.js";
import NoteContext from "../../components/note_context.js"; import NoteContext from "../../components/note_context.js";
import { openDialog } from "../../services/dialog.js"; import { openDialog } from "../../services/dialog.js";
import froca from "../../services/froca.js"; import froca from "../../services/froca.js";
@@ -28,7 +29,7 @@ export default class PopupEditorDialog extends Container<BasicWidget> {
constructor() { constructor() {
super(); super();
setTimeout(() => { setTimeout(() => {
this.openPopupEditorEvent("vdJ8utb0A0Kd"); this.openPopupEditorEvent("f4sIt7iRg0Lc");
}, 750); }, 750);
} }
@@ -57,9 +58,7 @@ export default class PopupEditorDialog extends Container<BasicWidget> {
const noteContext = new NoteContext("_popup-editor"); const noteContext = new NoteContext("_popup-editor");
await noteContext.setNote(note.noteId); await noteContext.setNote(note.noteId);
await this.handleEventInChildren("setNoteContext", { await this.handleEventInChildren("activeContextChanged", { noteContext });
noteContext: noteContext
});
return true; return true;
} }
@@ -69,4 +68,14 @@ export default class PopupEditorDialog extends Container<BasicWidget> {
openDialog(this.$widget); openDialog(this.$widget);
} }
} }
handleEventInChildren<T extends EventNames>(name: T, data: EventData<T>): Promise<unknown[] | unknown> | null {
// Avoid events related to the current tab interfere with our popup.
if (["noteSwitched", "noteSwitchedAndActivated"].includes(name)) {
return Promise.resolve();
}
return super.handleEventInChildren(name, data);
}
} }