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
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ class RNGestureHandlerModule(reactContext: ReactApplicationContext?) :
}
synchronized(roots) {
return roots.firstOrNull {
it.rootView is ReactRootView && it.rootView.rootViewTag == rootViewTag
val rv = it.rootView
rv is ReactRootView && rv.getRootViewTag() == rootViewTag
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,14 @@ - (void)registerViewWithGestureRecognizerAttachedIfNeeded:(RNGHUIView *)childVie
RNGHUIView *touchHandlerView = childView;

#if !TARGET_OS_OSX
Class fullWindowOverlayContainerClass = NSClassFromString(@"RNSFullWindowOverlayContainer");

if ([[childView reactViewController] isKindOfClass:[RCTFabricModalHostViewController class]]) {
touchHandlerView = [childView reactViewController].view;
} else {
while (touchHandlerView != nil && ![touchHandlerView isKindOfClass:[RCTSurfaceView class]]) {
while (
touchHandlerView != nil && ![touchHandlerView isKindOfClass:[RCTSurfaceView class]] &&
(fullWindowOverlayContainerClass == nil || ![touchHandlerView isKindOfClass:fullWindowOverlayContainerClass])) {
touchHandlerView = touchHandlerView.superview;
}
}
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-gesture-handler/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "react-native-gesture-handler",
"version": "2.29.0",
"version": "2.30.1",
"description": "Declarative API exposing native platform touch and gesture system to React Native",
"scripts": {
"test": "jest",
Expand Down
Loading