|
@@ -8,6 +8,7 @@
|
8
|
8
|
|
9
|
9
|
#import "RCCTitleViewHelper.h"
|
10
|
10
|
#import <React/RCTConvert.h>
|
|
11
|
+#import "RCCViewController.h"
|
11
|
12
|
#import "RCTHelpers.h"
|
12
|
13
|
|
13
|
14
|
@implementation RCCTitleView
|
|
@@ -69,6 +70,13 @@ navigationController:(UINavigationController*)navigationController
|
69
|
70
|
return;
|
70
|
71
|
}
|
71
|
72
|
|
|
73
|
+ if ([self.viewController isKindOfClass:[RCCViewController class]]) {
|
|
74
|
+ NSMutableDictionary *mergedStyle = [NSMutableDictionary dictionaryWithDictionary:((RCCViewController*)self.viewController).navigatorStyle];
|
|
75
|
+ [mergedStyle addEntriesFromDictionary:style];
|
|
76
|
+
|
|
77
|
+ style = mergedStyle;
|
|
78
|
+ }
|
|
79
|
+
|
72
|
80
|
CGRect navigationBarBounds = self.navigationController.navigationBar.bounds;
|
73
|
81
|
|
74
|
82
|
self.titleView = [[RCCTitleView alloc] initWithFrame:navigationBarBounds];
|
|
@@ -164,7 +172,7 @@ navigationController:(UINavigationController*)navigationController
|
164
|
172
|
labelframe.size = labelSize;
|
165
|
173
|
subtitleLabel.frame = labelframe;
|
166
|
174
|
[subtitleLabel sizeToFit];
|
167
|
|
-
|
|
175
|
+
|
168
|
176
|
[self.titleView addSubview:subtitleLabel];
|
169
|
177
|
|
170
|
178
|
return subtitleLabel;
|