Fix topBar options merging with default (#5918)

lib/ios/RNNStackPresenter.m

@@ -7,9 +7,9 @@
 #import "InteractivePopGestureDelegate.h"
 
 @interface RNNStackPresenter() {
-	RNNReactComponentRegistry* _componentRegistry;
-	UIView* _customTopBarBackground;
-	RNNReactView* _topBarBackgroundReactView;
+    RNNReactComponentRegistry* _componentRegistry;
+    UIView* _customTopBarBackground;
+    RNNReactView* _topBarBackgroundReactView;
     TopBarPresenter* _topBarPresenter;
     InteractivePopGestureDelegate *_interactivePopGestureDelegate;
 }
@@ -20,10 +20,10 @@
 @implementation RNNStackPresenter
 
 - (instancetype)initWithComponentRegistry:(RNNReactComponentRegistry *)componentRegistry defaultOptions:(RNNNavigationOptions *)defaultOptions {
-	self = [super initWithDefaultOptions:defaultOptions];
-	_componentRegistry = componentRegistry;
+    self = [super initWithDefaultOptions:defaultOptions];
+    _componentRegistry = componentRegistry;
     _interactivePopGestureDelegate = [InteractivePopGestureDelegate new];
-	return self;
+    return self;
 }
 
 - (void)bindViewController:(UINavigationController *)boundViewController {
@@ -46,149 +46,149 @@
 }
 
 - (void)applyOptions:(RNNNavigationOptions *)options {
-	[super applyOptions:options];
-	RNNStackController* stack = self.stackController;
-	RNNNavigationOptions * withDefault = [options withDefault:[self defaultOptions]];
-	
+    [super applyOptions:options];
+    RNNStackController* stack = self.stackController;
+    RNNNavigationOptions * withDefault = [options withDefault:[self defaultOptions]];
+    
     [_interactivePopGestureDelegate setEnabled:[withDefault.popGesture getWithDefaultValue:YES]];
-	stack.interactivePopGestureRecognizer.delegate = _interactivePopGestureDelegate;
+    stack.interactivePopGestureRecognizer.delegate = _interactivePopGestureDelegate;
 
     [stack setBarStyle:[RCTConvert UIBarStyle:[withDefault.topBar.barStyle getWithDefaultValue:@"default"]]];
-	[stack setRootBackgroundImage:[withDefault.rootBackgroundImage getWithDefaultValue:nil]];
-	[stack setNavigationBarTestId:[withDefault.topBar.testID getWithDefaultValue:nil]];
-	[stack setNavigationBarVisible:[withDefault.topBar.visible getWithDefaultValue:YES] animated:[withDefault.topBar.animate getWithDefaultValue:YES]];
-	[stack hideBarsOnScroll:[withDefault.topBar.hideOnScroll getWithDefaultValue:NO]];
+    [stack setRootBackgroundImage:[withDefault.rootBackgroundImage getWithDefaultValue:nil]];
+    [stack setNavigationBarTestId:[withDefault.topBar.testID getWithDefaultValue:nil]];
+    [stack setNavigationBarVisible:[withDefault.topBar.visible getWithDefaultValue:YES] animated:[withDefault.topBar.animate getWithDefaultValue:YES]];
+    [stack hideBarsOnScroll:[withDefault.topBar.hideOnScroll getWithDefaultValue:NO]];
     
     [_topBarPresenter applyOptions:withDefault.topBar];
     
     [stack setNavigationBarBlur:[withDefault.topBar.background.blur getWithDefaultValue:NO]];
     [stack setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
-	[stack setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds getWithDefaultValue:NO]];
-	[stack setBackButtonColor:[withDefault.topBar.backButton.color getWithDefaultValue:nil]];
+    [stack setNavigationBarClipsToBounds:[withDefault.topBar.background.clipToBounds getWithDefaultValue:NO]];
+    [stack setBackButtonColor:[withDefault.topBar.backButton.color getWithDefaultValue:nil]];
 }
 
 - (void)applyOptionsOnViewDidLayoutSubviews:(RNNNavigationOptions *)options {
-	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-	if (withDefault.topBar.background.component.name.hasValue) {
-		[self presentBackgroundComponent];
-	}
+    RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
+    if (withDefault.topBar.background.component.name.hasValue) {
+        [self presentBackgroundComponent];
+    }
 }
 
 - (void)applyOptionsBeforePopping:(RNNNavigationOptions *)options {
-	RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-	RNNStackController* navigationController = self.stackController;
-	[navigationController setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
+    RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
+    RNNStackController* navigationController = self.stackController;
+    [navigationController setNavigationBarLargeTitleVisible:[withDefault.topBar.largeTitle.visible getWithDefaultValue:NO]];
     [_topBarPresenter applyOptionsBeforePopping:options.topBar];
 }
 
 - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigationOptions *)resolvedOptions {
     [super mergeOptions:options resolvedOptions:resolvedOptions];
-	RNNStackController* stack = self.stackController;
-    
-	if (options.popGesture.hasValue) {
-		[_interactivePopGestureDelegate setEnabled:options.popGesture.get];
-	}
-	
-	if (options.rootBackgroundImage.hasValue) {
-		[stack setRootBackgroundImage:options.rootBackgroundImage.get];
-	}
-	
-	if (options.topBar.testID.hasValue) {
-		[stack setNavigationBarTestId:options.topBar.testID.get];
-	}
-	
-	if (options.topBar.visible.hasValue) {
-		[stack setNavigationBarVisible:options.topBar.visible.get animated:[options.topBar.animate getWithDefaultValue:YES]];
-	}
-	
-	if (options.topBar.hideOnScroll.hasValue) {
-		[stack hideBarsOnScroll:[options.topBar.hideOnScroll get]];
-	}
-	
-	if (options.topBar.barStyle.hasValue) {
-		[stack setBarStyle:[RCTConvert UIBarStyle:options.topBar.barStyle.get]];
-	}
-	
-	if (options.topBar.background.clipToBounds.hasValue) {
-		[stack setNavigationBarClipsToBounds:[options.topBar.background.clipToBounds get]];
-	}
-	
-	if (options.topBar.background.blur.hasValue) {
-		[stack setNavigationBarBlur:[options.topBar.background.blur get]];
-	}
-	
-	if (options.topBar.largeTitle.visible.hasValue) {
-		[stack setNavigationBarLargeTitleVisible:options.topBar.largeTitle.visible.get];
-	}
-	
-	if (options.topBar.backButton.color.hasValue) {
-		[stack setBackButtonColor:options.topBar.backButton.color.get];
-	}
-
-	if (options.topBar.background.component.name.hasValue) {
-		[self setCustomNavigationComponentBackground:options perform:nil];
-	}
+    RNNStackController* stack = self.stackController;
+    
+    if (options.popGesture.hasValue) {
+        [_interactivePopGestureDelegate setEnabled:options.popGesture.get];
+    }
+    
+    if (options.rootBackgroundImage.hasValue) {
+        [stack setRootBackgroundImage:options.rootBackgroundImage.get];
+    }
+    
+    if (options.topBar.testID.hasValue) {
+        [stack setNavigationBarTestId:options.topBar.testID.get];
+    }
+    
+    if (options.topBar.visible.hasValue) {
+        [stack setNavigationBarVisible:options.topBar.visible.get animated:[options.topBar.animate getWithDefaultValue:YES]];
+    }
+    
+    if (options.topBar.hideOnScroll.hasValue) {
+        [stack hideBarsOnScroll:[options.topBar.hideOnScroll get]];
+    }
+    
+    if (options.topBar.barStyle.hasValue) {
+        [stack setBarStyle:[RCTConvert UIBarStyle:options.topBar.barStyle.get]];
+    }
+    
+    if (options.topBar.background.clipToBounds.hasValue) {
+        [stack setNavigationBarClipsToBounds:[options.topBar.background.clipToBounds get]];
+    }
+    
+    if (options.topBar.background.blur.hasValue) {
+        [stack setNavigationBarBlur:[options.topBar.background.blur get]];
+    }
+    
+    if (options.topBar.largeTitle.visible.hasValue) {
+        [stack setNavigationBarLargeTitleVisible:options.topBar.largeTitle.visible.get];
+    }
+    
+    if (options.topBar.backButton.color.hasValue) {
+        [stack setBackButtonColor:options.topBar.backButton.color.get];
+    }
+
+    if (options.topBar.background.component.name.hasValue) {
+        [self setCustomNavigationComponentBackground:options perform:nil];
+    }
     
     RNNNavigationOptions * withDefault = (RNNNavigationOptions *) [[options mergeInOptions:resolvedOptions] withDefault:[self defaultOptions]];
-    [_topBarPresenter mergeOptions:options.topBar defaultOptions:withDefault.topBar];
+    [_topBarPresenter mergeOptions:options.topBar withDefault:withDefault.topBar];
 }
 
 - (void)renderComponents:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock {
-	dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
-		dispatch_group_t group = dispatch_group_create();
-		
-		dispatch_group_enter(group);
-		dispatch_async(dispatch_get_main_queue(), ^{
-			[self setCustomNavigationComponentBackground:options perform:^{
-				dispatch_group_leave(group);
-			}];
-		});
-		
-		dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
-		
-		dispatch_async(dispatch_get_main_queue(), ^{
-			if (readyBlock) {
-				readyBlock();
-			}
-		});
-	});
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+        dispatch_group_t group = dispatch_group_create();
+        
+        dispatch_group_enter(group);
+        dispatch_async(dispatch_get_main_queue(), ^{
+            [self setCustomNavigationComponentBackground:options perform:^{
+                dispatch_group_leave(group);
+            }];
+        });
+        
+        dispatch_group_wait(group, DISPATCH_TIME_FOREVER);
+        
+        dispatch_async(dispatch_get_main_queue(), ^{
+            if (readyBlock) {
+                readyBlock();
+            }
+        });
+    });
 }
 
 - (void)setCustomNavigationComponentBackground:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock {
     RNNNavigationOptions *withDefault = [options withDefault:[self defaultOptions]];
-	RNNStackController* stack = self.stackController;
-	if (![withDefault.topBar.background.component.waitForRender getWithDefaultValue:NO] && readyBlock) {
-		readyBlock();
-		readyBlock = nil;
-	}
-    
-	if (withDefault.topBar.background.component.name.hasValue) {
-		NSString* currentChildComponentId = [stack getCurrentChild].layoutInfo.componentId;
-		_topBarBackgroundReactView = [_componentRegistry createComponentIfNotExists:withDefault.topBar.background.component parentComponentId:currentChildComponentId componentType:RNNComponentTypeTopBarBackground reactViewReadyBlock:readyBlock];
-		
-	} else {
+    RNNStackController* stack = self.stackController;
+    if (![withDefault.topBar.background.component.waitForRender getWithDefaultValue:NO] && readyBlock) {
+        readyBlock();
+        readyBlock = nil;
+    }
+    
+    if (withDefault.topBar.background.component.name.hasValue) {
+        NSString* currentChildComponentId = [stack getCurrentChild].layoutInfo.componentId;
+        _topBarBackgroundReactView = [_componentRegistry createComponentIfNotExists:withDefault.topBar.background.component parentComponentId:currentChildComponentId componentType:RNNComponentTypeTopBarBackground reactViewReadyBlock:readyBlock];
+        
+    } else {
         [_topBarBackgroundReactView componentDidDisappear];
-		[_customTopBarBackground removeFromSuperview];
-		_customTopBarBackground = nil;
-		if (readyBlock) {
-			readyBlock();
-		}
-	}
+        [_customTopBarBackground removeFromSuperview];
+        _customTopBarBackground = nil;
+        if (readyBlock) {
+            readyBlock();
+        }
+    }
 }
 
 - (void)presentBackgroundComponent {
-	RNNStackController* stack = self.stackController;
-	if (_customTopBarBackground) {
-		[_customTopBarBackground removeFromSuperview];
-	}
-	_customTopBarBackground = [[RNNCustomTitleView alloc] initWithFrame:stack.navigationBar.bounds subView:_topBarBackgroundReactView alignment:@"fill"];
-	
-	[stack.navigationBar insertSubview:_customTopBarBackground atIndex:1];
+    RNNStackController* stack = self.stackController;
+    if (_customTopBarBackground) {
+        [_customTopBarBackground removeFromSuperview];
+    }
+    _customTopBarBackground = [[RNNCustomTitleView alloc] initWithFrame:stack.navigationBar.bounds subView:_topBarBackgroundReactView alignment:@"fill"];
+    
+    [stack.navigationBar insertSubview:_customTopBarBackground atIndex:1];
     [_topBarBackgroundReactView componentDidAppear];
 }
 
 - (void)dealloc {
-	[_componentRegistry removeComponent:self.boundComponentId];
+    [_componentRegistry removeComponent:self.boundComponentId];
 }
 
 @end

