Fix topBarHeight with UIModalPresentationPageSheet (#5749)

wix · Dec 9, 2019 · 9ef61a9 · 9ef61a9
1 parent 4cb0e98
commit 9ef61a9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/lib/ios/Constants.m b/lib/ios/Constants.m
@@ -8,7 +8,7 @@ + (NSDictionary *)getConstants {
 }
 
 + (CGFloat)topBarHeight {
-	return [UIApplication.sharedApplication.delegate.window.rootViewController getTopBarHeight];
+	return [RCTPresentedViewController() getTopBarHeight];
 }
 
 + (CGFloat)statusBarHeight {

diff --git a/lib/ios/RNNStackController.m b/lib/ios/RNNStackController.m
@@ -18,10 +18,6 @@ - (UIViewController *)getCurrentChild {
 	return self.topViewController;
 }
 
-- (CGFloat)getTopBarHeight {
-	return self.navigationBar.frame.size.height;
-}
-
 - (UINavigationController *)navigationController {
 	return self;
 }

diff --git a/lib/ios/UINavigationController+RNNOptions.m b/lib/ios/UINavigationController+RNNOptions.m
@@ -114,4 +114,8 @@ - (void)setBackButtonIcon:(UIImage *)icon withColor:(UIColor *)color title:(NSSt
     lastViewControllerInStack.navigationItem.backBarButtonItem = backItem;
 }
 
+- (CGFloat)getTopBarHeight {
+    return self.navigationBar.frame.size.height;
+}
+
 @end