|
@@ -97,21 +97,21 @@
|
97
|
97
|
|
98
|
98
|
- (UIViewController<RNNRootViewProtocol> *)createStack:(RNNLayoutNode*)node {
|
99
|
99
|
RNNNavigationController* vc = [[RNNNavigationController alloc] init];
|
100
|
|
- RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
|
|
100
|
+ NSDictionary* options = node.data[@"options"];
|
101
|
101
|
NSMutableArray* controllers = [NSMutableArray new];
|
102
|
102
|
for (NSDictionary* child in node.children) {
|
103
|
103
|
[controllers addObject:[self fromTree:child]];
|
104
|
104
|
}
|
105
|
105
|
[vc setViewControllers:controllers];
|
106
|
|
- [vc setOptions:options];
|
|
106
|
+ [vc mergeOptions:options];
|
107
|
107
|
|
108
|
108
|
return vc;
|
109
|
109
|
}
|
110
|
110
|
|
111
|
111
|
-(UIViewController<RNNRootViewProtocol> *)createTabs:(RNNLayoutNode*)node {
|
112
|
112
|
RNNTabBarController* vc = [[RNNTabBarController alloc] init];
|
113
|
|
- RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:node.data[@"options"]];
|
114
|
|
-
|
|
113
|
+ NSDictionary* options = node.data[@"options"];
|
|
114
|
+
|
115
|
115
|
NSMutableArray* controllers = [NSMutableArray new];
|
116
|
116
|
for (NSDictionary *child in node.children) {
|
117
|
117
|
UIViewController* childVc = (UIViewController*)[self fromTree:child];
|
|
@@ -121,7 +121,7 @@
|
121
|
121
|
[controllers addObject:childVc];
|
122
|
122
|
}
|
123
|
123
|
[vc setViewControllers:controllers];
|
124
|
|
- [vc setOptions:options];
|
|
124
|
+ [vc mergeOptions:options];
|
125
|
125
|
|
126
|
126
|
return vc;
|
127
|
127
|
}
|