vant 4.0.8 → 4.0.9

package/lib/vant.cjs.js

@@ -314,6 +314,7 @@ const Locale = {
     deepAssign(messages, newMessages);
   }
 };
+const useCurrentLang = () => lang;
 var stdin_default$1M = Locale;
 function createTranslate(name2) {
   const prefix = camelize(name2) + ".";
@@ -2138,7 +2139,7 @@ const SWIPE_KEY = Symbol(name$1l);
 var stdin_default$1w = vue.defineComponent({
   name: name$1l,
   props: swipeProps,
-  emits: ["change"],
+  emits: ["change", "dragStart", "dragEnd"],
   setup(props, {
     emit,
     slots
@@ -2153,6 +2154,7 @@ var stdin_default$1w = vue.defineComponent({
       active: 0,
       swiping: false
     });
+    let dragging = false;
     const touch = useTouch();
     const {
       children,
@@ -2323,9 +2325,10 @@ var stdin_default$1w = vue.defineComponent({
     const resize = () => initialize(state.active);
     let touchStartTime;
     const onTouchStart = (event) => {
-      if (!props.touchable)
+      if (!props.touchable || event.touches.length > 1)
         return;
       touch.start(event);
+      dragging = false;
       touchStartTime = Date.now();
       stopAutoplay();
       correctPosition();
@@ -2340,6 +2343,10 @@ var stdin_default$1w = vue.defineComponent({
             move({
               offset: delta.value
             });
+            if (!dragging) {
+              emit("dragStart");
+              dragging = true;
+            }
           }
         }
       }
@@ -2368,7 +2375,9 @@ var stdin_default$1w = vue.defineComponent({
           pace: 0
         });
       }
+      dragging = false;
       state.swiping = false;
+      emit("dragEnd");
       autoplay();
     };
     const swipeTo = (index, options = {}) => {
@@ -5589,6 +5598,7 @@ const backTopProps = {
   bottom: numericProp,
   target: [String, Object],
   offset: makeNumericProp(200),
+  immediate: Boolean,
   teleport: {
     type: [String, Object],
     default: "body"
@@ -5616,7 +5626,7 @@ var stdin_default$1b = vue.defineComponent({
       emit("click", event);
       (_a = scrollParent.value) == null ? void 0 : _a.scrollTo({
         top: 0,
-        behavior: "smooth"
+        behavior: props.immediate ? "auto" : "smooth"
       });
     };
     const scroll = () => {
@@ -6002,7 +6012,10 @@ var stdin_default$19 = vue.defineComponent({
       if (props.showMonthTitle) {
         return vue.createVNode("div", {
           "class": bem$Z("month-title")
-        }, [title.value]);
+        }, [slots["month-title"] ? slots["month-title"]({
+          date: props.date,
+          text: title.value
+        }) : title.value]);
       }
     };
     const renderMark = () => {
@@ -6448,7 +6461,7 @@ var stdin_default$17 = vue.defineComponent({
         "firstDayOfWeek": dayOffset.value
       }, pick(props, ["type", "color", "minDate", "maxDate", "showMark", "formatter", "rowHeight", "lazyRender", "showSubtitle", "allowSameDay"]), {
         "onClick": onClickDay
-      }), pick(slots, ["top-info", "bottom-info"]));
+      }), pick(slots, ["top-info", "bottom-info", "month-title"]));
     };
     const renderFooterButton = () => {
       if (slots.footer) {
@@ -9535,7 +9548,8 @@ var stdin_default$I = vue.defineComponent({
     minZoom: makeRequiredProp(numericProp),
     maxZoom: makeRequiredProp(numericProp),
     rootWidth: makeRequiredProp(Number),
-    rootHeight: makeRequiredProp(Number)
+    rootHeight: makeRequiredProp(Number),
+    disableZoom: Boolean
   },
   emits: ["scale", "close", "longPress"],
   setup(props, {
@@ -9630,18 +9644,23 @@ var stdin_default$I = vue.defineComponent({
     let startDistance;
     let doubleTapTimer;
     let touchStartTime;
+    let isImageMoved = false;
     const onTouchStart = (event) => {
       const {
         touches
       } = event;
+      fingerNum = touches.length;
+      if (fingerNum === 2 && props.disableZoom) {
+        return;
+      }
       const {
         offsetX
       } = touch;
       touch.start(event);
-      fingerNum = touches.length;
       startMoveX = state.moveX;
       startMoveY = state.moveY;
       touchStartTime = Date.now();
+      isImageMoved = false;
       state.moving = fingerNum === 1 && state.scale !== 1;
       state.zooming = fingerNum === 2 && !offsetX.value;
       if (state.zooming) {
@@ -9654,9 +9673,6 @@ var stdin_default$I = vue.defineComponent({
         touches
       } = event;
       touch.move(event);
-      if (state.moving || state.zooming) {
-        preventDefault(event, true);
-      }
       if (state.moving) {
         const {
           deltaX,
@@ -9664,13 +9680,22 @@ var stdin_default$I = vue.defineComponent({
         } = touch;
         const moveX = deltaX.value + startMoveX;
         const moveY = deltaY.value + startMoveY;
+        if ((moveX > maxMoveX.value || moveX < -maxMoveX.value) && !isImageMoved) {
+          state.moving = false;
+          return;
+        }
+        isImageMoved = true;
+        preventDefault(event, true);
         state.moveX = clamp(moveX, -maxMoveX.value, maxMoveX.value);
         state.moveY = clamp(moveY, -maxMoveY.value, maxMoveY.value);
       }
-      if (state.zooming && touches.length === 2) {
-        const distance = getDistance(touches);
-        const scale = startScale * distance / startDistance;
-        setScale(scale);
+      if (state.zooming) {
+        preventDefault(event, true);
+        if (touches.length === 2) {
+          const distance = getDistance(touches);
+          const scale = startScale * distance / startDistance;
+          setScale(scale);
+        }
       }
     };
     const checkTap = () => {
@@ -9780,7 +9805,7 @@ var stdin_default$I = vue.defineComponent({
   }
 });
 const [name$z, bem$y] = createNamespace("image-preview");
-const popupProps$1 = ["show", "transition", "overlayStyle", "closeOnPopstate", "teleport"];
+const popupProps$1 = ["show", "teleport", "transition", "overlayStyle", "closeOnPopstate"];
 const imagePreviewProps = {
   show: Boolean,
   loop: truthProp,
@@ -9815,7 +9840,8 @@ var stdin_default$H = vue.defineComponent({
     const state = vue.reactive({
       active: 0,
       rootWidth: 0,
-      rootHeight: 0
+      rootHeight: 0,
+      disableZoom: false
     });
     const resize = () => {
       if (swipeRef.value) {
@@ -9855,6 +9881,12 @@ var stdin_default$H = vue.defineComponent({
         }, [slots.cover()]);
       }
     };
+    const onDragStart = () => {
+      state.disableZoom = true;
+    };
+    const onDragEnd = () => {
+      state.disableZoom = false;
+    };
     const renderImages = () => vue.createVNode(Swipe, {
       "ref": swipeRef,
       "lazyRender": true,
@@ -9864,7 +9896,9 @@ var stdin_default$H = vue.defineComponent({
       "initialSwipe": props.startPosition,
       "showIndicators": props.showIndicators,
       "indicatorColor": "white",
-      "onChange": setActive
+      "onChange": setActive,
+      "onDragEnd": onDragEnd,
+      "onDragStart": onDragStart
     }, {
       default: () => [props.images.map((image, index) => vue.createVNode(stdin_default$I, {
         "src": image,
@@ -9874,6 +9908,7 @@ var stdin_default$H = vue.defineComponent({
         "minZoom": props.minZoom,
         "rootWidth": state.rootWidth,
         "rootHeight": state.rootHeight,
+        "disableZoom": state.disableZoom,
         "onScale": emitScale,
         "onClose": emitClose,
         "onLongPress": () => emit("longPress", {
@@ -14919,7 +14954,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.0.8";
+const version = "4.0.9";
 function install(app) {
   const components = [
     ActionBar,
@@ -15232,4 +15267,5 @@ exports.timePickerProps = timePickerProps;
 exports.toastProps = toastProps;
 exports.treeSelectProps = treeSelectProps;
 exports.uploaderProps = uploaderProps;
+exports.useCurrentLang = useCurrentLang;
 exports.version = version;

package/lib/vant.es.js

@@ -312,6 +312,7 @@ const Locale = {
     deepAssign(messages, newMessages);
   }
 };
+const useCurrentLang = () => lang;
 var stdin_default$1M = Locale;
 function createTranslate(name2) {
   const prefix = camelize(name2) + ".";
@@ -2136,7 +2137,7 @@ const SWIPE_KEY = Symbol(name$1l);
 var stdin_default$1w = defineComponent({
   name: name$1l,
   props: swipeProps,
-  emits: ["change"],
+  emits: ["change", "dragStart", "dragEnd"],
   setup(props, {
     emit,
     slots
@@ -2151,6 +2152,7 @@ var stdin_default$1w = defineComponent({
       active: 0,
       swiping: false
     });
+    let dragging = false;
     const touch = useTouch();
     const {
       children,
@@ -2321,9 +2323,10 @@ var stdin_default$1w = defineComponent({
     const resize = () => initialize(state.active);
     let touchStartTime;
     const onTouchStart = (event) => {
-      if (!props.touchable)
+      if (!props.touchable || event.touches.length > 1)
         return;
       touch.start(event);
+      dragging = false;
       touchStartTime = Date.now();
       stopAutoplay();
       correctPosition();
@@ -2338,6 +2341,10 @@ var stdin_default$1w = defineComponent({
             move({
               offset: delta.value
             });
+            if (!dragging) {
+              emit("dragStart");
+              dragging = true;
+            }
           }
         }
       }
@@ -2366,7 +2373,9 @@ var stdin_default$1w = defineComponent({
           pace: 0
         });
       }
+      dragging = false;
       state.swiping = false;
+      emit("dragEnd");
       autoplay();
     };
     const swipeTo = (index, options = {}) => {
@@ -5587,6 +5596,7 @@ const backTopProps = {
   bottom: numericProp,
   target: [String, Object],
   offset: makeNumericProp(200),
+  immediate: Boolean,
   teleport: {
     type: [String, Object],
     default: "body"
@@ -5614,7 +5624,7 @@ var stdin_default$1b = defineComponent({
       emit("click", event);
       (_a = scrollParent.value) == null ? void 0 : _a.scrollTo({
         top: 0,
-        behavior: "smooth"
+        behavior: props.immediate ? "auto" : "smooth"
       });
     };
     const scroll = () => {
@@ -6000,7 +6010,10 @@ var stdin_default$19 = defineComponent({
       if (props.showMonthTitle) {
         return createVNode("div", {
           "class": bem$Z("month-title")
-        }, [title.value]);
+        }, [slots["month-title"] ? slots["month-title"]({
+          date: props.date,
+          text: title.value
+        }) : title.value]);
       }
     };
     const renderMark = () => {
@@ -6446,7 +6459,7 @@ var stdin_default$17 = defineComponent({
         "firstDayOfWeek": dayOffset.value
       }, pick(props, ["type", "color", "minDate", "maxDate", "showMark", "formatter", "rowHeight", "lazyRender", "showSubtitle", "allowSameDay"]), {
         "onClick": onClickDay
-      }), pick(slots, ["top-info", "bottom-info"]));
+      }), pick(slots, ["top-info", "bottom-info", "month-title"]));
     };
     const renderFooterButton = () => {
       if (slots.footer) {
@@ -9533,7 +9546,8 @@ var stdin_default$I = defineComponent({
     minZoom: makeRequiredProp(numericProp),
     maxZoom: makeRequiredProp(numericProp),
     rootWidth: makeRequiredProp(Number),
-    rootHeight: makeRequiredProp(Number)
+    rootHeight: makeRequiredProp(Number),
+    disableZoom: Boolean
   },
   emits: ["scale", "close", "longPress"],
   setup(props, {
@@ -9628,18 +9642,23 @@ var stdin_default$I = defineComponent({
     let startDistance;
     let doubleTapTimer;
     let touchStartTime;
+    let isImageMoved = false;
     const onTouchStart = (event) => {
       const {
         touches
       } = event;
+      fingerNum = touches.length;
+      if (fingerNum === 2 && props.disableZoom) {
+        return;
+      }
       const {
         offsetX
       } = touch;
       touch.start(event);
-      fingerNum = touches.length;
       startMoveX = state.moveX;
       startMoveY = state.moveY;
       touchStartTime = Date.now();
+      isImageMoved = false;
       state.moving = fingerNum === 1 && state.scale !== 1;
       state.zooming = fingerNum === 2 && !offsetX.value;
       if (state.zooming) {
@@ -9652,9 +9671,6 @@ var stdin_default$I = defineComponent({
         touches
       } = event;
       touch.move(event);
-      if (state.moving || state.zooming) {
-        preventDefault(event, true);
-      }
       if (state.moving) {
         const {
           deltaX,
@@ -9662,13 +9678,22 @@ var stdin_default$I = defineComponent({
         } = touch;
         const moveX = deltaX.value + startMoveX;
         const moveY = deltaY.value + startMoveY;
+        if ((moveX > maxMoveX.value || moveX < -maxMoveX.value) && !isImageMoved) {
+          state.moving = false;
+          return;
+        }
+        isImageMoved = true;
+        preventDefault(event, true);
         state.moveX = clamp(moveX, -maxMoveX.value, maxMoveX.value);
         state.moveY = clamp(moveY, -maxMoveY.value, maxMoveY.value);
       }
-      if (state.zooming && touches.length === 2) {
-        const distance = getDistance(touches);
-        const scale = startScale * distance / startDistance;
-        setScale(scale);
+      if (state.zooming) {
+        preventDefault(event, true);
+        if (touches.length === 2) {
+          const distance = getDistance(touches);
+          const scale = startScale * distance / startDistance;
+          setScale(scale);
+        }
       }
     };
     const checkTap = () => {
@@ -9778,7 +9803,7 @@ var stdin_default$I = defineComponent({
   }
 });
 const [name$z, bem$y] = createNamespace("image-preview");
-const popupProps$1 = ["show", "transition", "overlayStyle", "closeOnPopstate", "teleport"];
+const popupProps$1 = ["show", "teleport", "transition", "overlayStyle", "closeOnPopstate"];
 const imagePreviewProps = {
   show: Boolean,
   loop: truthProp,
@@ -9813,7 +9838,8 @@ var stdin_default$H = defineComponent({
     const state = reactive({
       active: 0,
       rootWidth: 0,
-      rootHeight: 0
+      rootHeight: 0,
+      disableZoom: false
     });
     const resize = () => {
       if (swipeRef.value) {
@@ -9853,6 +9879,12 @@ var stdin_default$H = defineComponent({
         }, [slots.cover()]);
       }
     };
+    const onDragStart = () => {
+      state.disableZoom = true;
+    };
+    const onDragEnd = () => {
+      state.disableZoom = false;
+    };
     const renderImages = () => createVNode(Swipe, {
       "ref": swipeRef,
       "lazyRender": true,
@@ -9862,7 +9894,9 @@ var stdin_default$H = defineComponent({
       "initialSwipe": props.startPosition,
       "showIndicators": props.showIndicators,
       "indicatorColor": "white",
-      "onChange": setActive
+      "onChange": setActive,
+      "onDragEnd": onDragEnd,
+      "onDragStart": onDragStart
     }, {
       default: () => [props.images.map((image, index) => createVNode(stdin_default$I, {
         "src": image,
@@ -9872,6 +9906,7 @@ var stdin_default$H = defineComponent({
         "minZoom": props.minZoom,
         "rootWidth": state.rootWidth,
         "rootHeight": state.rootHeight,
+        "disableZoom": state.disableZoom,
         "onScale": emitScale,
         "onClose": emitClose,
         "onLongPress": () => emit("longPress", {
@@ -14917,7 +14952,7 @@ const Lazyload = {
     });
   }
 };
-const version = "4.0.8";
+const version = "4.0.9";
 function install(app) {
   const components = [
     ActionBar,
@@ -15231,5 +15266,6 @@ export {
   toastProps,
   treeSelectProps,
   uploaderProps,
+  useCurrentLang,
   version
 };

package/lib/vant.js

@@ -690,6 +690,7 @@
       deepAssign(messages, newMessages);
     }
   };
+  const useCurrentLang = () => lang;
   var stdin_default$1M = Locale;
   function createTranslate(name2) {
     const prefix = camelize(name2) + ".";
@@ -2511,7 +2512,7 @@
   var stdin_default$1w = vue.defineComponent({
     name: name$1l,
     props: swipeProps,
-    emits: ["change"],
+    emits: ["change", "dragStart", "dragEnd"],
     setup(props, {
       emit,
       slots
@@ -2526,6 +2527,7 @@
         active: 0,
         swiping: false
       });
+      let dragging = false;
       const touch = useTouch();
       const {
         children,
@@ -2696,9 +2698,10 @@
       const resize = () => initialize(state.active);
       let touchStartTime;
       const onTouchStart = (event) => {
-        if (!props.touchable)
+        if (!props.touchable || event.touches.length > 1)
           return;
         touch.start(event);
+        dragging = false;
         touchStartTime = Date.now();
         stopAutoplay();
         correctPosition();
@@ -2713,6 +2716,10 @@
               move({
                 offset: delta.value
               });
+              if (!dragging) {
+                emit("dragStart");
+                dragging = true;
+              }
             }
           }
         }
@@ -2741,7 +2748,9 @@
             pace: 0
           });
         }
+        dragging = false;
         state.swiping = false;
+        emit("dragEnd");
         autoplay();
       };
       const swipeTo = (index, options = {}) => {
@@ -5956,6 +5965,7 @@
     bottom: numericProp,
     target: [String, Object],
     offset: makeNumericProp(200),
+    immediate: Boolean,
     teleport: {
       type: [String, Object],
       default: "body"
@@ -5983,7 +5993,7 @@
         emit("click", event);
         (_a = scrollParent.value) == null ? void 0 : _a.scrollTo({
           top: 0,
-          behavior: "smooth"
+          behavior: props.immediate ? "auto" : "smooth"
         });
       };
       const scroll = () => {
@@ -6366,7 +6376,10 @@
         if (props.showMonthTitle) {
           return vue.createVNode("div", {
             "class": bem$Z("month-title")
-          }, [title.value]);
+          }, [slots["month-title"] ? slots["month-title"]({
+            date: props.date,
+            text: title.value
+          }) : title.value]);
         }
       };
       const renderMark = () => {
@@ -6812,7 +6825,7 @@
           "firstDayOfWeek": dayOffset.value
         }, pick(props, ["type", "color", "minDate", "maxDate", "showMark", "formatter", "rowHeight", "lazyRender", "showSubtitle", "allowSameDay"]), {
           "onClick": onClickDay
-        }), pick(slots, ["top-info", "bottom-info"]));
+        }), pick(slots, ["top-info", "bottom-info", "month-title"]));
       };
       const renderFooterButton = () => {
         if (slots.footer) {
@@ -9873,7 +9886,8 @@
       minZoom: makeRequiredProp(numericProp),
       maxZoom: makeRequiredProp(numericProp),
       rootWidth: makeRequiredProp(Number),
-      rootHeight: makeRequiredProp(Number)
+      rootHeight: makeRequiredProp(Number),
+      disableZoom: Boolean
     },
     emits: ["scale", "close", "longPress"],
     setup(props, {
@@ -9968,18 +9982,23 @@
       let startDistance;
       let doubleTapTimer;
       let touchStartTime;
+      let isImageMoved = false;
       const onTouchStart = (event) => {
         const {
           touches
         } = event;
+        fingerNum = touches.length;
+        if (fingerNum === 2 && props.disableZoom) {
+          return;
+        }
         const {
           offsetX
         } = touch;
         touch.start(event);
-        fingerNum = touches.length;
         startMoveX = state.moveX;
         startMoveY = state.moveY;
         touchStartTime = Date.now();
+        isImageMoved = false;
         state.moving = fingerNum === 1 && state.scale !== 1;
         state.zooming = fingerNum === 2 && !offsetX.value;
         if (state.zooming) {
@@ -9992,9 +10011,6 @@
           touches
         } = event;
         touch.move(event);
-        if (state.moving || state.zooming) {
-          preventDefault(event, true);
-        }
         if (state.moving) {
           const {
             deltaX,
@@ -10002,13 +10018,22 @@
           } = touch;
           const moveX = deltaX.value + startMoveX;
           const moveY = deltaY.value + startMoveY;
+          if ((moveX > maxMoveX.value || moveX < -maxMoveX.value) && !isImageMoved) {
+            state.moving = false;
+            return;
+          }
+          isImageMoved = true;
+          preventDefault(event, true);
           state.moveX = clamp(moveX, -maxMoveX.value, maxMoveX.value);
           state.moveY = clamp(moveY, -maxMoveY.value, maxMoveY.value);
         }
-        if (state.zooming && touches.length === 2) {
-          const distance = getDistance(touches);
-          const scale = startScale * distance / startDistance;
-          setScale(scale);
+        if (state.zooming) {
+          preventDefault(event, true);
+          if (touches.length === 2) {
+            const distance = getDistance(touches);
+            const scale = startScale * distance / startDistance;
+            setScale(scale);
+          }
         }
       };
       const checkTap = () => {
@@ -10118,7 +10143,7 @@
     }
   });
   const [name$z, bem$y] = createNamespace("image-preview");
-  const popupProps$1 = ["show", "transition", "overlayStyle", "closeOnPopstate", "teleport"];
+  const popupProps$1 = ["show", "teleport", "transition", "overlayStyle", "closeOnPopstate"];
   const imagePreviewProps = {
     show: Boolean,
     loop: truthProp,
@@ -10153,7 +10178,8 @@
       const state = vue.reactive({
         active: 0,
         rootWidth: 0,
-        rootHeight: 0
+        rootHeight: 0,
+        disableZoom: false
       });
       const resize = () => {
         if (swipeRef.value) {
@@ -10193,6 +10219,12 @@
           }, [slots.cover()]);
         }
       };
+      const onDragStart = () => {
+        state.disableZoom = true;
+      };
+      const onDragEnd = () => {
+        state.disableZoom = false;
+      };
       const renderImages = () => vue.createVNode(Swipe, {
         "ref": swipeRef,
         "lazyRender": true,
@@ -10202,7 +10234,9 @@
         "initialSwipe": props.startPosition,
         "showIndicators": props.showIndicators,
         "indicatorColor": "white",
-        "onChange": setActive
+        "onChange": setActive,
+        "onDragEnd": onDragEnd,
+        "onDragStart": onDragStart
       }, {
         default: () => [props.images.map((image, index) => vue.createVNode(stdin_default$I, {
           "src": image,
@@ -10212,6 +10246,7 @@
           "minZoom": props.minZoom,
           "rootWidth": state.rootWidth,
           "rootHeight": state.rootHeight,
+          "disableZoom": state.disableZoom,
           "onScale": emitScale,
           "onClose": emitClose,
           "onLongPress": () => emit("longPress", {
@@ -16134,7 +16169,7 @@
       });
     }
   };
-  const version = "4.0.8";
+  const version = "4.0.9";
   function install(app) {
     const components = [
       ActionBar,
@@ -16447,6 +16482,7 @@
   exports2.toastProps = toastProps;
   exports2.treeSelectProps = treeSelectProps;
   exports2.uploaderProps = uploaderProps;
+  exports2.useCurrentLang = useCurrentLang;
   exports2.version = version;
   Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 });