ios

Author: akwasniewski

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

@@ -8,4 +8,5 @@ typedef NS_ENUM(NSInteger, RNGestureHandlerActionType) {
   RNGestureHandlerActionTypeJSFunctionNewAPI, // JS function or Animated.event with useNativeDriver: false using new
                                               // RNGH API
   RNGestureHandlerActionTypeNativeDetector,
+  RNGestureHandlerActionTypeLogicDetector,
 };

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

@@ -20,6 +20,12 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)dispatchTouchEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerTouchEvent)event;
 
+- (void)dispatchLogicStateChangeEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicStateChange)event;
+
+- (void)dispatchLogicGestureEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicEvent)event;
+
+- (void)dispatchLogicTouchEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicTouchEvent)event;
+
 - (void)tryAttachNativeHandlersToChildView;
 
 - (void)detachNativeGestureHandlers;

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

@@ -24,8 +24,16 @@ typedef NS_ENUM(NSInteger, RNGestureHandlerMutation) {
   RNGestureHandlerMutationKeep,
 };
 
+struct LogicChild {
+  RNGHUIView *view;
+  std::vector<int> handlerTags;
+  NSMutableSet *nativeHandlers;
+  NSMutableSet *attachedHandlers;
+};
+
 @implementation RNGestureHandlerDetector {
   int _moduleId;
+  std::unordered_map<int, LogicChild> logicChildren;
 }
 
 #if TARGET_OS_OSX
@@ -87,6 +95,30 @@ - (void)dispatchTouchEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandl
   }
 }
 
+- (void)dispatchLogicStateChangeEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicStateChange)event
+{
+  if (_eventEmitter != nullptr) {
+    std::dynamic_pointer_cast<const RNGestureHandlerDetectorEventEmitter>(_eventEmitter)
+        ->onGestureHandlerLogicStateChange(event);
+  }
+}
+
+- (void)dispatchLogicGestureEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicEvent)event
+{
+  if (_eventEmitter != nullptr) {
+    std::dynamic_pointer_cast<const RNGestureHandlerDetectorEventEmitter>(_eventEmitter)
+        ->onGestureHandlerLogicEvent(event);
+  }
+}
+
+- (void)dispatchLogicTouchEvent:(RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicTouchEvent)event
+{
+  if (_eventEmitter != nullptr) {
+    std::dynamic_pointer_cast<const RNGestureHandlerDetectorEventEmitter>(_eventEmitter)
+        ->onGestureHandlerLogicTouchEvent(event);
+  }
+}
+
 - (BOOL)shouldAttachGestureToSubview:(NSNumber *)handlerTag
 {
   RNGestureHandlerManager *handlerManager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
@@ -125,25 +157,24 @@ - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
   [super updateLayoutMetrics:newLayoutMetrics oldLayoutMetrics:oldLayoutMetrics];
 }
 
