vant 4.0.0-alpha.4 → 4.0.0-rc.0

package/lib/picker/PickerColumn.js

@@ -45,7 +45,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     swipeDuration: (0, import_utils.makeRequiredProp)(import_utils.numericProp),
     visibleOptionNum: (0, import_utils.makeRequiredProp)(import_utils.numericProp)
   },
-  emits: ["change"],
+  emits: ["change", "clickOption"],
   setup(props, {
     emit,
     slots
@@ -55,6 +55,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
     let touchStartTime;
     let momentumOffset;
     let transitionEndTrigger;
+    const root = (0, import_vue2.ref)();
     const wrapper = (0, import_vue2.ref)();
     const currentOffset = (0, import_vue2.ref)(0);
     const currentDuration = (0, import_vue2.ref)(0);
@@ -77,13 +78,14 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
       currentOffset.value = offset;
     };
-    const onClickItem = (index) => {
+    const onClickOption = (index) => {
       if (moving || props.readonly) {
         return;
       }
       transitionEndTrigger = null;
       currentDuration.value = DEFAULT_DURATION;
       updateValueByIndex(index);
+      emit("clickOption", props.options[index]);
     };
     const getIndexByOffset = (offset) => (0, import_utils.clamp)(Math.round(-offset / props.optionHeight), 0, count() - 1);
     const momentum = (distance, duration) => {
@@ -168,7 +170,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
             disabled,
             selected: value === props.value
           }), option.className],
-          onClick: () => onClickItem(index)
+          onClick: () => onClickOption(index)
         };
         const childData = {
           class: "van-ellipsis",
@@ -187,10 +189,13 @@ var stdin_default = (0, import_vue2.defineComponent)({
       const offset = -enabledIndex * props.optionHeight;
       currentOffset.value = offset;
     });
+    (0, import_use.useEventListener)("touchmove", onTouchMove, {
+      target: root
+    });
     return () => (0, import_vue.createVNode)("div", {
+      "ref": root,
       "class": bem(),
-      "onTouchstart": onTouchStart,
-      "onTouchmove": onTouchMove,
+      "onTouchstartPassive": onTouchStart,
       "onTouchend": onTouchEnd,
       "onTouchcancel": onTouchEnd
     }, [(0, import_vue.createVNode)("ul", {

package/lib/picker/PickerToolbar.d.ts

@@ -0,0 +1,21 @@
+export declare const pickerToolbarProps: {
+    title: StringConstructor;
+    cancelButtonText: StringConstructor;
+    confirmButtonText: StringConstructor;
+};
+export declare const pickerToolbarSlots: string[];
+export declare type PickerToolbarPropKeys = Array<keyof typeof pickerToolbarProps>;
+export declare const pickerToolbarPropKeys: PickerToolbarPropKeys;
+declare const _default: import("vue").DefineComponent<{
+    title: StringConstructor;
+    cancelButtonText: StringConstructor;
+    confirmButtonText: StringConstructor;
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "confirm")[], "cancel" | "confirm", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    title: StringConstructor;
+    cancelButtonText: StringConstructor;
+    confirmButtonText: StringConstructor;
+}>> & {
+    onCancel?: ((...args: any[]) => any) | undefined;
+    onConfirm?: ((...args: any[]) => any) | undefined;
+}, {}>;
+export default _default;

package/lib/picker/PickerToolbar.js

@@ -0,0 +1,78 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name2 in all)
+    __defProp(target, name2, { get: all[name2], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  default: () => stdin_default,
+  pickerToolbarPropKeys: () => pickerToolbarPropKeys,
+  pickerToolbarProps: () => pickerToolbarProps,
+  pickerToolbarSlots: () => pickerToolbarSlots
+});
+module.exports = __toCommonJS(stdin_exports);
+var import_vue = require("vue");
+var import_vue2 = require("vue");
+var import_utils = require("./utils");
+var import_utils2 = require("../utils");
+const [name] = (0, import_utils2.createNamespace)("picker-toolbar");
+const pickerToolbarProps = {
+  title: String,
+  cancelButtonText: String,
+  confirmButtonText: String
+};
+const pickerToolbarSlots = ["cancel", "confirm", "title", "toolbar"];
+const pickerToolbarPropKeys = Object.keys(pickerToolbarProps);
+var stdin_default = (0, import_vue2.defineComponent)({
+  name,
+  props: pickerToolbarProps,
+  emits: ["confirm", "cancel"],
+  setup(props, {
+    emit,
+    slots
+  }) {
+    const renderTitle = () => {
+      if (slots.title) {
+        return slots.title();
+      }
+      if (props.title) {
+        return (0, import_vue.createVNode)("div", {
+          "class": [(0, import_utils.bem)("title"), "van-ellipsis"]
+        }, [props.title]);
+      }
+    };
+    const onCancel = () => emit("cancel");
+    const onConfirm = () => emit("confirm");
+    const renderCancel = () => {
+      const text = props.cancelButtonText || (0, import_utils.t)("cancel");
+      return (0, import_vue.createVNode)("button", {
+        "type": "button",
+        "class": [(0, import_utils.bem)("cancel"), import_utils2.HAPTICS_FEEDBACK],
+        "onClick": onCancel
+      }, [slots.cancel ? slots.cancel() : text]);
+    };
+    const renderConfirm = () => {
+      const text = props.confirmButtonText || (0, import_utils.t)("confirm");
+      return (0, import_vue.createVNode)("button", {
+        "type": "button",
+        "class": [(0, import_utils.bem)("confirm"), import_utils2.HAPTICS_FEEDBACK],
+        "onClick": onConfirm
+      }, [slots.confirm ? slots.confirm() : text]);
+    };
+    return () => (0, import_vue.createVNode)("div", {
+      "class": (0, import_utils.bem)("toolbar")
+    }, [slots.toolbar ? slots.toolbar() : [renderCancel(), renderTitle(), renderConfirm()]]);
+  }
+});

package/lib/picker/index.d.ts

@@ -1,6 +1,5 @@
 import { PickerProps } from './Picker';
 export declare const Picker: import("../utils").WithInstall<import("vue").DefineComponent<{
-    title: StringConstructor;
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
@@ -20,6 +19,8 @@ export declare const Picker: import("../utils").WithInstall<import("vue").Define
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+} & {
+    title: StringConstructor;
     cancelButtonText: StringConstructor;
     confirmButtonText: StringConstructor;
 } & {
@@ -36,8 +37,7 @@ export declare const Picker: import("../utils").WithInstall<import("vue").Define
         default: import("./types").PickerToolbarPosition;
     };
     columnsFieldNames: import("vue").PropType<import("./types").PickerFieldNames>;
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "change" | "cancel" | "confirm")[], "update:modelValue" | "change" | "cancel" | "confirm", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    title: StringConstructor;
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "change" | "cancel" | "clickOption" | "confirm")[], "update:modelValue" | "change" | "cancel" | "clickOption" | "confirm", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     loading: BooleanConstructor;
     readonly: BooleanConstructor;
     allowHtml: BooleanConstructor;
@@ -57,6 +57,8 @@ export declare const Picker: import("../utils").WithInstall<import("vue").Define
         type: (NumberConstructor | StringConstructor)[];
         default: number;
     };
