Merge branch 'v2' of github.com:wix/react-native-navigation into v2

docs/docs/styling.md

@@ -224,7 +224,9 @@ Navigation.mergeOptions(this.props.componentId, {
   },
   bottomTabs: {
     titleDisplayMode: 'alwaysShow' | 'showWhenActive' | 'alwaysHide' // Sets the title state for each tab.
-  }
+  },
+  bottomTab: {
+    selectedFontSize: 19 // Selected tab font size in sp
 }
 ```
 

docs/docs/topBar-buttons.md

@@ -25,14 +25,17 @@ Buttons can be defined in a screen's static options:
 ```js
 class MyScreen extends Component {
   static get options() {
-    topBar: {
-    leftButtons: [
-      {
-        id: 'buttonOne',
-        icon: require('icon.png')
+    return {
+      topBar: {
+        leftButtons: [
+          {
+            id: 'buttonOne',
+            icon: require('icon.png')
+          }
+        ],
+        rightButtons: [],
       }
-    ],
-    rightButtons: [],
+    };
   }
   
 }

lib/android/app/build.gradle

@@ -72,7 +72,7 @@ dependencies {
     implementation 'com.android.support:design:26.1.0'
     implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation 'com.android.support:support-v4:26.1.0'
-    implementation 'com.github.wix-playground:ahbottomnavigation:2.4.3'
+    implementation 'com.github.wix-playground:ahbottomnavigation:2.4.5'
 
     implementation 'com.github.clans:fab:1.6.4'
 

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

@@ -19,6 +19,7 @@ import com.reactnativenavigation.react.ReactGateway;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.Navigator;
+import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
 
 public class NavigationActivity extends AppCompatActivity implements DefaultHardwareBackBtnHandler, PermissionAwareActivity, JsDevReloadHandler.ReloadListener {
     @Nullable
@@ -29,7 +30,7 @@ public class NavigationActivity extends AppCompatActivity implements DefaultHard
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        navigator = new Navigator(this, new ChildControllersRegistry(), new OverlayManager());
+        navigator = new Navigator(this, new ChildControllersRegistry(), new ModalStack(this), new OverlayManager());
         getReactGateway().onActivityCreated(this);
         navigator.getView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
         setContentView(navigator.getView());

lib/android/app/src/main/java/com/reactnativenavigation/parse/AnimationOptions.java

@@ -26,7 +26,6 @@ public class AnimationOptions {
         AnimationOptions options = new AnimationOptions();
         if (json == null) return options;
 
-        options.hasValue = true;
         for (Iterator<String> it = json.keys(); it.hasNext(); ) {
             String key = it.next();
             switch (key) {
@@ -36,6 +35,9 @@ public class AnimationOptions {
                 case "enable":
                     options.enable = BoolParser.parse(json, key);
                     break;
+                case "waitForRender":
+                    options.waitForRender = BoolParser.parse(json, key);
+                    break;
                 default:
                     options.valueOptions.add(ValueAnimationOptions.parse(json.optJSONObject(key), getAnimProp(key)));
             }
@@ -44,30 +46,27 @@ public class AnimationOptions {
         return options;
     }
 
-    private boolean hasValue = false;
-
     public Text id = new NullText();
     public Bool enable = new NullBool();
+    public Bool waitForRender = new NullBool();
     private HashSet<ValueAnimationOptions> valueOptions = new HashSet<>();
 
     void mergeWith(AnimationOptions other) {
-        if (other.hasValue()) {
-            hasValue = true;
-            id = other.id;
-            valueOptions = other.valueOptions;
-        }
+        if (other.id.hasValue()) id = other.id;
+        if (other.enable.hasValue()) enable = other.enable;
+        if (other.waitForRender.hasValue()) waitForRender = other.waitForRender;
+        if (!other.valueOptions.isEmpty()) valueOptions = other.valueOptions;
     }
 
     void mergeWithDefault(AnimationOptions defaultOptions) {
-        if (defaultOptions.hasValue()) {
-            hasValue = true;
-            id = defaultOptions.id;
-            valueOptions = defaultOptions.valueOptions;
-        }
+        if (!id.hasValue()) id = defaultOptions.id;
+        if (!enable.hasValue()) enable = defaultOptions.enable;
+        if (!waitForRender.hasValue()) waitForRender = defaultOptions.waitForRender;
+        if (valueOptions.isEmpty()) valueOptions = defaultOptions.valueOptions;
     }
 
     public boolean hasValue() {
-        return hasValue;
+        return id.hasValue() || enable.hasValue() || waitForRender.hasValue();
     }
 
     public AnimatorSet getAnimation(View view) {
@@ -75,7 +74,7 @@ public class AnimationOptions {
     }
 
     public AnimatorSet getAnimation(View view, AnimatorSet defaultAnimation) {
-        if (!hasValue()) return defaultAnimation;
+        if (!hasAnimation()) return defaultAnimation;
         AnimatorSet animationSet = new AnimatorSet();
         List<Animator> animators = new ArrayList<>();
         for (ValueAnimationOptions options : valueOptions) {
@@ -106,4 +105,8 @@ public class AnimationOptions {
         }
         throw new IllegalArgumentException("This animation is not supported: " + key);
     }
+
+    public boolean hasAnimation() {
+        return !valueOptions.isEmpty();
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/parse/BottomTabOptions.java

@@ -5,9 +5,12 @@ import android.support.annotation.Nullable;
 
 import com.reactnativenavigation.parse.params.Color;
 import com.reactnativenavigation.parse.params.NullColor;
+import com.reactnativenavigation.parse.params.NullNumber;
 import com.reactnativenavigation.parse.params.NullText;
+import com.reactnativenavigation.parse.params.Number;
 import com.reactnativenavigation.parse.params.Text;
 import com.reactnativenavigation.parse.parsers.ColorParser;
+import com.reactnativenavigation.parse.parsers.NumberParser;
 import com.reactnativenavigation.parse.parsers.TextParser;
 import com.reactnativenavigation.utils.TypefaceLoader;
 
@@ -28,6 +31,8 @@ public class BottomTabOptions {
         options.badge = TextParser.parse(json, "badge");
         options.testId = TextParser.parse(json, "testID");
         options.fontFamily = typefaceManager.getTypeFace(json.optString("fontFamily", ""));
+        options.fontSize = NumberParser.parse(json, "fontSize");
+        options.selectedFontSize = NumberParser.parse(json, "selectedFontSize");
         return options;
     }
 
@@ -39,6 +44,8 @@ public class BottomTabOptions {
     public Color selectedIconColor = new NullColor();
     public Text testId = new NullText();
     public Text badge = new NullText();
+    public Number fontSize = new NullNumber();
+    public Number selectedFontSize = new NullNumber();
     @Nullable public Typeface fontFamily;
 
 
@@ -51,6 +58,8 @@ public class BottomTabOptions {
         if (other.selectedIconColor.hasValue()) selectedIconColor = other.selectedIconColor;
         if (other.badge.hasValue()) badge = other.badge;
         if (other.testId.hasValue()) testId = other.testId;
+        if (other.fontSize.hasValue()) fontSize = other.fontSize;
+        if (other.selectedFontSize.hasValue()) selectedFontSize = other.selectedFontSize;
         if (other.fontFamily != null) fontFamily = other.fontFamily;
     }
 
@@ -62,6 +71,8 @@ public class BottomTabOptions {
         if (!iconColor.hasValue()) iconColor = defaultOptions.iconColor;
         if (!selectedIconColor.hasValue()) selectedIconColor = defaultOptions.selectedIconColor;
         if (!badge.hasValue()) badge = defaultOptions.badge;
+        if (!fontSize.hasValue()) fontSize = defaultOptions.fontSize;
+        if (!selectedFontSize.hasValue()) selectedFontSize = defaultOptions.selectedFontSize;
         if (fontFamily == null) fontFamily = defaultOptions.fontFamily;
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/parse/NestedAnimationsOptions.java

@@ -16,11 +16,13 @@ public class NestedAnimationsOptions {
         options.bottomTabs = AnimationOptions.parse(json.optJSONObject("bottomTabs"));
         options.topBar = AnimationOptions.parse(json.optJSONObject("topBar"));
         options.enable = BoolParser.parse(json, "enable");
+        options.waitForRender = BoolParser.parse(json, "waitForRender");
 
         return options;
     }
 
     public Bool enable = new NullBool();
+    public Bool waitForRender = new NullBool();
     public AnimationOptions content = new AnimationOptions();
     public AnimationOptions bottomTabs = new AnimationOptions();
     public AnimationOptions topBar = new AnimationOptions();
@@ -30,6 +32,7 @@ public class NestedAnimationsOptions {
         content.mergeWith(other.content);
         bottomTabs.mergeWith(other.bottomTabs);
         if (other.enable.hasValue()) enable = other.enable;
+        if (other.waitForRender.hasValue()) waitForRender = other.waitForRender;
     }
 
     void mergeWithDefault(NestedAnimationsOptions defaultOptions) {
@@ -37,9 +40,10 @@ public class NestedAnimationsOptions {
         bottomTabs.mergeWithDefault(defaultOptions.bottomTabs);
         topBar.mergeWithDefault(defaultOptions.topBar);
         if (!enable.hasValue()) enable = defaultOptions.enable;
+        if (!waitForRender.hasValue()) waitForRender = defaultOptions.waitForRender;
     }
 
     public boolean hasValue() {
-        return topBar.hasValue() || content.hasValue() || bottomTabs.hasValue();
+        return topBar.hasValue() || content.hasValue() || bottomTabs.hasValue() || waitForRender.hasValue();
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/presentation/BottomTabOptionsPresenter.java

@@ -39,13 +39,15 @@ public class BottomTabOptionsPresenter {
 
     public void present() {
         for (int i = 0; i < tabs.size(); i++) {
-            BottomTabOptions bottomTab = tabs.get(i).options.copy().withDefaultOptions(defaultOptions).bottomTabOptions;
-            bottomTabs.setBadge(i, bottomTab.badge.get(""));
-            bottomTabs.setTitleTypeface(i, bottomTab.fontFamily);
-            bottomTabs.setIconActiveColor(i, bottomTab.selectedIconColor.get(null));
-            bottomTabs.setIconInactiveColor(i, bottomTab.iconColor.get(null));
-            bottomTabs.setTitleActiveColor(i, bottomTab.selectedTextColor.get(null));
-            bottomTabs.setTitleInactiveColor(i, bottomTab.textColor.get(null));
+            BottomTabOptions tab = tabs.get(i).options.copy().withDefaultOptions(defaultOptions).bottomTabOptions;
+            bottomTabs.setBadge(i, tab.badge.get(""));
+            bottomTabs.setTitleTypeface(i, tab.fontFamily);
+            bottomTabs.setIconActiveColor(i, tab.selectedIconColor.get(null));
+            bottomTabs.setIconInactiveColor(i, tab.iconColor.get(null));
+            bottomTabs.setTitleActiveColor(i, tab.selectedTextColor.get(null));
+            bottomTabs.setTitleInactiveColor(i, tab.textColor.get(null));
+            bottomTabs.setTitleInactiveTextSizeInSp(i, tab.fontSize.hasValue() ? Float.valueOf(tab.fontSize.get()) : null);
+            bottomTabs.setTitleActiveTextSizeInSp(i, tab.selectedFontSize.hasValue() ? Float.valueOf(tab.selectedFontSize.get()) : null);
         }
     }
 

lib/android/app/src/main/java/com/reactnativenavigation/presentation/StackOptionsPresenter.java

@@ -38,6 +38,10 @@ public class StackOptionsPresenter {
         this.defaultOptions = defaultOptions;
     }
 
+    public Options getDefaultOptions() {
+        return defaultOptions;
+    }
+
     public void bindView(TopBar topBar) {
         this.topBar = topBar;
     }

lib/android/app/src/main/java/com/reactnativenavigation/react/ReactView.java

@@ -92,6 +92,11 @@ public class ReactView extends ReactRootView implements IReactView {
         jsTouchDispatcher.handleTouchEvent(event, getEventDispatcher());
     }
 
+    @Override
+    public boolean isRendered() {
+        return getChildCount() >= 1;
+    }
+
     public EventDispatcher getEventDispatcher() {
         ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
         return reactContext == null ? null : reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/IReactView.java

@@ -20,4 +20,6 @@ public interface IReactView extends Destroyable {
     ScrollEventListener getScrollEventListener();
 
     void dispatchTouchEventToJs(MotionEvent event);
+
+    boolean isRendered();
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/Navigator.java

@@ -8,7 +8,6 @@ import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 
-import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.anim.NavigationAnimator;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.OptionsPresenter;
@@ -16,7 +15,6 @@ import com.reactnativenavigation.presentation.OverlayManager;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.utils.CompatUtils;
-import com.reactnativenavigation.viewcontrollers.modal.ModalPresenter;
 import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 
@@ -35,16 +33,19 @@ public class Navigator extends ParentController {
     @Override
     public void setDefaultOptions(Options defaultOptions) {
         this.defaultOptions = defaultOptions;
-        if (root != null) root.setDefaultOptions(defaultOptions);
+        if (root != null) {
+            root.setDefaultOptions(defaultOptions);
+            modalStack.setDefaultOptions(defaultOptions);
+        }
     }
 
     public Options getDefaultOptions() {
         return defaultOptions;
     }
 
-    public Navigator(final Activity activity, ChildControllersRegistry childRegistry, OverlayManager overlayManager) {
+    public Navigator(final Activity activity, ChildControllersRegistry childRegistry, ModalStack modalStack, OverlayManager overlayManager) {
         super(activity, childRegistry,"navigator" + CompatUtils.generateViewId(), new OptionsPresenter(activity, new Options()), new Options());
-        modalStack = new ModalStack(new ModalPresenter(new ModalAnimator(activity)));
+        this.modalStack = modalStack;
         this.overlayManager = overlayManager;
     }
 
@@ -105,7 +106,7 @@ public class Navigator extends ParentController {
         destroyRoot();
         root = viewController;
         contentLayout.addView(viewController.getView());
-        if (viewController.options.animations.startApp.hasValue()) {
+        if (viewController.options.animations.startApp.hasAnimation()) {
             new NavigationAnimator(viewController.getActivity(), viewController.options.animations)
                     .animateStartApp(viewController.getView(), new AnimatorListenerAdapter() {
                         @Override

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ParentController.java

@@ -9,6 +9,7 @@ import android.support.v4.view.ViewPager;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.presentation.OptionsPresenter;
 import com.reactnativenavigation.utils.CollectionUtils;
 import com.reactnativenavigation.views.Component;
@@ -21,7 +22,13 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
 		super(activity, childRegistry, id, presenter, initialOptions);
 	}
 
-	@Override
+    @Override
+    public void setWaitForRender(Bool waitForRender) {
+        super.setWaitForRender(waitForRender);
+        applyOnController(getCurrentChild(), controller -> ((ViewController) controller).setWaitForRender(waitForRender));
+    }
+
+    @Override
     public void setDefaultOptions(Options defaultOptions) {
         Collection<? extends ViewController> children = getChildControllers();
         if (!CollectionUtils.isNullOrEmpty(children)) {
@@ -35,8 +42,16 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
     @CheckResult
     public Options resolveCurrentOptions() {
 	    if (CollectionUtils.isNullOrEmpty(getChildControllers())) return options;
-        Options o = getCurrentChild().resolveCurrentOptions();
-        return o.copy().mergeWith(options);
+        return getCurrentChild()
+                .resolveCurrentOptions()
+                .copy()
+                .mergeWith(options);
+    }
+
+    @Override
+    @CheckResult
+    public Options resolveCurrentOptions(Options defaultOptions) {
+        return resolveCurrentOptions().withDefaultOptions(defaultOptions);
     }
 
     protected abstract ViewController getCurrentChild();
@@ -113,4 +128,9 @@ public abstract class ParentController<T extends ViewGroup> extends ChildControl
     public void clearTopTabs() {
 
     }
+
+    @Override
+    public boolean isRendered() {
+        return getCurrentChild() != null && getCurrentChild().isRendered();
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/ViewController.java

@@ -12,6 +12,8 @@ import android.view.ViewManager;
 import android.view.ViewTreeObserver;
 
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.presentation.FabOptionsPresenter;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.StringUtils;
@@ -23,6 +25,7 @@ import com.reactnativenavigation.views.Component;
 public abstract class ViewController<T extends ViewGroup> implements ViewTreeObserver.OnGlobalLayoutListener {
 
     private Runnable onAppearedListener;
+    private Bool waitForRender = new NullBool();
 
     public interface ViewVisibilityListener {
         /**
@@ -56,6 +59,10 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         options = initialOptions.copy();
     }
 
+    public void setWaitForRender(Bool waitForRender) {
+        this.waitForRender = waitForRender;
+    }
+
     public void setOnAppearedListener(Runnable onAppearedListener) {
         this.onAppearedListener = onAppearedListener;
     }
@@ -80,6 +87,11 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
         return options;
     }
 
+    @CheckResult
+    public Options resolveCurrentOptions(Options defaultOptions) {
+        return options.copy().withDefaultOptions(defaultOptions);
+    }
+
     @CallSuper
     public void mergeOptions(Options options) {
         this.options = this.options.mergeWith(options);
@@ -235,6 +247,21 @@ public abstract class ViewController<T extends ViewGroup> implements ViewTreeObs
     public abstract void sendOnNavigationButtonPressed(String buttonId);
 
     protected boolean isViewShown() {
-        return !isDestroyed && getView().isShown();
+        return !isDestroyed &&
+               getView().isShown() &&
+               view != null &&
+               isRendered();
+    }
+
+    public boolean isRendered() {
+        return view != null && (
+                waitForRender.isFalseOrUndefined() ||
+                !(view instanceof Component) ||
+                ((Component) view).isRendered()
+        );
+    }
+
+    void applyOnController(ViewController controller, Task<ViewController> task) {
+        if (controller != null) task.run(controller);
     }
 }

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenter.java

@@ -7,6 +7,7 @@ import android.view.ViewGroup;
 
 import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.parse.ModalPresentationStyle;
+import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -14,8 +15,9 @@ public class ModalPresenter {
 
     private ViewGroup content;
     private ModalAnimator animator;
+    private Options defaultOptions = new Options();
 
-    public ModalPresenter(ModalAnimator animator) {
+    ModalPresenter(ModalAnimator animator) {
         this.animator = animator;
     }
 
@@ -23,20 +25,34 @@ public class ModalPresenter {
         this.content = contentLayout;
     }
 
+    public void setDefaultOptions(Options defaultOptions) {
+        this.defaultOptions = defaultOptions;
+    }
+
     public void showModal(ViewController toAdd, ViewController toRemove, CommandListener listener) {
+        Options options = toAdd.resolveCurrentOptions(defaultOptions);
+        toAdd.setWaitForRender(options.animations.showModal.waitForRender);
         content.addView(toAdd.getView());
-        if (toAdd.options.animations.showModal.enable.isTrueOrUndefined()) {
-            animator.show(toAdd.getView(), toAdd.options.animations.showModal, new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(Animator animation) {
-                    onShowModalEnd(toAdd, toRemove, listener);
-                }
-            });
+        if (options.animations.showModal.enable.isTrueOrUndefined()) {
+            if (options.animations.showModal.waitForRender.isTrue()) {
+                toAdd.setOnAppearedListener(() -> animateShow(toAdd, toRemove, listener, options));
+            } else {
+                animateShow(toAdd, toRemove, listener, options);
+            }
         } else {
             onShowModalEnd(toAdd, toRemove, listener);
         }
     }
 
+    private void animateShow(ViewController toAdd, ViewController toRemove, CommandListener listener, Options options) {
+        animator.show(toAdd.getView(), options.animations.showModal, new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(Animator animation) {
+                onShowModalEnd(toAdd, toRemove, listener);
+            }
+        });
+    }
+
     private void onShowModalEnd(ViewController toAdd, ViewController toRemove, CommandListener listener) {
         if (toAdd.options.modal.presentationStyle != ModalPresentationStyle.OverCurrentContext) {
             toRemove.detachView();

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/modal/ModalStack.java

@@ -1,7 +1,11 @@
 package com.reactnativenavigation.viewcontrollers.modal;
 
+import android.app.Activity;
+import android.support.annotation.RestrictTo;
 import android.view.ViewGroup;
 
+import com.reactnativenavigation.anim.ModalAnimator;
+import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
@@ -15,7 +19,12 @@ public class ModalStack {
     private List<ViewController> modals = new ArrayList<>();
     private final ModalPresenter presenter;
 
-    public ModalStack(ModalPresenter presenter) {
+    public ModalStack(Activity activity) {
+        this.presenter = new ModalPresenter(new ModalAnimator(activity));
+    }
+
+    @RestrictTo(RestrictTo.Scope.TESTS)
+    ModalStack(ModalPresenter presenter) {
         this.presenter = presenter;
     }
 
@@ -23,6 +32,10 @@ public class ModalStack {
         presenter.setContentLayout(contentLayout);
     }
 
+    public void setDefaultOptions(Options defaultOptions) {
+        presenter.setDefaultOptions(defaultOptions);
+    }
+
     public void showModal(ViewController viewController, ViewController root, CommandListener listener) {
         ViewController toRemove = isEmpty() ? root : peek();
         modals.add(viewController);

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/stack/StackController.java

@@ -5,6 +5,7 @@ import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
 import android.support.annotation.VisibleForTesting;
 import android.support.v4.view.ViewPager;
+import android.view.View;
 import android.view.ViewGroup;
 import android.widget.RelativeLayout;
 
@@ -130,17 +131,22 @@ public class StackController extends ParentController<StackLayout> {
         child.setParentController(this);
         stack.push(child.getId(), child);
         backButtonHelper.addToPushedChild(this, child);
-        ViewGroup childView = child.getView();
-        childView.setLayoutParams(new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
-        presenter.applyLayoutParamsOptions(resolveCurrentOptions(), childView);
-        getView().addView(childView);
+        Options resolvedOptions = resolveCurrentOptions(presenter.getDefaultOptions());
+        addChildToStack(child, child.getView(), resolvedOptions);
 
         if (toRemove != null) {
             if (child.options.animations.push.enable.isTrueOrUndefined()) {
-                animator.push(child.getView(), () -> {
-                    getView().removeView(toRemove.getView());
-                    listener.onSuccess(child.getId());
-                });
+                if (resolvedOptions.animations.push.waitForRender.isTrue()) {
+                    child.setOnAppearedListener(() -> animator.push(child.getView(), () -> {
+                        getView().removeView(toRemove.getView());
+                        listener.onSuccess(child.getId());
+                    }));
+                } else {
+                    animator.push(child.getView(), () -> {
+                        getView().removeView(toRemove.getView());
+                        listener.onSuccess(child.getId());
+                    });
+                }
             } else {
                 getView().removeView(toRemove.getView());
                 listener.onSuccess(child.getId());
@@ -150,6 +156,13 @@ public class StackController extends ParentController<StackLayout> {
         }
     }
 
+    private void addChildToStack(ViewController child, View view, Options resolvedOptions) {
+        view.setLayoutParams(new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        child.setWaitForRender(resolvedOptions.animations.push.waitForRender);
+        presenter.applyLayoutParamsOptions(resolvedOptions, view);
+        getView().addView(view);
+    }
+
     public void setRoot(ViewController child, CommandListener listener) {
         backButtonHelper.clear(child);
         push(child, new CommandListenerAdapter() {

lib/android/app/src/main/java/com/reactnativenavigation/views/Component.java

@@ -6,4 +6,6 @@ public interface Component {
     void drawBehindTopBar();
 
     void drawBelowTopBar(TopBar topBar);
+
+    boolean isRendered();
 }

lib/android/app/src/main/java/com/reactnativenavigation/views/ComponentLayout.java

@@ -99,6 +99,11 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, TopB
         }
     }
 
+    @Override
+    public boolean isRendered() {
+        return reactView.isRendered();
+    }
+
     @Override
     public void onPress(String buttonId) {
         reactView.sendOnNavigationButtonPressed(buttonId);

lib/android/app/src/main/java/com/reactnativenavigation/views/ExternalComponentLayout.java

@@ -33,4 +33,9 @@ public class ExternalComponentLayout extends FrameLayout implements Component {
             setLayoutParams(layoutParams);
         }
     }
+
+    @Override
+    public boolean isRendered() {
+        return getChildCount() >= 1;
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/views/StackLayout.java

@@ -9,12 +9,13 @@ import com.reactnativenavigation.viewcontrollers.TopBarButtonController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarBackgroundViewController;
 import com.reactnativenavigation.viewcontrollers.topbar.TopBarController;
 import com.reactnativenavigation.views.titlebar.TitleBarReactViewCreator;
+import com.reactnativenavigation.views.topbar.TopBar;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.ViewGroup.LayoutParams.WRAP_CONTENT;
 
 @SuppressLint("ViewConstructor")
-public class StackLayout extends RelativeLayout {
+public class StackLayout extends RelativeLayout implements Component {
     private String stackId;
 
     public StackLayout(Context context, ReactViewCreator topBarButtonCreator, TitleBarReactViewCreator titleBarReactViewCreator, TopBarBackgroundViewController topBarBackgroundViewController, TopBarController topBarController, TopBarButtonController.OnClickListener topBarButtonClickListener, String stackId) {
@@ -31,4 +32,21 @@ public class StackLayout extends RelativeLayout {
     public String getStackId() {
         return stackId;
     }
+
+    @Override
+    public void drawBehindTopBar() {
+
+    }
+
+    @Override
+    public void drawBelowTopBar(TopBar topBar) {
+
+    }
+
+    @Override
+    public boolean isRendered() {
+        return getChildCount() >= 2 &&
+               getChildAt(1) instanceof Component &&
+               ((Component) getChildAt(1)).isRendered();
+    }
 }

lib/android/app/src/main/java/com/reactnativenavigation/views/toptabs/TopTabsViewPager.java

@@ -55,6 +55,18 @@ public class TopTabsViewPager extends ViewPager implements Component, TopBarButt
         setLayoutParams(layoutParams);
     }
 
+    @Override
+    public boolean isRendered() {
+        return tabs.size() != 0 && areAllTabsRendered();
+    }
+
+    private boolean areAllTabsRendered() {
+        for (ViewController tab : tabs) {
+            if (!tab.isRendered()) return false;
+        }
+        return true;
+    }
+
     public void switchToTab(int index) {
         setCurrentItem(index);
     }

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleOverlay.java

@@ -56,4 +56,9 @@ public class SimpleOverlay extends RelativeLayout implements IReactView {
     public void dispatchTouchEventToJs(MotionEvent event) {
 
     }
+
+    @Override
+    public boolean isRendered() {
+        return getChildCount() >= 1;
+    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/mocks/SimpleViewController.java

@@ -77,6 +77,11 @@ public class SimpleViewController extends ChildController<SimpleViewController.S
             }
         }
 
+        @Override
+        public boolean isRendered() {
+            return getChildCount() >= 1;
+        }
+
         @Override
         public boolean isReady() {
             return false;

lib/android/app/src/test/java/com/reactnativenavigation/mocks/TestReactView.java

@@ -54,4 +54,9 @@ public class TestReactView extends FrameLayout implements IReactView {
     public void dispatchTouchEventToJs(MotionEvent event) {
 
     }
+
+    @Override
+    public boolean isRendered() {
+        return getChildCount() >= 1;
+    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/NavigatorTest.java

@@ -23,6 +23,7 @@ import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.ImageLoader;
 import com.reactnativenavigation.utils.OptionHelper;
 import com.reactnativenavigation.viewcontrollers.bottomtabs.BottomTabsController;
+import com.reactnativenavigation.viewcontrollers.modal.ModalStack;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
 
 import org.junit.Test;
@@ -55,6 +56,7 @@ public class NavigatorTest extends BaseTest {
     private OverlayManager overlayManager;
     private EventEmitter eventEmitter;
     private ViewController.ViewVisibilityListener parentVisibilityListener;
+    private ModalStack modalStack;
 
     @Override
     public void beforeEach() {
@@ -64,7 +66,8 @@ public class NavigatorTest extends BaseTest {
         imageLoaderMock = ImageLoaderMock.mock();
         activityController = newActivityController(TestActivity.class);
         activity = activityController.create().get();
-        uut = new Navigator(activity, childRegistry, overlayManager);
+        modalStack = spy(new ModalStack(activity));
+        uut = new Navigator(activity, childRegistry, modalStack, overlayManager);
         activity.setNavigator(uut);
 
         parentController = newStack();
@@ -100,6 +103,7 @@ public class NavigatorTest extends BaseTest {
         Options defaultOptions = new Options();
         uut.setDefaultOptions(defaultOptions);
         verify(spy, times(1)).setDefaultOptions(defaultOptions);
+        verify(modalStack).setDefaultOptions(defaultOptions);
     }
 
     @Test
@@ -119,7 +123,7 @@ public class NavigatorTest extends BaseTest {
     @Test
     public void hasUniqueId() {
         assertThat(uut.getId()).startsWith("navigator");
-        assertThat(new Navigator(activity, childRegistry, overlayManager).getId()).isNotEqualTo(uut.getId());
+        assertThat(new Navigator(activity, childRegistry, modalStack, overlayManager).getId()).isNotEqualTo(uut.getId());
     }
 
     @Test
@@ -429,10 +433,11 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void dismissModal_onViewAppearedInvokedOnRoot() {
-        disableShowModalAnimation(child1, child2);
+        disableShowModalAnimation(child1, child2, child3);
         disableDismissModalAnimation(child1, child2);
 
         uut.setRoot(parentController, new CommandListenerAdapter());
+        parentController.push(child3, new CommandListenerAdapter());
         uut.showModal(child1, new CommandListenerAdapter());
         uut.showModal(child2, new CommandListenerAdapter());
 
@@ -448,12 +453,14 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void dismissAllModals_onViewAppearedInvokedOnRoot() {
+        disablePushAnimation(child2);
         disableShowModalAnimation(child1);
 
         uut.dismissAllModals(new CommandListenerAdapter());
         verify(parentVisibilityListener, times(0)).onViewAppeared(parentController.getView());
 
         uut.setRoot(parentController, new CommandListenerAdapter());
+        parentController.push(child2, new CommandListenerAdapter());
 
         verify(parentVisibilityListener, times(1)).onViewAppeared(parentController.getView());
         uut.showModal(child1, new CommandListenerAdapter());
@@ -464,8 +471,9 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void handleBack_onViewAppearedInvokedOnRoot() {
-        disableShowModalAnimation(child1, child2);
+        disableShowModalAnimation(child1, child2, child3);
 
+        parentController.push(child3, new CommandListenerAdapter());
         StackController spy = spy(parentController);
         uut.setRoot(spy, new CommandListenerAdapter());
         uut.showModal(child1, new CommandListenerAdapter());
@@ -485,9 +493,12 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void destroy_destroyedRoot() {
+        disablePushAnimation(child1);
+
         StackController spy = spy(parentController);
         spy.options.animations.startApp.enable = new Bool(false);
         uut.setRoot(spy, new CommandListenerAdapter());
+        spy.push(child1, new CommandListenerAdapter());
         activityController.destroy();
         verify(spy, times(1)).destroy();
     }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ParentControllerTest.java

@@ -27,6 +27,7 @@ import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 public class ParentControllerTest extends BaseTest {
 
@@ -182,4 +183,46 @@ public class ParentControllerTest extends BaseTest {
         uut.applyChildOptions(options, child1.getView());
         verify(presenter, times(0)).applyRootOptions(uut.getView(), options);
     }
+
+    @Test
+    public void resolveCurrentOptions_returnOptionsIfNoChildren() {
+        assertThat(uut.getChildControllers().size()).isZero();
+        assertThat(uut.resolveCurrentOptions()).isEqualTo(uut.options);
+    }
+
+    @Test
+    public void resolveCurrentOptions_mergesWithCurrentChild() {
+        ViewController child1 = Mockito.mock(ViewController.class);
+        when(child1.getView()).thenReturn(new FrameLayout(activity));
+        Options copiedChildOptions = spy(new Options());
+        Options childOptions = spy(new Options() {
+            @Override
+            public Options copy() {
+                return copiedChildOptions;
+            }
+        });
+        when(child1.resolveCurrentOptions()).thenReturn(childOptions);
+
+        children.add(child1);
+
+        uut.ensureViewIsCreated();
+        assertThat(uut.getCurrentChild()).isEqualTo(child1);
+        uut.resolveCurrentOptions();
+        verify(child1).resolveCurrentOptions();
+        verify(copiedChildOptions).mergeWith(uut.options);
+    }
+
+    @Test
+    public void resolveCurrentOptions_withDefaultOptions() {
+        SimpleViewController child1 = new SimpleViewController(activity, childRegistry, "child1", new Options());
+        children.add(child1);
+        uut.ensureViewIsCreated();
+
+        Options defaultOptions = new Options();
+        Options currentOptions = spy(new Options());
+        ParentController spy = spy(uut);
+        Mockito.when(spy.resolveCurrentOptions()).thenReturn(currentOptions);
+        spy.resolveCurrentOptions(defaultOptions);
+        verify(currentOptions).withDefaultOptions(defaultOptions);
+    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/ViewControllerTest.java

@@ -2,6 +2,7 @@ package com.reactnativenavigation.viewcontrollers;
 
 import android.app.Activity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewParent;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
@@ -10,8 +11,11 @@ import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.TestUtils;
 import com.reactnativenavigation.mocks.SimpleViewController;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
+import com.reactnativenavigation.parse.params.NullBool;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.stack.StackController;
+import com.reactnativenavigation.views.Component;
 
 import org.assertj.android.api.Assertions;
 import org.junit.Test;
@@ -25,6 +29,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.withSettings;
 
 public class ViewControllerTest extends BaseTest {
 
@@ -222,5 +227,26 @@ public class ViewControllerTest extends BaseTest {
         spy.ensureViewIsCreated();
         verify(spy, times(1)).getView();
     }
+
+    @Test
+    public void isRendered_falseIfViewIsNotCreated() {
+        uut.setWaitForRender(new Bool(true));
+        assertThat(uut.isRendered()).isFalse();
+    }
+
+    @Test
+    public void isRendered_delegatesToView() {
+        uut.setWaitForRender(new Bool(true));
+        uut.view = Mockito.mock(ViewGroup.class, withSettings().extraInterfaces(Component.class));
+        uut.isRendered();
+        verify((Component) uut.view).isRendered();
+    }
+
+    @Test
+    public void isRendered_returnsTrueForEveryViewByDefault() {
+        uut.setWaitForRender(new NullBool());
+        uut.view = Mockito.mock(ViewGroup.class);
+        assertThat(uut.isRendered()).isTrue();
+    }
 }
 

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalPresenterTest.java

@@ -6,14 +6,18 @@ import android.widget.FrameLayout;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.anim.ModalAnimator;
 import com.reactnativenavigation.mocks.SimpleViewController;
+import com.reactnativenavigation.parse.AnimationOptions;
 import com.reactnativenavigation.parse.ModalPresentationStyle;
 import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.params.Bool;
 import com.reactnativenavigation.utils.CommandListener;
 import com.reactnativenavigation.utils.CommandListenerAdapter;
 import com.reactnativenavigation.viewcontrollers.ChildController;
 import com.reactnativenavigation.viewcontrollers.ChildControllersRegistry;
 import com.reactnativenavigation.viewcontrollers.ViewController;
 
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.junit.Test;
 
 import static org.assertj.core.api.Java6Assertions.assertThat;
@@ -22,6 +26,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyZeroInteractions;
 
 public class ModalPresenterTest extends BaseTest {
     private static final String MODAL_ID_1 = "modalId1";
@@ -32,16 +37,16 @@ public class ModalPresenterTest extends BaseTest {
     private ModalPresenter uut;
     private FrameLayout contentLayout;
     private ModalAnimator animator;
-    private ViewController rootController;
+    private ViewController root;
 
     @Override
     public void beforeEach() {
         Activity activity = newActivity();
         ChildControllersRegistry childRegistry = new ChildControllersRegistry();
 
-        rootController = spy(new SimpleViewController(activity, childRegistry, "root", new Options()));
+        root = spy(new SimpleViewController(activity, childRegistry, "root", new Options()));
         contentLayout = new FrameLayout(activity);
-        contentLayout.addView(rootController.getView());
+        contentLayout.addView(root.getView());
         activity.setContentView(contentLayout);
 
         animator = spy(new ModalAnimator(activity));
@@ -51,6 +56,16 @@ public class ModalPresenterTest extends BaseTest {
         modal2 = spy(new SimpleViewController(activity, childRegistry, MODAL_ID_2, new Options()));
     }
 
+    @Test
+    public void showModal() {
+        Options defaultOptions = new Options();
+        uut.setDefaultOptions(defaultOptions);
+        disableShowModalAnimation(modal1);
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        verify(modal1).setWaitForRender(any());
+        verify(modal1).resolveCurrentOptions(defaultOptions);
+    }
+
     @Test
     public void showModal_noAnimation() {
         disableShowModalAnimation(modal1);
@@ -61,7 +76,7 @@ public class ModalPresenterTest extends BaseTest {
                 verify(modal1, times(1)).onViewAppeared();
             }
         });
-        uut.showModal(modal1, rootController, listener);
+        uut.showModal(modal1, root, listener);
         verify(animator, times(0)).show(
                 eq(modal1.getView()),
                 eq(modal1.options.animations.showModal),
@@ -70,6 +85,17 @@ public class ModalPresenterTest extends BaseTest {
         verify(listener, times(1)).onSuccess(MODAL_ID_1);
     }
 
+    @Test
+    public void showModal_resolvesDefaultOptions() throws JSONException {
+        Options defaultOptions = new Options();
+        JSONObject disabledShowModalAnimation = new JSONObject().put("enable", false);
+        defaultOptions.animations.showModal = AnimationOptions.parse(disabledShowModalAnimation);
+
+        uut.setDefaultOptions(defaultOptions);
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        verifyZeroInteractions(animator);
+    }
+
     @Test
     public void showModal_previousModalIsRemovedFromHierarchy() {
         uut.showModal(modal1, null, new CommandListenerAdapter() {
@@ -102,12 +128,20 @@ public class ModalPresenterTest extends BaseTest {
         });
     }
 
+    @Test
+    public void showModal_waitForRender() {
+        modal1.options.animations.showModal.waitForRender = new Bool(true);
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        verify(modal1).setOnAppearedListener(any());
+        verifyZeroInteractions(animator);
+    }
+
     @Test
     public void dismissModal_animatesByDefault() {
         disableShowModalAnimation(modal1);
 
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.dismissTopModal(modal1, rootController, new CommandListenerAdapter() {
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        uut.dismissTopModal(modal1, root, new CommandListenerAdapter() {
             @Override
             public void onSuccess(String childId) {
                 verify(modal1, times(1)).onViewDisappear();
@@ -132,8 +166,8 @@ public class ModalPresenterTest extends BaseTest {
         disableShowModalAnimation(modal1);
         disableDismissModalAnimation(modal1);
 
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        uut.dismissTopModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        uut.dismissTopModal(modal1, root, new CommandListenerAdapter());
         verify(modal1, times(1)).onViewDisappear();
         verify(modal1, times(1)).destroy();
         verify(animator, times(0)).dismiss(any(), any());
@@ -143,7 +177,7 @@ public class ModalPresenterTest extends BaseTest {
     public void dismissModal_previousModalIsAddedBackToHierarchy() {
         disableShowModalAnimation(modal1, modal2);
 
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
         uut.showModal(modal2, modal1, new CommandListenerAdapter());
         assertThat(modal1.getView().getParent()).isNull();
         uut.dismissTopModal(modal2, modal1, new CommandListenerAdapter());
@@ -155,16 +189,16 @@ public class ModalPresenterTest extends BaseTest {
         disableShowModalAnimation(modal1, modal2);
         disableDismissModalAnimation(modal1, modal2);
 
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
+        uut.showModal(modal1, root, new CommandListenerAdapter());
         uut.showModal(modal2, modal1, new CommandListenerAdapter());
         assertThat(modal1.getView().getParent()).isNull();
-        assertThat(rootController.getView().getParent()).isNull();
+        assertThat(root.getView().getParent()).isNull();
 
         uut.dismissModal(modal1, new CommandListenerAdapter());
-        assertThat(rootController.getView().getParent()).isNull();
+        assertThat(root.getView().getParent()).isNull();
 
-        uut.dismissTopModal(modal2, rootController, new CommandListenerAdapter());
-        assertThat(rootController.getView().getParent()).isNotNull();
+        uut.dismissTopModal(modal2, root, new CommandListenerAdapter());
+        assertThat(root.getView().getParent()).isNotNull();
     }
 
     @Test
@@ -172,8 +206,8 @@ public class ModalPresenterTest extends BaseTest {
         modal1.options.modal.presentationStyle = ModalPresentationStyle.OverCurrentContext;
         disableShowModalAnimation(modal1, modal2);
 
-        uut.showModal(modal1, rootController, new CommandListenerAdapter());
-        assertThat(rootController.getView().getParent()).isNotNull();
-        verify(rootController, times(0)).onViewDisappear();
+        uut.showModal(modal1, root, new CommandListenerAdapter());
+        assertThat(root.getView().getParent()).isNotNull();
+        verify(root, times(0)).onViewDisappear();
     }
 }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/modal/ModalStackTest.java

@@ -256,6 +256,13 @@ public class ModalStackTest extends BaseTest {
         verify(backHandlingModal, times(0)).onViewDisappear();
     }
 
+    @Test
+    public void setDefaultOptions() {
+        Options defaultOptions = new Options();
+        uut.setDefaultOptions(defaultOptions);
+        verify(presenter).setDefaultOptions(defaultOptions);
+    }
+
     private ViewController findModal(String id) {
         return uut.findControllerById(id);
     }

lib/android/app/src/test/java/com/reactnativenavigation/viewcontrollers/stack/StackControllerTest.java

@@ -158,6 +158,17 @@ public class StackControllerTest extends BaseTest {
         verify(child1, times(0)).mergeOptions(any());
     }
 
+    @Test
+    public void push_waitForRender() {
+        disablePushAnimation(child1);
+        uut.push(child1, new CommandListenerAdapter());
+
+        child2.options.animations.push.waitForRender = new Bool(true);
+        uut.push(child2, new CommandListenerAdapter());
+        verify(child2).setOnAppearedListener(any());
+        verify(animator, times(0)).push(eq(child1.getView()), any());
+    }
+
     @Test
     public void animateSetRoot() {
         disablePushAnimation(child1, child2, child3);

lib/ios/RNNOverlayManager.m

@@ -1,11 +1,9 @@
 #import "RNNOverlayManager.h"
 #import "RNNErrorHandler.h"
-#import "RNNOverlayWindow.h"
 
 @implementation RNNOverlayManager {
 	NSMutableDictionary* _overlayDict;
 	RNNStore* _store;
-	RNNOverlayWindow *_overlayWindow;
 }
 
 - (instancetype)initWithStore:(RNNStore *)store {
@@ -19,11 +17,7 @@
 
 - (void)showOverlay:(RNNRootViewController *)viewController completion:(RNNTransitionCompletionBlock)completion {
 	[self cacheOverlay:viewController];
-	_overlayWindow = [[RNNOverlayWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
-	[_overlayWindow setWindowLevel:UIWindowLevelNormal];
-	[_overlayWindow setRootViewController:viewController];
-	[_overlayWindow makeKeyAndVisible];
-	
+	[[[UIApplication sharedApplication] keyWindow] addSubview:viewController.view];
 	completion();
 }
 
@@ -44,10 +38,7 @@
 }
 
 - (void)removeCachedOverlay:(RNNRootViewController*)viewController {
-	[_overlayWindow setRootViewController:nil];
-	[_overlayWindow resignKeyWindow];
-	_overlayWindow = nil;
-	
+	[viewController.view removeFromSuperview];
 	[_overlayDict removeObjectForKey:viewController.componentId];
 	[_store removeComponent:viewController.componentId];
 }

lib/ios/RNNOverlayWindow.h

@@ -1,5 +0,0 @@
-#import <UIKit/UIKit.h>
-
-@interface RNNOverlayWindow : UIWindow
-
-@end

lib/ios/RNNOverlayWindow.m

@@ -1,15 +0,0 @@
-#import "RNNOverlayWindow.h"
-
-@implementation RNNOverlayWindow
-
-- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event {
-	UIView *hitTestResult = [super hitTest:point withEvent:event];
-	
-	if ([hitTestResult isKindOfClass:[UIWindow class]]) {
-		return nil;
-	}
-	
-	return hitTestResult;
-}
-
-@end

lib/ios/ReactNativeNavigation.xcodeproj/project.pbxproj

@@ -112,8 +112,6 @@
 		507F44201FFA8A8800D9425B /* RNNRootViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */; };
 		50887C1520ECC5C200D06111 /* RNNButtonOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50887C1320ECC5C200D06111 /* RNNButtonOptions.h */; };
 		50887C1620ECC5C200D06111 /* RNNButtonOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50887C1420ECC5C200D06111 /* RNNButtonOptions.m */; };
-		50887CA920F26BFE00D06111 /* RNNOverlayWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = 50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */; };
-		50887CAA20F26BFE00D06111 /* RNNOverlayWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */; };
 		50A00C37200F84D6000F01A6 /* RNNOverlayOptions.h in Headers */ = {isa = PBXBuildFile; fileRef = 50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */; };
 		50A00C38200F84D6000F01A6 /* RNNOverlayOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */; };
 		50BE951220B5A787004F5DF5 /* RNNStatusBarOptions.m in Sources */ = {isa = PBXBuildFile; fileRef = 50BE951020B5A787004F5DF5 /* RNNStatusBarOptions.m */; };
@@ -334,8 +332,6 @@
 		507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNRootViewProtocol.h; sourceTree = "<group>"; };
 		50887C1320ECC5C200D06111 /* RNNButtonOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNButtonOptions.h; sourceTree = "<group>"; };
 		50887C1420ECC5C200D06111 /* RNNButtonOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNButtonOptions.m; sourceTree = "<group>"; };
-		50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayWindow.m; sourceTree = "<group>"; };
-		50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNOverlayWindow.h; sourceTree = "<group>"; };
 		50A00C35200F84D6000F01A6 /* RNNOverlayOptions.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNNOverlayOptions.h; sourceTree = "<group>"; };
 		50A00C36200F84D6000F01A6 /* RNNOverlayOptions.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RNNOverlayOptions.m; sourceTree = "<group>"; };
 		50BE951020B5A787004F5DF5 /* RNNStatusBarOptions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNStatusBarOptions.m; sourceTree = "<group>"; };
@@ -671,8 +667,6 @@
 				507F441F1FFA8A8800D9425B /* RNNRootViewProtocol.h */,
 				E33AC1FF20B5BA0B0090DB8A /* RNNSplitViewController.m */,
 				E33AC20120B5BA550090DB8A /* RNNSplitViewController.h */,
-				50887CA820F26BFE00D06111 /* RNNOverlayWindow.h */,
-				50887CA720F26BFD00D06111 /* RNNOverlayWindow.m */,
 			);
 			name = Controllers;
 			sourceTree = "<group>";
@@ -884,7 +878,6 @@
 				50570B262061473D006A1B5C /* RNNTitleOptions.h in Headers */,
 				504AFE741FFFF0540076E904 /* RNNTopTabsOptions.h in Headers */,
 				E8E5182E1F83A48B000467AC /* RNNTransitionStateHolder.h in Headers */,
-				50887CAA20F26BFE00D06111 /* RNNOverlayWindow.h in Headers */,
 				507E7D57201DDD3000444E6C /* RNNAnimationOptions.h in Headers */,
 				2DCD9195200014A900EDC75D /* RNNBridgeManager.h in Headers */,
 				7B1126A91E2D2B6C00F9B03B /* RNNControllerFactory.h in Headers */,
@@ -1048,7 +1041,6 @@
 				504AFE651FFE53070076E904 /* RNNOptions.m in Sources */,
 				263905BA1E4C6F440023D7D3 /* RCCDrawerController.m in Sources */,
 				50F5DFC21F407A8C001A00BC /* RNNTabBarController.m in Sources */,
-				50887CA920F26BFE00D06111 /* RNNOverlayWindow.m in Sources */,
 				263905BC1E4C6F440023D7D3 /* RCCDrawerHelper.m in Sources */,
 				4534E72620CB6724009F8185 /* RNNLargeTitleOptions.m in Sources */,
 				507E7D58201DDD3000444E6C /* RNNAnimationOptions.m in Sources */,

playground/src/app.js

@@ -32,6 +32,11 @@ function start() {
         fontFamily: 'HelveticaNeue-Italic',
         fontSize: 13
       },
+      _animations: {
+        push: {
+          waitForRender: false,
+        }
+      },
       _animations: {
         startApp: {
           y: {

playground/src/screens/ModalScreen.js

@@ -17,13 +17,20 @@ class ModalScreen extends Component {
         backgroundColor: 'transparent'
       },
       layout: {
-        orientation: ['portrait']
+        orientation: ['portrait'],
+        backgroundColor: '#f5fcff'
+      },
+      _animations: {
+        showModal: {
+          waitForRender: true
+        }
       }
     };
   }
 
   constructor(props) {
     super(props);
+    // this.simulateLongRunningTask();
     this.onClickShowModal = this.onClickShowModal.bind(this);
     this.onClickDismissModal = this.onClickDismissModal.bind(this);
     this.onClickDismissPreviousModal = this.onClickDismissPreviousModal.bind(this);
@@ -36,6 +43,11 @@ class ModalScreen extends Component {
     this.onClickModalLifecycle = this.onClickModalLifecycle.bind(this);
   }
 
+  simulateLongRunningTask = () => {
+    // tslint:disable-next-line
+    for (let i = 0; i < Math.pow(2, 25); i++);
+  }
+
   render() {
     return (
       <View style={styles.root}>

playground/src/screens/PushedScreen.js

@@ -18,12 +18,18 @@ class PushedScreen extends Component {
       },
       topBar: {
         testID: testIDs.TOP_BAR_ELEMENT
+      },
+      layout: {
+        backgroundColor: '#f5fcff'
       }
     };
   }
 
   constructor(props) {
     super(props);
+    if (this.props.simulateLongRunningTask) {
+      this.simulateLongRunningTask();
+    }
     this.onClickPush = this.onClickPush.bind(this);
     this.onClickPop = this.onClickPop.bind(this);
     this.onClickPopPrevious = this.onClickPopPrevious.bind(this);
@@ -33,6 +39,11 @@ class PushedScreen extends Component {
     this.state = { disabled: false };
   }
 
+  simulateLongRunningTask() {
+    // tslint:disable-next-line
+    for (let i = 0; i < Math.pow(2, 25); i++);
+  }
+
   listeners = [];
 
   componentDidMount() {
@@ -76,6 +87,7 @@ class PushedScreen extends Component {
         <Button title='Pop Previous' testID={testIDs.POP_PREVIOUS_BUTTON} onPress={this.onClickPopPrevious} />
         <Button title='Pop To Root' testID={testIDs.POP_TO_ROOT} onPress={this.onClickPopToRoot} />
         <Button title='Set Stack Root' testID={testIDs.SET_STACK_ROOT_BUTTON} onPress={this.onClickSetStackRoot} />
+        <Button title='Push and Wait for Render' testID={testIDs.PUSH_BUTTON_WAIT_FOR_RENDER} onPress={this.onClickPushWaitForRender} />
         {stackPosition > 2 && <Button title='Pop To Stack Position 1' testID={testIDs.POP_STACK_POSITION_ONE_BUTTON} onPress={this.onClickPopToFirstPosition} />}
         <Text style={styles.footer}>{`this.props.componentId = ${this.props.componentId}`}</Text>
       </View>
@@ -174,6 +186,34 @@ class PushedScreen extends Component {
     });
   }
 
+  onClickPushWaitForRender = async () => {
+    await Navigation.push(this.props.componentId, {
+      component: {
+        name: 'navigation.playground.PushedScreen',
+        passProps: {
+          stackPosition: this.getStackPosition() + 1,
+          previousScreenIds: _.concat([], this.props.previousScreenIds || [], this.props.componentId),
+          simulateLongRunningTask: true
+        },
+        options: {
+          layout: {
+            backgroundColor: 'transparent'
+          },
+          topBar: {
+            title: {
+              text: `Pushed ${this.getStackPosition() + 1}`
+            }
+          },
+          animations: {
+            push: {
+              waitForRender: true
+            }
+          }
+        }
+      }
+    });
+  }
+
   getStackPosition() {
     return this.props.stackPosition || 1;
   }

playground/src/testIDs.js

@@ -44,6 +44,7 @@ module.exports = {
   TOGGLE_TOP_BAR_HIDE_ON_SCROLL: `TOGGLE_TOP_BAR_HIDE_ON_SCROLL`,
   SET_TAB_BADGE_BUTTON: `SET_TAB_BADGE_BUTTON`,
   PUSH_TO_TEST_DID_DISAPPEAR_BUTTON: `PUSH_TO_TEST_DID_DISAPPEAR_BUTTON`,
+  PUSH_BUTTON_WAIT_FOR_RENDER: `PUSH_AND_WAIT_FOR_RENDER`,
   SHOW_LEFT_SIDE_MENU_BUTTON: `SHOW_LEFT_SIDE_MENU_BUTTON`,
   SHOW_RIGHT_SIDE_MENU_BUTTON: `SHOW_RIGHT_SIDE_MENU_BUTTON`,
   HIDE_LEFT_SIDE_MENU_BUTTON: `HIDE_LEFT_SIDE_MENU_BUTTON`,