Merge pull request #46 from oleksii00ishchenko/master

Fix: switch between dates in month mode
AlexanderHubar · Dec 30, 2022 · 59d3883 · 59d3883
2 parents 79cb2d9 + 3f63c93
commit 59d3883
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/src/components/CalendarContainer/CalendarContainer.tsx b/src/components/CalendarContainer/CalendarContainer.tsx
@@ -253,10 +253,14 @@ function _CalendarContainer<T>(
  (direction === 'LEFT' && !theme.isRTL) ||
  (direction === 'RIGHT' && theme.isRTL)
  ) {
- setTargetDate(targetDate.add(modeToNum(mode, targetDate), 'day'));
+ setTargetDate(
+ targetDate.add(modeToNum(mode, targetDate, direction), 'day')
+ );
  calendarRef.current?.onSwipeLeft();
  } else {
- setTargetDate(targetDate.add(-modeToNum(mode, targetDate), 'day'));
+ setTargetDate(
+ targetDate.add(-modeToNum(mode, targetDate, direction), 'day')
+ );
  calendarRef.current?.onSwipeRight();
  }
  },

diff --git a/src/utils.ts b/src/utils.ts
@@ -119,14 +119,28 @@ export function todayInMinutes() {
  return today.diff(dayjs().startOf('day'), 'minute');
 }
 
-export function modeToNum(mode: Mode, current?: dayjs.Dayjs | Date): number {
+export function modeToNum(
+ mode: Mode,
+ current?: dayjs.Dayjs | Date,
+ swipeDirection?: string
+): number {
  if (mode === 'dayGridMonth') {
  if (!current) {
  throw new Error('You must specify current date if mode is month');
  }
  if (current instanceof Date) {
  current = dayjs(current);
  }
+ if (swipeDirection) {
+ const currentDate = dayjs.utc(current).date();
+ const startOfMonth = dayjs.utc(current).startOf('month').date();
+ const endOfMonth = current.endOf('month').date();
+ if (currentDate === startOfMonth && swipeDirection === 'RIGHT') {
+ return current.set('month', current.month() - 1).daysInMonth();
+ } else if (currentDate === endOfMonth && swipeDirection === 'LEFT') {
+ return current.set('month', current.month() + 1).daysInMonth();
+ }
+ }
  return current.daysInMonth();
  }
  switch (mode) {