vant 4.6.4-beta.2 → 4.6.5

package/lib/vant.es.js

@@ -9416,7 +9416,8 @@ const dropdownMenuProps = {
   direction: makeStringProp("down"),
   activeColor: String,
   closeOnClickOutside: truthProp,
-  closeOnClickOverlay: truthProp
+  closeOnClickOverlay: truthProp,
+  swipeThreshold: numericProp
 };
 const DROPDOWN_KEY = Symbol(name$K);
 var stdin_default$T = defineComponent({
@@ -9435,6 +9436,7 @@ var stdin_default$T = defineComponent({
     } = useChildren(DROPDOWN_KEY);
     const scrollParent = useScrollParent(root);
     const opened = computed(() => children.some((item) => item.state.showWrapper));
+    const scrollable = computed(() => props2.swipeThreshold && children.length > +props2.swipeThreshold);
     const barStyle = computed(() => {
       if (opened.value && isDef(props2.zIndex)) {
         return {
@@ -9491,7 +9493,8 @@ var stdin_default$T = defineComponent({
         "role": "button",
         "tabindex": disabled ? void 0 : 0,
         "class": [bem$K("item", {
-          disabled
+          disabled,
+          grow: scrollable.value
         }), {
           [HAPTICS_FEEDBACK]: !disabled
         }],
@@ -9535,7 +9538,8 @@ var stdin_default$T = defineComponent({
         "ref": barRef,
         "style": barStyle.value,
         "class": bem$K("bar", {
-          opened: opened.value
+          opened: opened.value,
+          scrollable: scrollable.value
         })
       }, [children.map(renderTitle)]), (_a = slots.default) == null ? void 0 : _a.call(slots)]);
     };
@@ -9734,11 +9738,13 @@ const floatingBubbleProps = {
 const [name$I, bem$I] = createNamespace("floating-bubble");
 var stdin_default$R = defineComponent({
   name: name$I,
+  inheritAttrs: false,
   props: floatingBubbleProps,
   emits: ["click", "update:offset", "offsetChange"],
   setup(props2, {
     slots,
-    emit
+    emit,
+    attrs
   }) {
     const rootRef = ref();
     const state = ref({
@@ -9859,7 +9865,7 @@ var stdin_default$R = defineComponent({
       }
     });
     return () => {
-      const Content = withDirectives(createVNode("div", {
+      const Content = withDirectives(createVNode("div", mergeProps({
         "class": bem$I(),
         "ref": rootRef,
         "onTouchstartPassive": onTouchStart,
@@ -9867,7 +9873,7 @@ var stdin_default$R = defineComponent({
         "onTouchcancel": onTouchEnd,
         "onClick": onClick,
         "style": rootStyle.value
-      }, [slots.default ? slots.default() : createVNode(stdin_default$1P, {
+      }, attrs), [slots.default ? slots.default() : createVNode(stdin_default$1P, {
         "name": props2.icon,
         "class": bem$I("icon")
       }, null)]), [[vShow, show.value]]);
@@ -9885,10 +9891,10 @@ const floatingPanelProps = {
   anchors: makeArrayProp(),
   duration: makeNumericProp(0.2),
   contentDraggable: truthProp,
+  lockScroll: Boolean,
   safeAreaInsetBottom: truthProp
 };
 const [name$H, bem$H] = createNamespace("floating-panel");
-const DAMP = 0.2;
 var stdin_default$Q = defineComponent({
   name: name$H,
   props: floatingPanelProps,
@@ -9897,6 +9903,7 @@ var stdin_default$Q = defineComponent({
     emit,
     slots
   }) {
+    const DAMP = 0.2;
     const rootRef = ref();
     const contentRef = ref();
     const height = useSyncPropRef(() => +props2.height, (value) => emit("update:height", value));
@@ -9929,24 +9936,28 @@ var stdin_default$Q = defineComponent({
       return moveY;
     };
     let startY;
+    let maxScroll = -1;
     const touch = useTouch();
     const onTouchstart = (e) => {
       touch.start(e);
       dragging.value = true;
       startY = -height.value;
+      maxScroll = -1;
     };
     const onTouchmove = (e) => {
       var _a;
       touch.move(e);
       const target = e.target;
       if (contentRef.value === target || ((_a = contentRef.value) == null ? void 0 : _a.contains(target))) {
+        const {
+          scrollTop
+        } = contentRef.value;
+        maxScroll = Math.max(maxScroll, scrollTop);
         if (!props2.contentDraggable)
           return;
         if (-startY < boundary.value.max) {
-          if (e.cancelable)
-            e.preventDefault();
-          e.stopPropagation();
-        } else if (!(contentRef.value.scrollTop <= 0 && touch.deltaY.value > 0)) {
+          preventDefault(e, true);
+        } else if (!(scrollTop <= 0 && touch.deltaY.value > 0) || maxScroll > 0) {
           return;
         }
       }
@@ -9954,6 +9965,7 @@ var stdin_default$Q = defineComponent({
       height.value = -ease(moveY);
     };
     const onTouchend = () => {
+      maxScroll = -1;
       dragging.value = false;
       height.value = closest(anchors.value, height.value);
       if (height.value !== -startY) {
@@ -9967,7 +9979,7 @@ var stdin_default$Q = defineComponent({
     }, {
       immediate: true
     });
-    useLockScroll(rootRef, () => true);
+    useLockScroll(rootRef, () => props2.lockScroll);
     useEventListener("touchmove", onTouchmove, {
       target: rootRef
     });
@@ -10184,7 +10196,8 @@ var stdin_default$N = defineComponent({
     maxZoom: makeRequiredProp(numericProp),
     rootWidth: makeRequiredProp(Number),
     rootHeight: makeRequiredProp(Number),
-    disableZoom: Boolean
+    disableZoom: Boolean,
+    closeOnClickOverlay: Boolean
   },
   emits: ["scale", "close", "longPress"],
   setup(props2, {
@@ -10344,7 +10357,8 @@ var stdin_default$N = defineComponent({
         }
       }
     };
-    const checkTap = () => {
+    const checkTap = (event) => {
+      var _a;
       if (fingerNum > 1) {
         return;
       }
@@ -10361,6 +10375,9 @@ var stdin_default$N = defineComponent({
             doubleTapTimer = null;
             toggleScale();
           } else {
+            if (!props2.closeOnClickOverlay && event.target === ((_a = swipeItem.value) == null ? void 0 : _a.$el)) {
+              return;
+            }
             doubleTapTimer = setTimeout(() => {
               emit("close");
               doubleTapTimer = null;
@@ -10398,7 +10415,7 @@ var stdin_default$N = defineComponent({
         }
       }
       preventDefault(event, stopPropagation2);
-      checkTap();
+      checkTap(event);
       touch.reset();
     };
     const resize = () => {
@@ -10495,6 +10512,7 @@ const imagePreviewProps = {
   startPosition: makeNumericProp(0),
   showIndicators: Boolean,
   closeOnPopstate: truthProp,
+  closeOnClickOverlay: truthProp,
   closeIconPosition: makeStringProp("top-right"),
   teleport: [String, Object]
 };
@@ -10579,6 +10597,7 @@ var stdin_default$M = defineComponent({
         "rootWidth": state.rootWidth,
         "rootHeight": state.rootHeight,
         "disableZoom": state.disableZoom,
+        "closeOnClickOverlay": props2.closeOnClickOverlay,
         "onScale": emitScale,
         "onClose": emitClose,
         "onLongPress": () => emit("longPress", {
@@ -10661,6 +10680,7 @@ const defaultConfig = {
   swipeDuration: 300,
   showIndicators: false,
   closeOnPopstate: true,
+  closeOnClickOverlay: true,
   closeIconPosition: "top-right"
 };
 function initInstance$1() {
@@ -10999,6 +11019,7 @@ const listProps = {
   loading: Boolean,
   disabled: Boolean,
   finished: Boolean,
+  scroller: Object,
   errorText: String,
   direction: makeStringProp("down"),
   loadingText: String,
@@ -11018,6 +11039,7 @@ var stdin_default$J = defineComponent({
     const placeholder = ref();
     const tabStatus = useTabStatus();
     const scrollParent = useScrollParent(root);
+    const scroller = computed(() => props2.scroller || scrollParent.value);
     const check = () => {
       nextTick(() => {
         if (loading.value || props2.finished || props2.disabled || props2.error || // skip check when inside an inactive tab
@@ -11028,7 +11050,7 @@ var stdin_default$J = defineComponent({
           direction
         } = props2;
         const offset = +props2.offset;
-        const scrollParentRect = useRect(scrollParent);
+        const scrollParentRect = useRect(scroller);
         if (!scrollParentRect.height || isHidden(root)) {
           return;
         }
@@ -11104,7 +11126,7 @@ var stdin_default$J = defineComponent({
       check
     });
     useEventListener("scroll", check, {
-      target: scrollParent,
+      target: scroller,
       passive: true
     });
     return () => {
@@ -14622,7 +14644,7 @@ var stdin_default$9 = defineComponent({
     const expanded = ref(false);
     const hasAction = ref(false);
     const root = ref();
-    const actionText = computed(() => expanded.value ? props2.expandText : props2.collapseText);
+    const actionText = computed(() => expanded.value ? props2.collapseText : props2.expandText);
     const pxToNum = (value) => {
       if (!value)
         return 0;
@@ -14664,7 +14686,7 @@ var stdin_default$9 = defineComponent({
               }
               return dots + content.slice(right, end);
             }
-            const middle2 = Math.round(left + right >> 1);
+            const middle2 = Math.round((left + right) / 2);
             if (position === "end") {
               container2.innerText = content.slice(0, middle2) + dots + actionText.value;
             } else {
@@ -14685,11 +14707,11 @@ var stdin_default$9 = defineComponent({
         };
         const middleTail = (leftPart, rightPart) => {
           if (leftPart[1] - leftPart[0] <= 1 && rightPart[1] - rightPart[0] <= 1) {
-            return content.slice(0, leftPart[1]) + dots + content.slice(rightPart[1], end);
+            return content.slice(0, leftPart[0]) + dots + content.slice(rightPart[1], end);
           }
-          const leftMiddle = Math.floor(leftPart[0] + leftPart[1] >> 1);
-          const rightMiddle = Math.ceil(rightPart[0] + rightPart[1] >> 1);
-          container2.innerText = props2.content.slice(0, leftMiddle) + props2.dots + actionText.value + props2.dots + props2.content.slice(rightMiddle, end);
+          const leftMiddle = Math.floor((leftPart[0] + leftPart[1]) / 2);
+          const rightMiddle = Math.ceil((rightPart[0] + rightPart[1]) / 2);
+          container2.innerText = props2.content.slice(0, leftMiddle) + props2.dots + props2.content.slice(rightMiddle, end) + props2.expandText;
           if (container2.offsetHeight >= maxHeight2) {
             return middleTail([leftPart[0], leftMiddle], [rightMiddle, rightPart[1]]);
           }
@@ -14724,7 +14746,7 @@ var stdin_default$9 = defineComponent({
     const renderAction = () => createVNode("span", {
       "class": bem$3("action"),
       "onClick": onClickAction
-    }, [expanded.value ? props2.collapseText : props2.expandText]);
+    }, [actionText.value]);
     onMounted(calcEllipsised);
     watch(() => [props2.content, props2.rows, props2.position], calcEllipsised);
     useEventListener("resize", calcEllipsised);
@@ -16385,7 +16407,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.6.4-beta.2";
+const version = "4.6.5";
 function install(app) {
   const components = [
     ActionBar,

package/lib/vant.js

@@ -9854,7 +9854,8 @@
     direction: makeStringProp("down"),
     activeColor: String,
     closeOnClickOutside: truthProp,
-    closeOnClickOverlay: truthProp
+    closeOnClickOverlay: truthProp,
+    swipeThreshold: numericProp
   };
   const DROPDOWN_KEY = Symbol(name$K);
   var stdin_default$T = vue.defineComponent({
@@ -9873,6 +9874,7 @@
       } = useChildren(DROPDOWN_KEY);
       const scrollParent = useScrollParent(root);
       const opened = vue.computed(() => children.some((item) => item.state.showWrapper));
+      const scrollable = vue.computed(() => props2.swipeThreshold && children.length > +props2.swipeThreshold);
       const barStyle = vue.computed(() => {
         if (opened.value && isDef(props2.zIndex)) {
           return {
@@ -9929,7 +9931,8 @@
           "role": "button",
           "tabindex": disabled ? void 0 : 0,
           "class": [bem$K("item", {
-            disabled
+            disabled,
+            grow: scrollable.value
           }), {
             [HAPTICS_FEEDBACK]: !disabled
           }],
@@ -9973,7 +9976,8 @@
           "ref": barRef,
           "style": barStyle.value,
           "class": bem$K("bar", {
-            opened: opened.value
+            opened: opened.value,
+            scrollable: scrollable.value
           })
         }, [children.map(renderTitle)]), (_a = slots.default) == null ? void 0 : _a.call(slots)]);
       };
@@ -10169,11 +10173,13 @@
   const [name$I, bem$I] = createNamespace("floating-bubble");
   var stdin_default$R = vue.defineComponent({
     name: name$I,
+    inheritAttrs: false,
     props: floatingBubbleProps,
     emits: ["click", "update:offset", "offsetChange"],
     setup(props2, {
       slots,
-      emit
+      emit,
+      attrs
     }) {
       const rootRef = vue.ref();
       const state = vue.ref({
@@ -10294,7 +10300,7 @@
         }
       });
       return () => {
-        const Content = vue.withDirectives(vue.createVNode("div", {
+        const Content = vue.withDirectives(vue.createVNode("div", vue.mergeProps({
           "class": bem$I(),
           "ref": rootRef,
           "onTouchstartPassive": onTouchStart,
@@ -10302,7 +10308,7 @@
           "onTouchcancel": onTouchEnd,
           "onClick": onClick,
           "style": rootStyle.value
-        }, [slots.default ? slots.default() : vue.createVNode(stdin_default$1P, {
+        }, attrs), [slots.default ? slots.default() : vue.createVNode(stdin_default$1P, {
           "name": props2.icon,
           "class": bem$I("icon")
         }, null)]), [[vue.vShow, show.value]]);
@@ -10320,10 +10326,10 @@
     anchors: makeArrayProp(),
     duration: makeNumericProp(0.2),
     contentDraggable: truthProp,
+    lockScroll: Boolean,
     safeAreaInsetBottom: truthProp
   };
   const [name$H, bem$H] = createNamespace("floating-panel");
-  const DAMP = 0.2;
   var stdin_default$Q = vue.defineComponent({
     name: name$H,
     props: floatingPanelProps,
@@ -10332,6 +10338,7 @@
       emit,
       slots
     }) {
+      const DAMP = 0.2;
       const rootRef = vue.ref();
       const contentRef = vue.ref();
       const height2 = useSyncPropRef(() => +props2.height, (value) => emit("update:height", value));
@@ -10364,24 +10371,28 @@
         return moveY;
       };
       let startY;
+      let maxScroll = -1;
       const touch = useTouch();
       const onTouchstart = (e) => {
         touch.start(e);
         dragging.value = true;
         startY = -height2.value;
+        maxScroll = -1;
       };
       const onTouchmove = (e) => {
         var _a;
         touch.move(e);
         const target = e.target;
         if (contentRef.value === target || ((_a = contentRef.value) == null ? void 0 : _a.contains(target))) {
+          const {
+            scrollTop
+          } = contentRef.value;
+          maxScroll = Math.max(maxScroll, scrollTop);
           if (!props2.contentDraggable)
             return;
           if (-startY < boundary.value.max) {
-            if (e.cancelable)
-              e.preventDefault();
-            e.stopPropagation();
-          } else if (!(contentRef.value.scrollTop <= 0 && touch.deltaY.value > 0)) {
+            preventDefault(e, true);
+          } else if (!(scrollTop <= 0 && touch.deltaY.value > 0) || maxScroll > 0) {
             return;
           }
         }
@@ -10389,6 +10400,7 @@
         height2.value = -ease(moveY);
       };
       const onTouchend = () => {
+        maxScroll = -1;
         dragging.value = false;
         height2.value = closest(anchors.value, height2.value);
         if (height2.value !== -startY) {
@@ -10402,7 +10414,7 @@
       }, {
         immediate: true
       });
-      useLockScroll(rootRef, () => true);
+      useLockScroll(rootRef, () => props2.lockScroll);
       useEventListener("touchmove", onTouchmove, {
         target: rootRef
       });
@@ -10616,7 +10628,8 @@
       maxZoom: makeRequiredProp(numericProp),
       rootWidth: makeRequiredProp(Number),
       rootHeight: makeRequiredProp(Number),
-      disableZoom: Boolean
+      disableZoom: Boolean,
+      closeOnClickOverlay: Boolean
     },
     emits: ["scale", "close", "longPress"],
     setup(props2, {
@@ -10776,7 +10789,8 @@
           }
         }
       };
-      const checkTap = () => {
+      const checkTap = (event) => {
+        var _a;
         if (fingerNum > 1) {
           return;
         }
@@ -10793,6 +10807,9 @@
               doubleTapTimer = null;
               toggleScale();
             } else {
+              if (!props2.closeOnClickOverlay && event.target === ((_a = swipeItem.value) == null ? void 0 : _a.$el)) {
+                return;
+              }
               doubleTapTimer = setTimeout(() => {
                 emit("close");
                 doubleTapTimer = null;
@@ -10830,7 +10847,7 @@
           }
         }
         preventDefault(event, stopPropagation2);
-        checkTap();
+        checkTap(event);
         touch.reset();
       };
       const resize = () => {
@@ -10927,6 +10944,7 @@
     startPosition: makeNumericProp(0),
     showIndicators: Boolean,
     closeOnPopstate: truthProp,
+    closeOnClickOverlay: truthProp,
     closeIconPosition: makeStringProp("top-right"),
     teleport: [String, Object]
   };
@@ -11011,6 +11029,7 @@
           "rootWidth": state.rootWidth,
           "rootHeight": state.rootHeight,
           "disableZoom": state.disableZoom,
+          "closeOnClickOverlay": props2.closeOnClickOverlay,
           "onScale": emitScale,
           "onClose": emitClose,
           "onLongPress": () => emit("longPress", {
@@ -11093,6 +11112,7 @@
     swipeDuration: 300,
     showIndicators: false,
     closeOnPopstate: true,
+    closeOnClickOverlay: true,
     closeIconPosition: "top-right"
   };
   function initInstance$1() {
@@ -11428,6 +11448,7 @@
     loading: Boolean,
     disabled: Boolean,
     finished: Boolean,
+    scroller: Object,
     errorText: String,
     direction: makeStringProp("down"),
     loadingText: String,
@@ -11447,6 +11468,7 @@
       const placeholder = vue.ref();
       const tabStatus = useTabStatus();
       const scrollParent = useScrollParent(root);
+      const scroller = vue.computed(() => props2.scroller || scrollParent.value);
       const check = () => {
         vue.nextTick(() => {
           if (loading.value || props2.finished || props2.disabled || props2.error || // skip check when inside an inactive tab
@@ -11457,7 +11479,7 @@
             direction
           } = props2;
           const offset2 = +props2.offset;
-          const scrollParentRect = useRect(scrollParent);
+          const scrollParentRect = useRect(scroller);
           if (!scrollParentRect.height || isHidden(root)) {
             return;
           }
@@ -11533,7 +11555,7 @@
         check
       });
       useEventListener("scroll", check, {
-        target: scrollParent,
+        target: scroller,
         passive: true
       });
       return () => {
@@ -15854,7 +15876,7 @@
       const expanded = vue.ref(false);
       const hasAction = vue.ref(false);
       const root = vue.ref();
-      const actionText = vue.computed(() => expanded.value ? props2.expandText : props2.collapseText);
+      const actionText = vue.computed(() => expanded.value ? props2.collapseText : props2.expandText);
       const pxToNum = (value) => {
         if (!value)
           return 0;
@@ -15896,7 +15918,7 @@
                 }
                 return dots + content.slice(right2, end2);
               }
-              const middle2 = Math.round(left2 + right2 >> 1);
+              const middle2 = Math.round((left2 + right2) / 2);
               if (position === "end") {
                 container2.innerText = content.slice(0, middle2) + dots + actionText.value;
               } else {
@@ -15917,11 +15939,11 @@
           };
           const middleTail = (leftPart, rightPart) => {
             if (leftPart[1] - leftPart[0] <= 1 && rightPart[1] - rightPart[0] <= 1) {
-              return content.slice(0, leftPart[1]) + dots + content.slice(rightPart[1], end2);
+              return content.slice(0, leftPart[0]) + dots + content.slice(rightPart[1], end2);
             }
-            const leftMiddle = Math.floor(leftPart[0] + leftPart[1] >> 1);
-            const rightMiddle = Math.ceil(rightPart[0] + rightPart[1] >> 1);
-            container2.innerText = props2.content.slice(0, leftMiddle) + props2.dots + actionText.value + props2.dots + props2.content.slice(rightMiddle, end2);
+            const leftMiddle = Math.floor((leftPart[0] + leftPart[1]) / 2);
+            const rightMiddle = Math.ceil((rightPart[0] + rightPart[1]) / 2);
+            container2.innerText = props2.content.slice(0, leftMiddle) + props2.dots + props2.content.slice(rightMiddle, end2) + props2.expandText;
             if (container2.offsetHeight >= maxHeight2) {
               return middleTail([leftPart[0], leftMiddle], [rightMiddle, rightPart[1]]);
             }
@@ -15956,7 +15978,7 @@
       const renderAction = () => vue.createVNode("span", {
         "class": bem$3("action"),
         "onClick": onClickAction
-      }, [expanded.value ? props2.collapseText : props2.expandText]);
+      }, [actionText.value]);
       vue.onMounted(calcEllipsised);
       vue.watch(() => [props2.content, props2.rows, props2.position], calcEllipsised);
       useEventListener("resize", calcEllipsised);
@@ -17597,7 +17619,7 @@
       });
     }
   };
-  const version = "4.6.4-beta.2";
+  const version = "4.6.5";
   function install(app) {
     const components = [
       ActionBar,