Merge pull request #6740 from RandomGamingDev/touchstarted-fix

Fix for touchStarted triggers twice among other issues with touchStarted/mousePressed on mobile

Author: davepagurek

src/core/main.js

@@ -205,6 +205,7 @@ class p5 {
     };
     this._millisStart = -1;
     this._recording = false;
+    this.touchstart = false;
     this.touchend = false;
 
     // States used in the custom random generators

src/events/mouse.js

@@ -657,21 +657,24 @@ p5.prototype._onmousedown = function(e) {
   this._setMouseButton(e);
   this._updateNextMouseCoords(e);
 
+  // _ontouchstart triggers first and sets this.touchstart
+  if (this.touchstart) {
+    return;
+  }
+
   if (typeof context.mousePressed === 'function') {
     executeDefault = context.mousePressed(e);
     if (executeDefault === false) {
       e.preventDefault();
     }
-    // only safari needs this manual fallback for consistency
-  } else if (
-    navigator.userAgent.toLowerCase().includes('safari') &&
-    typeof context.touchStarted === 'function'
-  ) {
+  } else if (typeof context.touchStarted === 'function') {
     executeDefault = context.touchStarted(e);
     if (executeDefault === false) {
       e.preventDefault();
     }
   }
+
+  this.touchstart = false;
 };
 
 /**

src/events/touch.js

@@ -134,15 +134,7 @@ p5.prototype._ontouchstart = function(e) {
     if (executeDefault === false) {
       e.preventDefault();
     }
-    // only safari needs this manual fallback for consistency
-  } else if (
-    navigator.userAgent.toLowerCase().includes('safari') &&
-    typeof context.mousePressed === 'function'
-  ) {
-    executeDefault = context.mousePressed(e);
-    if (executeDefault === false) {
-      e.preventDefault();
-    }
+    this.touchstart = true;
   }
 };