Make blocksHandlers symmetric on native iOS

software-mansion · Jan 10, 2025 · f6d6104 · f6d6104
1 parent c3ced78
commit f6d6104
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/apple/RNGestureHandler.mm b/apple/RNGestureHandler.mm
@@ -461,8 +461,8 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
     shouldRequireFailureOfGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
 {
+  RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
   if ([_handlersToWaitFor count]) {
-    RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:otherGestureRecognizer];
     if (handler != nil) {
       for (NSNumber *handlerTag in _handlersToWaitFor) {
         if ([handler.tag isEqual:handlerTag]) {
@@ -471,6 +471,15 @@ - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
       }
     }
   }
+
+  if (handler != nil) {
+    for (NSNumber *handlerTag in handler->_handlersThatShouldWait) {
+      if ([_tag isEqual:handlerTag]) {
+        return YES;
+      }
+    }
+  }
+
   return NO;
 }