vant 4.0.0-rc.2 → 4.0.0-rc.4

package/lib/vant.js

@@ -2999,7 +2999,7 @@
           index += diff;
         }
       };
-      const setCurrentIndex = (currentIndex) => {
+      const setCurrentIndex = (currentIndex, skipScrollIntoView) => {
         const newIndex = findAvailableTab(currentIndex);
         if (!isDef(newIndex)) {
           return;
@@ -3014,11 +3014,18 @@
             emit("change", newName, newTab.title);
           }
         }
+        if (!skipScrollIntoView) {
+          scrollIntoView();
+        }
+        setLine();
+        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) {
@@ -3145,15 +3152,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) {
@@ -3340,6 +3340,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 +3373,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 +4259,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();
@@ -10594,6 +10605,7 @@
           background: props.background
         },
         "overlay": false,
+        "zIndex": props.zIndex,
         "position": props.position,
         "duration": 0.2,
         "lockScroll": props.lockScroll,
@@ -10653,7 +10665,7 @@
     instance.open(options);
     clearTimeout(timer);
     if (options.duration > 0) {
-      timer = window.setTimeout(closeNotify, options.duration);
+      timer = setTimeout(closeNotify, options.duration);
     }
     return instance;
   }
@@ -15755,7 +15767,7 @@
       });
     }
   };
-  const version = "4.0.0-rc.2";
+  const version = "4.0.0-rc.4";
   function install(app) {
     const components = [
       ActionBar,