Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-09-30 15:17:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix calendar weekdays wrong for another year than current year

Browse Source
This commit is contained in:
Kalle
2025-11-26 16:56:10 +02:00
parent d1d0e68b4b
commit cd00207320
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/features/calendar/routes/calendar.tsx
View File

@@ -119,6 +119,7 @@ export default function CalendarPage() {
key={`${date.month}-${date.day}`}
date={date.day}
month={date.month}
year={date.year}
eventTimes={data.eventTimes.filter((event) => {
const eventDate = new Date(event.at);
@@ -217,17 +218,19 @@ function CalendarDatePicker({
function DayEventsColumn({
date,
month,
year,
eventTimes,
}: {
date: number;
month: number;
year: number;
eventTimes: CalendarLoaderData["eventTimes"];
}) {
const eventTimesCollapsed = useCollapsableEvents(eventTimes);
return (
<div>
<DayHeader date={date} month={month} />
<DayHeader date={date} month={month} year={year} />
<div className={styles.dayEvents}>
{eventTimesCollapsed.map((eventTime, i) => {
return (
@@ -251,10 +254,10 @@ function DayEventsColumn({
);
}
function DayHeader(props: { date: number; month: number }) {
function DayHeader(props: { date: number; month: number; year: number }) {
const { formatDate } = useTimeFormat();
const date = new Date(new Date().getFullYear(), props.month, props.date);
const date = new Date(props.year, props.month, props.date);
const isToday = date.toDateString() === new Date().toDateString();
return (