Skip to content
This repository was archived by the owner on Jun 24, 2025. It is now read-only.

Fix calendar widget doesn't close when click on a note #1673

Merged
eliandoran merged 8 commits into from
Apr 11, 2025
Merged

Fix calendar widget doesn't close when click on a note #1673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e6cc1b
refactor: 💡 tree.ts refactor
JYC333 Apr 10, 2025
14a3b28
fix: 🐛 fix calendar widget doesn't close when click on a note
JYC333 Apr 10, 2025
e555a33
refactor: 💡 fix note_tree.ts lint
JYC333 Apr 10, 2025
54a0bde
refactor: 💡 remove unused command data (editNoteTitle)
JYC333 Apr 10, 2025
522b96f
refactor: 💡 sort app_context.ts import
JYC333 Apr 10, 2025
1e7f15b
refactor: 💡 sort calendar.ts imports
JYC333 Apr 10, 2025
b4dbf4d
Revert sort imports refector to avoid conflits
JYC333 Apr 11, 2025
73b043f
refactor: 💡 add command data back for tracing aspect
JYC333 Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/public/app/components/app_context.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ export type CommandMappings = {
insertNoteAfter: ContextMenuCommandData;
insertChildNote: ContextMenuCommandData;
delete: ContextMenuCommandData;
editNoteTitle: ContextMenuCommandData;
editNoteTitle: {};
protectSubtree: ContextMenuCommandData;
unprotectSubtree: ContextMenuCommandData;
openBulkActionsDialog:
Expand Down
5 changes: 4 additions & 1 deletion src/public/app/widgets/note_tree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,9 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
// click event won't propagate so let's close context menu manually
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();

const notePath = treeService.getNotePath(data.node);
Expand Down Expand Up @@ -1683,7 +1686,7 @@ export default class NoteTreeWidget extends NoteContextAwareWidget {
this.triggerCommand("showImportDialog", { noteId: node.data.noteId });
}

editNoteTitleCommand({ node }: CommandListenerData<"editNoteTitle">) {
editNoteTitleCommand() {
appContext.triggerCommand("focusOnTitle");
}

Expand Down
Loading