vant 3.2.4 → 3.2.5

package/lib/swipe/Swipe.js

@@ -20,26 +20,17 @@ var _onPopupReopen = require("../composables/on-popup-reopen");
 var [name, bem] = (0, _utils.createNamespace)('swipe');
 var props = {
   loop: _utils.truthProp,
-  width: [Number, String],
-  height: [Number, String],
+  width: _utils.numericProp,
+  height: _utils.numericProp,
   vertical: Boolean,
+  autoplay: (0, _utils.makeNumericProp)(0),
+  duration: (0, _utils.makeNumericProp)(500),
   touchable: _utils.truthProp,
   lazyRender: Boolean,
+  initialSwipe: (0, _utils.makeNumericProp)(0),
   indicatorColor: String,
   showIndicators: _utils.truthProp,
-  stopPropagation: _utils.truthProp,
-  autoplay: {
-    type: [Number, String],
-    default: 0
-  },
-  duration: {
-    type: [Number, String],
-    default: 500
-  },
-  initialSwipe: {
-    type: [Number, String],
-    default: 0
-  }
+  stopPropagation: _utils.truthProp
 };
 var SWIPE_KEY = Symbol(name);
 exports.SWIPE_KEY = SWIPE_KEY;

package/lib/swipe/index.d.ts

@@ -7,11 +7,23 @@ export declare const Swipe: import("../utils").WithInstall<import("vue").DefineC
     width: (NumberConstructor | StringConstructor)[];
     height: (NumberConstructor | StringConstructor)[];
     vertical: BooleanConstructor;
+    autoplay: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
+    duration: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     touchable: {
         type: BooleanConstructor;
         default: true;
     };
     lazyRender: BooleanConstructor;
+    initialSwipe: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     indicatorColor: StringConstructor;
     showIndicators: {
         type: BooleanConstructor;
@@ -21,31 +33,19 @@ export declare const Swipe: import("../utils").WithInstall<import("vue").DefineC
         type: BooleanConstructor;
         default: true;
     };
-    autoplay: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-    duration: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
-    initialSwipe: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: number;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "change"[], "change", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
     loop?: unknown;
     width?: unknown;
     height?: unknown;
     vertical?: unknown;
+    autoplay?: unknown;
+    duration?: unknown;
     touchable?: unknown;
     lazyRender?: unknown;
+    initialSwipe?: unknown;
     indicatorColor?: unknown;
     showIndicators?: unknown;
     stopPropagation?: unknown;
-    autoplay?: unknown;
-    duration?: unknown;
-    initialSwipe?: unknown;
 } & {
     autoplay: string | number;
     loop: boolean;
@@ -53,12 +53,12 @@ export declare const Swipe: import("../utils").WithInstall<import("vue").DefineC
     duration: string | number;
     lazyRender: boolean;
     touchable: boolean;
+    initialSwipe: string | number;
     showIndicators: boolean;
     stopPropagation: boolean;
-    initialSwipe: string | number;
 } & {
-    height?: string | number | undefined;
     width?: string | number | undefined;
+    height?: string | number | undefined;
     indicatorColor?: string | undefined;
 }> & {
     onChange?: ((...args: any[]) => any) | undefined;
@@ -69,9 +69,9 @@ export declare const Swipe: import("../utils").WithInstall<import("vue").DefineC
     duration: string | number;
     lazyRender: boolean;
     touchable: boolean;
+    initialSwipe: string | number;
     showIndicators: boolean;
     stopPropagation: boolean;
-    initialSwipe: string | number;
 }>>;
 export default Swipe;
 export type { SwipeProps };

package/lib/swipe-cell/SwipeCell.d.ts

@@ -1,34 +1,34 @@
 import { PropType, ExtractPropTypes } from 'vue';
 import { Interceptor } from '../utils';
 declare const props: {
+    name: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: string;
+    };
     disabled: BooleanConstructor;
     leftWidth: (NumberConstructor | StringConstructor)[];
     rightWidth: (NumberConstructor | StringConstructor)[];
     beforeClose: PropType<Interceptor>;
     stopPropagation: BooleanConstructor;
