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

package/lib/vant.js

@@ -1106,6 +1106,13 @@
       const spinnerStyle = vue.computed(() => extend({
         color: props.color
       }, getSizeStyle(props.size)));
+      const renderIcon = () => {
+        const DefaultIcon = props.type === "spinner" ? SpinIcon : CircularIcon;
+        return vue.createVNode("span", {
+          "class": bem$1n("spinner", props.type),
+          "style": spinnerStyle.value
+        }, [slots.icon ? slots.icon() : DefaultIcon]);
+      };
       const renderText = () => {
         var _a;
         if (slots.default) {
@@ -1129,10 +1136,7 @@
           }]),
           "aria-live": "polite",
           "aria-busy": true
-        }, [vue.createVNode("span", {
-          "class": bem$1n("spinner", type),
-          "style": spinnerStyle.value
-        }, [type === "spinner" ? SpinIcon : CircularIcon]), renderText()]);
+        }, [renderIcon(), renderText()]);
       };
     }
   });
@@ -2999,7 +3003,7 @@
           index += diff;
         }
       };
-      const setCurrentIndex = (currentIndex) => {
+      const setCurrentIndex = (currentIndex, skipScrollIntoView) => {
         const newIndex = findAvailableTab(currentIndex);
         if (!isDef(newIndex)) {
           return;
@@ -3007,18 +3011,27 @@
         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) {
+          setRootScrollTop(Math.ceil(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) {
@@ -3109,13 +3122,14 @@
         }
       };
       const renderHeader = () => {
-        var _a, _b;
+        var _a, _b, _c;
         const {
           type,
-          border
+          border,
+          sticky
         } = props;
-        return vue.createVNode("div", {
-          "ref": wrapRef,
+        const Header = [vue.createVNode("div", {
+          "ref": sticky ? void 0 : wrapRef,
           "class": [bem$1a("wrap"), {
             [BORDER_TOP_BOTTOM]: type === "line" && border
           }]
@@ -3128,7 +3142,13 @@
           }]),
           "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 vue.createVNode("div", {
+            "ref": wrapRef
+          }, [Header]);
+        }
+        return Header;
       };
       vue.watch([() => props.color, windowWidth], setLine);
       vue.watch(() => props.active, (value) => {
@@ -3145,15 +3165,8 @@
           });
         }
       });
-      vue.watch(() => state.currentIndex, () => {
-        scrollIntoView();
-        setLine();
-        if (stickyFixed && !props.scrollspy) {
-          setRootScrollTop(Math.ceil(getElementTop(root.value) - offsetTopPx.value));
-        }
-      });
       const init = () => {
-        setCurrentIndexByName(props.active);
+        setCurrentIndexByName(props.active, true);
         vue.nextTick(() => {
           state.inited = true;
           if (wrapRef.value) {
@@ -3189,37 +3202,31 @@
         currentName,
         scrollIntoView
       });
-      return () => {
-        var _a;
-        return vue.createVNode("div", {
-          "ref": root,
-          "class": bem$1a([props.type])
-        }, [props.sticky ? vue.createVNode(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)], vue.createVNode(stdin_default$1n, {
-          "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 () => vue.createVNode("div", {
+        "ref": root,
+        "class": bem$1a([props.type])
+      }, [props.sticky ? vue.createVNode(Sticky, {
+        "container": root.value,
+        "offsetTop": offsetTopPx.value,
+        "onScroll": onStickyScroll
+      }, {
+        default: () => [renderHeader()]
+      }) : renderHeader(), vue.createVNode(stdin_default$1n, {
+        "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)];
+        }
+      })]);
     }
   });
   const TAB_STATUS_KEY = Symbol();
@@ -3340,6 +3347,16 @@
         }
         return isActive;
       });
+      const hasInactiveClass = vue.ref(!active.value);
+      vue.watch(active, (val) => {
+        if (val) {
+          hasInactiveClass.value = false;
+        } else {
+          doubleRaf(() => {
+            hasInactiveClass.value = true;
+          });
+        }
+      });
       vue.watch(() => props.title, () => {
         parent.setLine();
         parent.scrollIntoView();
@@ -3363,7 +3380,7 @@
             "id": id,
             "role": "tabpanel",
             "class": bem$18("panel-wrapper", {
-              inactive: !active.value
+              inactive: hasInactiveClass.value
             }),
             "tabindex": active.value ? 0 : -1,
             "aria-hidden": !active.value,
@@ -4249,7 +4266,8 @@
         state.validateMessage = "";
       };
       const endValidate = () => emit("endValidate", {
-        status: state.status
+        status: state.status,
+        message: state.validateMessage
       });
       const validate = (rules = props.rules) => new Promise((resolve) => {
         resetValidation();
@@ -4538,9 +4556,9 @@
         const labelAlign = getProp("labelAlign");
         const Label = renderLabel();
         const LeftIcon = renderLeftIcon();
+        const renderTitle = () => labelAlign === "top" ? [LeftIcon, Label] : Label;
         return vue.createVNode(Cell, {
           "size": props.size,
-          "icon": props.leftIcon,
           "class": bem$13({
             error: showError.value,
             disabled,
@@ -4557,8 +4575,8 @@
           }]), props.labelClass],
           "arrowDirection": props.arrowDirection
         }, {
-          icon: LeftIcon ? () => LeftIcon : null,
-          title: Label ? () => Label : null,
+          icon: LeftIcon && labelAlign !== "top" ? () => LeftIcon : null,
+          title: Label || labelAlign === "top" ? renderTitle : null,
           value: renderFieldBody,
           extra: slots.extra
         });
@@ -5746,6 +5764,16 @@
     });
     return filter ? filter(type, options) : options;
   };
