vant 3.6.2 → 3.6.4

package/lib/index.d.ts

@@ -91,4 +91,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "3.6.2";
+export const version: "3.6.4";

package/lib/index.js

@@ -196,7 +196,7 @@ __reExport(stdin_exports, require("./tag"), 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 = "3.6.2";
+const version = "3.6.4";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,

package/lib/tab/Tab.js

@@ -78,6 +78,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();
@@ -101,7 +111,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

@@ -172,7 +172,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;
@@ -180,18 +180,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) {
@@ -285,13 +294,14 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     };
     const renderHeader = () => {
-      var _a2, _b2;
+      var _a2, _b2, _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
         }]
@@ -304,7 +314,13 @@ var stdin_default = (0, import_vue2.defineComponent)({
         }]),
         "style": navStyle.value,
         "aria-orientation": "horizontal"
-      }, [(_a2 = slots["nav-left"]) == null ? void 0 : _a2.call(slots), renderNav(), renderLine(), (_b2 = slots["nav-right"]) == null ? void 0 : _b2.call(slots)])]);
+      }, [(_a2 = slots["nav-left"]) == null ? void 0 : _a2.call(slots), renderNav(), renderLine(), (_b2 = slots["nav-right"]) == null ? void 0 : _b2.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) => {
@@ -321,15 +337,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) {
@@ -365,36 +374,30 @@ var stdin_default = (0, import_vue2.defineComponent)({
       currentName,
       scrollIntoView
     });
-    return () => {
-      var _a2;
-      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 _a3;
-          return [renderHeader(), (_a3 = slots["nav-bottom"]) == null ? void 0 : _a3.call(slots)];
-        }
-      }) : [renderHeader(), (_a2 = slots["nav-bottom"]) == null ? void 0 : _a2.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 _a3;
-          return [(_a3 = slots.default) == null ? void 0 : _a3.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 _a2;
+        return [(_a2 = slots.default) == null ? void 0 : _a2.call(slots)];
+      }
+    })]);
   }
 });

package/lib/utils/basic.js

@@ -25,6 +25,7 @@ __export(stdin_exports, {
   toArray: () => toArray
 });
 module.exports = __toCommonJS(stdin_exports);
+var import_validate = require("./validate");
 function noop() {
 }
 const extend = Object.assign;
@@ -34,7 +35,7 @@ function get(object, path) {
   let result = object;
   keys.forEach((key) => {
     var _a;
-    result = (_a = result[key]) != null ? _a : "";
+    result = (0, import_validate.isObject)(result) ? (_a = result[key]) != null ? _a : "" : "";
   });
   return result;
 }

package/lib/vant.cjs.js

@@ -3,6 +3,17 @@ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toString
 const use = require("@vant/use");
 const vue = require("vue");
 const popperjs = require("@vant/popperjs");
+const isDef = (val) => val !== void 0 && val !== null;
+const isFunction = (val) => typeof val === "function";
+const isObject = (val) => val !== null && typeof val === "object";
+const isPromise = (val) => isObject(val) && isFunction(val.then) && isFunction(val.catch);
+const isDate = (val) => Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
+function isMobile(value) {
+  value = value.replace(/[^-|\d]/g, "");
+  return /^((\+86)|(86))?(1)\d{10}$/.test(value) || /^0[0-9-]{10,13}$/.test(value);
+}
+const isNumeric = (val) => typeof val === "number" || /^\d+(\.\d+)?$/.test(val);
+const isIOS$1 = () => inBrowser ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()) : false;
 function noop() {
 }
 const extend = Object.assign;
@@ -12,7 +23,7 @@ function get(object, path) {
   let result = object;
   keys.forEach((key) => {
     var _a;
-    result = (_a = result[key]) != null ? _a : "";
+    result = isObject(result) ? (_a = result[key]) != null ? _a : "" : "";
   });
   return result;
 }
@@ -51,17 +62,6 @@ const makeStringProp = (defaultVal) => ({
   type: String,
   default: defaultVal
 });
