Allow reset topBar.title.color when color isn't provided (#5910)

* Allow topBar.title.color reset when color isn't provided * Reset to nil color * Merge topBar options with default * Fix topBar options merging Co-authored-by: Guy Carmeli <guyca@users.noreply.github.com>
wix · Feb 9, 2020 · d0149a1 · d0149a1
1 parent 0ee3145
commit d0149a1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/lib/ios/RNNComponentPresenter.m b/lib/ios/RNNComponentPresenter.m
@@ -159,7 +159,7 @@ - (void)mergeOptions:(RNNNavigationOptions *)options resolvedOptions:(RNNNavigat
 		rootView.passThroughTouches = !options.overlay.interceptTouchOutside.get;
 	}
 
-	[_topBarTitlePresenter mergeOptions:options.topBar resolvedOptions:currentOptions.topBar];
+	[_topBarTitlePresenter mergeOptions:options.topBar resolvedOptions:withDefault.topBar];
 }
 
 - (void)renderComponents:(RNNNavigationOptions *)options perform:(RNNReactViewReadyCompletionBlock)readyBlock {

diff --git a/lib/ios/RNNFontAttributesCreator.m b/lib/ios/RNNFontAttributesCreator.m
@@ -20,13 +20,13 @@ + (NSDictionary *)createFromDictionary:(NSDictionary *)attributesDictionary font
 }
 
 + (NSDictionary *)createFromDictionary:(NSDictionary *)attributesDictionary fontFamily:(NSString *)fontFamily fontSize:(NSNumber *)fontSize fontWeight:(NSString *)fontWeight color:(UIColor *)color {
-	NSMutableDictionary* titleTextAttributes = [NSMutableDictionary dictionaryWithDictionary:attributesDictionary];\
+	NSMutableDictionary* titleTextAttributes = [NSMutableDictionary dictionaryWithDictionary:attributesDictionary];
     UIFont* currentFont = attributesDictionary[NSFontAttributeName];
 
 	CGFloat resolvedFontSize = [self resolveFontSize:currentFont fontSize:fontSize];
-    if (color) {
-        titleTextAttributes[NSForegroundColorAttributeName] = color;
-    }
+
+    titleTextAttributes[NSForegroundColorAttributeName] = color;
+
     if (fontWeight) {
         titleTextAttributes[NSFontAttributeName] = [UIFont systemFontOfSize:resolvedFontSize weight:[RCTConvert UIFontWeight:fontWeight]];
     } else if (fontFamily){

diff --git a/lib/ios/TopBarTitlePresenter.m b/lib/ios/TopBarTitlePresenter.m
@@ -24,7 +24,14 @@ - (void)updateTitleWithOptions:(RNNTopBarOptions *)options {
 }
 
 - (void)mergeOptions:(RNNTopBarOptions *)options resolvedOptions:(RNNTopBarOptions *)resolvedOptions {
-    [self updateTitleWithOptions:options];
+    if (options.title.component.hasValue) {
+        [self setCustomNavigationTitleView:resolvedOptions perform:nil];
+    } else if (options.subtitle.text.hasValue) {
+        [self setTitleViewWithSubtitle:resolvedOptions];
+    } else if (options.title.text.hasValue) {
+        [self removeTitleComponents];
+        self.boundViewController.navigationItem.title = resolvedOptions.title.text.get;
+    }
 }
 
 - (void)setTitleViewWithSubtitle:(RNNTopBarOptions *)options {

diff --git a/playground/ios/NavigationTests/RNNFontAttributesCreatorTest.m b/playground/ios/NavigationTests/RNNFontAttributesCreatorTest.m
@@ -56,18 +56,26 @@ - (void)testcreateFromDictionary_shouldCreateAttributes {
 	XCTAssertEqual(font.pointSize, fontSize.floatValue);
 }
 
-- (void)testcreateFromDictionary_shouldMergeWithDictionary {
+- (void)testCreateFromDictionary_shouldMergeWithDictionary {
 	NSString* familyName = @"Helvetica";
 	NSNumber* fontSize = @(20);
 	NSDictionary* dictionary = @{NSForegroundColorAttributeName: UIColor.redColor};
 
 	NSDictionary* attributes = [RNNFontAttributesCreator createFromDictionary:dictionary fontFamily:familyName fontSize:fontSize defaultFontSize:nil fontWeight:nil color:nil defaultColor:nil];
 	UIFont* font = attributes[NSFontAttributeName];
-	XCTAssertEqual(attributes[NSForegroundColorAttributeName], UIColor.redColor);
     XCTAssertTrue([familyName isEqualToString:font.familyName]);
 	XCTAssertEqual(font.pointSize, fontSize.floatValue);
 }
 
+- (void)testCreateFromDictionary_shouldOverrideColor {
+	NSString* familyName = @"Helvetica";
+	NSNumber* fontSize = @(20);
+	NSDictionary* dictionary = @{NSForegroundColorAttributeName: UIColor.redColor};
+
+	NSDictionary* attributes = [RNNFontAttributesCreator createFromDictionary:dictionary fontFamily:familyName fontSize:fontSize defaultFontSize:nil fontWeight:nil color:nil defaultColor:nil];
+	XCTAssertEqual(attributes[NSForegroundColorAttributeName], nil);
+}
+
 - (void)testCreateWithFontFamily_shouldNotChangeFontFamilyWhenOnlySizeAvailable {
 	NSNumber* fontSize = @(20);
 	UIFont* initialFont = [UIFont systemFontOfSize:10 weight:UIFontWeightHeavy];