Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-26 07:46:30 +01:00
Code Issues Packages Projects Releases Activity

optimize month selector behavior

Browse Source
This commit is contained in:
Jin
2025-02-28 15:09:28 +01:00
parent a99c86ea9f
commit c67445f511
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/public/app/widgets/buttons/calendar.ts
View File

@@ -38,7 +38,7 @@ const DROPDOWN_TPL = `
<button class="calendar-btn tn-tool-button bx bx-chevron-left" data-calendar-toggle="previous"></button>
<button class="btn dropdown-toggle select-button" type="button"
data-bs-toggle="dropdown" data-bs-auto-close="outside"
data-bs-toggle="dropdown" data-bs-auto-close="true"
aria-expanded="false"
data-calendar-input="month"></button>
<ul class="dropdown-menu" data-calendar-input="month-list">
@@ -111,7 +111,6 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
if (value) {
this.date.setMonth(parseInt(value));
this.createMonth();
this.monthDropdown.hide();
}
});
this.$next = this.$dropdownContent.find('[data-calendar-toggle="next"]');
@@ -143,8 +142,6 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
this.createMonth();
});
this.$dropdownContent.find(".calendar-header").on("click", (e) => e.stopPropagation());
this.$dropdownContent.on("click", ".calendar-date", async (ev) => {
const date = $(ev.target).closest(".calendar-date").attr("data-calendar-date");
@@ -162,8 +159,22 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
ev.stopPropagation();
});
// Prevent dismissing the calendar popup by clicking on an empty space inside it.
this.$dropdownContent.on("click", (e) => e.stopPropagation());
// Handle click events for the entire calendar widget
this.$dropdownContent.on("click", (e) => {
const $target = $(e.target);
// Keep dropdown open when clicking on month select button or year selector area
if ($target.closest('.btn.dropdown-toggle.select-button').length ||
$target.closest('.calendar-year-selector').length) {
e.stopPropagation();
return;
}
// Hide dropdown for all other cases
this.monthDropdown.hide();
// Prevent dismissing the calendar popup by clicking on an empty space inside it.
e.stopPropagation();
});
}
manageFirstDayOfWeek() {