vant 3.5.4 → 3.6.2

package/es/index-bar/IndexBar.mjs

@@ -31,6 +31,7 @@ var stdin_default = defineComponent({
     slots
   }) {
     const root = ref();
+    const sidebar = ref();
     const activeAnchor = ref("");
     const touch = useTouch();
     const scrollParent = useScrollParent(root);
@@ -121,7 +122,8 @@ var stdin_default = defineComponent({
       nextTick(onScroll);
     };
     useEventListener("scroll", onScroll, {
-      target: scrollParent
+      target: scrollParent,
+      passive: true
     });
     onMounted(init);
     watch(() => props.indexList, init);
@@ -149,11 +151,11 @@ var stdin_default = defineComponent({
         const {
           offsetHeight
         } = document.documentElement;
+        match.$el.scrollIntoView();
         if (scrollTop === offsetHeight - scrollParentRect.height) {
           onScroll();
           return;
         }
-        match.$el.scrollIntoView();
         if (props.sticky && props.stickyOffsetTop) {
           setRootScrollTop(getRootScrollTop() - props.stickyOffsetTop);
         }
@@ -193,15 +195,18 @@ var stdin_default = defineComponent({
       }
     };
     const renderSidebar = () => _createVNode("div", {
+      "ref": sidebar,
       "class": bem("sidebar"),
       "style": sidebarStyle.value,
       "onClick": onClickSidebar,
-      "onTouchstart": touch.start,
-      "onTouchmove": onTouchMove
+      "onTouchstartPassive": touch.start
     }, [renderIndexes()]);
     useExpose({
       scrollTo
     });
+    useEventListener("touchmove", onTouchMove, {
+      target: sidebar
+    });
     return () => {
       var _a;
       return _createVNode("div", {

package/es/index.d.ts

@@ -67,6 +67,7 @@ export * from "./sidebar";
 export * from "./sidebar-item";
 export * from "./skeleton";
 export * from "./slider";
+export * from "./space";
 export * from "./step";
 export * from "./stepper";
 export * from "./steps";
@@ -90,4 +91,4 @@ declare namespace _default {
 }
 export default _default;
 export function install(app: any): void;
-export const version: "3.5.4";
+export const version: "3.6.2";

package/es/index.mjs

@@ -66,6 +66,7 @@ import { Sidebar } from "./sidebar/index.mjs";
 import { SidebarItem } from "./sidebar-item/index.mjs";
 import { Skeleton } from "./skeleton/index.mjs";
 import { Slider } from "./slider/index.mjs";
+import { Space } from "./space/index.mjs";
 import { Step } from "./step/index.mjs";
 import { Stepper } from "./stepper/index.mjs";
 import { Steps } from "./steps/index.mjs";
@@ -83,7 +84,7 @@ import { Tag } from "./tag/index.mjs";
 import { Toast } from "./toast/index.mjs";
 import { TreeSelect } from "./tree-select/index.mjs";
 import { Uploader } from "./uploader/index.mjs";
-const version = "3.5.4";
+const version = "3.6.2";
 function install(app) {
   const components = [
     ActionBar,
@@ -154,6 +155,7 @@ function install(app) {
     SidebarItem,
     Skeleton,
     Slider,
+    Space,
     Step,
     Stepper,
     Steps,
@@ -249,6 +251,7 @@ export * from "./sidebar/index.mjs";
 export * from "./sidebar-item/index.mjs";
 export * from "./skeleton/index.mjs";
 export * from "./slider/index.mjs";
+export * from "./space/index.mjs";
 export * from "./step/index.mjs";
 export * from "./stepper/index.mjs";
 export * from "./steps/index.mjs";

package/es/lazyload/vue-lazyload/lazy-component.mjs

@@ -9,7 +9,10 @@ var stdin_default = (lazy) => ({
   },
   emits: ["show"],
   render() {
-    return h(this.tag, this.show && this.$slots.default ? this.$slots.default() : null);
+    return h(
+      this.tag,
+      this.show && this.$slots.default ? this.$slots.default() : null
+    );
   },
   data() {
     return {

package/es/lazyload/vue-lazyload/lazy-container.mjs

@@ -17,13 +17,17 @@ class LazyContainer {
     this.options = Object.assign({}, defaultOptions, binding.value);
     const imgs = this.getImgs();
     imgs.forEach((el2) => {
-      this.lazy.add(el2, Object.assign({}, this.binding, {
-        value: {
-          src: "dataset" in el2 ? el2.dataset.src : el2.getAttribute("data-src"),
-          error: ("dataset" in el2 ? el2.dataset.error : el2.getAttribute("data-error")) || this.options.error,
-          loading: ("dataset" in el2 ? el2.dataset.loading : el2.getAttribute("data-loading")) || this.options.loading
-        }
-      }), this.vnode);
+      this.lazy.add(
+        el2,
+        Object.assign({}, this.binding, {
+          value: {
+            src: "dataset" in el2 ? el2.dataset.src : el2.getAttribute("data-src"),
+            error: ("dataset" in el2 ? el2.dataset.error : el2.getAttribute("data-error")) || this.options.error,
+            loading: ("dataset" in el2 ? el2.dataset.loading : el2.getAttribute("data-loading")) || this.options.loading
+          }
+        }),
+        this.vnode
+      );
     });
   }
   getImgs() {

package/es/lazyload/vue-lazyload/lazy-image.mjs

@@ -10,11 +10,15 @@ var stdin_default = (lazyManager) => ({
     }
   },
   render(h) {
-    return h(this.tag, {
-      attrs: {
-        src: this.renderSrc
-      }
-    }, this.$slots.default);
+    return h(
+      this.tag,
+      {
+        attrs: {
+          src: this.renderSrc
+        }
+      },
+      this.$slots.default
+    );
   },
   data() {
     return {
@@ -68,20 +72,26 @@ var stdin_default = (lazyManager) => ({
     load(onFinish = noop) {
       if (this.state.attempt > this.options.attempt - 1 && this.state.error) {
         if (process.env.NODE_ENV !== "production" && !lazyManager.options.silent) {
-          console.log(`[@vant/lazyload] ${this.options.src} tried too more than ${this.options.attempt} times`);
+          console.log(
+            `[@vant/lazyload] ${this.options.src} tried too more than ${this.options.attempt} times`
+          );
         }
         onFinish();
         return;
       }
       const { src } = this.options;
-      loadImageAsync({ src }, ({ src: src2 }) => {
-        this.renderSrc = src2;
-        this.state.loaded = true;
-      }, () => {
-        this.state.attempt++;
-        this.renderSrc = this.options.error;
-        this.state.error = true;
-      });
+      loadImageAsync(
+        { src },
+        ({ src: src2 }) => {
+          this.renderSrc = src2;
+          this.state.loaded = true;
+        },
+        () => {
+          this.state.attempt++;
+          this.renderSrc = this.options.error;
+          this.state.error = true;
+        }
+      );
     }
   }
 });

package/es/lazyload/vue-lazyload/lazy.mjs

@@ -69,7 +69,10 @@ function stdin_default() {
       };
       this.initEvent();
       this.imageCache = new ImageCache({ max: 200 });
-      this.lazyLoadHandler = throttle(this.lazyLoadHandler.bind(this), this.options.throttleWait);
+      this.lazyLoadHandler = throttle(
+        this.lazyLoadHandler.bind(this),
+        this.options.throttleWait
+      );
       this.setMode(this.options.observer ? modeType.observer : modeType.event);
     }
     config(options = {}) {
@@ -224,7 +227,9 @@ function stdin_default() {
       });
     }
     initListen(el, start) {
-      this.options.ListenEvents.forEach((evt) => (start ? on : off)(el, evt, this.lazyLoadHandler));
+      this.options.ListenEvents.forEach(
+        (evt) => (start ? on : off)(el, evt, this.lazyLoadHandler)
+      );
     }
     initEvent() {
       this.Event = {
@@ -281,7 +286,10 @@ function stdin_default() {
       if (!hasIntersectionObserver) {
         return;
       }
-      this.observer = new IntersectionObserver(this.observerHandler.bind(this), this.options.observerOptions);
+      this.observer = new IntersectionObserver(
+        this.observerHandler.bind(this),
+        this.options.observerOptions
+      );
       if (this.listeners.length) {
         this.listeners.forEach((listener) => {
           this.observer.observe(listener.el);

package/es/lazyload/vue-lazyload/listener.mjs

@@ -73,24 +73,32 @@ class ReactiveListener {
   }
   renderLoading(cb) {
     this.state.loading = true;
-    loadImageAsync({
-      src: this.loading,
-      cors: this.cors
-    }, () => {
-      this.render("loading", false);
-      this.state.loading = false;
-      cb();
-    }, () => {
-      cb();
-      this.state.loading = false;
-      if (process.env.NODE_ENV !== "production" && !this.options.silent)
-        console.warn(`[@vant/lazyload] load failed with loading image(${this.loading})`);
-    });
+    loadImageAsync(
+      {
+        src: this.loading,
+        cors: this.cors
+      },
+      () => {
+        this.render("loading", false);
+        this.state.loading = false;
+        cb();
+      },
+      () => {
+        cb();
+        this.state.loading = false;
+        if (process.env.NODE_ENV !== "production" && !this.options.silent)
+          console.warn(
+            `[@vant/lazyload] load failed with loading image(${this.loading})`
+          );
+      }
+    );
   }
   load(onFinish = noop) {
     if (this.attempt > this.options.attempt - 1 && this.state.error) {
       if (process.env.NODE_ENV !== "production" && !this.options.silent) {
-        console.log(`[@vant/lazyload] ${this.src} tried too more than ${this.options.attempt} times`);
+        console.log(
+          `[@vant/lazyload] ${this.src} tried too more than ${this.options.attempt} times`
+        );
       }
       onFinish();
       return;
@@ -108,25 +116,29 @@ class ReactiveListener {
       this.attempt++;
       (_b = (_a = this.options.adapter).beforeLoad) == null ? void 0 : _b.call(_a, this, this.options);
       this.record("loadStart");
-      loadImageAsync({
-        src: this.src,
-        cors: this.cors
-      }, (data) => {
-        this.naturalHeight = data.naturalHeight;
-        this.naturalWidth = data.naturalWidth;
-        this.state.loaded = true;
-        this.state.error = false;
-        this.record("loadEnd");
-        this.render("loaded", false);
-        this.state.rendered = true;
-        this.imageCache.add(this.src);
-        onFinish();
-      }, (err) => {
-        !this.options.silent && console.error(err);
-        this.state.error = true;
-        this.state.loaded = false;
-        this.render("error", false);
-      });
+      loadImageAsync(
+        {
+          src: this.src,
+          cors: this.cors
+        },
+        (data) => {
+          this.naturalHeight = data.naturalHeight;
+          this.naturalWidth = data.naturalWidth;
+          this.state.loaded = true;
+          this.state.error = false;
+          this.record("loadEnd");
+          this.render("loaded", false);
+          this.state.rendered = true;
+          this.imageCache.add(this.src);
+          onFinish();
+        },
+        (err) => {
+          !this.options.silent && console.error(err);
+          this.state.error = true;
+          this.state.loaded = false;
+          this.render("error", false);
+        }
+      );
     });
   }
   render(state, cache) {

package/es/lazyload/vue-lazyload/util.mjs

@@ -29,7 +29,10 @@ function getBestSelectionFromSrcset(el, scale) {
       tmpWidth = 999998;
     } else {
       tmpSrc = item.substr(0, spaceIndex);
-      tmpWidth = parseInt(item.substr(spaceIndex + 1, item.length - spaceIndex - 2), 10);
+      tmpWidth = parseInt(
+        item.substr(spaceIndex + 1, item.length - spaceIndex - 2),
+        10
+      );
     }
     return [tmpWidth, tmpSrc];
   });

package/es/list/List.mjs

@@ -115,7 +115,8 @@ var stdin_default = defineComponent({
       check
     });
     useEventListener("scroll", check, {
-      target: scrollParent
+      target: scrollParent,
+      passive: true
     });
     return () => {
       var _a;

package/es/loading/Loading.d.ts

@@ -22,7 +22,7 @@ declare const _default: import("vue").DefineComponent<{
     vertical: BooleanConstructor;
     textSize: (NumberConstructor | StringConstructor)[];
     textColor: StringConstructor;
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     size: (NumberConstructor | StringConstructor)[];
     type: {
         type: import("vue").PropType<LoadingType>;

package/es/loading/index.d.ts

@@ -8,7 +8,7 @@ export declare const Loading: import("../utils").WithInstall<import("vue").Defin
     vertical: BooleanConstructor;
     textSize: (NumberConstructor | StringConstructor)[];
     textColor: StringConstructor;
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     size: (NumberConstructor | StringConstructor)[];
     type: {
         type: import("vue").PropType<import("./Loading").LoadingType>;

package/es/number-keyboard/NumberKeyboard.d.ts

@@ -92,7 +92,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<string | string[]>;
         default: string;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("input" | "blur" | "update:modelValue" | "hide" | "show" | "close" | "delete")[], "input" | "blur" | "update:modelValue" | "hide" | "show" | "close" | "delete", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("input" | "blur" | "update:modelValue" | "close" | "hide" | "show" | "delete")[], "input" | "blur" | "update:modelValue" | "close" | "hide" | "show" | "delete", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     show: BooleanConstructor;
     title: StringConstructor;
     theme: {

package/es/number-keyboard/NumberKeyboard.mjs

@@ -204,9 +204,8 @@ var stdin_default = defineComponent({
             unfit: !props.safeAreaInsetBottom,
             "with-title": !!Title
           }),
-          "onTouchstart": stopPropagation,
           "onAnimationend": onAnimationEnd,
-          "onWebkitAnimationEnd": onAnimationEnd
+          "onTouchstartPassive": stopPropagation
         }, [Title, _createVNode("div", {
           "class": bem("body")
         }, [_createVNode("div", {

package/es/number-keyboard/NumberKeyboardKey.mjs

@@ -74,8 +74,8 @@ var stdin_default = defineComponent({
       "class": bem("wrapper", {
         wider: props.wider
       }),
-      "onTouchstart": onTouchStart,
-      "onTouchmove": onTouchMove,
+      "onTouchstartPassive": onTouchStart,
+      "onTouchmovePassive": onTouchMove,
       "onTouchend": onTouchEnd,
       "onTouchcancel": onTouchEnd
     }, [_createVNode("div", {

package/es/number-keyboard/index.d.ts

@@ -43,7 +43,7 @@ export declare const NumberKeyboard: import("../utils").WithInstall<import("vue"
         type: import("vue").PropType<string | string[]>;
         default: string;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("input" | "blur" | "update:modelValue" | "hide" | "show" | "close" | "delete")[], "input" | "blur" | "update:modelValue" | "hide" | "show" | "close" | "delete", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("input" | "blur" | "update:modelValue" | "close" | "hide" | "show" | "delete")[], "input" | "blur" | "update:modelValue" | "close" | "hide" | "show" | "delete", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     show: BooleanConstructor;
     title: StringConstructor;
     theme: {

package/es/overlay/Overlay.d.ts

@@ -29,7 +29,7 @@ declare const _default: import("vue").DefineComponent<{
         default: true;
     };
     customStyle: PropType<CSSProperties>;
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
     show: BooleanConstructor;
     zIndex: (NumberConstructor | StringConstructor)[];
     duration: (NumberConstructor | StringConstructor)[];

package/es/overlay/Overlay.mjs

@@ -1,6 +1,7 @@
 import { withDirectives as _withDirectives, createVNode as _createVNode, vShow as _vShow } from "vue";
-import { Transition, defineComponent } from "vue";
-import { noop, isDef, extend, truthProp, numericProp, unknownProp, preventDefault, createNamespace, getZIndexStyle } from "../utils/index.mjs";
+import { ref, Transition, defineComponent } from "vue";
+import { isDef, extend, truthProp, numericProp, unknownProp, preventDefault, createNamespace, getZIndexStyle } from "../utils/index.mjs";
+import { useEventListener } from "@vant/use";
 import { useLazyRender } from "../composables/use-lazy-render.mjs";
 const [name, bem] = createNamespace("overlay");
 const overlayProps = {
@@ -18,9 +19,12 @@ var stdin_default = defineComponent({
   setup(props, {
     slots
   }) {
+    const root = ref();
     const lazyRender = useLazyRender(() => props.show || !props.lazyRender);
-    const preventTouchMove = (event) => {
-      preventDefault(event, true);
+    const onTouchMove = (event) => {
+      if (props.lockScroll) {
+        preventDefault(event, true);
+      }
     };
     const renderOverlay = lazyRender(() => {
       var _a;
@@ -29,11 +33,14 @@ var stdin_default = defineComponent({
         style.animationDuration = `${props.duration}s`;
       }
       return _withDirectives(_createVNode("div", {
+        "ref": root,
         "style": style,
-        "class": [bem(), props.className],
-        "onTouchmove": props.lockScroll ? preventTouchMove : noop
+        "class": [bem(), props.className]
       }, [(_a = slots.default) == null ? void 0 : _a.call(slots)]), [[_vShow, props.show]]);
     });
+    useEventListener("touchmove", onTouchMove, {
+      target: root
+    });
     return () => _createVNode(Transition, {
       "name": "van-fade",
       "appear": true

package/es/overlay/index.d.ts

@@ -12,7 +12,7 @@ export declare const Overlay: import("../utils").WithInstall<import("vue").Defin
         default: true;
     };
     customStyle: import("vue").PropType<import("vue").CSSProperties>;
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     show: BooleanConstructor;
     zIndex: (NumberConstructor | StringConstructor)[];
     duration: (NumberConstructor | StringConstructor)[];

package/es/password-input/PasswordInput.mjs

@@ -66,7 +66,7 @@ var stdin_default = defineComponent({
         "class": [bem("security"), {
           [BORDER_SURROUND]: !props.gutter
         }],
-        "onTouchstart": onTouchStart
+        "onTouchstartPassive": onTouchStart
       }, [renderPoints()]), info && _createVNode("div", {
         "class": bem(props.errorInfo ? "error-info" : "info")
       }, [info])]);

package/es/picker/Picker.mjs

@@ -1,7 +1,7 @@
 import { createVNode as _createVNode } from "vue";
 import { ref, watch, computed, defineComponent } from "vue";
 import { extend, unitToPx, truthProp, makeArrayProp, preventDefault, makeStringProp, makeNumericProp, createNamespace, HAPTICS_FEEDBACK, BORDER_UNSET_TOP_BOTTOM } from "../utils/index.mjs";
-import { useChildren } from "@vant/use";
+import { useChildren, useEventListener } from "@vant/use";
 import { useExpose } from "../composables/use-expose.mjs";
 import { Loading } from "../loading/index.mjs";
 import Column, { PICKER_KEY } from "./PickerColumn.mjs";
@@ -42,6 +42,7 @@ var stdin_default = defineComponent({
       }
     }
     const hasOptions = ref(false);
+    const columnsRef = ref();
     const formattedColumns = ref([]);
     const columnsFieldNames = computed(() => {
       const {
@@ -278,14 +279,17 @@ var stdin_default = defineComponent({
         height: `${wrapHeight}px`
       };
       return _createVNode("div", {
+        "ref": columnsRef,
         "class": bem("columns"),
-        "style": columnsStyle,
-        "onTouchmove": preventDefault
+        "style": columnsStyle
       }, [renderColumnItems(), renderMask(wrapHeight)]);
     };
     watch(() => props.columns, format, {
       immediate: true
     });
+    useEventListener("touchmove", preventDefault, {
+      target: columnsRef
+    });
     useExpose({
       confirm,
       getValues,

package/es/picker/PickerColumn.mjs

@@ -2,7 +2,7 @@ import { createVNode as _createVNode } from "vue";
 import { ref, watch, reactive, defineComponent } from "vue";
 import { deepClone } from "../utils/deep-clone.mjs";
 import { clamp, isObject, unknownProp, numericProp, makeArrayProp, makeNumberProp, preventDefault, createNamespace, makeRequiredProp } from "../utils/index.mjs";
-import { useParent } from "@vant/use";
+import { useEventListener, useParent } from "@vant/use";
 import { useTouch } from "../composables/use-touch.mjs";
 import { useExpose } from "../composables/use-expose.mjs";
 const DEFAULT_DURATION = 200;
@@ -41,6 +41,7 @@ var stdin_default = defineComponent({
     let touchStartTime;
     let momentumOffset;
     let transitionEndTrigger;
+    const root = ref();
     const wrapper = ref();
     const state = reactive({
       index: props.defaultIndex,
@@ -216,10 +217,13 @@ var stdin_default = defineComponent({
     });
     watch(() => props.initialOptions, setOptions);
     watch(() => props.defaultIndex, (value) => setIndex(value));
+    useEventListener("touchmove", onTouchMove, {
+      target: root
+    });
     return () => _createVNode("div", {
+      "ref": root,
       "class": [bem(), props.className],
-      "onTouchstart": onTouchStart,
-      "onTouchmove": onTouchMove,
+      "onTouchstartPassive": onTouchStart,
       "onTouchend": onTouchEnd,
       "onTouchcancel": onTouchEnd
     }, [_createVNode("ul", {

package/es/popover/Popover.mjs

@@ -1,5 +1,5 @@
 import { mergeProps as _mergeProps, Fragment as _Fragment, createVNode as _createVNode } from "vue";
-import { ref, watch, nextTick, onMounted, onBeforeUnmount, defineComponent } from "vue";
+import { ref, watch, nextTick, onMounted, watchEffect, onBeforeUnmount, defineComponent } from "vue";
 import { createPopper, offsetModifier } from "@vant/popperjs";
 import { pick, extend, truthProp, numericProp, unknownProp, BORDER_BOTTOM, makeArrayProp, makeStringProp, createNamespace } from "../utils/index.mjs";
 import { useClickAway } from "@vant/use";
@@ -41,6 +41,7 @@ var stdin_default = defineComponent({
     attrs
   }) {
     let popper;
+    const popupRef = ref();
     const wrapperRef = ref();
     const popoverRef = ref();
     const getPopoverOptions = () => ({
@@ -81,10 +82,6 @@ var stdin_default = defineComponent({
         updateShow(!props.show);
       }
     };
-    const onTouchstart = (event) => {
-      event.stopPropagation();
-      emit("touchstart", event);
-    };
     const onClickAction = (action, index) => {
       if (action.disabled) {
         return;
@@ -95,7 +92,7 @@ var stdin_default = defineComponent({
       }
     };
     const onClickAway = () => {
-      if (props.closeOnClickOutside && (!props.overlay || props.closeOnClickOverlay)) {
+      if (props.show && props.closeOnClickOutside && (!props.overlay || props.closeOnClickOverlay)) {
         updateShow(false);
       }
     };
@@ -135,7 +132,13 @@ var stdin_default = defineComponent({
         "onClick": () => onClickAction(action, index)
       }, [renderActionContent(action, index)]);
     };
-    onMounted(updateLocation);
+    onMounted(() => {
+      updateLocation();
+      watchEffect(() => {
+        var _a;
+        popupRef.value = (_a = popoverRef.value) == null ? void 0 : _a.popupRef.value;
+      });
+    });
     onBeforeUnmount(() => {
       if (popper) {
         popper.destroy();
@@ -143,7 +146,7 @@ var stdin_default = defineComponent({
       }
     });
     watch(() => [props.show, props.offset, props.placement], updateLocation);
-    useClickAway(wrapperRef, onClickAway, {
+    useClickAway([wrapperRef, popupRef], onClickAway, {
       eventName: "touchstart"
     });
     return () => {
@@ -158,7 +161,6 @@ var stdin_default = defineComponent({
         "position": "",
         "transition": "van-popover-zoom",
         "lockScroll": false,
-        "onTouchstart": onTouchstart,
         "onUpdate:show": updateShow
       }, attrs, pick(props, popupProps)), {
         default: () => [props.showArrow && _createVNode("div", {

package/es/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" | "click-overlay" | "click-close-icon")[], "open" | "close" | "keydown" | "opened" | "closed" | "update:show" | "click-overlay" | "click-close-icon", 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" | "click-overlay" | "click-close-icon")[], "open" | "close" | "keydown" | "opened" | "closed" | "update:show" | "click-overlay" | "click-close-icon", 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;