vant 4.6.4 → 4.6.6

package/README.md

@@ -53,7 +53,7 @@ npm i vant
 npm i vant@latest-v2
 ```
 
-Using `yarn` or `pnpm`:
+Using `yarn`, `pnpm`, or `bun`:
 
 ```bash
 # with yarn
@@ -61,6 +61,9 @@ yarn add vant
 
 # with pnpm
 pnpm add vant
+
+# with Bun
+bun add vant
 ```
 
 ## Quickstart

package/es/dropdown-item/DropdownItem.mjs

@@ -99,7 +99,7 @@ var stdin_default = defineComponent({
       };
       return _createVNode(Cell, {
         "role": "menuitem",
-        "key": option.value,
+        "key": String(option.value),
         "icon": option.icon,
         "title": option.text,
         "class": bem("option", {

package/es/dropdown-item/types.d.ts

@@ -1,10 +1,11 @@
 import type { DropdownItemProps } from './DropdownItem';
 import type { VNode, ComponentPublicInstance } from 'vue';
 import type { Numeric } from '../utils';
+export type DropdownItemOptionValue = Numeric | boolean;
 export type DropdownItemOption = {
     text: string;
     icon?: string;
-    value: Numeric;
+    value: DropdownItemOptionValue;
 };
 export type DropdownItemExpose = {
     toggle: (show?: boolean, options?: {

package/es/dropdown-menu/DropdownMenu.d.ts

@@ -23,6 +23,7 @@ export declare const dropdownMenuProps: {
         type: BooleanConstructor;
         default: true;
     };
+    swipeThreshold: (NumberConstructor | StringConstructor)[];
 };
 export type DropdownMenuProps = ExtractPropTypes<typeof dropdownMenuProps>;
 export declare const DROPDOWN_KEY: InjectionKey<DropdownMenuProvide>;
@@ -49,6 +50,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    swipeThreshold: (NumberConstructor | StringConstructor)[];
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     overlay: {
         type: BooleanConstructor;
@@ -72,6 +74,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    swipeThreshold: (NumberConstructor | StringConstructor)[];
 }>>, {
     overlay: boolean;
     duration: string | number;

package/es/dropdown-menu/DropdownMenu.mjs

@@ -12,7 +12,8 @@ const dropdownMenuProps = {
   direction: makeStringProp("down"),
   activeColor: String,
   closeOnClickOutside: truthProp,
-  closeOnClickOverlay: truthProp
+  closeOnClickOverlay: truthProp,
+  swipeThreshold: numericProp
 };
 const DROPDOWN_KEY = Symbol(name);
 var stdin_default = defineComponent({
@@ -31,6 +32,7 @@ var stdin_default = defineComponent({
     } = useChildren(DROPDOWN_KEY);
     const scrollParent = useScrollParent(root);
     const opened = computed(() => children.some((item) => item.state.showWrapper));
+    const scrollable = computed(() => props.swipeThreshold && children.length > +props.swipeThreshold);
     const barStyle = computed(() => {
       if (opened.value && isDef(props.zIndex)) {
         return {
@@ -87,7 +89,8 @@ var stdin_default = defineComponent({
         "role": "button",
         "tabindex": disabled ? void 0 : 0,
         "class": [bem("item", {
-          disabled
+          disabled,
+          grow: scrollable.value
         }), {
           [HAPTICS_FEEDBACK]: !disabled
         }],
@@ -131,7 +134,8 @@ var stdin_default = defineComponent({
         "ref": barRef,
         "style": barStyle.value,
         "class": bem("bar", {
-          opened: opened.value
+          opened: opened.value,
+          scrollable: scrollable.value
         })
       }, [children.map(renderTitle)]), (_a = slots.default) == null ? void 0 : _a.call(slots)]);
     };

package/es/dropdown-menu/index.css

@@ -1 +1 @@
-:root{--van-dropdown-menu-height: 48px;--van-dropdown-menu-background: var(--van-background-2);--van-dropdown-menu-shadow: 0 2px 12px rgba(100, 101, 102, .12);--van-dropdown-menu-title-font-size: 15px;--van-dropdown-menu-title-text-color: var(--van-text-color);--van-dropdown-menu-title-active-text-color: var(--van-primary-color);--van-dropdown-menu-title-disabled-text-color: var(--van-text-color-2);--van-dropdown-menu-title-padding: 0 var(--van-padding-xs);--van-dropdown-menu-title-line-height: var(--van-line-height-lg);--van-dropdown-menu-option-active-color: var(--van-primary-color);--van-dropdown-menu-content-max-height: 80%}.van-dropdown-menu{-webkit-user-select:none;user-select:none}.van-dropdown-menu__bar{position:relative;display:flex;height:var(--van-dropdown-menu-height);background:var(--van-dropdown-menu-background);box-shadow:var(--van-dropdown-menu-shadow)}.van-dropdown-menu__bar--opened{z-index:calc(var(--van-dropdown-item-z-index) + 1)}.van-dropdown-menu__item{display:flex;flex:1;align-items:center;justify-content:center;min-width:0}.van-dropdown-menu__item--disabled .van-dropdown-menu__title{color:var(--van-dropdown-menu-title-disabled-text-color)}.van-dropdown-menu__title{position:relative;box-sizing:border-box;max-width:100%;padding:var(--van-dropdown-menu-title-padding);color:var(--van-dropdown-menu-title-text-color);font-size:var(--van-dropdown-menu-title-font-size);line-height:var(--van-dropdown-menu-title-line-height)}.van-dropdown-menu__title:after{position:absolute;top:50%;right:-4px;margin-top:-5px;border:3px solid;border-color:transparent transparent var(--van-gray-4) var(--van-gray-4);transform:rotate(-45deg);opacity:.8;content:""}.van-dropdown-menu__title--active{color:var(--van-dropdown-menu-title-active-text-color)}.van-dropdown-menu__title--active:after{border-color:transparent transparent currentColor currentColor}.van-dropdown-menu__title--down:after{margin-top:-1px;transform:rotate(135deg)}
+:root{--van-dropdown-menu-height: 48px;--van-dropdown-menu-background: var(--van-background-2);--van-dropdown-menu-shadow: 0 2px 12px rgba(100, 101, 102, .12);--van-dropdown-menu-title-font-size: 15px;--van-dropdown-menu-title-text-color: var(--van-text-color);--van-dropdown-menu-title-active-text-color: var(--van-primary-color);--van-dropdown-menu-title-disabled-text-color: var(--van-text-color-2);--van-dropdown-menu-title-padding: 0 var(--van-padding-xs);--van-dropdown-menu-title-line-height: var(--van-line-height-lg);--van-dropdown-menu-option-active-color: var(--van-primary-color);--van-dropdown-menu-content-max-height: 80%}.van-dropdown-menu{-webkit-user-select:none;user-select:none}.van-dropdown-menu__bar{position:relative;display:flex;height:var(--van-dropdown-menu-height);background:var(--van-dropdown-menu-background);box-shadow:var(--van-dropdown-menu-shadow)}.van-dropdown-menu__bar--opened{z-index:calc(var(--van-dropdown-item-z-index) + 1)}.van-dropdown-menu__bar--scrollable{padding-left:var(--van-padding-base);padding-right:var(--van-padding-xs);overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch}.van-dropdown-menu__bar--scrollable::-webkit-scrollbar{display:none}.van-dropdown-menu__item{display:flex;flex:1;align-items:center;justify-content:center;min-width:0}.van-dropdown-menu__item--disabled .van-dropdown-menu__title{color:var(--van-dropdown-menu-title-disabled-text-color)}.van-dropdown-menu__item--grow{flex:1 0 auto;padding-left:var(--van-padding-base);padding-right:var(--van-padding-sm)}.van-dropdown-menu__title{position:relative;box-sizing:border-box;max-width:100%;padding:var(--van-dropdown-menu-title-padding);color:var(--van-dropdown-menu-title-text-color);font-size:var(--van-dropdown-menu-title-font-size);line-height:var(--van-dropdown-menu-title-line-height)}.van-dropdown-menu__title:after{position:absolute;top:50%;right:-4px;margin-top:-5px;border:3px solid;border-color:transparent transparent var(--van-gray-4) var(--van-gray-4);transform:rotate(-45deg);opacity:.8;content:""}.van-dropdown-menu__title--active{color:var(--van-dropdown-menu-title-active-text-color)}.van-dropdown-menu__title--active:after{border-color:transparent transparent currentColor currentColor}.van-dropdown-menu__title--down:after{margin-top:-1px;transform:rotate(135deg)}

package/es/dropdown-menu/index.d.ts

@@ -22,6 +22,7 @@ export declare const DropdownMenu: import("../utils").WithInstall<import("vue").
         type: BooleanConstructor;
         default: true;
     };
+    swipeThreshold: (NumberConstructor | StringConstructor)[];
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     overlay: {
         type: BooleanConstructor;
@@ -45,6 +46,7 @@ export declare const DropdownMenu: import("../utils").WithInstall<import("vue").
         type: BooleanConstructor;
         default: true;
     };
+    swipeThreshold: (NumberConstructor | StringConstructor)[];
 }>>, {
     overlay: boolean;
     duration: string | number;

package/es/floating-bubble/FloatingBubble.mjs

@@ -1,4 +1,4 @@
-import { withDirectives as _withDirectives, vShow as _vShow, createVNode as _createVNode } from "vue";
+import { withDirectives as _withDirectives, mergeProps as _mergeProps, vShow as _vShow, createVNode as _createVNode } from "vue";
 import { Teleport, computed, defineComponent, nextTick, onMounted, ref, watch, onActivated, onDeactivated } from "vue";
 import { pick, addUnit, closest, createNamespace, makeNumberProp, makeStringProp, windowWidth, windowHeight } from "../utils/index.mjs";
 import { useRect, useEventListener } from "@vant/use";
@@ -24,11 +24,13 @@ const floatingBubbleProps = {
 const [name, bem] = createNamespace("floating-bubble");
 var stdin_default = defineComponent({
   name,
+  inheritAttrs: false,
   props: floatingBubbleProps,
   emits: ["click", "update:offset", "offsetChange"],
   setup(props, {
     slots,
-    emit
+    emit,
+    attrs
   }) {
     const rootRef = ref();
     const state = ref({
@@ -56,6 +58,8 @@ var stdin_default = defineComponent({
       return style;
     });
     const updateState = () => {
+      if (!show.value)
+        return;
       const {
         width,
         height
@@ -131,6 +135,8 @@ var stdin_default = defineComponent({
     const onClick = (e) => {
       if (touch.isTap.value)
         emit("click", e);
+      else
+        e.stopPropagation();
     };
     onMounted(() => {
       updateState();
@@ -149,15 +155,15 @@ var stdin_default = defineComponent({
       }
     });
     return () => {
-      const Content = _withDirectives(_createVNode("div", {
+      const Content = _withDirectives(_createVNode("div", _mergeProps({
         "class": bem(),
         "ref": rootRef,
         "onTouchstartPassive": onTouchStart,
         "onTouchend": onTouchEnd,
         "onTouchcancel": onTouchEnd,
-        "onClick": onClick,
+        "onClickCapture": onClick,
         "style": rootStyle.value
-      }, [slots.default ? slots.default() : _createVNode(Icon, {
+      }, attrs), [slots.default ? slots.default() : _createVNode(Icon, {
         "name": props.icon,
         "class": bem("icon")
       }, null)]), [[_vShow, show.value]]);

package/es/floating-panel/FloatingPanel.d.ts

@@ -16,10 +16,7 @@ export declare const floatingPanelProps: {
         type: BooleanConstructor;
         default: true;
     };
-    lockScroll: {
-        type: BooleanConstructor;
-        default: true;
-    };
+    lockScroll: BooleanConstructor;
     safeAreaInsetBottom: {
         type: BooleanConstructor;
         default: true;
@@ -43,10 +40,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    lockScroll: {
-        type: BooleanConstructor;
-        default: true;
-    };
+    lockScroll: BooleanConstructor;
     safeAreaInsetBottom: {
         type: BooleanConstructor;
         default: true;
@@ -68,10 +62,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    lockScroll: {
-        type: BooleanConstructor;
-        default: true;
-    };
+    lockScroll: BooleanConstructor;
     safeAreaInsetBottom: {
         type: BooleanConstructor;
         default: true;

package/es/floating-panel/FloatingPanel.mjs

@@ -1,6 +1,6 @@
 import { createVNode as _createVNode } from "vue";
-import { computed, defineComponent, ref, watch } from "vue";
-import { addUnit, closest, createNamespace, makeArrayProp, makeNumericProp, truthProp, windowHeight } from "../utils/index.mjs";
+import { ref, watch, computed, defineComponent } from "vue";
+import { addUnit, closest, createNamespace, makeArrayProp, makeNumericProp, preventDefault, truthProp, windowHeight } from "../utils/index.mjs";
 import { useEventListener } from "@vant/use";
 import { useLockScroll } from "../composables/use-lock-scroll.mjs";
 import { useTouch } from "../composables/use-touch.mjs";
@@ -10,11 +10,10 @@ const floatingPanelProps = {
   anchors: makeArrayProp(),
   duration: makeNumericProp(0.2),
   contentDraggable: truthProp,
-  lockScroll: truthProp,
+  lockScroll: Boolean,
   safeAreaInsetBottom: truthProp
 };
 const [name, bem] = createNamespace("floating-panel");
-const DAMP = 0.2;
 var stdin_default = defineComponent({
   name,
   props: floatingPanelProps,
@@ -23,6 +22,7 @@ var stdin_default = defineComponent({
     emit,
     slots
   }) {
+    const DAMP = 0.2;
     const rootRef = ref();
     const contentRef = ref();
     const height = useSyncPropRef(() => +props.height, (value) => emit("update:height", value));
@@ -55,24 +55,28 @@ var stdin_default = 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 (!props.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;
         }
       }
@@ -80,6 +84,7 @@ var stdin_default = defineComponent({
       height.value = -ease(moveY);
     };
     const onTouchend = () => {
+      maxScroll = -1;
       dragging.value = false;
       height.value = closest(anchors.value, height.value);
       if (height.value !== -startY) {

package/es/floating-panel/index.d.ts

@@ -15,10 +15,7 @@ export declare const FloatingPanel: import("../utils").WithInstall<import("vue")
         type: BooleanConstructor;
         default: true;
     };
-    lockScroll: {
-        type: BooleanConstructor;
-        default: true;
-    };
+    lockScroll: BooleanConstructor;
     safeAreaInsetBottom: {
         type: BooleanConstructor;
         default: true;
@@ -40,10 +37,7 @@ export declare const FloatingPanel: import("../utils").WithInstall<import("vue")
         type: BooleanConstructor;
         default: true;
     };
-    lockScroll: {
-        type: BooleanConstructor;
-        default: true;
-    };
+    lockScroll: BooleanConstructor;
     safeAreaInsetBottom: {
         type: BooleanConstructor;
         default: true;

package/es/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.6";

package/es/index.mjs

@@ -98,7 +98,7 @@ import { Toast } from "./toast/index.mjs";
 import { TreeSelect } from "./tree-select/index.mjs";
 import { Uploader } from "./uploader/index.mjs";
 import { Watermark } from "./watermark/index.mjs";
-const version = "4.6.4";
+const version = "4.6.6";
 function install(app) {
   const components = [
     ActionBar,

package/es/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/es/vue-tsx-shim.d.ts

@@ -19,5 +19,6 @@ declare module 'vue' {
   interface HTMLAttributes {
     onTouchmovePassive?: EventHandler;
     onTouchstartPassive?: EventHandler;
+    onClickCapture?: EventHandler;
   }
 }

package/lib/dropdown-item/DropdownItem.js

@@ -122,7 +122,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       };
       return (0, import_vue.createVNode)(import_cell.Cell, {
         "role": "menuitem",
-        "key": option.value,
+        "key": String(option.value),
         "icon": option.icon,
         "title": option.text,
         "class": bem("option", {

package/lib/dropdown-item/types.d.ts

@@ -1,10 +1,11 @@
 import type { DropdownItemProps } from './DropdownItem';
 import type { VNode, ComponentPublicInstance } from 'vue';
 import type { Numeric } from '../utils';
+export type DropdownItemOptionValue = Numeric | boolean;
 export type DropdownItemOption = {
     text: string;
     icon?: string;
-    value: Numeric;
+    value: DropdownItemOptionValue;
 };
 export type DropdownItemExpose = {
     toggle: (show?: boolean, options?: {

package/lib/dropdown-menu/DropdownMenu.d.ts

@@ -23,6 +23,7 @@ export declare const dropdownMenuProps: {
         type: BooleanConstructor;
         default: true;
     };
+    swipeThreshold: (NumberConstructor | StringConstructor)[];
 };
 export type DropdownMenuProps = ExtractPropTypes<typeof dropdownMenuProps>;
 export declare const DROPDOWN_KEY: InjectionKey<DropdownMenuProvide>;
@@ -49,6 +50,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    swipeThreshold: (NumberConstructor | StringConstructor)[];
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     overlay: {
         type: BooleanConstructor;
@@ -72,6 +74,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
+    swipeThreshold: (NumberConstructor | StringConstructor)[];
 }>>, {
     overlay: boolean;
     duration: string | number;

package/lib/dropdown-menu/DropdownMenu.js

@@ -36,7 +36,8 @@ const dropdownMenuProps = {
   direction: (0, import_utils.makeStringProp)("down"),
   activeColor: String,
   closeOnClickOutside: import_utils.truthProp,
-  closeOnClickOverlay: import_utils.truthProp
+  closeOnClickOverlay: import_utils.truthProp,
+  swipeThreshold: import_utils.numericProp
 };
 const DROPDOWN_KEY = Symbol(name);
 var stdin_default = (0, import_vue2.defineComponent)({
@@ -55,6 +56,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     } = (0, import_use.useChildren)(DROPDOWN_KEY);
     const scrollParent = (0, import_use.useScrollParent)(root);
     const opened = (0, import_vue2.computed)(() => children.some((item) => item.state.showWrapper));
+    const scrollable = (0, import_vue2.computed)(() => props.swipeThreshold && children.length > +props.swipeThreshold);
     const barStyle = (0, import_vue2.computed)(() => {
       if (opened.value && (0, import_utils.isDef)(props.zIndex)) {
         return {
@@ -111,7 +113,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "role": "button",
         "tabindex": disabled ? void 0 : 0,
         "class": [bem("item", {
-          disabled
+          disabled,
+          grow: scrollable.value
         }), {
           [import_utils.HAPTICS_FEEDBACK]: !disabled
         }],
@@ -155,7 +158,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "ref": barRef,
         "style": barStyle.value,
         "class": bem("bar", {
-          opened: opened.value
+          opened: opened.value,
+          scrollable: scrollable.value
         })
       }, [children.map(renderTitle)]), (_a = slots.default) == null ? void 0 : _a.call(slots)]);
     };

package/lib/dropdown-menu/index.css

@@ -1 +1 @@
-:root{--van-dropdown-menu-height: 48px;--van-dropdown-menu-background: var(--van-background-2);--van-dropdown-menu-shadow: 0 2px 12px rgba(100, 101, 102, .12);--van-dropdown-menu-title-font-size: 15px;--van-dropdown-menu-title-text-color: var(--van-text-color);--van-dropdown-menu-title-active-text-color: var(--van-primary-color);--van-dropdown-menu-title-disabled-text-color: var(--van-text-color-2);--van-dropdown-menu-title-padding: 0 var(--van-padding-xs);--van-dropdown-menu-title-line-height: var(--van-line-height-lg);--van-dropdown-menu-option-active-color: var(--van-primary-color);--van-dropdown-menu-content-max-height: 80%}.van-dropdown-menu{-webkit-user-select:none;user-select:none}.van-dropdown-menu__bar{position:relative;display:flex;height:var(--van-dropdown-menu-height);background:var(--van-dropdown-menu-background);box-shadow:var(--van-dropdown-menu-shadow)}.van-dropdown-menu__bar--opened{z-index:calc(var(--van-dropdown-item-z-index) + 1)}.van-dropdown-menu__item{display:flex;flex:1;align-items:center;justify-content:center;min-width:0}.van-dropdown-menu__item--disabled .van-dropdown-menu__title{color:var(--van-dropdown-menu-title-disabled-text-color)}.van-dropdown-menu__title{position:relative;box-sizing:border-box;max-width:100%;padding:var(--van-dropdown-menu-title-padding);color:var(--van-dropdown-menu-title-text-color);font-size:var(--van-dropdown-menu-title-font-size);line-height:var(--van-dropdown-menu-title-line-height)}.van-dropdown-menu__title:after{position:absolute;top:50%;right:-4px;margin-top:-5px;border:3px solid;border-color:transparent transparent var(--van-gray-4) var(--van-gray-4);transform:rotate(-45deg);opacity:.8;content:""}.van-dropdown-menu__title--active{color:var(--van-dropdown-menu-title-active-text-color)}.van-dropdown-menu__title--active:after{border-color:transparent transparent currentColor currentColor}.van-dropdown-menu__title--down:after{margin-top:-1px;transform:rotate(135deg)}
+:root{--van-dropdown-menu-height: 48px;--van-dropdown-menu-background: var(--van-background-2);--van-dropdown-menu-shadow: 0 2px 12px rgba(100, 101, 102, .12);--van-dropdown-menu-title-font-size: 15px;--van-dropdown-menu-title-text-color: var(--van-text-color);--van-dropdown-menu-title-active-text-color: var(--van-primary-color);--van-dropdown-menu-title-disabled-text-color: var(--van-text-color-2);--van-dropdown-menu-title-padding: 0 var(--van-padding-xs);--van-dropdown-menu-title-line-height: var(--van-line-height-lg);--van-dropdown-menu-option-active-color: var(--van-primary-color);--van-dropdown-menu-content-max-height: 80%}.van-dropdown-menu{-webkit-user-select:none;user-select:none}.van-dropdown-menu__bar{position:relative;display:flex;height:var(--van-dropdown-menu-height);background:var(--van-dropdown-menu-background);box-shadow:var(--van-dropdown-menu-shadow)}.van-dropdown-menu__bar--opened{z-index:calc(var(--van-dropdown-item-z-index) + 1)}.van-dropdown-menu__bar--scrollable{padding-left:var(--van-padding-base);padding-right:var(--van-padding-xs);overflow-x:auto;overflow-y:hidden;-webkit-overflow-scrolling:touch}.van-dropdown-menu__bar--scrollable::-webkit-scrollbar{display:none}.van-dropdown-menu__item{display:flex;flex:1;align-items:center;justify-content:center;min-width:0}.van-dropdown-menu__item--disabled .van-dropdown-menu__title{color:var(--van-dropdown-menu-title-disabled-text-color)}.van-dropdown-menu__item--grow{flex:1 0 auto;padding-left:var(--van-padding-base);padding-right:var(--van-padding-sm)}.van-dropdown-menu__title{position:relative;box-sizing:border-box;max-width:100%;padding:var(--van-dropdown-menu-title-padding);color:var(--van-dropdown-menu-title-text-color);font-size:var(--van-dropdown-menu-title-font-size);line-height:var(--van-dropdown-menu-title-line-height)}.van-dropdown-menu__title:after{position:absolute;top:50%;right:-4px;margin-top:-5px;border:3px solid;border-color:transparent transparent var(--van-gray-4) var(--van-gray-4);transform:rotate(-45deg);opacity:.8;content:""}.van-dropdown-menu__title--active{color:var(--van-dropdown-menu-title-active-text-color)}.van-dropdown-menu__title--active:after{border-color:transparent transparent currentColor currentColor}.van-dropdown-menu__title--down:after{margin-top:-1px;transform:rotate(135deg)}

package/lib/dropdown-menu/index.d.ts

@@ -22,6 +22,7 @@ export declare const DropdownMenu: import("../utils").WithInstall<import("vue").
         type: BooleanConstructor;
         default: true;
     };
+    swipeThreshold: (NumberConstructor | StringConstructor)[];
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     overlay: {
         type: BooleanConstructor;
@@ -45,6 +46,7 @@ export declare const DropdownMenu: import("../utils").WithInstall<import("vue").
         type: BooleanConstructor;
         default: true;
     };
+    swipeThreshold: (NumberConstructor | StringConstructor)[];
 }>>, {
     overlay: boolean;
     duration: string | number;

package/lib/floating-bubble/FloatingBubble.js

@@ -57,11 +57,13 @@ const floatingBubbleProps = {
 const [name, bem] = (0, import_utils.createNamespace)("floating-bubble");
 var stdin_default = (0, import_vue2.defineComponent)({
   name,
+  inheritAttrs: false,
   props: floatingBubbleProps,
   emits: ["click", "update:offset", "offsetChange"],
   setup(props, {
     slots,
-    emit
+    emit,
+    attrs
   }) {
     const rootRef = (0, import_vue2.ref)();
     const state = (0, import_vue2.ref)({
@@ -89,6 +91,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
       return style;
     });
     const updateState = () => {
+      if (!show.value)
+        return;
       const {
         width,
         height
@@ -164,6 +168,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
     const onClick = (e) => {
       if (touch.isTap.value)
         emit("click", e);
+      else
+        e.stopPropagation();
     };
     (0, import_vue2.onMounted)(() => {
       updateState();
@@ -182,15 +188,15 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     });
     return () => {
-      const Content = (0, import_vue.withDirectives)((0, import_vue.createVNode)("div", {
+      const Content = (0, import_vue.withDirectives)((0, import_vue.createVNode)("div", (0, import_vue.mergeProps)({
         "class": bem(),
         "ref": rootRef,
         "onTouchstartPassive": onTouchStart,
         "onTouchend": onTouchEnd,
         "onTouchcancel": onTouchEnd,
-        "onClick": onClick,
+        "onClickCapture": onClick,
         "style": rootStyle.value
-      }, [slots.default ? slots.default() : (0, import_vue.createVNode)(import_icon.default, {
+      }, attrs), [slots.default ? slots.default() : (0, import_vue.createVNode)(import_icon.default, {
         "name": props.icon,
         "class": bem("icon")
       }, null)]), [[import_vue.vShow, show.value]]);

package/lib/floating-panel/FloatingPanel.d.ts

@@ -16,10 +16,7 @@ export declare const floatingPanelProps: {
         type: BooleanConstructor;
         default: true;
     };
-    lockScroll: {
-        type: BooleanConstructor;
-        default: true;
-    };
+    lockScroll: BooleanConstructor;
     safeAreaInsetBottom: {
         type: BooleanConstructor;
         default: true;
@@ -43,10 +40,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    lockScroll: {
-        type: BooleanConstructor;
-        default: true;
-    };
+    lockScroll: BooleanConstructor;
     safeAreaInsetBottom: {
         type: BooleanConstructor;
         default: true;
@@ -68,10 +62,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: true;
     };
-    lockScroll: {
-        type: BooleanConstructor;
-        default: true;
-    };
+    lockScroll: BooleanConstructor;
     safeAreaInsetBottom: {
         type: BooleanConstructor;
         default: true;

package/lib/floating-panel/FloatingPanel.js

@@ -33,11 +33,10 @@ const floatingPanelProps = {
   anchors: (0, import_utils.makeArrayProp)(),
   duration: (0, import_utils.makeNumericProp)(0.2),
   contentDraggable: import_utils.truthProp,
-  lockScroll: import_utils.truthProp,
+  lockScroll: Boolean,
   safeAreaInsetBottom: import_utils.truthProp
 };
 const [name, bem] = (0, import_utils.createNamespace)("floating-panel");
-const DAMP = 0.2;
 var stdin_default = (0, import_vue2.defineComponent)({
   name,
   props: floatingPanelProps,
@@ -46,6 +45,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     emit,
     slots
   }) {
+    const DAMP = 0.2;
     const rootRef = (0, import_vue2.ref)();
     const contentRef = (0, import_vue2.ref)();
     const height = (0, import_use_sync_prop_ref.useSyncPropRef)(() => +props.height, (value) => emit("update:height", value));
@@ -78,24 +78,28 @@ var stdin_default = (0, import_vue2.defineComponent)({
       return moveY;
     };
     let startY;
+    let maxScroll = -1;
     const touch = (0, import_use_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 (!props.contentDraggable)
           return;
         if (-startY < boundary.value.max) {
-          if (e.cancelable)
-            e.preventDefault();
-          e.stopPropagation();
-        } else if (!(contentRef.value.scrollTop <= 0 && touch.deltaY.value > 0)) {
+          (0, import_utils.preventDefault)(e, true);
+        } else if (!(scrollTop <= 0 && touch.deltaY.value > 0) || maxScroll > 0) {
           return;
         }
       }
@@ -103,6 +107,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       height.value = -ease(moveY);
     };
     const onTouchend = () => {
+      maxScroll = -1;
       dragging.value = false;
       height.value = (0, import_utils.closest)(anchors.value, height.value);
       if (height.value !== -startY) {

package/lib/floating-panel/index.d.ts

@@ -15,10 +15,7 @@ export declare const FloatingPanel: import("../utils").WithInstall<import("vue")
         type: BooleanConstructor;
         default: true;
     };
-    lockScroll: {
-        type: BooleanConstructor;
-        default: true;
-    };
+    lockScroll: BooleanConstructor;
     safeAreaInsetBottom: {
         type: BooleanConstructor;
         default: true;
@@ -40,10 +37,7 @@ export declare const FloatingPanel: import("../utils").WithInstall<import("vue")
         type: BooleanConstructor;
         default: true;
     };
-    lockScroll: {
-        type: BooleanConstructor;
-        default: true;
-    };
+    lockScroll: BooleanConstructor;
     safeAreaInsetBottom: {
         type: BooleanConstructor;
         default: true;