diff --git a/packages/react-native/React/Views/RCTModalHostViewManager.m b/packages/react-native/React/Views/RCTModalHostViewManager.m index eccf05f9cb6..8407662ff18 100644 --- a/packages/react-native/React/Views/RCTModalHostViewManager.m +++ b/packages/react-native/React/Views/RCTModalHostViewManager.m @@ -64,9 +64,9 @@ RCT_EXPORT_MODULE() if (self->_presentationBlock) { self->_presentationBlock([modalHostView reactViewController], viewController, animated, completionBlock); } else { - [[modalHostView reactViewController] presentViewController:viewController - animated:animated - completion:completionBlock]; + [[self _topMostViewControllerFrom:[modalHostView reactViewController]] presentViewController:viewController + animated:animated + completion:completionBlock]; } }); } @@ -107,6 +107,26 @@ RCT_EXPORT_MODULE() _hostViews = nil; } +#pragma mark - Private + +- (UIViewController *)_topMostViewControllerFrom:(UIViewController *)rootViewController +{ + UIViewController *topController = rootViewController; + while (topController.presentedViewController) { + topController = topController.presentedViewController; + } + if ([topController isKindOfClass:[UINavigationController class]]) { + UINavigationController *navigationController = (UINavigationController *)topController; + topController = navigationController.visibleViewController; + return [self _topMostViewControllerFrom:topController]; + } else if ([topController isKindOfClass:[UITabBarController class]]) { + UITabBarController *tabBarController = (UITabBarController *)topController; + topController = tabBarController.selectedViewController; + return [self _topMostViewControllerFrom:topController]; + } + return topController; +} + RCT_EXPORT_VIEW_PROPERTY(animationType, NSString) RCT_EXPORT_VIEW_PROPERTY(presentationStyle, UIModalPresentationStyle) RCT_EXPORT_VIEW_PROPERTY(transparent, BOOL)