vant 4.0.7 → 4.0.9

package/lib/image-preview/ImagePreviewItem.js

@@ -38,7 +38,8 @@ var stdin_default = (0, import_vue2.defineComponent)({
     minZoom: (0, import_utils.makeRequiredProp)(import_utils.numericProp),
     maxZoom: (0, import_utils.makeRequiredProp)(import_utils.numericProp),
     rootWidth: (0, import_utils.makeRequiredProp)(Number),
-    rootHeight: (0, import_utils.makeRequiredProp)(Number)
+    rootHeight: (0, import_utils.makeRequiredProp)(Number),
+    disableZoom: Boolean
   },
   emits: ["scale", "close", "longPress"],
   setup(props, {
@@ -133,18 +134,23 @@ var stdin_default = (0, import_vue2.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) {
@@ -157,9 +163,6 @@ var stdin_default = (0, import_vue2.defineComponent)({
         touches
       } = event;
       touch.move(event);
-      if (state.moving || state.zooming) {
-        (0, import_utils.preventDefault)(event, true);
-      }
       if (state.moving) {
         const {
           deltaX,
@@ -167,13 +170,22 @@ var stdin_default = (0, import_vue2.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;
+        (0, import_utils.preventDefault)(event, true);
         state.moveX = (0, import_utils.clamp)(moveX, -maxMoveX.value, maxMoveX.value);
         state.moveY = (0, import_utils.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) {
+        (0, import_utils.preventDefault)(event, true);
+        if (touches.length === 2) {
+          const distance = getDistance(touches);
+          const scale = startScale * distance / startDistance;
+          setScale(scale);
+        }
       }
     };
     const checkTap = () => {