Support await navigator.push

android/app/src/main/java/com/reactnativenavigation/bridge/NavigationReactModule.java

@@ -176,8 +176,8 @@ public class NavigationReactModule extends ReactContextBaseJavaModule {
     }
 
     @ReactMethod
-    public void push(final ReadableMap params) {
-        NavigationCommandsHandler.push(BundleConverter.toBundle(params));
+    public void push(final ReadableMap params, Promise onPushComplete) {
+        NavigationCommandsHandler.push(BundleConverter.toBundle(params), onPushComplete);
     }
 
     @ReactMethod

android/app/src/main/java/com/reactnativenavigation/controllers/Modal.java

@@ -9,6 +9,7 @@ import android.view.Window;
 import android.view.WindowManager;
 
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.R;
 import com.reactnativenavigation.layouts.Layout;
@@ -160,8 +161,8 @@ class Modal extends Dialog implements DialogInterface.OnDismissListener, ScreenS
     }
 
     @Override
-    public void push(ScreenParams params) {
-        layout.push(params);
+    public void push(ScreenParams params, Promise onPushComplete) {
+        layout.push(params, onPushComplete);
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/controllers/ModalController.java

@@ -5,6 +5,7 @@ import android.support.v7.app.AppCompatActivity;
 import android.view.Window;
 
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
 import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.ModalDismissedEvent;
 import com.reactnativenavigation.layouts.ScreenStackContainer;
@@ -58,8 +59,8 @@ class ModalController implements ScreenStackContainer, Modal.OnModalDismissedLis
         return !stack.empty();
     }
 
-    public void push(ScreenParams params) {
-        stack.peek().push(params);
+    public void push(ScreenParams params, Promise onPushComplete) {
+        stack.peek().push(params, onPushComplete);
     }
 
     @Override

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationActivity.java

@@ -12,6 +12,7 @@ import android.view.KeyEvent;
 import android.view.Window;
 
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.modules.core.DefaultHardwareBackBtnHandler;
 import com.facebook.react.modules.core.PermissionAwareActivity;
 import com.facebook.react.modules.core.PermissionListener;
@@ -212,11 +213,11 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
         super.onConfigurationChanged(newConfig);
     }
 
-    void push(ScreenParams params) {
+    void push(ScreenParams params, Promise onPushComplete) {
         if (modalController.containsNavigator(params.getNavigatorId())) {
-            modalController.push(params);
+            modalController.push(params, onPushComplete);
         } else {
-            layout.push(params);
+            layout.push(params, onPushComplete);
         }
     }
 

android/app/src/main/java/com/reactnativenavigation/controllers/NavigationCommandsHandler.java

@@ -47,7 +47,7 @@ public class NavigationCommandsHandler {
         NavigationApplication.instance.startActivity(intent);
     }
 
-    public static void push(Bundle screenParams) {
+    public static void push(Bundle screenParams, final Promise onPushComplete) {
         final NavigationActivity currentActivity = NavigationActivity.currentActivity;
         if (currentActivity == null) {
             return;
@@ -57,7 +57,7 @@ public class NavigationCommandsHandler {
         NavigationApplication.instance.runOnMainThread(new Runnable() {
             @Override
             public void run() {
-                currentActivity.push(params);
+                currentActivity.push(params, onPushComplete);
             }
         });
     }

android/app/src/main/java/com/reactnativenavigation/layouts/BottomTabsLayout.java

@@ -13,6 +13,7 @@ import android.widget.RelativeLayout;
 import com.aurelhubert.ahbottomnavigation.AHBottomNavigation;
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
 import com.facebook.react.bridge.WritableMap;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.events.EventBus;
@@ -364,11 +365,11 @@ public class BottomTabsLayout extends BaseLayout implements AHBottomNavigation.O
     }
 
     @Override
-    public void push(final ScreenParams params) {
+    public void push(final ScreenParams params, final Promise onPushComplete) {
         performOnStack(params.getNavigatorId(), new Task<ScreenStack>() {
             @Override
             public void run(ScreenStack screenStack) {
-                screenStack.push(params, createScreenLayoutParams(params));
+                screenStack.push(params, createScreenLayoutParams(params), onPushComplete);
                 if (isCurrentStack(screenStack)) {
                     setStyleFromScreen(params.styleParams);
                     EventBus.instance.post(new ScreenChangedEvent(params));

android/app/src/main/java/com/reactnativenavigation/layouts/ScreenStackContainer.java

@@ -1,10 +1,11 @@
 package com.reactnativenavigation.layouts;
 
+import com.facebook.react.bridge.Promise;
 import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.views.LeftButtonOnClickListener;
 
 public interface ScreenStackContainer extends LeftButtonOnClickListener {
-    void push(ScreenParams screenParams);
+    void push(ScreenParams screenParams, Promise onPushComplete);
 
     void pop(ScreenParams screenParams);
 

android/app/src/main/java/com/reactnativenavigation/layouts/SingleScreenLayout.java

@@ -7,6 +7,7 @@ import android.view.View;
 import android.widget.RelativeLayout;
 
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.events.EventBus;
 import com.reactnativenavigation.events.ScreenChangedEvent;
@@ -144,8 +145,8 @@ public class SingleScreenLayout extends BaseLayout {
     }
 
     @Override
-    public void push(ScreenParams params) {
-        stack.push(params, new LayoutParams(MATCH_PARENT, MATCH_PARENT));
+    public void push(ScreenParams params, Promise onPushComplete) {
+        stack.push(params, new LayoutParams(MATCH_PARENT, MATCH_PARENT), onPushComplete);
         EventBus.instance.post(new ScreenChangedEvent(params));
     }
 

android/app/src/main/java/com/reactnativenavigation/screens/ScreenStack.java

@@ -9,6 +9,7 @@ import android.widget.RelativeLayout;
 import android.widget.RelativeLayout.LayoutParams;
 
 import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
 import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.params.ContextualMenuParams;
 import com.reactnativenavigation.params.FabParams;
@@ -57,14 +58,14 @@ public class ScreenStack {
         final Screen nextScreen = ScreenFactory.create(activity, params, leftButtonOnClickListener);
         final Screen previousScreen = stack.peek();
         if (isStackVisible) {
-            pushScreenToVisibleStack(layoutParams, nextScreen, previousScreen, new Screen.OnDisplayListener() {
+            pushScreenToVisibleStack(layoutParams, nextScreen, previousScreen, null, new Screen.OnDisplayListener() {
                 @Override
                 public void onDisplay() {
                     removeElementsBelowTop();
                 }
             });
         } else {
-            pushScreenToInvisibleStack(layoutParams, nextScreen, previousScreen);
+            pushScreenToInvisibleStack(layoutParams, nextScreen, previousScreen, null);
             removeElementsBelowTop();
         }
     }
@@ -97,28 +98,29 @@ public class ScreenStack {
         addScreen(initialScreen, params);
     }
 
-    public void push(final ScreenParams params, LayoutParams layoutParams) {
+    public void push(final ScreenParams params, LayoutParams layoutParams, Promise onPushComplete) {
         Screen nextScreen = ScreenFactory.create(activity, params, leftButtonOnClickListener);
         final Screen previousScreen = stack.peek();
         if (isStackVisible) {
             if (nextScreen.screenParams.sharedElementsTransitions.isEmpty()) {
-                pushScreenToVisibleStack(layoutParams, nextScreen, previousScreen);
+                pushScreenToVisibleStack(layoutParams, nextScreen, previousScreen, onPushComplete);
             } else {
-                pushScreenToVisibleStackWithSharedElementTransition(layoutParams, nextScreen, previousScreen);
+                pushScreenToVisibleStackWithSharedElementTransition(layoutParams, nextScreen, previousScreen, onPushComplete);
             }
         } else {
-            pushScreenToInvisibleStack(layoutParams, nextScreen, previousScreen);
+            pushScreenToInvisibleStack(layoutParams, nextScreen, previousScreen, onPushComplete);
         }
     }
 
     private void pushScreenToVisibleStack(LayoutParams layoutParams, final Screen nextScreen,
-                                          final Screen previousScreen) {
-        pushScreenToVisibleStack(layoutParams, nextScreen, previousScreen, null);
+                                          final Screen previousScreen, Promise onPushComplete) {
+        pushScreenToVisibleStack(layoutParams, nextScreen, previousScreen, onPushComplete, null);
     }
 
     private void pushScreenToVisibleStack(LayoutParams layoutParams,
                                           final Screen nextScreen,
                                           final Screen previousScreen,
+                                          @Nullable final Promise onPushComplete,
                                           @Nullable final Screen.OnDisplayListener onDisplay) {
         nextScreen.setVisibility(View.INVISIBLE);
         addScreen(nextScreen, layoutParams);
@@ -130,6 +132,7 @@ public class ScreenStack {
                     @Override
                     public void run() {
                         if (onDisplay != null) onDisplay.onDisplay();
+                        if (onPushComplete != null) onPushComplete.resolve(null);
                         NavigationApplication.instance.getEventEmitter().sendDidDisappearEvent(previousScreen.getScreenParams(), NavigationType.Push);
                         parent.removeView(previousScreen);
                     }
@@ -138,7 +141,8 @@ public class ScreenStack {
         });
     }
 
-    private void pushScreenToVisibleStackWithSharedElementTransition(LayoutParams layoutParams, final Screen nextScreen, final Screen previousScreen) {
+    private void pushScreenToVisibleStackWithSharedElementTransition(LayoutParams layoutParams, final Screen nextScreen,
+                                                                     final Screen previousScreen, @Nullable final Promise onPushComplete) {
         nextScreen.setVisibility(View.INVISIBLE);
         nextScreen.setOnDisplayListener(new Screen.OnDisplayListener() {
             @Override
@@ -146,6 +150,7 @@ public class ScreenStack {
                 nextScreen.showWithSharedElementsTransitions(previousScreen.sharedElements.getToElements(), new Runnable() {
                     @Override
                     public void run() {
+                        if (onPushComplete != null) onPushComplete.resolve(null);
                         parent.removeView(previousScreen);
                     }
                 });
@@ -154,8 +159,15 @@ public class ScreenStack {
         addScreen(nextScreen, layoutParams);
     }
 
-    private void pushScreenToInvisibleStack(LayoutParams layoutParams, Screen nextScreen, Screen previousScreen) {
+    private void pushScreenToInvisibleStack(LayoutParams layoutParams, Screen nextScreen, Screen previousScreen,
+                                            @Nullable final Promise onPushComplete) {
         nextScreen.setVisibility(View.INVISIBLE);
+        nextScreen.setOnDisplayListener(new Screen.OnDisplayListener() {
+            @Override
+            public void onDisplay() {
+                if (onPushComplete != null) onPushComplete.resolve(null);
+            }
+        });
         addScreen(nextScreen, layoutParams);
         parent.removeView(previousScreen);
     }

src/deprecated/platformSpecificDeprecated.android.js

@@ -80,7 +80,7 @@ function navigatorPush(navigator, params) {
   adapted.overrideBackPress = params.overrideBackPress;
   adapted.timestamp = Date.now();
 
-  newPlatformSpecific.push(adapted);
+  return newPlatformSpecific.push(adapted);
 }
 
 function navigatorPop(navigator, params) {

src/platformSpecific.android.js

@@ -12,7 +12,7 @@ function startApp(activityParams) {
 
 function push(screenParams) {
   savePassProps(screenParams);
-  NativeReactModule.push(screenParams);
+  return NativeReactModule.push(screenParams);
 }
 
 function pop(screenParams) {