|
|
@@ -27,6 +27,7 @@ import java.util.ArrayList;
|
|
27
|
27
|
*/
|
|
28
|
28
|
public class RctActivityModule extends ReactContextBaseJavaModule {
|
|
29
|
29
|
public static final String REACT_CLASS = "RctActivity";
|
|
|
30
|
+ private static final String KEY_NAVIGATOR_ID = "navigatorID";
|
|
30
|
31
|
|
|
31
|
32
|
public RctActivityModule(ReactApplicationContext reactContext) {
|
|
32
|
33
|
super(reactContext);
|
|
|
@@ -133,7 +134,7 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
|
|
133
|
134
|
|
|
134
|
135
|
@ReactMethod
|
|
135
|
136
|
public void navigatorPop(final ReadableMap navigator) {
|
|
136
|
|
- final String navigatorId = navigator.getString("navigatorID");
|
|
|
137
|
+ final String navigatorId = navigator.getString(KEY_NAVIGATOR_ID);
|
|
137
|
138
|
final BaseReactActivity context = ContextProvider.getActivityContext();
|
|
138
|
139
|
if (context == null || context.isFinishing()) {
|
|
139
|
140
|
return;
|
|
|
@@ -160,6 +161,22 @@ public class RctActivityModule extends ReactContextBaseJavaModule {
|
|
160
|
161
|
}
|
|
161
|
162
|
});
|
|
162
|
163
|
}
|
|
|
164
|
+ }
|
|
|
165
|
+
|
|
|
166
|
+ @ReactMethod
|
|
|
167
|
+ public void navigatorPopToRoot(final ReadableMap params) {
|
|
|
168
|
+ final BaseReactActivity context = ContextProvider.getActivityContext();
|
|
|
169
|
+ if (context == null || context.isFinishing()) {
|
|
|
170
|
+ return;
|
|
|
171
|
+ }
|
|
|
172
|
+
|
|
|
173
|
+ final String navigatorID = params.getString(KEY_NAVIGATOR_ID);
|
|
|
174
|
+ context.runOnUiThread(new Runnable() {
|
|
|
175
|
+ @Override
|
|
|
176
|
+ public void run() {
|
|
|
177
|
+ context.popToRoot(navigatorID);
|
|
|
178
|
+ }
|
|
|
179
|
+ });
|
|
163
|
180
|
|
|
164
|
181
|
}
|
|
165
|
182
|
|