Revert "Apply topBar appearance options on current child navigationIt…

…em (wix#5994)"

This reverts commit 661cfba.

lib/ios/RNNBasePresenter.h

@@ -39,8 +39,6 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (void)componentDidDisappear;
 
-- (UINavigationItem *)currentNavigationItem;
-
 - (UIStatusBarStyle)getStatusBarStyle:(RNNNavigationOptions *)resolvedOptions;
 
 - (UIInterfaceOrientationMask)getOrientation:(RNNNavigationOptions *)options;

lib/ios/RNNBasePresenter.m

@@ -110,10 +110,6 @@ - (UIStatusBarStyle)getStatusBarStyle:(RNNNavigationOptions *)resolvedOptions {
     }
 }
 
-- (UINavigationItem *)currentNavigationItem {
-    return self.boundViewController.getCurrentChild.navigationItem;
-}
-
 - (UIInterfaceOrientationMask)getOrientation:(RNNNavigationOptions *)options {
     return [options withDefault:[self defaultOptions]].layout.supportedOrientations;
 }

lib/ios/RNNComponentViewController.m

@@ -8,9 +8,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];
-    }
 	return self;
 }
 

lib/ios/TopBarAppearancePresenter.m

@@ -1,25 +1,20 @@
 #import "TopBarAppearancePresenter.h"
 #import "RNNFontAttributesCreator.h"
-#import "UIViewController+LayoutProtocol.h"
 
 @interface TopBarAppearancePresenter ()
 
 @end
 
 