-const isDef = (val) => val !== void 0 && val !== null;
-const isFunction = (val) => typeof val === "function";
-const isObject = (val) => val !== null && typeof val === "object";
-const isPromise = (val) => isObject(val) && isFunction(val.then) && isFunction(val.catch);
-const isDate = (val) => Object.prototype.toString.call(val) === "[object Date]" && !Number.isNaN(val.getTime());
-function isMobile(value) {
-  value = value.replace(/[^-|\d]/g, "");
-  return /^((\+86)|(86))?(1)\d{10}$/.test(value) || /^0[0-9-]{10,13}$/.test(value);
-}
-const isNumeric = (val) => typeof val === "number" || /^\d+(\.\d+)?$/.test(val);
-const isIOS$1 = () => inBrowser ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()) : false;
 function getScrollTop(el) {
   const top = "scrollTop" in el ? el.scrollTop : el.pageYOffset;
   return Math.max(top, 0);
@@ -5126,6 +5126,7 @@ const imageProps = {
   fit: String,
   position: String,
   round: Boolean,
+  block: Boolean,
   width: numericProp,
   height: numericProp,
   radius: numericProp,
@@ -5254,7 +5255,8 @@ var stdin_default$17 = vue.defineComponent({
       var _a;
       return vue.createVNode("div", {
         "class": bem$10({
-          round: props.round
+          round: props.round,
+          block: props.block
         }),
         "style": style.value
       }, [renderImage(), renderPlaceholder(), (_a = slots.default) == null ? void 0 : _a.call(slots)]);
@@ -6174,7 +6176,7 @@ var stdin_default$11 = vue.defineComponent({
         index += diff;
       }
     };
-    const setCurrentIndex = (currentIndex) => {
+    const setCurrentIndex = (currentIndex, skipScrollIntoView) => {
       const newIndex = findAvailableTab(currentIndex);
       if (!isDef(newIndex)) {
         return;
@@ -6182,18 +6184,27 @@ var stdin_default$11 = vue.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) {
+        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) {
@@ -6287,13 +6298,14 @@ var stdin_default$11 = vue.defineComponent({
       }
     };
     const renderHeader = () => {
-      var _a2, _b2;
+      var _a2, _b2, _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$W("wrap"), {
           [BORDER_TOP_BOTTOM]: type === "line" && border
         }]
@@ -6306,7 +6318,13 @@ var stdin_default$11 = vue.defineComponent({
         }]),
         "style": navStyle.value,
         "aria-orientation": "horizontal"
-      }, [(_a2 = slots["nav-left"]) == null ? void 0 : _a2.call(slots), renderNav(), renderLine(), (_b2 = slots["nav-right"]) == null ? void 0 : _b2.call(slots)])]);
+      }, [(_a2 = slots["nav-left"]) == null ? void 0 : _a2.call(slots), renderNav(), renderLine(), (_b2 = slots["nav-right"]) == null ? void 0 : _b2.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) => {
@@ -6323,15 +6341,8 @@ var stdin_default$11 = vue.defineComponent({
         });
       }
     });
-    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) {
@@ -6367,37 +6378,31 @@ var stdin_default$11 = vue.defineComponent({
       currentName,
       scrollIntoView
     });
-    return () => {
-      var _a2;
-      return vue.createVNode("div", {
-        "ref": root,
-        "class": bem$W([props.type])
-      }, [props.sticky ? vue.createVNode(Sticky, {
-        "container": root.value,
-        "offsetTop": offsetTopPx.value,
-        "onScroll": onStickyScroll
-      }, {
-        default: () => {
-          var _a3;
-          return [renderHeader(), (_a3 = slots["nav-bottom"]) == null ? void 0 : _a3.call(slots)];
-        }
-      }) : [renderHeader(), (_a2 = slots["nav-bottom"]) == null ? void 0 : _a2.call(slots)], vue.createVNode(stdin_default$12, {
-        "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 _a3;
-          return [(_a3 = slots.default) == null ? void 0 : _a3.call(slots)];
-        }
-      })]);
-    };
+    return () => vue.createVNode("div", {
+      "ref": root,
+      "class": bem$W([props.type])
+    }, [props.sticky ? vue.createVNode(Sticky, {
+      "container": root.value,
+      "offsetTop": offsetTopPx.value,
+      "onScroll": onStickyScroll
+    }, {
+      default: () => [renderHeader()]
+    }) : renderHeader(), vue.createVNode(stdin_default$12, {
+      "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)];
+      }
+    })]);
   }
 });
 const TAB_STATUS_KEY = Symbol();
@@ -6524,6 +6529,16 @@ var stdin_default$$ = vue.defineComponent({
       }
       return isActive;
     });
+    const hasInactiveClass = vue.ref(!active.value);
+    vue.watch(active, (val) => {
+      if (val) {
+        hasInactiveClass.value = false;
+      } else {
+        use.doubleRaf(() => {
+          hasInactiveClass.value = true;
+        });
+      }
+    });
     vue.watch(() => props.title, () => {
       parent.setLine();
       parent.scrollIntoView();
@@ -6547,7 +6562,7 @@ var stdin_default$$ = vue.defineComponent({
           "id": id,
           "role": "tabpanel",
           "class": bem$U("panel-wrapper", {
-            inactive: !active.value
+            inactive: hasInactiveClass.value
           }),
           "tabindex": active.value ? 0 : -1,
           "aria-hidden": !active.value,
@@ -14933,7 +14948,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.6.2";
+const version = "3.6.4";
 function install(app) {
   const components = [
     ActionBar,