Fix styling options on iOS 13.4

lib/ios/RNNBasePresenter.h

@@ -39,10 +39,12 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (UINavigationItem *)currentNavigationItem;
 
-- (UIStatusBarStyle)getStatusBarStyle:(RNNNavigationOptions *)resolvedOptions;
+- (void)willMoveToParentViewController:(UIViewController *)parent;
 
-- (UIInterfaceOrientationMask)getOrientation:(RNNNavigationOptions *)options;
+- (UIStatusBarStyle)getStatusBarStyle;
 
-- (BOOL)statusBarVisibile:(UINavigationController *)stack resolvedOptions:(RNNNavigationOptions *)resolvedOptions;
+- (UIInterfaceOrientationMask)getOrientation;
+
+- (BOOL)getStatusBarVisibility;
 
 @end

lib/ios/RNNBasePresenter.m

@@ -36,6 +36,13 @@ - (void)componentDidDisappear {
 
 }
 
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+    if (parent) {
+        [self applyOptionsOnWillMoveToParentViewController:self.boundViewController.resolveOptions];
+        [self.boundViewController onChildAddToParent:self.boundViewController options:self.boundViewController.resolveOptions];
+    }
+}
+
 - (void)applyOptionsOnInit:(RNNNavigationOptions *)initialOptions {
     UIViewController* viewController = self.boundViewController;
     RNNNavigationOptions *withDefault = [initialOptions withDefault:[self defaultOptions]];
@@ -78,8 +85,8 @@ - (void)viewDidLayoutSubviews {
 
 }
 
-- (UIStatusBarStyle)getStatusBarStyle:(RNNNavigationOptions *)resolvedOptions {
-    RNNNavigationOptions *withDefault = [resolvedOptions withDefault:[self defaultOptions]];
+- (UIStatusBarStyle)getStatusBarStyle {
+    RNNNavigationOptions *withDefault = [self.boundViewController.resolveOptions withDefault:[self defaultOptions]];
     NSString* statusBarStyle = [withDefault.statusBar.style getWithDefaultValue:@"default"];
     if ([statusBarStyle isEqualToString:@"light"]) {
         return UIStatusBarStyleLightContent;
@@ -98,16 +105,16 @@ - (UINavigationItem *)currentNavigationItem {
     return self.boundViewController.getCurrentChild.navigationItem;
 }
 
-- (UIInterfaceOrientationMask)getOrientation:(RNNNavigationOptions *)options {
-    return [options withDefault:[self defaultOptions]].layout.supportedOrientations;
+- (UIInterfaceOrientationMask)getOrientation {
+    return [self.boundViewController.resolveOptions withDefault:self.defaultOptions].layout.supportedOrientations;
 }
 
-- (BOOL)statusBarVisibile:(UINavigationController *)stack resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
-    RNNNavigationOptions *withDefault = [resolvedOptions withDefault:self.defaultOptions];
+- (BOOL)getStatusBarVisibility {
+    RNNNavigationOptions *withDefault = [self.boundViewController.resolveOptions withDefault:self.defaultOptions];
     if (withDefault.statusBar.visible.hasValue) {
         return ![withDefault.statusBar.visible get];
     } else if ([withDefault.statusBar.hideWithTopBar getWithDefaultValue:NO]) {
-        return stack.isNavigationBarHidden;
+        return self.boundViewController.stack.isNavigationBarHidden;
     }
     return NO;
 }

lib/ios/RNNBottomTabsController.m

@@ -87,14 +87,6 @@ - (void)setSelectedIndex:(NSUInteger)selectedIndex {
 	[super setSelectedIndex:selectedIndex];
 }
 
-- (UIStatusBarStyle)preferredStatusBarStyle {
-	return [[self presenter] getStatusBarStyle:self.resolveOptions];
-}
-
-- (BOOL)prefersStatusBarHidden {
-    return [self.presenter statusBarVisibile:self.navigationController resolvedOptions:self.resolveOptions];
-}
-
 #pragma mark UITabBarControllerDelegate
 
 - (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController {
@@ -121,4 +113,23 @@ - (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectView
     return NO;
 }
 
+# pragma mark - UIViewController overrides
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+    [self.presenter willMoveToParentViewController:parent];
+}
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return [self.presenter getStatusBarStyle];
+}
+
+- (BOOL)prefersStatusBarHidden {
+    return [self.presenter getStatusBarVisibility];
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return [self.presenter getOrientation];
+}
+
+
 @end

lib/ios/RNNComponentViewController.m

@@ -6,7 +6,6 @@ @implementation RNNComponentViewController
 
 - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo rootViewCreator:(id<RNNComponentViewCreator>)creator eventEmitter:(RNNEventEmitter *)eventEmitter presenter:(RNNComponentPresenter *)presenter options:(RNNNavigationOptions *)options defaultOptions:(RNNNavigationOptions *)defaultOptions {
 	self = [super initWithLayoutInfo:layoutInfo creator:creator options:options defaultOptions:defaultOptions presenter:presenter eventEmitter:eventEmitter childViewControllers:nil];
-	self.extendedLayoutIncludesOpaqueBars = YES;
     if (@available(iOS 13.0, *)) {
         self.navigationItem.standardAppearance = [UINavigationBarAppearance new];
         self.navigationItem.scrollEdgeAppearance = [UINavigationBarAppearance new];
@@ -79,14 +78,6 @@ - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
 	[self.eventEmitter sendOnSearchBarCancelPressed:self.layoutInfo.componentId];
 }
 
-- (UIStatusBarStyle)preferredStatusBarStyle {
-	return [_presenter getStatusBarStyle:[self resolveOptions]];
-}
-
-- (BOOL)prefersStatusBarHidden {
-    return [self.presenter statusBarVisibile:self.navigationController resolvedOptions:self.resolveOptions];
-}
-
 - (UIViewController *)previewingContext:(id<UIViewControllerPreviewing>)previewingContext viewControllerForLocation:(CGPoint)location{
 	return self.previewController;
 }
@@ -139,5 +130,23 @@ -(void)onButtonPress:(RNNUIBarButtonItem *)barButtonItem {
 	[self.eventEmitter sendOnNavigationButtonPressed:self.layoutInfo.componentId buttonId:barButtonItem.buttonId];
 }
 
+# pragma mark - UIViewController overrides
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+    [self.presenter willMoveToParentViewController:parent];
+}
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return [self.presenter getStatusBarStyle];
+}
+
+- (BOOL)prefersStatusBarHidden {
+    return [self.presenter getStatusBarVisibility];
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return [self.presenter getOrientation];
+}
+
 
 @end

lib/ios/RNNExternalViewController.m

@@ -30,4 +30,22 @@ - (void)render {
 	[self readyForPresentation];
 }
 
+# pragma mark - UIViewController overrides
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+    [self.presenter willMoveToParentViewController:parent];
+}
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return [self.presenter getStatusBarStyle];
+}
+
+- (BOOL)prefersStatusBarHidden {
+    return [self.presenter getStatusBarVisibility];
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return [self.presenter getOrientation];
+}
+
 @end

lib/ios/RNNSideMenuChildVC.m

@@ -39,8 +39,22 @@ - (UIViewController *)getCurrentChild {
 	return self.child;
 }
 
+# pragma mark - UIViewController overrides
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+    [self.presenter willMoveToParentViewController:parent];
+}
+
 - (UIStatusBarStyle)preferredStatusBarStyle {
-	return [[self presenter] getStatusBarStyle:[self resolveOptions]];
+    return [self.presenter getStatusBarStyle];
+}
+
+- (BOOL)prefersStatusBarHidden {
+    return [self.presenter getStatusBarVisibility];
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return [self.presenter getOrientation];
 }
 
 @end

lib/ios/RNNSideMenuController.m

@@ -130,14 +130,6 @@ -(void)setControllers:(NSArray*)controllers {
 	}
 }
 