+} & {
+    title: StringConstructor;
     cancelButtonText: StringConstructor;
     confirmButtonText: StringConstructor;
 } & {
@@ -77,6 +79,7 @@ export declare const Picker: import("../utils").WithInstall<import("vue").Define
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
     onCancel?: ((...args: any[]) => any) | undefined;
+    onClickOption?: ((...args: any[]) => any) | undefined;
     onConfirm?: ((...args: any[]) => any) | undefined;
 }, {
     modelValue: import("../utils").Numeric[];

package/lib/picker/index.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var stdin_exports = {};
 __export(stdin_exports, {

package/lib/picker/style/index.js

@@ -1,3 +1,10 @@
 require("../../style/base.css");
+require("../../badge/index.css");
 require("../../loading/index.css");
+require("../../sticky/index.css");
+require("../../swipe/index.css");
+require("../../swipe-item/index.css");
+require("../../tabs/index.css");
+require("../../tab/index.css");
+require("../../picker-group/index.css");
 require("../index.css");

package/lib/picker/utils.d.ts

@@ -1,6 +1,8 @@
 import { type Numeric } from '../utils';
 import type { Ref } from 'vue';
 import type { PickerOption, PickerColumn, PickerFieldNames } from './types';
+declare const name: string, bem: (el?: import("../utils").Mods | undefined, mods?: import("../utils").Mods | undefined) => import("../utils").Mods, t: (path: string, ...args: unknown[]) => any;
+export { name, bem, t };
 export declare const getFirstEnabledOption: (options: PickerOption[]) => PickerOption | undefined;
 export declare function getColumnsType(columns: PickerColumn | PickerColumn[], fields: Required<PickerFieldNames>): "default" | "multiple" | "cascade";
 export declare function findIndexOfEnabledOption(options: PickerOption[], index: number): number;

package/lib/picker/utils.js

@@ -3,8 +3,8 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
+  for (var name2 in all)
+    __defProp(target, name2, { get: all[name2], enumerable: true });
 };
 var __copyProps = (to, from, except, desc) => {
   if (from && typeof from === "object" || typeof from === "function") {
@@ -18,16 +18,20 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var stdin_exports = {};
 __export(stdin_exports, {
   assignDefaultFields: () => assignDefaultFields,
+  bem: () => bem,
   findIndexOfEnabledOption: () => findIndexOfEnabledOption,
   findOptionByValue: () => findOptionByValue,
   formatCascadeColumns: () => formatCascadeColumns,
   getColumnsType: () => getColumnsType,
   getElementTranslateY: () => getElementTranslateY,
   getFirstEnabledOption: () => getFirstEnabledOption,
-  isOptionExist: () => isOptionExist
+  isOptionExist: () => isOptionExist,
+  name: () => name,
+  t: () => t
 });
 module.exports = __toCommonJS(stdin_exports);
 var import_utils = require("../utils");
+const [name, bem, t] = (0, import_utils.createNamespace)("picker");
 const getFirstEnabledOption = (options) => options.find((option) => !option.disabled) || options[0];
 function getColumnsType(columns, fields) {
   const firstColumn = columns[0];
@@ -84,9 +88,12 @@ function getElementTranslateY(element) {
   return Number(translateY);
 }
 function assignDefaultFields(fields) {
-  return (0, import_utils.extend)({
-    text: "text",
-    value: "value",
-    children: "children"
-  }, fields);
+  return (0, import_utils.extend)(
+    {
+      text: "text",
+      value: "value",
+      children: "children"
+    },
+    fields
+  );
 }

package/lib/picker-group/PickerGroup.d.ts

@@ -0,0 +1,39 @@
+import { type InjectionKey, type ExtractPropTypes } from 'vue';
+export declare type PickerGroupProvide = Record<string, string>;
+export declare const PICKER_GROUP_KEY: InjectionKey<PickerGroupProvide>;
+export declare const pickerGroupProps: {
+    tabs: {
+        type: import("vue").PropType<string[]>;
+        default: () => never[];
+    };
+} & {
+    title: StringConstructor;
+    cancelButtonText: StringConstructor;
+    confirmButtonText: StringConstructor;
+};
+export declare type PickerGroupProps = ExtractPropTypes<typeof pickerGroupProps>;
+declare const _default: import("vue").DefineComponent<{
+    tabs: {
+        type: import("vue").PropType<string[]>;
+        default: () => never[];
+    };
+} & {
+    title: StringConstructor;
+    cancelButtonText: StringConstructor;
+    confirmButtonText: StringConstructor;
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "confirm")[], "cancel" | "confirm", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+    tabs: {
+        type: import("vue").PropType<string[]>;
+        default: () => never[];
+    };
+} & {
+    title: StringConstructor;
+    cancelButtonText: StringConstructor;
+    confirmButtonText: StringConstructor;
+}>> & {
+    onCancel?: ((...args: any[]) => any) | undefined;
+    onConfirm?: ((...args: any[]) => any) | undefined;
+}, {
+    tabs: string[];
+}>;
+export default _default;

package/lib/picker-group/PickerGroup.js

@@ -0,0 +1,82 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name2 in all)
+    __defProp(target, name2, { get: all[name2], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  PICKER_GROUP_KEY: () => PICKER_GROUP_KEY,
+  default: () => stdin_default,
+  pickerGroupProps: () => pickerGroupProps
+});
+module.exports = __toCommonJS(stdin_exports);
+var import_vue = require("vue");
+var import_vue2 = require("vue");
+var import_utils = require("../utils");
+var import_use = require("@vant/use");
+var import_tab = require("../tab");
+var import_tabs = require("../tabs");
+var import_PickerToolbar = __toESM(require("../picker/PickerToolbar"));
+const [name, bem] = (0, import_utils.createNamespace)("picker-group");
+const PICKER_GROUP_KEY = Symbol(name);
+const pickerGroupProps = (0, import_utils.extend)({
+  tabs: (0, import_utils.makeArrayProp)()
+}, import_PickerToolbar.pickerToolbarProps);
+var stdin_default = (0, import_vue2.defineComponent)({
+  name,
+  props: pickerGroupProps,
+  emits: ["confirm", "cancel"],
+  setup(props, {
+    emit,
+    slots
+  }) {
+    const {
+      children,
+      linkChildren
+    } = (0, import_use.useChildren)(PICKER_GROUP_KEY);
+    linkChildren();
+    const onConfirm = () => {
+      emit("confirm", children.map((item) => item.confirm()));
+    };
+    const onCancel = () => emit("cancel");
+    return () => {
+      var _a;
+      const childNodes = (_a = slots.default) == null ? void 0 : _a.call(slots);
+      return (0, import_vue.createVNode)("div", {
+        "class": bem()
+      }, [(0, import_vue.createVNode)(import_PickerToolbar.default, (0, import_vue.mergeProps)(props, {
+        "onConfirm": onConfirm,
+        "onCancel": onCancel
+      }), null), (0, import_vue.createVNode)(import_tabs.Tabs, {
+        "shrink": true,
+        "class": bem("tabs"),
+        "animated": true
+      }, {
+        default: () => [props.tabs.map((title, index) => (0, import_vue.createVNode)(import_tab.Tab, {
+          "title": title,
+          "titleClass": bem("tab-title")
+        }, {
+          default: () => [childNodes == null ? void 0 : childNodes[index]]
+        }))]
+      })]);
+    };
+  }
+});

package/lib/picker-group/index.css

@@ -0,0 +1 @@
+body{--van-picker-group-background: var(--van-background-2)}.van-picker-group{background:var(--van-picker-group-background)}.van-picker-group__tabs{margin-top:var(--van-padding-base)}.van-picker-group__tab-title{margin-right:16px}

package/lib/picker-group/index.d.ts

@@ -0,0 +1,32 @@
+import { PickerGroupProps } from './PickerGroup';
+export declare const PickerGroup: import("../utils").WithInstall<import("vue").DefineComponent<{
+    tabs: {
+        type: import("vue").PropType<string[]>;
+        default: () => never[];
+    };
+} & {
+    title: StringConstructor;
+    cancelButtonText: StringConstructor;
+    confirmButtonText: StringConstructor;
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "confirm")[], "cancel" | "confirm", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    tabs: {
+        type: import("vue").PropType<string[]>;
+        default: () => never[];
+    };
+} & {
+    title: StringConstructor;
+    cancelButtonText: StringConstructor;
+    confirmButtonText: StringConstructor;
+}>> & {
+    onCancel?: ((...args: any[]) => any) | undefined;
+    onConfirm?: ((...args: any[]) => any) | undefined;
+}, {
+    tabs: string[];
+}>>;
+export default PickerGroup;
+export type { PickerGroupProps };
+declare module 'vue' {
+    interface GlobalComponents {
+        VanPickerGroup: typeof PickerGroup;
+    }
+}

package/lib/picker-group/index.js

@@ -0,0 +1,33 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  PickerGroup: () => PickerGroup,
+  default: () => stdin_default
+});
+module.exports = __toCommonJS(stdin_exports);
+var import_utils = require("../utils");
+var import_PickerGroup = __toESM(require("./PickerGroup"));
+const PickerGroup = (0, import_utils.withInstall)(import_PickerGroup.default);
+var stdin_default = PickerGroup;

