vant 4.8.2 → 4.8.3

package/lib/vant.js

@@ -2351,6 +2351,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 +2383,7 @@
         }
       }
       return res;
-    } else if (isString(value)) {
-      return value;
-    } else if (isObject(value)) {
+    } else if (isString(value) || isObject(value)) {
       return value;
     }
   }
@@ -2596,7 +2599,7 @@
           if (container) {
             const containerRect = useRect(container);
             const difference = containerRect.bottom - offset2.value - state.height;
-            state.fixed = offset2.value > rootRect.top && containerRect.bottom > 0;
+            state.fixed = offset2.value >= rootRect.top && containerRect.bottom > 0;
             state.transform = difference < 0 ? difference : 0;
           } else {
             state.fixed = offset2.value > rootRect.top;
@@ -5023,7 +5026,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 +5046,8 @@
     overlayClass: unknownProp,
     overlayStyle: Object,
     closeOnClick: Boolean,
-    closeOnClickOverlay: Boolean
+    closeOnClickOverlay: Boolean,
+    zIndex: numericProp
   };
   var stdin_default$1u = vue.defineComponent({
     name: name$1k,
@@ -5133,7 +5137,7 @@
         "onClick": onClick,
         "onClosed": clearTimer,
         "onUpdate:show": updateShow
-      }, pick(props2, popupInheritProps)), {
+      }, pick(props2, popupInheritProps$1)), {
         default: () => [renderIcon(), renderMessage()]
       });
     }
@@ -10902,6 +10906,7 @@
     rootHeight: makeRequiredProp(Number),
     disableZoom: Boolean,
     doubleScale: Boolean,
+    closeOnClickImage: Boolean,
     closeOnClickOverlay: Boolean
   };
   var stdin_default$N = vue.defineComponent({
@@ -11066,7 +11071,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 +11236,7 @@
     startPosition: makeNumericProp(0),
     showIndicators: Boolean,
     closeOnPopstate: truthProp,
+    closeOnClickImage: truthProp,
     closeOnClickOverlay: truthProp,
     closeIconPosition: makeStringProp("top-right"),
     teleport: [String, Object]
@@ -11318,6 +11329,7 @@
           "rootHeight": state.rootHeight,
           "disableZoom": state.disableZoom,
           "doubleScale": props2.doubleScale,
+          "closeOnClickImage": props2.closeOnClickImage,
           "closeOnClickOverlay": props2.closeOnClickOverlay,
           "onScale": emitScale,
           "onClose": emitClose,
@@ -12124,6 +12136,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 +12155,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 +16212,8 @@
     props: textEllipsisProps,
     emits: ["clickAction"],
     setup(props2, {
-      emit
+      emit,
+      slots
     }) {
       const text = vue.ref("");
       const expanded = vue.ref(false);
@@ -16311,10 +16321,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 +17981,7 @@
       });
     }
   };
-  const version = "4.8.2";
+  const version = "4.8.3";
   function install(app) {
     const components = [
       ActionBar,