fix touch tap to stop

darkroomengineering · Mar 17, 2024 · 35515a7 · 35515a7 · github-actions · Mar 17, 2024
1 parent 3dc11c2
commit 35515a7
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 10 deletions.
diff --git a/packages/lenis/dist/lenis.cjs.js b/packages/lenis/dist/lenis.cjs.js
diff --git a/packages/lenis/dist/lenis.cjs.js.map b/packages/lenis/dist/lenis.cjs.js.map
diff --git a/packages/lenis/dist/lenis.js b/packages/lenis/dist/lenis.js
@@ -334,7 +334,11 @@
                   return;
               const isTouch = event.type.includes('touch');
               const isWheel = event.type.includes('wheel');
-              const isTapToStop = this.options.syncTouch && isTouch && event.type === 'touchstart';
+              const isTapToStop = this.options.syncTouch &&
+                  isTouch &&
+                  event.type === 'touchstart' &&
+                  !this.isStopped &&
+                  !this.isLocked;
               if (isTapToStop) {
                   this.reset();
                   return;

diff --git a/packages/lenis/dist/lenis.min.js b/packages/lenis/dist/lenis.min.js
diff --git a/packages/lenis/dist/lenis.mjs b/packages/lenis/dist/lenis.mjs
diff --git a/packages/lenis/dist/lenis.mjs.map b/packages/lenis/dist/lenis.mjs.map
diff --git a/packages/lenis/dist/lenis.umd.js b/packages/lenis/dist/lenis.umd.js
diff --git a/packages/lenis/dist/lenis.umd.js.map b/packages/lenis/dist/lenis.umd.js.map
diff --git a/packages/lenis/playground/main.js b/packages/lenis/playground/main.js
@@ -5,7 +5,7 @@ import './style.css'
 
 const lenis = new Lenis({
   smoothWheel: true,
-  syncTouch: true,
+  // syncTouch: true,
 })
 
 window.lenis = lenis
@@ -27,3 +27,10 @@ requestAnimationFrame((deltaTime) => {
 })
 
 setupCounter(document.querySelector('#counter'))
+
+setInterval(() => {
+  // lenis.stop(); // stopping lenis also does not help
+  lenis.scrollTo(lenis.limit * Math.random(), {
+    lock: true,
+  })
+}, 4000)
diff --git a/packages/lenis/src/index.ts b/packages/lenis/src/index.ts
@@ -157,7 +157,11 @@ export default class Lenis {
     const isWheel = event.type.includes('wheel')
 
     const isTapToStop =
-      this.options.syncTouch && isTouch && event.type === 'touchstart'
+      this.options.syncTouch &&
+      isTouch &&
+      event.type === 'touchstart' &&
+      !this.isStopped &&
+      !this.isLocked
 
     if (isTapToStop) {
       this.reset()