vant 3.2.4 → 3.2.5

package/es/button/index.d.ts

@@ -3,8 +3,20 @@ export declare const Button: import("../utils").WithInstall<import("vue").Define
     url: StringConstructor;
     replace: BooleanConstructor;
 } & {
+    tag: {
+        type: import("vue").PropType<keyof HTMLElementTagNameMap>;
+        default: keyof HTMLElementTagNameMap;
+    };
     text: StringConstructor;
     icon: StringConstructor;
+    type: {
+        type: import("vue").PropType<import("./Button").ButtonType>;
+        default: import("./Button").ButtonType;
+    };
+    size: {
+        type: import("vue").PropType<import("./Button").ButtonSize>;
+        default: import("./Button").ButtonSize;
+    };
     color: StringConstructor;
     block: BooleanConstructor;
     plain: BooleanConstructor;
@@ -14,35 +26,26 @@ export declare const Button: import("../utils").WithInstall<import("vue").Define
     hairline: BooleanConstructor;
     disabled: BooleanConstructor;
     iconPrefix: StringConstructor;
+    nativeType: {
+        type: import("vue").PropType<import("./Button").ButtonNativeType>;
+        default: import("./Button").ButtonNativeType;
+    };
     loadingSize: (NumberConstructor | StringConstructor)[];
     loadingText: StringConstructor;
     loadingType: import("vue").PropType<import("..").LoadingType>;
-    tag: {
-        type: import("vue").PropType<keyof HTMLElementTagNameMap>;
-        default: string;
-    };
-    type: {
-        type: import("vue").PropType<import("./Button").ButtonType>;
-        default: string;
-    };
-    size: {
-        type: import("vue").PropType<import("./Button").ButtonSize>;
-        default: string;
-    };
-    nativeType: {
-        type: import("vue").PropType<"button" | "submit" | "reset" | undefined>;
-        default: string;
-    };
     iconPosition: {
-        type: import("vue").PropType<"left" | "right">;
-        default: string;
+        type: import("vue").PropType<import("./Button").ButtonIconPosition>;
+        default: import("./Button").ButtonIconPosition;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "click"[], "click", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     to?: unknown;
     url?: unknown;
     replace?: unknown;
+    tag?: unknown;
     text?: unknown;
     icon?: unknown;
+    type?: unknown;
+    size?: unknown;
     color?: unknown;
     block?: unknown;
     plain?: unknown;
@@ -52,13 +55,10 @@ export declare const Button: import("../utils").WithInstall<import("vue").Define
     hairline?: unknown;
     disabled?: unknown;
     iconPrefix?: unknown;
+    nativeType?: unknown;
     loadingSize?: unknown;
     loadingText?: unknown;
     loadingType?: unknown;
-    tag?: unknown;
-    type?: unknown;
-    size?: unknown;
-    nativeType?: unknown;
     iconPosition?: unknown;
 } & {
     replace: boolean;
@@ -72,8 +72,8 @@ export declare const Button: import("../utils").WithInstall<import("vue").Define
     square: boolean;
     plain: boolean;
     hairline: boolean;
-    nativeType: "button" | "submit" | "reset" | undefined;
-    iconPosition: "left" | "right";
+    nativeType: import("./Button").ButtonNativeType;
+    iconPosition: import("./Button").ButtonIconPosition;
 } & {
     text?: string | undefined;
     url?: string | undefined;
@@ -98,8 +98,8 @@ export declare const Button: import("../utils").WithInstall<import("vue").Define
     square: boolean;
     plain: boolean;
     hairline: boolean;
-    nativeType: "button" | "submit" | "reset" | undefined;
-    iconPosition: "left" | "right";
+    nativeType: import("./Button").ButtonNativeType;
+    iconPosition: import("./Button").ButtonIconPosition;
 }>>;
 export default Button;
-export type { ButtonType, ButtonSize } from './Button';
+export type { ButtonType, ButtonSize, ButtonNativeType, ButtonIconPosition, } from './Button';

package/es/calendar/Calendar.d.ts

@@ -1,9 +1,12 @@
 import { PropType, ExtractPropTypes } from 'vue';
-import { isDate } from '../utils';
 import { PopupPosition } from '../popup';
 import type { CalendarType, CalendarDayItem } from './types';
 declare const props: {
     show: BooleanConstructor;
+    type: {
+        type: PropType<CalendarType>;
+        default: CalendarType;
+    };
     title: StringConstructor;
     color: StringConstructor;
     round: {
@@ -15,6 +18,14 @@ declare const props: {
         type: BooleanConstructor;
         default: true;
     };
+    maxRange: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: null;
+    };
+    position: {
+        type: PropType<PopupPosition>;
+        default: PopupPosition;
+    };
     teleport: PropType<string | import("vue").RendererElement | null | undefined>;
     showMark: {
         type: BooleanConstructor;
@@ -46,6 +57,10 @@ declare const props: {
         type: BooleanConstructor;
         default: true;
     };
+    showRangePrompt: {
+        type: BooleanConstructor;
+        default: true;
+    };
     confirmDisabledText: StringConstructor;
     closeOnClickOverlay: {
         type: BooleanConstructor;
@@ -55,26 +70,14 @@ declare const props: {
         type: BooleanConstructor;
         default: true;
     };
-    type: {
-        type: PropType<CalendarType>;
-        default: string;
-    };
-    position: {
-        type: PropType<PopupPosition>;
-        default: string;
-    };
-    maxRange: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: null;
-    };
     minDate: {
         type: DateConstructor;
-        validator: typeof isDate;
+        validator: (val: unknown) => val is Date;
         default: () => Date;
     };
     maxDate: {
         type: DateConstructor;
-        validator: typeof isDate;
+        validator: (val: unknown) => val is Date;
         default: () => Date;
     };
     firstDayOfWeek: {
@@ -82,14 +85,14 @@ declare const props: {
         default: number;
         validator: (val: number) => boolean;
     };
-    showRangePrompt: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
 };
 export declare type CalendarProps = ExtractPropTypes<typeof props>;
 declare const _default: import("vue").DefineComponent<{
     show: BooleanConstructor;
+    type: {
+        type: PropType<CalendarType>;
+        default: CalendarType;
+    };
     title: StringConstructor;
     color: StringConstructor;
     round: {
@@ -101,6 +104,14 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    maxRange: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: null;
+    };
+    position: {
+        type: PropType<PopupPosition>;
+        default: PopupPosition;
+    };
     teleport: PropType<string | import("vue").RendererElement | null | undefined>;
     showMark: {
         type: BooleanConstructor;
@@ -132,6 +143,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    showRangePrompt: {
+        type: BooleanConstructor;
+        default: true;
+    };
     confirmDisabledText: StringConstructor;
     closeOnClickOverlay: {
         type: BooleanConstructor;
@@ -141,26 +156,14 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    type: {
-        type: PropType<CalendarType>;
-        default: string;
-    };
-    position: {
-        type: PropType<PopupPosition>;
-        default: string;
-    };
-    maxRange: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: null;
-    };
     minDate: {
         type: DateConstructor;
-        validator: typeof isDate;
+        validator: (val: unknown) => val is Date;
         default: () => Date;
     };
     maxDate: {
         type: DateConstructor;
-        validator: typeof isDate;
+        validator: (val: unknown) => val is Date;
         default: () => Date;
     };
     firstDayOfWeek: {
@@ -168,17 +171,16 @@ declare const _default: import("vue").DefineComponent<{
         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;
@@ -192,16 +194,13 @@ declare const _default: import("vue").DefineComponent<{
     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: CalendarType;
     round: boolean;
@@ -210,19 +209,19 @@ declare const _default: import("vue").DefineComponent<{
     show: boolean;
     lazyRender: boolean;
     closeOnClickOverlay: boolean;
-    closeOnPopstate: boolean;
     position: 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;
@@ -249,18 +248,18 @@ declare const _default: import("vue").DefineComponent<{
     show: boolean;
     lazyRender: boolean;
     closeOnClickOverlay: boolean;
-    closeOnPopstate: boolean;
     position: 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 _default;

package/es/calendar/Calendar.js

@@ -1,7 +1,7 @@
 import { createVNode as _createVNode, mergeProps as _mergeProps, resolveDirective as _resolveDirective } from "vue";
 import { ref, watch, computed, defineComponent } from 'vue'; // Utils
 
-import { pick, isDate, truthProp, getScrollTop } from '../utils';
+import { pick, isDate, truthProp, numericProp, getScrollTop, makeStringProp, makeNumericProp } from '../utils';
 import { t, bem, name, getToday, cloneDate, cloneDates, getPrevDay, getNextDay, compareDay, calcDateNum, compareMonth, getDayByOffset } from './utils'; // Composables
 
 import { raf, useRect, onMountedOrActivated } from '@vant/use';
@@ -16,16 +16,19 @@ import CalendarHeader from './CalendarHeader'; // Types
 
 var props = {
   show: Boolean,
+  type: makeStringProp('single'),
   title: String,
   color: String,
   round: truthProp,
   readonly: Boolean,
   poppable: truthProp,
+  maxRange: makeNumericProp(null),
+  position: makeStringProp('bottom'),
   teleport: [String, Object],
   showMark: truthProp,
   showTitle: truthProp,
   formatter: Function,
-  rowHeight: [Number, String],
+  rowHeight: numericProp,
   confirmText: String,
   rangePrompt: String,
   lazyRender: truthProp,
@@ -34,21 +37,10 @@ var props = {
   allowSameDay: Boolean,
   showSubtitle: truthProp,
   closeOnPopstate: truthProp,
+  showRangePrompt: truthProp,
   confirmDisabledText: String,
   closeOnClickOverlay: truthProp,
   safeAreaInsetBottom: truthProp,
-  type: {
-    type: String,
-    default: 'single'
-  },
-  position: {
-    type: String,
-    default: 'bottom'
-  },
-  maxRange: {
-    type: [Number, String],
-    default: null
-  },
   minDate: {
     type: Date,
     validator: isDate,
@@ -63,13 +55,9 @@ var props = {
     }
   },
   firstDayOfWeek: {
-    type: [Number, String],
+    type: numericProp,
     default: 0,
     validator: val => val >= 0 && val <= 6
-  },
-  showRangePrompt: {
-    type: Boolean,
-    default: true
   }
 };
 export default defineComponent({
@@ -357,8 +345,7 @@ export default defineComponent({
             var disabledDay = getDisabledDate(disabledDays.value, startDay, date);
 
             if (disabledDay) {
-              var lastAbledEndDay = getPrevDay(disabledDay);
-              select([startDay, lastAbledEndDay]);
+              select([startDay, getPrevDay(disabledDay)]);
             } else {
               select([startDay, date], true);
             }
@@ -443,9 +430,7 @@ export default defineComponent({
       "showTitle": props.showTitle,
       "showSubtitle": props.showSubtitle,
       "firstDayOfWeek": dayOffset.value,
-      "onClick-subtitle": event => {
-        emit('click-subtitle', event);
-      }
+      "onClick-subtitle": event => emit('click-subtitle', event)
     }, pick(slots, ['title', 'subtitle'])), _createVNode("div", {
       "ref": bodyRef,
       "class": bem('body'),
@@ -453,9 +438,7 @@ export default defineComponent({
     }, [months.value.map(renderMonth)]), renderFooter()]);
 
     watch(() => props.show, init);
-    watch(() => [props.type, props.minDate, props.maxDate], () => {
-      reset(getInitialDate(currentDate.value));
-    });
+    watch(() => [props.type, props.minDate, props.maxDate], () => reset(getInitialDate(currentDate.value)));
     watch(() => props.defaultDate, (value = null) => {
       currentDate.value = value;
       scrollIntoView();

package/es/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/es/calendar/CalendarDay.js

@@ -1,22 +1,16 @@
 import { createVNode as _createVNode } from "vue";
 import { computed, defineComponent } from 'vue';
-import { createNamespace } from '../utils';
+import { makeNumberProp, createNamespace, makeRequiredProp } from '../utils';
 import { bem } from './utils';
 var [name] = createNamespace('calendar-day');
 export default defineComponent({
   name,
   props: {
+    item: makeRequiredProp(Object),
     color: String,
     index: Number,
-    rowHeight: String,
-    offset: {
-      type: Number,
-      default: 0
-    },
-    item: {
-      type: Object,
-      required: true
-    }
+    offset: makeNumberProp(0),
+    rowHeight: String
   },
   emits: ['click'],
 

package/es/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/es/calendar/CalendarMonth.js

@@ -1,11 +1,11 @@
 import { resolveDirective as _resolveDirective, createVNode as _createVNode } from "vue";
 import { ref, computed, defineComponent } from 'vue'; // Utils
 
-import { addUnit, setScrollTop, createNamespace, pick } from '../utils';
+import { pick, addUnit, numericProp, setScrollTop, createNamespace, makeRequiredProp } from '../utils';
 import { getMonthEndDay } from '../datetime-picker/utils';
 import { t, bem, compareDay, getPrevDay, getNextDay, formatMonthTitle } from './utils'; // Composables
 
-import { useToggle } from '@vant/use';
+import { useRect, useToggle } from '@vant/use';
 import { useExpose } from '../composables/use-expose';
 import { useHeight } from '../composables/use-height'; // Components
 
@@ -13,29 +13,20 @@ import CalendarDay from './CalendarDay'; // Types
 
 var [name] = createNamespace('calendar-month');
 var props = {
+  date: makeRequiredProp(Date),
   type: String,
   color: String,
+  minDate: makeRequiredProp(Date),
+  maxDate: makeRequiredProp(Date),
   showMark: Boolean,
-  rowHeight: [Number, String],
+  rowHeight: 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
 };
 export default defineComponent({
   name,
@@ -70,7 +61,7 @@ export default defineComponent({
       var el = props.showSubtitle ? daysRef.value : monthRef.value;
 
       if (el) {
-        var scrollTop = el.getBoundingClientRect().top - body.getBoundingClientRect().top + body.scrollTop;
+        var scrollTop = useRect(el).top - useRect(body).top + body.scrollTop;
         setScrollTop(body, scrollTop);
       }
     };