fix(calendar): set max date to years calculation (#441)

core-ds · Dec 24, 2020 · ec9fd36 · ec9fd36
1 parent 943766a
commit ec9fd36
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/packages/calendar/src/useCalendar.ts b/packages/calendar/src/useCalendar.ts
@@ -108,7 +108,7 @@ export function useCalendar({
         activeMonth,
     ]);
 
-    const years = useMemo(() => generateYears(minDate), [minDate]);
+    const years = useMemo(() => generateYears(minDate, maxDate || new Date()), [minDate, maxDate]);
 
     const setMonth = useCallback(
         (newMonth: Date) => {

diff --git a/packages/calendar/src/utils.ts b/packages/calendar/src/utils.ts
@@ -96,12 +96,12 @@ export function generateMonths(year: Date, options: { minMonth?: Date; maxMonth?
 }
 
 /**
- * Возвращает массив лет от текущего года и до minYear
+ * Возвращает массив лет от minYear до maxYear
  */
-export function generateYears(minYear: Date) {
+export function generateYears(minYear: Date, maxYear: Date) {
     return eachYearOfInterval({
-        start: startOfYear(minYear),
-        end: max([startOfYear(new Date()), startOfYear(minYear)]),
+        start: min([startOfYear(maxYear), startOfYear(minYear)]),
+        end: max([startOfYear(maxYear), startOfYear(minYear)]),
     }).reverse();
 }