vant 3.2.2 → 3.2.6

package/lib/calendar/Calendar.js

@@ -32,16 +32,19 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Components
 var props = {
   show: Boolean,
+  type: (0, _utils.makeStringProp)('single'),
   title: String,
   color: String,
   round: _utils.truthProp,
   readonly: Boolean,
   poppable: _utils.truthProp,
+  maxRange: (0, _utils.makeNumericProp)(null),
+  position: (0, _utils.makeStringProp)('bottom'),
   teleport: [String, Object],
   showMark: _utils.truthProp,
   showTitle: _utils.truthProp,
   formatter: Function,
-  rowHeight: [Number, String],
+  rowHeight: _utils.numericProp,
   confirmText: String,
   rangePrompt: String,
   lazyRender: _utils.truthProp,
@@ -50,21 +53,10 @@ var props = {
   allowSameDay: Boolean,
   showSubtitle: _utils.truthProp,
   closeOnPopstate: _utils.truthProp,
+  showRangePrompt: _utils.truthProp,
   confirmDisabledText: String,
   closeOnClickOverlay: _utils.truthProp,
   safeAreaInsetBottom: _utils.truthProp,
-  type: {
-    type: String,
-    default: 'single'
-  },
-  position: {
-    type: String,
-    default: 'bottom'
-  },
-  maxRange: {
-    type: [Number, String],
-    default: null
-  },
   minDate: {
     type: Date,
     validator: _utils.isDate,
@@ -79,13 +71,9 @@ var props = {
     }
   },
   firstDayOfWeek: {
-    type: [Number, String],
+    type: _utils.numericProp,
     default: 0,
     validator: val => val >= 0 && val <= 6
-  },
-  showRangePrompt: {
-    type: Boolean,
-    default: true
   }
 };
 
@@ -330,7 +318,22 @@ var _default = (0, _vue.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 => (0, _utils2.compareDay)(startDay, day.date) === -1 && (0, _utils2.compareDay)(day.date, date) === -1)) == null ? void 0 : _disabledDays$find.date;
+    }; // disabled calendarDay
+
+
+    var disabledDays = (0, _vue.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) {
@@ -356,7 +359,13 @@ var _default = (0, _vue.defineComponent)({
           var compareToStart = (0, _utils2.compareDay)(date, startDay);
 
           if (compareToStart === 1) {
-            select([startDay, date], true);
+            var disabledDay = getDisabledDate(disabledDays.value, startDay, date);
+
+            if (disabledDay) {
+              select([startDay, (0, _utils2.getPrevDay)(disabledDay)]);
+            } else {
+              select([startDay, date], true);
+            }
           } else if (compareToStart === -1) {
             select([date]);
           } else if (props.allowSameDay) {
@@ -408,18 +417,22 @@ var _default = (0, _vue.defineComponent)({
       }
 
       if (props.showConfirm) {
-        var text = buttonDisabled.value ? props.confirmDisabledText : props.confirmText;
+        var slot = slots['confirm-text'];
+        var disabled = buttonDisabled.value;
+        var text = disabled ? props.confirmDisabledText : props.confirmText;
         return (0, _vue.createVNode)(_button.Button, {
           "round": true,
           "block": true,
           "type": "danger",
           "color": props.color,
           "class": (0, _utils2.bem)('confirm'),
-          "disabled": buttonDisabled.value,
+          "disabled": disabled,
           "nativeType": "button",
           "onClick": onConfirm
         }, {
-          default: () => [text || (0, _utils2.t)('confirm')]
+          default: () => [slot ? slot({
+            disabled
+          }) : text || (0, _utils2.t)('confirm')]
         });
       }
     };
@@ -438,9 +451,7 @@ var _default = (0, _vue.defineComponent)({
       "showTitle": props.showTitle,
       "showSubtitle": props.showSubtitle,
       "firstDayOfWeek": dayOffset.value,
-      "onClick-subtitle": event => {
-        emit('click-subtitle', event);
-      }
+      "onClick-subtitle": event => emit('click-subtitle', event)
     }, (0, _utils.pick)(slots, ['title', 'subtitle'])), (0, _vue.createVNode)("div", {
       "ref": bodyRef,
       "class": (0, _utils2.bem)('body'),
@@ -448,9 +459,7 @@ var _default = (0, _vue.defineComponent)({
     }, [months.value.map(renderMonth)]), renderFooter()]);
 
     (0, _vue.watch)(() => props.show, init);
-    (0, _vue.watch)(() => [props.type, props.minDate, props.maxDate], () => {
-      reset(getInitialDate(currentDate.value));
-    });
+    (0, _vue.watch)(() => [props.type, props.minDate, props.maxDate], () => reset(getInitialDate(currentDate.value)));
     (0, _vue.watch)(() => props.defaultDate, (value = null) => {
       currentDate.value = value;
       scrollIntoView();
@@ -462,7 +471,7 @@ var _default = (0, _vue.defineComponent)({
     (0, _use.onMountedOrActivated)(init);
     return () => {
       if (props.poppable) {
-        return (0, _vue.createVNode)(_popup.Popup, (0, _vue.mergeProps)({
+        return (0, _vue.createVNode)(_popup.Popup, {
           "show": props.show,
           "class": (0, _utils2.bem)('popup'),
           "round": props.round,
@@ -470,11 +479,10 @@ var _default = (0, _vue.defineComponent)({
           "closeable": props.showTitle || props.showSubtitle,
           "teleport": props.teleport,
           "closeOnPopstate": props.closeOnPopstate,
-          "closeOnClickOverlay": props.closeOnClickOverlay
+          "closeOnClickOverlay": props.closeOnClickOverlay,
+          "onUpdate:show": updateShow
         }, {
-          'onUpdate:show': updateShow
-        }), {
-          default: () => [renderCalendar()]
+          default: renderCalendar
         });
       }
 

package/lib/calendar/CalendarDay.d.ts

@@ -1,23 +1,23 @@
 import { PropType } from 'vue';
 import type { CalendarDayItem } from './types';
 declare const _default: import("vue").DefineComponent<{
+    item: {
+        type: PropType<CalendarDayItem>;
+        required: true;
+    };
     color: StringConstructor;
     index: NumberConstructor;
-    rowHeight: StringConstructor;
     offset: {
         type: NumberConstructor;
         default: number;
     };
-    item: {
-        type: PropType<CalendarDayItem>;
-        required: true;
-    };
+    rowHeight: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "click"[], "click", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
+    item?: unknown;
     color?: unknown;
     index?: unknown;
-    rowHeight?: unknown;
     offset?: unknown;
-    item?: unknown;
+    rowHeight?: unknown;
 } & {
     offset: number;
     item: CalendarDayItem;

package/lib/calendar/CalendarDay.js

@@ -14,17 +14,11 @@ var [name] = (0, _utils.createNamespace)('calendar-day');
 var _default = (0, _vue.defineComponent)({
   name,
   props: {
+    item: (0, _utils.makeRequiredProp)(Object),
     color: String,
     index: Number,
-    rowHeight: String,
-    offset: {
-      type: Number,
-      default: 0
-    },
-    item: {
-      type: Object,
-      required: true
-    }
+    offset: (0, _utils.makeNumberProp)(0),
+    rowHeight: String
   },
   emits: ['click'],
 

package/lib/calendar/CalendarMonth.d.ts

@@ -1,21 +1,12 @@
 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;
     };
+    type: PropType<CalendarType>;
+    color: StringConstructor;
     minDate: {
         type: DateConstructor;
         required: true;
@@ -24,11 +15,6 @@ declare const props: {
         type: DateConstructor;
         required: true;
     };
-};
-export declare type CalendarMonthProps = ExtractPropTypes<typeof props>;
-declare const _default: import("vue").DefineComponent<{
-    type: PropType<CalendarType>;
-    color: StringConstructor;
     showMark: BooleanConstructor;
     rowHeight: (NumberConstructor | StringConstructor)[];
     formatter: PropType<(item: CalendarDayItem) => CalendarDayItem>;
@@ -38,10 +24,15 @@ declare const _default: import("vue").DefineComponent<{
     showSubtitle: BooleanConstructor;
     showMonthTitle: BooleanConstructor;
     firstDayOfWeek: NumberConstructor;
+};
+export declare type CalendarMonthProps = ExtractPropTypes<typeof props>;
+declare const _default: import("vue").DefineComponent<{
     date: {
         type: DateConstructor;
         required: true;
     };
+    type: PropType<CalendarType>;
+    color: StringConstructor;
     minDate: {
         type: DateConstructor;
         required: true;
@@ -50,9 +41,21 @@ declare const _default: import("vue").DefineComponent<{
         type: DateConstructor;
         required: true;
     };
+    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;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("click" | "update-height")[], "click" | "update-height", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
+    date?: unknown;
     type?: unknown;
     color?: unknown;
+    minDate?: unknown;
+    maxDate?: unknown;
     showMark?: unknown;
     rowHeight?: unknown;
     formatter?: unknown;
@@ -62,9 +65,6 @@ declare const _default: import("vue").DefineComponent<{
     showSubtitle?: unknown;
     showMonthTitle?: unknown;
     firstDayOfWeek?: unknown;
-    date?: unknown;
-    minDate?: unknown;
-    maxDate?: unknown;
 } & {
     lazyRender: boolean;
     date: Date;

package/lib/calendar/CalendarMonth.js

@@ -26,29 +26,20 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Components
 var [name] = (0, _utils.createNamespace)('calendar-month');
 var props = {
+  date: (0, _utils.makeRequiredProp)(Date),
   type: String,
   color: String,
+  minDate: (0, _utils.makeRequiredProp)(Date),
+  maxDate: (0, _utils.makeRequiredProp)(Date),
   showMark: Boolean,
-  rowHeight: [Number, String],
+  rowHeight: _utils.numericProp,
   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
-  }
+  firstDayOfWeek: Number
 };
 
 var _default = (0, _vue.defineComponent)({
@@ -84,7 +75,7 @@ var _default = (0, _vue.defineComponent)({
       var el = props.showSubtitle ? daysRef.value : monthRef.value;
 
       if (el) {
-        var scrollTop = el.getBoundingClientRect().top - body.getBoundingClientRect().top + body.scrollTop;
+        var scrollTop = (0, _use.useRect)(el).top - (0, _use.useRect)(body).top + body.scrollTop;
         (0, _utils.setScrollTop)(body, scrollTop);
       }
     };
@@ -239,6 +230,7 @@ var _default = (0, _vue.defineComponent)({
 
       return days;
     });
+    var disabledDays = (0, _vue.computed)(() => days.value.filter(day => day.type === 'disabled'));
 
     var renderDay = (item, index) => (0, _vue.createVNode)(_CalendarDay.default, {
       "item": item,
@@ -259,7 +251,8 @@ var _default = (0, _vue.defineComponent)({
       getTitle,
       getHeight: () => height.value,
       setVisible,
-      scrollIntoView
+      scrollIntoView,
+      disabledDays
     });
     return () => (0, _vue.createVNode)("div", {
       "class": (0, _utils3.bem)('month'),

package/lib/calendar/index.css

@@ -1 +1 @@
-:root{--van-calendar-background-color:var(--van-white);--van-calendar-popup-height:80%;--van-calendar-header-box-shadow:0 2px 10px rgba(125, 126, 128, 0.16);--van-calendar-header-title-height:44px;--van-calendar-header-title-font-size:var(--van-font-size-lg);--van-calendar-header-subtitle-font-size:var(--van-font-size-md);--van-calendar-weekdays-height:30px;--van-calendar-weekdays-font-size:var(--van-font-size-sm);--van-calendar-month-title-font-size:var(--van-font-size-md);--van-calendar-month-mark-color:rgba(242, 243, 245, 0.8);--van-calendar-month-mark-font-size:160px;--van-calendar-day-height:64px;--van-calendar-day-font-size:var(--van-font-size-lg);--van-calendar-range-edge-color:var(--van-white);--van-calendar-range-edge-background-color:var(--van-danger-color);--van-calendar-range-middle-color:var(--van-danger-color);--van-calendar-range-middle-background-opacity:0.1;--van-calendar-selected-day-size:54px;--van-calendar-selected-day-color:var(--van-white);--van-calendar-info-font-size:var(--van-font-size-xs);--van-calendar-info-line-height:var(--van-line-height-xs);--van-calendar-selected-day-background-color:var(--van-danger-color);--van-calendar-day-disabled-color:var(--van-gray-5);--van-calendar-confirm-button-height:36px;--van-calendar-confirm-button-margin:7px 0}.van-calendar{display:flex;flex-direction:column;height:100%;background-color:var(--van-calendar-background-color)}.van-calendar__popup.van-popup--bottom,.van-calendar__popup.van-popup--top{height:var(--van-calendar-popup-height)}.van-calendar__popup.van-popup--left,.van-calendar__popup.van-popup--right{height:100%}.van-calendar__popup .van-popup__close-icon{top:11px}.van-calendar__header{flex-shrink:0;box-shadow:var(--van-calendar-header-box-shadow)}.van-calendar__header-subtitle,.van-calendar__header-title,.van-calendar__month-title{height:var(--van-calendar-header-title-height);font-weight:var(--van-font-weight-bold);line-height:var(--van-calendar-header-title-height);text-align:center}.van-calendar__header-title{font-size:var(--van-calendar-header-title-font-size)}.van-calendar__header-subtitle{font-size:var(--van-calendar-header-subtitle-font-size)}.van-calendar__month-title{font-size:var(--van-calendar-month-title-font-size)}.van-calendar__weekdays{display:flex}.van-calendar__weekday{flex:1;font-size:var(--van-calendar-weekdays-font-size);line-height:var(--van-calendar-weekdays-height);text-align:center}.van-calendar__body{flex:1;overflow:auto;-webkit-overflow-scrolling:touch}.van-calendar__days{position:relative;display:flex;flex-wrap:wrap;-webkit-user-select:none;user-select:none}.van-calendar__month-mark{position:absolute;top:50%;left:50%;z-index:0;color:var(--van-calendar-month-mark-color);font-size:var(--van-calendar-month-mark-font-size);transform:translate(-50%,-50%);pointer-events:none}.van-calendar__day,.van-calendar__selected-day{display:flex;align-items:center;justify-content:center;text-align:center}.van-calendar__day{position:relative;width:14.285%;height:var(--van-calendar-day-height);font-size:var(--van-calendar-day-font-size);cursor:pointer}.van-calendar__day--end,.van-calendar__day--multiple-middle,.van-calendar__day--multiple-selected,.van-calendar__day--start,.van-calendar__day--start-end{color:var(--van-calendar-range-edge-color);background-color:var(--van-calendar-range-edge-background-color)}.van-calendar__day--start{border-radius:var(--van-border-radius-md) 0 0 var(--van-border-radius-md)}.van-calendar__day--end{border-radius:0 var(--van-border-radius-md) var(--van-border-radius-md) 0}.van-calendar__day--multiple-selected,.van-calendar__day--start-end{border-radius:var(--van-border-radius-md)}.van-calendar__day--middle{color:var(--van-calendar-range-middle-color)}.van-calendar__day--middle::after{position:absolute;top:0;right:0;bottom:0;left:0;background-color:currentColor;opacity:var(--van-calendar-range-middle-background-opacity);content:''}.van-calendar__day--disabled{color:var(--van-calendar-day-disabled-color);cursor:default}.van-calendar__bottom-info,.van-calendar__top-info{position:absolute;right:0;left:0;font-size:var(--van-calendar-info-font-size);line-height:var(--van-calendar-info-line-height)}@media (max-width:350px){.van-calendar__bottom-info,.van-calendar__top-info{font-size:9px}}.van-calendar__top-info{top:6px}.van-calendar__bottom-info{bottom:6px}.van-calendar__selected-day{width:var(--van-calendar-selected-day-size);height:var(--van-calendar-selected-day-size);color:var(--van-calendar-selected-day-color);background-color:var(--van-calendar-selected-day-background-color);border-radius:var(--van-border-radius-md)}.van-calendar__footer{flex-shrink:0;padding-left:var(--van-padding-md);padding-right:var(--van-padding-md)}.van-calendar__confirm{height:var(--van-calendar-confirm-button-height);margin:var(--van-calendar-confirm-button-margin)}
+:root{--van-calendar-background-color:var(--van-white);--van-calendar-popup-height:80%;--van-calendar-header-box-shadow:0 2px 10px rgba(125, 126, 128, 0.16);--van-calendar-header-title-height:44px;--van-calendar-header-title-font-size:var(--van-font-size-lg);--van-calendar-header-subtitle-font-size:var(--van-font-size-md);--van-calendar-weekdays-height:30px;--van-calendar-weekdays-font-size:var(--van-font-size-sm);--van-calendar-month-title-font-size:var(--van-font-size-md);--van-calendar-month-mark-color:rgba(242, 243, 245, 0.8);--van-calendar-month-mark-font-size:160px;--van-calendar-day-height:64px;--van-calendar-day-font-size:var(--van-font-size-lg);--van-calendar-range-edge-color:var(--van-white);--van-calendar-range-edge-background-color:var(--van-danger-color);--van-calendar-range-middle-color:var(--van-danger-color);--van-calendar-range-middle-background-opacity:0.1;--van-calendar-selected-day-size:54px;--van-calendar-selected-day-color:var(--van-white);--van-calendar-info-font-size:var(--van-font-size-xs);--van-calendar-info-line-height:var(--van-line-height-xs);--van-calendar-selected-day-background-color:var(--van-danger-color);--van-calendar-day-disabled-color:var(--van-gray-5);--van-calendar-confirm-button-height:36px;--van-calendar-confirm-button-margin:7px 0}.van-calendar{display:flex;flex-direction:column;height:100%;background:var(--van-calendar-background-color)}.van-calendar__popup.van-popup--bottom,.van-calendar__popup.van-popup--top{height:var(--van-calendar-popup-height)}.van-calendar__popup.van-popup--left,.van-calendar__popup.van-popup--right{height:100%}.van-calendar__popup .van-popup__close-icon{top:11px}.van-calendar__header{flex-shrink:0;box-shadow:var(--van-calendar-header-box-shadow)}.van-calendar__header-subtitle,.van-calendar__header-title,.van-calendar__month-title{height:var(--van-calendar-header-title-height);font-weight:var(--van-font-weight-bold);line-height:var(--van-calendar-header-title-height);text-align:center}.van-calendar__header-title{font-size:var(--van-calendar-header-title-font-size)}.van-calendar__header-subtitle{font-size:var(--van-calendar-header-subtitle-font-size)}.van-calendar__month-title{font-size:var(--van-calendar-month-title-font-size)}.van-calendar__weekdays{display:flex}.van-calendar__weekday{flex:1;font-size:var(--van-calendar-weekdays-font-size);line-height:var(--van-calendar-weekdays-height);text-align:center}.van-calendar__body{flex:1;overflow:auto;-webkit-overflow-scrolling:touch}.van-calendar__days{position:relative;display:flex;flex-wrap:wrap;-webkit-user-select:none;user-select:none}.van-calendar__month-mark{position:absolute;top:50%;left:50%;z-index:0;color:var(--van-calendar-month-mark-color);font-size:var(--van-calendar-month-mark-font-size);transform:translate(-50%,-50%);pointer-events:none}.van-calendar__day,.van-calendar__selected-day{display:flex;align-items:center;justify-content:center;text-align:center}.van-calendar__day{position:relative;width:14.285%;height:var(--van-calendar-day-height);font-size:var(--van-calendar-day-font-size);cursor:pointer}.van-calendar__day--end,.van-calendar__day--multiple-middle,.van-calendar__day--multiple-selected,.van-calendar__day--start,.van-calendar__day--start-end{color:var(--van-calendar-range-edge-color);background:var(--van-calendar-range-edge-background-color)}.van-calendar__day--start{border-radius:var(--van-border-radius-md) 0 0 var(--van-border-radius-md)}.van-calendar__day--end{border-radius:0 var(--van-border-radius-md) var(--van-border-radius-md) 0}.van-calendar__day--multiple-selected,.van-calendar__day--start-end{border-radius:var(--van-border-radius-md)}.van-calendar__day--middle{color:var(--van-calendar-range-middle-color)}.van-calendar__day--middle::after{position:absolute;top:0;right:0;bottom:0;left:0;background-color:currentColor;opacity:var(--van-calendar-range-middle-background-opacity);content:''}.van-calendar__day--disabled{color:var(--van-calendar-day-disabled-color);cursor:default}.van-calendar__bottom-info,.van-calendar__top-info{position:absolute;right:0;left:0;font-size:var(--van-calendar-info-font-size);line-height:var(--van-calendar-info-line-height)}@media (max-width:350px){.van-calendar__bottom-info,.van-calendar__top-info{font-size:9px}}.van-calendar__top-info{top:6px}.van-calendar__bottom-info{bottom:6px}.van-calendar__selected-day{width:var(--van-calendar-selected-day-size);height:var(--van-calendar-selected-day-size);color:var(--van-calendar-selected-day-color);background:var(--van-calendar-selected-day-background-color);border-radius:var(--van-border-radius-md)}.van-calendar__footer{flex-shrink:0;padding-left:var(--van-padding-md);padding-right:var(--van-padding-md)}.van-calendar__confirm{height:var(--van-calendar-confirm-button-height);margin:var(--van-calendar-confirm-button-margin)}

package/lib/calendar/index.d.ts

@@ -1,5 +1,10 @@
+import { CalendarProps } from './Calendar';
 export declare const Calendar: import("../utils").WithInstall<import("vue").DefineComponent<{
     show: BooleanConstructor;
+    type: {
+        type: import("vue").PropType<import("./types").CalendarType>;
+        default: import("./types").CalendarType;
+    };
     title: StringConstructor;
     color: StringConstructor;
     round: {
@@ -11,6 +16,14 @@ export declare const Calendar: import("../utils").WithInstall<import("vue").Defi
         type: BooleanConstructor;
         default: true;
     };
+    maxRange: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: null;
+    };
+    position: {
+        type: import("vue").PropType<import("..").PopupPosition>;
+        default: import("..").PopupPosition;
+    };
     teleport: import("vue").PropType<string | import("vue").RendererElement | null | undefined>;
     showMark: {
         type: BooleanConstructor;
@@ -42,6 +55,10 @@ export declare const Calendar: import("../utils").WithInstall<import("vue").Defi
         type: BooleanConstructor;
         default: true;
     };
+    showRangePrompt: {
+        type: BooleanConstructor;
+        default: true;
+    };
     confirmDisabledText: StringConstructor;
     closeOnClickOverlay: {
         type: BooleanConstructor;
@@ -51,26 +68,14 @@ export declare const Calendar: import("../utils").WithInstall<import("vue").Defi
         type: BooleanConstructor;
         default: true;
     };
-    type: {
-        type: import("vue").PropType<import("./types").CalendarType>;
-        default: string;
-    };
-    position: {
-        type: import("vue").PropType<import("..").PopupPosition>;
-        default: string;
-    };
-    maxRange: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: null;
-    };
     minDate: {
         type: DateConstructor;
-        validator: typeof import("../utils").isDate;
+        validator: (val: unknown) => val is Date;
         default: () => Date;
     };
     maxDate: {
         type: DateConstructor;
-        validator: typeof import("../utils").isDate;
+        validator: (val: unknown) => val is Date;
         default: () => Date;
     };
     firstDayOfWeek: {
@@ -78,17 +83,16 @@ export declare const Calendar: import("../utils").WithInstall<import("vue").Defi
         default: number;
         validator: (val: number) => boolean;
     };
-    showRangePrompt: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("select" | "update:show" | "confirm" | "click-subtitle" | "unselect" | "month-show" | "over-range")[], "select" | "update:show" | "confirm" | "click-subtitle" | "unselect" | "month-show" | "over-range", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     show?: unknown;
+    type?: unknown;
     title?: unknown;
     color?: unknown;
     round?: unknown;
     readonly?: unknown;
     poppable?: unknown;
+    maxRange?: unknown;
+    position?: unknown;
     teleport?: unknown;
     showMark?: unknown;
     showTitle?: unknown;
@@ -102,16 +106,13 @@ export declare const Calendar: import("../utils").WithInstall<import("vue").Defi
     allowSameDay?: unknown;
     showSubtitle?: unknown;
     closeOnPopstate?: unknown;
+    showRangePrompt?: unknown;
     confirmDisabledText?: unknown;
     closeOnClickOverlay?: unknown;
     safeAreaInsetBottom?: unknown;
-    type?: unknown;
-    position?: unknown;
-    maxRange?: unknown;
     minDate?: unknown;
     maxDate?: unknown;
     firstDayOfWeek?: unknown;
-    showRangePrompt?: unknown;
 } & {
     type: import("./types").CalendarType;
     round: boolean;
@@ -120,19 +121,19 @@ export declare const Calendar: import("../utils").WithInstall<import("vue").Defi
     show: boolean;
     lazyRender: boolean;
     closeOnClickOverlay: boolean;
-    closeOnPopstate: boolean;
     position: import("..").PopupPosition;
+    closeOnPopstate: boolean;
     minDate: Date;
     maxDate: Date;
     poppable: boolean;
+    maxRange: string | number;
     showMark: boolean;
     showTitle: boolean;
     showConfirm: boolean;
     allowSameDay: boolean;
     showSubtitle: boolean;
-    maxRange: string | number;
-    firstDayOfWeek: string | number;
     showRangePrompt: boolean;
+    firstDayOfWeek: string | number;
 } & {
     title?: string | undefined;
     color?: string | undefined;
@@ -159,19 +160,20 @@ export declare const Calendar: import("../utils").WithInstall<import("vue").Defi
     show: boolean;
     lazyRender: boolean;
     closeOnClickOverlay: boolean;
-    closeOnPopstate: boolean;
     position: import("..").PopupPosition;
+    closeOnPopstate: boolean;
     minDate: Date;
     maxDate: Date;
     poppable: boolean;
+    maxRange: string | number;
     showMark: boolean;
     showTitle: boolean;
     showConfirm: boolean;
     allowSameDay: boolean;
     showSubtitle: boolean;
-    maxRange: string | number;
-    firstDayOfWeek: string | number;
     showRangePrompt: boolean;
+    firstDayOfWeek: string | number;
 }>>;
 export default Calendar;
+export type { CalendarProps };
 export type { CalendarType, CalendarDayItem, CalendarDayType, CalendarInstance, } from './types';

package/lib/calendar/index.less

@@ -32,7 +32,7 @@
   display: flex;
   flex-direction: column;
   height: 100%;
-  background-color: var(--van-calendar-background-color);
+  background: var(--van-calendar-background-color);
 
   &__popup {
     &.van-popup--top,
@@ -132,7 +132,7 @@
     &--multiple-middle,
     &--multiple-selected {
       color: var(--van-calendar-range-edge-color);
-      background-color: var(--van-calendar-range-edge-background-color);
+      background: var(--van-calendar-range-edge-background-color);
     }
 
     &--start {
@@ -194,7 +194,7 @@
     width: var(--van-calendar-selected-day-size);
     height: var(--van-calendar-selected-day-size);
     color: var(--van-calendar-selected-day-color);
-    background-color: var(--van-calendar-selected-day-background-color);
+    background: var(--van-calendar-selected-day-background-color);
     border-radius: var(--van-border-radius-md);
   }
 

package/lib/calendar/types.d.ts

@@ -1,4 +1,4 @@
-import type { ComponentPublicInstance } from 'vue';
+import type { ComponentPublicInstance, ComputedRef, Ref } from 'vue';
 import type { CalendarProps } from './Calendar';
 import type { CalendarMonthProps } from './CalendarMonth';
 export declare type CalendarType = 'single' | 'range' | 'multiple';
@@ -22,4 +22,5 @@ export declare type CalendarMonthInstance = ComponentPublicInstance<CalendarMont
     getHeight: () => number;
     setVisible: (value?: boolean | undefined) => void;
     scrollIntoView: (body: Element) => void;
+    disabledDays: Ref<ComputedRef<CalendarDayItem[]>>;
 }>;

package/lib/calendar/utils.d.ts

@@ -1,6 +1,6 @@
-declare const name: string, bem: (el?: import("../utils/create/bem").Mods | undefined, mods?: import("../utils/create/bem").Mods | undefined) => import("../utils/create/bem").Mods, t: (path: string, ...args: any[]) => any;
+declare const name: string, bem: (el?: import("../utils").Mods | undefined, mods?: import("../utils").Mods | undefined) => import("../utils").Mods, t: (path: string, ...args: any[]) => any;
 export { name, bem, t };
-export declare function formatMonthTitle(date: Date): any;
+export declare const formatMonthTitle: (date: Date) => any;
 export declare function compareMonth(date1: Date, date2: Date): 0 | 1 | -1;
 export declare function compareDay(day1: Date, day2: Date): 0 | 1 | -1;
 export declare const cloneDate: (date: Date) => Date;

package/lib/calendar/utils.js

@@ -1,12 +1,14 @@
 "use strict";
 
 exports.__esModule = true;
-exports.formatMonthTitle = formatMonthTitle;
-exports.compareMonth = compareMonth;
+exports.bem = void 0;
+exports.calcDateNum = calcDateNum;
+exports.cloneDates = exports.cloneDate = void 0;
 exports.compareDay = compareDay;
+exports.compareMonth = compareMonth;
+exports.formatMonthTitle = void 0;
 exports.getDayByOffset = getDayByOffset;
-exports.calcDateNum = calcDateNum;
-exports.getToday = exports.getNextDay = exports.getPrevDay = exports.cloneDates = exports.cloneDate = exports.t = exports.bem = exports.name = void 0;
+exports.t = exports.name = exports.getToday = exports.getPrevDay = exports.getNextDay = void 0;
 
 var _utils = require("../utils");
 
@@ -15,9 +17,9 @@ exports.t = t;
 exports.bem = bem;
 exports.name = name;
 
-function formatMonthTitle(date) {
-  return t('monthTitle', date.getFullYear(), date.getMonth() + 1);
-}
+var formatMonthTitle = date => t('monthTitle', date.getFullYear(), date.getMonth() + 1);
+
+exports.formatMonthTitle = formatMonthTitle;
 
 function compareMonth(date1, date2) {
   var year1 = date1.getFullYear();

package/lib/card/Card.d.ts

@@ -7,12 +7,12 @@ declare const _default: import("vue").DefineComponent<{
     price: (NumberConstructor | StringConstructor)[];
     centered: BooleanConstructor;
     lazyLoad: BooleanConstructor;
-    thumbLink: StringConstructor;
-    originPrice: (NumberConstructor | StringConstructor)[];
     currency: {
-        type: StringConstructor;
+        type: import("vue").PropType<string>;
         default: string;
     };
+    thumbLink: StringConstructor;
+    originPrice: (NumberConstructor | StringConstructor)[];
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "click-thumb"[], "click-thumb", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     tag?: unknown;
     num?: unknown;
@@ -22,9 +22,9 @@ declare const _default: import("vue").DefineComponent<{
     price?: unknown;
     centered?: unknown;
     lazyLoad?: unknown;
+    currency?: unknown;
     thumbLink?: unknown;
     originPrice?: unknown;
-    currency?: unknown;
 } & {
     lazyLoad: boolean;
     centered: boolean;

package/lib/card/Card.js

@@ -19,19 +19,16 @@ var _default = (0, _vue.defineComponent)({
   name,
   props: {
     tag: String,
-    num: [Number, String],
+    num: _utils.numericProp,
     desc: String,
     thumb: String,
     title: String,
-    price: [Number, String],
+    price: _utils.numericProp,
     centered: Boolean,
     lazyLoad: Boolean,
+    currency: (0, _utils.makeStringProp)('¥'),
     thumbLink: String,
-    originPrice: [Number, String],
-    currency: {
-      type: String,
-      default: '¥'
-    }
+    originPrice: _utils.numericProp
   },
   emits: ['click-thumb'],