package/lib/picker-group/style/index.js

@@ -0,0 +1,9 @@
+require("../../style/base.css");
+require("../../badge/index.css");
+require("../../sticky/index.css");
+require("../../swipe/index.css");
+require("../../swipe-item/index.css");
+require("../../tabs/index.css");
+require("../../tab/index.css");
+require("../../picker/index.css");
+require("../index.css");

package/lib/popover/Popover.js

@@ -63,24 +63,26 @@ var stdin_default = (0, import_vue2.defineComponent)({
     attrs
   }) {
     let popper;
+    const popupRef = (0, import_vue2.ref)();
     const wrapperRef = (0, import_vue2.ref)();
     const popoverRef = (0, import_vue2.ref)();
+    const getPopoverOptions = () => ({
+      placement: props.placement,
+      modifiers: [{
+        name: "computeStyles",
+        options: {
+          adaptive: false,
+          gpuAcceleration: false
+        }
+      }, (0, import_utils.extend)({}, import_popperjs.offsetModifier, {
+        options: {
+          offset: props.offset
+        }
+      })]
+    });
     const createPopperInstance = () => {
       if (wrapperRef.value && popoverRef.value) {
-        return (0, import_popperjs.createPopper)(wrapperRef.value, popoverRef.value.popupRef.value, {
-          placement: props.placement,
-          modifiers: [{
-            name: "computeStyles",
-            options: {
-              adaptive: false,
-              gpuAcceleration: false
-            }
-          }, (0, import_utils.extend)({}, import_popperjs.offsetModifier, {
-            options: {
-              offset: props.offset
-            }
-          })]
-        });
+        return (0, import_popperjs.createPopper)(wrapperRef.value, popoverRef.value.popupRef.value, getPopoverOptions());
       }
       return null;
     };
@@ -92,9 +94,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
         if (!popper) {
           popper = createPopperInstance();
         } else {
-          popper.setOptions({
-            placement: props.placement
-          });
+          popper.setOptions(getPopoverOptions());
         }
       });
     };
