fix #4625 (#5398)

* fix #4625 * fixed renamed property
wix · Aug 22, 2019 · b434b4f · b434b4f
1 parent 5b24982
commit b434b4f
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/lib/ios/RNNViewControllerPresenter.m b/lib/ios/RNNViewControllerPresenter.m
@@ -156,6 +156,9 @@ - (void)mergeOptions:(RNNNavigationOptions *)newOptions currentOptions:(RNNNavig
 
 	if (newOptions.topBar.title.component.name.hasValue) {
 		[self setCustomNavigationTitleView:newOptions perform:nil];
+	} else {
+		[_customTitleView removeFromSuperview];
+		_customTitleView = nil;
 	}
 
 	if (newOptions.topBar.backButton.icon.hasValue || newOptions.topBar.backButton.showTitle.hasValue || newOptions.topBar.backButton.color.hasValue || newOptions.topBar.backButton.title.hasValue) {
@@ -191,10 +194,20 @@ - (void)setCustomNavigationTitleView:(RNNNavigationOptions *)options perform:(RN
 }
 
 - (void)setTitleViewWithSubtitle:(RNNNavigationOptions *)options {
-	if (!_customTitleView && options.topBar.subtitle.text.hasValue) {
+	if (!_customTitleView) {
 		_titleViewHelper = [[RNNTitleViewHelper alloc] initWithTitleViewOptions:options.topBar.title subTitleOptions:options.topBar.subtitle viewController:self.boundViewController];
+
+		if (options.topBar.title.text.hasValue) {
+			[_titleViewHelper setTitleOptions:options.topBar.title];
+		}
+		if (options.topBar.subtitle.text.hasValue) {
+			[_titleViewHelper setSubtitleOptions:options.topBar.subtitle];
+		}
+
 		[_titleViewHelper setup];
-	} else if (_titleViewHelper) {
+	} else {
+		_titleViewHelper = [[RNNTitleViewHelper alloc] initWithTitleViewOptions:options.topBar.title subTitleOptions:options.topBar.subtitle viewController:self.boundViewController];
+
 		if (options.topBar.title.text.hasValue) {
 			[_titleViewHelper setTitleOptions:options.topBar.title];
 		}