-@implementation TopBarAppearancePresenter
-
-- (void)applyOptions:(RNNTopBarOptions *)options {
-    [self setTranslucent:[options.background.translucent getWithDefaultValue:NO]];
-    [self setBackgroundColor:[options.background.color getWithDefaultValue:nil]];
-    [self setTitleAttributes:options.title];
-    [self setLargeTitleAttributes:options.largeTitle];
-    [self showBorder:![options.noBorder getWithDefaultValue:NO]];
-    [self setBackButtonOptions:options.backButton];
+@implementation TopBarAppearancePresenter {
+    UINavigationBarAppearance* _appearance;
 }
 
-- (void)applyOptionsBeforePopping:(RNNTopBarOptions *)options {
-    [self setBackgroundColor:[options.background.color getWithDefaultValue:nil]];
+- (instancetype)initWithNavigationController:(UINavigationController *)boundNavigationController {
+    self = [super initWithNavigationController:boundNavigationController];
+    _appearance = boundNavigationController.navigationBar.standardAppearance ?: [UINavigationBarAppearance new];
+    boundNavigationController.navigationBar.standardAppearance = _appearance;
+    return self;
 }
 
 - (void)setTranslucent:(BOOL)translucent {
@@ -33,23 +28,23 @@ - (void)setTransparent:(BOOL)transparent {
 
 - (void)updateBackgroundAppearance {
     if (self.transparent) {
-        [self.getAppearance configureWithTransparentBackground];
+        [_appearance configureWithTransparentBackground];
     } else if (self.backgroundColor) {
-        [self.getAppearance setBackgroundColor:self.backgroundColor];
+        [_appearance setBackgroundColor:self.backgroundColor];
     } else if (self.translucent) {
-        [self.getAppearance configureWithDefaultBackground];
+        [_appearance configureWithDefaultBackground];
     } else {
-        [self.getAppearance configureWithOpaqueBackground];
+        [_appearance configureWithOpaqueBackground];
     }
 }
 
 - (void)showBorder:(BOOL)showBorder {
     UIColor* shadowColor = showBorder ? [[UINavigationBarAppearance new] shadowColor] : nil;
-    self.getAppearance.shadowColor = shadowColor;
+    _appearance.shadowColor = shadowColor;
 }
 
 - (void)setBackIndicatorImage:(UIImage *)image withColor:(UIColor *)color {
-    [self.getAppearance setBackIndicatorImage:image transitionMaskImage:image];
+    [_appearance setBackIndicatorImage:image transitionMaskImage:image];
 }
 
 - (void)setTitleAttributes:(RNNTitleOptions *)titleOptions {
@@ -58,7 +53,7 @@ - (void)setTitleAttributes:(RNNTitleOptions *)titleOptions {
     NSNumber* fontSize = [titleOptions.fontSize getWithDefaultValue:nil];
     UIColor* fontColor = [titleOptions.color getWithDefaultValue:nil];
 
-    self.getAppearance.titleTextAttributes = [RNNFontAttributesCreator createFromDictionary:self.getAppearance.titleTextAttributes fontFamily:fontFamily fontSize:fontSize defaultFontSize:nil fontWeight:fontWeight color:fontColor defaultColor:nil];
+    _appearance.titleTextAttributes = [RNNFontAttributesCreator createFromDictionary:_appearance.titleTextAttributes fontFamily:fontFamily fontSize:fontSize defaultFontSize:nil fontWeight:fontWeight color:fontColor defaultColor:nil];
 }
 
 - (void)setLargeTitleAttributes:(RNNLargeTitleOptions *)largeTitleOptions {
@@ -67,11 +62,7 @@ - (void)setLargeTitleAttributes:(RNNLargeTitleOptions *)largeTitleOptions {
     NSNumber* fontSize = [largeTitleOptions.fontSize getWithDefaultValue:nil];
     UIColor* fontColor = [largeTitleOptions.color getWithDefaultValue:nil];
 
-    self.getAppearance.largeTitleTextAttributes = [RNNFontAttributesCreator createFromDictionary:self.getAppearance.largeTitleTextAttributes fontFamily:fontFamily fontSize:fontSize defaultFontSize:nil fontWeight:fontWeight color:fontColor defaultColor:nil];
-}
-
-- (UINavigationBarAppearance *)getAppearance {
-    return self.currentNavigationItem.standardAppearance;
+    _appearance.largeTitleTextAttributes = [RNNFontAttributesCreator createFromDictionary:_appearance.largeTitleTextAttributes fontFamily:fontFamily fontSize:fontSize defaultFontSize:nil fontWeight:fontWeight color:fontColor defaultColor:nil];
 }
 
 @end

lib/ios/TopBarPresenter.h

@@ -13,8 +13,6 @@
 
 - (BOOL)transparent;
 
-- (void)setBackButtonOptions:(RNNBackButtonOptions *)backButtonOptions;
-
 @property (nonatomic) BOOL translucent;
 @property (nonatomic, strong) UIColor* backgroundColor;
 

playground/ios/NavigationTests/RNNRootViewControllerTest.m

@@ -60,7 +60,7 @@ - (void)testTopBarBackgroundColor_validColor {
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.backgroundColor isEqual:expectedColor]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.backgroundColor isEqual:expectedColor]);
 }
 
 - (void)testTopBarBackgroundColorWithoutNavigationController {
@@ -127,7 +127,7 @@ - (void)testTopBarTextColor_validColor{
 	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.titleTextAttributes[@"NSColor"] isEqual:expectedColor]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.titleTextAttributes[@"NSColor"] isEqual:expectedColor]);
 }
 
 - (void)testBackgroundColor_validColor {
@@ -149,7 +149,7 @@ - (void)testTopBarTextFontFamily_validFont{
 	self.options.topBar.title.fontFamily = [[Text alloc] initWithValue:inputFont];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:17];
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
 }
 
 - (void)testTopBarHideOnScroll_true {
@@ -165,8 +165,8 @@ - (void)testTopBarTranslucent {
 	self.options.topBar.background.translucent = [[Bool alloc] initWithValue:topBarTranslucentInput];
 	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
-	XCTAssertTrue(CGColorEqualToColor(self.uut.navigationItem.standardAppearance.shadowColor.CGColor, [UINavigationBarAppearance new].shadowColor.CGColor));
-	XCTAssertTrue(CGColorEqualToColor(self.uut.navigationItem.standardAppearance.backgroundColor.CGColor, UIColor.systemBackgroundColor.CGColor));
+	XCTAssertTrue(CGColorEqualToColor(self.uut.navigationController.navigationBar.standardAppearance.shadowColor.CGColor, [UINavigationBarAppearance new].shadowColor.CGColor));
+	XCTAssertTrue(CGColorEqualToColor(self.uut.navigationController.navigationBar.standardAppearance.backgroundColor.CGColor, UIColor.systemBackgroundColor.CGColor));
 }
 
 - (void)testTopBarTransparent {
@@ -218,7 +218,7 @@ - (void)testTopBarLargeTitleFontSize_withoutTextFontFamily_withoutTextColor {
 	UIFont* initialFont = self.uut.navigationController.navigationBar.standardAppearance.largeTitleTextAttributes[@"NSFont"];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithDescriptor:initialFont.fontDescriptor size:topBarTextFontSizeInput.floatValue];
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
 }
 
 - (void)testTopBarLargeTitleFontSize_withoutTextFontFamily_withTextColor {
@@ -231,8 +231,8 @@ - (void)testTopBarLargeTitleFontSize_withoutTextFontFamily_withTextColor {
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithDescriptor:initialFont.fontDescriptor size:topBarTextFontSizeInput.floatValue];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.largeTitleTextAttributes[@"NSColor"] isEqual:expectedColor]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.largeTitleTextAttributes[@"NSColor"] isEqual:expectedColor]);
 }
 
 - (void)testTopBarLargeTitleFontSize_withTextFontFamily_withTextColor {
@@ -247,8 +247,8 @@ - (void)testTopBarLargeTitleFontSize_withTextFontFamily_withTextColor {
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.largeTitleTextAttributes[@"NSColor"] isEqual:expectedColor]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.largeTitleTextAttributes[@"NSColor"] isEqual:expectedColor]);
 }
 
 - (void)testTopBarLargeTitleFontSize_withTextFontFamily_withoutTextColor {
@@ -259,7 +259,7 @@ - (void)testTopBarLargeTitleFontSize_withTextFontFamily_withoutTextColor {
 	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.largeTitleTextAttributes[@"NSFont"] isEqual:expectedFont]);
 }
 
 
