Send touch events on iOS

Author: j-piasecki

packages/react-native-gesture-handler/apple/RNGestureHandler.h

@@ -42,6 +42,8 @@
     withActionType:(RNGestureHandlerActionType)actionType
      forRecognizer:(UIGestureRecognizer *)recognizer;
 
+- (void)sendNativeTouchEventForGestureHandler:(RNGestureHandler *)handler withPointerType:(NSInteger)pointerType;
+
 @end
 
 @protocol RNRootViewGestureRecognizerDelegate <UIGestureRecognizerDelegate>

packages/react-native-gesture-handler/apple/RNGestureHandler.mm

@@ -333,18 +333,22 @@ - (void)sendEvent:(RNGestureHandlerStateChange *)event
 
 - (void)sendTouchEventInState:(RNGestureHandlerState)state forViewWithTag:(NSNumber *)reactTag
 {
-  id extraData = [RNGestureHandlerEventExtraData forEventType:_pointerTracker.eventType
-                                          withChangedPointers:_pointerTracker.changedPointersData
-                                              withAllPointers:_pointerTracker.allPointersData
-                                          withNumberOfTouches:_pointerTracker.trackedPointersCount
-                                              withPointerType:_pointerType];
-  id event = [[RNGestureHandlerEvent alloc] initWithReactTag:reactTag
-                                                  handlerTag:_tag
-                                                       state:state
-                                                   extraData:extraData
-                                               coalescingKey:[_tag intValue]];
-
-  [self.emitter sendEvent:event withActionType:self.actionType forRecognizer:self.recognizer];
+  if (self.actionType == RNGestureHandlerActionTypeNativeDetector) {
+    [self.emitter sendNativeTouchEventForGestureHandler:self withPointerType:_pointerType];
+  } else {
+    id extraData = [RNGestureHandlerEventExtraData forEventType:_pointerTracker.eventType
+                                            withChangedPointers:_pointerTracker.changedPointersData
+                                                withAllPointers:_pointerTracker.allPointersData
+                                            withNumberOfTouches:_pointerTracker.trackedPointersCount
+                                                withPointerType:_pointerType];
+    id event = [[RNGestureHandlerEvent alloc] initWithReactTag:reactTag
+                                                    handlerTag:_tag
+                                                         state:state
+                                                     extraData:extraData
+                                                 coalescingKey:[_tag intValue]];
+
+    [self.emitter sendEvent:event withActionType:self.actionType forRecognizer:self.recognizer];
+  }
 }
 
 - (RNGestureHandlerState)recognizerState

packages/react-native-gesture-handler/apple/RNGestureHandlerDetector.h

@@ -19,6 +19,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)dispatchGestureEvent:(facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerEvent)event;
 
+- (void)dispatchTouchEvent:(facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerTouchEvent)event;
+
 @end
 
 NS_ASSUME_NONNULL_END

packages/react-native-gesture-handler/apple/RNGestureHandlerDetector.mm

@@ -79,6 +79,14 @@ - (void)dispatchGestureEvent:(facebook::react::RNGestureHandlerDetectorEventEmit
   }
 }
 
+- (void)dispatchTouchEvent:(facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerTouchEvent)event
+{
+  if (_eventEmitter != nullptr) {
+    std::dynamic_pointer_cast<const facebook::react::RNGestureHandlerDetectorEventEmitter>(_eventEmitter)
+        ->onGestureHandlerTouchEvent(event);
+  }
+}
+
 #pragma mark - RCTComponentViewProtocol
 
 + (ComponentDescriptorProvider)componentDescriptorProvider

packages/react-native-gesture-handler/apple/RNGestureHandlerManager.mm

@@ -400,6 +400,42 @@ - (void)sendEvent:(RNGestureHandlerStateChange *)event
   }
 }
 
+- (void)sendNativeTouchEventForGestureHandler:(RNGestureHandler *)handler withPointerType:(NSInteger)pointerType
+{
+  facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerTouchEvent nativeEvent = {
+      .handlerTag = [handler.tag intValue],
+      .state = static_cast<int>(handler.state),
+      .pointerType = static_cast<int>(pointerType),
+      .numberOfTouches = handler.pointerTracker.trackedPointersCount,
+      .eventType = static_cast<int>(handler.pointerTracker.eventType),
+      .changedTouches = {},
+      .allTouches = {},
+  };
+
+  for (NSDictionary<NSString *, NSNumber *> *touch in handler.pointerTracker.allPointersData) {
+    nativeEvent.allTouches.push_back({
+        .id = [[touch valueForKey:@"id"] intValue],
+        .x = [[touch valueForKey:@"x"] doubleValue],
+        .y = [[touch valueForKey:@"y"] doubleValue],
+        .absoluteX = [[touch valueForKey:@"absoluteX"] doubleValue],
+        .absoluteY = [[touch valueForKey:@"absoluteY"] doubleValue],
+    });
+  }
+
+  for (NSDictionary<NSString *, NSNumber *> *touch in handler.pointerTracker.changedPointersData) {
+    nativeEvent.changedTouches.push_back({
+        .id = [[touch valueForKey:@"id"] intValue],
+        .x = [[touch valueForKey:@"x"] doubleValue],
+        .y = [[touch valueForKey:@"y"] doubleValue],
+        .absoluteX = [[touch valueForKey:@"absoluteX"] doubleValue],
+        .absoluteY = [[touch valueForKey:@"absoluteY"] doubleValue],
+    });
+  }
+
+  RNGestureHandlerDetector *detector = (RNGestureHandlerDetector *)handler.recognizer.view;
+  [detector dispatchTouchEvent:nativeEvent];
+}
+
 - (void)sendEventForReanimated:(RNGestureHandlerStateChange *)event
 {
   // Delivers the event to Reanimated.

…r/apple/RNGestureHandlerPointerTracker.m …/apple/RNGestureHandlerPointerTracker.mmpackages/react-native-gesture-handler/apple/RNGestureHandlerPointerTracker.m renamed to packages/react-native-gesture-handler/apple/RNGestureHandlerPointerTracker.mm packages/react-native-gesture-handler/apple/RNGestureHandlerPointerTracker.m renamed to packages/react-native-gesture-handler/apple/RNGestureHandlerPointerTracker.mm

@@ -1,5 +1,6 @@
 #import "RNGestureHandlerPointerTracker.h"
 #import "RNGestureHandler.h"
+#import "RNGestureHandlerDetector.h"
 
 #import <React/UIView+React.h>
 
@@ -239,7 +240,9 @@ - (void)sendEvent
   // it may happen that the gesture recognizer is reset after it's been unbound from the view,
   // it that recognizer tried to send event, the app would crash because the target of the event
   // would be nil.
-  if (!_gestureHandler.needsPointerData || _gestureHandler.recognizer.view.reactTag == nil) {
+  if (!_gestureHandler.needsPointerData ||
+      (_gestureHandler.recognizer.view.reactTag == nil &&
+       ![_gestureHandler.recognizer.view isKindOfClass:[RNGestureHandlerDetector class]])) {
     return;
   }