-- (void)updateProps:(const Props::Shared &)propsBase oldProps:(const Props::Shared &)oldPropsBase
-{
-  const auto &newProps = *std::static_pointer_cast<const RNGestureHandlerDetectorProps>(propsBase);
-  const auto &oldProps = *std::static_pointer_cast<const RNGestureHandlerDetectorProps>(oldPropsBase);
+- (void)updatePropsInternal:(const std::vector<int> &)handlerTags
+             oldHandlerTags:(const std::vector<int> &)oldHandlerTags
+                    isLogic:(bool)isLogic
+                    viewTag:(const int)viewTag
+           attachedHandlers:(NSMutableSet *)attachedHandlers
+             nativeHandlers:(NSMutableSet *)nativeHandlers
 
-  _moduleId = newProps.moduleId;
+{
   RNGestureHandlerManager *handlerManager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
   react_native_assert(handlerManager != nullptr && "Tried to access a non-existent handler manager")
 
       std::unordered_map<int, RNGestureHandlerMutation>
           changes;
-
-  if (oldPropsBase != nullptr) {
-    for (const auto oldHandler : oldProps.handlerTags) {
-      changes[oldHandler] = RNGestureHandlerMutationDetach;
-    }
+  for (const auto oldHandler : oldHandlerTags) {
+    changes[oldHandler] = RNGestureHandlerMutationDetach;
   }
 
-  for (const auto newHandler : newProps.handlerTags) {
+  for (const auto newHandler : handlerTags) {
     changes[newHandler] = changes.contains(newHandler) ? RNGestureHandlerMutationKeep : RNGestureHandlerMutationAttach;
   }
 
@@ -154,27 +185,69 @@ - (void)updateProps:(const Props::Shared &)propsBase oldProps:(const Props::Shar
       if ([self shouldAttachGestureToSubview:handlerTag]) {
         // It might happen that `attachHandlers` will be called before children are added into view hierarchy. In that
         // case we cannot attach `NativeViewGestureHandlers` here and we have to do it in `didAddSubview` method.
-        [_nativeHandlers addObject:handlerTag];
+        [nativeHandlers addObject:handlerTag];
       } else {
-        [handlerManager.registry attachHandlerWithTag:handlerTag
-                                               toView:self
-                                       withActionType:RNGestureHandlerActionTypeNativeDetector];
-
-        [_attachedHandlers addObject:handlerTag];
+        if (isLogic) {
+          [handlerManager attachGestureHandler:handlerTag
+                                 toViewWithTag:@(viewTag)
+                                withActionType:RNGestureHandlerActionTypeLogicDetector];
+        } else {
+          [handlerManager.registry attachHandlerWithTag:handlerTag
+                                                 toView:self
+                                         withActionType:RNGestureHandlerActionTypeNativeDetector];
+        }
+        [attachedHandlers addObject:handlerTag];
       }
     } else if (handlerChange.second == RNGestureHandlerMutationDetach) {
       [handlerManager.registry detachHandlerWithTag:handlerTag];
-      [_attachedHandlers removeObject:handlerTag];
-      [_nativeHandlers removeObject:handlerTag];
+      [attachedHandlers removeObject:handlerTag];
+      [nativeHandlers removeObject:handlerTag];
     }
   }
 
   // This covers the case where `NativeViewGestureHandlers` are attached after child views were created.
   if (!self.subviews[0]) {
     [self tryAttachNativeHandlersToChildView];
   }
+}
+
+- (void)updateProps:(const Props::Shared &)propsBase oldProps:(const Props::Shared &)oldPropsBase
+{
+  const auto &newProps = *std::static_pointer_cast<const RNGestureHandlerDetectorProps>(propsBase);
+  const auto &oldProps = *std::static_pointer_cast<const RNGestureHandlerDetectorProps>(oldPropsBase);
+  _moduleId = newProps.moduleId;
 
+  static std::vector<int> emptyVector;
+  const std::vector<int> &oldHandlerTags = (oldPropsBase != nullptr) ? oldProps.handlerTags : emptyVector;
+
+  [self updatePropsInternal:newProps.handlerTags
+             oldHandlerTags:oldHandlerTags
+                    isLogic:false
+                    viewTag:-1
+           attachedHandlers:_attachedHandlers
+             nativeHandlers:_nativeHandlers];
   [super updateProps:propsBase oldProps:oldPropsBase];
+
+  for (const RNGestureHandlerDetectorLogicChildrenStruct &child : newProps.logicChildren) {
+    if (logicChildren.find(child.viewTag) == logicChildren.end()) {
+      // Initialize the vector for a new logic child
+      RNGestureHandlerManager *handlerManager = [RNGestureHandlerModule handlerManagerForModuleId:_moduleId];
+      react_native_assert(handlerManager != nullptr && "Tried to access a non-existent handler manager")
+          logicChildren[child.viewTag]
+              .view = [handlerManager viewForReactTag:@(child.viewTag)];
+      logicChildren[child.viewTag].handlerTags = {};
+      logicChildren[child.viewTag].attachedHandlers = [NSMutableSet set];
+      logicChildren[child.viewTag].nativeHandlers = [NSMutableSet set];
+      [[handlerManager registry] registerLogicChild:@(child.viewTag) toParent:@(self.tag)];
+    }
+    [self updatePropsInternal:child.handlerTags
+               oldHandlerTags:logicChildren[child.viewTag].handlerTags
+                      isLogic:true
+                      viewTag:child.viewTag
+             attachedHandlers:logicChildren[child.viewTag].attachedHandlers
+               nativeHandlers:logicChildren[child.viewTag].nativeHandlers];
+  }
+
   // Override to force hittesting to work outside bounds
   self.clipsToBounds = NO;
 }

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

@@ -36,4 +36,5 @@
 
 - (nullable RNGestureHandler *)handlerWithTag:(nonnull NSNumber *)handlerTag;
 
+- (nullable RNGHUIView *)viewForReactTag:(nonnull NSNumber *)reactTag;
 @end

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

@@ -311,6 +311,20 @@ - (void)sendEvent:(RNGestureHandlerStateChange *)event
       }
       break;
     }
+    case RNGestureHandlerActionTypeLogicDetector: {
+      NSNumber *parentTag = [_registry getLogicParent:@(detectorView.tag)];
+      RNGHUIView *parentView = [self viewForReactTag:parentTag];
+      if ([event isKindOfClass:[RNGestureHandlerEvent class]]) {
+        // TODO: handle forAnimated
+        RNGestureHandlerEvent *gestureEvent = (RNGestureHandlerEvent *)event;
+        auto nativeEvent = [gestureEvent getNativeLogicEvent:@(detectorView.tag)];
+        [(RNGestureHandlerDetector *)parentView dispatchLogicGestureEvent:nativeEvent];
+      } else {
+        auto nativeEvent = [event getNativeLogicEvent:@(detectorView.tag)];
+        [(RNGestureHandlerDetector *)parentView dispatchLogicStateChangeEvent:nativeEvent];
+      }
+      break;
+    }
 
     case RNGestureHandlerActionTypeReanimatedWorklet:
       [self sendEventForReanimated:event];
