statusBarHideWithTopBar iOS (#1724)

README.md

@@ -92,8 +92,8 @@ Note:  v1 properties with names beginning with 'navBar' are replaced in v2 with
 | navBarSubtitleFontFamily    |   ✅  |    [Contribute](CONTRIBUTING.md)    |     [Contribute](CONTRIBUTING.md)       |
 | screenBackgroundColor     | ✅    |   ✅     |     [Contribute](CONTRIBUTING.md)       |  Wix|
 | orientation     |  ✅   |  WIP @yogevbd      |   [Contribute](CONTRIBUTING.md)          |
-| statusBarHideWithTopBar        |  ✅   |    [Contribute](CONTRIBUTING.md)     |     [Contribute](CONTRIBUTING.md)       |
-| statusBarHidden       |  ✅   |    ✅       |     [Contribute](CONTRIBUTING.md)      | Wix|
+| statusBarHideWithTopBar        |  ✅   |   ✅     |     [Contribute](CONTRIBUTING.md)       | @gtchance|
+| statusBarHidden       |  ✅   |    ✅       |     [Contribute](CONTRIBUTING.md)      | WIX |
 | disabledBackGesture       |   ✅  |  WIP @gran33     |    / iOS specific     |
 | screenBackgroundImageName         |   ✅  |   [Contribute](CONTRIBUTING.md)      |    [Contribute](CONTRIBUTING.md)        |
 | rootBackgroundImageName            |  ✅   |    [Contribute](CONTRIBUTING.md)     |    [Contribute](CONTRIBUTING.md)       |

lib/ios/RNNNavigationOptions.h

@@ -19,6 +19,7 @@ extern const NSInteger BLUR_STATUS_TAG;
 @property (nonatomic, strong) NSNumber* topBarTextFontSize;
 @property (nonatomic, strong) NSNumber* topBarNoBorder;
 @property (nonatomic, strong) NSNumber* statusBarBlur;
+@property (nonatomic, strong) NSNumber* statusBarHideWithTopBar;
 
 
 -(instancetype)init;

lib/ios/RNNRootViewController.m

@@ -40,7 +40,12 @@
 }
 
 - (BOOL)prefersStatusBarHidden {
-	return [self.navigationOptions.statusBarHidden boolValue]; // || self.navigationController.isNavigationBarHidden;
+	if ([self.navigationOptions.statusBarHidden boolValue]) {
+		return YES;
+	} else if ([self.navigationOptions.statusBarHideWithTopBar boolValue]) {
+		return self.navigationController.isNavigationBarHidden;
+	}
+	return NO;
 }
 
 -(void)viewDidAppear:(BOOL)animated {

lib/ios/ReactNativeNavigationTests/RNNRootViewControllerTest.m

@@ -59,6 +59,25 @@
 	XCTAssertTrue([self.uut prefersStatusBarHidden]);
 }
 
+- (void)testStatusBarHideWithTopBar_false {
+	self.options.statusBarHideWithTopBar = @(0);
+	self.options.topBarHidden = @(1);
+	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	[self.uut viewWillAppear:false];
+	
+	XCTAssertFalse([self.uut prefersStatusBarHidden]);
+}
+
+- (void)testStatusBarHideWithTopBar_true {
+	self.options.statusBarHideWithTopBar = @(1);
+	self.options.topBarHidden = @(1);
+	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];
+	[self.uut viewWillAppear:false];
+
+	XCTAssertTrue([self.uut prefersStatusBarHidden]);
+}
+
+
 - (void)testStatusBarHidden_false {
 	self.options.statusBarHidden = @(0);
 	__unused UINavigationController* nav = [[UINavigationController alloc] initWithRootViewController:self.uut];