From 65d2a3b1189d7a081e4bd5b826bed3cfcea425a4 Mon Sep 17 00:00:00 2001
From: Damian Kacperski <7dami77@gmail.com>
Date: Fri, 2 Aug 2024 00:34:55 +0200
Subject: [PATCH 1/2] Fix zoomIn after currentScale is set to 1

---
 src/modules/zoom/zoom.mjs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/zoom/zoom.mjs b/src/modules/zoom/zoom.mjs
index 9c4cead2d..ec26924e7 100644
--- a/src/modules/zoom/zoom.mjs
+++ b/src/modules/zoom/zoom.mjs
@@ -500,10 +500,6 @@ export default function Zoom({ swiper, extendParams, on, emit }) {
     }
 
     const forceZoomRatio = typeof e === 'number' ? e : null;
-    if (currentScale === 1 && forceZoomRatio) {
-      touchX = undefined;
-      touchY = undefined;
-    }
 
     const maxRatio = getMaxRatio();
     zoom.scale = forceZoomRatio || maxRatio;
@@ -551,6 +547,10 @@ export default function Zoom({ swiper, extendParams, on, emit }) {
       gesture.originX = 0;
       gesture.originY = 0;
     }
+    if (currentScale === 1) {
+      image.touchesStart.x = undefined;
+      image.touchesStart.y = undefined;
+    }
     gesture.imageWrapEl.style.transitionDuration = '300ms';
     gesture.imageWrapEl.style.transform = `translate3d(${translateX}px, ${translateY}px,0)`;
     gesture.imageEl.style.transitionDuration = '300ms';
@@ -584,6 +584,8 @@ export default function Zoom({ swiper, extendParams, on, emit }) {
     }
     zoom.scale = 1;
     currentScale = 1;
+    image.touchesStart.x = undefined;
+    image.touchesStart.y = undefined;
     gesture.imageWrapEl.style.transitionDuration = '300ms';
     gesture.imageWrapEl.style.transform = 'translate3d(0,0,0)';
     gesture.imageEl.style.transitionDuration = '300ms';

From 5b34740fb67f08bd3ec363f05b344f48a631389f Mon Sep 17 00:00:00 2001
From: Vladimir Kharlampidi <nolimits4web@gmail.com>
Date: Wed, 21 Aug 2024 12:08:46 +0300
Subject: [PATCH 2/2] Update zoom.mjs

---
 src/modules/zoom/zoom.mjs | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/zoom/zoom.mjs b/src/modules/zoom/zoom.mjs
index ec26924e7..1c20c03d2 100644
--- a/src/modules/zoom/zoom.mjs
+++ b/src/modules/zoom/zoom.mjs
@@ -500,6 +500,12 @@ export default function Zoom({ swiper, extendParams, on, emit }) {
     }
 
     const forceZoomRatio = typeof e === 'number' ? e : null;
+    if (currentScale === 1 && forceZoomRatio) {
+      touchX = undefined;
+      touchY = undefined;
+      image.touchesStart.x = undefined;
+      image.touchesStart.y = undefined;
+    }
 
     const maxRatio = getMaxRatio();
     zoom.scale = forceZoomRatio || maxRatio;
@@ -547,10 +553,6 @@ export default function Zoom({ swiper, extendParams, on, emit }) {
       gesture.originX = 0;
       gesture.originY = 0;
     }
-    if (currentScale === 1) {
-      image.touchesStart.x = undefined;
-      image.touchesStart.y = undefined;
-    }
     gesture.imageWrapEl.style.transitionDuration = '300ms';
     gesture.imageWrapEl.style.transform = `translate3d(${translateX}px, ${translateY}px,0)`;
     gesture.imageEl.style.transitionDuration = '300ms';