vant 3.2.4 → 3.2.5

package/es/checkbox/Checker.js

@@ -1,30 +1,24 @@
 import { createVNode as _createVNode } from "vue";
 import { ref, computed, defineComponent } from 'vue';
-import { addUnit, extend, unknownProp, truthProp } from '../utils';
+import { extend, addUnit, truthProp, numericProp, unknownProp, makeStringProp, makeRequiredProp } from '../utils';
 import { Icon } from '../icon';
 export var checkerProps = {
   name: unknownProp,
+  shape: makeStringProp('round'),
   disabled: Boolean,
-  iconSize: [Number, String],
+  iconSize: numericProp,
   modelValue: unknownProp,
   checkedColor: String,
   labelPosition: String,
-  labelDisabled: Boolean,
-  shape: {
-    type: String,
-    default: 'round'
-  }
+  labelDisabled: Boolean
 };
 export default defineComponent({
   props: extend({}, checkerProps, {
+    bem: makeRequiredProp(Function),
     role: String,
     parent: Object,
     checked: Boolean,
-    bindGroup: truthProp,
-    bem: {
-      type: Function,
-      required: true
-    }
+    bindGroup: truthProp
   }),
   emits: ['click', 'toggle'],
 

package/es/checkbox/index.d.ts

@@ -1,16 +1,16 @@
 import { CheckboxProps } from './Checkbox';
 export declare const Checkbox: import("../utils").WithInstall<import("vue").DefineComponent<{
     name: import("vue").PropType<unknown>;
+    shape: {
+        type: import("vue").PropType<import("./Checker").CheckerShape>;
+        default: import("./Checker").CheckerShape;
+    };
     disabled: BooleanConstructor;
     iconSize: (NumberConstructor | StringConstructor)[];
     modelValue: import("vue").PropType<unknown>;
     checkedColor: StringConstructor;
     labelPosition: import("vue").PropType<import("./Checker").CheckerLabelPosition>;
     labelDisabled: BooleanConstructor;
-    shape: {
-        type: import("vue").PropType<import("./Checker").CheckerShape>;
-        default: string;
-    };
 } & {
     bindGroup: {
         type: BooleanConstructor;
@@ -18,13 +18,13 @@ export declare const Checkbox: import("../utils").WithInstall<import("vue").Defi
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "change")[], "update:modelValue" | "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     name?: unknown;
+    shape?: unknown;
     disabled?: unknown;
     iconSize?: unknown;
     modelValue?: unknown;
     checkedColor?: unknown;
     labelPosition?: unknown;
     labelDisabled?: unknown;
-    shape?: unknown;
     bindGroup?: unknown;
 } & {
     disabled: boolean;

package/es/checkbox-group/CheckboxGroup.d.ts

@@ -4,33 +4,33 @@ import type { CheckboxGroupProvide } from './types';
 declare const props: {
     max: (NumberConstructor | StringConstructor)[];
     disabled: BooleanConstructor;
-    direction: PropType<CheckerDirection>;
     iconSize: (NumberConstructor | StringConstructor)[];
-    checkedColor: StringConstructor;
+    direction: PropType<CheckerDirection>;
     modelValue: {
         type: PropType<unknown[]>;
         default: () => never[];
     };
+    checkedColor: StringConstructor;
 };
 export declare type CheckboxGroupProps = ExtractPropTypes<typeof props>;
 export declare const CHECKBOX_GROUP_KEY: InjectionKey<CheckboxGroupProvide>;
 declare const _default: import("vue").DefineComponent<{
     max: (NumberConstructor | StringConstructor)[];
     disabled: BooleanConstructor;
-    direction: PropType<CheckerDirection>;
     iconSize: (NumberConstructor | StringConstructor)[];
-    checkedColor: StringConstructor;
+    direction: PropType<CheckerDirection>;
     modelValue: {
         type: PropType<unknown[]>;
         default: () => never[];
     };
+    checkedColor: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "change")[], "update:modelValue" | "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     max?: unknown;
     disabled?: unknown;
-    direction?: unknown;
     iconSize?: unknown;
-    checkedColor?: unknown;
+    direction?: unknown;
     modelValue?: unknown;
+    checkedColor?: unknown;
 } & {
     disabled: boolean;
     modelValue: unknown[];

package/es/checkbox-group/CheckboxGroup.js

@@ -1,22 +1,19 @@
 import { createVNode as _createVNode } from "vue";
 import { watch, defineComponent } from 'vue'; // Utils
 
-import { createNamespace } from '../utils'; // Composables
+import { numericProp, createNamespace, makeArrayProp } from '../utils'; // Composables
 
 import { useChildren, useCustomFieldValue } from '@vant/use';
 import { useExpose } from '../composables/use-expose'; // Types
 
 var [name, bem] = createNamespace('checkbox-group');
 var props = {
-  max: [Number, String],
+  max: numericProp,
   disabled: Boolean,
+  iconSize: numericProp,
   direction: String,
-  iconSize: [Number, String],
-  checkedColor: String,
-  modelValue: {
-    type: Array,
-    default: () => []
-  }
+  modelValue: makeArrayProp(),
+  checkedColor: String
 };
 export var CHECKBOX_GROUP_KEY = Symbol(name);
 export default defineComponent({

package/es/checkbox-group/index.d.ts

@@ -2,20 +2,20 @@ import { CheckboxGroupProps } from './CheckboxGroup';
 export declare const CheckboxGroup: import("../utils").WithInstall<import("vue").DefineComponent<{
     max: (NumberConstructor | StringConstructor)[];
     disabled: BooleanConstructor;
-    direction: import("vue").PropType<import("../checkbox/Checker").CheckerDirection>;
     iconSize: (NumberConstructor | StringConstructor)[];
-    checkedColor: StringConstructor;
+    direction: import("vue").PropType<import("../checkbox/Checker").CheckerDirection>;
     modelValue: {
         type: import("vue").PropType<unknown[]>;
         default: () => never[];
     };
+    checkedColor: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "change")[], "update:modelValue" | "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     max?: unknown;
     disabled?: unknown;
-    direction?: unknown;
     iconSize?: unknown;
-    checkedColor?: unknown;
+    direction?: unknown;
     modelValue?: unknown;
+    checkedColor?: unknown;
 } & {
     disabled: boolean;
     modelValue: unknown[];

package/es/circle/Circle.d.ts

@@ -3,57 +3,57 @@ export declare type CircleStartPosition = 'top' | 'right' | 'bottom' | 'left';
 declare const _default: import("vue").DefineComponent<{
     text: StringConstructor;
     size: (NumberConstructor | StringConstructor)[];
-    color: PropType<string | Record<string, string>>;
-    clockwise: {
-        type: BooleanConstructor;
-        default: true;
+    fill: {
+        type: PropType<string>;
+        default: string;
     };
-    layerColor: StringConstructor;
-    strokeLinecap: PropType<CanvasLineCap>;
-    currentRate: {
-        type: NumberConstructor;
+    rate: {
+        type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
     speed: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    fill: {
-        type: StringConstructor;
-        default: string;
+    color: PropType<string | Record<string, string>>;
+    clockwise: {
+        type: BooleanConstructor;
+        default: true;
     };
-    rate: {
-        type: (NumberConstructor | StringConstructor)[];
+    layerColor: StringConstructor;
+    currentRate: {
+        type: NumberConstructor;
         default: number;
     };
     strokeWidth: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+    strokeLinecap: PropType<CanvasLineCap>;
     startPosition: {
         type: PropType<CircleStartPosition>;
-        default: string;
+        default: CircleStartPosition;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:currentRate"[], "update:currentRate", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     text?: unknown;
     size?: unknown;
+    fill?: unknown;
+    rate?: unknown;
+    speed?: unknown;
     color?: unknown;
     clockwise?: unknown;
     layerColor?: unknown;
-    strokeLinecap?: unknown;
     currentRate?: unknown;
-    speed?: unknown;
-    fill?: unknown;
-    rate?: unknown;
     strokeWidth?: unknown;
+    strokeLinecap?: unknown;
     startPosition?: unknown;
 } & {
     fill: string;
     strokeWidth: string | number;
+    rate: string | number;
+    speed: string | number;
     clockwise: boolean;
     currentRate: number;
-    speed: string | number;
-    rate: string | number;
     startPosition: CircleStartPosition;
 } & {
     text?: string | undefined;
@@ -66,10 +66,10 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     fill: string;
     strokeWidth: string | number;
+    rate: string | number;
+    speed: string | number;
     clockwise: boolean;
     currentRate: number;
-    speed: string | number;
-    rate: string | number;
     startPosition: CircleStartPosition;
 }>;
 export default _default;

package/es/circle/Circle.js

@@ -1,13 +1,11 @@
 import { createVNode as _createVNode } from "vue";
 import { watch, computed, defineComponent } from 'vue';
 import { raf, cancelRaf } from '@vant/use';
-import { isObject, getSizeStyle, truthProp, createNamespace } from '../utils';
+import { isObject, truthProp, numericProp, getSizeStyle, makeStringProp, makeNumberProp, makeNumericProp, createNamespace } from '../utils';
 var [name, bem] = createNamespace('circle');
 var uid = 0;
 
-function format(rate) {
-  return Math.min(Math.max(+rate, 0), 100);
-}
+var format = rate => Math.min(Math.max(+rate, 0), 100);
 
 function getPath(clockwise, viewBoxSize) {
   var sweepFlag = clockwise ? 1 : 0;
@@ -18,35 +16,17 @@ export default defineComponent({
   name,
   props: {
     text: String,
-    size: [Number, String],
+    size: numericProp,
+    fill: makeStringProp('none'),
+    rate: makeNumericProp(100),
+    speed: makeNumericProp(0),
     color: [String, Object],
     clockwise: truthProp,
     layerColor: String,
+    currentRate: makeNumberProp(0),
+    strokeWidth: makeNumericProp(40),
     strokeLinecap: String,
-    currentRate: {
-      type: Number,
-      default: 0
-    },
-    speed: {
-      type: [Number, String],
-      default: 0
-    },
-    fill: {
-      type: String,
-      default: 'none'
-    },
-    rate: {
-      type: [Number, String],
-      default: 100
-    },
-    strokeWidth: {
-      type: [Number, String],
-      default: 40
-    },
-    startPosition: {
-      type: String,
-      default: 'top'
-    }
+    startPosition: makeStringProp('top')
   },
   emits: ['update:currentRate'],
 

package/es/circle/index.d.ts

@@ -1,57 +1,57 @@
 export declare const Circle: import("../utils").WithInstall<import("vue").DefineComponent<{
     text: StringConstructor;
     size: (NumberConstructor | StringConstructor)[];
-    color: import("vue").PropType<string | Record<string, string>>;
-    clockwise: {
-        type: BooleanConstructor;
-        default: true;
+    fill: {
+        type: import("vue").PropType<string>;
+        default: string;
     };
-    layerColor: StringConstructor;
-    strokeLinecap: import("vue").PropType<CanvasLineCap>;
-    currentRate: {
-        type: NumberConstructor;
+    rate: {
+        type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
     speed: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    fill: {
-        type: StringConstructor;
-        default: string;
+    color: import("vue").PropType<string | Record<string, string>>;
+    clockwise: {
+        type: BooleanConstructor;
+        default: true;
     };
-    rate: {
-        type: (NumberConstructor | StringConstructor)[];
+    layerColor: StringConstructor;
+    currentRate: {
+        type: NumberConstructor;
         default: number;
     };
     strokeWidth: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+    strokeLinecap: import("vue").PropType<CanvasLineCap>;
     startPosition: {
         type: import("vue").PropType<import("./Circle").CircleStartPosition>;
-        default: string;
+        default: import("./Circle").CircleStartPosition;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:currentRate"[], "update:currentRate", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     text?: unknown;
     size?: unknown;
+    fill?: unknown;
+    rate?: unknown;
+    speed?: unknown;
     color?: unknown;
     clockwise?: unknown;
     layerColor?: unknown;
-    strokeLinecap?: unknown;
     currentRate?: unknown;
-    speed?: unknown;
-    fill?: unknown;
-    rate?: unknown;
     strokeWidth?: unknown;
+    strokeLinecap?: unknown;
     startPosition?: unknown;
 } & {
     fill: string;
     strokeWidth: string | number;
+    rate: string | number;
+    speed: string | number;
     clockwise: boolean;
     currentRate: number;
-    speed: string | number;
-    rate: string | number;
     startPosition: import("./Circle").CircleStartPosition;
 } & {
     text?: string | undefined;
@@ -64,10 +64,10 @@ export declare const Circle: import("../utils").WithInstall<import("vue").Define
 }, {
     fill: string;
     strokeWidth: string | number;
+    rate: string | number;
+    speed: string | number;
     clockwise: boolean;
     currentRate: number;
-    speed: string | number;
-    rate: string | number;
     startPosition: import("./Circle").CircleStartPosition;
 }>>;
 export default Circle;

package/es/col/Col.d.ts

@@ -1,18 +1,17 @@
-import { PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
-    offset: (NumberConstructor | StringConstructor)[];
     tag: {
-        type: PropType<keyof HTMLElementTagNameMap>;
-        default: string;
+        type: import("vue").PropType<keyof HTMLElementTagNameMap>;
+        default: keyof HTMLElementTagNameMap;
     };
     span: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+    offset: (NumberConstructor | StringConstructor)[];
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
-    offset?: unknown;
     tag?: unknown;
     span?: unknown;
+    offset?: unknown;
 } & {
     span: string | number;
     tag: keyof HTMLElementTagNameMap;

package/es/col/Col.js

@@ -1,21 +1,15 @@
 import { createVNode as _createVNode } from "vue";
 import { computed, defineComponent } from 'vue';
-import { createNamespace } from '../utils';
+import { numericProp, createNamespace, makeNumericProp, makeStringProp } from '../utils';
 import { useParent } from '@vant/use';
 import { ROW_KEY } from '../row/Row';
 var [name, bem] = createNamespace('col');
 export default defineComponent({
   name,
   props: {
-    offset: [Number, String],
-    tag: {
-      type: String,
-      default: 'div'
-    },
-    span: {
-      type: [Number, String],
-      default: 0
-    }
+    tag: makeStringProp('div'),
+    span: makeNumericProp(0),
+    offset: numericProp
   },
 
   setup(props, {

package/es/col/index.d.ts

@@ -1,17 +1,17 @@
 export declare const Col: import("../utils").WithInstall<import("vue").DefineComponent<{
-    offset: (NumberConstructor | StringConstructor)[];
     tag: {
         type: import("vue").PropType<keyof HTMLElementTagNameMap>;
-        default: string;
+        default: keyof HTMLElementTagNameMap;
     };
     span: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+    offset: (NumberConstructor | StringConstructor)[];
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
-    offset?: unknown;
     tag?: unknown;
     span?: unknown;
+    offset?: unknown;
 } & {
     span: string | number;
     tag: keyof HTMLElementTagNameMap;

package/es/collapse-item/CollapseItem.js

@@ -2,7 +2,7 @@ import { withDirectives as _withDirectives, vShow as _vShow, createVNode as _cre
 import { ref, watch, computed, nextTick, defineComponent } from 'vue'; // Utils
 
 import { cellProps } from '../cell/Cell';
-import { createNamespace, extend, pick, truthProp } from '../utils';
+import { pick, extend, truthProp, numericProp, createNamespace } from '../utils';
 import { COLLAPSE_KEY } from '../collapse/Collapse'; // Composables
 
 import { raf, doubleRaf, useParent } from '@vant/use';
@@ -13,7 +13,7 @@ import { Cell } from '../cell';
 var [name, bem] = createNamespace('collapse-item');
 var CELL_SLOTS = ['icon', 'title', 'value', 'label', 'right-icon'];
 var props = extend({}, cellProps, {
-  name: [Number, String],
+  name: numericProp,
   isLink: truthProp,
   disabled: Boolean,
   readonly: Boolean

package/es/composables/use-lock-scroll.js

@@ -1,5 +1,5 @@
 import { watch, onBeforeUnmount, onDeactivated } from 'vue';
-import { getScrollParent, supportsPassive, onMountedOrActivated } from '@vant/use';
+import { getScrollParent, onMountedOrActivated } from '@vant/use';
 import { useTouch } from './use-touch';
 import { preventDefault } from '../utils';
 var totalLockCount = 0;
@@ -31,9 +31,9 @@ export function useLockScroll(rootRef, shouldLock) {
 
   var lock = () => {
     document.addEventListener('touchstart', touch.start);
-    document.addEventListener('touchmove', onTouchMove, supportsPassive ? {
+    document.addEventListener('touchmove', onTouchMove, {
       passive: false
-    } : false);
+    });
 
     if (!totalLockCount) {
       document.body.classList.add(BODY_LOCK_CLASS);

package/es/composables/use-placeholder.d.ts

@@ -1,3 +1,3 @@
 import { Ref } from 'vue';
-import type { BEM } from '../utils/create/bem';
+import type { BEM } from '../utils/create';
 export declare function usePlaceholder(contentRef: Ref<Element | undefined>, bem: BEM): (renderContent: () => JSX.Element) => JSX.Element;

package/es/config-provider/ConfigProvider.d.ts

@@ -4,16 +4,16 @@ export declare type ConfigProviderProvide = {
 };
 export declare const CONFIG_PROVIDER_KEY: InjectionKey<ConfigProviderProvide>;
 declare const _default: import("vue").DefineComponent<{
-    themeVars: PropType<Record<string, string | number>>;
-    iconPrefix: StringConstructor;
     tag: {
         type: PropType<keyof HTMLElementTagNameMap>;
-        default: string;
+        default: keyof HTMLElementTagNameMap;
     };
+    themeVars: PropType<Record<string, string | number>>;
+    iconPrefix: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
+    tag?: unknown;
     themeVars?: unknown;
     iconPrefix?: unknown;
-    tag?: unknown;
 } & {
     tag: keyof HTMLElementTagNameMap;
 } & {

package/es/config-provider/ConfigProvider.js

@@ -1,6 +1,6 @@
 import { createVNode as _createVNode } from "vue";
 import { provide, computed, defineComponent } from 'vue';
-import { createNamespace, kebabCase } from '../utils';
+import { kebabCase, makeStringProp, createNamespace } from '../utils';
 var [name, bem] = createNamespace('config-provider');
 export var CONFIG_PROVIDER_KEY = Symbol(name);
 
@@ -15,12 +15,9 @@ function mapThemeVarsToCSSVars(themeVars) {
 export default defineComponent({
   name,
   props: {
+    tag: makeStringProp('div'),
     themeVars: Object,
-    iconPrefix: String,
-    tag: {
-      type: String,
-      default: 'div'
-    }
+    iconPrefix: String
   },
 
   setup(props, {

package/es/config-provider/index.d.ts

@@ -1,14 +1,14 @@
 export declare const ConfigProvider: import("../utils").WithInstall<import("vue").DefineComponent<{
-    themeVars: import("vue").PropType<Record<string, string | number>>;
-    iconPrefix: StringConstructor;
     tag: {
         type: import("vue").PropType<keyof HTMLElementTagNameMap>;
-        default: string;
+        default: keyof HTMLElementTagNameMap;
     };
+    themeVars: import("vue").PropType<Record<string, string | number>>;
+    iconPrefix: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
+    tag?: unknown;
     themeVars?: unknown;
     iconPrefix?: unknown;
-    tag?: unknown;
 } & {
     tag: keyof HTMLElementTagNameMap;
 } & {

package/es/contact-card/ContactCard.d.ts

@@ -1,23 +1,22 @@
-import { PropType } from 'vue';
 export declare type ContactCardType = 'add' | 'edit';
 declare const _default: import("vue").DefineComponent<{
     tel: StringConstructor;
     name: StringConstructor;
+    type: {
+        type: import("vue").PropType<ContactCardType>;
+        default: ContactCardType;
+    };
     addText: StringConstructor;
     editable: {
         type: BooleanConstructor;
         default: true;
     };
-    type: {
-        type: PropType<ContactCardType>;
-        default: string;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "click"[], "click", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     tel?: unknown;
     name?: unknown;
+    type?: unknown;
     addText?: unknown;
     editable?: unknown;
-    type?: unknown;
 } & {
     type: ContactCardType;
     editable: boolean;

package/es/contact-card/ContactCard.js

@@ -1,6 +1,6 @@
 import { resolveDirective as _resolveDirective, createVNode as _createVNode } from "vue";
 import { defineComponent } from 'vue';
-import { truthProp, createNamespace } from '../utils';
+import { truthProp, makeStringProp, createNamespace } from '../utils';
 import { Cell } from '../cell';
 var [name, bem, t] = createNamespace('contact-card');
 export default defineComponent({
@@ -8,12 +8,9 @@ export default defineComponent({
   props: {
     tel: String,
     name: String,
+    type: makeStringProp('add'),
     addText: String,
-    editable: truthProp,
-    type: {
-      type: String,
-      default: 'add'
-    }
+    editable: truthProp
   },
   emits: ['click'],