simplify ios

Author: akwasniewski

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

@@ -103,6 +103,9 @@
 - (nonnull RNGHUIView *)findViewForEvents;
 - (BOOL)wantsToAttachDirectlyToView;
 
+- (void)setParentTag:(nonnull NSNumber *)parentTag;
+- (nonnull NSNumber *)getParentTag;
+
 #if !TARGET_OS_OSX
 - (BOOL)isUIScrollViewPanGestureRecognizer:(nonnull UIGestureRecognizer *)gestureRecognizer;
 #else

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

@@ -76,6 +76,7 @@ @implementation RNGestureHandler {
   NSArray<NSNumber *> *_simultaneousHandlers;
   RNGHHitSlop _hitSlop;
   uint16_t _eventCoalescingKey;
+  NSNumber *_parentTag;
 }
 
 - (instancetype)initWithTag:(NSNumber *)tag
@@ -674,4 +675,14 @@ - (BOOL)wantsToAttachDirectlyToView
   return NO;
 }
 
+- (void)setParentTag:(NSNumber *)parentTag
+{
+  _parentTag = parentTag;
+}
+
+- (NSNumber *)getParentTag
+{
+  return _parentTag;
+}
+
 @end

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

@@ -244,7 +244,7 @@ - (void)updateProps:(const Props::Shared &)propsBase oldProps:(const Props::Shar
       // Initialize the vector for a new logic child
       logicChildren[child.viewTag].handlerTags = {};
       logicChildren[child.viewTag].attachedHandlers = [NSMutableSet set];
-      [[handlerManager registry] registerLogicChild:@(child.viewTag) toParent:@(self.tag)];
+      [[[handlerManager registry] handlerWithTag:@(child.viewTag)] setParentTag:@(self.tag)];
     }
     shouldKeepLogicChild[child.viewTag] = true;
     [self updatePropsInternal:child.handlerTags

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

@@ -318,7 +318,7 @@ - (void)sendEvent:(RNGestureHandlerStateChange *)event
       break;
     }
     case RNGestureHandlerActionTypeLogicDetector: {
-      NSNumber *parentTag = [_registry getLogicParent:@(detectorView.tag)];
+      NSNumber *parentTag = [[_registry handlerWithTag:event.handlerTag] getParentTag];
       RNGHUIView *parentView = [self viewForReactTag:parentTag];
       if ([event isKindOfClass:[RNGestureHandlerEvent class]]) {
         // TODO: handle forAnimated

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

@@ -18,6 +18,4 @@
 - (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,14 +12,12 @@
 
 @implementation RNGestureHandlerRegistry {
   NSMutableDictionary<NSNumber *, RNGestureHandler *> *_handlers;
-  NSMutableDictionary<NSNumber *, NSNumber *> *_logicChildMap;
 }
 
 - (instancetype)init
 {
   if ((self = [super init])) {
     _handlers = [NSMutableDictionary new];
-    _logicChildMap = [NSMutableDictionary new];
   }
   return self;
 }
@@ -34,16 +32,6 @@ - (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

yarn.lock

@@ -6527,7 +6527,7 @@ __metadata:
     jest: "npm:^29.6.3"
     prettier: "npm:3.3.3"
     react-native-gesture-handler: "workspace:*"
-    react-native-reanimated: "npm:^3.18.0"
+    react-native-reanimated: "npm:^3.19.1"
     react-native-safe-area-context: "npm:^5.4.0"
     react-native-screens: "npm:^4.10.0"
     react-native-svg: "npm:15.11.2"
@@ -14298,7 +14298,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-reanimated@npm:^3.18.0":
+"react-native-reanimated@npm:^3.18.0, react-native-reanimated@npm:^3.19.1":
   version: 3.19.1
   resolution: "react-native-reanimated@npm:3.19.1"
   dependencies: