merge

Author: akwasniewski

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

@@ -94,7 +94,6 @@
 - (void)updateRelations:(nonnull NSDictionary *)relations;
 - (void)handleGesture:(nonnull id)recognizer fromReset:(BOOL)fromReset;
 - (void)handleGesture:(nonnull id)recognizer inState:(RNGestureHandlerState)state;
-- (CGRect)getViewBounds;
 - (BOOL)containsPointInView;
 - (RNGestureHandlerState)state;
 - (nullable RNGestureHandlerEventExtraData *)eventExtraData:(nonnull id)recognizer;

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

@@ -666,20 +666,17 @@ - (void)reset
   }
 }
 
-- (CGRect)getViewBounds
+- (BOOL)containsPointInView
 {
   CGRect bounds = _recognizer.view.bounds;
+  CGPoint pt = [_recognizer locationInView:_recognizer.view];
+
   if (bounds.size.width == 0 and bounds.size.height == 0 and bounds.origin.x == 0 and bounds.origin.y == 0 and
       _recognizer.view.subviews.count) {
     bounds = _recognizer.view.subviews[0].bounds;
+    pt = [_recognizer locationInView:_recognizer.view.subviews[0]];
   }
-  return bounds;
-}
-
-- (BOOL)containsPointInView
-{
-  CGPoint pt = [_recognizer locationInView:_recognizer.view];
-  CGRect hitFrame = RNGHHitSlopInsetRect([self getViewBounds], _hitSlop);
+  CGRect hitFrame = RNGHHitSlopInsetRect(bounds, _hitSlop);
   return CGRectContainsPoint(hitFrame, pt);
 }