|
@@ -57,7 +57,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
|
57
|
57
|
}
|
58
|
58
|
}];
|
59
|
59
|
|
60
|
|
- [[self.fromVC navigationController] pushViewController:self.toVC animated:self.toVC.options.animations.push.enabled];
|
|
60
|
+ [[self.fromVC navigationController] pushViewController:self.toVC animated:self.toVC.options.animations.push.enable];
|
61
|
61
|
[CATransaction commit];
|
62
|
62
|
|
63
|
63
|
self.toVC = nil;
|
|
@@ -71,15 +71,15 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
|
71
|
71
|
if ([nvc topViewController] == vc) {
|
72
|
72
|
if (vc.options.animations.pop) {
|
73
|
73
|
nvc.delegate = vc;
|
74
|
|
- [nvc popViewControllerAnimated:vc.options.animations.pop.enabled];
|
|
74
|
+ [nvc popViewControllerAnimated:vc.options.animations.pop.enable];
|
75
|
75
|
} else {
|
76
|
76
|
nvc.delegate = nil;
|
77
|
|
- [nvc popViewControllerAnimated:vc.options.animations.pop.enabled];
|
|
77
|
+ [nvc popViewControllerAnimated:vc.options.animations.pop.enable];
|
78
|
78
|
}
|
79
|
79
|
} else {
|
80
|
80
|
NSMutableArray * vcs = nvc.viewControllers.mutableCopy;
|
81
|
81
|
[vcs removeObject:vc];
|
82
|
|
- [nvc setViewControllers:vcs animated:vc.options.animations.pop.enabled];
|
|
82
|
+ [nvc setViewControllers:vcs animated:vc.options.animations.pop.enable];
|
83
|
83
|
}
|
84
|
84
|
[_store removeComponent:componentId];
|
85
|
85
|
}
|
|
@@ -90,7 +90,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
|
90
|
90
|
if (vc) {
|
91
|
91
|
UINavigationController *nvc = [vc navigationController];
|
92
|
92
|
if(nvc) {
|
93
|
|
- NSArray *poppedVCs = [nvc popToViewController:vc animated:vc.options.animations.pop.enabled];
|
|
93
|
+ NSArray *poppedVCs = [nvc popToViewController:vc animated:vc.options.animations.pop.enable];
|
94
|
94
|
[self removePopedViewControllers:poppedVCs];
|
95
|
95
|
}
|
96
|
96
|
}
|
|
@@ -99,7 +99,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
|
99
|
99
|
-(void)popToRoot:(NSString*)componentId {
|
100
|
100
|
RNNRootViewController *vc = (RNNRootViewController*)[_store findComponentForId:componentId];
|
101
|
101
|
UINavigationController* nvc = [vc navigationController];
|
102
|
|
- NSArray* poppedVCs = [nvc popToRootViewControllerAnimated:vc.options.animations.pop.enabled];
|
|
102
|
+ NSArray* poppedVCs = [nvc popToRootViewControllerAnimated:vc.options.animations.pop.enable];
|
103
|
103
|
[self removePopedViewControllers:poppedVCs];
|
104
|
104
|
}
|
105
|
105
|
|
|
@@ -113,7 +113,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
|
113
|
113
|
}
|
114
|
114
|
}];
|
115
|
115
|
|
116
|
|
- [nvc setViewControllers:@[newRoot] animated:newRoot.options.animations.push.enabled];
|
|
116
|
+ [nvc setViewControllers:@[newRoot] animated:newRoot.options.animations.push.enable];
|
117
|
117
|
|
118
|
118
|
[CATransaction commit];
|
119
|
119
|
}
|