Fix transparent topBar option (#5704)

lib/ios/UINavigationBar+utils.m

@@ -4,49 +4,55 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 
 @implementation UINavigationBar (utils)
 
+- (void)rnn_setBackIndicatorImage:(UIImage *)image {
+    if (@available(iOS 13.0, *)) {
+        [[self getNavigaitonBarStandardAppearance] setBackIndicatorImage:image transitionMaskImage:image];
+        [[self getNavigaitonBarCompactAppearance] setBackIndicatorImage:image transitionMaskImage:image];
+        [[self getNavigaitonBarScrollEdgeAppearance] setBackIndicatorImage:image transitionMaskImage:image];
+    } else {
+        [self setBackIndicatorImage:image];
+        [self setBackIndicatorTransitionMaskImage:image];
+    }
+}
+
 - (void)rnn_setBackgroundColor:(UIColor *)color {
     CGFloat bgColorAlpha = CGColorGetAlpha(color.CGColor);
     
     if (color && bgColorAlpha == 0.0) {
-        [self rnn_setBackgroundColorTransparent];
+        self.translucent = YES;
+        [self setBackgroundColorTransparent];
     } else {
-        [self removeTransparentView];
-        if (@available(iOS 13.0, *)) {
-            [self getNavigaitonBarStandardAppearance].backgroundColor = color;
-            [self getNavigaitonBarCompactAppearance].backgroundColor = color;
-            [self getNavigaitonBarScrollEdgeAppearance].backgroundColor = color;
-        }
-        self.barTintColor = color;
+        self.translucent = NO;
+        [self setBackgroundColor:color];
     }
 }
 
-- (void)rnn_setBackgroundColorTransparent {
-    if (![self viewWithTag:TOP_BAR_TRANSPARENT_TAG]){
-        UIView *transparentView = [[UIView alloc] initWithFrame:CGRectZero];
-        transparentView.backgroundColor = [UIColor clearColor];
-        transparentView.tag = TOP_BAR_TRANSPARENT_TAG;
-        [self insertSubview:transparentView atIndex:0];
-    }
-    
-    self.translucent = YES;
-    [self setBackgroundColor:[UIColor clearColor]];
-    self.shadowImage = [UIImage new];
-    [self setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
+- (void)setBackgroundColor:(UIColor *)color {
     if (@available(iOS 13.0, *)) {
-        UINavigationBarAppearance *standardAppearance = [self getNavigaitonBarStandardAppearance];
-        standardAppearance.backgroundColor = [UIColor clearColor];
-        standardAppearance.shadowImage =  [UIImage new];
-        standardAppearance.backgroundImage = [UIImage new];
-
-        UINavigationBarAppearance *compactAppearance = [self getNavigaitonBarCompactAppearance];
-        compactAppearance.backgroundColor = [UIColor clearColor];
-        compactAppearance.shadowImage =  [UIImage new];
-        compactAppearance.backgroundImage = [UIImage new];
+        [self configureWithDefaultBackground];
+        [self getNavigaitonBarStandardAppearance].backgroundColor = color;
+        [self getNavigaitonBarCompactAppearance].backgroundColor = color;
+        [self getNavigaitonBarScrollEdgeAppearance].backgroundColor = color;
+    } else {
+        [super setBackgroundColor:color];
+        [self removeTransparentView];
+    }
+}
 
-        UINavigationBarAppearance *scrollEdgeAppearance = [self getNavigaitonBarScrollEdgeAppearance];
-        scrollEdgeAppearance.backgroundColor = [UIColor clearColor];
-        scrollEdgeAppearance.shadowImage =  [UIImage new];
-        scrollEdgeAppearance.backgroundImage = [UIImage new];
+- (void)setBackgroundColorTransparent {
+    if (@available(iOS 13.0, *)) {
+        [self configureWithTransparentBackground];
+    } else {
+        if (![self viewWithTag:TOP_BAR_TRANSPARENT_TAG]){
+            UIView *transparentView = [[UIView alloc] initWithFrame:CGRectZero];
+            transparentView.backgroundColor = [UIColor clearColor];
+            transparentView.tag = TOP_BAR_TRANSPARENT_TAG;
+            [self insertSubview:transparentView atIndex:0];
+        }
+        
+        [self setBackgroundColor:[UIColor clearColor]];
+        self.shadowImage = [UIImage new];
+        [self setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
     }
 }
 
@@ -57,14 +63,19 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
     }
 }
 
-- (void)rnn_setBackIndicatorImage:(UIImage *)image {
+- (void)configureWithTransparentBackground {
     if (@available(iOS 13.0, *)) {
-        [[self getNavigaitonBarStandardAppearance] setBackIndicatorImage:image transitionMaskImage:image];
-        [[self getNavigaitonBarCompactAppearance] setBackIndicatorImage:image transitionMaskImage:image];
-        [[self getNavigaitonBarScrollEdgeAppearance] setBackIndicatorImage:image transitionMaskImage:image];
-    } else {
-        [self setBackIndicatorImage:image];
-        [self setBackIndicatorTransitionMaskImage:image];
+        [[self getNavigaitonBarStandardAppearance] configureWithTransparentBackground];
+        [[self getNavigaitonBarCompactAppearance] configureWithTransparentBackground];
+        [[self getNavigaitonBarScrollEdgeAppearance] configureWithTransparentBackground];
+    }
+}
+
+- (void)configureWithDefaultBackground {
+    if (@available(iOS 13.0, *)) {
+        [[self getNavigaitonBarStandardAppearance] configureWithDefaultBackground];
+        [[self getNavigaitonBarCompactAppearance] configureWithDefaultBackground];
+        [[self getNavigaitonBarScrollEdgeAppearance] configureWithDefaultBackground];
     }
 }
 

playground/ios/NavigationTests/RNNNavigationControllerTest.m

@@ -123,7 +123,7 @@
 	[_vc1 overrideOptions:_options];
 	
 	[self.uut popViewControllerAnimated:NO];
-	XCTAssertEqual(_vc1.resolveOptions.topBar.background.color.get, self.uut.navigationBar.barTintColor);
+	XCTAssertEqual(_vc1.resolveOptions.topBar.background.color.get, self.uut.navigationBar.standardAppearance.backgroundColor);
 }
 
 - (void)testPopViewControllerSetDefaultTopBarBackgroundForPoppingViewController {
@@ -155,7 +155,6 @@
 - (void)testSetTopBarBackgroundColor_ShouldSetBackgroundColor {
 	UIColor* color = UIColor.redColor;
 	[self.uut setTopBarBackgroundColor:color];
-	XCTAssertEqual(self.uut.navigationBar.barTintColor, color);
 	XCTAssertEqual(self.uut.navigationBar.standardAppearance.backgroundColor, color);
 	XCTAssertEqual(self.uut.navigationBar.compactAppearance.backgroundColor, color);
 	XCTAssertEqual(self.uut.navigationBar.scrollEdgeAppearance.backgroundColor, color);
@@ -165,25 +164,12 @@
 	UIColor* transparentColor = UIColor.clearColor;
 	[self.uut setTopBarBackgroundColor:transparentColor];
 
-	XCTAssertEqual(self.uut.navigationBar.backgroundColor, transparentColor);
 	XCTAssertTrue(self.uut.navigationBar.translucent);
-	XCTAssertNotNil(self.uut.navigationBar.shadowImage);
-	XCTAssertNotNil([self.uut.navigationBar backgroundImageForBarMetrics:UIBarMetricsDefault]);
 	XCTAssertNil(self.uut.navigationBar.standardAppearance.backgroundColor);
 	XCTAssertNil(self.uut.navigationBar.compactAppearance.backgroundColor);
 	XCTAssertNil(self.uut.navigationBar.scrollEdgeAppearance.backgroundColor);
 }
 
-- (void)testSetTopBarBackgroundColor_ShouldRemoveTransparentView {
-	UIColor* transparentColor = UIColor.clearColor;
-	UIColor* redColor = UIColor.redColor;
-	
-	[self.uut setTopBarBackgroundColor:transparentColor];
-	XCTAssertNotNil([self.uut.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG]);
-	[self.uut setTopBarBackgroundColor:redColor];
-	XCTAssertNil([self.uut.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG]);
-}
-
 - (void)testSetTopBarBackgroundColor_NilColorShouldResetNavigationBar {
 	UIColor* transparentColor = UIColor.clearColor;
 	UIColor* redColor = UIColor.redColor;

playground/ios/NavigationTests/RNNRootViewControllerTest.m

@@ -60,7 +60,7 @@
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 
-	XCTAssertTrue([self.uut.navigationController.navigationBar.barTintColor isEqual:expectedColor]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.backgroundColor isEqual:expectedColor]);
 }
 
 -(void)testTopBarBackgroundColorWithoutNavigationController{
@@ -177,16 +177,6 @@
 
 }
 
--(void)testTopBarTransparent_BOOL_True {
-	UIColor* transparentColor = [RCTConvert UIColor:@(0x00000000)];
-	self.options.topBar.background.color = [[Color alloc] initWithValue:transparentColor];
-	__unused RNNStackController* nav = [self createNavigationController];
-	[self.uut viewWillAppear:false];
-	UIView* transparentView = [self.uut.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG];
-	XCTAssertTrue(transparentView);
-	XCTAssertTrue([NSStringFromCGRect(transparentView.frame) isEqual: NSStringFromCGRect(CGRectZero)]);
-}
-
 -(void)testTopBarTransparent_BOOL_false {
 	UIColor* inputColor = [RCTConvert UIColor:@(0xFFFF0000)];
 	__unused RNNStackController* nav = [self createNavigationController];