lib/ios/RNNTitleOptions.h

@@ -9,10 +9,9 @@
 @property (nonatomic, strong) Color* color;
 @property (nonatomic, strong) Text* fontFamily;
 @property (nonatomic, strong) Text* fontWeight;
-
 @property (nonatomic, strong) RNNComponentOptions* component;
 @property (nonatomic, strong) Text* componentAlignment;
 
-@property (nonatomic, strong) NSDictionary* fontAttributes;
+- (BOOL)hasValue;
 
 @end

lib/ios/RNNTitleOptions.m

@@ -3,17 +3,21 @@
 @implementation RNNTitleOptions
 
 - (instancetype)initWithDict:(NSDictionary *)dict {
-	self = [super init];
-	
-	self.text = [TextParser parse:dict key:@"text"];
-	self.fontFamily = [TextParser parse:dict key:@"fontFamily"];
-	self.fontSize = [NumberParser parse:dict key:@"fontSize"];
-	self.fontWeight = [TextParser parse:dict key:@"fontWeight"];
-	self.color = [ColorParser parse:dict key:@"color"];
-	
-	self.component = [[RNNComponentOptions alloc] initWithDict:dict[@"component"]];
-	
-	return self;
+    self = [super init];
+    
+    self.text = [TextParser parse:dict key:@"text"];
+    self.fontFamily = [TextParser parse:dict key:@"fontFamily"];
+    self.fontSize = [NumberParser parse:dict key:@"fontSize"];
+    self.fontWeight = [TextParser parse:dict key:@"fontWeight"];
+    self.color = [ColorParser parse:dict key:@"color"];
+    
+    self.component = [[RNNComponentOptions alloc] initWithDict:dict[@"component"]];
+    
+    return self;
+}
+
+- (BOOL)hasValue {
+    return self.text.hasValue || self.fontFamily.hasValue || self.fontSize.hasValue || self.fontWeight.hasValue || self.color.hasValue || self.component.hasValue || self.componentAlignment.hasValue;
 }
 
 @end

