|
@@ -25,26 +25,32 @@
|
25
|
25
|
|
26
|
26
|
#pragma mark - public
|
27
|
27
|
|
28
|
|
--(void) setRoot:(NSDictionary*)layout {
|
|
28
|
+-(void) setRoot:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
|
29
|
29
|
[self assertReady];
|
30
|
|
-
|
|
30
|
+
|
31
|
31
|
[_modalManager dismissAllModals];
|
32
|
32
|
|
33
|
33
|
UIViewController *vc = [_controllerFactory createLayoutAndSaveToStore:layout];
|
34
|
34
|
|
35
|
35
|
UIApplication.sharedApplication.delegate.window.rootViewController = vc;
|
36
|
36
|
[UIApplication.sharedApplication.delegate.window makeKeyAndVisible];
|
|
37
|
+ completion();
|
37
|
38
|
}
|
38
|
39
|
|
39
|
|
--(void) setOptions:(NSString*)containerId options:(NSDictionary*)options {
|
|
40
|
+-(void) setOptions:(NSString*)containerId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
|
40
|
41
|
[self assertReady];
|
41
|
42
|
|
42
|
43
|
UIViewController* vc = [_store findContainerForId:containerId];
|
43
|
44
|
if([vc isKindOfClass:[RNNRootViewController class]]) {
|
44
|
45
|
RNNRootViewController* rootVc = (RNNRootViewController*)vc;
|
45
|
46
|
[rootVc.navigationOptions mergeWith:options];
|
|
47
|
+ [CATransaction begin];
|
|
48
|
+ [CATransaction setCompletionBlock:completion];
|
|
49
|
+
|
46
|
50
|
[rootVc.navigationOptions applyOn:vc];
|
47
|
51
|
[rootVc applyNavigationButtons];
|
|
52
|
+
|
|
53
|
+ [CATransaction commit];
|
48
|
54
|
}
|
49
|
55
|
}
|
50
|
56
|
|
|
@@ -56,8 +62,10 @@
|
56
|
62
|
[_navigationStackManager push:newVc onTop:containerId completion:completion];
|
57
|
63
|
}
|
58
|
64
|
|
59
|
|
--(void)pop:(NSString*)containerId options:(NSDictionary*)options{
|
|
65
|
+-(void)pop:(NSString*)containerId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
|
60
|
66
|
[self assertReady];
|
|
67
|
+ [CATransaction begin];
|
|
68
|
+ [CATransaction setCompletionBlock:completion];
|
61
|
69
|
NSDictionary* animationData = options[@"customTransition"];
|
62
|
70
|
if (animationData){
|
63
|
71
|
if ([animationData objectForKey:@"animations"]) {
|
|
@@ -68,19 +76,27 @@
|
68
|
76
|
} else {
|
69
|
77
|
[_navigationStackManager pop:containerId withAnimationData:nil];
|
70
|
78
|
}
|
71
|
|
-
|
|
79
|
+ [CATransaction commit];
|
72
|
80
|
}
|
73
|
81
|
|
74
|
|
--(void) popTo:(NSString*)containerId {
|
|
82
|
+-(void) popTo:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion {
|
75
|
83
|
[self assertReady];
|
|
84
|
+ [CATransaction begin];
|
|
85
|
+ [CATransaction setCompletionBlock:completion];
|
76
|
86
|
|
77
|
87
|
[_navigationStackManager popTo:containerId];
|
|
88
|
+
|
|
89
|
+ [CATransaction commit];
|
78
|
90
|
}
|
79
|
91
|
|
80
|
|
--(void) popToRoot:(NSString*)containerId {
|
|
92
|
+-(void) popToRoot:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion {
|
81
|
93
|
[self assertReady];
|
|
94
|
+ [CATransaction begin];
|
|
95
|
+ [CATransaction setCompletionBlock:completion];
|
82
|
96
|
|
83
|
97
|
[_navigationStackManager popToRoot:containerId];
|
|
98
|
+
|
|
99
|
+ [CATransaction commit];
|
84
|
100
|
}
|
85
|
101
|
|
86
|
102
|
-(void) showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
|
|
@@ -90,16 +106,24 @@
|
90
|
106
|
[_modalManager showModal:newVc completion:completion];
|
91
|
107
|
}
|
92
|
108
|
|
93
|
|
--(void) dismissModal:(NSString*)containerId {
|
|
109
|
+-(void) dismissModal:(NSString*)containerId completion:(RNNTransitionCompletionBlock)completion {
|
94
|
110
|
[self assertReady];
|
|
111
|
+ [CATransaction begin];
|
|
112
|
+ [CATransaction setCompletionBlock:completion];
|
95
|
113
|
|
96
|
114
|
[_modalManager dismissModal:containerId];
|
|
115
|
+
|
|
116
|
+ [CATransaction commit];
|
97
|
117
|
}
|
98
|
118
|
|
99
|
|
--(void) dismissAllModals {
|
|
119
|
+-(void) dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion {
|
100
|
120
|
[self assertReady];
|
|
121
|
+ [CATransaction begin];
|
|
122
|
+ [CATransaction setCompletionBlock:completion];
|
101
|
123
|
|
102
|
124
|
[_modalManager dismissAllModals];
|
|
125
|
+
|
|
126
|
+ [CATransaction commit];
|
103
|
127
|
}
|
104
|
128
|
|
105
|
129
|
#pragma mark - private
|