fix: Use proper multi-calendars map on month and quarter pickers (

fixes #875)
Vuepic · May 24, 2024 · 4b5f451 · 4b5f451
1 parent 22346de
commit 4b5f451
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 2 deletions.
diff --git a/src/VueDatePicker/components/MonthPicker/month-picker.ts b/src/VueDatePicker/components/MonthPicker/month-picker.ts
@@ -55,6 +55,7 @@ export const useMonthPicker = (props: PickerBasePropsType, emit: VueEmit) => {
     } = useMonthOrQuarterPicker({
         modelValue,
         multiCalendars: defaultedMultiCalendars,
+        range: defaultedRange,
         highlight: defaultedHighlight,
         calendars,
         year,

diff --git a/src/VueDatePicker/components/QuarterPicker/quarter-picker.ts b/src/VueDatePicker/components/QuarterPicker/quarter-picker.ts
@@ -38,6 +38,7 @@ export const useQuarterPicker = (props: PickerBasePropsType, emit: VueEmit) => {
         useMonthOrQuarterPicker({
             modelValue,
             multiCalendars: defaultedMultiCalendars,
+            range: defaultedRange,
             highlight: defaultedHighlight,
             calendars,
             propDates,

diff --git a/src/VueDatePicker/components/shared/month-quarter-picker.ts b/src/VueDatePicker/components/shared/month-quarter-picker.ts
@@ -1,5 +1,5 @@
 import { computed, onMounted, ref } from 'vue';
-import { addYears, endOfYear, getMonth, getYear, set, startOfYear, subYears } from 'date-fns';
+import { addYears, differenceInYears, endOfYear, getMonth, getYear, set, startOfYear, subYears } from 'date-fns';
 
 import { checkHighlightYear, getDate, getMinMaxYear, resetDate, validateMonthYear } from '@/utils/date-utils';
 import { checkMinMaxValue, getYears, groupListAndMap } from '@/utils/util';
@@ -16,6 +16,7 @@ import type {
     HighlightFn,
     PropDates,
     DateFilter,
+    RangeConfig,
 } from '@/interfaces';
 import type { PickerBasePropsType } from '@/props';
 import { FlowStep } from '@/constants';
@@ -30,6 +31,7 @@ interface Opts {
     highlight: ComputedRef<Highlight | HighlightFn>;
     propDates: ComputedRef<PropDates>;
     filters: ComputedRef<DateFilter>;
+    range: ComputedRef<RangeConfig>;
     emit: VueEmit;
 }
 
@@ -38,6 +40,7 @@ interface Opts {
  */
 export const useMonthOrQuarterPicker = ({
     multiCalendars,
+    range,
     highlight,
     propDates,
     calendars,
@@ -66,10 +69,19 @@ export const useMonthOrQuarterPicker = ({
         );
     });
 
+    const isSoloMultiInRange = () => {
+        return Array.isArray(modelValue.value) && multiCalendars.value.solo && modelValue.value[1];
+    };
+
     const assignMultiCalendars = () => {
         for (let i = 0; i < multiCalendars.value.count; i++) {
             if (i === 0) {
                 calendars.value[i] = calendars.value[0];
+            } else if (i === multiCalendars.value.count - 1 && isSoloMultiInRange()) {
+                calendars.value[i] = {
+                    month: getMonth((modelValue.value as Date[])[1]),
+                    year: getYear((modelValue.value as Date[])[1]),
+                };
             } else {
                 const prevDate = set(getDate(), calendars.value[i - 1]);
                 calendars.value[i] = { month: getMonth(prevDate), year: getYear(addYears(prevDate, 1)) };
@@ -84,9 +96,15 @@ export const useMonthOrQuarterPicker = ({
         return assignMultiCalendars();
     };
 
+    const getDateToFocus = (dateOne: Date, dateTwo: Date) => {
+        const diff = differenceInYears(dateTwo, dateOne);
+        return range.value.showLastInRange && diff > 1 ? dateTwo : dateOne;
+    };
+
     const getRangedValueDate = (dates: Date[]) => {
         if (props.focusStartDate) return dates[0];
-        return dates[1] ? dates[1] : dates[0];
+        if (multiCalendars.value.solo) return dates[0];
+        return dates[1] ? getDateToFocus(dates[0], dates[1]) : dates[0];
     };
 
     const checkModelValue = () => {