lib/ios/TopBarPresenter.h

@@ -7,7 +7,7 @@
 
 - (void)applyOptionsBeforePopping:(RNNTopBarOptions *)options;
 
-- (void)mergeOptions:(RNNTopBarOptions *)options defaultOptions:(RNNTopBarOptions *)defaultOptions;
+- (void)mergeOptions:(RNNTopBarOptions *)options withDefault:(RNNTopBarOptions *)defaultOptions;
 
 - (instancetype)initWithNavigationController:(UINavigationController *)boundNavigationController;
 

lib/ios/TopBarPresenter.m

@@ -25,7 +25,7 @@
     [self setLargeTitleAttributes:options.largeTitle];
 }
 
-- (void)mergeOptions:(RNNTopBarOptions *)options defaultOptions:(RNNTopBarOptions *)defaultOptions {
+- (void)mergeOptions:(RNNTopBarOptions *)options withDefault:(RNNTopBarOptions *)withDefault {
     if (options.background.color.hasValue) {
         [self setBackgroundColor:options.background.color.get];
     }
@@ -43,10 +43,12 @@
         [self setLargeTitleAttributes:largeTitleOptions];
     }
 
-    [self setTitleAttributes:options.title];
+    if (options.title.hasValue) {
+        [self setTitleAttributes:withDefault.title];
+    }
     
     if (options.backButton.hasValue) {
-        [self setBackButtonIcon:[defaultOptions.backButton.icon getWithDefaultValue:nil] withColor:[defaultOptions.backButton.color getWithDefaultValue:nil] title:[defaultOptions.backButton.title getWithDefaultValue:nil] showTitle:[defaultOptions.backButton.showTitle getWithDefaultValue:YES]];
+        [self setBackButtonIcon:[withDefault.backButton.icon getWithDefaultValue:nil] withColor:[withDefault.backButton.color getWithDefaultValue:nil] title:[withDefault.backButton.title getWithDefaultValue:nil] showTitle:[withDefault.backButton.showTitle getWithDefaultValue:YES]];
     }
 }
 

