Merge branch 'v2' into typescript

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

@@ -1,6 +1,7 @@
 package com.reactnativenavigation.e2e.androide2e;
 
 import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiObjectNotFoundException;
 
 import org.junit.Test;
 
@@ -11,8 +12,22 @@ public class OverlayTest extends BaseTest {
 		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();
+        assetDismissed();
+	}
+
+    @Test
+	public void testOverlayNotInterceptingTouchEvents() throws Exception {
+		elementByText("PUSH OPTIONS SCREEN").click();
+        elementByText("SHOW TOUCH THROUGH OVERLAY").click();
+		assertExists(By.text("Test view"));
+        elementByText("DYNAMIC OPTIONS").click();
+        assertExists(By.text("Dynamic Title"));
+        assetDismissed();
 	}
+
+    private void assetDismissed() throws UiObjectNotFoundException {
+        elementByText("OK").click();
+        assertExists(By.text("Overlay disappeared"));
+        elementByText("OK").click();
+    }
 }

docs/docs/usage.md

@@ -12,18 +12,18 @@ How to initiate your app.
 ```js
 Navigation.events().onAppLaunched(() => {
   Navigation.setRoot({
-    container: {
+    component: {
       name: 'navigation.playground.WelcomeScreen'
     }
   });
 });
 ```
 
-### registerContainer(screenID, generator)
+### registerComponent(screenID, generator)
 Every screen component in your app must be registered with a unique name. The component itself is a traditional React component extending React.Component.
 
 ```js
-Navigation.registerContainer(`navigation.playground.WelcomeScreen`, () => WelcomeScreen);
+Navigation.registerComponent(`navigation.playground.WelcomeScreen`, () => WelcomeScreen);
 ```
 
 ### setRoot({params})
@@ -31,20 +31,22 @@ Start a Single page app with two side menus:
 
 ```js
 Navigation.setRoot({
-  container: {
-    name: 'navigation.playground.WelcomeScreen'
-  },
   sideMenu: {
     left: {
-      container: {
+      component: {
         name: 'navigation.playground.TextScreen',
         passProps: {
           text: 'This is a left side menu screen'
         }
       }
     },
+    center: {
+      component: {
+        name: 'navigation.playground.WelcomeScreen'
+      },
+    },
     right: {
-      container: {
+      component: {
         name: 'navigation.playground.TextScreen',
         passProps: {
           text: 'This is a right side menu screen'
@@ -58,25 +60,27 @@ Start a tab based app:
 
 ```js
 Navigation.setRoot({
-  bottomTabs: [
-    {
-      container: {
-        name: 'navigation.playground.TextScreen',
-        passProps: {
-          text: 'This is tab 1',
-          myFunction: () => 'Hello from a function!'
-        }
-      }
-    },
-    {
-      container: {
-        name: 'navigation.playground.TextScreen',
-        passProps: {
-          text: 'This is tab 2'
-        }
-      }
-    }
-  ]
+  bottomTabs: {
+    children: [
+      {
+        component: {
+          name: 'navigation.playground.TextScreen',
+          passProps: {
+            text: 'This is tab 1',
+            myFunction: () => 'Hello from a function!',
+          },
+        },
+      },
+      {
+        component: {
+          name: 'navigation.playground.TextScreen',
+          passProps: {
+            text: 'This is tab 2',
+          },
+        },
+      },
+    ],
+  },
 });
 ```
 ## Screen API

playground/src/screens/OptionsScreen.js

@@ -66,8 +66,8 @@ class OptionsScreen extends Component {
         <Button title="Custom Transition" onPress={this.onClickCustomTranstition} />
         <Button title="Show custom alert" testID={testIDs.SHOW_CUSTOM_ALERT_BUTTON} onPress={this.onClickAlert} />
         <Button title="Show snackbar" testID={testIDs.SHOW_SNACKBAR_BUTTON} onPress={this.onClickSnackbar} />
-        <Button title="Show overlay inter" testID={testIDs.SHOW_OVERLAY_BUTTON} onPress={() => this.onClickShowOverlay(true)} />
-        <Button title="Show touch through overlay notInter" testID={testIDs.SHOW_TOUCH_THROUGH_OVERLAY_BUTTON} onPress={() => this.onClickShowOverlay(false)} />
+        <Button title="Show overlay" testID={testIDs.SHOW_OVERLAY_BUTTON} onPress={() => this.onClickShowOverlay(true)} />
+        <Button title="Show touch through overlay" testID={testIDs.SHOW_TOUCH_THROUGH_OVERLAY_BUTTON} onPress={() => this.onClickShowOverlay(false)} />
         <Button title="Push Default Options Screen" testID={testIDs.PUSH_DEFAULT_OPTIONS_BUTTON} onPress={this.onClickPushDefaultOptionsScreen} />
         <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
       </View>