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

Merge pull request #1673 from TriliumNext/fix_cal

Browse Source 
Fix calendar widget doesn't close when click on a note
This commit is contained in:
Elian Doran
2025-04-11 23:50:25 +03:00
committed by GitHub
parent 0acdab29af 73b043fe8d
commit b26e430c3e
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/components/app_context.ts
View File

@@ -138,7 +138,7 @@ export type CommandMappings = {
insertNoteAfter: ContextMenuCommandData; insertNoteAfter: ContextMenuCommandData;
insertChildNote: ContextMenuCommandData; insertChildNote: ContextMenuCommandData;
delete: ContextMenuCommandData; delete: ContextMenuCommandData;
editNoteTitle: ContextMenuCommandData; editNoteTitle: {};
protectSubtree: ContextMenuCommandData; protectSubtree: ContextMenuCommandData;
unprotectSubtree: ContextMenuCommandData; unprotectSubtree: ContextMenuCommandData;
openBulkActionsDialog: openBulkActionsDialog:

5
src/public/app/widgets/note_tree.ts
View File

@@ -418,6 +418,9 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
// click event won't propagate so let's close context menu manually // click event won't propagate so let's close context menu manually
contextMenu.hide(); contextMenu.hide();
// hide all dropdowns, fix calendar widget dropdown doesn't close when click on a note
$('.dropdown-menu').parent('.dropdown').find('[data-bs-toggle="dropdown"]').dropdown('hide');
this.clearSelectedNodes(); this.clearSelectedNodes();
const notePath = treeService.getNotePath(data.node); const notePath = treeService.getNotePath(data.node);
@@ -1683,7 +1686,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
this.triggerCommand("showImportDialog", { noteId: node.data.noteId }); this.triggerCommand("showImportDialog", { noteId: node.data.noteId });
} }
editNoteTitleCommand({ node }: CommandListenerData<"editNoteTitle">) { editNoteTitleCommand() {
appContext.triggerCommand("focusOnTitle"); appContext.triggerCommand("focusOnTitle");
} }