Fix merging buttons second time doesn't work (#4243)

lib/ios/RNNLeafProtocol.h

@@ -1,3 +1,4 @@
+#import "RNNRootViewCreator.h"
 
 typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
@@ -9,4 +10,6 @@ typedef void (^RNNReactViewReadyCompletionBlock)(void);
 
 - (BOOL)isCustomTransitioned;
 
+- (id<RNNRootViewCreator>)creator;
+
 @end

lib/ios/RNNNavigationButtons.h

@@ -1,11 +1,11 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
-#import "RNNRootViewController.h"
 #import "RNNButtonOptions.h"
+#import "RNNRootViewCreator.h"
 
 @interface RNNNavigationButtons : NSObject
 
--(instancetype)initWithViewController:(RNNRootViewController*)viewController;
+-(instancetype)initWithViewController:(UIViewController*)viewController rootViewCreator:(id<RNNRootViewCreator>)creator;
 
 -(void)applyLeftButtons:(NSArray*)leftButtons rightButtons:(NSArray*)rightButtons defaultLeftButtonStyle:(RNNButtonOptions *)defaultLeftButtonStyle defaultRightButtonStyle:(RNNButtonOptions *)defaultRightButtonStyle;
 

lib/ios/RNNNavigationButtons.m

@@ -3,21 +3,23 @@
 #import <React/RCTConvert.h>
 #import "RCTHelpers.h"
 #import "UIImage+tint.h"
+#import "RNNRootViewController.h"
 
 @interface RNNNavigationButtons()
 
-@property (weak, nonatomic) RNNRootViewController* viewController;
+@property (weak, nonatomic) UIViewController* viewController;
 @property (strong, nonatomic) RNNButtonOptions* defaultLeftButtonStyle;
 @property (strong, nonatomic) RNNButtonOptions* defaultRightButtonStyle;
-
+@property (nonatomic) id<RNNRootViewCreator> creator;
 @end
 
 @implementation RNNNavigationButtons
 
--(instancetype)initWithViewController:(RNNRootViewController*)viewController {
+-(instancetype)initWithViewController:(UIViewController*)viewController rootViewCreator:(id<RNNRootViewCreator>)creator {
 	self = [super init];
 	
 	self.viewController = viewController;
+	self.creator = creator;
 	
 	return self;
 }
@@ -78,7 +80,7 @@
 	
 	RNNUIBarButtonItem *barButtonItem;
 	if (component) {
-		RCTRootView *view = (RCTRootView*)[self.viewController.creator createCustomReactView:component[@"name"] rootViewId:component[@"componentId"]];
+		RCTRootView *view = (RCTRootView*)[self.creator createCustomReactView:component[@"name"] rootViewId:component[@"componentId"]];
 		barButtonItem = [[RNNUIBarButtonItem alloc] init:buttonId withCustomView:view];
 	} else if (iconImage) {
 		barButtonItem = [[RNNUIBarButtonItem alloc] init:buttonId withIcon:iconImage];

lib/ios/RNNRootViewController.m

@@ -37,7 +37,7 @@
 	
 	self.eventEmitter = eventEmitter;
 	self.presenter = presenter;
-	[self.presenter bindViewController:self];
+	[self.presenter bindViewController:self viewCreator:self.creator];
 	self.options = options;
 	self.defaultOptions = defaultOptions;
 	

lib/ios/RNNTopBarOptions.m

@@ -61,62 +61,5 @@
 	return self;
 }
 
-- (void)applyOn:(UIViewController*)viewController {
-	if (self.rightButtons || self.leftButtons) {
-		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
-		[_navigationButtons applyLeftButtons:self.leftButtons rightButtons:self.rightButtons defaultLeftButtonStyle:self.leftButtonStyle defaultRightButtonStyle:self.rightButtonStyle];
-	}
-	
-	self.rightButtons = nil;
-	self.leftButtons = nil;
-}
-
-//- (void)setRightButtonColor:(NSNumber *)rightButtonColor {
-//	_rightButtonColor = rightButtonColor;
-//	_rightButtonStyle.color = rightButtonColor;
-//}
-//
-//- (void)setRightButtonDisabledColor:(NSNumber *)rightButtonDisabledColor {
-//	_rightButtonDisabledColor = rightButtonDisabledColor;
-//	_rightButtonStyle.disabledColor = rightButtonDisabledColor;
-//}
-//
-//- (void)setLeftButtonColor:(NSNumber *)leftButtonColor {
-//	_leftButtonColor = leftButtonColor;
-//	_leftButtonStyle.color = leftButtonColor;
-//}
-//
-//- (void)setLeftButtonDisabledColor:(NSNumber *)leftButtonDisabledColor {
-//	_leftButtonDisabledColor = leftButtonDisabledColor;
-//	_leftButtonStyle.disabledColor = leftButtonDisabledColor;
-//}
-
-//- (void)setRightButtons:(id)rightButtons {
-//	if ([rightButtons isKindOfClass:[NSArray class]]) {
-//		_rightButtons = rightButtons;
-//	} else if ([rightButtons isKindOfClass:[NSDictionary class]]) {
-//		if (rightButtons[@"id"]) {
-//			_rightButtons = @[rightButtons];
-//		} else {
-//			[_rightButtonStyle mergeWith:rightButtons];
-//		}
-//	} else {
-//		_rightButtons = rightButtons;
-//	}
-//}
-//
-//- (void)setLeftButtons:(id)leftButtons {
-//	if ([leftButtons isKindOfClass:[NSArray class]]) {
-//		_leftButtons = leftButtons;
-//	} else if ([leftButtons isKindOfClass:[NSDictionary class]]) {
-//		if (leftButtons[@"id"]) {
-//			_leftButtons = @[leftButtons];
-//		} else {
-//			[_leftButtonStyle mergeWith:leftButtons];
-//		}
-//	} else {
-//		_leftButtons = leftButtons;
-//	}
-//}
 
 @end

lib/ios/RNNViewControllerPresenter.h

@@ -1,5 +1,10 @@
 #import "RNNBasePresenter.h"
+#import "RNNNavigationButtons.h"
 
 @interface RNNViewControllerPresenter : RNNBasePresenter
 
+@property (nonatomic, strong) RNNNavigationButtons* navigationButtons;
+
+- (void)bindViewController:(UIViewController *)bindedViewController viewCreator:(id<RNNRootViewCreator>)creator;
+
 @end

lib/ios/RNNViewControllerPresenter.m

@@ -1,16 +1,15 @@
 #import "RNNViewControllerPresenter.h"
 #import "UIViewController+RNNOptions.h"
 #import "UITabBarController+RNNOptions.h"
-#import "RNNNavigationButtons.h"
 #import "RCTConvert+Modal.h"
 #import "RNNReactView.h"
 
-@interface RNNViewControllerPresenter()
-@property (nonatomic, strong) RNNNavigationButtons* navigationButtons;
-@end
-
 @implementation RNNViewControllerPresenter
 
+- (void)bindViewController:(UIViewController *)bindedViewController viewCreator:(id<RNNRootViewCreator>)creator {
+	self.bindedViewController = bindedViewController;
+	_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:self.bindedViewController rootViewCreator:creator];
+}
 
 - (void)applyOptions:(RNNNavigationOptions *)options {
 	[super applyOptions:options];
@@ -33,8 +32,7 @@
 		[viewController rnn_setSearchBarWithPlaceholder:[options.topBar.searchBarPlaceholder getWithDefaultValue:@""]];
 	}
 	