playground/ios/NavigationTests/TopBarAppearancePresenterTest.m

@@ -0,0 +1,36 @@
+#import <XCTest/XCTest.h>
+#import <OCMock/OCMock.h>
+#import <ReactNativeNavigation/TopBarAppearancePresenter.h>
+#import "UIViewController+RNNOptions.h"
+#import <ReactNativeNavigation/RNNStackController.h>
+
+@interface TopBarAppearancePresenterTest : XCTestCase
+
+@end
+
+@implementation TopBarAppearancePresenterTest {
+	TopBarAppearancePresenter* _uut;
+	RNNStackController* _stack;
+}
+
+- (void)setUp {
+    [super setUp];
+	_stack = [[RNNStackController alloc] initWithLayoutInfo:nil creator:nil options:[[RNNNavigationOptions alloc] initEmptyOptions] defaultOptions:[[RNNNavigationOptions alloc] initEmptyOptions] presenter:_uut eventEmitter:nil childViewControllers:@[]];
+	_uut = [[TopBarAppearancePresenter alloc] initWithNavigationController:_stack];
+}
+
+- (void)testMergeOptions_shouldMergeWithDefault {
+	RNNNavigationOptions* mergeOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
+	RNNNavigationOptions* defaultOptions = [[RNNNavigationOptions alloc] initEmptyOptions];
+	defaultOptions.topBar.title.color = [Color withColor:UIColor.redColor];
+	
+	mergeOptions.topBar.title.fontSize = [Number withValue:@(21)];
+	RNNNavigationOptions* withDefault = [mergeOptions withDefault:defaultOptions];
+	[_uut mergeOptions:mergeOptions.topBar withDefault:withDefault.topBar];
+	XCTAssertEqual(_stack.navigationBar.standardAppearance.titleTextAttributes[NSForegroundColorAttributeName], UIColor.redColor);
+	UIFont* font = _stack.navigationBar.standardAppearance.titleTextAttributes[NSFontAttributeName];
+	XCTAssertEqual(font.pointSize, 21);
+}
+
+
+@end