@@ -270,7 +270,7 @@ - (void)testTopBarTextFontSize_withoutTextFontFamily_withoutTextColor {
 	UIFont* initialFont = self.uut.navigationController.navigationBar.standardAppearance.titleTextAttributes[@"NSFont"];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithDescriptor:initialFont.fontDescriptor size:topBarTextFontSizeInput.floatValue];
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
 }
 
 - (void)testTopBarTextFontSize_withoutTextFontFamily_withTextColor {
@@ -283,8 +283,8 @@ - (void)testTopBarTextFontSize_withoutTextFontFamily_withTextColor {
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithDescriptor:initialFont.fontDescriptor size:topBarTextFontSizeInput.floatValue];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.titleTextAttributes[@"NSColor"] isEqual:expectedColor]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.titleTextAttributes[@"NSColor"] isEqual:expectedColor]);
 }
 
 - (void)testTopBarTextFontSize_withTextFontFamily_withTextColor {
@@ -298,8 +298,8 @@ - (void)testTopBarTextFontSize_withTextFontFamily_withTextColor {
 	[self.uut viewWillAppear:false];
 	UIColor* expectedColor = [UIColor colorWithRed:1 green:0 blue:0 alpha:1];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.titleTextAttributes[@"NSColor"] isEqual:expectedColor]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.titleTextAttributes[@"NSColor"] isEqual:expectedColor]);
 }
 
 - (void)testTopBarTextFontSize_withTextFontFamily_withoutTextColor {
@@ -310,7 +310,7 @@ - (void)testTopBarTextFontSize_withTextFontFamily_withoutTextColor {
 	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
 	UIFont* expectedFont = [UIFont fontWithName:inputFont size:15];
-	XCTAssertTrue([self.uut.navigationItem.standardAppearance.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
+	XCTAssertTrue([self.uut.navigationController.navigationBar.standardAppearance.titleTextAttributes[@"NSFont"] isEqual:expectedFont]);
 }
 
 // TODO: Currently not passing
@@ -468,7 +468,7 @@ - (void)testTopBarNoBorderOn {
 	self.options.topBar.noBorder = [[Bool alloc] initWithValue:topBarNoBorderInput];
 	__unused RNNStackController* nav = [self createNavigationController];
 	[self.uut viewWillAppear:false];
-	XCTAssertNil(self.uut.navigationItem.standardAppearance.shadowColor);
+	XCTAssertNil(self.uut.navigationController.navigationBar.standardAppearance.shadowColor);
 }
 
 - (void)testTopBarNoBorderOff {

playground/ios/NavigationTests/RNNStackControllerTest.m

@@ -137,8 +137,7 @@ - (void)testPopViewControllerSetTopBarBackgroundForPoppingViewController {
 	[_vc1 overrideOptions:_options];
 
 	[self.uut popViewControllerAnimated:NO];
-	[_vc1 viewWillAppear:YES];
-	XCTAssertEqual(_vc1.resolveOptions.topBar.background.color.get, self.uut.childViewControllers.lastObject.navigationItem.standardAppearance.backgroundColor);
+	XCTAssertEqual(_vc1.resolveOptions.topBar.background.color.get, self.uut.navigationBar.standardAppearance.backgroundColor);
 }
 
 - (void)testPopViewControllerSetDefaultTopBarBackgroundForPoppingViewController {

playground/ios/NavigationTests/RNNStackPresenterTest.m

@@ -1,10 +1,9 @@
 #import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
-#import <ReactNativeNavigation/RNNStackPresenter.h>
+#import "RNNStackPresenter.h"
 #import "UINavigationController+RNNOptions.h"
 #import "RNNStackController.h"
 #import "UIImage+Utils.h"
-#import "RNNComponentViewController+Utils.h"
 
 @interface RNNStackPresenterTest : XCTestCase
 
@@ -19,7 +18,7 @@ @implementation RNNStackPresenterTest
 - (void)setUp {
 	[super setUp];
 	self.uut = [[RNNStackPresenter alloc] init];
-	RNNStackController* stackController = [[RNNStackController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:self.uut eventEmitter:nil childViewControllers:@[[RNNComponentViewController createWithComponentId:@"component1"], [RNNComponentViewController createWithComponentId:@"component2"]]];
+	RNNStackController* stackController = [[RNNStackController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil presenter:self.uut eventEmitter:nil childViewControllers:@[[UIViewController new], [UIViewController new]]];
 	self.boundViewController = [OCMockObject partialMockForObject:stackController];
     [self.uut bindViewController:self.boundViewController];
 	self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
@@ -42,7 +41,7 @@ - (void)testApplyOptionsBeforePoppingShouldSetTopBarBackgroundForPoppingViewCont
 	_options.topBar.background.color = [[Color alloc] initWithValue:[UIColor redColor]];
 
 	[self.uut applyOptionsBeforePopping:self.options];
-	XCTAssertTrue([_boundViewController.childViewControllers.lastObject.navigationItem.standardAppearance.backgroundColor isEqual:[UIColor redColor]]);
+	XCTAssertTrue([_boundViewController.navigationBar.standardAppearance.backgroundColor isEqual:[UIColor redColor]]);
 }
 
 - (void)testApplyOptionsShouldSetLargeTitleVisible {
@@ -99,7 +98,7 @@ - (void)testSetBackButtonIcon_withColor_shouldSetIcon {
 	self.options.topBar.backButton.icon = icon;
 	[self.uut applyOptions:self.options];
 	XCTAssertEqual(self.boundViewController.viewControllers.firstObject.navigationItem.backBarButtonItem.tintColor, UIColor.redColor);
-	XCTAssertTrue([self.boundViewController.viewControllers.lastObject.navigationItem.standardAppearance.backIndicatorImage isEqual:image]);
+	XCTAssertTrue([self.boundViewController.navigationBar.standardAppearance.backIndicatorImage isEqual:image]);
 }
 
 - (void)testBackgroundColor_validColor {

playground/ios/NavigationTests/TopBarAppearancePresenterTest.m

@@ -4,7 +4,6 @@
 #import "UIViewController+RNNOptions.h"
 #import <ReactNativeNavigation/RNNStackController.h>
 #import <ReactNativeNavigation/RNNComponentViewController.h>
-#import "RNNComponentViewController+Utils.h"
 
 @interface TopBarAppearancePresenterTest : XCTestCase
 
@@ -18,7 +17,7 @@ @implementation TopBarAppearancePresenterTest {
 
 - (void)setUp {
     [super setUp];
-	_componentViewController = [RNNComponentViewController createWithComponentId:@"componentId"];
+	_componentViewController = [[RNNComponentViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:nil];
 	_stack = [[RNNStackController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:_uut eventEmitter:nil childViewControllers:@[_componentViewController]];
 	_uut = [[TopBarAppearancePresenter alloc] initWithNavigationController:_stack];
 }
@@ -31,8 +30,8 @@ - (void)testMergeOptions_shouldMergeWithDefault {
 	mergeOptions.topBar.title.fontSize = [Number withValue:@(21)];
 	RNNNavigationOptions* withDefault = [mergeOptions withDefault:defaultOptions];
 	[_uut mergeOptions:mergeOptions.topBar withDefault:withDefault.topBar];
-	XCTAssertEqual(_stack.childViewControllers.lastObject.navigationItem.standardAppearance.titleTextAttributes[NSForegroundColorAttributeName], UIColor.redColor);
-	UIFont* font = _stack.childViewControllers.lastObject.navigationItem.standardAppearance.titleTextAttributes[NSFontAttributeName];
+	XCTAssertEqual(_stack.navigationBar.standardAppearance.titleTextAttributes[NSForegroundColorAttributeName], UIColor.redColor);
+	UIFont* font = _stack.navigationBar.standardAppearance.titleTextAttributes[NSFontAttributeName];
 	XCTAssertEqual(font.pointSize, 21);
 }