Merge branch 'v2' into typescript

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/OverlayTest.java

@@ -1,20 +1,18 @@
 package com.reactnativenavigation.e2e.androide2e;
 
-public class OverlayTest {//extends BaseTest {
+import android.support.test.uiautomator.By;
 
-//	@Test
-//	public void testOverlayAlertAppear() throws Exception {
-//		elementByText("PUSH OPTIONS SCREEN").click();
-//		elementByText("SHOW CUSTOM ALERT").click();
-//		assertExists(By.text("Test view"));
-//		elementByText("OK").click();
-//		assertExists(By.text("Static Title"));
-//	}
-//
-//	@Test
-//	public void testSnackbarAppear() throws Exception {
-//		elementByText("PUSH OPTIONS SCREEN").click();
-//		elementByText("SHOW SNACKBAR").click();
-//		assertExists(By.text("Test!"));
-//	}
+import org.junit.Test;
+
+public class OverlayTest extends BaseTest {
+
+	@Test
+	public void testOverlayAlertAppear() throws Exception {
+		elementByText("PUSH OPTIONS SCREEN").click();
+        elementByText("SHOW OVERLAY").click();
+		assertExists(By.text("Test view"));
+		elementByText("OK").click();
+		assertExists(By.text("Overlay disappeared"));
+        elementByText("OK").click();
+	}
 }

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/ScreenStackTest.java

@@ -45,4 +45,13 @@ public class ScreenStackTest extends BaseTest {
         elementByText("POP TO ROOT").click();
         assertMainShown();
     }
+
+    @Test
+    public void pushStackWithMultipleChildren() throws Exception {
+        elementByText("SHOW MODAL").click();
+        elementByText("SHOW MODAL WITH STACK").click();
+        assertExists(By.text("Screen 2"));
+        device().pressBack();
+        assertExists(By.text("Screen 1"));
+    }
 }

AndroidE2E/app/src/androidTest/java/com/reactnativenavigation/e2e/androide2e/StaticLifecycleEvents.java

@@ -0,0 +1,17 @@
+package com.reactnativenavigation.e2e.androide2e;
+
+import android.support.test.uiautomator.By;
+
+import org.junit.Test;
+
+public class StaticLifecycleEvents extends BaseTest {
+    @Test
+    public void didAppearDidDisappear() throws Exception {
+        elementByText("STATIC LIFECYCLE EVENTS").click();
+        assertExists(By.text("Static Lifecycle Events"));
+        assertExists(By.text("didAppear | navigation.playground.StaticLifecycleOverlay"));
+        elementByText("PUSH").click();
+        assertExists(By.text("didAppear | navigation.playground.PushedScreen"));
+        assertExists(By.text("didDisappear | navigation.playground.WelcomeScreen"));
+    }
+}

README.md

@@ -68,11 +68,11 @@ v2 is written in Test Driven Development. We have a test for every feature inclu
 | resetTo             |   ✅        |	✅|
 | showModal              |  ✅        |	✅|
 | dismissModal           |     ✅       |	✅|
-| showOverlay             |  [Contribute](/docs/docs/CONTRIBUTING.md)         |	✅ |
-| dismissOverlay             |  [Contribute](/docs/docs/CONTRIBUTING.md)         |	✅ |
+| showOverlay             |  ✅         |	✅ |
+| dismissOverlay             |  ✅   |	✅ |
 | customTransition            |   ✅        |	[Contribute](/docs/docs/CONTRIBUTING.md) |
 | Screen Visibility        | ✅     |✅|
-| async commands (await push)     |  [Contribute](/docs/docs/CONTRIBUTING.md)        |✅   |
+| async commands (await push)     |  ✅        |✅   |
 
 ### Navigation Options
 
@@ -129,7 +129,7 @@ v2 is written in Test Driven Development. We have a test for every feature inclu
 | disabledBackGesture        |    ✅     |    / iOS specific     |
 | screenBackgroundImageName        |   ✅      |    [Contribute](/docs/docs/CONTRIBUTING.md)        |
 | rootBackgroundImageName              |    ✅     |    [Contribute](/docs/docs/CONTRIBUTING.md)       |
-| sideMenuVisible          |        [Contribute](/docs/docs/CONTRIBUTING.md)   | [Contribute](/docs/docs/CONTRIBUTING.md) |
+| sideMenuVisible          |      ✅   | [Contribute](/docs/docs/CONTRIBUTING.md) |
 
 
 ## v1 vs v2 Feature Comparison

e2e/ScreenStack.test.js

@@ -59,4 +59,38 @@ describe('screen stack', () => {
     await elementById(testIDs.SWITCH_FIRST_TAB_BUTTON).tap();
     await expect(elementByLabel('This is tab 1')).toBeVisible();
   });
+
+  it('show and dismiss overlay', async () => {
+    await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
+    await elementById(testIDs.SHOW_OVERLAY_BUTTON).tap();
+    await expect(elementById(testIDs.DIALOG_HEADER)).toBeVisible();
+    await elementById(testIDs.OK_BUTTON).tap();
+    await expect(elementById(testIDs.DIALOG_HEADER)).toBeNotVisible();
+  });
+
+  it('overlay pass touches - true', async () => {
+    await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
+    await elementById(testIDs.SHOW_TOUCH_THROUGH_OVERLAY_BUTTON).tap();
+    await expect(elementById(testIDs.DIALOG_HEADER)).toBeVisible();
+    await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
+    await elementById(testIDs.HIDE_TOP_BAR_BUTTON).tap();
+    await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeNotVisible();
+  });
+
+  it('overlay pass touches - false', async () => {
+    await elementById(testIDs.PUSH_OPTIONS_BUTTON).tap();
+    await elementById(testIDs.SHOW_OVERLAY_BUTTON).tap();
+    await expect(elementById(testIDs.DIALOG_HEADER)).toBeVisible();
+    await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
+    await elementById(testIDs.HIDE_TOP_BAR_BUTTON).tap();
+    await expect(elementById(testIDs.TOP_BAR_ELEMENT)).toBeVisible();
+  });
+
+  it('push stack with multiple children', async () => {
+    await elementById(testIDs.SHOW_MODAL_BUTTON).tap();
+    await elementById(testIDs.MODAL_WITH_STACK_BUTTON).tap();
+    await expect(elementByLabel('Screen 2')).toBeVisible();
+    await Utils.tapBackIos();
+    await expect(elementByLabel('Screen 1')).toBeVisible();
+  });
 });

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

@@ -19,9 +19,22 @@ public abstract class NavigationApplication extends Application implements React
 	public void onCreate() {
 		super.onCreate();
         instance = this;
-        reactGateway = new ReactGateway(this, isDebug(), createAdditionalReactPackages());
+        reactGateway = createReactGateway();
 	}
 
+    /**
+     * Subclasses of NavigationApplication may override this method to create the singleton instance
+     * of {@link ReactGateway}. For example, subclasses may wish to provide a custom {@link ReactNativeHost}
+     * with the ReactGateway. This method will be called exactly once, in the application's {@link #onCreate()} method.
+     *
+     * Custom {@link ReactNativeHost}s must be sure to include {@link com.reactnativenavigation.react.NavigationPackage}
+     *
+     * @return a singleton {@link ReactGateway}
+     */
+	protected ReactGateway createReactGateway() {
+	    return new ReactGateway(this, isDebug(), createAdditionalReactPackages());
+    }
+
 	public ReactGateway getReactGateway() {
 		return reactGateway;
 	}
@@ -33,6 +46,10 @@ public abstract class NavigationApplication extends Application implements React
 
 	public abstract boolean isDebug();
 
+    /**
+     * Create a list of additional {@link ReactPackage}s to include. This method will only be called by
+     * the default implementation of {@link #createReactGateway()}
+     */
 	@Nullable
 	public abstract List<ReactPackage> createAdditionalReactPackages();
 }

lib/android/app/src/main/java/com/reactnativenavigation/anim/TopBarCollapseBehavior.java

@@ -16,8 +16,9 @@ public class TopBarCollapseBehavior implements ScrollEventListener.OnScrollListe
         this.animator = new TopBarAnimator(topBar);
     }
 
