vant 4.0.0-rc.3 → 4.0.0-rc.5

package/lib/index.d.ts

@@ -93,4 +93,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "4.0.0-rc.3";
+export const version: "4.0.0-rc.5";

package/lib/index.js

@@ -200,7 +200,7 @@ __reExport(stdin_exports, require("./time-picker"), module.exports);
 __reExport(stdin_exports, require("./toast"), module.exports);
 __reExport(stdin_exports, require("./tree-select"), module.exports);
 __reExport(stdin_exports, require("./uploader"), module.exports);
-const version = "4.0.0-rc.3";
+const version = "4.0.0-rc.5";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,

package/lib/loading/Loading.js

@@ -54,6 +54,13 @@ var stdin_default = (0, import_vue2.defineComponent)({
     const spinnerStyle = (0, import_vue2.computed)(() => (0, import_utils.extend)({
       color: props.color
     }, (0, import_utils.getSizeStyle)(props.size)));
+    const renderIcon = () => {
+      const DefaultIcon = props.type === "spinner" ? SpinIcon : CircularIcon;
+      return (0, import_vue.createVNode)("span", {
+        "class": bem("spinner", props.type),
+        "style": spinnerStyle.value
+      }, [slots.icon ? slots.icon() : DefaultIcon]);
+    };
     const renderText = () => {
       var _a;
       if (slots.default) {
@@ -77,10 +84,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         }]),
         "aria-live": "polite",
         "aria-busy": true
-      }, [(0, import_vue.createVNode)("span", {
-        "class": bem("spinner", type),
-        "style": spinnerStyle.value
-      }, [type === "spinner" ? SpinIcon : CircularIcon]), renderText()]);
+      }, [renderIcon(), renderText()]);
     };
   }
 });

package/lib/nav-bar/NavBar.d.ts