-- (UIStatusBarStyle)preferredStatusBarStyle {
-	return self.openedViewController.preferredStatusBarStyle;
-}
-
-- (BOOL)prefersStatusBarHidden {
-    return [self.presenter statusBarVisibile:self.navigationController resolvedOptions:self.resolveOptions];
-}
-
 - (UIViewController<RNNLayoutProtocol> *)getCurrentChild {
 	return self.openedViewController;
 }
@@ -163,4 +155,22 @@ - (RNNNavigationOptions *)resolveOptions {
     return options;
 }
 
+# pragma mark - UIViewController overrides
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+    [self.presenter willMoveToParentViewController:parent];
+}
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return [self.presenter getStatusBarStyle];
+}
+
+- (BOOL)prefersStatusBarHidden {
+    return [self.presenter getStatusBarVisibility];
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return [self.presenter getOrientation];
+}
+
 @end

lib/ios/RNNSplitViewController.m

@@ -9,12 +9,26 @@ - (void)setViewControllers:(NSArray<__kindof UIViewController *> *)viewControlle
     self.delegate = masterViewController;
 }
 
--(void)viewWillAppear:(BOOL)animated{
-	[super viewWillAppear:animated];
-}
-
 - (UIViewController *)getCurrentChild {
 	return self.viewControllers[0];
 }
 
