vant 4.8.2 → 4.8.4

package/lib/vant.es.js

@@ -1,4 +1,4 @@
-import { unref, ref, reactive, inject, watch, onMounted, nextTick, createVNode, defineComponent, getCurrentInstance, computed, onActivated, onDeactivated, onBeforeUnmount, provide, watchEffect, mergeProps, Transition, withDirectives, vShow, Teleport, Fragment, onBeforeUpdate, Comment, createTextVNode, onUnmounted, createApp, resolveDirective, withKeys, onUpdated, Text, h } from "vue";
+import { unref, ref, reactive, inject, watch, onMounted, nextTick, createVNode, defineComponent, getCurrentInstance, computed, onActivated, onDeactivated, onBeforeUnmount, provide, watchEffect, mergeProps, Transition, withDirectives, vShow, Teleport, Fragment, onBeforeUpdate, Comment, createTextVNode, onUnmounted, createApp, resolveDirective, withKeys, toRaw, onUpdated, Text, h } from "vue";
 import { useWindowSize, useRect, useChildren, useParent, onMountedOrActivated, getScrollParent, useEventListener, cancelRaf, raf, useScrollParent, usePageVisibility, doubleRaf, CUSTOM_FIELD_INJECTION_KEY, useCustomFieldValue, inBrowser as inBrowser$1, useToggle, useCountDown, useClickAway } from "@vant/use";
 import { normalizeClass, stringifyStyle, normalizeStyle } from "@vue/shared";
 import { offsetModifier, createPopper } from "@vant/popperjs";
