vant 3.6.2 → 3.6.4

package/lib/vant.es.js

@@ -1,6 +1,17 @@
 import { useWindowSize, useRect, useChildren, useParent, onMountedOrActivated, getScrollParent, useEventListener, CUSTOM_FIELD_INJECTION_KEY, useCustomFieldValue, useToggle, raf, useScrollParent, usePageVisibility, doubleRaf, cancelRaf, useCountDown, useClickAway, inBrowser as inBrowser$1 } from "@vant/use";
 import { unref, ref, reactive, inject, watch, onMounted, nextTick, createVNode, defineComponent, getCurrentInstance, computed, provide, watchEffect, mergeProps, onDeactivated, onBeforeUnmount, Transition, withDirectives, vShow, onActivated, Teleport, Fragment, createTextVNode, createApp, onUnmounted, onBeforeUpdate, resolveDirective, withKeys, onUpdated, h } from "vue";
 import { offsetModifier, createPopper } from "@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;
@@ -10,7 +21,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;
 }
@@ -49,17 +60,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);
@@ -5124,6 +5124,7 @@ const imageProps = {
   fit: String,
   position: String,
   round: Boolean,
+  block: Boolean,
   width: numericProp,
   height: numericProp,
   radius: numericProp,
@@ -5252,7 +5253,8 @@ var stdin_default$17 = defineComponent({
       var _a;
       return 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)]);
@@ -6172,7 +6174,7 @@ var stdin_default$11 = defineComponent({
         index += diff;
       }
     };
-    const setCurrentIndex = (currentIndex) => {
+    const setCurrentIndex = (currentIndex, skipScrollIntoView) => {
       const newIndex = findAvailableTab(currentIndex);
       if (!isDef(newIndex)) {
         return;
@@ -6180,18 +6182,27 @@ var stdin_default$11 = 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) {
@@ -6285,13 +6296,14 @@ var stdin_default$11 = defineComponent({
       }
     };
     const renderHeader = () => {
-      var _a2, _b2;
+      var _a2, _b2, _c;
       const {
         type,
-        border
+        border,
+        sticky
       } = props;
-      return createVNode("div", {
-        "ref": wrapRef,
+      const Header = [createVNode("div", {
+        "ref": sticky ? void 0 : wrapRef,
         "class": [bem$W("wrap"), {
           [BORDER_TOP_BOTTOM]: type === "line" && border
         }]
@@ -6304,7 +6316,13 @@ var stdin_default$11 = 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 createVNode("div", {
+          "ref": wrapRef
+        }, [Header]);
+      }
+      return Header;
     };
     watch([() => props.color, windowWidth], setLine);
     watch(() => props.active, (value) => {
@@ -6321,15 +6339,8 @@ var stdin_default$11 = defineComponent({
         });
       }
     });
-    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);
       nextTick(() => {
         state.inited = true;
         if (wrapRef.value) {
@@ -6365,37 +6376,31 @@ var stdin_default$11 = defineComponent({
       currentName,
       scrollIntoView
     });
-    return () => {
-      var _a2;
-      return createVNode("div", {
-        "ref": root,
-        "class": bem$W([props.type])
-      }, [props.sticky ? 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)], 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 () => createVNode("div", {
+      "ref": root,
+      "class": bem$W([props.type])
+    }, [props.sticky ? createVNode(Sticky, {
+      "container": root.value,
+      "offsetTop": offsetTopPx.value,
+      "onScroll": onStickyScroll
+    }, {
+      default: () => [renderHeader()]
+    }) : renderHeader(), 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();
@@ -6522,6 +6527,16 @@ var stdin_default$$ = defineComponent({
       }
       return isActive;
     });
+    const hasInactiveClass = ref(!active.value);
+    watch(active, (val) => {
+      if (val) {
+        hasInactiveClass.value = false;
+      } else {
+        doubleRaf(() => {
+          hasInactiveClass.value = true;
+        });
+      }
+    });
     watch(() => props.title, () => {
       parent.setLine();
       parent.scrollIntoView();
@@ -6545,7 +6560,7 @@ var stdin_default$$ = 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,
@@ -14931,7 +14946,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.6.2";
+const version = "3.6.4";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -2,6 +2,17 @@
   typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("vue")) : typeof define === "function" && define.amd ? define(["exports", "vue"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global.vant = {}, global.Vue));
 })(this, function(exports2, vue) {
   "use strict";
+  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$1 ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()) : false;
   function noop() {
   }
   const extend = Object.assign;
@@ -11,7 +22,7 @@
     let result = object;
     keys.forEach((key) => {
       var _a;
-      result = (_a = result[key]) != null ? _a : "";
+      result = isObject(result) ? (_a = result[key]) != null ? _a : "" : "";
     });
     return result;
   }
@@ -418,17 +429,6 @@
       });
     }
   }
-  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$1 ? /ios|iphone|ipad|ipod/.test(navigator.userAgent.toLowerCase()) : false;
   function getScrollTop(el) {
     const top2 = "scrollTop" in el ? el.scrollTop : el.pageYOffset;
     return Math.max(top2, 0);
@@ -5482,6 +5482,7 @@
     fit: String,
     position: String,
     round: Boolean,
+    block: Boolean,
     width: numericProp,
     height: numericProp,
     radius: numericProp,
@@ -5610,7 +5611,8 @@
         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)]);
@@ -6520,7 +6522,7 @@
           index += diff;
         }
       };
-      const setCurrentIndex = (currentIndex) => {
+      const setCurrentIndex = (currentIndex, skipScrollIntoView) => {
         const newIndex = findAvailableTab(currentIndex);
         if (!isDef(newIndex)) {
           return;
@@ -6528,18 +6530,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) {
@@ -6633,13 +6644,14 @@
         }
       };
       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
           }]
@@ -6652,7 +6664,13 @@
           }]),
           "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) => {
@@ -6669,15 +6687,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) {
@@ -6713,37 +6724,31 @@
         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();
@@ -6864,6 +6869,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();
@@ -6887,7 +6902,7 @@
             "id": id,
             "role": "tabpanel",
             "class": bem$U("panel-wrapper", {
-              inactive: !active.value
+              inactive: hasInactiveClass.value
             }),
             "tabindex": active.value ? 0 : -1,
             "aria-hidden": !active.value,
@@ -16130,7 +16145,7 @@
       });
     }
   };
-  const version = "3.6.2";
+  const version = "3.6.4";
   function install(app) {
     const components = [
       ActionBar,