+# pragma mark - UIViewController overrides
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+    [self.presenter willMoveToParentViewController:parent];
+}
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return [self.presenter getStatusBarStyle];
+}
+
+- (BOOL)prefersStatusBarHidden {
+    return [self.presenter getStatusBarVisibility];
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return [self.presenter getOrientation];
+}
+
 @end

lib/ios/RNNStackController.m

@@ -35,14 +35,6 @@ - (void)mergeChildOptions:(RNNNavigationOptions *)options child:(UIViewControlle
     [self.parentViewController mergeChildOptions:options child:child];
 }
 
-- (UIStatusBarStyle)preferredStatusBarStyle {
-	return [_presenter getStatusBarStyle:self.resolveOptions];
-}
-
-- (BOOL)prefersStatusBarHidden {
-    return [self.presenter statusBarVisibile:self.navigationController resolvedOptions:self.resolveOptions];
-}
-
 - (UIViewController *)popViewControllerAnimated:(BOOL)animated {
     [self prepareForPop];
 	return [super popViewControllerAnimated:animated];
@@ -62,4 +54,22 @@ - (UIViewController *)childViewControllerForStatusBarStyle {
 	return self.topViewController;
 }
 
+# pragma mark - UIViewController overrides
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+    [self.presenter willMoveToParentViewController:parent];
+}
+
+- (UIStatusBarStyle)preferredStatusBarStyle {
+    return [self.presenter getStatusBarStyle];
+}
+
+- (BOOL)prefersStatusBarHidden {
+    return [self.presenter getStatusBarVisibility];
+}
+
+- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
+    return [self.presenter getOrientation];
+}
+
 @end

lib/ios/UIViewController+LayoutProtocol.m

@@ -20,6 +20,7 @@ - (instancetype)initWithLayoutInfo:(RNNLayoutInfo *)layoutInfo
     self.eventEmitter = eventEmitter;
     self.presenter = presenter;
     [self.presenter bindViewController:self];
+    self.extendedLayoutIncludesOpaqueBars = YES;
     if ([self respondsToSelector:@selector(setViewControllers:)]) {
         [self performSelector:@selector(setViewControllers:) withObject:childViewControllers];
     }
@@ -51,15 +52,6 @@ - (void)overrideOptions:(RNNNavigationOptions *)options {
 	[self.options overrideOptions:options];
 }
 
-- (BOOL)extendedLayoutIncludesOpaqueBars {
-    return YES;
-}
-
-- (UIInterfaceOrientationMask)supportedInterfaceOrientations {
-	UIInterfaceOrientationMask interfaceOrientationMask = self.presenter ? [self.presenter getOrientation:[self resolveOptions]] : [[UIApplication sharedApplication] supportedInterfaceOrientationsForWindow:[[UIApplication sharedApplication] keyWindow]];
-	return interfaceOrientationMask;
-}
-
 - (UINavigationController *)stack {
     if ([self isKindOfClass:UINavigationController.class]) {
         return (UINavigationController *)self;
@@ -161,13 +153,6 @@ - (void)componentDidDisappear {
     [self.parentViewController componentDidDisappear];
 }
 
-- (void)willMoveToParentViewController:(UIViewController *)parent {
-	if (parent) {
-		[self.presenter applyOptionsOnWillMoveToParentViewController:self.resolveOptions];
-        [self onChildAddToParent:self options:self.resolveOptions];
-	}
-}
-
 #pragma mark getters and setters to associated object
 
 - (RNNNavigationOptions *)options {

playground/ios/NavigationTests/BottomTabsControllerTest.m

@@ -139,7 +139,7 @@ - (void)testGetCurrentChild_shouldReturnSelectedViewController {
 }
 
 - (void)testPreferredStatusBarStyle_shouldInvokeSelectedViewControllerPreferredStatusBarStyle {
-    [[self.mockTabBarPresenter expect] getStatusBarStyle:[OCMArg any]];
+    [[self.mockTabBarPresenter expect] getStatusBarStyle];
     [self.uut preferredStatusBarStyle];
     [self.mockTabBarPresenter verify];
 }