Dockery/Trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-17 21:59:55 +01:00
Code Issues Packages Projects Releases Activity

fix(launch_bar): handle week number wrap-around for next year in calendar

Browse Source
This commit is contained in:
Elian Doran
2025-12-05 15:17:51 +02:00
parent 30fe6b93c4
commit 3f0c114f24
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/client/src/widgets/launch_bar/Calendar.tsx
View File

@@ -143,7 +143,13 @@ function CalendarDay({ date, dateNotesForMonth, className, activeDate, todaysDat
} }
function CalendarWeek({ date, weekNumber, weekNotes, onWeekClicked }: { weekNumber: number, weekNotes: string[] } & Pick<CalendarArgs, "date" | "onWeekClicked">) { function CalendarWeek({ date, weekNumber, weekNotes, onWeekClicked }: { weekNumber: number, weekNotes: string[] } & Pick<CalendarArgs, "date" | "onWeekClicked">) {
const weekString = date.local().format('YYYY-') + 'W' + String(weekNumber).padStart(2, '0'); const localDate = date.local();
// Handle case where week is in between years.
let year = localDate.year();
if (localDate.month() === 11 && weekNumber === 1) year++;
const weekString = `${year}-W${String(weekNumber).padStart(2, '0')}`;
if (onWeekClicked) { if (onWeekClicked) {
return ( return (
@@ -151,6 +157,7 @@ function CalendarWeek({ date, weekNumber, weekNotes, onWeekClicked }: { weekNumb
className={clsx("calendar-week-number", "calendar-date", className={clsx("calendar-week-number", "calendar-date",
weekNotes.includes(weekString) && "calendar-date-exists")} weekNotes.includes(weekString) && "calendar-date-exists")}
data-calendar-week-number={weekNumber} data-calendar-week-number={weekNumber}
data-date={date.local().format("YYYY-MM-DD")}
onClick={(e) => onWeekClicked(weekString, e)} onClick={(e) => onWeekClicked(weekString, e)}
>{weekNumber}</a> >{weekNumber}</a>
) )