Fix topBar.title.color on popping (#4234)

lib/ios/RNNNavigationController.m

@@ -78,7 +78,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 		UIViewController *controller = self.viewControllers[self.viewControllers.count - 2];
 		if ([controller isKindOfClass:[RNNRootViewController class]]) {
 			RNNRootViewController *rnnController = (RNNRootViewController *)controller;
-			[self setTopBarBackgroundColor:[rnnController.resolveOptions.topBar.background.color getWithDefaultValue:nil]];
+			[self.presenter applyOptionsBeforePopping:rnnController.resolveOptions];
 		}
 	}
 	

lib/ios/RNNNavigationControllerPresenter.h

@@ -2,4 +2,6 @@
 
 @interface RNNNavigationControllerPresenter : RNNBasePresenter
 
+- (void)applyOptionsBeforePopping:(RNNNavigationOptions *)options;
+
 @end

lib/ios/RNNNavigationControllerPresenter.m

@@ -35,6 +35,12 @@
 	[navigationController rnn_setBackButtonIcon:[options.topBar.backButton.icon getWithDefaultValue:nil] withColor:[options.topBar.backButton.color getWithDefaultValue:nil] title:[options.topBar.backButton.showTitle getWithDefaultValue:YES] ? [options.topBar.backButton.title getWithDefaultValue:nil] : @""];
 }
 
+- (void)applyOptionsBeforePopping:(RNNNavigationOptions *)options {
+	RNNNavigationController* navigationController = self.bindedViewController;
+	[navigationController setTopBarBackgroundColor:[options.topBar.background.color getWithDefaultValue:nil]];
+	[navigationController rnn_setNavigationBarFontFamily:[options.topBar.title.fontFamily getWithDefaultValue:nil] fontSize:[options.topBar.title.fontSize getWithDefaultValue:@(17)] color:[options.topBar.title.color getWithDefaultValue:[UIColor blackColor]]];
+}
+
 - (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavigationOptions *)currentOptions defaultOptions:(RNNNavigationOptions *)defaultOptions {
 	[super mergeOptions:newOptions currentOptions:currentOptions defaultOptions:defaultOptions];
 	

lib/ios/ReactNativeNavigationTests/RNNNavigationControllerPresenterTest.m

@@ -92,6 +92,14 @@
 	[_bindedViewController verify];
 }
 
+- (void)testApplyOptionsBefoePoppingShouldSetTopBarBackgroundForPoppingViewController {
+	_options.topBar.background.color = [[Color alloc] initWithValue:[UIColor redColor]];
+	
+	[[_bindedViewController expect] setTopBarBackgroundColor:_options.topBar.background.color.get];
+	[self.uut applyOptionsBeforePopping:self.options];
+	[_bindedViewController verify];
+}
+
 
 
 @end

lib/ios/ReactNativeNavigationTests/RNNNavigationControllerTest.m

@@ -19,11 +19,11 @@
 - (void)setUp {
     [super setUp];
 	
-	_vc1 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNViewControllerPresenter alloc] init] options:[[RNNNavigationOptions alloc] initEmptyOptions]  defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
+	_vc1 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[OCMockObject partialMockForObject:[[RNNViewControllerPresenter alloc] init]] options:[[RNNNavigationOptions alloc] initEmptyOptions]  defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
 	_vc2 = [[RNNRootViewController alloc] initWithLayoutInfo:nil rootViewCreator:nil eventEmitter:nil presenter:[[RNNViewControllerPresenter alloc] init] options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions]];
 	_vc3 = [UIViewController new];
-	_options = [[RNNNavigationOptions alloc] initEmptyOptions];
-	self.uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[_vc1, _vc2] options:[[RNNNavigationOptions alloc] initWithDict:@{}] defaultOptions:nil presenter:[[RNNViewControllerPresenter alloc] init]];
+	_options = [OCMockObject partialMockForObject:[[RNNNavigationOptions alloc] initEmptyOptions]];
+	self.uut = [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[_vc1, _vc2] options:_options defaultOptions:nil presenter:[OCMockObject partialMockForObject:[[RNNNavigationControllerPresenter alloc] init]]];
 }
 
 - (void)testInitWithLayoutInfo_shouldBindPresenter {
@@ -115,27 +115,38 @@
 }
 
 - (void)testPopViewControllerSetTopBarBackgroundForPoppingViewController {
-	RNNNavigationController* uut = [RNNNavigationController new];
-	[uut setViewControllers:@[_vc1, _vc2]];
-	
 	_options.topBar.background.color = [[Color alloc] initWithValue:[UIColor redColor]];
 	[_vc1 overrideOptions:_options];
 	
-	[uut popViewControllerAnimated:NO];
-	XCTAssertEqual(_vc1.resolveOptions.topBar.background.color.get, uut.navigationBar.barTintColor);
+	[self.uut popViewControllerAnimated:NO];
+	XCTAssertEqual(_vc1.resolveOptions.topBar.background.color.get, self.uut.navigationBar.barTintColor);
 }
 
 - (void)testPopViewControllerSetDefaultTopBarBackgroundForPoppingViewController {
-	RNNNavigationController* uut = [RNNNavigationController new];
-	[uut setViewControllers:@[_vc1, _vc2]];
-
 	_options.topBar.background.color = [[Color alloc] initWithValue:[UIColor redColor]];
 	[_vc1 setDefaultOptions:_options];
 
+	[self.uut popViewControllerAnimated:NO];
+	XCTAssertEqual(_vc1.resolveOptions.topBar.background.color.get, self.uut.navigationBar.barTintColor);
+}
+
+- (void)testPopViewControllerShouldInvokeApplyOptionsBeforePoppingForDestinationViewController {
+	RNNNavigationController* uut = [RNNNavigationController new];
+	[uut setViewControllers:@[_vc1, _vc2]];
+	
+	[[(id)uut.presenter expect] applyOptionsBeforePopping:[OCMArg any]];
+	
 	[uut popViewControllerAnimated:NO];
-	XCTAssertEqual(_vc1.resolveOptions.topBar.background.color.get, uut.navigationBar.barTintColor);
+	
+	[(id)uut.presenter verify];
 }
 
+- (void)testOverrideOptionsShouldOverrideOptionsState {
+	RNNNavigationOptions* overrideOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
+	[(RNNNavigationOptions*)[(id)self.uut.options expect] overrideOptions:overrideOptions];
+	[self.uut overrideOptions:overrideOptions];
+	[(id)self.uut.options verify];
+}
 
 - (RNNNavigationController *)createNavigationControllerWithOptions:(RNNNavigationOptions *)options {
 	return [[RNNNavigationController alloc] initWithLayoutInfo:nil childViewControllers:@[_vc1] options:options defaultOptions:nil presenter:[[RNNNavigationControllerPresenter alloc] init]];