vant 3.6.1 → 3.6.2

package/lib/vant.cjs.js

@@ -332,9 +332,15 @@ function genBem(name2, mods) {
     return ` ${name2}--${mods}`;
   }
   if (Array.isArray(mods)) {
-    return mods.reduce((ret, item) => ret + genBem(name2, item), "");
-  }
-  return Object.keys(mods).reduce((ret, key) => ret + (mods[key] ? genBem(name2, key) : ""), "");
+    return mods.reduce(
+      (ret, item) => ret + genBem(name2, item),
+      ""
+    );
+  }
+  return Object.keys(mods).reduce(
+    (ret, key) => ret + (mods[key] ? genBem(name2, key) : ""),
+    ""
+  );
 }
 function createBEM(name2) {
   return (el, mods) => {
@@ -390,8 +396,10 @@ function callInterceptor(interceptor, {
 function withInstall(options) {
   options.install = (app) => {
     const { name: name2 } = options;
-    app.component(name2, options);
-    app.component(camelize(`-${name2}`), options);
+    if (name2) {
+      app.component(name2, options);
+      app.component(camelize(`-${name2}`), options);
+    }
   };
   return options;
 }
@@ -1020,7 +1028,9 @@ const popupSharedProps = {
   transitionAppear: Boolean,
   closeOnClickOverlay: truthProp
 };
-const popupSharedPropKeys = Object.keys(popupSharedProps);
+const popupSharedPropKeys = Object.keys(
+  popupSharedProps
+);
 function getDirection(x, y) {
   if (x > y) {
     return "horizontal";
@@ -1087,7 +1097,10 @@ function useLockScroll(rootRef, shouldLock) {
   const onTouchMove = (event) => {
     touch.move(event);
     const direction = touch.deltaY.value > 0 ? DIRECTION_DOWN : DIRECTION_UP;
-    const el = use.getScrollParent(event.target, rootRef.value);
+    const el = use.getScrollParent(
+      event.target,
+      rootRef.value
+    );
     const { scrollHeight, offsetHeight, scrollTop } = el;
     let status = "11";
     if (scrollTop === 0) {
@@ -1128,11 +1141,15 @@ function useLockScroll(rootRef, shouldLock) {
 }
 function useLazyRender(show) {
   const inited = vue.ref(false);
-  vue.watch(show, (value) => {
-    if (value) {
-      inited.value = value;
-    }
-  }, { immediate: true });
+  vue.watch(
+    show,
+    (value) => {
+      if (value) {
+        inited.value = value;
+      }
+    },
+    { immediate: true }
+  );
   return (render) => () => inited.value ? render() : null;
 }
 const [name$1n, bem$1j] = createNamespace("overlay");
@@ -1151,9 +1168,12 @@ var stdin_default$1u = vue.defineComponent({
   setup(props, {
     slots
   }) {
+    const root = vue.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;
@@ -1162,11 +1182,14 @@ var stdin_default$1u = vue.defineComponent({
         style.animationDuration = `${props.duration}s`;
       }
       return vue.withDirectives(vue.createVNode("div", {
+        "ref": root,
         "style": style,
-        "class": [bem$1j(), props.className],
-        "onTouchmove": props.lockScroll ? preventTouchMove : noop
+        "class": [bem$1j(), props.className]
       }, [(_a = slots.default) == null ? void 0 : _a.call(slots)]), [[vue.vShow, props.show]]);
     });
+    use.useEventListener("touchmove", onTouchMove, {
+      target: root
+    });
     return () => vue.createVNode(vue.Transition, {
       "name": "van-fade",
       "appear": true
@@ -1542,6 +1565,7 @@ var stdin_default$1r = vue.defineComponent({
     let touchStartTime;
     let momentumOffset;
     let transitionEndTrigger;
+    const root = vue.ref();
     const wrapper = vue.ref();
     const state = vue.reactive({
       index: props.defaultIndex,
@@ -1717,10 +1741,13 @@ var stdin_default$1r = vue.defineComponent({
     });
     vue.watch(() => props.initialOptions, setOptions);
     vue.watch(() => props.defaultIndex, (value) => setIndex(value));
+    use.useEventListener("touchmove", onTouchMove, {
+      target: root
+    });
     return () => vue.createVNode("div", {
+      "ref": root,
       "class": [bem$1g(), props.className],
       "onTouchstartPassive": onTouchStart,
-      "onTouchmove": onTouchMove,
       "onTouchend": onTouchEnd,
       "onTouchcancel": onTouchEnd
     }, [vue.createVNode("ul", {
@@ -1772,6 +1799,7 @@ var stdin_default$1q = vue.defineComponent({
       }
     }
     const hasOptions = vue.ref(false);
+    const columnsRef = vue.ref();
     const formattedColumns = vue.ref([]);
     const columnsFieldNames = vue.computed(() => {
       const {
@@ -2008,14 +2036,17 @@ var stdin_default$1q = vue.defineComponent({
         height: `${wrapHeight}px`
       };
       return vue.createVNode("div", {
+        "ref": columnsRef,
         "class": bem$1f("columns"),
-        "style": columnsStyle,
-        "onTouchmove": preventDefault
+        "style": columnsStyle
       }, [renderColumnItems(), renderMask(wrapHeight)]);
     };
     vue.watch(() => props.columns, format2, {
       immediate: true
     });
+    use.useEventListener("touchmove", preventDefault, {
+      target: columnsRef
+    });
     useExpose({
       confirm,
       getValues,
@@ -2693,6 +2724,7 @@ var stdin_default$1m = vue.defineComponent({
       validateMessage: ""
     });
     const inputRef = vue.ref();
+    const clearIconRef = vue.ref();
     const customValue = vue.ref();
     const {
       parent: form
@@ -3008,9 +3040,9 @@ var stdin_default$1m = vue.defineComponent({
     const renderFieldBody = () => [vue.createVNode("div", {
       "class": bem$1b("body")
     }, [renderInput(), showClear.value && vue.createVNode(Icon, {
+      "ref": clearIconRef,
       "name": props.clearIcon,
-      "class": bem$1b("clear"),
-      "onTouchstart": onClear
+      "class": bem$1b("clear")
     }, null), renderRightIcon(), slots.button && vue.createVNode("div", {
       "class": bem$1b("button")
     }, [slots.button()])]), renderWordLimit(), renderMessage()];
@@ -3037,6 +3069,12 @@ var stdin_default$1m = vue.defineComponent({
       updateValue(getModelValue(), props.formatTrigger);
       vue.nextTick(adjustTextareaSize);
     });
+    use.useEventListener("touchstart", onClear, {
+      target: vue.computed(() => {
+        var _a;
+        return (_a = clearIconRef.value) == null ? void 0 : _a.$el;
+      })
+    });
     return () => {
       const disabled = getProp("disabled");
       const labelAlign = getProp("labelAlign");
@@ -4757,7 +4795,8 @@ var stdin_default$18 = vue.defineComponent({
       const {
         type,
         minDate,
-        maxDate
+        maxDate,
+        allowSameDay
       } = props;
       if (defaultDate === null) {
         return defaultDate;
@@ -4767,8 +4806,8 @@ var stdin_default$18 = vue.defineComponent({
         if (!Array.isArray(defaultDate)) {
           defaultDate = [];
         }
-        const start = limitDateRange(defaultDate[0] || now, minDate, getPrevDay(maxDate));
-        const end = limitDateRange(defaultDate[1] || now, getNextDay(minDate));
+        const start = limitDateRange(defaultDate[0] || now, minDate, allowSameDay ? maxDate : getPrevDay(maxDate));
+        const end = limitDateRange(defaultDate[1] || now, allowSameDay ? minDate : getNextDay(minDate));
         return [start, end];
       }
       if (type === "multiple") {
@@ -5377,9 +5416,12 @@ function useVisibilityChange(target, onChange) {
   if (!inBrowser || !window.IntersectionObserver) {
     return;
   }
-  const observer = new IntersectionObserver((entries) => {
-    onChange(entries[0].intersectionRatio > 0);
-  }, { root: document.body });
+  const observer = new IntersectionObserver(
+    (entries) => {
+      onChange(entries[0].intersectionRatio > 0);
+    },
+    { root: document.body }
+  );
   const observe = () => {
     if (target.value) {
       observer.observe(target.value);
@@ -5615,6 +5657,7 @@ var stdin_default$13 = vue.defineComponent({
     slots
   }) {
     const root = vue.ref();
+    const track = vue.ref();
     const state = vue.reactive({
       rect: null,
       width: 0,
@@ -5801,10 +5844,13 @@ var stdin_default$13 = vue.defineComponent({
       if (props.touchable && state.swiping) {
         touch.move(event);
         if (isCorrectDirection.value) {
-          preventDefault(event, props.stopPropagation);
-          move({
-            offset: delta.value
-          });
+          const isEdgeTouch = !props.loop && (state.active === 0 && delta.value > 0 || state.active === count.value - 1 && delta.value < 0);
+          if (!isEdgeTouch) {
+            preventDefault(event, props.stopPropagation);
+            move({
+              offset: delta.value
+            });
+          }
         }
       }
     };
@@ -5914,18 +5960,21 @@ var stdin_default$13 = vue.defineComponent({
     onPopupReopen(() => initialize(state.active));
     vue.onDeactivated(stopAutoplay);
     vue.onBeforeUnmount(stopAutoplay);
+    use.useEventListener("touchmove", onTouchMove, {
+      target: track
+    });
     return () => {
       var _a;
       return vue.createVNode("div", {
         "ref": root,
         "class": bem$Y()
       }, [vue.createVNode("div", {
+        "ref": track,
         "style": trackStyle.value,
         "class": bem$Y("track", {
           vertical: props.vertical
         }),
         "onTouchstartPassive": onTouchStart,
-        "onTouchmove": onTouchMove,
         "onTouchend": onTouchEnd,
         "onTouchcancel": onTouchEnd
       }, [(_a = slots.default) == null ? void 0 : _a.call(slots)]), renderIndicator()]);
@@ -7738,7 +7787,9 @@ var stdin_default$O = vue.defineComponent({
 const CountDown = withInstall(stdin_default$O);
 function getDate(timeStamp) {
   const date = new Date(timeStamp * 1e3);
-  return `${date.getFullYear()}.${padZero(date.getMonth() + 1)}.${padZero(date.getDate())}`;
+  return `${date.getFullYear()}.${padZero(date.getMonth() + 1)}.${padZero(
+    date.getDate()
+  )}`;
 }
 const formatDiscount = (discount) => (discount / 10).toFixed(discount % 10 === 0 ? 0 : 1);
 const formatAmount = (amount) => (amount / 100).toFixed(amount % 100 === 0 ? 0 : amount % 10 === 0 ? 1 : 2);
@@ -9543,6 +9594,7 @@ var stdin_default$A = vue.defineComponent({
       displayHeight: 0
     });
     const touch = useTouch();
+    const swipeItem = vue.ref();
     const vertical = vue.computed(() => {
       const {
         rootWidth,
@@ -9728,6 +9780,12 @@ var stdin_default$A = vue.defineComponent({
         resetScale();
       }
     });
+    use.useEventListener("touchmove", onTouchMove, {
+      target: vue.computed(() => {
+        var _a;
+        return (_a = swipeItem.value) == null ? void 0 : _a.$el;
+      })
+    });
     return () => {
       const imageSlots = {
         loading: () => vue.createVNode(Loading, {
@@ -9735,9 +9793,9 @@ var stdin_default$A = vue.defineComponent({
         }, null)
       };
       return vue.createVNode(SwipeItem, {
+        "ref": swipeItem,
         "class": bem$v("swipe-item"),
         "onTouchstartPassive": onTouchStart,
-        "onTouchmove": onTouchMove,
         "onTouchend": onTouchEnd,
         "onTouchcancel": onTouchEnd
       }, {
@@ -9991,6 +10049,7 @@ var stdin_default$y = vue.defineComponent({
     slots
   }) {
     const root = vue.ref();
+    const sidebar = vue.ref();
     const activeAnchor = vue.ref("");
     const touch = useTouch();
     const scrollParent = use.useScrollParent(root);
@@ -10110,11 +10169,11 @@ var stdin_default$y = vue.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);
         }
@@ -10154,15 +10213,18 @@ var stdin_default$y = vue.defineComponent({
       }
     };
     const renderSidebar = () => vue.createVNode("div", {
+      "ref": sidebar,
       "class": bem$t("sidebar"),
       "style": sidebarStyle.value,
       "onClick": onClickSidebar,
-      "onTouchstartPassive": touch.start,
-      "onTouchmove": onTouchMove
+      "onTouchstartPassive": touch.start
     }, [renderIndexes()]);
     useExpose({
       scrollTo
     });
+    use.useEventListener("touchmove", onTouchMove, {
+      target: sidebar
+    });
     return () => {
       var _a;
       return vue.createVNode("div", {
@@ -11861,6 +11923,9 @@ var stdin_default$l = vue.defineComponent({
       }, null)]);
     };
     use.useCustomFieldValue(() => props.modelValue);
+    use.useEventListener("touchmove", onTouchMove, {
+      target: groupRef
+    });
     return () => vue.createVNode("div", {
       "ref": groupRef,
       "role": "radiogroup",
@@ -11871,8 +11936,7 @@ var stdin_default$l = vue.defineComponent({
       "tabindex": props.disabled ? void 0 : 0,
       "aria-disabled": props.disabled,
       "aria-readonly": props.readonly,
-      "onTouchstartPassive": onTouchStart,
-      "onTouchmove": onTouchMove
+      "onTouchstartPassive": onTouchStart
     }, [list.value.map(renderStar)]);
   }
 });
@@ -12311,6 +12375,7 @@ var stdin_default$f = vue.defineComponent({
     let current2;
     let startValue;
     const root = vue.ref();
+    const slider = vue.ref();
     const dragStatus = vue.ref();
     const touch = useTouch();
     const scope = vue.computed(() => Number(props.max) - Number(props.min));
@@ -12503,6 +12568,7 @@ var stdin_default$f = vue.defineComponent({
     const renderButton = (index) => {
       const current22 = typeof index === "number" ? props.modelValue[index] : props.modelValue;
       return vue.createVNode("div", {
+        "ref": slider,
         "role": "slider",
         "class": getButtonClassName(index),
         "tabindex": props.disabled ? void 0 : 0,
@@ -12518,7 +12584,6 @@ var stdin_default$f = vue.defineComponent({
           }
           onTouchStart(event);
         },
-        "onTouchmove": onTouchMove,
         "onTouchend": onTouchEnd,
         "onTouchcancel": onTouchEnd,
         "onClick": stopPropagation
@@ -12526,6 +12591,9 @@ var stdin_default$f = vue.defineComponent({
     };
     updateValue(props.modelValue);
     use.useCustomFieldValue(() => props.modelValue);
+    use.useEventListener("touchmove", onTouchMove, {
+      target: slider
+    });
     return () => vue.createVNode("div", {
       "ref": root,
       "style": wrapperStyle.value,
@@ -13250,6 +13318,9 @@ var stdin_default$9 = vue.defineComponent({
     use.useClickAway(root, () => onClick("outside"), {
       eventName: "touchstart"
     });
+    use.useEventListener("touchmove", onTouchMove, {
+      target: root
+    });
     return () => {
       var _a;
       const wrapperStyle = {
@@ -13261,7 +13332,6 @@ var stdin_default$9 = vue.defineComponent({
         "class": bem$4(),
         "onClick": getClickHandler("cell", lockClick2),
         "onTouchstartPassive": onTouchStart,
-        "onTouchmove": onTouchMove,
         "onTouchend": onTouchEnd,
         "onTouchcancel": onTouchEnd
       }, [vue.createVNode("div", {
@@ -13995,7 +14065,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];
   });
@@ -14186,24 +14259,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;
@@ -14221,25 +14302,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) {
@@ -14324,7 +14409,10 @@ function stdin_default$3() {
       };
       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 = {}) {
@@ -14479,7 +14567,9 @@ function stdin_default$3() {
       });
     }
     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 = {
@@ -14536,7 +14626,10 @@ function stdin_default$3() {
       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);
@@ -14615,7 +14708,10 @@ var stdin_default$2 = (lazy) => ({
   },
   emits: ["show"],
   render() {
-    return vue.h(this.tag, this.show && this.$slots.default ? this.$slots.default() : null);
+    return vue.h(
+      this.tag,
+      this.show && this.$slots.default ? this.$slots.default() : null
+    );
   },
   data() {
     return {
@@ -14667,13 +14763,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() {
@@ -14724,11 +14824,15 @@ var stdin_default$1 = (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 {
@@ -14782,20 +14886,26 @@ var stdin_default$1 = (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;
+        }
+      );
     }
   }
 });
@@ -14823,7 +14933,7 @@ const Lazyload = {
     });
   }
 };
-const version = "3.6.1";
+const version = "3.6.2";
 function install(app) {
   const components = [
     ActionBar,