vant 3.2.1 → 3.2.5

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/tabbar-item/index.d.ts

@@ -1,4 +1,4 @@
-declare const TabbarItem: import("../utils").WithInstall<import("vue").DefineComponent<{
+export declare const TabbarItem: import("../utils").WithInstall<import("vue").DefineComponent<{
     to: import("vue").PropType<import("vue-router").RouteLocationRaw>;
     url: StringConstructor;
     replace: BooleanConstructor;
@@ -34,4 +34,3 @@ declare const TabbarItem: import("../utils").WithInstall<import("vue").DefineCom
     dot: boolean;
 }>>;
 export default TabbarItem;
-export { TabbarItem };

package/lib/tabbar-item/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.TabbarItem = exports.default = void 0;
+exports.default = exports.TabbarItem = void 0;
 
 var _utils = require("../utils");
 

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;
@@ -309,17 +296,13 @@ var _default = (0, _vue.defineComponent)({
       }
     };
 
-    var renderNav = () => children.map((item, index) => (0, _vue.createVNode)(_TabsTitle.default, {
+    var renderNav = () => children.map((item, index) => (0, _vue.createVNode)(_TabsTitle.default, (0, _vue.mergeProps)({
       "ref": setTitleRefs(index),
-      "dot": item.dot,
       "type": props.type,
-      "badge": item.badge,
-      "title": item.title,
       "color": props.color,
       "style": item.titleStyle,
       "class": item.titleClass,
       "isActive": index === state.currentIndex,
-      "disabled": item.disabled,
       "scrollable": scrollable.value,
       "renderTitle": item.$slots.title,
       "activeColor": props.titleActiveColor,
@@ -327,7 +310,7 @@ var _default = (0, _vue.defineComponent)({
       "onClick": event => {
         onClickTab(item, index, event);
       }
-    }, null));
+    }, (0, _utils.pick)(item, ['dot', 'badge', 'title', 'disabled', 'showZeroBadge'])), null));
 
     var renderHeader = () => {
       var _slots$navLeft, _slots$navRight;
@@ -384,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.d.ts

@@ -10,6 +10,10 @@ declare const _default: import("vue").DefineComponent<{
     activeColor: StringConstructor;
     renderTitle: FunctionConstructor;
     inactiveColor: StringConstructor;
+    showZeroBadge: {
+        type: BooleanConstructor;
+        default: true;
+    };
 }, () => 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<{
     dot?: unknown;
     type?: unknown;
@@ -22,11 +26,13 @@ declare const _default: import("vue").DefineComponent<{
     activeColor?: unknown;
     renderTitle?: unknown;
     inactiveColor?: unknown;
+    showZeroBadge?: unknown;
 } & {
     dot: boolean;
     disabled: boolean;
     isActive: boolean;
     scrollable: boolean;
+    showZeroBadge: boolean;
 } & {
     type?: string | undefined;
     badge?: string | number | undefined;
@@ -35,10 +41,11 @@ declare const _default: import("vue").DefineComponent<{
     activeColor?: string | undefined;
     inactiveColor?: string | undefined;
     renderTitle?: Function | undefined;
-}> & {}, {
+}>, {
     dot: boolean;
     disabled: boolean;
     isActive: boolean;
     scrollable: boolean;
+    showZeroBadge: boolean;
 }>;
 export default _default;

package/lib/tabs/TabsTitle.js

@@ -18,13 +18,14 @@ var _default = (0, _vue.defineComponent)({
     type: String,
     color: String,
     title: String,
-    badge: [Number, String],
+    badge: _utils.numericProp,
     isActive: Boolean,
     disabled: Boolean,
     scrollable: Boolean,
     activeColor: String,
     renderTitle: Function,
-    inactiveColor: String
+    inactiveColor: String,
+    showZeroBadge: _utils.truthProp
   },
 
   setup(props) {
@@ -71,7 +72,8 @@ var _default = (0, _vue.defineComponent)({
       if (props.dot || (0, _utils.isDef)(props.badge) && props.badge !== '') {
         return (0, _vue.createVNode)(_badge.Badge, {
           "dot": props.dot,
-          "content": props.badge
+          "content": props.badge,
+          "showZero": props.showZeroBadge
         }, {
           default: () => [Text]
         });

package/lib/tabs/index.d.ts

@@ -1,7 +1,20 @@
-declare const Tabs: import("../utils").WithInstall<import("vue").DefineComponent<{
+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;
@@ -9,6 +22,10 @@ declare const Tabs: import("../utils").WithInstall<import("vue").DefineComponent
     };
     swipeable: BooleanConstructor;
     scrollspy: BooleanConstructor;
+    offsetTop: {
+        type: (NumberConstructor | StringConstructor)[];
+        default: number;
+    };
     background: StringConstructor;
     lazyRender: {
         type: BooleanConstructor;
@@ -17,48 +34,32 @@ declare const Tabs: import("../utils").WithInstall<import("vue").DefineComponent
     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;
@@ -103,5 +104,5 @@ declare const Tabs: import("../utils").WithInstall<import("vue").DefineComponent
     swipeThreshold: string | number;
 }>>;
 export default Tabs;
-export { Tabs };
+export type { TabsProps };
 export type { TabsType, TabsInstance } from './types';

package/lib/tabs/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.Tabs = exports.default = void 0;
+exports.default = exports.Tabs = void 0;
 
 var _utils = require("../utils");
 

package/lib/tabs/utils.js

@@ -8,10 +8,7 @@ var _use = require("@vant/use");
 
 var _utils = require("../utils");
 
-var rafId;
-
 function scrollLeftTo(scroller, to, duration) {
-  (0, _use.cancelRaf)(rafId);
   var count = 0;
   var from = scroller.scrollLeft;
   var frames = duration === 0 ? 1 : Math.round(duration * 1000 / 16);
@@ -20,7 +17,7 @@ function scrollLeftTo(scroller, to, duration) {
     scroller.scrollLeft += (to - from) / frames;
 
     if (++count < frames) {
-      rafId = (0, _use.raf)(animate);
+      (0, _use.raf)(animate);
     }
   }
 

package/lib/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/lib/tag/Tag.js

@@ -17,15 +17,12 @@ var _default = (0, _vue.defineComponent)({
     size: String,
     mark: Boolean,
     show: _utils.truthProp,
+    type: (0, _utils.makeStringProp)('default'),
     color: String,
     plain: Boolean,
     round: Boolean,
     textColor: String,
-    closeable: Boolean,
-    type: {
-      type: String,
-      default: 'default'
-    }
+    closeable: Boolean
   },
   emits: ['close'],
 

package/lib/tag/index.d.ts

@@ -1,29 +1,29 @@
-declare const Tag: import("../utils").WithInstall<import("vue").DefineComponent<{
+export declare const Tag: import("../utils").WithInstall<import("vue").DefineComponent<{
     size: StringConstructor;
     mark: BooleanConstructor;
     show: {
         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;
@@ -46,4 +46,3 @@ declare const Tag: import("../utils").WithInstall<import("vue").DefineComponent<
     closeable: boolean;
 }>>;
 export default Tag;
-export { Tag };

package/lib/tag/index.js

@@ -1,7 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.Tag = exports.default = void 0;
+exports.default = exports.Tag = void 0;
 
 var _utils = require("../utils");