+};
+export declare type SwipeCellProps = ExtractPropTypes<typeof props>;
+declare const _default: import("vue").DefineComponent<{
     name: {
         type: (NumberConstructor | StringConstructor)[];
         default: string;
     };
-};
-export declare type SwipeCellProps = ExtractPropTypes<typeof props>;
-declare const _default: import("vue").DefineComponent<{
     disabled: BooleanConstructor;
     leftWidth: (NumberConstructor | StringConstructor)[];
     rightWidth: (NumberConstructor | StringConstructor)[];
     beforeClose: PropType<Interceptor>;
     stopPropagation: BooleanConstructor;
-    name: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: string;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("open" | "click" | "close")[], "open" | "click" | "close", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
+    name?: unknown;
     disabled?: unknown;
     leftWidth?: unknown;
     rightWidth?: unknown;
     beforeClose?: unknown;
     stopPropagation?: unknown;
-    name?: unknown;
 } & {
     name: string | number;
     disabled: boolean;

package/lib/swipe-cell/SwipeCell.js

@@ -17,15 +17,12 @@ var _useExpose = require("../composables/use-expose");
 // Composables
 var [name, bem] = (0, _utils.createNamespace)('swipe-cell');
 var props = {
+  name: (0, _utils.makeNumericProp)(''),
   disabled: Boolean,
-  leftWidth: [Number, String],
-  rightWidth: [Number, String],
+  leftWidth: _utils.numericProp,
+  rightWidth: _utils.numericProp,
   beforeClose: Function,
-  stopPropagation: Boolean,
-  name: {
-    type: [Number, String],
-    default: ''
-  }
+  stopPropagation: Boolean
 };
 
 var _default = (0, _vue.defineComponent)({

package/lib/swipe-cell/index.d.ts

@@ -1,21 +1,21 @@
 import { SwipeCellProps } from './SwipeCell';
 export declare const SwipeCell: import("../utils").WithInstall<import("vue").DefineComponent<{
+    name: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: string;
+    };
     disabled: BooleanConstructor;
     leftWidth: (NumberConstructor | StringConstructor)[];
     rightWidth: (NumberConstructor | StringConstructor)[];
     beforeClose: import("vue").PropType<import("../utils").Interceptor>;
     stopPropagation: BooleanConstructor;
-    name: {
-        type: (NumberConstructor | StringConstructor)[];
-        default: string;
-    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("open" | "click" | "close")[], "open" | "click" | "close", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps, Readonly<{
+    name?: unknown;
     disabled?: unknown;
     leftWidth?: unknown;
     rightWidth?: unknown;
     beforeClose?: unknown;
     stopPropagation?: unknown;
-    name?: unknown;
 } & {
     name: string | number;
     disabled: boolean;

package/lib/switch/Switch.js

@@ -16,7 +16,7 @@ var [name, bem] = (0, _utils.createNamespace)('switch');
 var _default = (0, _vue.defineComponent)({
   name,
   props: {
-    size: [Number, String],
+    size: _utils.numericProp,
     loading: Boolean,
     disabled: Boolean,
     modelValue: _utils.unknownProp,

package/lib/tab/Tab.js

@@ -26,8 +26,8 @@ var _default = (0, _vue.defineComponent)({
   name,
   props: (0, _utils.extend)({}, _useRoute.routeProps, {
     dot: Boolean,
-    name: [Number, String],
-    badge: [Number, String],
+    name: _utils.numericProp,
+    badge: _utils.numericProp,
     title: String,
     disabled: Boolean,
     titleClass: _utils.unknownProp,

package/lib/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/lib/tabbar/Tabbar.js

@@ -18,15 +18,12 @@ var props = {
   route: Boolean,
   fixed: _utils.truthProp,
   border: _utils.truthProp,
-  zIndex: [Number, String],
+  zIndex: _utils.numericProp,
   placeholder: Boolean,
   activeColor: String,
   beforeChange: Function,
   inactiveColor: String,
-  modelValue: {
-    type: [Number, String],
-    default: 0
-  },
+  modelValue: (0, _utils.makeNumericProp)(0),
   safeAreaInsetBottom: {
     type: Boolean,
     default: null

package/lib/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/lib/tabbar-item/TabbarItem.js

@@ -27,8 +27,8 @@ var _default = (0, _vue.defineComponent)({
   props: (0, _utils.extend)({}, _useRoute.routeProps, {
     dot: Boolean,
     icon: String,
-    name: [Number, String],
-    badge: [Number, String],
+    name: _utils.numericProp,
+    badge: _utils.numericProp,
     iconPrefix: String
   }),
   emits: ['click'],

package/lib/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/lib/tabs/Tabs.js

@@ -32,40 +32,25 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 // Components
 var [name, bem] = (0, _utils.createNamespace)('tabs');
 var props = {
+  type: (0, _utils.makeStringProp)('line'),
   color: String,
   border: Boolean,
   sticky: Boolean,
+  active: (0, _utils.makeNumericProp)(0),
+  duration: (0, _utils.makeNumericProp)(0.3),
   animated: Boolean,
   ellipsis: _utils.truthProp,
   swipeable: Boolean,
   scrollspy: Boolean,
+  offsetTop: (0, _utils.makeNumericProp)(0),
   background: String,
   lazyRender: _utils.truthProp,
-  lineWidth: [Number, String],
-  lineHeight: [Number, String],
+  lineWidth: _utils.numericProp,
+  lineHeight: _utils.numericProp,
   beforeChange: Function,
+  swipeThreshold: (0, _utils.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
 };
 var TABS_KEY = Symbol(name);
 exports.TABS_KEY = TABS_KEY;
@@ -292,7 +277,9 @@ var _default = (0, _vue.defineComponent)({
 
     var getCurrentIndexOnScroll = () => {
       for (var index = 0; index < children.length; index++) {
-        var top = (0, _utils.getVisibleTop)(children[index].$el);
+        var {
+          top
+        } = (0, _use.useRect)(children[index].$el);
 
         if (top > scrollOffset.value) {
           return index === 0 ? 0 : index - 1;
@@ -380,7 +367,11 @@ var _default = (0, _vue.defineComponent)({
       setCurrentIndexByName(props.active);
       (0, _vue.nextTick)(() => {
         state.inited = true;
-        tabHeight = (0, _utils.getVisibleHeight)(wrapRef.value);
+
+        if (wrapRef.value) {
+          tabHeight = (0, _use.useRect)(wrapRef.value).height;
+        }
+
         scrollIntoView(true);
       });
     };

package/lib/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/lib/tabs/TabsContent.js

@@ -14,22 +14,13 @@ var [name, bem] = (0, _utils.createNamespace)('tabs');
 var _default = (0, _vue.defineComponent)({
   name,
   props: {
+    count: (0, _utils.makeRequiredProp)(Number),
     inited: Boolean,
     animated: Boolean,
+    duration: (0, _utils.makeRequiredProp)(_utils.numericProp),
     swipeable: Boolean,
     lazyRender: Boolean,
-    count: {
-      type: Number,
-      required: true
-    },
-    duration: {
-      type: [Number, String],
-      required: true
-    },
-    currentIndex: {
-      type: Number,
-      required: true
-    }
+    currentIndex: (0, _utils.makeRequiredProp)(Number)
   },
   emits: ['change'],
 

package/lib/tabs/TabsTitle.js

@@ -18,7 +18,7 @@ var _default = (0, _vue.defineComponent)({
     type: String,
     color: String,
     title: String,
-    badge: [Number, String],
+    badge: _utils.numericProp,
     isActive: Boolean,
     disabled: Boolean,
     scrollable: Boolean,

package/lib/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;