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

e2e/ScreenStack.test.js

@@ -98,4 +98,13 @@ describe('screen stack', () => {
     await elementById(testIDs.POP_BUTTON).tap();
     await expect(elementByLabel('Stack Position: 2')).toBeVisible();
   });
+
+  it(':android: push to stack with static id from SideMenu', async () => {
+    await elementById(testIDs.TAB_BASED_APP_SIDE_BUTTON).tap();
+    await elementById(testIDs.SHOW_LEFT_SIDE_MENU_BUTTON).tap();
+    await elementById(testIDs.LEFT_SIDE_MENU_PUSH_BUTTON).tap();
+    await expect(elementByLabel('Text Screen')).toBeVisible();
+    await elementById(testIDs.POP_BUTTON).tap();
+    await expect(elementByLabel('This is a side menu center screen tab 1')).toBeVisible();
+  });
 });

playground/src/screens/SideMenuScreen.js

@@ -15,6 +15,7 @@ class SideMenuScreen extends Component {
         <Text testID={testIDs.SIDE_BAR}>Side Bar</Text>
         <Text style={styles.h1}>{`This is a ${this.props.side} side menu screen`}</Text>
         <Button title='Hide Side Menu' testID={testID} onPress={() => this.hideSideMenu()} />
+        <Button title='Push' testID={this.props.side + testIDs.SIDE_MENU_PUSH_BUTTON} onPress={() => this.pushAndCloseSideMenu()} />
       </View>
     );
   }
@@ -28,6 +29,15 @@ class SideMenuScreen extends Component {
       }
     });
   }
+
+  pushAndCloseSideMenu() {
+    this.hideSideMenu();
+    Navigation.push('tab1Stack', {
+      component: {
+        name: 'navigation.playground.TextScreen'
+      }
+    });
+  }
 }
 module.exports = SideMenuScreen;
 

playground/src/screens/WelcomeScreen.js

@@ -153,6 +153,7 @@ class WelcomeScreen extends Component {
               children: [
                 {
                   stack: {
+                    id: 'tab1Stack',
                     children: [
                       {
                         component: {

playground/src/testIDs.js

@@ -7,6 +7,9 @@ module.exports = {
   PUSH_LIFECYCLE_BUTTON: `PUSH_LIFECYCLE_BUTTON`,
   PUSH_STATIC_LIFECYCLE_BUTTON: `PUSH_STATIC_LIFECYCLE_BUTTON`,
   PUSH_BUTTON: `PUSH_BUTTON`,
+  SIDE_MENU_PUSH_BUTTON: `SIDE_MENU_PUSH_BUTTON`,
+  LEFT_SIDE_MENU_PUSH_BUTTON: `leftSIDE_MENU_PUSH_BUTTON`,
+  RIGHT_SIDE_MENU_PUSH_BUTTON: `rightSIDE_MENU_PUSH_BUTTON`,
   PUSH_OPTIONS_BUTTON: `PUSH_OPTIONS_BUTTON`,
   PUSH_DEFAULT_OPTIONS_BUTTON: `PUSH_DEFAULT_OPTIONS_BUTTON`,
   SHOW_TOPBAR_REACT_VIEW: `SHOW_TOPBAR_REACT_VIEW`,