diff --git a/web/src/components/events/EventContainer.tsx b/web/src/components/events/EventContainer.tsx index 8325297..79bfa29 100644 --- a/web/src/components/events/EventContainer.tsx +++ b/web/src/components/events/EventContainer.tsx @@ -244,6 +244,16 @@ const CalendarWeek = ({ days }: { days: Record }) => { ); }; +function maybeYear(yearMonthString: string) { + const yearMonth = new Date(yearMonthString); + const now = new Date(); + const isCurrentYear = yearMonth.getFullYear() == now.getFullYear(); + if (isCurrentYear) { + return {yearMonth.getFullYear()}; + } + return ` ${yearMonth.getFullYear()}`; +} + const EventCalendar = ({ events }: { events: EventFragment[] }) => { const futureSingularEvents = getSingularEvents(events).filter( (x) => x.occurrence?.start && isTodayOrFuture(x.occurrence.start) @@ -275,6 +285,7 @@ const EventCalendar = ({ events }: { events: EventFragment[] }) => { ), 0 ); + return (
{ data-collapsed={!visibleYearMonths.includes(yearMonth)} >

toggleYearMonth(yearMonth)}> - {formatYearMonth(yearMonth)}{" "} + {formatYearMonth(yearMonth)} + {maybeYear(yearMonth)}{" "} ({eventCount})

{eventCount === 0 && (