Merge pull request #378 from uvarov-frontend/fix/add_displayClosestValidDate

fix: Add displayClosestValidDate

Author: uvarov-frontend

package/src/scripts/utils/initVariables/initRange.ts

@@ -1,14 +1,8 @@
 import getDate from '@scripts/utils/getDate';
-import getLocalDate from '@scripts/utils/getLocalDate';
 import parseDates from '@scripts/utils/parseDates';
+import resolveDate from '@scripts/utils/resolveDate';
 import setContext from '@scripts/utils/setContext';
-import type { Calendar, DateAny, FormatDateString } from '@src/index';
-
-const resolveDate = (date: 'today' | Date | number | string | undefined, defaultDate: DateAny): FormatDateString => {
-  if (date === 'today') return getLocalDate();
-  if (date instanceof Date || typeof date === 'number' || typeof date === 'string') return parseDates([date])[0];
-  return defaultDate as FormatDateString;
-};
+import type { Calendar } from '@src/index';
 
 const initRange = (self: Calendar) => {
   // set self.context.displayDateMin, self.context.displayDateMax

package/src/scripts/utils/initVariables/initSelectedMonthYear.ts

@@ -2,6 +2,31 @@ import getDate from '@scripts/utils/getDate';
 import parseDates from '@scripts/utils/parseDates';
 import setContext from '@scripts/utils/setContext';
 import type { Calendar, Range } from '@src/index';
+import resolveDate from '@src/scripts/utils/resolveDate';
+
+const displayClosestValidDate = (self: Calendar) => {
+  const isBefore = (date1: string | Date, date2: Date) => new Date(date1).getTime() < date2.getTime();
+  const isAfter = (date1: string | Date, date2: Date) => new Date(date1).getTime() > date2.getTime();
+
+  const gotoMonthYear = (dateOrStr: Date) => {
+    const gotoDate = new Date(dateOrStr);
+    setInitialContext(self, gotoDate.getMonth() as Range<12>, gotoDate.getFullYear());
+  };
+
+  if (self.displayDateMin && self.displayDateMin !== 'today' && isAfter(self.displayDateMin as string, new Date())) {
+    const parsedDate = self.selectedDates.length && self.selectedDates[0] ? parseDates(self.selectedDates)[0] : self.displayDateMin;
+    gotoMonthYear(getDate(resolveDate(parsedDate, self.displayDateMin)));
+    return true;
+  }
+
+  if (self.displayDateMax && self.displayDateMax !== 'today' && isBefore(self.displayDateMax as string, new Date())) {
+    const parsedDate = self.selectedDates.length && self.selectedDates[0] ? parseDates(self.selectedDates)[0] : self.displayDateMax;
+    gotoMonthYear(getDate(resolveDate(parsedDate, self.displayDateMax)));
+    return true;
+  }
+
+  return false;
+};
 
 const setInitialContext = (self: Calendar, month: Range<12>, year: number) => {
   setContext(self, 'selectedMonth', month);
@@ -18,8 +43,11 @@ const initSelectedMonthYear = (self: Calendar) => {
     return;
   }
 
+  if (displayClosestValidDate(self)) return;
+
   const isValidMonth = self.selectedMonth !== undefined && Number(self.selectedMonth) >= 0 && Number(self.selectedMonth) < 12;
   const isValidYear = self.selectedYear !== undefined && Number(self.selectedYear) >= 0 && Number(self.selectedYear) <= 9999;
+
   setInitialContext(
     self,
     (isValidMonth ? Number(self.selectedMonth) : getDate(self.context.dateToday).getMonth()) as Range<12>,

package/src/scripts/utils/resolveDate.ts

@@ -0,0 +1,11 @@
+import getLocalDate from '@scripts/utils/getLocalDate';
+import parseDates from '@scripts/utils/parseDates';
+import type { DateAny, FormatDateString } from '@src/index';
+
+const resolveDate = (date: 'today' | Date | number | string | undefined, defaultDate: DateAny): FormatDateString => {
+  if (date === 'today') return getLocalDate();
+  if (date instanceof Date || typeof date === 'number' || typeof date === 'string') return parseDates([date])[0];
+  return defaultDate as FormatDateString;
+};
+
+export default resolveDate;