@@ -104,10 +104,6 @@ var stdin_default = (0, import_vue2.defineComponent)({
         updateShow(!props.show);
       }
     };
-    const onTouchstart = (event) => {
-      event.stopPropagation();
-      emit("touchstart", event);
-    };
     const onClickAction = (action, index) => {
       if (action.disabled) {
         return;
@@ -118,7 +114,7 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     };
     const onClickAway = () => {
-      if (props.closeOnClickOutside && (!props.overlay || props.closeOnClickOverlay)) {
+      if (props.show && props.closeOnClickOutside && (!props.overlay || props.closeOnClickOverlay)) {
         updateShow(false);
       }
     };
@@ -158,15 +154,21 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "onClick": () => onClickAction(action, index)
       }, [renderActionContent(action, index)]);
     };
-    (0, import_vue2.onMounted)(updateLocation);
+    (0, import_vue2.onMounted)(() => {
+      updateLocation();
+      (0, import_vue2.watchEffect)(() => {
+        var _a;
+        popupRef.value = (_a = popoverRef.value) == null ? void 0 : _a.popupRef.value;
+      });
+    });
     (0, import_vue2.onBeforeUnmount)(() => {
       if (popper) {
         popper.destroy();
         popper = null;
       }
     });
-    (0, import_vue2.watch)(() => [props.show, props.placement], updateLocation);
-    (0, import_use.useClickAway)(wrapperRef, onClickAway, {
+    (0, import_vue2.watch)(() => [props.show, props.offset, props.placement], updateLocation);
+    (0, import_use.useClickAway)([wrapperRef, popupRef], onClickAway, {
       eventName: "touchstart"
     });
     return () => {
@@ -181,7 +183,6 @@ var stdin_default = (0, import_vue2.defineComponent)({
         "position": "",
         "transition": "van-popover-zoom",
         "lockScroll": false,
-        "onTouchstart": onTouchstart,
         "onUpdate:show": updateShow
       }, attrs, (0, import_utils.pick)(props, popupProps)), {
         default: () => [props.showArrow && (0, import_vue.createVNode)("div", {

package/lib/popover/index.js

@@ -16,7 +16,10 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target, mod));
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var stdin_exports = {};
 __export(stdin_exports, {

package/lib/popup/Popup.d.ts

@@ -92,7 +92,7 @@ declare const _default: import("vue").DefineComponent<{
     };
     safeAreaInsetTop: BooleanConstructor;
     safeAreaInsetBottom: BooleanConstructor;
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("open" | "close" | "keydown" | "opened" | "closed" | "update:show" | "clickOverlay" | "clickCloseIcon")[], "open" | "close" | "keydown" | "opened" | "closed" | "update:show" | "clickOverlay" | "clickCloseIcon", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "keydown" | "open" | "opened" | "closed" | "update:show" | "clickOverlay" | "clickCloseIcon")[], "open" | "close" | "keydown" | "opened" | "closed" | "update:show" | "clickOverlay" | "clickCloseIcon", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     show: BooleanConstructor;
     zIndex: (NumberConstructor | StringConstructor)[];
     overlay: {
@@ -139,8 +139,8 @@ declare const _default: import("vue").DefineComponent<{
     safeAreaInsetBottom: BooleanConstructor;
 }>> & {
     onKeydown?: ((...args: any[]) => any) | undefined;
-    onOpen?: ((...args: any[]) => any) | undefined;
     onClose?: ((...args: any[]) => any) | undefined;
+    onOpen?: ((...args: any[]) => any) | undefined;
     onOpened?: ((...args: any[]) => any) | undefined;
     onClosed?: ((...args: any[]) => any) | undefined;
     "onUpdate:show"?: ((...args: any[]) => any) | undefined;