-    public void enableCollapse() {
-        scrollEventListener.register(topBar, this, this);
+    public void enableCollapse(ScrollEventListener scrollEventListener) {
+        this.scrollEventListener = scrollEventListener;
+        this.scrollEventListener.register(topBar, this, this);
     }
 
     public void disableCollapse() {

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

@@ -1,46 +0,0 @@
-package com.reactnativenavigation.parse;
-
-
-import android.support.annotation.ColorInt;
-
-import org.json.JSONObject;
-
-import static com.reactnativenavigation.parse.OverlayOptions.NO_COLOR;
-
-public class ButtonOptions {
-
-	public static ButtonOptions parse(JSONObject json) {
-		ButtonOptions options = new ButtonOptions();
-		if (json == null) return new ButtonOptions();
-
-		//TODO: parse
-		options.text = json.optString("text");
-		options.action = json.optString("action");
-		options.visible = json.optBoolean("visible", true);
-		options.textColor = json.optInt("textColor", NO_COLOR);
-
-		return options;
-	}
-
-	private String text = "";
-	private String action;
-	private boolean visible = false;
-	@ColorInt
-	private int textColor;
-
-	public String getText() {
-		return text;
-	}
-
-	public String getAction() {
-		return action;
-	}
-
-	public boolean isVisible() {
-		return visible;
-	}
-
-	public int getTextColor() {
-		return textColor;
-	}
-}

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

@@ -10,7 +10,6 @@ import com.reactnativenavigation.viewcontrollers.ComponentViewController;
 import com.reactnativenavigation.viewcontrollers.SideMenuController;
 import com.reactnativenavigation.viewcontrollers.StackController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.viewcontrollers.toptabs.TopTabController;
 import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsController;
 import com.reactnativenavigation.views.ComponentViewCreator;
 import com.reactnativenavigation.views.TopTabsLayoutCreator;
@@ -91,7 +90,7 @@ public class LayoutFactory {
 	private ViewController createComponent(LayoutNode node) {
 		String id = node.id;
 		String name = node.data.optString("name");
-		Options options = Options.parse(typefaceManager, node.data.optJSONObject("options"), defaultOptions);
+		Options options = Options.parse(typefaceManager, node.getNavigationOptions(), defaultOptions);
 		return new ComponentViewController(activity,
                 id,
                 name,
@@ -102,9 +101,13 @@ public class LayoutFactory {
 
 	private ViewController createStack(LayoutNode node) {
 		StackController stackController = new StackController(activity, node.id);
-		for (LayoutNode child : node.children) {
-			stackController.animatePush(create(child), new NoOpPromise());
-		}
+        for (int i = 0; i < node.children.size(); i++) {
+            if (i < node.children.size() - 1) {
+                stackController.push(create(node.children.get(i)), new NoOpPromise());
+            } else {
+                stackController.animatePush(create(node.children.get(i)), new NoOpPromise());
+            }
+        }
 		return stackController;
 	}
 

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

@@ -36,6 +36,7 @@ public class Options implements DEFAULT_VALUES {
 		result.topTabsOptions = TopTabsOptions.parse(json.optJSONObject("topTabs"));
         result.topTabOptions = TopTabOptions.parse(typefaceManager, json.optJSONObject("topTab"));
 		result.bottomTabsOptions = BottomTabsOptions.parse(json.optJSONObject("bottomTabs"));
+        result.overlayOptions = OverlayOptions.parse(json.optJSONObject("overlay"));
 
 		return result.withDefaultOptions(defaultOptions);
 	}
@@ -44,6 +45,7 @@ public class Options implements DEFAULT_VALUES {
     @NonNull public TopTabsOptions topTabsOptions = new TopTabsOptions();
     @NonNull public TopTabOptions topTabOptions = new TopTabOptions();
     @NonNull public BottomTabsOptions bottomTabsOptions = new BottomTabsOptions();
+    @NonNull public OverlayOptions overlayOptions = new OverlayOptions();
 
     void setTopTabIndex(int i) {
         topTabOptions.tabIndex = i;

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

@@ -1,86 +1,15 @@
 package com.reactnativenavigation.parse;
 
-
-import android.support.annotation.ColorInt;
-
-import com.reactnativenavigation.viewcontrollers.ViewController;
-
 import org.json.JSONObject;
 
 public class OverlayOptions {
+    public Options.BooleanOptions interceptTouchOutside = Options.BooleanOptions.False;
 
-	public static final int NO_COLOR = -1;
-
-	public static OverlayOptions parse(JSONObject json) {
-		OverlayOptions options = new OverlayOptions();
-		if (json == null) return options;
-
-		options.title = json.optString("title");
-		options.text = json.optString("text");
-		options.positiveButton = ButtonOptions.parse(json.optJSONObject("positiveButton"));
-		options.negativeButton = ButtonOptions.parse(json.optJSONObject("negativeButton"));
-		options.button = ButtonOptions.parse(json.optJSONObject("button"));
-		options.textColor = json.optInt("textColor", NO_COLOR);
-		options.duration = json.optString("duration");
-		options.backgroundColor = json.optInt("backgroundColor", NO_COLOR);
-
-		return options;
-	}
-
-	public static OverlayOptions create(ViewController componentView) {
-		OverlayOptions options = new OverlayOptions();
-		if (componentView == null) return options;
-
-		options.customView = componentView;
-		return options;
-	}
-
-	private String title = "";
-	private String text = "";
-	private ButtonOptions positiveButton;
-	private ButtonOptions negativeButton;
-	private ButtonOptions button;
-	@ColorInt
-	private int textColor;
-	private String duration;
-	@ColorInt
-	private int backgroundColor;
-
-	private ViewController customView;
-
-	public String getText() {
-		return text;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public ButtonOptions getPositiveButton() {
-		return positiveButton;
-	}
-
-	public ButtonOptions getNegativeButton() {
-		return negativeButton;
-	}
-
-	public ViewController getCustomView() {
-		return customView;
-	}
-
-	public ButtonOptions getButton() {
-		return button;
-	}
-
-	public int getTextColor() {
-		return textColor;
-	}
-
-	public String getDuration() {
-		return duration;
-	}
+    public static OverlayOptions parse(JSONObject json) {
+        OverlayOptions options = new OverlayOptions();
+        if (json == null) return options;
 
-	public int getBackgroundColor() {
-		return backgroundColor;
-	}
+        options.interceptTouchOutside = Options.BooleanOptions.parse(json.optString("interceptTouchOutside", ""));
+        return options;
+    }
 }

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

@@ -49,7 +49,7 @@ public class OptionsPresenter {
         }
 
         if (options.hideOnScroll == True) {
-            topBar.enableCollapse();
+            topBar.enableCollapse(component.getScrollEventListener());
         } else if (options.hideOnScroll == False) {
             topBar.disableCollapse();
         }

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

@@ -0,0 +1,22 @@
+package com.reactnativenavigation.presentation;
+
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.reactnativenavigation.viewcontrollers.ViewController;
+
+import java.util.HashMap;
+
+public class OverlayManager {
+    private final HashMap<String, Integer> overlayRegistry = new HashMap<>();
+
+    public void show(ViewGroup root, ViewController overlay) {
+        View view = overlay.getView();
+        overlayRegistry.put(overlay.getId(), view.getId());
+        root.addView(view);
+    }
+
+    public void dismiss(ViewGroup root, String componentId) {
+        root.removeView(root.findViewById(overlayRegistry.get(componentId)));
+    }
+}

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

@@ -1,27 +0,0 @@
-package com.reactnativenavigation.presentation;
-
-
-import android.content.Context;
-
-import com.reactnativenavigation.parse.OverlayOptions;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.viewcontrollers.overlay.OverlayFactory;
-import com.reactnativenavigation.viewcontrollers.overlay.OverlayInterface;
-
-public class OverlayPresenter {
-
-	private OverlayInterface overlay;
-
-	public OverlayPresenter(ViewController viewController, String type, OverlayOptions options) {
-		this.overlay = OverlayFactory.create(type, viewController, options);
-	}
-
-
-	public void show() {
-		overlay.show();
-	}
-
-	public void dismiss() {
-		overlay.dismiss();
-	}
-}

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

@@ -1,14 +1,12 @@
 package com.reactnativenavigation.react;
 
+import android.support.annotation.NonNull;
+
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import static com.facebook.react.modules.core.DeviceEventManagerModule.RCTDeviceEventEmitter;
 
 public class NavigationEvent {
@@ -16,6 +14,7 @@ public class NavigationEvent {
 	private static final String componentDidAppear = "RNN.componentDidAppear";
 	private static final String componentDidDisappear = "RNN.componentDidDisappear";
 	private static final String onNavigationButtonPressed = "RNN.navigationButtonPressed";
+    private static final String componentLifecycle = "RNN.componentLifecycle";
 
 	private final RCTDeviceEventEmitter emitter;
 
@@ -27,15 +26,26 @@ public class NavigationEvent {
 		emit(onAppLaunched);
 	}
 
-	public void componentDidDisappear(String id) {
+	public void componentDidDisappear(String id, String componentName) {
 		emit(componentDidDisappear, id);
+		emit(componentLifecycle, getLifecycleEventData(id, componentName, "didDisappear"));
 	}
 
-	public void componentDidAppear(String id) {
+	public void componentDidAppear(String id, String componentName) {
 		emit(componentDidAppear, id);
+        emit(componentLifecycle, getLifecycleEventData(id, componentName, "didAppear"));
 	}
 
-	public void sendOnNavigationButtonPressed(String id, String buttonId) {
+    @NonNull
+    private WritableMap getLifecycleEventData(String id, String componentName, String didAppear) {
+        WritableMap map = Arguments.createMap();
+        map.putString("componentId", id);
+        map.putString("componentName", componentName);
+        map.putString("event", didAppear);
+        return map;
+    }
+
+    public void sendOnNavigationButtonPressed(String id, String buttonId) {
 		WritableMap map = Arguments.createMap();
 		map.putString("componentId", id);
 		map.putString("buttonId", buttonId);

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

@@ -14,7 +14,6 @@ import com.reactnativenavigation.parse.LayoutFactory;
 import com.reactnativenavigation.parse.LayoutNode;
 import com.reactnativenavigation.parse.LayoutNodeParser;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.parse.OverlayOptions;
 import com.reactnativenavigation.utils.TypefaceLoader;
 import com.reactnativenavigation.utils.UiThread;
 import com.reactnativenavigation.viewcontrollers.Navigator;
@@ -100,14 +99,17 @@ public class NavigationModule extends ReactContextBaseJavaModule {
 	}
 
 	@ReactMethod
-	public void showOverlay(final String type, final ReadableMap data, final Promise promise) {
-        final OverlayOptions overlayOptions = OverlayOptions.parse(JSONParser.parse(data));
-        handle(() -> navigator().showOverlay(type, overlayOptions, promise));
+	public void showOverlay(final ReadableMap rawLayoutTree) {
+        final LayoutNode layoutTree = LayoutNodeParser.parse(JSONParser.parse(rawLayoutTree));
+        handle(() -> {
+            final ViewController viewController = newLayoutFactory().create(layoutTree);
+            navigator().showOverlay(viewController);
+        });
 	}
 
 	@ReactMethod
-	public void dismissOverlay() {
-		handle(() -> navigator().dismissOverlay());
+	public void dismissOverlay(final String componentId) {
+		handle(() -> navigator().dismissOverlay(componentId));
 	}
 
 	private NavigationActivity activity() {

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

@@ -9,6 +9,10 @@ import com.facebook.react.shell.MainReactPackage;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Default implementation of {@link ReactNativeHost} that includes {@link NavigationPackage}
+ * and user-defined additional packages.
+ */
 public class NavigationReactNativeHost extends ReactNativeHost {
 
 	private final boolean isDebug;
@@ -27,6 +31,8 @@ public class NavigationReactNativeHost extends ReactNativeHost {
 
 	@Override
 	protected List<ReactPackage> getPackages() {
+		// Please note that users may provide their own implementations of ReactNativeHost. Any additional
+		// package requirements should be documented in the changelog.
 		List<ReactPackage> packages = new ArrayList<>();
 		packages.add(new MainReactPackage());
 		packages.add(new NavigationPackage(this));

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

@@ -3,8 +3,8 @@ package com.reactnativenavigation.react;
 import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController.ReactViewCreator;
+import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
+import com.reactnativenavigation.viewcontrollers.IReactView;
 
 public class ReactComponentViewCreator implements ReactViewCreator {
 	private ReactInstanceManager reactInstanceManager;
@@ -14,7 +14,7 @@ public class ReactComponentViewCreator implements ReactViewCreator {
 	}
 
 	@Override
-	public ComponentViewController.IReactView create(final Activity activity, final String componentId, final String componentName) {
+	public IReactView create(final Activity activity, final String componentId, final String componentName) {
 		return new ReactView(activity, reactInstanceManager, componentId, componentName);
 	}
 }

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

@@ -1,5 +1,7 @@
 package com.reactnativenavigation.react;
 
+import android.app.Application;
+
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;
@@ -10,13 +12,17 @@ import java.util.List;
 
 public class ReactGateway {
 
-	private final NavigationReactNativeHost reactNativeHost;
+	private final ReactNativeHost reactNativeHost;
 	private final NavigationReactInitializer initializer;
 	private final JsDevReloadHandler jsDevReloadHandler;
 
-	public ReactGateway(final NavigationApplication application, final boolean isDebug, final List<ReactPackage> additionalReactPackages) {
+	public ReactGateway(final Application application, final boolean isDebug, final List<ReactPackage> additionalReactPackages) {
+		this(application, isDebug, new NavigationReactNativeHost(application, isDebug, additionalReactPackages));
+	}
+
+	public ReactGateway(final Application application, final boolean isDebug, final ReactNativeHost reactNativeHost) {
 		SoLoader.init(application, false);
-		reactNativeHost = new NavigationReactNativeHost(application, isDebug, additionalReactPackages);
+		this.reactNativeHost = reactNativeHost;
 		initializer = new NavigationReactInitializer(reactNativeHost.getReactInstanceManager(), isDebug);
 		jsDevReloadHandler = new JsDevReloadHandler(reactNativeHost.getReactInstanceManager());
 	}

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

@@ -3,29 +3,33 @@ package com.reactnativenavigation.react;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.os.Bundle;
+import android.view.MotionEvent;
 import android.view.View;
 
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactRootView;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.uimanager.JSTouchDispatcher;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.uimanager.events.EventDispatcher;
 import com.reactnativenavigation.interfaces.ScrollEventListener;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
+import com.reactnativenavigation.viewcontrollers.IReactView;
 
 @SuppressLint("ViewConstructor")
-public class ReactView extends ReactRootView implements ComponentViewController.IReactView {
+public class ReactView extends ReactRootView implements IReactView {
 
 	private final ReactInstanceManager reactInstanceManager;
 	private final String componentId;
 	private final String componentName;
 	private boolean isAttachedToReactInstance = false;
+    private final JSTouchDispatcher jsTouchDispatcher;
 
-	public ReactView(final Context context, ReactInstanceManager reactInstanceManager, String componentId, String componentName) {
+    public ReactView(final Context context, ReactInstanceManager reactInstanceManager, String componentId, String componentName) {
 		super(context);
 		this.reactInstanceManager = reactInstanceManager;
 		this.componentId = componentId;
 		this.componentName = componentName;
+		jsTouchDispatcher = new JSTouchDispatcher(this);
 		start();
 	}
 
@@ -56,12 +60,12 @@ public class ReactView extends ReactRootView implements ComponentViewController.
 
 	@Override
 	public void sendComponentStart() {
-		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).componentDidAppear(componentId);
+		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).componentDidAppear(componentId, componentName);
 	}
 
 	@Override
 	public void sendComponentStop() {
-		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).componentDidDisappear(componentId);
+		new NavigationEvent(reactInstanceManager.getCurrentReactContext()).componentDidDisappear(componentId, componentName);
 	}
 
     @Override
@@ -74,6 +78,11 @@ public class ReactView extends ReactRootView implements ComponentViewController.
         return new ScrollEventListener(getEventDispatcher());
     }
 
+    @Override
+    public void dispatchTouchEventToJs(MotionEvent event) {
+        jsTouchDispatcher.handleTouchEvent(event, getEventDispatcher());
+    }
+
     public EventDispatcher getEventDispatcher() {
         ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
         return reactContext == null ? null : reactContext.getNativeModule(UIManagerModule.class).getEventDispatcher();

lib/android/app/src/main/java/com/reactnativenavigation/utils/DeviceScreen.java

@@ -0,0 +1,13 @@
+package com.reactnativenavigation.utils;
+
+import android.content.res.Resources;
+
+public class DeviceScreen {
+    public static int width(Resources resources) {
+        return resources.getDisplayMetrics().widthPixels;
+    }
+
+    public static int height(Resources resources) {
+        return resources.getDisplayMetrics().heightPixels;
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/utils/UiUtils.java

@@ -1,9 +1,11 @@
 package com.reactnativenavigation.utils;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.DisplayMetrics;
@@ -11,17 +13,23 @@ import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 
+import com.reactnativenavigation.NavigationApplication;
+
 public class UiUtils {
+    public static final int STATUS_BAR_HEIGHT_M = 24;
+    public static final int STATUS_BAR_HEIGHT_L = 25;
+    private static int statusBarHeight = -1;
+
 	public static void runOnPreDrawOnce(final View view, final Runnable task) {
-		view.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
-			@Override
-			public boolean onPreDraw() {
-				view.getViewTreeObserver().removeOnPreDrawListener(this);
-				task.run();
-				return true;
-			}
-		});
-	}
+        view.getViewTreeObserver().addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
+            @Override
+            public boolean onPreDraw() {
+                view.getViewTreeObserver().removeOnPreDrawListener(this);
+                task.run();
+                return true;
+            }
+        });
+    }
 
 	public static void tintDrawable(Drawable drawable, int tint) {
 		drawable.setColorFilter(new PorterDuffColorFilter(tint, PorterDuff.Mode.SRC_IN));
@@ -39,4 +47,22 @@ public class UiUtils {
 		}
 		return metrics.heightPixels;
 	}
+
+    public static int getStatusBarHeight(Context context) {
+        if (statusBarHeight > 0) {
+            return statusBarHeight;
+        }
+        final Resources resources = context.getResources();
+        final int resourceId = resources.getIdentifier("status_bar_height", "dimen", "android");
+        statusBarHeight = resourceId > 0 ?
+                resources.getDimensionPixelSize(resourceId) :
+                (int) dpToPx(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? STATUS_BAR_HEIGHT_M : STATUS_BAR_HEIGHT_L);
+        return statusBarHeight;
+    }
+
+    public static float dpToPx(float dp) {
+        float scale = NavigationApplication.instance.getResources().getDisplayMetrics().density;
+        return dp * scale + 0.5f;
+    }
+
 }

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

@@ -1,42 +1,18 @@
 package com.reactnativenavigation.viewcontrollers;
 
-import android.app.*;
-import android.support.annotation.*;
-import android.view.*;
+import android.app.Activity;
+import android.support.annotation.NonNull;
 
-import com.reactnativenavigation.interfaces.ScrollEventListener;
-import com.reactnativenavigation.parse.*;
-import com.reactnativenavigation.presentation.*;
-import com.reactnativenavigation.views.*;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.presentation.NavigationOptionsListener;
+import com.reactnativenavigation.views.ComponentLayout;
+import com.reactnativenavigation.views.ReactComponent;
 
-public class ComponentViewController extends ViewController implements NavigationOptionsListener {
-
-    public interface ReactViewCreator {
-
-        IReactView create(Activity activity, String componentId, String componentName);
-    }
-
-    public interface IReactView {
-
-        boolean isReady();
-
-        View asView();
-
-        void destroy();
-
-        void sendComponentStart();
-
-        void sendComponentStop();
-
-        void sendOnNavigationButtonPressed(String buttonId);
-
-        ScrollEventListener getScrollEventListener();
-    }
+public class ComponentViewController extends ViewController<ComponentLayout> implements NavigationOptionsListener {
 
     private final String componentName;
 
     private final ReactViewCreator viewCreator;
-    private ReactComponent component;
 
     public ComponentViewController(final Activity activity,
                                    final String id,
@@ -49,47 +25,36 @@ public class ComponentViewController extends ViewController implements Navigatio
         options = initialNavigationOptions;
     }
 
-    @Override
-    public void destroy() {
-        super.destroy();
-        if (component != null) component.destroy();
-        component = null;
-    }
-
     @Override
     public void onViewAppeared() {
         super.onViewAppeared();
-        ensureViewIsCreated();
-        applyOnParentStack(parentController -> {
-            parentController.clearOptions();
-            parentController.applyOptions(options, component);
-        });
-        component.sendComponentStart();
+        view.applyOptions(options);
+        view.sendComponentStart();
     }
 
     @Override
     public void onViewDisappear() {
+        view.sendComponentStop();
         super.onViewDisappear();
-        component.sendComponentStop();
     }
 
     @Override
     protected boolean isViewShown() {
-        return super.isViewShown() && component.isReady();
+        return super.isViewShown() && view.isReady();
     }
 
     @NonNull
     @Override
-    protected View createView() {
-        component = (ReactComponent) viewCreator.create(getActivity(), getId(), componentName);
-        return component.asView();
+    protected ComponentLayout createView() {
+        view = (ComponentLayout) viewCreator.create(getActivity(), getId(), componentName);
+        return (ComponentLayout) view.asView();
     }
 
     @Override
     public void mergeOptions(Options options) {
         this.options.mergeWith(options);
-        component.applyOptions(this.options);
-        applyOnParentStack(parentController -> parentController.applyOptions(this.options, component));
+        view.applyOptions(this.options);
+        applyOnParentController(parentController -> parentController.applyOptions(this.options, view));
     }
 
     Options getOptions() {
@@ -97,6 +62,6 @@ public class ComponentViewController extends ViewController implements Navigatio
     }
 
     ReactComponent getComponent() {
-        return component;
+        return view;
     }
 }

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

@@ -0,0 +1,5 @@
+package com.reactnativenavigation.viewcontrollers;
+
+public interface Destroyable {
+    void destroy();
+}

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

@@ -0,0 +1,23 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.view.MotionEvent;
+import android.view.View;
+
+import com.reactnativenavigation.interfaces.ScrollEventListener;
+
+public interface IReactView extends Destroyable {
+
+    boolean isReady();
+
+    View asView();
+
+    void sendComponentStart();
+
+    void sendComponentStop();
+
+    void sendOnNavigationButtonPressed(String buttonId);
+
+    ScrollEventListener getScrollEventListener();
+
+    void dispatchTouchEventToJs(MotionEvent event);
+}

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

@@ -8,9 +8,8 @@ import android.widget.FrameLayout;
 
 import com.facebook.react.bridge.Promise;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.parse.OverlayOptions;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
-import com.reactnativenavigation.presentation.OverlayPresenter;
+import com.reactnativenavigation.presentation.OverlayManager;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.NoOpPromise;
 
@@ -22,7 +21,7 @@ public class Navigator extends ParentController {
     private static final NoOpPromise NO_OP = new NoOpPromise();
     private final ModalStack modalStack = new ModalStack();
 	private ViewController root;
-	private OverlayPresenter overlayPresenter;
+    private OverlayManager overlayManager = new OverlayManager();
     private Options defaultOptions = new Options();
 
     public Navigator(final Activity activity) {
@@ -83,21 +82,21 @@ public class Navigator extends ParentController {
 	public void push(final String fromId, final ViewController viewController, Promise promise) {
 		ViewController from = findControllerById(fromId);
 		if (from != null) {
-		    from.performOnParentStack(stack -> stack.animatePush(viewController, promise));
+		    from.performOnParentStack(stack -> ((StackController) stack).animatePush(viewController, promise));
 		}
 	}
 
 	void pop(final String fromId, Promise promise) {
 		ViewController from = findControllerById(fromId);
 		if (from != null) {
-		    from.performOnParentStack(stack -> stack.pop(promise));
+		    from.performOnParentStack(stack -> ((StackController) stack).pop(promise));
 		}
 	}
 
 	public void popSpecific(final String id, Promise promise) {
 		ViewController from = findControllerById(id);
 		if (from != null) {
-		    from.performOnParentStack(stack -> stack.popSpecific(from, promise), () -> rejectPromise(promise));
+		    from.performOnParentStack(stack -> ((StackController) stack).popSpecific(from, promise), () -> rejectPromise(promise));
 		} else {
 			rejectPromise(promise);
 		}
@@ -106,14 +105,14 @@ public class Navigator extends ParentController {
 	public void popToRoot(final String id, Promise promise) {
 		ViewController from = findControllerById(id);
 		if (from != null) {
-		    from.performOnParentStack(stack -> stack.popToRoot(promise));
+		    from.performOnParentStack(stack -> ((StackController) stack).popToRoot(promise));
 		}
 	}
 
 	public void popTo(final String componentId, Promise promise) {
 		ViewController target = findControllerById(componentId);
 		if (target != null) {
-		    target.performOnParentStack(stack -> stack.popTo(target, promise), () -> rejectPromise(promise));
+		    target.performOnParentStack(stack -> ((StackController) stack).popTo(target, promise), () -> rejectPromise(promise));
 		} else {
 			rejectPromise(promise);
 		}
@@ -131,14 +130,12 @@ public class Navigator extends ParentController {
 		modalStack.dismissAll(promise);
 	}
 
-	public void showOverlay(String type, OverlayOptions options, Promise promise) {
-		overlayPresenter = new OverlayPresenter(root, type, options);
-		overlayPresenter.show();
-		promise.resolve(true);
+	public void showOverlay(ViewController overlay) {
+        overlayManager.show(getView(), overlay);
 	}
 
-	public void dismissOverlay() {
-		overlayPresenter.dismiss();
+	public void dismissOverlay(final String componentId) {
+		overlayManager.dismiss(getView(), componentId);
 	}
 
 	static void rejectPromise(Promise promise) {

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.viewcontrollers;
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.v4.view.ViewPager;
 import android.view.ViewGroup;
 
 import com.reactnativenavigation.parse.Options;
@@ -58,4 +59,8 @@ public abstract class ParentController<T extends ViewGroup> extends ViewControll
     void clearOptions() {
 
     }
+
+    public void setupTopTabsWithViewPager(ViewPager viewPager) {
+
+    }
 }

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

@@ -0,0 +1,8 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.app.Activity;
+
+public interface ReactViewCreator {
+
+    IReactView create(Activity activity, String componentId, String componentName);
+}

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.viewcontrollers;
 import android.app.Activity;
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
+import android.support.v4.view.ViewPager;
 import android.view.View;
 
 import com.facebook.react.bridge.Promise;
@@ -43,6 +44,20 @@ public class StackController extends ParentController <StackLayout> {
         stackLayout.clearOptions();
     }
 
+    public void push(ViewController child, final Promise promise) {
+        final ViewController toRemove = stack.peek();
+
+        child.setParentController(this);
+        stack.push(child.getId(), child);
+        View enteringView = child.getView();
+        getView().addView(enteringView);
+
+        if (toRemove != null) {
+            getView().removeView(toRemove.getView());
+        }
+        promise.resolve(child.getId());
+    }
+
     public void animatePush(final ViewController child, final Promise promise) {
 		final ViewController toRemove = stack.peek();
 
@@ -61,7 +76,7 @@ public class StackController extends ParentController <StackLayout> {
 		}
 	}
 
-    public void pop(final Promise promise) {
+    void pop(final Promise promise) {
         if (!canPop()) {
             Navigator.rejectPromise(promise);
             return;
@@ -77,7 +92,7 @@ public class StackController extends ParentController <StackLayout> {
         finishPopping(exitingView, poppedTop, promise);
     }
 
-	public void animatePop(final Promise promise) {
+	private void animatePop(final Promise promise) {
 		if (!canPop()) {
 			Navigator.rejectPromise(promise);
 			return;
@@ -177,4 +192,9 @@ public class StackController extends ParentController <StackLayout> {
 	public Collection<ViewController> getChildControllers() {
 		return stack.values();
 	}
+
+    @Override
+    public void setupTopTabsWithViewPager(ViewPager viewPager) {
+        stackLayout.setupTopTabsWithViewPager(viewPager);
+    }
 }

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

@@ -13,135 +13,164 @@ import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.utils.CompatUtils;
 import com.reactnativenavigation.utils.StringUtils;
 import com.reactnativenavigation.utils.Task;
+import com.reactnativenavigation.views.ReactComponent;
 
-public abstract class ViewController implements ViewTreeObserver.OnGlobalLayoutListener {
+public abstract class ViewController<T extends ViewGroup> implements ViewTreeObserver.OnGlobalLayoutListener {
+
+    public interface ViewVisibilityListener {
+        /**
+         * @return true if the event is consumed, false otherwise
+         */
+        boolean onViewAppeared(View view);
+
+        /**
+         * @return true if the event is consumed, false otherwise
+         */
+        boolean onViewDisappear(View view);
+    }
 
     public Options options;
 
-	private final Activity activity;
-	private final String id;
-	private View view;
-	private ParentController parentController;
-	private boolean isShown = false;
+    private final Activity activity;
+    private final String id;
+    protected T view;
+    @Nullable private ParentController<T> parentController;
+    private boolean isShown;
     private boolean isDestroyed;
+    private ViewVisibilityListener viewVisibilityListener = new ViewVisibilityListenerAdapter();
+
+    public ViewController(Activity activity, String id) {
+        this.activity = activity;
+        this.id = id;
+    }
 
-	public ViewController(Activity activity, String id) {
-		this.activity = activity;
-		this.id = id;
-	}
+    protected abstract T createView();
 
-	protected abstract View createView();
+    public void setViewVisibilityListener(ViewVisibilityListener viewVisibilityListener) {
+        this.viewVisibilityListener = viewVisibilityListener;
+    }
 
-	@SuppressWarnings("WeakerAccess")
+    @SuppressWarnings("WeakerAccess")
     @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
-	public void ensureViewIsCreated() {
-		getView();
-	}
+    public void ensureViewIsCreated() {
+        getView();
+    }
 
-	public boolean handleBack() {
-		return false;
-	}
+    public boolean handleBack() {
+        return false;
+    }
 
     public void applyOptions(Options options) {
 
     }
 
-	public Activity getActivity() {
-		return activity;
-	}
+    public Activity getActivity() {
+        return activity;
+    }
 
-	protected void applyOnParentStack(Task<ParentController> task) {
-        if (parentController != null) {
-            task.run(parentController);
-        }
+    protected void applyOnParentController(Task<ParentController> task) {
+        if (parentController != null) task.run(parentController);
     }
 
-	@Nullable
-    ParentController getParentStackController() {
-		return parentController;
-	}
+    @Nullable
+    ParentController getParentController() {
+        return parentController;
+    }
 
-	public void setParentController(final ParentController parentController) {
-		this.parentController = parentController;
-	}
+    public void setParentController(@NonNull final ParentController parentController) {
+        this.parentController = parentController;
+    }
 
     boolean performOnParentStack(Task<StackController> task) {
-	    if (parentController instanceof StackController) {
+        if (parentController instanceof StackController) {
             task.run((StackController) parentController);
             return true;
         }
         if (this instanceof StackController) {
-	        task.run((StackController) this);
+            task.run((StackController) this);
             return true;
         }
         return false;
     }
 
-    void performOnParentStack(Task<StackController> accept, Runnable  reject) {
+    void performOnParentStack(Task accept, Runnable reject) {
         if (!performOnParentStack(accept)) {
             reject.run();
         }
     }
 
-	@NonNull
-	public View getView() {
-		if (view == null) {
-		    if (isDestroyed) throw new RuntimeException("Tried to create view after it has already been destroyed");
+    @NonNull
+    public T getView() {
+        if (view == null) {
+            if (isDestroyed) {
+                throw new RuntimeException("Tried to create view after it has already been destroyed");
+            }
             view = createView();
-			view.setId(CompatUtils.generateViewId());
-			view.getViewTreeObserver().addOnGlobalLayoutListener(this);
-		}
-		return view;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	boolean isSameId(final String id) {
-		return StringUtils.isEqual(this.id, id);
-	}
-
-	@Nullable
-	public ViewController findControllerById(String id) {
-		return isSameId(id) ? this : null;
-	}
-
-	public void onViewAppeared() {
+            view.setId(CompatUtils.generateViewId());
+            view.getViewTreeObserver().addOnGlobalLayoutListener(this);
+        }
+        return view;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    boolean isSameId(final String id) {
+        return StringUtils.isEqual(this.id, id);
+    }
+
+    @Nullable
+    public ViewController findControllerById(String id) {
+        return isSameId(id) ? this : null;
+    }
+
+    public void onViewAppeared() {
         isShown = true;
+        applyOnParentController(parentController -> {
+            parentController.clearOptions();
+            parentController.applyOptions(options, (ReactComponent) getView());
+        });
     }
 
-	public void onViewDisappear() {
+    public void onViewDisappear() {
         isShown = false;
     }
 
-	public void destroy() {
-		if (isShown) {
-			isShown = false;
-			onViewDisappear();
-		}
-		if (view != null) {
-			view.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-			if (view.getParent() instanceof ViewGroup) {
-				((ViewManager) view.getParent()).removeView(view);
-			}
-			view = null;
+    public void destroy() {
+        if (isShown) {
+            isShown = false;
+            onViewDisappear();
+            if (view instanceof Destroyable) {
+                ((Destroyable) view).destroy();
+            }
+        }
+        if (view != null) {
+            view.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+            if (view.getParent() instanceof ViewGroup) {
+                ((ViewManager) view.getParent()).removeView(view);
+            }
+            view = null;
             isDestroyed = true;
-		}
-	}
-
-	@Override
-	public void onGlobalLayout() {
-		if (!isShown && isViewShown()) {
-			isShown = true;
-			onViewAppeared();
-		} else if (isShown && !isViewShown()) {
-			isShown = false;
-			onViewDisappear();
-		}
-	}
-
-	protected boolean isViewShown() {
+        }
+    }
+
+    @Override
+    public void onGlobalLayout() {
+        if (!isShown && isViewShown()) {
+            if (!viewVisibilityListener.onViewAppeared(view)) {
+                isShown = true;
+                onViewAppeared();
+            }
+        } else if (isShown && !isViewShown()) {
+            if (!viewVisibilityListener.onViewDisappear(view)) {
+                isShown = false;
+                onViewDisappear();
+            }
+        }
+    }
+
+    protected boolean isViewShown() {
         return !isDestroyed && getView().isShown();
-	}
+    }
 }

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

@@ -0,0 +1,15 @@
+package com.reactnativenavigation.viewcontrollers;
+
+import android.view.View;
+
+public class ViewVisibilityListenerAdapter implements ViewController.ViewVisibilityListener {
+    @Override
+    public boolean onViewAppeared(View view) {
+        return false;
+    }
+
+    @Override
+    public boolean onViewDisappear(View view) {
+        return false;
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/AlertOverlay.java

@@ -1,55 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.overlay;
-
-
-import android.content.Context;
-import android.content.DialogInterface;
-import android.support.v7.app.AlertDialog;
-
-import com.reactnativenavigation.parse.OverlayOptions;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-
-public class AlertOverlay implements OverlayInterface {
-
-	private AlertDialog dialog;
-
-	@Override
-	public AlertOverlay create(ViewController viewController, final OverlayOptions options) {
-		AlertDialog.Builder builder = new AlertDialog.Builder(viewController.getActivity());
-
-		builder.setTitle(options.getTitle());
-		builder.setMessage(options.getText());
-		if (options.getPositiveButton().isVisible()) {
-			builder.setPositiveButton(options.getPositiveButton().getText(), new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					//TODO: perform action options.getPositiveButton().getAction();
-					dialog.dismiss();
-				}
-			});
-		}
-		if (options.getNegativeButton().isVisible()) {
-			builder.setNegativeButton(options.getNegativeButton().getText(), new DialogInterface.OnClickListener() {
-				@Override
-				public void onClick(DialogInterface dialog, int which) {
-					//TODO: perform action options.getNegativeButton().getAction();
-					dialog.dismiss();
-				}
-			});
-		}
-		dialog = builder.create();
-
-		return this;
-	}
-
-	@Override
-	public void show() {
-		dialog.show();
-	}
-
-	@Override
-	public void dismiss() {
-		if (dialog != null) {
-			dialog.dismiss();
-		}
-	}
-}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/DialogViewController.java

@@ -1,27 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.overlay;
-
-import android.app.Activity;
-import android.support.annotation.NonNull;
-import android.view.View;
-
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-
-
-public class DialogViewController extends ViewController {
-
-	private ComponentViewController.ReactViewCreator viewCreator;
-	private String componentName;
-
-	public DialogViewController(Activity activity, String id, String componentName, ComponentViewController.ReactViewCreator viewCreator) {
-		super(activity, id);
-		this.viewCreator = viewCreator;
-		this.componentName = componentName;
-	}
-
-	@NonNull
-	@Override
-	protected View createView() {
-		return viewCreator.create(getActivity(), getId(), componentName).asView();
-	}
-}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/OverlayFactory.java

@@ -1,35 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.overlay;
-
-
-import com.reactnativenavigation.parse.OverlayOptions;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-
-public class OverlayFactory {
-
-	public enum Overlay {
-		AlertDialog("alert", new AlertOverlay()),
-		Snackbar("snackbar", new SnackbarOverlay());
-
-		private String name;
-		private OverlayInterface overlayInstance;
-
-		Overlay(String name, OverlayInterface overlayInstance) {
-			this.name = name;
-			this.overlayInstance = overlayInstance;
-		}
-
-		public static Overlay create(String type) {
-			for (Overlay overlay : values()) {
-				if (overlay.name.equals(type)) {
-					return overlay;
-				}
-			}
-			return AlertDialog;
-		}
-	}
-
-	public static OverlayInterface create(String type, ViewController viewController, OverlayOptions options) {
-		return Overlay.create(type).overlayInstance.create(viewController, options);
-	}
-
-}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/overlay/SnackbarOverlay.java

@@ -1,88 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.overlay;
-
-
-import android.app.Activity;
-import android.content.Context;
-import android.support.design.widget.Snackbar;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.style.ForegroundColorSpan;
-import android.view.View;
-
-import com.reactnativenavigation.parse.OverlayOptions;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-
-import static com.reactnativenavigation.parse.OverlayOptions.NO_COLOR;
-
-public class SnackbarOverlay implements OverlayInterface {
-
-	private Snackbar snackbar;
-	private OverlayOptions options;
-
-	@Override
-	public SnackbarOverlay create(ViewController viewController, OverlayOptions options) {
-		this.options = options;
-
-		init(viewController);
-		setAction();
-		setStyle();
-
-		return this;
-	}
-
-	private void init(ViewController viewController) {
-		snackbar = Snackbar.make(viewController.getView(),
-				options.getTextColor() == NO_COLOR ? options.getText() : getStyledText(),
-				getDuration(options.getDuration()));
-	}
-
-	private Spanned getStyledText() {
-		SpannableStringBuilder spannableStringBuilder = new SpannableStringBuilder(options.getText());
-		spannableStringBuilder.setSpan(new ForegroundColorSpan(options.getTextColor()), 0,
-				spannableStringBuilder.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
-		return spannableStringBuilder;
-	}
-
-	@Override
-	public void show() {
-		snackbar.show();
-	}
-
-	@Override
-	public void dismiss() {
-		snackbar.dismiss();
-	}
-
-	private int getDuration(String duration) {
-		switch (duration) {
-			case "short":
-				return Snackbar.LENGTH_SHORT;
-			case "long":
-				return Snackbar.LENGTH_LONG;
-			case "indefinite":
-				return Snackbar.LENGTH_INDEFINITE;
-			default:
-				return Snackbar.LENGTH_SHORT;
-		}
-	}
-
-	private void setAction() {
-		if (options.getButton() != null) {
-			snackbar.setAction(options.getButton().getText(), new View.OnClickListener() {
-				@Override
-				public void onClick(View v) {
-					//TODO: perform action
-				}
-			});
-		}
-	}
-
-	private void setStyle() {
-		if (options.getButton() != null && options.getButton().getTextColor() != NO_COLOR) {
-			snackbar.setActionTextColor(options.getButton().getTextColor());
-		}
-		if (options.getBackgroundColor() != NO_COLOR) {
-			snackbar.getView().setBackgroundColor(options.getBackgroundColor());
-		}
-	}
-}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabController.java

@@ -1,80 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.toptabs;
-
-import android.app.Activity;
-import android.view.View;
-
-import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.presentation.NavigationOptionsListener;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.views.TopTab;
-
-public class TopTabController extends ViewController implements NavigationOptionsListener {
-
-    private final String componentName;
-    private ComponentViewController.ReactViewCreator viewCreator;
-    private TopTab topTab;
-    private boolean isSelectedTab;
-
-    public TopTabController(Activity activity, String id, String name, ComponentViewController.ReactViewCreator viewCreator, Options initialOptions) {
-        super(activity, id);
-        this.componentName = name;
-        this.viewCreator = viewCreator;
-        this.options = initialOptions;
-    }
-
-    @Override
-    public void onViewAppeared() {
-        super.onViewAppeared();
-        isSelectedTab = true;
-        applyOptions(options);
-        topTab.sendComponentStart();
-    }
-
-    @Override
-    public void applyOptions(Options options) {
-        applyOnParentStack(parentController -> parentController.applyOptions(options));
-    }
-
-    @Override
-    public void onViewDisappear() {
-        super.onViewDisappear();
-        isSelectedTab = false;
-        topTab.sendComponentStop();
-    }
-
-    @Override
-    protected boolean isViewShown() {
-        return super.isViewShown() && isSelectedTab;
-    }
-
-    @Override
-    public View createView() {
-        topTab = new TopTab(
-                getActivity(),
-                viewCreator.create(getActivity(), getId(), componentName)
-        );
-        return topTab;
-    }
-
-    @Override
-    public void destroy() {
-        super.destroy();
-        if (topTab != null) topTab.destroy();
-        topTab = null;
-    }
-
-    @Override
-    public void mergeOptions(Options options) {
-        this.options.mergeWith(options);
-        applyOptions(this.options);
-    }
-
-    String getTabTitle() {
-        return options.topTabOptions.title.get("");
-    }
-
-    public void setTabIndex(int i) {
-        options.topTabOptions.tabIndex = i;
-    }
-}

lib/android/app/src/main/java/com/reactnativenavigation/viewcontrollers/toptabs/TopTabsController.java

@@ -2,23 +2,24 @@ package com.reactnativenavigation.viewcontrollers.toptabs;
 
 import android.app.Activity;
 import android.support.annotation.NonNull;
-import android.view.ViewGroup;
+import android.view.View;
 
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.presentation.NavigationOptionsListener;
 import com.reactnativenavigation.utils.Task;
 import com.reactnativenavigation.viewcontrollers.ParentController;
 import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.views.TopTabsLayout;
+import com.reactnativenavigation.viewcontrollers.ViewVisibilityListenerAdapter;
+import com.reactnativenavigation.views.ReactComponent;
 import com.reactnativenavigation.views.TopTabsLayoutCreator;
+import com.reactnativenavigation.views.TopTabsViewPager;
 
 import java.util.Collection;
 import java.util.List;
 
-public class TopTabsController extends ParentController implements NavigationOptionsListener {
+public class TopTabsController extends ParentController<TopTabsViewPager> implements NavigationOptionsListener {
 
     private List<ViewController> tabs;
-    private TopTabsLayout topTabsLayout;
     private TopTabsLayoutCreator viewCreator;
     private Options options;
 
@@ -29,14 +30,20 @@ public class TopTabsController extends ParentController implements NavigationOpt
         this.tabs = tabs;
         for (ViewController tab : tabs) {
             tab.setParentController(this);
+            tab.setViewVisibilityListener(new ViewVisibilityListenerAdapter() {
+                @Override
+                public boolean onViewAppeared(View view) {
+                    return getView().isCurrentView(view);
+                }
+            });
         }
     }
 
     @NonNull
     @Override
-    protected ViewGroup createView() {
-        topTabsLayout = viewCreator.create();
-        return topTabsLayout;
+    protected TopTabsViewPager createView() {
+        view = viewCreator.create();
+        return (TopTabsViewPager) view;
     }
 
     @NonNull
@@ -48,6 +55,7 @@ public class TopTabsController extends ParentController implements NavigationOpt
     @Override
     public void onViewAppeared() {
         applyOptions(options);
+        applyOnParentController(parentController -> ((ParentController) parentController).setupTopTabsWithViewPager(getView()));
         performOnCurrentTab(ViewController::onViewAppeared);
     }
 
@@ -58,7 +66,12 @@ public class TopTabsController extends ParentController implements NavigationOpt
 
     @Override
     public void applyOptions(Options options) {
-        topTabsLayout.applyOptions(options);
+        getView().applyOptions(options);
+    }
+
+    @Override
+    public void applyOptions(Options options, ReactComponent childComponent) {
+        applyOnParentController(parentController -> ((ParentController) parentController).applyOptions(options, childComponent));
     }
 
     @Override
@@ -67,10 +80,10 @@ public class TopTabsController extends ParentController implements NavigationOpt
     }
 
     public void switchToTab(int index) {
-        topTabsLayout.switchToTab(index);
+        getView().switchToTab(index);
     }
 
     private void performOnCurrentTab(Task<ViewController> task) {
-        task.run(tabs.get(topTabsLayout.getCurrentItem()));
+        task.run(tabs.get(getView().getCurrentItem()));
     }
 }

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

@@ -1,44 +0,0 @@
-package com.reactnativenavigation.viewcontrollers.toptabs;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.support.v4.view.ViewPager;
-import android.view.ViewGroup;
-
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-
-import java.util.List;
-
-import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-
-@SuppressLint("ViewConstructor")
-public class TopTabsViewPager extends ViewPager {
-    private static final int OFFSCREEN_PAGE_LIMIT = 99;
-    private List<ViewController> tabs;
-
-    public TopTabsViewPager(Context context, List<ViewController> tabs, TopTabsAdapter adapter) {
-        super(context);
-        this.tabs = tabs;
-        init(adapter);
-    }
-
-    private void init(TopTabsAdapter adapter) {
-        setOffscreenPageLimit(OFFSCREEN_PAGE_LIMIT);
-        for (ViewController tab : tabs) {
-            addView(tab.getView(), new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
-        }
-        setAdapter(adapter);
-        addOnPageChangeListener(adapter);
-    }
-
-    public void destroy() {
-        for (ViewController tab : tabs) {
-            tab.destroy();
-        }
-    }
-
-    public void sendOnNavigationButtonPressed(String id) {
-        ((ComponentViewController.IReactView) tabs.get(getCurrentItem()).getView()).sendOnNavigationButtonPressed(id);
-    }
-}

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

@@ -2,13 +2,15 @@ package com.reactnativenavigation.views;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
+import android.view.MotionEvent;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController.IReactView;
+import com.reactnativenavigation.viewcontrollers.IReactView;
+import com.reactnativenavigation.views.touch.OverlayTouchDelegate;
 
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.widget.RelativeLayout.BELOW;
@@ -17,11 +19,13 @@ import static android.widget.RelativeLayout.BELOW;
 public class ComponentLayout extends FrameLayout implements ReactComponent, TitleBarButton.OnClickListener {
 
     private IReactView reactView;
+    private final OverlayTouchDelegate touchDelegate;
 
-	public ComponentLayout(Context context, IReactView reactView) {
+    public ComponentLayout(Context context, IReactView reactView) {
 		super(context);
 		this.reactView = reactView;
         addView(reactView.asView(), MATCH_PARENT, MATCH_PARENT);
+        touchDelegate = new OverlayTouchDelegate(reactView);
     }
 
     @Override
@@ -51,7 +55,7 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, Titl
 
     @Override
     public void applyOptions(Options options) {
-
+        touchDelegate.setInterceptTouchOutside(options.overlayOptions.interceptTouchOutside == Options.BooleanOptions.True);
     }
 
     @Override
@@ -64,16 +68,21 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, Titl
         return reactView.getScrollEventListener();
     }
 
+    @Override
+    public void dispatchTouchEventToJs(MotionEvent event) {
+        reactView.dispatchTouchEventToJs(event);
+    }
+
     @Override
     public void drawBehindTopBar() {
-        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) reactView.asView().getLayoutParams();
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
         layoutParams.removeRule(BELOW);
         reactView.asView().setLayoutParams(layoutParams);
     }
 
     @Override
     public void drawBelowTopBar(TopBar topBar) {
-        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) reactView.asView().getLayoutParams();
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
         layoutParams.addRule(BELOW, topBar.getId());
         reactView.asView().setLayoutParams(layoutParams);
     }
@@ -82,4 +91,9 @@ public class ComponentLayout extends FrameLayout implements ReactComponent, Titl
     public void onPress(String buttonId) {
         reactView.sendOnNavigationButtonPressed(buttonId);
     }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        return touchDelegate.onInterceptTouchEvent(ev);
+    }
 }

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

@@ -4,9 +4,10 @@ import android.app.Activity;
 
 import com.facebook.react.ReactInstanceManager;
 import com.reactnativenavigation.react.ReactComponentViewCreator;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
+import com.reactnativenavigation.viewcontrollers.IReactView;
+import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
 
-public class ComponentViewCreator implements ComponentViewController.ReactViewCreator {
+public class ComponentViewCreator implements ReactViewCreator {
 
     private ReactInstanceManager instanceManager;
 
@@ -15,8 +16,8 @@ public class ComponentViewCreator implements ComponentViewController.ReactViewCr
 	}
 
 	@Override
-	public ComponentViewController.IReactView create(Activity activity, String componentId, String componentName) {
-        ComponentViewController.IReactView reactView = new ReactComponentViewCreator(instanceManager).create(activity, componentId, componentName);
+	public IReactView create(Activity activity, String componentId, String componentName) {
+        IReactView reactView = new ReactComponentViewCreator(instanceManager).create(activity, componentId, componentName);
         return new ComponentLayout(activity, reactView);
 	}
 }

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

@@ -1,6 +1,6 @@
 package com.reactnativenavigation.views;
 
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
+import com.reactnativenavigation.viewcontrollers.IReactView;
 
-public interface ReactComponent extends Component, ComponentViewController.IReactView {
+public interface ReactComponent extends Component, IReactView {
 }

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

@@ -2,6 +2,7 @@ package com.reactnativenavigation.views;
 
 import android.content.Context;
 import android.support.annotation.RestrictTo;
+import android.support.v4.view.ViewPager;
 import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.parse.Options;
@@ -43,4 +44,8 @@ public class StackLayout extends RelativeLayout implements TitleBarButton.OnClic
     public void clearOptions() {
         topBar.clear();
     }
+
+    public void setupTopTabsWithViewPager(ViewPager viewPager) {
+        topBar.setupTopTabsWithViewPager(viewPager);
+    }
 }

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

@@ -5,6 +5,7 @@ import android.content.Context;
 import android.graphics.Typeface;
 import android.support.annotation.Nullable;
 import android.support.design.widget.AppBarLayout;
+import android.support.v4.view.ViewPager;
 import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.Menu;
@@ -20,7 +21,6 @@ import com.reactnativenavigation.parse.Color;
 import com.reactnativenavigation.parse.Fraction;
 import com.reactnativenavigation.parse.Number;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsViewPager;
 
 import java.util.ArrayList;
 
@@ -37,6 +37,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         this.onClickListener = onClickListener;
         collapsingBehavior = new TopBarCollapseBehavior(this);
         titleBar = new Toolbar(context);
+        titleBar.getMenu();
         topTabs = new TopTabs(getContext());
         this.animator = new TopBarAnimator(this);
         addView(titleBar);
@@ -146,7 +147,7 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         return titleBar;
     }
 
-    public void setupTopTabsWithViewPager(TopTabsViewPager viewPager) {
+    public void setupTopTabsWithViewPager(ViewPager viewPager) {
         initTopTabs();
         topTabs.setupWithViewPager(viewPager);
     }
@@ -156,8 +157,8 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         addView(topTabs);
     }
 
-    public void enableCollapse() {
-        collapsingBehavior.enableCollapse();
+    public void enableCollapse(ScrollEventListener scrollEventListener) {
+        collapsingBehavior.enableCollapse(scrollEventListener);
     }
 
     public void disableCollapse() {
@@ -190,5 +191,6 @@ public class TopBar extends AppBarLayout implements ScrollEventListener.ScrollAw
         titleBar.setTitle(null);
         titleBar.setNavigationIcon(null);
         titleBar.getMenu().clear();
+        removeView(topTabs);
     }
 }

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

@@ -1,56 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.view.View;
-import android.widget.FrameLayout;
-
-import com.reactnativenavigation.interfaces.ScrollEventListener;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController.IReactView;
-
-@SuppressLint("ViewConstructor")
-public class TopTab extends FrameLayout implements IReactView {
-
-	private final IReactView reactView;
-
-	public TopTab(Context context, IReactView reactView) {
-		super(context);
-		this.reactView = reactView;
-        addView(reactView.asView());
-	}
-
-	@Override
-	public boolean isReady() {
-		return reactView.isReady();
-	}
-
-	@Override
-	public View asView() {
-		return this;
-	}
-
-	@Override
-	public void destroy() {
-		reactView.destroy();
-	}
-
-	@Override
-	public void sendComponentStart() {
-		reactView.sendComponentStart();
-	}
-
-	@Override
-	public void sendComponentStop() {
-		reactView.sendComponentStop();
-	}
-
-    @Override
-    public void sendOnNavigationButtonPressed(String buttonId) {
-        reactView.sendOnNavigationButtonPressed(buttonId);
-    }
-
-    @Override
-    public ScrollEventListener getScrollEventListener() {
-        return reactView.getScrollEventListener();
-    }
-}

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

@@ -1,23 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.app.Activity;
-
-import com.facebook.react.ReactInstanceManager;
-import com.reactnativenavigation.react.ReactComponentViewCreator;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController;
-
-public class TopTabCreator implements ComponentViewController.ReactViewCreator {
-
-
-    private ReactInstanceManager instanceManager;
-
-    public TopTabCreator(ReactInstanceManager instanceManager) {
-        this.instanceManager = instanceManager;
-    }
-
-	@Override
-	public ComponentViewController.IReactView create(Activity activity, String componentId, String componentName) {
-        ComponentViewController.IReactView reactView = new ReactComponentViewCreator(instanceManager).create(activity, componentId, componentName);
-        return new TopTab(activity, reactView);
-	}
-}

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

@@ -1,73 +0,0 @@
-package com.reactnativenavigation.views;
-
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.support.annotation.RestrictTo;
-import android.support.v4.view.ViewPager;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.RelativeLayout;
-
-import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.viewcontrollers.ViewController;
-import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsAdapter;
-import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsViewPager;
-
-import java.util.List;
-
-@SuppressLint("ViewConstructor")
-public class TopTabsLayout extends RelativeLayout implements Component, TitleBarButton.OnClickListener {
-
-    private TopBar topBar;
-    private TopTabsViewPager viewPager;
-
-    public TopTabsLayout(Context context, List<ViewController> tabs, TopTabsAdapter adapter) {
-        super(context);
-        viewPager = new TopTabsViewPager(context, tabs, adapter);
-        topBar = new TopBar(context, this);
-        topBar.setId(View.generateViewId());
-
-        initViews();
-    }
-
-    private void initViews() {
-        LayoutParams layoutParams = new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-        layoutParams.addRule(BELOW, topBar.getId());
-        addView(topBar, new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-        addView(viewPager, layoutParams);
-        topBar.setupTopTabsWithViewPager(viewPager);
-    }
-
-    @Override
-    public void applyOptions(Options options) {
-
-    }
-
-    @Override
-    public void drawBehindTopBar() {
-
-    }
-
-    @Override
-    public void drawBelowTopBar(TopBar topBar) {
-
-    }
-
-    @RestrictTo(RestrictTo.Scope.TESTS)
-    public ViewPager getViewPager() {
-        return viewPager;
-    }
-
-    public void switchToTab(int index) {
-        viewPager.setCurrentItem(index);
-    }
-
-    public int getCurrentItem() {
-        return viewPager.getCurrentItem();
-    }
-
-    @Override
-    public void onPress(String buttonId) {
-        viewPager.sendOnNavigationButtonPressed(buttonId);
-    }
-}

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

@@ -16,7 +16,7 @@ public class TopTabsLayoutCreator {
         this.tabs = tabs;
     }
 
-    public TopTabsLayout create() {
-        return new TopTabsLayout(context, tabs, new TopTabsAdapter(tabs));
+    public TopTabsViewPager create() {
+        return new TopTabsViewPager(context, tabs, new TopTabsAdapter(tabs));
     }
 }

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

@@ -0,0 +1,83 @@
+package com.reactnativenavigation.views;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.RelativeLayout;
+
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.IReactView;
+import com.reactnativenavigation.viewcontrollers.ViewController;
+import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsAdapter;
+
+import java.util.List;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.widget.RelativeLayout.BELOW;
+
+@SuppressLint("ViewConstructor")
+public class TopTabsViewPager extends ViewPager implements Component, TitleBarButton.OnClickListener {
+
+    private static final int OFFSCREEN_PAGE_LIMIT = 99;
+    private List<ViewController> tabs;
+
+    public TopTabsViewPager(Context context, List<ViewController> tabs, TopTabsAdapter adapter) {
+        super(context);
+        this.tabs = tabs;
+        initTabs(adapter);
+    }
+
+    private void initTabs(TopTabsAdapter adapter) {
+        setOffscreenPageLimit(OFFSCREEN_PAGE_LIMIT);
+        for (ViewController tab : tabs) {
+            addView(tab.getView(), new ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+        }
+        setAdapter(adapter);
+        addOnPageChangeListener(adapter);
+    }
+
+    @Override
+    public void applyOptions(Options options) {
+
+    }
+
+    @Override
+    public void drawBehindTopBar() {
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
+        layoutParams.removeRule(BELOW);
+        setLayoutParams(layoutParams);
+    }
+
+    @Override
+    public void drawBelowTopBar(TopBar topBar) {
+        RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) getLayoutParams();
+        layoutParams.addRule(BELOW, topBar.getId());
+        setLayoutParams(layoutParams);
+    }
+
+    public void switchToTab(int index) {
+        setCurrentItem(index);
+    }
+
+    @Override
+    public void onPress(String buttonId) {
+        ((IReactView) tabs.get(getCurrentItem()).getView()).sendOnNavigationButtonPressed(buttonId);
+    }
+
+    public void destroy() {
+        for (ViewController tab : tabs) {
+            tab.destroy();
+        }
+    }
+
+    public boolean isCurrentView(View view) {
+        for (ViewController tab : tabs) {
+            if (tab.getView() == view) {
+                return true;
+            }
+        }
+        return false;
+    }
+}

lib/android/app/src/main/java/com/reactnativenavigation/views/touch/OverlayTouchDelegate.java

@@ -0,0 +1,54 @@
+package com.reactnativenavigation.views.touch;
+
+import android.graphics.Rect;
+import android.support.annotation.VisibleForTesting;
+import android.view.MotionEvent;
+import android.view.ViewGroup;
+
+import com.reactnativenavigation.utils.UiUtils;
+import com.reactnativenavigation.viewcontrollers.IReactView;
+
+public class OverlayTouchDelegate {
+    private enum TouchLocation {Outside, Inside}
+    private final Rect hitRect = new Rect();
+    private IReactView reactView;
+    private boolean interceptTouchOutside;
+
+    public OverlayTouchDelegate(IReactView reactView) {
+        this.reactView = reactView;
+    }
+
+    public boolean onInterceptTouchEvent(MotionEvent event) {
+        switch (event.getActionMasked()) {
+            case MotionEvent.ACTION_DOWN:
+                return handleDown(event);
+            default:
+                reactView.dispatchTouchEventToJs(event);
+                return false;
+
+        }
+    }
+
+    @VisibleForTesting
+    public boolean handleDown(MotionEvent event) {
+        TouchLocation location = getTouchLocation(event);
+        if (location == TouchLocation.Inside) {
+            reactView.dispatchTouchEventToJs(event);
+        }
+        if (interceptTouchOutside) {
+            return location == TouchLocation.Inside;
+        }
+        return location == TouchLocation.Outside;
+    }
+
+    private TouchLocation getTouchLocation(MotionEvent ev) {
+        ((ViewGroup) reactView.asView()).getChildAt(0).getHitRect(hitRect);
+        return hitRect.contains((int) ev.getRawX(), (int) ev.getRawY() - UiUtils.getStatusBarHeight(reactView.asView().getContext())) ?
+                TouchLocation.Inside :
+                TouchLocation.Outside;
+    }
+
+    public void setInterceptTouchOutside(boolean interceptTouchOutside) {
+        this.interceptTouchOutside = interceptTouchOutside;
+    }
+}

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

@@ -6,7 +6,7 @@ import com.reactnativenavigation.parse.*;
 import com.reactnativenavigation.viewcontrollers.*;
 
 public class SimpleComponentViewController extends ComponentViewController {
-    public SimpleComponentViewController(final Activity activity, final String id) {
-        super(activity, id, "theComponentName", new TestComponentViewCreator(), new Options());
+    public SimpleComponentViewController(final Activity activity, final String id, Options initialOptions) {
+        super(activity, id, "theComponentName", new TestComponentViewCreator(), initialOptions);
     }
 }

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

@@ -0,0 +1,59 @@
+package com.reactnativenavigation.mocks;
+
+import android.content.Context;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.widget.RelativeLayout;
+
+import com.reactnativenavigation.interfaces.ScrollEventListener;
+import com.reactnativenavigation.viewcontrollers.IReactView;
+
+public class SimpleOverlay extends RelativeLayout implements IReactView {
+    public SimpleOverlay(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isReady() {
+        return true;
+    }
+
+    @Override
+    public View asView() {
+        FrameLayout root = new FrameLayout(getContext());
+        FrameLayout overlay = new FrameLayout(getContext());
+        root.addView(overlay);
+        return root;
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+
+    @Override
+    public void sendComponentStart() {
+
+    }
+
+    @Override
+    public void sendComponentStop() {
+
+    }
+
+    @Override
+    public void sendOnNavigationButtonPressed(String buttonId) {
+
+    }
+
+    @Override
+    public ScrollEventListener getScrollEventListener() {
+        return null;
+    }
+
+    @Override
+    public void dispatchTouchEventToJs(MotionEvent event) {
+
+    }
+}

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

@@ -1,23 +1,94 @@
 package com.reactnativenavigation.mocks;
 
-import android.app.*;
-import android.view.*;
+import android.app.Activity;
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
 
-import com.reactnativenavigation.viewcontrollers.*;
+import com.reactnativenavigation.interfaces.ScrollEventListener;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.viewcontrollers.ViewController;
+import com.reactnativenavigation.views.ReactComponent;
+import com.reactnativenavigation.views.TopBar;
 
-public class SimpleViewController extends ViewController {
+public class SimpleViewController extends ViewController<FrameLayout> {
 
     public SimpleViewController(final Activity activity, String id) {
         super(activity, id);
+        options = new Options();
     }
 
     @Override
-    protected View createView() {
-        return new View(getActivity());
+    protected FrameLayout createView() {
+        return new SimpleView(getActivity());
     }
 
     @Override
     public String toString() {
         return "SimpleViewController " + getId();
     }
+
+    public class SimpleView extends FrameLayout implements ReactComponent {
+
+        public SimpleView(@NonNull Context context) {
+            super(context);
+        }
+
+        @Override
+        public void applyOptions(Options options) {
+
+        }
+
+        @Override
+        public void drawBehindTopBar() {
+
+        }
+
+        @Override
+        public void drawBelowTopBar(TopBar topBar) {
+
+        }
+
+        @Override
+        public boolean isReady() {
+            return false;
+        }
+
+        @Override
+        public View asView() {
+            return null;
+        }
+
+        @Override
+        public void destroy() {
+
+        }
+
+        @Override
+        public void sendComponentStart() {
+
+        }
+
+        @Override
+        public void sendComponentStop() {
+
+        }
+
+        @Override
+        public void sendOnNavigationButtonPressed(String buttonId) {
+
+        }
+
+        @Override
+        public ScrollEventListener getScrollEventListener() {
+            return null;
+        }
+
+        @Override
+        public void dispatchTouchEventToJs(MotionEvent event) {
+
+        }
+    }
 }

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

@@ -1,39 +1,24 @@
 package com.reactnativenavigation.mocks;
 
 import android.content.Context;
+import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.RelativeLayout;
 
 import com.reactnativenavigation.interfaces.ScrollEventListener;
 import com.reactnativenavigation.parse.Options;
-import com.reactnativenavigation.views.ReactComponent;
+import com.reactnativenavigation.viewcontrollers.IReactView;
+import com.reactnativenavigation.views.ComponentLayout;
 import com.reactnativenavigation.views.TitleBarButton;
-import com.reactnativenavigation.views.TopBar;
 
-public class TestComponentLayout extends RelativeLayout implements ReactComponent, TitleBarButton.OnClickListener {
+public class TestComponentLayout extends ComponentLayout implements TitleBarButton.OnClickListener {
 
-    private final View contentView;
+    private IReactView reactView;
 
-    public TestComponentLayout(final Context context) {
-        super(context);
-        contentView = new View(context);
-        addView(contentView);
+    public TestComponentLayout(final Context context, IReactView reactView) {
+        super(context, reactView);
+        this.reactView = reactView;
     }
 
-    @Override
-    public void drawBehindTopBar() {
-        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-        layoutParams.removeRule(BELOW);
-        contentView.setLayoutParams(layoutParams);
-    }
-
-    @Override
-    public void drawBelowTopBar(TopBar topBar) {
-        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-        layoutParams.addRule(BELOW, topBar.getId());
-        contentView.setLayoutParams(layoutParams);
-    }
 
     @Override
     public boolean isReady() {
@@ -51,10 +36,12 @@ public class TestComponentLayout extends RelativeLayout implements ReactComponen
 
     @Override
     public void sendComponentStart() {
+        reactView.sendComponentStart();
     }
 
     @Override
     public void sendComponentStop() {
+        reactView.sendComponentStop();
     }
 
     @Override
@@ -72,6 +59,11 @@ public class TestComponentLayout extends RelativeLayout implements ReactComponen
         return null;
     }
 
+    @Override
+    public void dispatchTouchEventToJs(MotionEvent event) {
+
+    }
+
     @Override
     public void onPress(String buttonId) {
 

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

@@ -1,13 +1,18 @@
 package com.reactnativenavigation.mocks;
 
-import android.app.*;
+import android.app.Activity;
 
-import com.reactnativenavigation.viewcontrollers.*;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController.*;
+import com.reactnativenavigation.viewcontrollers.ReactViewCreator;
+import com.reactnativenavigation.viewcontrollers.IReactView;
+import com.reactnativenavigation.views.ComponentLayout;
+import com.reactnativenavigation.views.ReactComponent;
+
+import static org.mockito.Mockito.spy;
 
 public class TestComponentViewCreator implements ReactViewCreator {
     @Override
-    public ComponentViewController.IReactView create(final Activity activity, final String componentId, final String componentName) {
-        return new TestComponentLayout(activity);
+    public ReactComponent create(final Activity activity, final String componentId, final String componentName) {
+        IReactView reactView = spy(new TestReactView(activity));
+        return new ComponentLayout(activity, reactView);
     }
 }

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

@@ -0,0 +1,57 @@
+package com.reactnativenavigation.mocks;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.MotionEvent;
+import android.view.View;
+import android.widget.FrameLayout;
+
+import com.reactnativenavigation.interfaces.ScrollEventListener;
+import com.reactnativenavigation.viewcontrollers.IReactView;
+
+public class TestReactView extends FrameLayout implements IReactView {
+
+    public TestReactView(@NonNull Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isReady() {
+        return false;
+    }
+
+    @Override
+    public View asView() {
+        return this;
+    }
+
+    @Override
+    public void destroy() {
+
+    }
+
+    @Override
+    public void sendComponentStart() {
+
+    }
+
+    @Override
+    public void sendComponentStop() {
+
+    }
+
+    @Override
+    public void sendOnNavigationButtonPressed(String buttonId) {
+
+    }
+
+    @Override
+    public ScrollEventListener getScrollEventListener() {
+        return null;
+    }
+
+    @Override
+    public void dispatchTouchEventToJs(MotionEvent event) {
+
+    }
+}

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

@@ -4,9 +4,11 @@ import android.content.*;
 import android.view.*;
 
 import com.reactnativenavigation.interfaces.ScrollEventListener;
-import com.reactnativenavigation.viewcontrollers.*;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.views.ReactComponent;
+import com.reactnativenavigation.views.TopBar;
 
-public class TopTabLayoutMock extends View implements ComponentViewController.IReactView {
+public class TopTabLayoutMock extends View implements ReactComponent {
 
     public TopTabLayoutMock(Context context) {
         super(context);
@@ -46,4 +48,24 @@ public class TopTabLayoutMock extends View implements ComponentViewController.IR
     public ScrollEventListener getScrollEventListener() {
         return null;
     }
+
+    @Override
+    public void dispatchTouchEventToJs(MotionEvent event) {
+
+    }
+
+    @Override
+    public void applyOptions(Options options) {
+
+    }
+
+    @Override
+    public void drawBehindTopBar() {
+
+    }
+
+    @Override
+    public void drawBelowTopBar(TopBar topBar) {
+
+    }
 }

lib/android/app/src/test/java/com/reactnativenavigation/parse/OverlayOptionsTest.java

@@ -1,47 +0,0 @@
-package com.reactnativenavigation.parse;
-
-import android.graphics.Color;
-
-import com.reactnativenavigation.*;
-
-import org.json.*;
-import org.junit.*;
-
-import static org.assertj.core.api.Java6Assertions.*;
-
-public class OverlayOptionsTest extends BaseTest {
-
-    @Test
-    public void parsesNullAsDefaultEmptyOptions() throws Exception {
-        assertThat(OverlayOptions.parse(null)).isNotNull();
-    }
-
-    @Test
-    public void parsesJson() throws Exception {
-        JSONObject json = new JSONObject();
-        json.put("title", "the title");
-        json.put("text", "the text");
-        JSONObject nestedButton = new JSONObject();
-        nestedButton.put("text", "OK");
-        nestedButton.put("action", "action");
-        json.put("positiveButton", nestedButton);
-        json.put("textColor", Color.RED);
-        json.put("duration", "short");
-        json.put("backgroundColor", Color.RED);
-
-        OverlayOptions result = OverlayOptions.parse(json);
-        assertThat(result.getTitle()).isEqualTo("the title");
-        assertThat(result.getText()).isEqualTo("the text");
-        assertThat(result.getPositiveButton().getText()).isEqualTo("OK");
-        assertThat(result.getPositiveButton().getAction()).isEqualTo("action");
-        assertThat(result.getTextColor()).isEqualTo(Color.RED);
-        assertThat(result.getDuration()).isEqualTo("short");
-        assertThat(result.getBackgroundColor()).isEqualTo(Color.RED);
-    }
-
-    @Test
-    public void defaultEmptyOptions() throws Exception {
-        OverlayOptions uut = new OverlayOptions();
-        assertThat(uut.getTitle()).isEmpty();
-    }
-}

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

@@ -4,6 +4,7 @@ import android.app.Activity;
 
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.TestComponentLayout;
+import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.views.StackLayout;
 
@@ -17,15 +18,14 @@ import static org.mockito.Mockito.when;
 
 public class ComponentViewControllerTest extends BaseTest {
     private ComponentViewController uut;
-    private ParentController<StackLayout> parentController;
-    private ComponentViewController.IReactView view;
+    private IReactView view;
 
     @Override
     public void beforeEach() {
         super.beforeEach();
         Activity activity = newActivity();
-        view = spy(new TestComponentLayout(activity));
-        parentController = new StackController(activity, "stack");
+        view = spy(new TestComponentLayout(activity, new TestReactView(activity)));
+        ParentController<StackLayout> parentController = new StackController(activity, "stack");
         uut = new ComponentViewController(activity, "componentId1", "componentName", (activity1, componentId, componentName) -> view, new Options());
         uut.setParentController(parentController);
         parentController.ensureViewIsCreated();
@@ -40,6 +40,7 @@ public class ComponentViewControllerTest extends BaseTest {
     public void componentViewDestroyedOnDestroy() throws Exception {
         uut.ensureViewIsCreated();
         verify(view, times(0)).destroy();
+        uut.onViewAppeared();
         uut.destroy();
         verify(view, times(1)).destroy();
     }

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

@@ -204,7 +204,7 @@ public class NavigatorTest extends BaseTest {
 
     @Test
     public void setOptions_CallsApplyNavigationOptions() {
-        ComponentViewController componentVc = new SimpleComponentViewController(activity, "theId");
+        ComponentViewController componentVc = new SimpleComponentViewController(activity, "theId", new Options());
         componentVc.setParentController(parentController);
         assertThat(componentVc.getOptions().topBarOptions.title.get("")).isEmpty();
         uut.setRoot(componentVc, new MockPromise());

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

@@ -10,6 +10,7 @@ import android.widget.RelativeLayout;
 import com.reactnativenavigation.BaseTest;
 import com.reactnativenavigation.mocks.MockPromise;
 import com.reactnativenavigation.mocks.TestComponentLayout;
+import com.reactnativenavigation.mocks.TestReactView;
 import com.reactnativenavigation.parse.Fraction;
 import com.reactnativenavigation.parse.Options;
 import com.reactnativenavigation.parse.Text;
@@ -18,6 +19,7 @@ import org.junit.Test;
 
 import javax.annotation.Nullable;
 
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.widget.RelativeLayout.BELOW;
 import static org.assertj.core.api.Java6Assertions.assertThat;
 import static org.mockito.Mockito.spy;
@@ -26,7 +28,7 @@ public class OptionsApplyingTest extends BaseTest {
     private Activity activity;
     private StackController stackController;
     private ComponentViewController uut;
-    private ComponentViewController.IReactView view;
+    private IReactView view;
     private Options initialNavigationOptions;
 
     @Override
@@ -34,7 +36,8 @@ public class OptionsApplyingTest extends BaseTest {
         super.beforeEach();
         activity = newActivity();
         initialNavigationOptions = new Options();
-        view = spy(new TestComponentLayout(activity));
+        view = spy(new TestComponentLayout(activity, new TestReactView(activity)));
+        view.asView().setLayoutParams(new RelativeLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
         uut = new ComponentViewController(activity,
                 "componentId1",
                 "componentName",
@@ -49,9 +52,10 @@ public class OptionsApplyingTest extends BaseTest {
     @Test
     public void applyNavigationOptionsHandlesNoParentStack() throws Exception {
         uut.setParentController(null);
-        assertThat(uut.getParentStackController()).isNull();
+        assertThat(uut.getParentController()).isNull();
+        uut.ensureViewIsCreated();
         uut.onViewAppeared();
-        assertThat(uut.getParentStackController()).isNull();
+        assertThat(uut.getParentController()).isNull();
     }
 
     @Test
@@ -79,6 +83,7 @@ public class OptionsApplyingTest extends BaseTest {
 
     @Test
     public void reappliesOptionsOnMerge() throws Exception {
+        uut.ensureViewIsCreated();
         uut.onViewAppeared();
         assertThat(stackController.getTopBar().getTitle()).isEmpty();
 
@@ -91,6 +96,7 @@ public class OptionsApplyingTest extends BaseTest {
 
     @Test
     public void appliesTopBackBackgroundColor() throws Exception {
+        uut.ensureViewIsCreated();
         uut.onViewAppeared();
 
         Options opts = new Options();
@@ -122,6 +128,7 @@ public class OptionsApplyingTest extends BaseTest {
     public void appliesTopBarTextSize() throws Exception {
         assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
         initialNavigationOptions.topBarOptions.title = new Text("the title");
+        uut.ensureViewIsCreated();
         uut.onViewAppeared();
 
         Options opts = new Options();
@@ -137,6 +144,7 @@ public class OptionsApplyingTest extends BaseTest {
     public void appliesTopBarHidden() throws Exception {
         assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
         initialNavigationOptions.topBarOptions.title = new Text("the title");
+        uut.ensureViewIsCreated();
         uut.onViewAppeared();
         assertThat(stackController.getTopBar().getVisibility()).isNotEqualTo(View.GONE);
 
@@ -152,6 +160,7 @@ public class OptionsApplyingTest extends BaseTest {
         assertThat(uut.getOptions()).isSameAs(initialNavigationOptions);
         initialNavigationOptions.topBarOptions.title = new Text("the title");
         initialNavigationOptions.topBarOptions.drawBehind = Options.BooleanOptions.False;
+        uut.ensureViewIsCreated();
         uut.onViewAppeared();
         stackController.animatePush(uut, new MockPromise() {
             @Override

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

@@ -84,4 +84,14 @@ public class ParentControllerTest extends BaseTest {
         uut.destroy();
         verify(child1, times(1)).destroy();
     }
+
+    @Test
+    public void optionsAreClearedWhenChildIsAppeared() throws Exception {
+        StackController stackController = spy(new StackController(activity, "stack"));
+        SimpleViewController child1 = new SimpleViewController(activity, "child1");
+        stackController.animatePush(child1, new MockPromise());
+
+        child1.onViewAppeared();
+        verify(stackController, times(1)).clearOptions();
+    }
 }

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

@@ -80,13 +80,13 @@ public class StackControllerTest extends BaseTest {
 
     @Test
     public void pushAssignsRefToSelfOnPushedController() throws Exception {
-        assertThat(child1.getParentStackController()).isNull();
+        assertThat(child1.getParentController()).isNull();
         uut.animatePush(child1, new MockPromise());
-        assertThat(child1.getParentStackController()).isEqualTo(uut);
+        assertThat(child1.getParentController()).isEqualTo(uut);
 
         StackController anotherNavController = new StackController(activity, "another");
         anotherNavController.animatePush(child2, new MockPromise());
-        assertThat(child2.getParentStackController()).isEqualTo(anotherNavController);
+        assertThat(child2.getParentController()).isEqualTo(anotherNavController);
     }
 
     @Test

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

@@ -1,51 +0,0 @@
-package com.reactnativenavigation.viewcontrollers;
-
-import android.app.*;
-
-import com.reactnativenavigation.*;
-import com.reactnativenavigation.mocks.*;
-import com.reactnativenavigation.parse.*;
-import com.reactnativenavigation.viewcontrollers.toptabs.*;
-
-import org.junit.*;
-
-import static org.mockito.Mockito.*;
-
-public class TopTabControllerTest extends BaseTest {
-    private TopTabController uut;
-    private TopTabLayoutMock view;
-    private ParentController parentController;
-    private Options initialOptions;
-
-    @Override
-    public void beforeEach() {
-        super.beforeEach();
-        Activity activity = newActivity();
-        view = spy(new TopTabLayoutMock(activity));
-        initialOptions = new Options();
-        uut = new TopTabController(activity,
-                "componentId",
-                "componentName",
-                (activity1, componentId, componentName) -> view,
-                initialOptions
-        );
-        parentController = spy(new TopTabsControllerMock(activity, "parentComponentId"));
-        uut.setParentController(parentController);
-    }
-
-    @Test
-    public void styleIsAppliedOnParentControllerWhenTabIsVisible() throws Exception {
-        uut.ensureViewIsCreated();
-        uut.onViewAppeared();
-        verify(parentController, times(1)).applyOptions(initialOptions);
-    }
-
-    @Test
-    public void styleIsAppliedOnParentControllerWhenOptionsAreSetDynamically() throws Exception {
-        uut.ensureViewIsCreated();
-        uut.onViewAppeared();
-        uut.mergeOptions(new Options());
-        verify(parentController, times(2)).applyOptions(initialOptions);
-    }
-
-}

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

@@ -1,67 +1,90 @@
 package com.reactnativenavigation.viewcontrollers;
 
-import android.app.*;
-import android.view.*;
-
-import com.reactnativenavigation.*;
-import com.reactnativenavigation.mocks.*;
-import com.reactnativenavigation.parse.*;
-import com.reactnativenavigation.viewcontrollers.ComponentViewController.*;
-import com.reactnativenavigation.viewcontrollers.toptabs.*;
-import com.reactnativenavigation.views.*;
-
-import org.junit.*;
-import org.mockito.*;
-
-import java.util.*;
-
-import static org.mockito.Mockito.*;
+import android.app.Activity;
+import android.support.annotation.NonNull;
+import android.view.ViewGroup;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.TestComponentViewCreator;
+import com.reactnativenavigation.mocks.TestReactView;
+import com.reactnativenavigation.parse.Options;
+import com.reactnativenavigation.parse.Text;
+import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsAdapter;
+import com.reactnativenavigation.viewcontrollers.toptabs.TopTabsController;
+import com.reactnativenavigation.views.ReactComponent;
+import com.reactnativenavigation.views.TopTabsLayoutCreator;
+import com.reactnativenavigation.views.TopTabsViewPager;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 public class TopTabsViewControllerTest extends BaseTest {
 
     private static final int SIZE = 2;
 
+    private StackController parentController;
     private TopTabsController uut;
-    private List<TopTabLayoutMock> tabs = new ArrayList<>(SIZE);
     private List<ViewController> tabControllers = new ArrayList<>(SIZE);
     private List<Options> tabOptions = new ArrayList<>(SIZE);
-    private Options options;
-    private TopTabsLayout topTabsLayout;
+    private final Options options = new Options();
+    private TopTabsViewPager topTabsLayout;
 
     @Override
     public void beforeEach() {
         super.beforeEach();
-        tabControllers.clear();
-        tabs.clear();
-        Activity activity = newActivity();
-        tabControllers = createTabs(activity);
-        options = new Options();
-        topTabsLayout = spy(new TopTabsLayout(activity, tabControllers, new TopTabsAdapter(tabControllers)));
 
+        final Activity activity = newActivity();
+        tabOptions = createOptions();
+        tabControllers = createTabsControllers(activity);
+
+        topTabsLayout = spy(new TopTabsViewPager(activity, tabControllers, new TopTabsAdapter(tabControllers)));
         TopTabsLayoutCreator layoutCreator = Mockito.mock(TopTabsLayoutCreator.class);
         Mockito.when(layoutCreator.create()).thenReturn(topTabsLayout);
-        uut = new TopTabsController(activity, "componentId", tabControllers, layoutCreator, options);
+        uut = spy(new TopTabsController(activity, "componentId", tabControllers, layoutCreator, options));
+        tabControllers.forEach(viewController -> viewController.setParentController(uut));
+
+        parentController = spy(new StackController(activity, "stackId"));
+        uut.setParentController(parentController);
     }
 
-    private List<ViewController> createTabs(Activity activity) {
-        List<ViewController> result = new ArrayList<>(SIZE);
-        tabOptions = new ArrayList<>();
+    @NonNull
+    private ArrayList<Options> createOptions() {
+        ArrayList result = new ArrayList();
         for (int i = 0; i < SIZE; i++) {
-            TopTabLayoutMock reactView = spy(new TopTabLayoutMock(activity));
-            tabs.add(reactView);
-            Options options = new Options();
+            final Options options = new Options();
             options.topTabOptions.title = new Text("Tab " + i);
-            tabOptions.add(options);
-            result.add(spy(new TopTabController(activity,
-                    "idTab" + i,
-                    "tab" + i,
-                    (activity1, componentId, componentName) -> reactView,
-                    options)
-            ));
+            options.topBarOptions.title = new Text("Title " + i);
+            result.add(options);
         }
         return result;
     }
 
+    private List<ViewController> createTabsControllers(Activity activity) {
+        List<ViewController> tabControllers = new ArrayList<>(SIZE);
+        for (int i = 0; i < SIZE; i++) {
+            ComponentViewController viewController = new ComponentViewController(
+                    activity,
+                    "idTab" + i,
+                    "theComponentName",
+                    new TestComponentViewCreator(),
+                    tabOptions.get(i)
+            );
+            tabControllers.add(spy(viewController));
+        }
+        return tabControllers;
+    }
+
+    private ReactComponent tabView(int index) {
+        return (ReactComponent) tabControllers.get(index).getView();
+    }
+
     @Test
     public void createsViewFromComponentViewCreator() throws Exception {
         uut.ensureViewIsCreated();
@@ -73,7 +96,7 @@ public class TopTabsViewControllerTest extends BaseTest {
     @Test
     public void componentViewDestroyedOnDestroy() throws Exception {
         uut.ensureViewIsCreated();
-        TopTabsLayout topTabs = (TopTabsLayout) uut.getView();
+        TopTabsViewPager topTabs = uut.getView();
         for (int i = 0; i < SIZE; i++) {
             verify(tab(topTabs, i), times(0)).destroy();
         }
@@ -85,10 +108,18 @@ public class TopTabsViewControllerTest extends BaseTest {
 
     @Test
     public void lifecycleMethodsSentWhenSelectedTabChanges() throws Exception {
+        parentController.ensureViewIsCreated();
         uut.ensureViewIsCreated();
-        TopTabLayoutMock initialTab = tabs.get(0);
-        TopTabLayoutMock selectedTab = tabs.get(1);
+        tabControllers.get(0).ensureViewIsCreated();
+        tabControllers.get(1).ensureViewIsCreated();
+
+        tabControllers.get(0).onViewAppeared();
+
         uut.onViewAppeared();
+
+        TestReactView initialTab = getActualTabView(0);
+        TestReactView selectedTab = getActualTabView(1);
+
         uut.switchToTab(1);
         verify(initialTab, times(1)).sendComponentStop();
         verify(selectedTab, times(1)).sendComponentStart();
@@ -97,42 +128,60 @@ public class TopTabsViewControllerTest extends BaseTest {
 
     @Test
     public void lifecycleMethodsSentWhenSelectedPreviouslySelectedTab() throws Exception {
+        parentController.ensureViewIsCreated();
         uut.ensureViewIsCreated();
         uut.onViewAppeared();
         uut.switchToTab(1);
         uut.switchToTab(0);
-        verify(tabs.get(0), times(1)).sendComponentStop();
-        verify(tabs.get(0), times(2)).sendComponentStart();
-        verify(tabs.get(1), times(1)).sendComponentStart();
-        verify(tabs.get(1), times(1)).sendComponentStop();
+
+        verify(getActualTabView(0), times(1)).sendComponentStop();
+        verify(getActualTabView(0), times(2)).sendComponentStart();
+        verify(getActualTabView(1), times(1)).sendComponentStart();
+        verify(getActualTabView(1), times(1)).sendComponentStop();
     }
 
     @Test
     public void setOptionsOfInitialTab() throws Exception {
+        parentController.ensureViewIsCreated();
         uut.ensureViewIsCreated();
         uut.onViewAppeared();
-        verify(tabControllers.get(0), times(1)).applyOptions(tabOptions.get(0));
+        verify(tabControllers.get(0), times(1)).onViewAppeared();
+        verify(tabControllers.get(1), times(0)).onViewAppeared();
+
+        verify(uut, times(1)).applyOptions(tabOptions.get(0), ((ComponentViewController) tabControllers.get(0)).getComponent());
     }
 
     @Test
     public void setOptionsWhenTabChanges() throws Exception {
+        parentController.ensureViewIsCreated();
         uut.ensureViewIsCreated();
+        tabControllers.get(0).ensureViewIsCreated();
+        tabControllers.get(1).ensureViewIsCreated();
+
         uut.onViewAppeared();
-        verify(tabControllers.get(0), times(1)).applyOptions(tabOptions.get(0));
+        verify(uut, times(1)).applyOptions(tabOptions.get(0), tabView(0));
         uut.switchToTab(1);
-        verify(tabControllers.get(1), times(1)).applyOptions(tabOptions.get(1));
+        verify(uut, times(1)).applyOptions(tabOptions.get(1), tabView(1));
         uut.switchToTab(0);
-        verify(tabControllers.get(0), times(2)).applyOptions(tabOptions.get(0));
+        verify(uut, times(2)).applyOptions(tabOptions.get(0), tabView(0));
+    }
+
+    private TestReactView getActualTabView(int index) {
+        return (TestReactView) tabControllers.get(index).getView().getChildAt(0);
     }
 
     @Test
     public void appliesOptionsOnLayoutWhenVisible() throws Exception {
+        tabControllers.get(0).ensureViewIsCreated();
+        parentController.ensureViewIsCreated();
         uut.ensureViewIsCreated();
+
         uut.onViewAppeared();
+
         verify(topTabsLayout, times(1)).applyOptions(options);
     }
 
-    private IReactView tab(TopTabsLayout topTabs, final int index) {
-        return (IReactView) ((ViewGroup) topTabs.getViewPager().getChildAt(index)).getChildAt(0);
+    private IReactView tab(TopTabsViewPager topTabs, final int index) {
+        return (IReactView) ((ViewGroup) topTabs.getChildAt(index)).getChildAt(0);
     }
 }

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

@@ -3,6 +3,7 @@ package com.reactnativenavigation.viewcontrollers;
 import android.app.Activity;
 import android.view.View;
 import android.view.ViewParent;
+import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
 import com.reactnativenavigation.BaseTest;
@@ -45,10 +46,10 @@ public class ViewControllerTest extends BaseTest {
 
     @Test
     public void canOverrideViewCreation() throws Exception {
-        final View otherView = new View(activity);
+        final FrameLayout otherView = new FrameLayout(activity);
         ViewController myController = new ViewController(activity, "vc") {
             @Override
-            protected View createView() {
+            protected FrameLayout createView() {
                 return otherView;
             }
         };
@@ -57,10 +58,10 @@ public class ViewControllerTest extends BaseTest {
 
     @Test
     public void holdsAReferenceToStackControllerOrNull() throws Exception {
-        assertThat(uut.getParentStackController()).isNull();
+        assertThat(uut.getParentController()).isNull();
         StackController nav = new StackController(activity, "stack");
         nav.animatePush(uut, new MockPromise());
-        assertThat(uut.getParentStackController()).isEqualTo(nav);
+        assertThat(uut.getParentController()).isEqualTo(nav);
     }
 
     @Test

lib/android/app/src/test/java/com/reactnativenavigation/views/TouchDelegateTest.java

@@ -0,0 +1,57 @@
+package com.reactnativenavigation.views;
+
+import android.view.MotionEvent;
+
+import com.reactnativenavigation.BaseTest;
+import com.reactnativenavigation.mocks.SimpleOverlay;
+import com.reactnativenavigation.views.touch.OverlayTouchDelegate;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+public class TouchDelegateTest extends BaseTest {
+    private OverlayTouchDelegate uut;
+    private final int x = 10;
+    private final int y = 10;
+    private final MotionEvent downEvent = MotionEvent.obtain(0, 0, MotionEvent.ACTION_DOWN, x, y, 0);
+    private final MotionEvent upEvent = MotionEvent.obtain(0, 0, MotionEvent.ACTION_UP, x, y, 0);
+    private SimpleOverlay reactView;
+
+    @Override
+    public void beforeEach() {
+        super.beforeEach();
+        reactView = spy(new SimpleOverlay(newActivity()));
+        uut = spy(new OverlayTouchDelegate(reactView));
+    }
+
+    @Test
+    public void downEventIsHandled() throws Exception {
+        uut.setInterceptTouchOutside(true);
+        uut.onInterceptTouchEvent(downEvent);
+        verify(uut, times(1)).handleDown(downEvent);
+    }
+
+    @Test
+    public void onlyDownEventIsHandled() throws Exception {
+        uut.setInterceptTouchOutside(true);
+        uut.onInterceptTouchEvent(upEvent);
+        verify(uut, times(0)).handleDown(upEvent);
+    }
+
+    @Test
+    public void nonDownEventsDontIntercept() throws Exception {
+        uut.setInterceptTouchOutside(true);
+        assertThat(uut.onInterceptTouchEvent(upEvent)).isFalse();
+    }
+
+    @Test
+    public void nonDownEventsDispatchTouchEventsToJs() throws Exception {
+        uut.setInterceptTouchOutside(true);
+        uut.onInterceptTouchEvent(upEvent);
+        verify(reactView, times(1)).dispatchTouchEventToJs(upEvent);
+    }
+}

lib/ios/RNNBottomTabOptions.m

@@ -34,12 +34,6 @@
 	[self resetOptions];
 }
 
--(void)mergeWith:(NSDictionary *)otherOptions {
-	for (id key in otherOptions) {
-		[self setValue:[otherOptions objectForKey:key] forKey:key];
-	}
-}
-
 -(void)resetOptions {
 	self.title = nil;
 	self.badge = nil;

lib/ios/RNNBottomTabsOptions.h

@@ -9,4 +9,12 @@
 @property (nonatomic, strong) NSNumber* drawUnder;
 @property (nonatomic, strong) NSString* currentTabId;
 
+@property (nonatomic, strong) NSNumber* translucent;
+@property (nonatomic, strong) NSNumber* hideShadow;
+@property (nonatomic, strong) NSNumber* backgroundColor;
+@property (nonatomic, strong) NSNumber* textColor;
+@property (nonatomic, strong) NSNumber* selectedTextColor;
+@property (nonatomic, strong) NSString* fontFamily;
+@property (nonatomic, strong) NSNumber* fontSize;
+
 @end

lib/ios/RNNBottomTabsOptions.m

@@ -29,17 +29,63 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 		}
 	}
 	
+	if (self.backgroundColor) {
+		viewController.tabBarController.tabBar.barTintColor = [RCTConvert UIColor:self.backgroundColor];
+	}
+	
+	if (self.translucent) {
+		viewController.tabBarController.tabBar.translucent = [self.translucent boolValue];
+	}
+	
+	if (self.hideShadow) {
+		viewController.tabBarController.tabBar.clipsToBounds = [self.hideShadow boolValue];
+	}
+	
+	if (self.tabBarTextFont || self.textColor) {
+		NSMutableDictionary* tabBarTitleTextAttributes = [NSMutableDictionary new];
+		if (self.textColor) {
+			tabBarTitleTextAttributes[NSForegroundColorAttributeName] = [RCTConvert UIColor:self.textColor];
+		}
+		
+		if (self.tabBarTextFont) {
+			tabBarTitleTextAttributes[NSFontAttributeName] = self.tabBarTextFont;
+		}
+		
+		for (UITabBarItem* item in viewController.tabBarController.tabBar.items) {
+			[item setTitleTextAttributes:tabBarTitleTextAttributes forState:UIControlStateNormal];
+		}
+	}
+	
+	if (self.selectedTextColor){
+		for (UITabBarItem* item in viewController.tabBarController.tabBar.items) {
+			NSMutableDictionary* tabBarTitleTextAttributes = [NSMutableDictionary new];
+			tabBarTitleTextAttributes[NSForegroundColorAttributeName] = [RCTConvert UIColor:self.selectedTextColor];
+			[item setTitleTextAttributes:tabBarTitleTextAttributes forState:UIControlStateSelected];
+		}
+	}
+	
 	[self resetOptions];
 }
 
+-(UIFont *)tabBarTextFont {
+	if (self.fontFamily) {
+		return [UIFont fontWithName:self.fontFamily size:self.tabBarTextFontSizeValue];
+	}
+	else if (self.fontSize) {
+		return [UIFont systemFontOfSize:self.tabBarTextFontSizeValue];
+	}
+	else {
+		return nil;
+	}
+}
+
+-(CGFloat)tabBarTextFontSizeValue {
+	return self.fontSize ? [self.fontSize floatValue] : 10;
+}
+
 - (void)resetOptions {
 	self.currentTabId = nil;
 	self.currentTabIndex = nil;
 }
 
--(void)mergeWith:(NSDictionary *)otherOptions {
-	for (id key in otherOptions) {
-		[self setValue:[otherOptions objectForKey:key] forKey:key];
-	}
-}
 @end

lib/ios/RNNBridgeModule.m

@@ -78,5 +78,17 @@ RCT_EXPORT_METHOD(dismissAllModals:(RCTPromiseResolveBlock)resolve rejecter:(RCT
 	}];
 }
 
+RCT_EXPORT_METHOD(showOverlay:(NSDictionary*)layout resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	[_commandsHandler showOverlay:layout completion:^{
+		resolve(layout[@"id"]);
+	}];
+}
+
+RCT_EXPORT_METHOD(dismissOverlay:(NSString*)componentId resolve:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject) {
+	[_commandsHandler dismissOverlay:componentId completion:^{
+		resolve(@(1));
+	}];
+}
+
 @end
 

lib/ios/RNNCommandsHandler.h

@@ -28,4 +28,8 @@
 
 -(void) dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion;
 
+-(void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion;
+
+-(void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
+
 @end

lib/ios/RNNCommandsHandler.m

@@ -1,6 +1,7 @@
 #import "RNNCommandsHandler.h"
 #import "RNNModalManager.h"
 #import "RNNNavigationStackManager.h"
+#import "RNNOverlayManager.h"
 #import "RNNNavigationOptions.h"
 #import "RNNRootViewController.h"
 #import "React/RCTUIManager.h"
@@ -10,6 +11,7 @@
 	RNNStore *_store;
 	RNNNavigationStackManager* _navigationStackManager;
 	RNNModalManager* _modalManager;
+	RNNOverlayManager* _overlayManager;
 }
 
 -(instancetype) initWithStore:(RNNStore*)store controllerFactory:(RNNControllerFactory*)controllerFactory {
@@ -18,6 +20,7 @@
 	_controllerFactory = controllerFactory;
 	_navigationStackManager = [[RNNNavigationStackManager alloc] initWithStore:_store];
 	_modalManager = [[RNNModalManager alloc] initWithStore:_store];
+	_overlayManager = [[RNNOverlayManager alloc] init];
 	return self;
 }
 
@@ -61,13 +64,19 @@
 	[self assertReady];
 	
 	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-	[_navigationStackManager push:newVc onTop:componentId completion:completion];
+	[_navigationStackManager push:newVc onTop:componentId completion:^{
+		[_controllerFactory.eventEmitter sendNavigationEvent:[RNNNavigationEvent create:kPush fromComponent:componentId toComponent:newVc.componentId]];
+		completion();
+	}];
 }
 
 -(void)pop:(NSString*)componentId options:(NSDictionary*)options completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	[CATransaction begin];
-	[CATransaction setCompletionBlock:completion];
+	[CATransaction setCompletionBlock:^{
+		[_controllerFactory.eventEmitter sendNavigationEvent:[RNNNavigationEvent create:kPop fromComponent:nil toComponent:componentId]];
+		completion();
+	}];
 	NSDictionary* animationData = options[@"customTransition"];
 	if (animationData){
 		if ([animationData objectForKey:@"animations"]) {
@@ -84,7 +93,10 @@
 -(void) popTo:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	[CATransaction begin];
-	[CATransaction setCompletionBlock:completion];
+	[CATransaction setCompletionBlock:^{
+		[_controllerFactory.eventEmitter sendNavigationEvent:[RNNNavigationEvent create:kPopTo fromComponent:nil toComponent:componentId]];
+		completion();
+	}];
 	
 	[_navigationStackManager popTo:componentId];
 	
@@ -94,7 +106,10 @@
 -(void) popToRoot:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	[CATransaction begin];
-	[CATransaction setCompletionBlock:completion];
+	[CATransaction setCompletionBlock:^{
+		[_controllerFactory.eventEmitter sendNavigationEvent:[RNNNavigationEvent create:kPopToRoot fromComponent:componentId toComponent:nil]];
+		completion();
+	}];
 	
 	[_navigationStackManager popToRoot:componentId];
 	
@@ -104,14 +119,20 @@
 -(void) showModal:(NSDictionary*)layout completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	
-	UIViewController *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
-	[_modalManager showModal:newVc completion:completion];
+	UIViewController<RNNRootViewProtocol> *newVc = [_controllerFactory createLayoutAndSaveToStore:layout];
+	[_modalManager showModal:newVc completion:^{
+		[_controllerFactory.eventEmitter sendNavigationEvent:[RNNNavigationEvent create:kShowModal fromComponent:nil toComponent:newVc.componentId]];
+		completion();
+	}];
 }
 
 -(void) dismissModal:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	[CATransaction begin];
-	[CATransaction setCompletionBlock:completion];
+	[CATransaction setCompletionBlock:^{
+		[_controllerFactory.eventEmitter sendNavigationEvent:[RNNNavigationEvent create:kDismissModal fromComponent:componentId toComponent:nil]];
+		completion();
+	}];
 	
 	[_modalManager dismissModal:componentId];
 	
@@ -121,13 +142,33 @@
 -(void) dismissAllModalsWithCompletion:(RNNTransitionCompletionBlock)completion {
 	[self assertReady];
 	[CATransaction begin];
-	[CATransaction setCompletionBlock:completion];
+	[CATransaction setCompletionBlock:^{
+		[_controllerFactory.eventEmitter sendNavigationEvent:[RNNNavigationEvent create:kDismissAllModals fromComponent:nil toComponent:nil]];
+		completion();
+	}];
 	
 	[_modalManager dismissAllModals];
 	
 	[CATransaction commit];
 }
 
+-(void)showOverlay:(NSDictionary *)layout completion:(RNNTransitionCompletionBlock)completion {
+	[self assertReady];
+	UIViewController<RNNRootViewProtocol>* overlayVC = [_controllerFactory createOverlay:layout];
+	[_overlayManager showOverlay:overlayVC completion:^{
+		[_controllerFactory.eventEmitter sendNavigationEvent:[RNNNavigationEvent create:kShowOverlay fromComponent:nil toComponent:overlayVC.componentId]];
+		completion();
+	}];
+}
+
+- (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
+	[self assertReady];
+	[_overlayManager dismissOverlay:componentId completion:^{	
+		[_controllerFactory.eventEmitter sendNavigationEvent:[RNNNavigationEvent create:kDismissOverlay fromComponent:componentId toComponent:nil]];
+		completion();
+	}];
+}
+
 #pragma mark - private
 
 -(void) assertReady {

lib/ios/RNNComponentLifecycleEvent.h

@@ -0,0 +1,15 @@
+#import "RNNNavigationEvent.h"
+
+#define kDidAppear         @"didAppear"
+#define kDidDisappear      @"didDisappear"
+#define kWillUnmount       @"willUnmount"
+#define kDidMount         @"didMount"
+typedef NSString*               LifecycleEvent;
+
+@interface RNNComponentLifecycleEvent : NSObject
+
++ (instancetype)create:(LifecycleEvent)event componentName:(NSString*)componentName componentId:(NSString*)componentId;
+
+- (NSDictionary*)body;
+
+@end

lib/ios/RNNComponentLifecycleEvent.m

@@ -0,0 +1,24 @@
+#import "RNNComponentLifecycleEvent.h"
+
+@interface RNNComponentLifecycleEvent()
+@property (nonatomic, strong) NSString* componentName;
+@property (nonatomic, strong) NSString* componentId;
+@property (nonatomic, strong) LifecycleEvent event;
+
+@end
+
+@implementation RNNComponentLifecycleEvent
+
++ (instancetype)create:(LifecycleEvent)event componentName:(NSString *)componentName componentId:(NSString *)componentId {
+	RNNComponentLifecycleEvent* lifecycleEvent = [[RNNComponentLifecycleEvent alloc] init];
+	lifecycleEvent.componentName = componentName;
+	lifecycleEvent.componentId = componentId;
+	lifecycleEvent.event = event;
+	return lifecycleEvent;
+}
+
+- (NSDictionary *)body {
+	return @{@"event": self.event, @"componentName": self.componentName, @"componentId": self.componentId};
+}
+
+@end

lib/ios/RNNControllerFactory.h

@@ -15,6 +15,9 @@
 
 -(UIViewController<RNNRootViewProtocol> *)createLayoutAndSaveToStore:(NSDictionary*)layout;
 
+- (UIViewController<RNNRootViewProtocol> *)createOverlay:(NSDictionary*)layout;
+
 @property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
+@property (nonatomic, strong) RNNEventEmitter *eventEmitter;
 
 @end

lib/ios/RNNControllerFactory.m

@@ -12,7 +12,6 @@
 @implementation RNNControllerFactory {
 	id<RNNRootViewCreator> _creator;
 	RNNStore *_store;
-	RNNEventEmitter *_eventEmitter;
 	RCTBridge *_bridge;
 }
 
@@ -162,6 +161,15 @@
 	return sideMenuChild;
 }
 
-
+- (UIViewController<RNNRootViewProtocol> *)createOverlay:(NSDictionary*)layout {
+	UIViewController<RNNRootViewProtocol> *vc = [self fromTree:layout];
+	RCTRootView* rootView = (RCTRootView*)vc.view;
+	rootView.backgroundColor = [UIColor clearColor];
+	CGSize availableSize = UIApplication.sharedApplication.delegate.window.bounds.size;
+	rootView.frame = CGRectMake(0, 0, availableSize.width, availableSize.height);
+	[_bridge.uiManager setAvailableSize:availableSize forRootView:vc.view];
+	
+	return vc;
+}
 
 @end

lib/ios/RNNEventEmitter.h

@@ -4,6 +4,9 @@
 #import <React/RCTEventEmitter.h>
 #import <React/RCTBridgeModule.h>
 
+#import "RNNNavigationEvent.h"
+#import "RNNComponentLifecycleEvent.h"
+
 @interface RNNEventEmitter : RCTEventEmitter <RCTBridgeModule>
 
 -(void)sendOnAppLaunched;
@@ -14,4 +17,8 @@
 
 -(void)sendOnNavigationButtonPressed:(NSString*)componentId buttonId:(NSString*)buttonId;
 
+-(void)sendNavigationEvent:(RNNNavigationEvent*)navigationEvent;
+
+-(void)sendLifecycleEvent:(RNNComponentLifecycleEvent *)navigationEvent;
+
 @end

lib/ios/RNNEventEmitter.m

@@ -11,9 +11,11 @@ static NSString* const onAppLaunched	= @"RNN.appLaunched";
 static NSString* const componentDidAppear	= @"RNN.componentDidAppear";
 static NSString* const componentDidDisappear	= @"RNN.componentDidDisappear";
 static NSString* const onNavigationButtonPressed	= @"RNN.navigationButtonPressed";
+static NSString* const navigationCommands	= @"RNN.navigationCommands";
+static NSString* const componentLifecycle	= @"RNN.componentLifecycle";
 
 -(NSArray<NSString *> *)supportedEvents {
-	return @[onAppLaunched, componentDidAppear, componentDidDisappear, onNavigationButtonPressed];
+	return @[onAppLaunched, componentDidAppear, componentDidDisappear, onNavigationButtonPressed, navigationCommands, componentLifecycle];
 }
 
 # pragma mark public
@@ -26,6 +28,14 @@ static NSString* const onNavigationButtonPressed	= @"RNN.navigationButtonPressed
 	}
 }
 
+-(void)sendNavigationEvent:(RNNNavigationEvent *)navigationEvent {
+	[self send:navigationCommands body:navigationEvent.body];
+}
+
+-(void)sendLifecycleEvent:(RNNComponentLifecycleEvent *)navigationEvent {
+	[self send:componentLifecycle body:navigationEvent.body];
+}
+
 -(void)sendComponentDidAppear:(NSString *)componentId {
 	[self send:componentDidAppear body:componentId];
 }

lib/ios/RNNModalManager.h

@@ -4,7 +4,7 @@
 
 @interface RNNModalManager : NSObject
 
-@property (nonatomic, strong) UIViewController* toVC;
+@property (nonatomic, strong) UIViewController<RNNRootViewProtocol>* toVC;
 
 -(instancetype)initWithStore:(RNNStore*)store;
 -(void)showModal:(UIViewController*)viewController completion:(RNNTransitionCompletionBlock)completion;

lib/ios/RNNModalManager.m

@@ -22,7 +22,7 @@
 -(void)showModalAfterLoad:(NSDictionary*)notif {
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:@"RCTContentDidAppearNotification" object:nil];
 	UIViewController *topVC = [self topPresentedVC];
-	[topVC presentViewController:self.toVC animated:YES completion:^{
+	[topVC presentViewController:self.toVC animated:self.toVC.isAnimated completion:^{
 		if (_completionBlock) {
 			_completionBlock();
 			_completionBlock = nil;
@@ -31,7 +31,7 @@
 }
 
 -(void)showModal:(UIViewController *)viewController completion:(RNNTransitionCompletionBlock)completion {
-	self.toVC = viewController;
+	self.toVC = (UIViewController<RNNRootViewProtocol>*)viewController;
 	_completionBlock = completion;
 	[self waitForContentToAppearAndThen:@selector(showModalAfterLoad:)];
 }
@@ -53,7 +53,7 @@
 -(void)removePendingNextModalIfOnTop {
 	NSString *componentId = [[_store pendingModalIdsToDismiss] lastObject];
 	
-	UIViewController *modalToDismiss = [_store findComponentForId:componentId];
+	UIViewController<RNNRootViewProtocol> *modalToDismiss = (UIViewController<RNNRootViewProtocol>*)[_store findComponentForId:componentId];
 	
 	if(!modalToDismiss) {
 		return;
@@ -62,7 +62,7 @@
 	UIViewController* topPresentedVC = [self topPresentedVC];
 	
 	if (modalToDismiss == topPresentedVC || [[topPresentedVC childViewControllers] containsObject:modalToDismiss]) {
-		[modalToDismiss dismissViewControllerAnimated:YES completion:^{
+		[modalToDismiss dismissViewControllerAnimated:modalToDismiss.isAnimated completion:^{
 			[[_store pendingModalIdsToDismiss] removeObject:componentId];
 			[self removePendingNextModalIfOnTop];
 		}];

lib/ios/RNNNavigationButtons.m

@@ -94,6 +94,11 @@
 		[barButtonItem setImage:[barButtonItem.image imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal]];
 	}
 	
+	id tintColor = dictionary[@"tintColor"];
+	if (tintColor) {
+		[barButtonItem setTintColor:[RCTConvert UIColor: tintColor]];
+	}
+	
 	NSString *testID = dictionary[@"testID"];
 	if (testID)
 	{

lib/ios/RNNNavigationController.m

@@ -11,4 +11,13 @@
 	return NO;
 }
 
+- (BOOL)isAnimated {
+	UIViewController<RNNRootViewProtocol>* rootVC = (UIViewController<RNNRootViewProtocol>*) self.topViewController;
+	return rootVC.isAnimated;
+}
+
+- (NSString *)componentId {
+	return ((UIViewController<RNNRootViewProtocol>*)self.topViewController).componentId;
+}
+
 @end

lib/ios/RNNNavigationEvent.h

@@ -0,0 +1,20 @@
+#import <Foundation/Foundation.h>
+
+#define kPush              @"push"
+#define kPop               @"pop"
+#define kPopTo             @"popTo"
+#define kPopToRoot         @"popToRoot"
+#define kShowModal         @"showModal"
+#define kDismissModal      @"dismissModal"
+#define kDismissAllModals  @"dismissAllModals"
+#define kShowOverlay       @"showOverlay"
+#define kDismissOverlay    @"dismissOverlay"
+typedef NSString*               NavigationCommand;
+
+@interface RNNNavigationEvent : NSObject
+
+@property (nonatomic, strong) NSDictionary* body;
+
++ (instancetype)create:(NavigationCommand)commandType fromComponent:(NSString *)fromComponentId toComponent:(NSString *)toComponentId;
+
+@end

lib/ios/RNNNavigationEvent.m

@@ -0,0 +1,26 @@
+#import "RNNNavigationEvent.h"
+
+@interface RNNNavigationEvent ()
+	@property (nonatomic, strong) NavigationCommand command;
+	@property (nonatomic, strong) NSString* toComponentId;
+	@property (nonatomic, strong) NSString* fromComponentId;
+@end
+
+@implementation RNNNavigationEvent
+
++ (instancetype)create:(NavigationCommand)commandType fromComponent:(NSString *)fromComponentId toComponent:(NSString *)toComponentId {
+	RNNNavigationEvent* navigationCommand = [[RNNNavigationEvent alloc] init];
+	navigationCommand.command = commandType;
+	navigationCommand.fromComponentId = fromComponentId;
+	navigationCommand.toComponentId = toComponentId;
+	return navigationCommand;
+}
+
+- (NSDictionary *)body {
+	NSMutableDictionary* mutableParams = [NSMutableDictionary new];
+	self.fromComponentId ? [mutableParams setObject:self.fromComponentId forKey:@"fromComponentId"] : nil;
+	self.toComponentId ? [mutableParams setObject:self.toComponentId forKey:@"toComponentId"] : nil;
+	return @{@"commandName": self.command, @"params": mutableParams};
+}
+
+@end

lib/ios/RNNNavigationOptions.h

@@ -5,6 +5,7 @@
 #import "RNNSideMenuOptions.h"
 #import "RNNTopTabOptions.h"
 #import "RNNTopTabsOptions.h"
+#import "RNNOverlayOptions.h"
 
 extern const NSInteger BLUR_STATUS_TAG;
 extern const NSInteger BLUR_TOPBAR_TAG;
@@ -18,9 +19,11 @@ extern const NSInteger TOP_BAR_TRANSPARENT_TAG;
 @property (nonatomic, strong) RNNTopTabsOptions* topTabs;
 @property (nonatomic, strong) RNNTopTabOptions* topTab;
 @property (nonatomic, strong) RNNSideMenuOptions* sideMenu;
+@property (nonatomic, strong) RNNOverlayOptions* overlay;
 
 @property (nonatomic, strong) RNNNavigationOptions* defaultOptions;
 
+@property (nonatomic, strong) NSNumber* animated;
 @property (nonatomic, strong) NSNumber* statusBarHidden;
 @property (nonatomic, strong) NSNumber* screenBackgroundColor;
 @property (nonatomic, strong) NSMutableDictionary* originalTopBarImages;

lib/ios/RNNNavigationOptions.m

@@ -30,7 +30,9 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	self.backgroundImage = [RCTConvert UIImage:[options objectForKey:@"backgroundImage"]];
 	self.rootBackgroundImage = [RCTConvert UIImage:[options objectForKey:@"rootBackgroundImage"]];
 	self.bottomTab = [[RNNBottomTabOptions alloc] initWithDict:[options objectForKey:@"bottomTab"]];
-    
+	self.overlay = [[RNNOverlayOptions alloc] initWithDict:[options objectForKey:@"overlay"]];
+	self.animated = [options objectForKey:@"animated"];
+	
 	return self;
 }
 
@@ -53,6 +55,7 @@ const NSInteger TOP_BAR_TRANSPARENT_TAG = 78264803;
 	[self.topTab applyOn:viewController];
 	[self.bottomTab applyOn:viewController];
 	[self.sideMenu applyOn:viewController];
+	[self.overlay applyOn:viewController];
 	[self applyOtherOptionsOn:viewController];
 }
 

lib/ios/RNNNavigationStackManager.m

@@ -52,7 +52,7 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 		}
 	}];
 	
-	[[self.fromVC navigationController] pushViewController:self.toVC animated:YES];
+	[[self.fromVC navigationController] pushViewController:self.toVC animated:self.toVC.isAnimated];
 	[CATransaction commit];
 	
 	self.toVC = nil;
@@ -61,17 +61,17 @@ dispatch_queue_t RCTGetUIManagerQueue(void);
 }
 
 -(void)pop:(NSString *)componentId withAnimationData:(NSDictionary *)animationData {
-	UIViewController* vc = [_store findComponentForId:componentId];
+	UIViewController<RNNRootViewProtocol>* vc = (UIViewController<RNNRootViewProtocol>*)[_store findComponentForId:componentId];
 	UINavigationController* nvc = [vc navigationController];
 	if ([nvc topViewController] == vc) {
 		if (animationData) {
 			RNNRootViewController* RNNVC = (RNNRootViewController*)vc;
 			nvc.delegate = RNNVC;
 			[RNNVC.animator setupTransition:animationData];
-			[nvc popViewControllerAnimated:YES];
+			[nvc popViewControllerAnimated:vc.isAnimated];
 		} else {
 			nvc.delegate = nil;
-			[nvc popViewControllerAnimated:YES];
+			[nvc popViewControllerAnimated:vc.isAnimated];
 		}
 	} else {
 		NSMutableArray * vcs = nvc.viewControllers.mutableCopy;

lib/ios/RNNOverlayManager.h

@@ -0,0 +1,10 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+#import "RNNStore.h"
+
+@interface RNNOverlayManager : NSObject
+
+- (void)showOverlay:(UIViewController*)viewController completion:(RNNTransitionCompletionBlock)completion;
+- (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion;
+
+@end

lib/ios/RNNOverlayManager.m

@@ -0,0 +1,38 @@
+#import "RNNOverlayManager.h"
+
+@implementation RNNOverlayManager {
+	NSMutableDictionary* _overlayDict;
+}
+
+- (instancetype)init {
+	self = [super init];
+	_overlayDict = [[NSMutableDictionary alloc] init];
+	return self;
+}
+
+#pragma mark - public
+
+- (void)showOverlay:(RNNRootViewController *)viewController completion:(RNNTransitionCompletionBlock)completion {
+	[self cacheOverlay:viewController];
+	[[[UIApplication sharedApplication] keyWindow] addSubview:viewController.view];
+	completion();
+}
+
+- (void)dismissOverlay:(NSString*)componentId completion:(RNNTransitionCompletionBlock)completion {
+	RNNRootViewController* viewController = [_overlayDict objectForKey:componentId];
+	[self removeCachedOverlay:viewController];
+	completion();
+}
+
+#pragma mark - private
+
+- (void)cacheOverlay:(RNNRootViewController*)viewController {
+	[_overlayDict setObject:viewController forKey:viewController.componentId];
+}
+
+- (void)removeCachedOverlay:(RNNRootViewController*)viewController {
+	[viewController.view removeFromSuperview];
+	[_overlayDict removeObjectForKey:viewController.componentId];
+}
+
+@end

lib/ios/RNNOverlayOptions.h

@@ -0,0 +1,7 @@
+#import "RNNOptions.h"
+
+@interface RNNOverlayOptions : RNNOptions
+
+@property (nonatomic, strong) NSNumber* interceptTouchOutside;
+
+@end

lib/ios/RNNOverlayOptions.m

@@ -0,0 +1,13 @@
+#import "RNNOverlayOptions.h"
+#import <React/RCTRootView.h>
+
+@implementation RNNOverlayOptions
+
+- (void)applyOn:(UIViewController *)viewController {
+	if (self.interceptTouchOutside) {
+		RCTRootView* rootView = (RCTRootView*)viewController.view;
+		rootView.passThroughTouches = ![self.interceptTouchOutside boolValue];
+	}
+}
+
+@end

lib/ios/RNNRootViewController.m

@@ -38,16 +38,42 @@
 -(void)viewWillAppear:(BOOL)animated{
 	[super viewWillAppear:animated];
 	[self.options applyOn:self];
+	[self sendLifecycleEvent:kDidMount];
+}
+
+-(void)viewDidAppear:(BOOL)animated {
+	[super viewDidAppear:animated];
+	[self.eventEmitter sendComponentDidAppear:self.componentId];
+	[self sendLifecycleEvent:kDidAppear];
+}
+
+- (void)viewWillDisappear:(BOOL)animated {
+	[super viewWillDisappear:animated];
+	[self sendLifecycleEvent:kWillUnmount];
+}
+
+-(void)viewDidDisappear:(BOOL)animated {
+	[super viewDidDisappear:animated];
+	[self.eventEmitter sendComponentDidDisappear:self.componentId];
+	[self sendLifecycleEvent:kDidDisappear];
 }
 
 - (void)viewDidLoad {
 	[super viewDidLoad];
 }
 
+- (void)sendLifecycleEvent:(LifecycleEvent)event {
+	[self.eventEmitter sendLifecycleEvent:[RNNComponentLifecycleEvent create:event componentName:self.componentName componentId:self.componentId]];
+}
+
 -(BOOL)isCustomTransitioned {
 	return self.animator != nil;
 }
 
+- (BOOL)isAnimated {
+	return self.options.animated ? [self.options.animated boolValue] : YES;
+}
+
 - (BOOL)prefersStatusBarHidden {
 	if ([self.options.statusBarHidden boolValue]) {
 		return YES;
@@ -69,16 +95,6 @@
 	return NO;
 }
 
--(void)viewDidAppear:(BOOL)animated {
-	[super viewDidAppear:animated];
-	[self.eventEmitter sendComponentDidAppear:self.componentId];
-}
-
--(void)viewDidDisappear:(BOOL)animated {
-	[super viewDidDisappear:animated];
-	[self.eventEmitter sendComponentDidDisappear:self.componentId];
-}
-
 - (void)navigationController:(UINavigationController *)navigationController didShowViewController:(UIViewController *)viewController animated:(BOOL)animated{
 	RNNRootViewController* vc =  (RNNRootViewController*)viewController;
 	if (![vc.options.backButtonTransition isEqualToString:@"custom"]){

lib/ios/RNNRootViewProtocol.h

@@ -5,6 +5,9 @@
 @required
 
 - (BOOL)isCustomTransitioned;
+- (BOOL)isAnimated;
+
+- (NSString *)componentId;
 
 @end
 

lib/ios/RNNSideMenuChildVC.m

@@ -11,13 +11,13 @@
 @interface RNNSideMenuChildVC ()
 
 @property (readwrite) RNNSideMenuChildType type;
-@property (readwrite) UIViewController *child;
+@property (readwrite) UIViewController<RNNRootViewProtocol> *child;
 
 @end
 
 @implementation RNNSideMenuChildVC
 
--(instancetype) initWithChild:(UIViewController*)child type:(RNNSideMenuChildType)type {
+-(instancetype) initWithChild:(UIViewController<RNNRootViewProtocol>*)child type:(RNNSideMenuChildType)type {
 	self = [super init];
 	
 	self.child = child;
@@ -37,4 +37,12 @@
 	return NO;
 }
 
+- (BOOL)isAnimated {
+	return YES;
+}
+
+- (NSString *)componentId {
+	return _child.componentId;
+}
+
 @end

lib/ios/RNNSideMenuController.m

@@ -76,4 +76,12 @@
 	return NO;
 }
 
+- (BOOL)isAnimated {
+	return YES;
+}
+
+- (NSString *)componentId {
+	return _center.componentId;
+}
+
 @end

lib/ios/RNNSwizzles.h

@@ -0,0 +1,13 @@
+//
+//  RNNSwizzles.h
+//  ReactNativeNavigation
+//
+//  Created by Leo Natan (Wix) on 1/17/18.
+//  Copyright © 2018 Wix. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface RNNSwizzles : NSObject
+
+@end

lib/ios/RNNSwizzles.m

@@ -0,0 +1,49 @@
+//
+//  RNNSwizzles.m
+//  ReactNativeNavigation
+//
+//  Created by Leo Natan (Wix) on 1/17/18.
+//  Copyright © 2018 Wix. All rights reserved.
+//
+
+#import "RNNSwizzles.h"
+@import ObjectiveC;
+@import UIKit;
+
+static id (*__SWZ_initWithEventDispatcher_orig)(id self, SEL _cmd, id eventDispatcher);
+
+@implementation RNNSwizzles
+
+#if __IPHONE_OS_VERSION_MAX_ALLOWED > __IPHONE_10_3
+- (id)__swz_initWithEventDispatcher:(id)eventDispatcher
+{
+	id returnValue = __SWZ_initWithEventDispatcher_orig(self, _cmd, eventDispatcher);
+	
+	if (@available(iOS 11.0, *)) {
+		[(UIScrollView*)[returnValue valueForKey:@"scrollView"] setContentInsetAdjustmentBehavior:UIScrollViewContentInsetAdjustmentAutomatic];
+	}
+	
+	return returnValue;
+}
+
++ (void)load
+{
+	Class cls = NSClassFromString(@"RCTScrollView");
+	if(cls == NULL)
+	{
+		return;
+	}
+	Method m1 = class_getInstanceMethod(cls, NSSelectorFromString(@"initWithEventDispatcher:"));
+	
+	if(m1 == NULL)
+	{
+		return;
+	}
+	
+	__SWZ_initWithEventDispatcher_orig = (void*)method_getImplementation(m1);
+	Method m2 = class_getInstanceMethod([RNNSwizzles class], NSSelectorFromString(@"__swz_initWithEventDispatcher:"));
+	method_exchangeImplementations(m1, m2);
+}
+#endif
+
+@end

lib/ios/RNNTabBarController.m

@@ -37,4 +37,12 @@
 	return NO;
 }
 
+- (BOOL)isAnimated {
+	return YES;
+}
+
+- (NSString *)componentId {
+	return ((UIViewController<RNNRootViewProtocol>*)self.selectedViewController).componentId;
+}
+
 @end

lib/ios/RNNTopBarOptions.m

@@ -98,7 +98,7 @@ extern const NSInteger BLUR_TOPBAR_TAG;
 		}
 	}
 	
-	void (^disableTopBarTransparent)() = ^void(){
+	void (^disableTopBarTransparent)(void) = ^ {
 		UIView *transparentView = [viewController.navigationController.navigationBar viewWithTag:TOP_BAR_TRANSPARENT_TAG];
 		if (transparentView){
 			[transparentView removeFromSuperview];