fix(tap-click): prevent activated while scrolling

fixes #15752
ionic-team · Sep 25, 2018 · 7f38d37 · 7f38d37
1 parent 0379977
commit 7f38d37
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/core/src/utils/tap-click.ts b/core/src/utils/tap-click.ts
@@ -5,14 +5,15 @@ export function startTapClick(doc: Document) {
   let lastTouch = -MOUSE_WAIT * 10;
   let lastActivated = 0;
   let cancelled = false;
+  let scrolling = false;
 
   let activatableEle: HTMLElement | undefined;
   let activeDefer: any;
 
   const clearDefers = new WeakMap<HTMLElement, any>();
 
   function onBodyClick(ev: Event) {
-    if (cancelled) {
+    if (cancelled || scrolling) {
       ev.preventDefault();
       ev.stopPropagation();
     }
@@ -45,6 +46,7 @@ export function startTapClick(doc: Document) {
 
   function cancelActive() {
     clearTimeout(activeDefer);
+    activeDefer = undefined;
     if (activatableEle) {
       removeActivated(false);
       activatableEle = undefined;
@@ -53,14 +55,17 @@ export function startTapClick(doc: Document) {
   }
 
   function pointerDown(ev: any) {
-    if (activatableEle) {
+    if (activatableEle || scrolling) {
       return;
     }
     cancelled = false;
     setActivatedElement(getActivatableTarget(ev), ev);
   }
 
   function pointerUp(ev: UIEvent) {
+    if (scrolling) {
+      return;
+    }
     setActivatedElement(undefined, ev);
     if (cancelled && ev.cancelable) {
       ev.preventDefault();
@@ -133,7 +138,13 @@ export function startTapClick(doc: Document) {
   }
 
   doc.body.addEventListener('click', onBodyClick, true);
-  doc.body.addEventListener('ionScrollStart', cancelActive);
+  doc.body.addEventListener('ionScrollStart', () => {
+    scrolling = true;
+    cancelActive();
+  });
+  doc.body.addEventListener('ionScrollEnd', () => {
+    scrolling = false;
+  });
   doc.body.addEventListener('ionGestureCaptured', cancelActive);
 
   doc.addEventListener('touchstart', onTouchStart, true);