From 1ab6abfc1982c2edca87f6b19f9632620f5e88da Mon Sep 17 00:00:00 2001
From: nemo-shen <kienshin626@gmail.com>
Date: Wed, 20 Oct 2021 09:30:20 +0800
Subject: [PATCH] fix(Calendar): select min effective range (#4569)

* fix(Calendar): select min effective range

* fix(Calendar): fix prefer-destructuring
---
 packages/calendar/components/month/index.ts |  2 +-
 packages/calendar/index.ts                  | 31 ++++++++++++---------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/packages/calendar/components/month/index.ts b/packages/calendar/components/month/index.ts
index 812893dd..ecd5665a 100644
--- a/packages/calendar/components/month/index.ts
+++ b/packages/calendar/components/month/index.ts
@@ -6,7 +6,7 @@ import {
   getNextDay,
 } from '../../utils';
 
-interface Day {
+export interface Day {
   date: Date;
   type: string;
   text: number;
diff --git a/packages/calendar/index.ts b/packages/calendar/index.ts
index f735e3a5..f409c7c1 100644
--- a/packages/calendar/index.ts
+++ b/packages/calendar/index.ts
@@ -12,6 +12,7 @@ import {
   getMonths,
   getDayByOffset,
 } from './utils';
+import { Day } from './components/month/index';
 
 import Toast from '../toast/toast';
 import { requestAnimationFrame } from '../common/utils';
@@ -25,6 +26,8 @@ const initialMaxDate = (() => {
     now.getDate()
   ).getTime();
 })();
+const getTime = (date: Date | number) =>
+  date instanceof Date ? date.getTime() : date;
 
 VantComponent({
   props: {
@@ -230,14 +233,8 @@ VantComponent({
 
     scrollIntoView() {
       requestAnimationFrame(() => {
-        const {
-          currentDate,
-          type,
-          show,
-          poppable,
-          minDate,
-          maxDate,
-        } = this.data;
+        const { currentDate, type, show, poppable, minDate, maxDate } =
+          this.data;
         // @ts-ignore
         const targetDate = type === 'single' ? currentDate : currentDate[0];
         const displayed = show || !poppable;
@@ -278,8 +275,8 @@ VantComponent({
       if (this.data.readonly) {
         return;
       }
-      
-      const { date } = event.detail;
+
+      let { date } = event.detail;
       const { type, currentDate, allowSameDay } = this.data;
 
       if (type === 'range') {
@@ -290,6 +287,17 @@ VantComponent({
           const compareToStart = compareDay(date, startDay);
 
           if (compareToStart === 1) {
+            const { days } = this.selectComponent('.month').data;
+            days.some((day: Day, index) => {
+              const isDisabled =
+                day.type === 'disabled' &&
+                getTime(startDay) < getTime(day.date) &&
+                getTime(day.date) < getTime(date);
+              if (isDisabled) {
+                ({ date } = days[index - 1]);
+              }
+              return isDisabled;
+            });
             this.select([startDay, date], true);
           } else if (compareToStart === -1) {
             this.select([date, null]);
@@ -358,9 +366,6 @@ VantComponent({
     },
 
     emit(date) {
-      const getTime = (date: Date | number) =>
-        date instanceof Date ? date.getTime() : date;
-
       this.setData({
         currentDate: Array.isArray(date) ? date.map(getTime) : getTime(date),
       });