Merge branch 'master' into overrideUserInterfaceStyle

tidev · Sep 16, 2024 · b9e2f11 · b9e2f11
2 parents b1f0eed + d084485
commit b9e2f11
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/iphone/TitaniumKit/TitaniumKit/Sources/API/TiUIView.m b/iphone/TitaniumKit/TitaniumKit/Sources/API/TiUIView.m
@@ -1312,6 +1312,7 @@ - (UITapGestureRecognizer *)singleTapRecognizer
 {
   if (singleTapRecognizer == nil) {
     singleTapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(recognizedTap:)];
+    [singleTapRecognizer setNumberOfTapsRequired:1];
     [self configureGestureRecognizer:singleTapRecognizer];
     [self addGestureRecognizer:singleTapRecognizer];
     if (doubleTapRecognizer != nil) {
@@ -1434,6 +1435,8 @@ - (void)recognizedTap:(UITapGestureRecognizer *)recognizer
       [proxy fireEvent:@"dblclick" withObject:event propagate:YES];
     }
     [proxy fireEvent:@"doubletap" withObject:event];
+  } else if ([recognizer numberOfTapsRequired] == 1 && [proxy _hasListeners:@"click"]) {
+    [proxy fireEvent:@"click" withObject:event propagate:YES];
   } else {
     [proxy fireEvent:@"singletap" withObject:event];
   }
@@ -1609,12 +1612,7 @@ - (void)processTouchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
     // Click handling is special; don't propagate if we have a delegate,
     // but DO invoke the touch delegate.
     // clicks should also be handled by any control the view is embedded in.
-    if ([touch tapCount] == 1 && [proxy _hasListeners:@"click"]) {
-      if (touchDelegate == nil) {
-        [proxy fireEvent:@"click" withObject:evt propagate:YES];
-        return;
-      }
-    } else if ([touch tapCount] == 2 && [proxy _hasListeners:@"dblclick"]) {
+    if ([touch tapCount] == 2 && [proxy _hasListeners:@"dblclick"]) {
       [proxy fireEvent:@"dblclick" withObject:evt propagate:YES];
       return;
     }

diff --git a/support/module/packaged/modules.json b/support/module/packaged/modules.json
@@ -54,8 +54,8 @@
 	"commonjs": {},
 	"hyperloop": {
 		"hyperloop": {
-			"url": "https://github.com/tidev/hyperloop.next/releases/download/v7.0.6/hyperloop-7.0.6.zip",
-			"integrity": "sha512-ZHmm7GINiCyrjvNMn232G1Tkby6PhwsmSxPZlPNDWH4jRn6iCpjIqX1Ha12MBedma01a4hlvARLaiUQ9j3SPow=="
+			"url": "https://github.com/tidev/hyperloop.next/releases/download/v7.0.7/hyperloop-7.0.7.zip",
+			"integrity": "sha512-+CF+1G1ClJZrY4VzrZMUCX37JT/tSGvnWWUXouiAtd6WLlPPvUI+Q7ytNoTm/q/g/hPwiiV6qzV9Rgm61qsXOg=="
 		}
 	}
 }