gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-10-31 03:29:02 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

refactor(react/collections/calendar): add back clicking on date notes

Browse Source
This commit is contained in:
Elian Doran 2025-09-06 10:52:14 +03:00
parent 6237afe3cd
commit 85e5f4d2c0
No known key found for this signature in database
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/client/src/widgets/collections/calendar/index.tsx
View File

@ -15,6 +15,9 @@ import { t } from "../../../services/i18n";
import { buildEvents, buildEventsForCalendar } from "./event_builder"; import { buildEvents, buildEventsForCalendar } from "./event_builder";
import { changeEvent, newEvent } from "./api"; import { changeEvent, newEvent } from "./api";
import froca from "../../../services/froca"; import froca from "../../../services/froca";
import date_notes from "../../../services/date_notes";
import appContext from "../../../components/app_context";
import { DateClickArg } from "@fullcalendar/interaction";
interface CalendarViewData { interface CalendarViewData {
@ -92,6 +95,16 @@ export default function CalendarView({ note, noteIds }: ViewModeProps<CalendarVi
changeEvent(note, { startDate, endDate, startTime, endTime }); changeEvent(note, { startDate, endDate, startTime, endTime });
}, []); }, []);
// Called upon when clicking the day number in the calendar, opens or creates the day note but only if in a calendar root.
const onDateClick = useCallback(async (e: DateClickArg) => {
if (!isCalendarRoot) return;
const eventNote = await date_notes.getDayNote(e.dateStr);
if (eventNote) {
appContext.triggerCommand("openInPopup", { noteIdOrPath: eventNote.noteId });
}
}, []);
return (plugins && return (plugins &&
<div className="calendar-view" ref={containerRef}> <div className="calendar-view" ref={containerRef}>
<Calendar <Calendar
@ -112,6 +125,7 @@ export default function CalendarView({ note, noteIds }: ViewModeProps<CalendarVi
editable={isEditable} selectable={isEditable} editable={isEditable} selectable={isEditable}
select={onCalendarSelection} select={onCalendarSelection}
eventChange={onEventChange} eventChange={onEventChange}
dateClick={onDateClick}
viewDidMount={({ view }) => { viewDidMount={({ view }) => {
if (initialView.current !== view.type) { if (initialView.current !== view.type) {
initialView.current = view.type; initialView.current = view.type;

12
apps/client/src/widgets/view_widgets/calendar_view.ts
View File

@ -86,18 +86,6 @@ export default class CalendarView extends ViewMode<{}> {
$(mainContainer ?? e.el).append($(promotedAttributesHtml)); $(mainContainer ?? e.el).append($(promotedAttributesHtml));
} }
}, },
// Called upon when clicking the day number in the calendar, opens or creates the day note but only if in a calendar root.
dateClick: async (e) => {
if (!this.isCalendarRoot) {
return;
}
const note = await date_notes.getDayNote(e.dateStr);
if (note) {
appContext.triggerCommand("openInPopup", { noteIdOrPath: note.noteId });
appContext.triggerCommand("refreshNoteList", { noteId: this.parentNote.noteId });
}
},
datesSet: (e) => this.#onDatesSet(e), datesSet: (e) => this.#onDatesSet(e),
}); });