playground/ios/playground.xcodeproj/project.pbxproj

@@ -16,6 +16,7 @@
 		50647FE323E3196800B92025 /* RNNExternalViewControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 50647FE223E3196800B92025 /* RNNExternalViewControllerTests.m */; };
 		50996C6823AA477400008F89 /* RNNRootViewControllerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 50996C6723AA477400008F89 /* RNNRootViewControllerTest.m */; };
 		50996C6923AA487800008F89 /* RNNTestRootViewCreator.m in Sources */ = {isa = PBXBuildFile; fileRef = E58D263D2385888C003F36BA /* RNNTestRootViewCreator.m */; };
+		50BCB27623F1A2B100D6C8E5 /* TopBarAppearancePresenterTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 50BCB27523F1A26600D6C8E5 /* TopBarAppearancePresenterTest.m */; };
 		67C681D42B662A53F29C19DA /* Pods_NavigationIOS12Tests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEE0B5D45FD34FBABC6586CF /* Pods_NavigationIOS12Tests.framework */; };
 		9D204F3DC4FBCD81583BF99F /* Pods_playground.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A3340545EAAF11C1F146864 /* Pods_playground.framework */; };
 		E5046080227748EA00212BD8 /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E504607F227748EA00212BD8 /* JavaScriptCore.framework */; };
@@ -88,6 +89,7 @@
 		50996C5D23AA46DD00008F89 /* NavigationIOS12Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = NavigationIOS12Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		50996C6123AA46DD00008F89 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		50996C6723AA477400008F89 /* RNNRootViewControllerTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNRootViewControllerTest.m; sourceTree = "<group>"; };
+		50BCB27523F1A26600D6C8E5 /* TopBarAppearancePresenterTest.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TopBarAppearancePresenterTest.m; sourceTree = "<group>"; };
 		7F8E255E2E08F6ECE7DF6FE3 /* Pods-playground.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-playground.release.xcconfig"; path = "Target Support Files/Pods-playground/Pods-playground.release.xcconfig"; sourceTree = "<group>"; };
 		84E32151E3A71C2B7328BCB4 /* Pods_NavigationTests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_NavigationTests.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		B484A10A046B0046B98A76B5 /* Pods-playground.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-playground.debug.xcconfig"; path = "Target Support Files/Pods-playground/Pods-playground.debug.xcconfig"; sourceTree = "<group>"; };
@@ -247,6 +249,7 @@
 			children = (
 				E58D26442385888C003F36BA /* Options */,
 				E58D26422385888C003F36BA /* RNNBasePresenterTest.m */,
+				50BCB27523F1A26600D6C8E5 /* TopBarAppearancePresenterTest.m */,
 				E58D26412385888C003F36BA /* RNNCommandsHandlerTest.m */,
 				E58D26352385888B003F36BA /* RNNComponentPresenterTest.m */,
 				E58D26402385888C003F36BA /* RNNControllerFactoryTest.m */,
@@ -738,6 +741,7 @@
 			files = (
 				E58D265B2385888C003F36BA /* UIViewController+RNNOptionsTest.m in Sources */,
 				E58D26532385888C003F36BA /* RNNSideMenuPresenterTest.m in Sources */,
+				50BCB27623F1A2B100D6C8E5 /* TopBarAppearancePresenterTest.m in Sources */,
 				50647FE323E3196800B92025 /* RNNExternalViewControllerTests.m in Sources */,
 				E58D264D2385888C003F36BA /* RNNOverlayManagerTest.m in Sources */,
 				501C86B9239FE9C400E0B631 /* UIImage+Utils.m in Sources */,