|
@@ -67,19 +67,15 @@ static NSString* const setDefaultOptions = @"setDefaultOptions";
|
67
|
67
|
- (void)mergeOptions:(NSString*)componentId options:(NSDictionary*)mergeOptions completion:(RNNTransitionCompletionBlock)completion {
|
68
|
68
|
[self assertReady];
|
69
|
69
|
|
70
|
|
- UIViewController<RNNLayoutProtocol>* vc = (UIViewController<RNNLayoutProtocol>*)[_store findComponentForId:componentId];
|
|
70
|
+ UIViewController* vc = [_store findComponentForId:componentId];
|
71
|
71
|
RNNNavigationOptions* options = [[RNNNavigationOptions alloc] initWithDict:mergeOptions];
|
72
|
|
- [CATransaction begin];
|
73
|
|
- [CATransaction setCompletionBlock:completion];
|
74
|
72
|
|
75
|
73
|
while (vc != nil) {
|
76
|
74
|
if ([vc conformsToProtocol:@protocol(RNNLayoutProtocol)]) {
|
77
|
|
- [vc mergeOptions:options];
|
|
75
|
+ [(UIViewController<RNNLayoutProtocol>*)vc mergeOptions:options];
|
78
|
76
|
}
|
79
|
|
- vc = (UIViewController<RNNLayoutProtocol>*)vc.parentViewController;
|
|
77
|
+ vc = vc.parentViewController;
|
80
|
78
|
}
|
81
|
|
-
|
82
|
|
- [CATransaction commit];
|
83
|
79
|
}
|
84
|
80
|
|
85
|
81
|
- (void)setDefaultOptions:(NSDictionary*)optionsDict completion:(RNNTransitionCompletionBlock)completion {
|