Browse Source

fix #4625 (#5398)

* fix #4625

* fixed renamed property
Fabrizio Rizzonelli 5 years ago
parent
commit
b434b4f82a
1 changed files with 15 additions and 2 deletions
  1. 15
    2
      lib/ios/RNNViewControllerPresenter.m

+ 15
- 2
lib/ios/RNNViewControllerPresenter.m View File

156
 	
156
 	
157
 	if (newOptions.topBar.title.component.name.hasValue) {
157
 	if (newOptions.topBar.title.component.name.hasValue) {
158
 		[self setCustomNavigationTitleView:newOptions perform:nil];
158
 		[self setCustomNavigationTitleView:newOptions perform:nil];
159
+	} else {
160
+		[_customTitleView removeFromSuperview];
161
+		_customTitleView = nil;
159
 	}
162
 	}
160
 	
163
 	
161
 	if (newOptions.topBar.backButton.icon.hasValue || newOptions.topBar.backButton.showTitle.hasValue || newOptions.topBar.backButton.color.hasValue || newOptions.topBar.backButton.title.hasValue) {
164
 	if (newOptions.topBar.backButton.icon.hasValue || newOptions.topBar.backButton.showTitle.hasValue || newOptions.topBar.backButton.color.hasValue || newOptions.topBar.backButton.title.hasValue) {
191
 }
194
 }
192
 
195
 
193
 - (void)setTitleViewWithSubtitle:(RNNNavigationOptions *)options {
196
 - (void)setTitleViewWithSubtitle:(RNNNavigationOptions *)options {
194
-	if (!_customTitleView && options.topBar.subtitle.text.hasValue) {
197
+	if (!_customTitleView) {
195
 		_titleViewHelper = [[RNNTitleViewHelper alloc] initWithTitleViewOptions:options.topBar.title subTitleOptions:options.topBar.subtitle viewController:self.boundViewController];
198
 		_titleViewHelper = [[RNNTitleViewHelper alloc] initWithTitleViewOptions:options.topBar.title subTitleOptions:options.topBar.subtitle viewController:self.boundViewController];
199
+
200
+		if (options.topBar.title.text.hasValue) {
201
+			[_titleViewHelper setTitleOptions:options.topBar.title];
202
+		}
203
+		if (options.topBar.subtitle.text.hasValue) {
204
+			[_titleViewHelper setSubtitleOptions:options.topBar.subtitle];
205
+		}
206
+
196
 		[_titleViewHelper setup];
207
 		[_titleViewHelper setup];
197
-	} else if (_titleViewHelper) {
208
+	} else {
209
+		_titleViewHelper = [[RNNTitleViewHelper alloc] initWithTitleViewOptions:options.topBar.title subTitleOptions:options.topBar.subtitle viewController:self.boundViewController];
210
+		
198
 		if (options.topBar.title.text.hasValue) {
211
 		if (options.topBar.title.text.hasValue) {
199
 			[_titleViewHelper setTitleOptions:options.topBar.title];
212
 			[_titleViewHelper setTitleOptions:options.topBar.title];
200
 		}
213
 		}