Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions packages/react-native-gesture-handler/apple/RNGestureHandler.mm
Original file line number Diff line number Diff line change
Expand Up @@ -640,14 +640,14 @@ + (RNGestureHandler *)findGestureHandlerByRecognizer:(UIGestureRecognizer *)reco
// We may try to extract "DummyGestureHandler" in case when "otherGestureRecognizer" belongs to
// a native view being wrapped with "NativeViewGestureHandler"
RNGHUIView *reactView = recognizer.view;
while (reactView != nil && reactView.reactTag == nil) {
reactView = reactView.superview;
}

for (UIGestureRecognizer *recognizer in reactView.gestureRecognizers) {
if ([recognizer isKindOfClass:[RNDummyGestureRecognizer class]]) {
return recognizer.gestureHandler;
while (reactView != nil) {
for (UIGestureRecognizer *recognizer in reactView.gestureRecognizers) {
if ([recognizer isKindOfClass:[RNDummyGestureRecognizer class]]) {
return recognizer.gestureHandler;
}
}

reactView = reactView.superview;
}

return nil;
Expand Down Expand Up @@ -816,7 +816,8 @@ - (BOOL)wantsToHandleEventsAtPoint:(CGPoint)point

RNGHUIView *viewToHitTest = _recognizer.view;

if ([self usesNativeOrVirtualDetector] && [_recognizer.view.subviews count] > 0) {
if ([self usesNativeOrVirtualDetector] && [_recognizer.view.subviews count] > 0 &&
_recognizer.view == self.hostDetectorView) {
viewToHitTest = _recognizer.view.subviews[0];
point = [_recognizer.view convertPoint:point toView:viewToHitTest];
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -850,7 +850,7 @@ - (BOOL)shouldHandleTouch:(RNGHUIView *)view atPoint:(CGPoint)point
for (UIGestureRecognizer *recognizer in enabledGestureRecognizers) {
RNGestureHandler *handler = [RNGestureHandler findGestureHandlerByRecognizer:recognizer];
if (handler != nil) {
CGPoint pointInView = [self convertPoint:point toView:view];
CGPoint pointInView = [self convertPoint:point toView:handler.recognizer.view];
gestureRecognizerWantsEvent = [handler wantsToHandleEventsAtPoint:pointInView];
} else {
gestureRecognizerWantsEvent = YES;
Expand Down
Loading