vant 4.6.4 → 4.6.5

package/lib/index.d.ts

@@ -105,4 +105,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "4.6.4";
+export const version: "4.6.5";

package/lib/index.js

@@ -224,7 +224,7 @@ __reExport(stdin_exports, require("./toast"), module.exports);
 __reExport(stdin_exports, require("./tree-select"), module.exports);
 __reExport(stdin_exports, require("./uploader"), module.exports);
 __reExport(stdin_exports, require("./watermark"), module.exports);
-const version = "4.6.4";
+const version = "4.6.5";
 function install(app) {
   const components = [
     import_action_bar.ActionBar,

package/lib/toast/index.d.ts

@@ -79,7 +79,7 @@ export default Toast;
 export { toastProps } from './Toast';
 export { showToast, closeToast, showFailToast, showLoadingToast, showSuccessToast, allowMultipleToast, setToastDefaultOptions, resetToastDefaultOptions, } from './function-call';
 export type { ToastProps } from './Toast';
-export type { ToastType, ToastOptions, ToastPosition, ToastThemeVars, ToastWordBreak, } from './types';
+export type { ToastType, ToastOptions, ToastPosition, ToastThemeVars, ToastWordBreak, ToastWrapperInstance, } from './types';
 declare module 'vue' {
     interface GlobalComponents {
         VanToast: typeof Toast;

package/lib/vant.cjs.js

@@ -9418,7 +9418,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 = vue.defineComponent({
@@ -9437,6 +9438,7 @@ var stdin_default$T = vue.defineComponent({
     } = use.useChildren(DROPDOWN_KEY);
     const scrollParent = use.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 {
@@ -9493,7 +9495,8 @@ var stdin_default$T = vue.defineComponent({
         "role": "button",
         "tabindex": disabled ? void 0 : 0,
         "class": [bem$K("item", {
-          disabled
+          disabled,
+          grow: scrollable.value
         }), {
           [HAPTICS_FEEDBACK]: !disabled
         }],
@@ -9537,7 +9540,8 @@ var stdin_default$T = vue.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)]);
     };
@@ -9736,11 +9740,13 @@ const floatingBubbleProps = {
 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({
@@ -9861,7 +9867,7 @@ var stdin_default$R = vue.defineComponent({
       }
     });
     return () => {
-      const Content = vue.withDirectives(vue.createVNode("div", {
+      const Content = vue.withDirectives(vue.createVNode("div", vue.mergeProps({
         "class": bem$I(),
         "ref": rootRef,
         "onTouchstartPassive": onTouchStart,
@@ -9869,7 +9875,7 @@ var stdin_default$R = vue.defineComponent({
         "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]]);
@@ -9887,11 +9893,10 @@ const floatingPanelProps = {
   anchors: makeArrayProp(),
   duration: makeNumericProp(0.2),
   contentDraggable: truthProp,
-  lockScroll: 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,
@@ -9900,6 +9905,7 @@ var stdin_default$Q = vue.defineComponent({
     emit,
     slots
   }) {
+    const DAMP = 0.2;
     const rootRef = vue.ref();
     const contentRef = vue.ref();
     const height = useSyncPropRef(() => +props2.height, (value) => emit("update:height", value));
@@ -9932,24 +9938,28 @@ var stdin_default$Q = vue.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;
         }
       }
@@ -9957,6 +9967,7 @@ var stdin_default$Q = vue.defineComponent({
       height.value = -ease(moveY);
     };
     const onTouchend = () => {
+      maxScroll = -1;
       dragging.value = false;
       height.value = closest(anchors.value, height.value);
       if (height.value !== -startY) {
@@ -16398,7 +16409,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.6.4";
+const version = "4.6.5";
 function install(app) {
   const components = [
     ActionBar,

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,11 +9891,10 @@ const floatingPanelProps = {
   anchors: makeArrayProp(),
   duration: makeNumericProp(0.2),
   contentDraggable: truthProp,
-  lockScroll: 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,
@@ -9898,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));
@@ -9930,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;
         }
       }
@@ -9955,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) {
@@ -16396,7 +16407,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.6.4";
+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,11 +10326,10 @@
     anchors: makeArrayProp(),
     duration: makeNumericProp(0.2),
     contentDraggable: truthProp,
-    lockScroll: 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,
@@ -10333,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));
@@ -10365,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;
           }
         }
@@ -10390,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) {
@@ -17608,7 +17619,7 @@
       });
     }
   };
-  const version = "4.6.4";
+  const version = "4.6.5";
   function install(app) {
     const components = [
       ActionBar,