vant 3.2.4 → 3.2.5

package/es/switch/Switch.js

@@ -1,13 +1,13 @@
 import { createVNode as _createVNode } from "vue";
 import { defineComponent } from 'vue';
-import { createNamespace, addUnit, unknownProp } from '../utils';
+import { addUnit, numericProp, unknownProp, createNamespace } from '../utils';
 import { useCustomFieldValue } from '@vant/use';
 import { Loading } from '../loading';
 var [name, bem] = createNamespace('switch');
 export default defineComponent({
   name,
   props: {
-    size: [Number, String],
+    size: numericProp,
     loading: Boolean,
     disabled: Boolean,
     modelValue: unknownProp,

package/es/tab/Tab.js

@@ -1,7 +1,7 @@
 import { withDirectives as _withDirectives, vShow as _vShow, createVNode as _createVNode } from "vue";
 import { ref, watch, provide, computed, nextTick, defineComponent } from 'vue'; // Utils
 
-import { createNamespace, extend, truthProp, unknownProp } from '../utils';
+import { extend, truthProp, unknownProp, numericProp, createNamespace } from '../utils';
 import { TABS_KEY } from '../tabs/Tabs'; // Composables
 
 import { useParent } from '@vant/use';
@@ -14,8 +14,8 @@ export default defineComponent({
   name,
   props: extend({}, routeProps, {
     dot: Boolean,
-    name: [Number, String],
-    badge: [Number, String],
+    name: numericProp,
+    badge: numericProp,
     title: String,
     disabled: Boolean,
     titleClass: unknownProp,

package/es/tabbar/Tabbar.d.ts

@@ -66,8 +66,8 @@ declare const _default: import("vue").DefineComponent<{
 } & {
     fixed: boolean;
     border: boolean;
-    placeholder: boolean;
     modelValue: string | number;
+    placeholder: boolean;
     safeAreaInsetBottom: boolean | null;
     route: boolean;
 } & {
@@ -81,8 +81,8 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     fixed: boolean;
     border: boolean;
-    placeholder: boolean;
     modelValue: string | number;
+    placeholder: boolean;
     safeAreaInsetBottom: boolean | null;
     route: boolean;
 }>;

package/es/tabbar/Tabbar.js

@@ -1,7 +1,7 @@
 import { createVNode as _createVNode } from "vue";
 import { ref, defineComponent } from 'vue'; // Utils
 
-import { truthProp, getZIndexStyle, createNamespace, callInterceptor, BORDER_TOP_BOTTOM } from '../utils'; // Composables
+import { truthProp, numericProp, getZIndexStyle, createNamespace, callInterceptor, makeNumericProp, BORDER_TOP_BOTTOM } from '../utils'; // Composables
 
 import { useChildren } from '@vant/use';
 import { usePlaceholder } from '../composables/use-placeholder';
@@ -10,15 +10,12 @@ var props = {
   route: Boolean,
   fixed: truthProp,
   border: truthProp,
-  zIndex: [Number, String],
+  zIndex: numericProp,
   placeholder: Boolean,
   activeColor: String,
   beforeChange: Function,
   inactiveColor: String,
-  modelValue: {
-    type: [Number, String],
-    default: 0
-  },
+  modelValue: makeNumericProp(0),
   safeAreaInsetBottom: {
     type: Boolean,
     default: null

package/es/tabbar/index.d.ts

@@ -35,8 +35,8 @@ export declare const Tabbar: import("../utils").WithInstall<import("vue").Define
 } & {
     fixed: boolean;
     border: boolean;
-    placeholder: boolean;
     modelValue: string | number;
+    placeholder: boolean;
     safeAreaInsetBottom: boolean | null;
     route: boolean;
 } & {
@@ -50,8 +50,8 @@ export declare const Tabbar: import("../utils").WithInstall<import("vue").Define
 }, {
     fixed: boolean;
     border: boolean;
-    placeholder: boolean;
     modelValue: string | number;
+    placeholder: boolean;
     safeAreaInsetBottom: boolean | null;
     route: boolean;
 }>>;

package/es/tabbar-item/TabbarItem.js

@@ -1,7 +1,7 @@
 import { createVNode as _createVNode } from "vue";
 import { computed, getCurrentInstance, defineComponent } from 'vue'; // Utils
 
-import { createNamespace, extend, isObject } from '../utils';
+import { createNamespace, extend, isObject, numericProp } from '../utils';
 import { TABBAR_KEY } from '../tabbar/Tabbar'; // Composables
 
 import { useParent } from '@vant/use';
@@ -15,8 +15,8 @@ export default defineComponent({
   props: extend({}, routeProps, {
     dot: Boolean,
     icon: String,
-    name: [Number, String],
-    badge: [Number, String],
+    name: numericProp,
+    badge: numericProp,
     iconPrefix: String
   }),
   emits: ['click'],

package/es/tabs/Tabs.d.ts

@@ -2,9 +2,21 @@ import { PropType, InjectionKey, ExtractPropTypes } from 'vue';
 import { Interceptor } from '../utils';
 import type { TabsProvide, TabsType } from './types';
 declare const props: {
+    type: {
+        type: PropType<TabsType>;
+        default: TabsType;
+    };
     color: StringConstructor;
     border: BooleanConstructor;
     sticky: BooleanConstructor;
+    active: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
+    duration: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     animated: BooleanConstructor;
     ellipsis: {
         type: BooleanConstructor;
@@ -12,6 +24,10 @@ declare const props: {
     };
     swipeable: BooleanConstructor;
     scrollspy: BooleanConstructor;
+    offsetTop: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     background: StringConstructor;
     lazyRender: {
         type: BooleanConstructor;
@@ -20,12 +36,23 @@ declare const props: {
     lineWidth: (NumberConstructor | StringConstructor)[];
     lineHeight: (NumberConstructor | StringConstructor)[];
     beforeChange: PropType<Interceptor>;
+    swipeThreshold: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     titleActiveColor: StringConstructor;
     titleInactiveColor: StringConstructor;
+};
+export declare type TabsProps = ExtractPropTypes<typeof props>;
+export declare const TABS_KEY: InjectionKey<TabsProvide>;
+declare const _default: import("vue").DefineComponent<{
     type: {
         type: PropType<TabsType>;
-        default: string;
+        default: TabsType;
     };
+    color: StringConstructor;
+    border: BooleanConstructor;
+    sticky: BooleanConstructor;
     active: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
@@ -34,21 +61,6 @@ declare const props: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
-    offsetTop: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-    swipeThreshold: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-};
-export declare type TabsProps = ExtractPropTypes<typeof props>;
-export declare const TABS_KEY: InjectionKey<TabsProvide>;
-declare const _default: import("vue").DefineComponent<{
-    color: StringConstructor;
-    border: BooleanConstructor;
-    sticky: BooleanConstructor;
     animated: BooleanConstructor;
     ellipsis: {
         type: BooleanConstructor;
@@ -56,6 +68,10 @@ declare const _default: import("vue").DefineComponent<{
     };
     swipeable: BooleanConstructor;
     scrollspy: BooleanConstructor;
+    offsetTop: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     background: StringConstructor;
     lazyRender: {
         type: BooleanConstructor;
@@ -64,48 +80,32 @@ declare const _default: import("vue").DefineComponent<{
     lineWidth: (NumberConstructor | StringConstructor)[];
     lineHeight: (NumberConstructor | StringConstructor)[];
     beforeChange: PropType<Interceptor>;
-    titleActiveColor: StringConstructor;
-    titleInactiveColor: StringConstructor;
-    type: {
-        type: PropType<TabsType>;
-        default: string;
-    };
-    active: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-    duration: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-    offsetTop: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
     swipeThreshold: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+    titleActiveColor: StringConstructor;
+    titleInactiveColor: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "disabled" | "click" | "change" | "rendered" | "click-tab" | "update:active")[], "scroll" | "disabled" | "click" | "change" | "rendered" | "click-tab" | "update:active", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
+    type?: unknown;
     color?: unknown;
     border?: unknown;
     sticky?: unknown;
+    active?: unknown;
+    duration?: unknown;
     animated?: unknown;
     ellipsis?: unknown;
     swipeable?: unknown;
     scrollspy?: unknown;
+    offsetTop?: unknown;
     background?: unknown;
     lazyRender?: unknown;
     lineWidth?: unknown;
     lineHeight?: unknown;
     beforeChange?: unknown;
+    swipeThreshold?: unknown;
     titleActiveColor?: unknown;
     titleInactiveColor?: unknown;
-    type?: unknown;
-    active?: unknown;
-    duration?: unknown;
-    offsetTop?: unknown;
-    swipeThreshold?: unknown;
 } & {
     type: TabsType;
     border: boolean;

package/es/tabs/Tabs.js

@@ -1,10 +1,10 @@
 import { createVNode as _createVNode, mergeProps as _mergeProps } from "vue";
 import { ref, watch, computed, reactive, nextTick, onActivated, defineComponent, getCurrentInstance } from 'vue'; // Utils
 
-import { isDef, addUnit, isHidden, unitToPx, truthProp, getVisibleTop, getElementTop, callInterceptor, createNamespace, getVisibleHeight, setRootScrollTop, BORDER_TOP_BOTTOM, pick } from '../utils';
+import { pick, isDef, addUnit, isHidden, unitToPx, truthProp, numericProp, getElementTop, makeStringProp, callInterceptor, createNamespace, makeNumericProp, setRootScrollTop, BORDER_TOP_BOTTOM } from '../utils';
 import { scrollLeftTo, scrollTopTo } from './utils'; // Composables
 
-import { useChildren, useWindowSize, useScrollParent, useEventListener, onMountedOrActivated } from '@vant/use';
+import { useRect, useChildren, useWindowSize, useScrollParent, useEventListener, onMountedOrActivated } from '@vant/use';
 import { route } from '../composables/use-route';
 import { useRefs } from '../composables/use-refs';
 import { useExpose } from '../composables/use-expose';
@@ -16,40 +16,25 @@ import TabsContent from './TabsContent'; // Types
 
 var [name, bem] = createNamespace('tabs');
 var props = {
+  type: makeStringProp('line'),
   color: String,
   border: Boolean,
   sticky: Boolean,
+  active: makeNumericProp(0),
+  duration: makeNumericProp(0.3),
   animated: Boolean,
   ellipsis: truthProp,
   swipeable: Boolean,
   scrollspy: Boolean,
+  offsetTop: makeNumericProp(0),
   background: String,
   lazyRender: truthProp,
-  lineWidth: [Number, String],
-  lineHeight: [Number, String],
+  lineWidth: numericProp,
+  lineHeight: numericProp,
   beforeChange: Function,
+  swipeThreshold: makeNumericProp(5),
   titleActiveColor: String,
-  titleInactiveColor: String,
-  type: {
-    type: String,
-    default: 'line'
-  },
-  active: {
-    type: [Number, String],
-    default: 0
-  },
-  duration: {
-    type: [Number, String],
-    default: 0.3
-  },
-  offsetTop: {
-    type: [Number, String],
-    default: 0
-  },
-  swipeThreshold: {
-    type: [Number, String],
-    default: 5
-  }
+  titleInactiveColor: String
 };
 export var TABS_KEY = Symbol(name);
 export default defineComponent({
@@ -274,7 +259,9 @@ export default defineComponent({
 
     var getCurrentIndexOnScroll = () => {
       for (var index = 0; index < children.length; index++) {
-        var top = getVisibleTop(children[index].$el);
+        var {
+          top
+        } = useRect(children[index].$el);
 
         if (top > scrollOffset.value) {
           return index === 0 ? 0 : index - 1;
@@ -362,7 +349,11 @@ export default defineComponent({
       setCurrentIndexByName(props.active);
       nextTick(() => {
         state.inited = true;
-        tabHeight = getVisibleHeight(wrapRef.value);
+
+        if (wrapRef.value) {
+          tabHeight = useRect(wrapRef.value).height;
+        }
+
         scrollIntoView(true);
       });
     };

package/es/tabs/TabsContent.d.ts

@@ -1,35 +1,35 @@
 declare const _default: import("vue").DefineComponent<{
-    inited: BooleanConstructor;
-    animated: BooleanConstructor;
-    swipeable: BooleanConstructor;
-    lazyRender: BooleanConstructor;
     count: {
         type: NumberConstructor;
         required: true;
     };
+    inited: BooleanConstructor;
+    animated: BooleanConstructor;
     duration: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };
+    swipeable: BooleanConstructor;
+    lazyRender: BooleanConstructor;
     currentIndex: {
         type: NumberConstructor;
         required: true;
     };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "change"[], "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
+    count?: unknown;
     inited?: unknown;
     animated?: unknown;
+    duration?: unknown;
     swipeable?: unknown;
     lazyRender?: unknown;
-    count?: unknown;
-    duration?: unknown;
     currentIndex?: unknown;
 } & {
     duration: string | number;
     lazyRender: boolean;
+    count: number;
     inited: boolean;
     animated: boolean;
     swipeable: boolean;
-    count: number;
     currentIndex: number;
 } & {}> & {
     onChange?: ((...args: any[]) => any) | undefined;

package/es/tabs/TabsContent.js

@@ -1,27 +1,18 @@
 import { createVNode as _createVNode } from "vue";
 import { ref, watch, onMounted, defineComponent } from 'vue';
-import { createNamespace } from '../utils';
+import { numericProp, makeRequiredProp, createNamespace } from '../utils';
 import { Swipe } from '../swipe';
 var [name, bem] = createNamespace('tabs');
 export default defineComponent({
   name,
   props: {
+    count: makeRequiredProp(Number),
     inited: Boolean,
     animated: Boolean,
+    duration: makeRequiredProp(numericProp),
     swipeable: Boolean,
     lazyRender: Boolean,
-    count: {
-      type: Number,
-      required: true
-    },
-    duration: {
-      type: [Number, String],
-      required: true
-    },
-    currentIndex: {
-      type: Number,
-      required: true
-    }
+    currentIndex: makeRequiredProp(Number)
   },
   emits: ['change'],
 

package/es/tabs/TabsTitle.js

@@ -1,6 +1,6 @@
 import { createVNode as _createVNode } from "vue";
 import { computed, defineComponent } from 'vue';
-import { createNamespace, isDef, truthProp } from '../utils';
+import { isDef, truthProp, numericProp, createNamespace } from '../utils';
 import { Badge } from '../badge';
 var [name, bem] = createNamespace('tab');
 export default defineComponent({
@@ -10,7 +10,7 @@ export default defineComponent({
     type: String,
     color: String,
     title: String,
-    badge: [Number, String],
+    badge: numericProp,
     isActive: Boolean,
     disabled: Boolean,
     scrollable: Boolean,

package/es/tabs/index.d.ts

@@ -1,8 +1,20 @@
 import { TabsProps } from './Tabs';
 export declare const Tabs: import("../utils").WithInstall<import("vue").DefineComponent<{
+    type: {
+        type: import("vue").PropType<import("./types").TabsType>;
+        default: import("./types").TabsType;
+    };
     color: StringConstructor;
     border: BooleanConstructor;
     sticky: BooleanConstructor;
+    active: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
+    duration: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     animated: BooleanConstructor;
     ellipsis: {
         type: BooleanConstructor;
@@ -10,6 +22,10 @@ export declare const Tabs: import("../utils").WithInstall<import("vue").DefineCo
     };
     swipeable: BooleanConstructor;
     scrollspy: BooleanConstructor;
+    offsetTop: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     background: StringConstructor;
     lazyRender: {
         type: BooleanConstructor;
@@ -18,48 +34,32 @@ export declare const Tabs: import("../utils").WithInstall<import("vue").DefineCo
     lineWidth: (NumberConstructor | StringConstructor)[];
     lineHeight: (NumberConstructor | StringConstructor)[];
     beforeChange: import("vue").PropType<import("../utils").Interceptor>;
-    titleActiveColor: StringConstructor;
-    titleInactiveColor: StringConstructor;
-    type: {
-        type: import("vue").PropType<import("./types").TabsType>;
-        default: string;
-    };
-    active: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-    duration: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-    offsetTop: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
     swipeThreshold: {
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+    titleActiveColor: StringConstructor;
+    titleInactiveColor: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("scroll" | "disabled" | "click" | "change" | "rendered" | "click-tab" | "update:active")[], "scroll" | "disabled" | "click" | "change" | "rendered" | "click-tab" | "update:active", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
+    type?: unknown;
     color?: unknown;
     border?: unknown;
     sticky?: unknown;
+    active?: unknown;
+    duration?: unknown;
     animated?: unknown;
     ellipsis?: unknown;
     swipeable?: unknown;
     scrollspy?: unknown;
+    offsetTop?: unknown;
     background?: unknown;
     lazyRender?: unknown;
     lineWidth?: unknown;
     lineHeight?: unknown;
     beforeChange?: unknown;
+    swipeThreshold?: unknown;
     titleActiveColor?: unknown;
     titleInactiveColor?: unknown;
-    type?: unknown;
-    active?: unknown;
-    duration?: unknown;
-    offsetTop?: unknown;
-    swipeThreshold?: unknown;
 } & {
     type: import("./types").TabsType;
     border: boolean;

package/es/tag/Tag.d.ts

@@ -1,4 +1,3 @@
-import { PropType } from 'vue';
 export declare type TagType = 'default' | 'primary' | 'success' | 'warning' | 'danger';
 declare const _default: import("vue").DefineComponent<{
     size: StringConstructor;
@@ -7,25 +6,25 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    type: {
+        type: import("vue").PropType<TagType>;
+        default: TagType;
+    };
     color: StringConstructor;
     plain: BooleanConstructor;
     round: BooleanConstructor;
     textColor: StringConstructor;
     closeable: BooleanConstructor;
-    type: {
-        type: PropType<TagType>;
-        default: string;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "close"[], "close", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     size?: unknown;
     mark?: unknown;
     show?: unknown;
+    type?: unknown;
     color?: unknown;
     plain?: unknown;
     round?: unknown;
     textColor?: unknown;
     closeable?: unknown;
-    type?: unknown;
 } & {
     type: TagType;
     mark: boolean;

package/es/tag/Tag.js

@@ -1,6 +1,6 @@
 import { createVNode as _createVNode } from "vue";
 import { Transition, defineComponent } from 'vue';
-import { truthProp, createNamespace } from '../utils';
+import { truthProp, makeStringProp, createNamespace } from '../utils';
 import { Icon } from '../icon';
 var [name, bem] = createNamespace('tag');
 export default defineComponent({
@@ -9,15 +9,12 @@ export default defineComponent({
     size: String,
     mark: Boolean,
     show: truthProp,
+    type: makeStringProp('default'),
     color: String,
     plain: Boolean,
     round: Boolean,
     textColor: String,
-    closeable: Boolean,
-    type: {
-      type: String,
-      default: 'default'
-    }
+    closeable: Boolean
   },
   emits: ['close'],
 

package/es/tag/index.d.ts

@@ -5,25 +5,25 @@ export declare const Tag: import("../utils").WithInstall<import("vue").DefineCom
         type: BooleanConstructor;
         default: true;
     };
+    type: {
+        type: import("vue").PropType<import("./Tag").TagType>;
+        default: import("./Tag").TagType;
+    };
     color: StringConstructor;
     plain: BooleanConstructor;
     round: BooleanConstructor;
     textColor: StringConstructor;
     closeable: BooleanConstructor;
-    type: {
-        type: import("vue").PropType<import("./Tag").TagType>;
-        default: string;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "close"[], "close", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     size?: unknown;
     mark?: unknown;
     show?: unknown;
+    type?: unknown;
     color?: unknown;
     plain?: unknown;
     round?: unknown;
     textColor?: unknown;
     closeable?: unknown;
-    type?: unknown;
 } & {
     type: import("./Tag").TagType;
     mark: boolean;