vant 3.2.0 → 3.2.4

package/es/badge/Badge.d.ts

@@ -28,9 +28,9 @@ declare const _default: import("vue").DefineComponent<{
 } & {
     max?: string | number | undefined;
     color?: string | undefined;
-    offset?: [string | number, string | number] | undefined;
     content?: string | number | undefined;
-}> & {}, {
+    offset?: [string | number, string | number] | undefined;
+}>, {
     dot: boolean;
     showZero: boolean;
     tag: keyof HTMLElementTagNameMap;

package/es/badge/index.d.ts

@@ -1,4 +1,4 @@
-declare const Badge: import("../utils").WithInstall<import("vue").DefineComponent<{
+export declare const Badge: import("../utils").WithInstall<import("vue").DefineComponent<{
     dot: BooleanConstructor;
     max: (NumberConstructor | StringConstructor)[];
     color: StringConstructor;
@@ -27,12 +27,11 @@ declare const Badge: import("../utils").WithInstall<import("vue").DefineComponen
 } & {
     max?: string | number | undefined;
     color?: string | undefined;
-    offset?: [string | number, string | number] | undefined;
     content?: string | number | undefined;
-}> & {}, {
+    offset?: [string | number, string | number] | undefined;
+}>, {
     dot: boolean;
     showZero: boolean;
     tag: keyof HTMLElementTagNameMap;
 }>>;
 export default Badge;
-export { Badge };

package/es/badge/index.js

@@ -1,5 +1,4 @@
 import { withInstall } from '../utils';
 import _Badge from './Badge';
-var Badge = withInstall(_Badge);
-export default Badge;
-export { Badge };
+export var Badge = withInstall(_Badge);
+export default Badge;

package/es/button/Button.d.ts

@@ -69,8 +69,8 @@ declare const _default: import("vue").DefineComponent<{
     type: ButtonType;
     tag: keyof HTMLElementTagNameMap;
     round: boolean;
-    size: ButtonSize;
     disabled: boolean;
+    size: ButtonSize;
     loading: boolean;
     block: boolean;
     square: boolean;
@@ -95,8 +95,8 @@ declare const _default: import("vue").DefineComponent<{
     type: ButtonType;
     tag: keyof HTMLElementTagNameMap;
     round: boolean;
-    size: ButtonSize;
     disabled: boolean;
+    size: ButtonSize;
     loading: boolean;
     block: boolean;
     square: boolean;

package/es/button/index.css

@@ -1 +1 @@
-:root{--van-button-mini-height:24px;--van-button-mini-padding:0 var(--van-padding-base);--van-button-mini-font-size:var(--van-font-size-xs);--van-button-small-height:32px;--van-button-small-padding:0 var(--van-padding-xs);--van-button-small-font-size:var(--van-font-size-sm);--van-button-normal-padding:0 15px;--van-button-normal-font-size:var(--van-font-size-md);--van-button-large-height:50px;--van-button-default-height:44px;--van-button-default-line-height:1.2;--van-button-default-font-size:var(--van-font-size-lg);--van-button-default-color:var(--van-text-color);--van-button-default-background-color:var(--van-white);--van-button-default-border-color:var(--van-border-color);--van-button-primary-color:var(--van-white);--van-button-primary-background-color:var(--van-primary-color);--van-button-primary-border-color:var(--van-primary-color);--van-button-success-color:var(--van-white);--van-button-success-background-color:var(--van-success-color);--van-button-success-border-color:var(--van-success-color);--van-button-danger-color:var(--van-white);--van-button-danger-background-color:var(--van-danger-color);--van-button-danger-border-color:var(--van-danger-color);--van-button-warning-color:var(--van-white);--van-button-warning-background-color:var(--van-warning-color);--van-button-warning-border-color:var(--van-warning-color);--van-button-border-width:var(--van-border-width-base);--van-button-border-radius:var(--van-border-radius-sm);--van-button-round-border-radius:var(--van-border-radius-max);--van-button-plain-background-color:var(--van-white);--van-button-disabled-opacity:var(--van-disabled-opacity);--van-button-icon-size:1.2em;--van-button-loading-icon-size:20px}.van-button{position:relative;display:inline-block;box-sizing:border-box;height:var(--van-button-default-height);margin:0;padding:0;font-size:var(--van-button-default-font-size);line-height:var(--van-button-default-line-height);text-align:center;border-radius:var(--van-button-border-radius);cursor:pointer;transition:opacity var(--van-animation-duration-fast);-webkit-appearance:none}.van-button::before{position:absolute;top:50%;left:50%;width:100%;height:100%;background-color:var(--van-black);border:inherit;border-color:var(--van-black);border-radius:inherit;transform:translate(-50%,-50%);opacity:0;content:' '}.van-button:active::before{opacity:.1}.van-button--disabled::before,.van-button--loading::before{display:none}.van-button--default{color:var(--van-button-default-color);background-color:var(--van-button-default-background-color);border:var(--van-button-border-width) solid var(--van-button-default-border-color)}.van-button--primary{color:var(--van-button-primary-color);background-color:var(--van-button-primary-background-color);border:var(--van-button-border-width) solid var(--van-button-primary-border-color)}.van-button--success{color:var(--van-button-success-color);background-color:var(--van-button-success-background-color);border:var(--van-button-border-width) solid var(--van-button-success-border-color)}.van-button--danger{color:var(--van-button-danger-color);background-color:var(--van-button-danger-background-color);border:var(--van-button-border-width) solid var(--van-button-danger-border-color)}.van-button--warning{color:var(--van-button-warning-color);background-color:var(--van-button-warning-background-color);border:var(--van-button-border-width) solid var(--van-button-warning-border-color)}.van-button--plain{background-color:var(--van-button-plain-background-color)}.van-button--plain.van-button--primary{color:var(--van-button-primary-background-color)}.van-button--plain.van-button--success{color:var(--van-button-success-background-color)}.van-button--plain.van-button--danger{color:var(--van-button-danger-background-color)}.van-button--plain.van-button--warning{color:var(--van-button-warning-background-color)}.van-button--large{width:100%;height:var(--van-button-large-height)}.van-button--normal{padding:var(--van-button-normal-padding);font-size:var(--van-button-normal-font-size)}.van-button--small{height:var(--van-button-small-height);padding:var(--van-button-small-padding);font-size:var(--van-button-small-font-size)}.van-button__loading{color:inherit;font-size:inherit}.van-button__loading .van-loading__spinner{color:currentColor;width:var(--van-button-loading-icon-size);height:var(--van-button-loading-icon-size)}.van-button--mini{height:var(--van-button-mini-height);padding:var(--van-button-mini-padding);font-size:var(--van-button-mini-font-size)}.van-button--mini+.van-button--mini{margin-left:var(--van-padding-base)}.van-button--block{display:block;width:100%}.van-button--disabled{cursor:not-allowed;opacity:var(--van-button-disabled-opacity)}.van-button--loading{cursor:default}.van-button--round{border-radius:var(--van-button-round-border-radius)}.van-button--square{border-radius:0}.van-button__content{display:flex;align-items:center;justify-content:center;height:100%}.van-button__content::before{content:' '}.van-button__icon{font-size:var(--van-button-icon-size);line-height:inherit}.van-button__icon+.van-button__text,.van-button__loading+.van-button__text,.van-button__text+.van-button__icon,.van-button__text+.van-button__loading{margin-left:var(--van-padding-base)}.van-button--hairline{border-width:0}.van-button--hairline::after{border-color:inherit;border-radius:calc(var(--van-button-border-radius) * 2)}.van-button--hairline.van-button--round::after{border-radius:var(--van-button-round-border-radius)}.van-button--hairline.van-button--square::after{border-radius:0}
+:root{--van-button-mini-height:24px;--van-button-mini-padding:0 var(--van-padding-base);--van-button-mini-font-size:var(--van-font-size-xs);--van-button-small-height:32px;--van-button-small-padding:0 var(--van-padding-xs);--van-button-small-font-size:var(--van-font-size-sm);--van-button-normal-padding:0 15px;--van-button-normal-font-size:var(--van-font-size-md);--van-button-large-height:50px;--van-button-default-height:44px;--van-button-default-line-height:1.2;--van-button-default-font-size:var(--van-font-size-lg);--van-button-default-color:var(--van-text-color);--van-button-default-background-color:var(--van-white);--van-button-default-border-color:var(--van-border-color);--van-button-primary-color:var(--van-white);--van-button-primary-background-color:var(--van-primary-color);--van-button-primary-border-color:var(--van-primary-color);--van-button-success-color:var(--van-white);--van-button-success-background-color:var(--van-success-color);--van-button-success-border-color:var(--van-success-color);--van-button-danger-color:var(--van-white);--van-button-danger-background-color:var(--van-danger-color);--van-button-danger-border-color:var(--van-danger-color);--van-button-warning-color:var(--van-white);--van-button-warning-background-color:var(--van-warning-color);--van-button-warning-border-color:var(--van-warning-color);--van-button-border-width:var(--van-border-width-base);--van-button-border-radius:var(--van-border-radius-sm);--van-button-round-border-radius:var(--van-border-radius-max);--van-button-plain-background-color:var(--van-white);--van-button-disabled-opacity:var(--van-disabled-opacity);--van-button-icon-size:1.2em;--van-button-loading-icon-size:20px}.van-button{position:relative;display:inline-block;box-sizing:border-box;height:var(--van-button-default-height);margin:0;padding:0;font-size:var(--van-button-default-font-size);line-height:var(--van-button-default-line-height);text-align:center;border-radius:var(--van-button-border-radius);cursor:pointer;transition:opacity var(--van-animation-duration-fast);-webkit-appearance:none}.van-button::before{position:absolute;top:50%;left:50%;width:100%;height:100%;background:var(--van-black);border:inherit;border-color:var(--van-black);border-radius:inherit;transform:translate(-50%,-50%);opacity:0;content:' '}.van-button:active::before{opacity:.1}.van-button--disabled::before,.van-button--loading::before{display:none}.van-button--default{color:var(--van-button-default-color);background:var(--van-button-default-background-color);border:var(--van-button-border-width) solid var(--van-button-default-border-color)}.van-button--primary{color:var(--van-button-primary-color);background:var(--van-button-primary-background-color);border:var(--van-button-border-width) solid var(--van-button-primary-border-color)}.van-button--success{color:var(--van-button-success-color);background:var(--van-button-success-background-color);border:var(--van-button-border-width) solid var(--van-button-success-border-color)}.van-button--danger{color:var(--van-button-danger-color);background:var(--van-button-danger-background-color);border:var(--van-button-border-width) solid var(--van-button-danger-border-color)}.van-button--warning{color:var(--van-button-warning-color);background:var(--van-button-warning-background-color);border:var(--van-button-border-width) solid var(--van-button-warning-border-color)}.van-button--plain{background:var(--van-button-plain-background-color)}.van-button--plain.van-button--primary{color:var(--van-button-primary-background-color)}.van-button--plain.van-button--success{color:var(--van-button-success-background-color)}.van-button--plain.van-button--danger{color:var(--van-button-danger-background-color)}.van-button--plain.van-button--warning{color:var(--van-button-warning-background-color)}.van-button--large{width:100%;height:var(--van-button-large-height)}.van-button--normal{padding:var(--van-button-normal-padding);font-size:var(--van-button-normal-font-size)}.van-button--small{height:var(--van-button-small-height);padding:var(--van-button-small-padding);font-size:var(--van-button-small-font-size)}.van-button__loading{color:inherit;font-size:inherit}.van-button__loading .van-loading__spinner{color:currentColor;width:var(--van-button-loading-icon-size);height:var(--van-button-loading-icon-size)}.van-button--mini{height:var(--van-button-mini-height);padding:var(--van-button-mini-padding);font-size:var(--van-button-mini-font-size)}.van-button--mini+.van-button--mini{margin-left:var(--van-padding-base)}.van-button--block{display:block;width:100%}.van-button--disabled{cursor:not-allowed;opacity:var(--van-button-disabled-opacity)}.van-button--loading{cursor:default}.van-button--round{border-radius:var(--van-button-round-border-radius)}.van-button--square{border-radius:0}.van-button__content{display:flex;align-items:center;justify-content:center;height:100%}.van-button__content::before{content:' '}.van-button__icon{font-size:var(--van-button-icon-size);line-height:inherit}.van-button__icon+.van-button__text,.van-button__loading+.van-button__text,.van-button__text+.van-button__icon,.van-button__text+.van-button__loading{margin-left:var(--van-padding-base)}.van-button--hairline{border-width:0}.van-button--hairline::after{border-color:inherit;border-radius:calc(var(--van-button-border-radius) * 2)}.van-button--hairline.van-button--round::after{border-radius:var(--van-button-round-border-radius)}.van-button--hairline.van-button--square::after{border-radius:0}

package/es/button/index.d.ts

@@ -1,4 +1,4 @@
-declare const Button: import("../utils").WithInstall<import("vue").DefineComponent<{
+export declare const Button: import("../utils").WithInstall<import("vue").DefineComponent<{
     to: import("vue").PropType<import("vue-router").RouteLocationRaw>;
     url: StringConstructor;
     replace: BooleanConstructor;
@@ -65,8 +65,8 @@ declare const Button: import("../utils").WithInstall<import("vue").DefineCompone
     type: import("./Button").ButtonType;
     tag: keyof HTMLElementTagNameMap;
     round: boolean;
-    size: import("./Button").ButtonSize;
     disabled: boolean;
+    size: import("./Button").ButtonSize;
     loading: boolean;
     block: boolean;
     square: boolean;
@@ -91,8 +91,8 @@ declare const Button: import("../utils").WithInstall<import("vue").DefineCompone
     type: import("./Button").ButtonType;
     tag: keyof HTMLElementTagNameMap;
     round: boolean;
-    size: import("./Button").ButtonSize;
     disabled: boolean;
+    size: import("./Button").ButtonSize;
     loading: boolean;
     block: boolean;
     square: boolean;
@@ -102,5 +102,4 @@ declare const Button: import("../utils").WithInstall<import("vue").DefineCompone
     iconPosition: "left" | "right";
 }>>;
 export default Button;
-export { Button };
 export type { ButtonType, ButtonSize } from './Button';

package/es/button/index.js

@@ -1,5 +1,4 @@
 import { withInstall } from '../utils';
 import _Button from './Button';
-var Button = withInstall(_Button);
-export default Button;
-export { Button };
+export var Button = withInstall(_Button);
+export default Button;

package/es/button/index.less

@@ -58,7 +58,7 @@
     left: 50%;
     width: 100%;
     height: 100%;
-    background-color: var(--van-black);
+    background: var(--van-black);
     border: inherit;
     border-color: var(--van-black);
     border-radius: inherit; /* inherit parent's border radius */
@@ -80,41 +80,41 @@
 
   &--default {
     color: var(--van-button-default-color);
-    background-color: var(--van-button-default-background-color);
+    background: var(--van-button-default-background-color);
     border: var(--van-button-border-width) solid
       var(--van-button-default-border-color);
   }
 
   &--primary {
     color: var(--van-button-primary-color);
-    background-color: var(--van-button-primary-background-color);
+    background: var(--van-button-primary-background-color);
     border: var(--van-button-border-width) solid
       var(--van-button-primary-border-color);
   }
 
   &--success {
     color: var(--van-button-success-color);
-    background-color: var(--van-button-success-background-color);
+    background: var(--van-button-success-background-color);
     border: var(--van-button-border-width) solid
       var(--van-button-success-border-color);
   }
 
   &--danger {
     color: var(--van-button-danger-color);
-    background-color: var(--van-button-danger-background-color);
+    background: var(--van-button-danger-background-color);
     border: var(--van-button-border-width) solid
       var(--van-button-danger-border-color);
   }
 
   &--warning {
     color: var(--van-button-warning-color);
-    background-color: var(--van-button-warning-background-color);
+    background: var(--van-button-warning-background-color);
     border: var(--van-button-border-width) solid
       var(--van-button-warning-border-color);
   }
 
   &--plain {
-    background-color: var(--van-button-plain-background-color);
+    background: var(--van-button-plain-background-color);
 
     &.van-button--primary {
       color: var(--van-button-primary-background-color);

package/es/calendar/Calendar.d.ts

@@ -36,7 +36,7 @@ declare const props: {
         type: BooleanConstructor;
         default: true;
     };
-    defaultDate: any;
+    defaultDate: PropType<Date | Date[] | null>;
     allowSameDay: BooleanConstructor;
     showSubtitle: {
         type: BooleanConstructor;
@@ -122,7 +122,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    defaultDate: any;
+    defaultDate: PropType<Date | Date[] | null>;
     allowSameDay: BooleanConstructor;
     showSubtitle: {
         type: BooleanConstructor;
@@ -218,7 +218,6 @@ declare const _default: import("vue").DefineComponent<{
     showMark: boolean;
     showTitle: boolean;
     showConfirm: boolean;
-    defaultDate: any;
     allowSameDay: boolean;
     showSubtitle: boolean;
     maxRange: string | number;
@@ -232,6 +231,7 @@ declare const _default: import("vue").DefineComponent<{
     rowHeight?: string | number | undefined;
     confirmText?: string | undefined;
     rangePrompt?: string | undefined;
+    defaultDate?: Date | Date[] | null | undefined;
     confirmDisabledText?: string | undefined;
 }> & {
     onSelect?: ((...args: any[]) => any) | undefined;
@@ -257,7 +257,6 @@ declare const _default: import("vue").DefineComponent<{
     showMark: boolean;
     showTitle: boolean;
     showConfirm: boolean;
-    defaultDate: any;
     allowSameDay: boolean;
     showSubtitle: boolean;
     maxRange: string | number;

package/es/calendar/Calendar.js

@@ -1,8 +1,8 @@
 import { createVNode as _createVNode, mergeProps as _mergeProps, resolveDirective as _resolveDirective } from "vue";
-import { ref, watch, reactive, computed, defineComponent } from 'vue'; // Utils
+import { ref, watch, computed, defineComponent } from 'vue'; // Utils
 
 import { pick, isDate, truthProp, getScrollTop } from '../utils';
-import { t, bem, name, cloneDate, cloneDates, getPrevDay, getNextDay, getToday, compareDay, calcDateNum, compareMonth, getDayByOffset } from './utils'; // Composables
+import { t, bem, name, getToday, cloneDate, cloneDates, getPrevDay, getNextDay, compareDay, calcDateNum, compareMonth, getDayByOffset } from './utils'; // Composables
 
 import { raf, useRect, onMountedOrActivated } from '@vant/use';
 import { useRefs } from '../composables/use-refs';
@@ -30,8 +30,6 @@ var props = {
   rangePrompt: String,
   lazyRender: truthProp,
   showConfirm: truthProp,
-  // TODO: remove any
-  // see: https://github.com/vuejs/vue-next/issues/2668
   defaultDate: [Date, Array],
   allowSameDay: Boolean,
   showSubtitle: truthProp,
@@ -135,10 +133,8 @@ export default defineComponent({
 
     var bodyHeight;
     var bodyRef = ref();
-    var state = reactive({
-      subtitle: '',
-      currentDate: getInitialDate()
-    });
+    var subtitle = ref('');
+    var currentDate = ref(getInitialDate());
     var [monthRefs, setMonthRefs] = useRefs();
     var dayOffset = computed(() => props.firstDayOfWeek ? +props.firstDayOfWeek % 7 : 0);
     var months = computed(() => {
@@ -154,21 +150,17 @@ export default defineComponent({
       return months;
     });
     var buttonDisabled = computed(() => {
-      var {
-        currentDate
-      } = state;
-
-      if (currentDate) {
+      if (currentDate.value) {
         if (props.type === 'range') {
-          return !currentDate[0] || !currentDate[1];
+          return !currentDate.value[0] || !currentDate.value[1];
         }
 
         if (props.type === 'multiple') {
-          return !currentDate.length;
+          return !currentDate.value.length;
         }
       }
 
-      return !currentDate;
+      return !currentDate.value;
     }); // calculate the position of the elements
     // and find the elements that needs to be rendered
 
@@ -202,7 +194,7 @@ export default defineComponent({
             monthRefs.value[i].showed = true;
             emit('month-show', {
               date: month.date,
-              title: month.title
+              title: month.getTitle()
             });
           }
         }
@@ -217,7 +209,7 @@ export default defineComponent({
       /* istanbul ignore else */
 
       if (currentMonth) {
-        state.subtitle = currentMonth.getTitle();
+        subtitle.value = currentMonth.getTitle();
       }
     };
 
@@ -225,7 +217,10 @@ export default defineComponent({
       raf(() => {
         months.value.some((month, index) => {
           if (compareMonth(month, targetDate) === 0) {
-            monthRefs.value[index].scrollIntoView(bodyRef.value);
+            if (bodyRef.value) {
+              monthRefs.value[index].scrollIntoView(bodyRef.value);
+            }
+
             return true;
           }
 
@@ -241,12 +236,8 @@ export default defineComponent({
         return;
       }
 
-      var {
-        currentDate
-      } = state;
-
-      if (currentDate) {
-        var targetDate = props.type === 'single' ? currentDate : currentDate[0];
+      if (currentDate.value) {
+        var targetDate = props.type === 'single' ? currentDate.value : currentDate.value[0];
         scrollToDate(targetDate);
       } else {
         raf(onScroll);
@@ -267,7 +258,7 @@ export default defineComponent({
     };
 
     var reset = (date = getInitialDate()) => {
-      state.currentDate = date;
+      currentDate.value = date;
       scrollIntoView();
     };
 
@@ -290,12 +281,16 @@ export default defineComponent({
       return true;
     };
 
-    var onConfirm = () => emit('confirm', cloneDates(state.currentDate));
+    var onConfirm = () => {
+      var _currentDate$value;
+
+      return emit('confirm', (_currentDate$value = currentDate.value) != null ? _currentDate$value : cloneDates(currentDate.value));
+    };
 
     var select = (date, complete) => {
       var setCurrentDate = date => {
-        state.currentDate = date;
-        emit('select', cloneDates(state.currentDate));
+        currentDate.value = date;
+        emit('select', cloneDates(date));
       };
 
       if (complete && props.type === 'range') {
@@ -318,7 +313,22 @@ export default defineComponent({
       if (complete && !props.showConfirm) {
         onConfirm();
       }
-    };
+    }; // get first disabled calendarDay between date range
+
+
+    var getDisabledDate = (disabledDays, startDay, date) => {
+      var _disabledDays$find;
+
+      return (_disabledDays$find = disabledDays.find(day => compareDay(startDay, day.date) === -1 && compareDay(day.date, date) === -1)) == null ? void 0 : _disabledDays$find.date;
+    }; // disabled calendarDay
+
+
+    var disabledDays = computed(() => monthRefs.value.reduce((arr, ref) => {
+      var _ref$disabledDays$val, _ref$disabledDays;
+
+      arr.push(...((_ref$disabledDays$val = (_ref$disabledDays = ref.disabledDays) == null ? void 0 : _ref$disabledDays.value) != null ? _ref$disabledDays$val : []));
+      return arr;
+    }, []));
 
     var onClickDay = item => {
       if (props.readonly || !item.date) {
@@ -331,23 +341,27 @@ export default defineComponent({
       var {
         type
       } = props;
-      var {
-        currentDate
-      } = state;
 
       if (type === 'range') {
-        if (!currentDate) {
+        if (!currentDate.value) {
           select([date]);
           return;
         }
 
-        var [startDay, endDay] = currentDate;
+        var [startDay, endDay] = currentDate.value;
 
         if (startDay && !endDay) {
           var compareToStart = compareDay(date, startDay);
 
           if (compareToStart === 1) {
-            select([startDay, date], true);
+            var disabledDay = getDisabledDate(disabledDays.value, startDay, date);
+
+            if (disabledDay) {
+              var lastAbledEndDay = getPrevDay(disabledDay);
+              select([startDay, lastAbledEndDay]);
+            } else {
+              select([startDay, date], true);
+            }
           } else if (compareToStart === -1) {
             select([date]);
           } else if (props.allowSameDay) {
@@ -357,29 +371,21 @@ export default defineComponent({
           select([date]);
         }
       } else if (type === 'multiple') {
-        if (!currentDate) {
+        if (!currentDate.value) {
           select([date]);
           return;
         }
 
-        var selectedIndex;
-        var selected = state.currentDate.some((dateItem, index) => {
-          var equal = compareDay(dateItem, date) === 0;
-
-          if (equal) {
-            selectedIndex = index;
-          }
-
-          return equal;
-        });
+        var dates = currentDate.value;
+        var selectedIndex = dates.findIndex(dateItem => compareDay(dateItem, date) === 0);
 
-        if (selected) {
-          var [unselectedDate] = currentDate.splice(selectedIndex, 1);
+        if (selectedIndex !== -1) {
+          var [unselectedDate] = dates.splice(selectedIndex, 1);
           emit('unselect', cloneDate(unselectedDate));
-        } else if (props.maxRange && currentDate.length >= props.maxRange) {
+        } else if (props.maxRange && dates.length >= props.maxRange) {
           Toast(props.rangePrompt || t('rangePrompt', props.maxRange));
         } else {
-          select([...currentDate, date]);
+          select([...dates, date]);
         }
       } else {
         select(date, true);
@@ -393,7 +399,7 @@ export default defineComponent({
       return _createVNode(CalendarMonth, _mergeProps({
         "ref": setMonthRefs(index),
         "date": date,
-        "currentDate": state.currentDate,
+        "currentDate": currentDate.value,
         "showMonthTitle": showMonthTitle,
         "firstDayOfWeek": dayOffset.value
       }, pick(props, ['type', 'color', 'minDate', 'maxDate', 'showMark', 'formatter', 'rowHeight', 'lazyRender', 'showSubtitle', 'allowSameDay']), {
@@ -433,7 +439,7 @@ export default defineComponent({
       "class": bem()
     }, [_createVNode(CalendarHeader, {
       "title": props.title,
-      "subtitle": state.subtitle,
+      "subtitle": subtitle.value,
       "showTitle": props.showTitle,
       "showSubtitle": props.showSubtitle,
       "firstDayOfWeek": dayOffset.value,
@@ -448,10 +454,10 @@ export default defineComponent({
 
     watch(() => props.show, init);
     watch(() => [props.type, props.minDate, props.maxDate], () => {
-      reset(getInitialDate(state.currentDate));
+      reset(getInitialDate(currentDate.value));
     });
-    watch(() => props.defaultDate, value => {
-      state.currentDate = value;
+    watch(() => props.defaultDate, (value = null) => {
+      currentDate.value = value;
       scrollIntoView();
     });
     useExpose({

package/es/calendar/CalendarMonth.d.ts

@@ -1,5 +1,31 @@
-import { PropType } from 'vue';
+import { PropType, ExtractPropTypes } from 'vue';
 import type { CalendarType, CalendarDayItem } from './types';
+declare const props: {
+    type: PropType<CalendarType>;
+    color: StringConstructor;
+    showMark: BooleanConstructor;
+    rowHeight: (NumberConstructor | StringConstructor)[];
+    formatter: PropType<(item: CalendarDayItem) => CalendarDayItem>;
+    lazyRender: BooleanConstructor;
+    currentDate: PropType<Date | Date[] | null>;
+    allowSameDay: BooleanConstructor;
+    showSubtitle: BooleanConstructor;
+    showMonthTitle: BooleanConstructor;
+    firstDayOfWeek: NumberConstructor;
+    date: {
+        type: DateConstructor;
+        required: true;
+    };
+    minDate: {
+        type: DateConstructor;
+        required: true;
+    };
+    maxDate: {
+        type: DateConstructor;
+        required: true;
+    };
+};
+export declare type CalendarMonthProps = ExtractPropTypes<typeof props>;
 declare const _default: import("vue").DefineComponent<{
     type: PropType<CalendarType>;
     color: StringConstructor;
@@ -7,7 +33,7 @@ declare const _default: import("vue").DefineComponent<{
     rowHeight: (NumberConstructor | StringConstructor)[];
     formatter: PropType<(item: CalendarDayItem) => CalendarDayItem>;
     lazyRender: BooleanConstructor;
-    currentDate: PropType<Date | Date[]>;
+    currentDate: PropType<Date | Date[] | null>;
     allowSameDay: BooleanConstructor;
     showSubtitle: BooleanConstructor;
     showMonthTitle: BooleanConstructor;
@@ -54,7 +80,7 @@ declare const _default: import("vue").DefineComponent<{
     formatter?: ((item: CalendarDayItem) => CalendarDayItem) | undefined;
     rowHeight?: string | number | undefined;
     firstDayOfWeek?: number | undefined;
-    currentDate?: Date | Date[] | undefined;
+    currentDate?: Date | Date[] | null | undefined;
 }> & {
     onClick?: ((...args: any[]) => any) | undefined;
     "onUpdate-height"?: ((...args: any[]) => any) | undefined;

package/es/calendar/CalendarMonth.js

@@ -12,33 +12,34 @@ import { useHeight } from '../composables/use-height'; // Components
 import CalendarDay from './CalendarDay'; // Types
 
 var [name] = createNamespace('calendar-month');
+var props = {
+  type: String,
+  color: String,
+  showMark: Boolean,
+  rowHeight: [Number, String],
+  formatter: Function,
+  lazyRender: Boolean,
+  currentDate: [Date, Array],
+  allowSameDay: Boolean,
+  showSubtitle: Boolean,
+  showMonthTitle: Boolean,
+  firstDayOfWeek: Number,
+  date: {
+    type: Date,
+    required: true
+  },
+  minDate: {
+    type: Date,
+    required: true
+  },
+  maxDate: {
+    type: Date,
+    required: true
+  }
+};
 export default defineComponent({
   name,
-  props: {
-    type: String,
-    color: String,
-    showMark: Boolean,
-    rowHeight: [Number, String],
-    formatter: Function,
-    lazyRender: Boolean,
-    currentDate: [Date, Array],
-    allowSameDay: Boolean,
-    showSubtitle: Boolean,
-    showMonthTitle: Boolean,
-    firstDayOfWeek: Number,
-    date: {
-      type: Date,
-      required: true
-    },
-    minDate: {
-      type: Date,
-      required: true
-    },
-    maxDate: {
-      type: Date,
-      required: true
-    }
-  },
+  props,
   emits: ['click', 'update-height'],
 
   setup(props, {
@@ -67,8 +68,11 @@ export default defineComponent({
 
     var scrollIntoView = body => {
       var el = props.showSubtitle ? daysRef.value : monthRef.value;
-      var scrollTop = el.getBoundingClientRect().top - body.getBoundingClientRect().top + body.scrollTop;
-      setScrollTop(body, scrollTop);
+
+      if (el) {
+        var scrollTop = el.getBoundingClientRect().top - body.getBoundingClientRect().top + body.scrollTop;
+        setScrollTop(body, scrollTop);
+      }
     };
 
     var getMultipleDayType = day => {
@@ -221,6 +225,7 @@ export default defineComponent({
 
       return days;
     });
+    var disabledDays = computed(() => days.value.filter(day => day.type === 'disabled'));
 
     var renderDay = (item, index) => _createVNode(CalendarDay, {
       "item": item,
@@ -241,7 +246,8 @@ export default defineComponent({
       getTitle,
       getHeight: () => height.value,
       setVisible,
-      scrollIntoView
+      scrollIntoView,
+      disabledDays
     });
     return () => _createVNode("div", {
       "class": bem('month'),

package/es/calendar/index.d.ts

@@ -1,4 +1,5 @@
-declare const Calendar: import("../utils").WithInstall<import("vue").DefineComponent<{
+import { CalendarProps } from './Calendar';
+export declare const Calendar: import("../utils").WithInstall<import("vue").DefineComponent<{
     show: BooleanConstructor;
     title: StringConstructor;
     color: StringConstructor;
@@ -32,7 +33,7 @@ declare const Calendar: import("../utils").WithInstall<import("vue").DefineCompo
         type: BooleanConstructor;
         default: true;
     };
-    defaultDate: any;
+    defaultDate: import("vue").PropType<Date | Date[] | null>;
     allowSameDay: BooleanConstructor;
     showSubtitle: {
         type: BooleanConstructor;
@@ -128,7 +129,6 @@ declare const Calendar: import("../utils").WithInstall<import("vue").DefineCompo
     showMark: boolean;
     showTitle: boolean;
     showConfirm: boolean;
-    defaultDate: any;
     allowSameDay: boolean;
     showSubtitle: boolean;
     maxRange: string | number;
@@ -142,6 +142,7 @@ declare const Calendar: import("../utils").WithInstall<import("vue").DefineCompo
     rowHeight?: string | number | undefined;
     confirmText?: string | undefined;
     rangePrompt?: string | undefined;
+    defaultDate?: Date | Date[] | null | undefined;
     confirmDisabledText?: string | undefined;
 }> & {
     onSelect?: ((...args: any[]) => any) | undefined;
@@ -167,7 +168,6 @@ declare const Calendar: import("../utils").WithInstall<import("vue").DefineCompo
     showMark: boolean;
     showTitle: boolean;
     showConfirm: boolean;
-    defaultDate: any;
     allowSameDay: boolean;
     showSubtitle: boolean;
     maxRange: string | number;
@@ -175,5 +175,5 @@ declare const Calendar: import("../utils").WithInstall<import("vue").DefineCompo
     showRangePrompt: boolean;
 }>>;
 export default Calendar;
-export { Calendar };
+export type { CalendarProps };
 export type { CalendarType, CalendarDayItem, CalendarDayType, CalendarInstance, } from './types';