Work around date±duration operations being broken

Looks like adding a dayjs duration object to a dayjs date object returns an invalid date object with most fields set to `NaN`
bravecollective · Nov 7, 2023 · e911d42 · e911d42
1 parent 16e2ec5
commit e911d42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/packages/frontend/src/pages/calendar.tsx b/packages/frontend/src/pages/calendar.tsx
@@ -26,10 +26,8 @@ export function CalendarPage(): JSX.Element {
   }, [dispatch, month, year])
 
   const handleTodayClicked = () => setCurrentMonth(dayjs.utc())
-  const handleNextMonthClicked = () =>
-    setCurrentMonth(m => m.add(dayjs.duration({ months: 1 })))
-  const handlePrevMonthClicked = () =>
-    setCurrentMonth(m => m.subtract(dayjs.duration({ months: 1 })))
+  const handleNextMonthClicked = () => setCurrentMonth(m => m.add(1, 'month'))
+  const handlePrevMonthClicked = () => setCurrentMonth(m => m.subtract(1, 'month'))
   const handleReloadClicked = () => {
     dispatch(clearCalendarEntries())
     dispatch(loadMonth({ month, year }))

diff --git a/packages/frontend/src/store/calendar-slice.ts b/packages/frontend/src/store/calendar-slice.ts
@@ -51,7 +51,7 @@ export function getDisplayedMonthRange(date: { year: number, month: number }): {
   const startOfMonthPadding = modulo(firstOfMonth.day() - dayjs.localeData().firstDayOfWeek(), 7)
   const from = firstOfMonth.subtract(startOfMonthPadding, 'days')
   const displayedWeeks = Math.ceil((from.daysInMonth() + startOfMonthPadding) / 7)
-  const to = from.add(dayjs.duration({ weeks: displayedWeeks }))
+  const to = from.add(displayedWeeks, 'weeks')
   return { from, to, displayedWeeks }
 }