Skip to content

Commit 9928ede

Browse files
authored
Merge branch 'main' into @akwasniewski/ios-fix-buttons-with-virutal-detector
2 parents e726e91 + 6c06cc4 commit 9928ede

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,10 +273,14 @@ - (void)registerViewWithGestureRecognizerAttachedIfNeeded:(RNGHUIView *)childVie
273273
RNGHUIView *touchHandlerView = childView;
274274

275275
#if !TARGET_OS_OSX
276+
Class fullWindowOverlayContainerClass = NSClassFromString(@"RNSFullWindowOverlayContainer");
277+
276278
if ([[childView reactViewController] isKindOfClass:[RCTFabricModalHostViewController class]]) {
277279
touchHandlerView = [childView reactViewController].view;
278280
} else {
279-
while (touchHandlerView != nil && ![touchHandlerView isKindOfClass:[RCTSurfaceView class]]) {
281+
while (
282+
touchHandlerView != nil && ![touchHandlerView isKindOfClass:[RCTSurfaceView class]] &&
283+
(fullWindowOverlayContainerClass == nil || ![touchHandlerView isKindOfClass:fullWindowOverlayContainerClass])) {
280284
touchHandlerView = touchHandlerView.superview;
281285
}
282286
}

0 commit comments

Comments
 (0)