@@ -418,4 +432,8 @@ - (void)sendEventForDeviceEvent:(RNGestureHandlerStateChange *)event
   [_eventDispatcher sendDeviceEventWithName:@"onGestureHandlerStateChange" body:body];
 }
 
+- (RNGHUIView *)viewForReactTag:(NSNumber *)reactTag
+{
+  return [_viewRegistry viewForReactTag:reactTag];
+}
 @end

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

@@ -5,11 +5,13 @@
 @interface RNGestureHandlerEvent (NativeEvent)
 
 - (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerEvent)getNativeEvent;
-
+- (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicEvent)getNativeLogicEvent:
+    (NSNumber *)childTag;
 @end
 
 @interface RNGestureHandlerStateChange (NativeEvent)
 
 - (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerStateChange)getNativeEvent;
-
+- (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicStateChange)getNativeLogicEvent:
+    (NSNumber *)childTag;
 @end

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

@@ -67,10 +67,25 @@ @implementation RNGestureHandlerEvent (NativeEvent)
   return nativeEvent;
 }
 
+- (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicEvent)getNativeLogicEvent:
+    (NSNumber *)childTag
+{
+  folly::dynamic handlerData = rngh_dynamicFromId(self.extraData.data);
+
+  facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicEvent nativeEvent = {
+      .handlerTag = [self.handlerTag intValue],
+      .state = static_cast<int>(self.state),
+      .handlerData = handlerData,
+      .childTag = [childTag intValue]};
+
+  return nativeEvent;
+}
 @end
 
 @implementation RNGestureHandlerStateChange (NativeEvent)
 
+// TODO: unify logic getter
+
 - (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerStateChange)getNativeEvent
 {
   folly::dynamic handlerData = rngh_dynamicFromId(self.extraData.data);
@@ -85,4 +100,18 @@ @implementation RNGestureHandlerStateChange (NativeEvent)
   return nativeEvent;
 }
 
+- (facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicStateChange)getNativeLogicEvent:
+    (NSNumber *)childTag
+{
+  folly::dynamic handlerData = rngh_dynamicFromId(self.extraData.data);
+
+  facebook::react::RNGestureHandlerDetectorEventEmitter::OnGestureHandlerLogicStateChange nativeEvent = {
+      .handlerTag = [self.handlerTag intValue],
+      .state = static_cast<int>(self.state),
+      .oldState = static_cast<int>(self.previousState),
+      .handlerData = handlerData,
+      .childTag = [childTag intValue]};
+
+  return nativeEvent;
+}
 @end

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

@@ -18,5 +18,6 @@
 - (void)detachHandlerWithTag:(nonnull NSNumber *)handlerTag;
 - (void)dropHandlerWithTag:(nonnull NSNumber *)handlerTag;
 - (void)dropAllHandlers;
-
+- (nullable NSNumber *)getLogicParent:(nonnull NSNumber *)child;
+- (void)registerLogicChild:(nonnull NSNumber *)child toParent:(nonnull NSNumber *)parent;
 @end

packages/react-native-gesture-handler/apple/RNGestureHandlerRegistry.m

@@ -12,12 +12,14 @@
 
 @implementation RNGestureHandlerRegistry {
   NSMutableDictionary<NSNumber *, RNGestureHandler *> *_handlers;
+  NSMutableDictionary<NSNumber *, NSNumber *> *_logicChildMap;
 }
 
 - (instancetype)init
 {
   if ((self = [super init])) {
     _handlers = [NSMutableDictionary new];
+    _logicChildMap = [NSMutableDictionary new];
   }
   return self;
 }
@@ -32,6 +34,16 @@ - (void)registerGestureHandler:(RNGestureHandler *)gestureHandler
   _handlers[gestureHandler.tag] = gestureHandler;
 }
 
+- (void)registerLogicChild:(NSNumber *)child toParent:(NSNumber *)parent
+{
+  _logicChildMap[child] = parent;
+}
+
+- (NSNumber *)getLogicParent:(NSNumber *)child
+{
+  return _logicChildMap[child];
+}
+
 - (void)attachHandlerWithTag:(NSNumber *)handlerTag
                       toView:(RNGHUIView *)view
               withActionType:(RNGestureHandlerActionType)actionType

packages/react-native-gesture-handler/src/ActionType.ts

@@ -4,6 +4,7 @@ export const ActionType = {
   JS_FUNCTION_OLD_API: 3,
   JS_FUNCTION_NEW_API: 4,
   NATIVE_DETECTOR: 5,
+  LogicDetector: 6,
 } as const;
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare -- backward compatibility; it can be used as a type and as a value