@@ -12,6 +12,10 @@ export declare const navBarProps: {
     leftArrow: BooleanConstructor;
     placeholder: BooleanConstructor;
     safeAreaInsetTop: BooleanConstructor;
+    clickable: {
+        type: BooleanConstructor;
+        default: true;
+    };
 };
 export declare type NavBarProps = ExtractPropTypes<typeof navBarProps>;
 declare const _default: import("vue").DefineComponent<{
@@ -27,6 +31,10 @@ declare const _default: import("vue").DefineComponent<{
     leftArrow: BooleanConstructor;
     placeholder: BooleanConstructor;
     safeAreaInsetTop: BooleanConstructor;
+    clickable: {
+        type: BooleanConstructor;
+        default: true;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("clickLeft" | "clickRight")[], "clickLeft" | "clickRight", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     title: StringConstructor;
     fixed: BooleanConstructor;
@@ -40,12 +48,17 @@ declare const _default: import("vue").DefineComponent<{
     leftArrow: BooleanConstructor;
     placeholder: BooleanConstructor;
     safeAreaInsetTop: BooleanConstructor;
+    clickable: {
+        type: BooleanConstructor;
+        default: true;
+    };
 }>> & {
     onClickLeft?: ((...args: any[]) => any) | undefined;
     onClickRight?: ((...args: any[]) => any) | undefined;
 }, {
     fixed: boolean;
     border: boolean;
+    clickable: boolean;
     placeholder: boolean;
     safeAreaInsetTop: boolean;
     leftArrow: boolean;

package/lib/nav-bar/NavBar.js

@@ -36,7 +36,8 @@ const navBarProps = {
   rightText: String,
   leftArrow: Boolean,
   placeholder: Boolean,
-  safeAreaInsetTop: Boolean
+  safeAreaInsetTop: Boolean,
+  clickable: import_utils.truthProp
 };
 var stdin_default = (0, import_vue2.defineComponent)({
   name,
@@ -91,12 +92,12 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }, [(0, import_vue.createVNode)("div", {
         "class": bem("content")
       }, [hasLeft && (0, import_vue.createVNode)("div", {
-        "class": [bem("left"), import_utils.HAPTICS_FEEDBACK],
+        "class": [bem("left"), props.clickable ? import_utils.HAPTICS_FEEDBACK : ""],
         "onClick": onClickLeft
       }, [renderLeft()]), (0, import_vue.createVNode)("div", {
         "class": [bem("title"), "van-ellipsis"]
       }, [slots.title ? slots.title() : title]), hasRight && (0, import_vue.createVNode)("div", {
-        "class": [bem("right"), import_utils.HAPTICS_FEEDBACK],
+        "class": [bem("right"), props.clickable ? import_utils.HAPTICS_FEEDBACK : ""],
         "onClick": onClickRight
       }, [renderRight()])])]);
     };

package/lib/nav-bar/index.d.ts

@@ -11,6 +11,10 @@ export declare const NavBar: import("../utils").WithInstall<import("vue").Define
     leftArrow: BooleanConstructor;
     placeholder: BooleanConstructor;
     safeAreaInsetTop: BooleanConstructor;
+    clickable: {
+        type: BooleanConstructor;
+        default: true;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("clickLeft" | "clickRight")[], "clickLeft" | "clickRight", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     title: StringConstructor;
     fixed: BooleanConstructor;
@@ -24,12 +28,17 @@ export declare const NavBar: import("../utils").WithInstall<import("vue").Define
     leftArrow: BooleanConstructor;
     placeholder: BooleanConstructor;
     safeAreaInsetTop: BooleanConstructor;
+    clickable: {
+        type: BooleanConstructor;
+        default: true;
+    };
 }>> & {
     onClickLeft?: ((...args: any[]) => any) | undefined;
     onClickRight?: ((...args: any[]) => any) | undefined;
 }, {
     fixed: boolean;
     border: boolean;
+    clickable: boolean;
     placeholder: boolean;
     safeAreaInsetTop: boolean;
     leftArrow: boolean;

package/lib/notify/function-call.js

@@ -83,7 +83,7 @@ function showNotify(options) {
   instance.open(options);
   clearTimeout(timer);
   if (options.duration > 0) {
-    timer = window.setTimeout(closeNotify, options.duration);
+    timer = setTimeout(closeNotify, options.duration);
   }
   return instance;
 }

package/lib/stepper/Stepper.d.ts

@@ -37,6 +37,10 @@ export declare const stepperProps: {
         type: BooleanConstructor;
         default: true;
     };
+    autoFixed: {
+        type: BooleanConstructor;
+        default: true;
+    };
     allowEmpty: BooleanConstructor;
     modelValue: (NumberConstructor | StringConstructor)[];
     inputWidth: (NumberConstructor | StringConstructor)[];
@@ -89,6 +93,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    autoFixed: {
+        type: BooleanConstructor;
+        default: true;
+    };
     allowEmpty: BooleanConstructor;
     modelValue: (NumberConstructor | StringConstructor)[];
     inputWidth: (NumberConstructor | StringConstructor)[];
@@ -139,6 +147,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    autoFixed: {
+        type: BooleanConstructor;
+        default: true;
+    };
     allowEmpty: BooleanConstructor;
     modelValue: (NumberConstructor | StringConstructor)[];
     inputWidth: (NumberConstructor | StringConstructor)[];
@@ -172,6 +184,7 @@ declare const _default: import("vue").DefineComponent<{
     showMinus: boolean;
     showInput: boolean;
     longPress: boolean;
+    autoFixed: boolean;
     allowEmpty: boolean;
     disablePlus: boolean;
     disableMinus: boolean;

package/lib/stepper/Stepper.js

@@ -41,6 +41,7 @@ const stepperProps = {
   showMinus: import_utils.truthProp,
   showInput: import_utils.truthProp,
   longPress: import_utils.truthProp,
+  autoFixed: import_utils.truthProp,
   allowEmpty: Boolean,
   modelValue: import_utils.numericProp,
   inputWidth: import_utils.numericProp,
@@ -60,7 +61,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
   setup(props, {
     emit
   }) {
-    const format = (value) => {
+    const format = (value, autoFixed = true) => {
       const {
         min,
         max,
@@ -73,7 +74,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       value = (0, import_utils.formatNumber)(String(value), !props.integer);
       value = value === "" ? 0 : +value;
       value = Number.isNaN(value) ? +min : value;
-      value = Math.max(Math.min(+max, value), +min);
+      value = autoFixed ? Math.max(Math.min(+max, value), +min) : value;
       if ((0, import_utils.isDef)(decimalLength)) {
         value = value.toFixed(+decimalLength);
       }
@@ -157,7 +158,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     };
     const onBlur = (event) => {
       const input = event.target;
-      const value = format(input.value);
+      const value = format(input.value, props.autoFixed);
       input.value = String(value);
       current.value = value;
       (0, import_vue2.nextTick)(() => {

package/lib/stepper/index.d.ts

@@ -34,6 +34,10 @@ export declare const Stepper: import("../utils").WithInstall<import("vue").Defin
         type: BooleanConstructor;
         default: true;
     };
+    autoFixed: {
+        type: BooleanConstructor;
+        default: true;
+    };
     allowEmpty: BooleanConstructor;
     modelValue: (NumberConstructor | StringConstructor)[];
     inputWidth: (NumberConstructor | StringConstructor)[];
@@ -84,6 +88,10 @@ export declare const Stepper: import("../utils").WithInstall<import("vue").Defin
         type: BooleanConstructor;
         default: true;
     };
+    autoFixed: {
+        type: BooleanConstructor;
+        default: true;
+    };
     allowEmpty: BooleanConstructor;
     modelValue: (NumberConstructor | StringConstructor)[];
     inputWidth: (NumberConstructor | StringConstructor)[];
@@ -117,6 +125,7 @@ export declare const Stepper: import("../utils").WithInstall<import("vue").Defin
     showMinus: boolean;
     showInput: boolean;
     longPress: boolean;
+    autoFixed: boolean;
     allowEmpty: boolean;
     disablePlus: boolean;
     disableMinus: boolean;

package/lib/tab/Tab.js

@@ -79,6 +79,16 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
       return isActive;
     });
+    const hasInactiveClass = (0, import_vue2.ref)(!active.value);
+    (0, import_vue2.watch)(active, (val) => {
+      if (val) {
+        hasInactiveClass.value = false;
+      } else {
+        (0, import_use.doubleRaf)(() => {
+          hasInactiveClass.value = true;
+        });
+      }
+    });
     (0, import_vue2.watch)(() => props.title, () => {
       parent.setLine();
       parent.scrollIntoView();
@@ -102,7 +112,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
           "id": id,
           "role": "tabpanel",
           "class": bem("panel-wrapper", {
-            inactive: !active.value
+            inactive: hasInactiveClass.value
           }),
           "tabindex": active.value ? 0 : -1,
           "aria-hidden": !active.value,

package/lib/tabs/Tabs.js

@@ -163,7 +163,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         index += diff;
       }
     };
-    const setCurrentIndex = (currentIndex) => {
+    const setCurrentIndex = (currentIndex, skipScrollIntoView) => {
       const newIndex = findAvailableTab(currentIndex);
       if (!(0, import_utils.isDef)(newIndex)) {
         return;
@@ -171,18 +171,27 @@ var stdin_default = (0, import_vue2.defineComponent)({
       const newTab = children[newIndex];
       const newName = getTabName(newTab, newIndex);
       const shouldEmitChange = state.currentIndex !== null;
-      state.currentIndex = newIndex;
+      if (state.currentIndex !== newIndex) {
+        state.currentIndex = newIndex;
+        if (!skipScrollIntoView) {
+          scrollIntoView();
+        }
+        setLine();
+      }
       if (newName !== props.active) {
         emit("update:active", newName);
         if (shouldEmitChange) {
           emit("change", newName, newTab.title);
         }
       }
+      if (stickyFixed && !props.scrollspy) {
+        (0, import_utils.setRootScrollTop)(Math.ceil((0, import_utils.getElementTop)(root.value) - offsetTopPx.value));
+      }
     };
-    const setCurrentIndexByName = (name2) => {
+    const setCurrentIndexByName = (name2, skipScrollIntoView) => {
       const matched = children.find((tab, index2) => getTabName(tab, index2) === name2);
       const index = matched ? children.indexOf(matched) : 0;
-      setCurrentIndex(index);
+      setCurrentIndex(index, skipScrollIntoView);
     };
     const scrollToCurrentContent = (immediate = false) => {
       if (props.scrollspy) {
@@ -273,13 +282,14 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     };
     const renderHeader = () => {
-      var _a, _b;
+      var _a, _b, _c;
       const {
         type,
-        border
+        border,
+        sticky
       } = props;
-      return (0, import_vue.createVNode)("div", {
-        "ref": wrapRef,
+      const Header = [(0, import_vue.createVNode)("div", {
+        "ref": sticky ? void 0 : wrapRef,
         "class": [bem("wrap"), {
           [import_utils.BORDER_TOP_BOTTOM]: type === "line" && border
         }]
@@ -292,7 +302,13 @@ var stdin_default = (0, import_vue2.defineComponent)({
         }]),
         "style": navStyle.value,
         "aria-orientation": "horizontal"
-      }, [(_a = slots["nav-left"]) == null ? void 0 : _a.call(slots), renderNav(), renderLine(), (_b = slots["nav-right"]) == null ? void 0 : _b.call(slots)])]);
+      }, [(_a = slots["nav-left"]) == null ? void 0 : _a.call(slots), renderNav(), renderLine(), (_b = slots["nav-right"]) == null ? void 0 : _b.call(slots)])]), (_c = slots["nav-bottom"]) == null ? void 0 : _c.call(slots)];
+      if (sticky) {
+        return (0, import_vue.createVNode)("div", {
+          "ref": wrapRef
+        }, [Header]);
+      }
+      return Header;
     };
     (0, import_vue2.watch)([() => props.color, import_utils.windowWidth], setLine);
     (0, import_vue2.watch)(() => props.active, (value) => {
@@ -309,15 +325,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
         });
       }
     });
-    (0, import_vue2.watch)(() => state.currentIndex, () => {
-      scrollIntoView();
-      setLine();
-      if (stickyFixed && !props.scrollspy) {
-        (0, import_utils.setRootScrollTop)(Math.ceil((0, import_utils.getElementTop)(root.value) - offsetTopPx.value));
-      }
-    });
     const init = () => {
-      setCurrentIndexByName(props.active);
+      setCurrentIndexByName(props.active, true);
       (0, import_vue2.nextTick)(() => {
         state.inited = true;
         if (wrapRef.value) {
@@ -353,36 +362,30 @@ var stdin_default = (0, import_vue2.defineComponent)({
       currentName,
       scrollIntoView
     });
-    return () => {
-      var _a;
-      return (0, import_vue.createVNode)("div", {
-        "ref": root,
-        "class": bem([props.type])
-      }, [props.sticky ? (0, import_vue.createVNode)(import_sticky.Sticky, {
-        "container": root.value,
-        "offsetTop": offsetTopPx.value,
-        "onScroll": onStickyScroll
-      }, {
-        default: () => {
-          var _a2;
-          return [renderHeader(), (_a2 = slots["nav-bottom"]) == null ? void 0 : _a2.call(slots)];
-        }
-      }) : [renderHeader(), (_a = slots["nav-bottom"]) == null ? void 0 : _a.call(slots)], (0, import_vue.createVNode)(import_TabsContent.default, {
-        "ref": contentRef,
-        "count": children.length,
-        "inited": state.inited,
-        "animated": props.animated,
-        "duration": props.duration,
-        "swipeable": props.swipeable,
-        "lazyRender": props.lazyRender,
-        "currentIndex": state.currentIndex,
-        "onChange": setCurrentIndex
-      }, {
-        default: () => {
-          var _a2;
-          return [(_a2 = slots.default) == null ? void 0 : _a2.call(slots)];
-        }
-      })]);
-    };
+    return () => (0, import_vue.createVNode)("div", {
+      "ref": root,
+      "class": bem([props.type])
+    }, [props.sticky ? (0, import_vue.createVNode)(import_sticky.Sticky, {
+      "container": root.value,
+      "offsetTop": offsetTopPx.value,
+      "onScroll": onStickyScroll
+    }, {
+      default: () => [renderHeader()]
+    }) : renderHeader(), (0, import_vue.createVNode)(import_TabsContent.default, {
+      "ref": contentRef,
+      "count": children.length,
+      "inited": state.inited,
+      "animated": props.animated,
+      "duration": props.duration,
+      "swipeable": props.swipeable,
+      "lazyRender": props.lazyRender,
+      "currentIndex": state.currentIndex,
+      "onChange": setCurrentIndex
+    }, {
+      default: () => {
+        var _a;
+        return [(_a = slots.default) == null ? void 0 : _a.call(slots)];
+      }
+    })]);
   }
 });

package/lib/time-picker/TimePicker.js

@@ -68,13 +68,14 @@ var stdin_default = (0, import_vue2.defineComponent)({
       if (!(0, import_utils.isSameValue)(newValues, props.modelValue)) {
         emit("update:modelValue", newValues);
       }
-    }, {
-      immediate: true
     });
     (0, import_vue2.watch)(() => props.modelValue, (newValues) => {
+      newValues = (0, import_utils2.formatValueRange)(newValues, columns.value);
       if (!(0, import_utils.isSameValue)(newValues, currentValues.value)) {
         currentValues.value = newValues;
       }
+    }, {
+      immediate: true
     });
     const onChange = (...args) => emit("change", ...args);
     const onCancel = (...args) => emit("cancel", ...args);