+  const formatValueRange = (values, columns) => values.map((value, index) => {
+    const column = columns[index];
+    if (column.length) {
+      const maxValue = +column[column.length - 1].value;
+      if (+value > maxValue) {
+        return String(maxValue);
+      }
+    }
+    return value;
+  });
   const [name$Y] = createNamespace("calendar-day");
   var stdin_default$13 = vue.defineComponent({
     name: name$Y,
@@ -8664,9 +8692,12 @@
         }
       });
       vue.watch(() => props.modelValue, (newValues) => {
+        newValues = formatValueRange(newValues, columns.value);
         if (!isSameValue(newValues, currentValues.value)) {
           currentValues.value = newValues;
         }
+      }, {
+        immediate: true
       });
       const onChange = (...args) => emit("change", ...args);
       const onCancel = (...args) => emit("cancel", ...args);
@@ -10338,7 +10369,8 @@
     rightText: String,
     leftArrow: Boolean,
     placeholder: Boolean,
-    safeAreaInsetTop: Boolean
+    safeAreaInsetTop: Boolean,
+    clickable: truthProp
   };
   var stdin_default$w = vue.defineComponent({
     name: name$r,
@@ -10393,12 +10425,12 @@
         }, [vue.createVNode("div", {
           "class": bem$q("content")
         }, [hasLeft && vue.createVNode("div", {
-          "class": [bem$q("left"), HAPTICS_FEEDBACK],
+          "class": [bem$q("left"), props.clickable ? HAPTICS_FEEDBACK : ""],
           "onClick": onClickLeft
         }, [renderLeft()]), vue.createVNode("div", {
           "class": [bem$q("title"), "van-ellipsis"]
         }, [slots.title ? slots.title() : title]), hasRight && vue.createVNode("div", {
-          "class": [bem$q("right"), HAPTICS_FEEDBACK],
+          "class": [bem$q("right"), props.clickable ? HAPTICS_FEEDBACK : ""],
           "onClick": onClickRight
         }, [renderRight()])])]);
       };
@@ -10654,7 +10686,7 @@
     instance.open(options);
     clearTimeout(timer);
     if (options.duration > 0) {
-      timer = window.setTimeout(closeNotify, options.duration);
+      timer = setTimeout(closeNotify, options.duration);
     }
     return instance;
   }
@@ -13634,6 +13666,7 @@
     showMinus: truthProp,
     showInput: truthProp,
     longPress: truthProp,
+    autoFixed: truthProp,
     allowEmpty: Boolean,
     modelValue: numericProp,
     inputWidth: numericProp,
@@ -13653,7 +13686,7 @@
     setup(props, {
       emit
     }) {
-      const format2 = (value) => {
+      const format2 = (value, autoFixed = true) => {
         const {
           min,
           max,
@@ -13666,7 +13699,7 @@
         value = 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 (isDef(decimalLength)) {
           value = value.toFixed(+decimalLength);
         }
@@ -13750,7 +13783,7 @@
       };
       const onBlur = (event) => {
         const input = event.target;
-        const value = format2(input.value);
+        const value = format2(input.value, props.autoFixed);
         input.value = String(value);
         current2.value = value;
         vue.nextTick(() => {
@@ -14346,13 +14379,14 @@
         if (!isSameValue(newValues, props.modelValue)) {
           emit("update:modelValue", newValues);
         }
-      }, {
-        immediate: true
       });
       vue.watch(() => props.modelValue, (newValues) => {
+        newValues = formatValueRange(newValues, columns.value);
         if (!isSameValue(newValues, currentValues.value)) {
           currentValues.value = newValues;
         }
+      }, {
+        immediate: true
       });
       const onChange = (...args) => emit("change", ...args);
       const onCancel = (...args) => emit("cancel", ...args);
@@ -15756,7 +15790,7 @@
       });
     }
   };
-  const version = "4.0.0-rc.3";
+  const version = "4.0.0-rc.5";
   function install(app) {
     const components = [
       ActionBar,