@@ -1927,7 +1927,11 @@ var stdin_default$1H = defineComponent({
     const onCancel = () => emit("cancel");
     const onConfirm = () => emit("confirm");
     const renderCancel = () => {
-      const text = props2.cancelButtonText || t$k("cancel");
+      var _a;
+      const text = (_a = props2.cancelButtonText) != null ? _a : t$k("cancel");
+      if (!slots.cancel && !text) {
+        return;
+      }
       return createVNode("button", {
         "type": "button",
         "class": [bem$1u("cancel"), HAPTICS_FEEDBACK],
@@ -1935,7 +1939,11 @@ var stdin_default$1H = defineComponent({
       }, [slots.cancel ? slots.cancel() : text]);
     };
     const renderConfirm = () => {
-      const text = props2.confirmButtonText || t$k("confirm");
+      var _a;
+      const text = (_a = props2.confirmButtonText) != null ? _a : t$k("confirm");
+      if (!slots.confirm && !text) {
+        return;
+      }
       return createVNode("button", {
         "type": "button",
         "class": [bem$1u("confirm"), HAPTICS_FEEDBACK],
@@ -4562,7 +4570,7 @@ function lockClick(lock) {
   }
 }
 const [name$1k, bem$1g] = createNamespace("toast");
-const popupInheritProps = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay"];
+const popupInheritProps$1 = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay", "zIndex"];
 const toastProps = {
   icon: String,
   show: Boolean,
@@ -4582,7 +4590,8 @@ const toastProps = {
   overlayClass: unknownProp,
   overlayStyle: Object,
   closeOnClick: Boolean,
-  closeOnClickOverlay: Boolean
+  closeOnClickOverlay: Boolean,
+  zIndex: numericProp
 };
 var stdin_default$1u = defineComponent({
   name: name$1k,
@@ -4672,7 +4681,7 @@ var stdin_default$1u = defineComponent({
       "onClick": onClick,
       "onClosed": clearTimer,
       "onUpdate:show": updateShow
-    }, pick(props2, popupInheritProps)), {
+    }, pick(props2, popupInheritProps$1)), {
       default: () => [renderIcon(), renderMessage()]
     });
   }
@@ -9630,7 +9639,7 @@ var stdin_default$U = defineComponent({
       const {
         disabled,
         titleClass
-      } = item;
+      } = toRaw(item.$props);
       return createVNode("div", {
         "id": `${id}-${index}`,
         "role": "button",
@@ -10470,6 +10479,7 @@ const imagePreviewItemProps = {
   rootHeight: makeRequiredProp(Number),
   disableZoom: Boolean,
   doubleScale: Boolean,
+  closeOnClickImage: Boolean,
   closeOnClickOverlay: Boolean
 };
 var stdin_default$N = defineComponent({
@@ -10634,7 +10644,12 @@ var stdin_default$N = defineComponent({
     };
     const checkClose = (event) => {
       var _a;
-      const isClickOverlay = event.target === ((_a = swipeItem.value) == null ? void 0 : _a.$el);
+      const swipeItemEl = (_a = swipeItem.value) == null ? void 0 : _a.$el;
+      const imageEl = swipeItemEl.firstElementChild;
+      const isClickOverlay = event.target === swipeItemEl;
+      const isClickImage = imageEl == null ? void 0 : imageEl.contains(event.target);
+      if (!props2.closeOnClickImage && isClickImage)
+        return;
       if (!props2.closeOnClickOverlay && isClickOverlay)
         return;
       emit("close");
@@ -10794,6 +10809,7 @@ const imagePreviewProps = {
   startPosition: makeNumericProp(0),
   showIndicators: Boolean,
   closeOnPopstate: truthProp,
+  closeOnClickImage: truthProp,
   closeOnClickOverlay: truthProp,
   closeIconPosition: makeStringProp("top-right"),
   teleport: [String, Object]
@@ -10886,6 +10902,7 @@ var stdin_default$M = defineComponent({
         "rootHeight": state.rootHeight,
         "disableZoom": state.disableZoom,
         "doubleScale": props2.doubleScale,
+        "closeOnClickImage": props2.closeOnClickImage,
         "closeOnClickOverlay": props2.closeOnClickOverlay,
         "onScale": emitScale,
         "onClose": emitClose,
@@ -11695,6 +11712,7 @@ var stdin_default$H = defineComponent({
 });
 const NoticeBar = withInstall(stdin_default$H);
 const [name$y, bem$x] = createNamespace("notify");
+const popupInheritProps = ["lockScroll", "position", "show", "teleport", "zIndex"];
 const notifyProps = extend({}, popupSharedProps, {
   type: makeStringProp("danger"),
   color: String,
@@ -11713,20 +11731,16 @@ var stdin_default$G = defineComponent({
     slots
   }) {
     const updateShow = (show) => emit("update:show", show);
-    return () => createVNode(Popup, {
-      "show": props2.show,
+    return () => createVNode(Popup, mergeProps({
       "class": [bem$x([props2.type]), props2.className],
       "style": {
         color: props2.color,
         background: props2.background
       },
       "overlay": false,
-      "zIndex": props2.zIndex,
-      "position": props2.position,
       "duration": 0.2,
-      "lockScroll": props2.lockScroll,
       "onUpdate:show": updateShow
-    }, {
+    }, pick(props2, popupInheritProps)), {
       default: () => [slots.default ? slots.default() : props2.message]
     });
   }
@@ -14971,7 +14985,8 @@ var stdin_default$9 = defineComponent({
   props: textEllipsisProps,
   emits: ["clickAction"],
   setup(props2, {
-    emit
+    emit,
+    slots
   }) {
     const text = ref("");
     const expanded = ref(false);
@@ -15079,10 +15094,15 @@ var stdin_default$9 = defineComponent({
       toggle();
       emit("clickAction", event);
     };
-    const renderAction = () => createVNode("span", {
-      "class": bem$3("action"),
-      "onClick": onClickAction
-    }, [actionText.value]);
+    const renderAction = () => {
+      const action = slots.action ? slots.action({
+        expanded: expanded.value
+      }) : actionText.value;
+      return createVNode("span", {
+        "class": bem$3("action"),
+        "onClick": onClickAction
+      }, [action]);
+    };
     onMounted(calcEllipsised);
     watch([windowWidth, () => [props2.content, props2.rows, props2.position]], calcEllipsised);
     useExpose({
@@ -16754,7 +16774,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.8.2";
+const version = "4.8.4";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -2317,7 +2317,11 @@
       const onCancel = () => emit("cancel");
       const onConfirm = () => emit("confirm");
       const renderCancel = () => {
-        const text = props2.cancelButtonText || t$k("cancel");
+        var _a;
+        const text = (_a = props2.cancelButtonText) != null ? _a : t$k("cancel");
+        if (!slots.cancel && !text) {
+          return;
+        }
         return vue.createVNode("button", {
           "type": "button",
           "class": [bem$1u("cancel"), HAPTICS_FEEDBACK],
@@ -2325,7 +2329,11 @@
         }, [slots.cancel ? slots.cancel() : text]);
       };
       const renderConfirm = () => {
-        const text = props2.confirmButtonText || t$k("confirm");
+        var _a;
+        const text = (_a = props2.confirmButtonText) != null ? _a : t$k("confirm");
+        if (!slots.confirm && !text) {
+          return;
+        }
         return vue.createVNode("button", {
           "type": "button",
           "class": [bem$1u("confirm"), HAPTICS_FEEDBACK],
@@ -2351,6 +2359,11 @@
     });
     return propRef;
   };
+  /**
+  * @vue/shared v3.4.12
+  * (c) 2018-present Yuxi (Evan) You and Vue contributors
+  * @license MIT
+  **/
   const isArray = Array.isArray;
   const isString = (val) => typeof val === "string";
   const isObject = (val) => val !== null && typeof val === "object";
@@ -2378,9 +2391,7 @@
         }
       }
       return res;
-    } else if (isString(value)) {
-      return value;
-    } else if (isObject(value)) {
+    } else if (isString(value) || isObject(value)) {
       return value;
     }
   }
@@ -5023,7 +5034,7 @@
     }
   }
   const [name$1k, bem$1g] = createNamespace("toast");
-  const popupInheritProps = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay"];
+  const popupInheritProps$1 = ["show", "overlay", "teleport", "transition", "overlayClass", "overlayStyle", "closeOnClickOverlay", "zIndex"];
   const toastProps = {
     icon: String,
     show: Boolean,
@@ -5043,7 +5054,8 @@
     overlayClass: unknownProp,
     overlayStyle: Object,
     closeOnClick: Boolean,
-    closeOnClickOverlay: Boolean
+    closeOnClickOverlay: Boolean,
+    zIndex: numericProp
   };
   var stdin_default$1u = vue.defineComponent({
     name: name$1k,
@@ -5133,7 +5145,7 @@
         "onClick": onClick,
         "onClosed": clearTimer,
         "onUpdate:show": updateShow
-      }, pick(props2, popupInheritProps)), {
+      }, pick(props2, popupInheritProps$1)), {
         default: () => [renderIcon(), renderMessage()]
       });
     }
@@ -10068,7 +10080,7 @@
         const {
           disabled,
           titleClass
-        } = item;
+        } = vue.toRaw(item.$props);
         return vue.createVNode("div", {
           "id": `${id}-${index}`,
           "role": "button",
@@ -10902,6 +10914,7 @@
     rootHeight: makeRequiredProp(Number),
     disableZoom: Boolean,
     doubleScale: Boolean,
+    closeOnClickImage: Boolean,
     closeOnClickOverlay: Boolean
   };
   var stdin_default$N = vue.defineComponent({
@@ -11066,7 +11079,12 @@
       };
       const checkClose = (event) => {
         var _a;
-        const isClickOverlay = event.target === ((_a = swipeItem.value) == null ? void 0 : _a.$el);
+        const swipeItemEl = (_a = swipeItem.value) == null ? void 0 : _a.$el;
+        const imageEl = swipeItemEl.firstElementChild;
+        const isClickOverlay = event.target === swipeItemEl;
+        const isClickImage = imageEl == null ? void 0 : imageEl.contains(event.target);
+        if (!props2.closeOnClickImage && isClickImage)
+          return;
         if (!props2.closeOnClickOverlay && isClickOverlay)
           return;
         emit("close");
@@ -11226,6 +11244,7 @@
     startPosition: makeNumericProp(0),
     showIndicators: Boolean,
     closeOnPopstate: truthProp,
+    closeOnClickImage: truthProp,
     closeOnClickOverlay: truthProp,
     closeIconPosition: makeStringProp("top-right"),
     teleport: [String, Object]
@@ -11318,6 +11337,7 @@
           "rootHeight": state.rootHeight,
           "disableZoom": state.disableZoom,
           "doubleScale": props2.doubleScale,
+          "closeOnClickImage": props2.closeOnClickImage,
           "closeOnClickOverlay": props2.closeOnClickOverlay,
           "onScale": emitScale,
           "onClose": emitClose,
@@ -12124,6 +12144,7 @@
   });
   const NoticeBar = withInstall(stdin_default$H);
   const [name$y, bem$x] = createNamespace("notify");
+  const popupInheritProps = ["lockScroll", "position", "show", "teleport", "zIndex"];
   const notifyProps = extend({}, popupSharedProps, {
     type: makeStringProp("danger"),
     color: String,
@@ -12142,20 +12163,16 @@
       slots
     }) {
       const updateShow = (show) => emit("update:show", show);
-      return () => vue.createVNode(Popup, {
-        "show": props2.show,
+      return () => vue.createVNode(Popup, vue.mergeProps({
         "class": [bem$x([props2.type]), props2.className],
         "style": {
           color: props2.color,
           background: props2.background
         },
         "overlay": false,
-        "zIndex": props2.zIndex,
-        "position": props2.position,
         "duration": 0.2,
-        "lockScroll": props2.lockScroll,
         "onUpdate:show": updateShow
-      }, {
+      }, pick(props2, popupInheritProps)), {
         default: () => [slots.default ? slots.default() : props2.message]
       });
     }
@@ -16203,7 +16220,8 @@
     props: textEllipsisProps,
     emits: ["clickAction"],
     setup(props2, {
-      emit
+      emit,
+      slots
     }) {
       const text = vue.ref("");
       const expanded = vue.ref(false);
@@ -16311,10 +16329,15 @@
         toggle();
         emit("clickAction", event);
       };
-      const renderAction = () => vue.createVNode("span", {
-        "class": bem$3("action"),
-        "onClick": onClickAction
-      }, [actionText.value]);
+      const renderAction = () => {
+        const action = slots.action ? slots.action({
+          expanded: expanded.value
+        }) : actionText.value;
+        return vue.createVNode("span", {
+          "class": bem$3("action"),
+          "onClick": onClickAction
+        }, [action]);
+      };
       vue.onMounted(calcEllipsised);
       vue.watch([windowWidth, () => [props2.content, props2.rows, props2.position]], calcEllipsised);
       useExpose({
@@ -17966,7 +17989,7 @@
       });
     }
   };
-  const version = "4.8.2";
+  const version = "4.8.4";
   function install(app) {
     const components = [
       ActionBar,