-	if ((options.topBar.leftButtons || options.topBar.rightButtons) && !_navigationButtons) {
-		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
+	if ((options.topBar.leftButtons || options.topBar.rightButtons)) {
 		[_navigationButtons applyLeftButtons:options.topBar.leftButtons rightButtons:options.topBar.rightButtons defaultLeftButtonStyle:options.topBar.leftButtonStyle defaultRightButtonStyle:options.topBar.rightButtonStyle];
 	}
 }
@@ -112,7 +110,6 @@
 	
 	if (newOptions.topBar.leftButtons || newOptions.topBar.rightButtons) {
 		RNNNavigationOptions* buttonsResolvedOptions = [(RNNNavigationOptions *)[currentOptions overrideOptions:newOptions] withDefault:defaultOptions];
-		_navigationButtons = [[RNNNavigationButtons alloc] initWithViewController:(RNNRootViewController*)viewController];
 		[_navigationButtons applyLeftButtons:newOptions.topBar.leftButtons rightButtons:newOptions.topBar.rightButtons defaultLeftButtonStyle:buttonsResolvedOptions.topBar.leftButtonStyle defaultRightButtonStyle:buttonsResolvedOptions.topBar.rightButtonStyle];
 	}
 	

lib/ios/ReactNativeNavigationTests/RNNViewControllerPresenterTest.m

@@ -3,6 +3,7 @@
 #import "RNNViewControllerPresenter.h"
 #import "UIViewController+RNNOptions.h"
 #import "RNNReactView.h"
+#import "RNNRootViewController.h"
 
 @interface RNNViewControllerPresenterTest : XCTestCase
 
@@ -17,7 +18,7 @@
 - (void)setUp {
     [super setUp];
 	self.uut = [[RNNViewControllerPresenter alloc] init];
-	self.bindedViewController = [OCMockObject partialMockForObject:[UIViewController new]];
+	self.bindedViewController = [OCMockObject partialMockForObject:[RNNRootViewController new]];
 	[self.uut bindViewController:self.bindedViewController];
 	self.options = [[RNNNavigationOptions alloc] initEmptyOptions];
 }
@@ -67,6 +68,12 @@
     [(id)self.bindedViewController verify];
 }
 
+- (void)testBindViewControllerShouldCreateNavigationButtonsCreator {
+	RNNViewControllerPresenter* presenter = [[RNNViewControllerPresenter alloc] init];
+	[presenter bindViewController:self.bindedViewController viewCreator:nil];
+	XCTAssertNotNil(presenter.navigationButtons);
+}
+
 - (void)testApplyOptionsOnInit_shouldSetModalPresentetionStyleWithDefault {
 	[[(id)self.bindedViewController expect] rnn_setModalPresentationStyle:UIModalPresentationFullScreen];
 	[self.uut applyOptionsOnInit:self.options];
@@ -125,4 +132,5 @@
     [(id)self.bindedViewController verify];
 }
 
+
 @end