fix #1803

e2e/Orientations.test.js

@@ -8,39 +8,52 @@ describe('orientation', () => {
     await device.relaunchApp();
   });
 
-  it('orientation should not change from landscape', async () => {
-    await elementByLabel('Orientation').tap();
+  afterEach(async () => {
     await device.setOrientation('landscape');
-    await elementByLabel('Push landscape only screen').tap();
     await device.setOrientation('portrait');
-    await expect(element(by.id('currentOrientation'))).toHaveText('Landscape');
   });
 
-  it('orientation should not change from portrait', async () => {
+  it('default allows all', async () => {
     await elementByLabel('Orientation').tap();
-    await device.setOrientation('portrait');
-    await elementByLabel('Push portrait only screen').tap();
+    await elementByLabel('default').tap();
+    await expect(element(by.id('currentOrientation'))).toHaveText('Portrait');
     await device.setOrientation('landscape');
+    await expect(element(by.id('currentOrientation'))).toHaveText('Landscape');
+    await device.setOrientation('portrait');
     await expect(element(by.id('currentOrientation'))).toHaveText('Portrait');
+    await elementByLabel('Dismiss').tap();
   });
 
-  it('orientation should change to portrait and landscape', async () => {
+  it('landscape and portrait array', async () => {
     await elementByLabel('Orientation').tap();
-    await device.setOrientation('portrait');
-    await elementByLabel('Push landscape and portrait').tap();
+    await elementByLabel('landscape and portrait').tap();
+    await expect(element(by.id('currentOrientation'))).toHaveText('Portrait');
     await device.setOrientation('landscape');
     await expect(element(by.id('currentOrientation'))).toHaveText('Landscape');
     await device.setOrientation('portrait');
     await expect(element(by.id('currentOrientation'))).toHaveText('Portrait');
+    await elementByLabel('Dismiss').tap();
   });
 
-  it('orientation default should change to portrait and landscape', async () => {
+  it('portrait only', async () => {
     await elementByLabel('Orientation').tap();
+    await elementByLabel('portrait only').tap();
+    await expect(element(by.id('currentOrientation'))).toHaveText('Portrait');
+    await device.setOrientation('landscape');
+    await expect(element(by.id('currentOrientation'))).toHaveText('Portrait');
     await device.setOrientation('portrait');
-    await elementByLabel('Push default').tap();
+    await expect(element(by.id('currentOrientation'))).toHaveText('Portrait');
+    await elementByLabel('Dismiss').tap();
+  });
+
+  it('landscape only', async () => {
+    await elementByLabel('Orientation').tap();
+    await elementByLabel('landscape only').tap();
+    await expect(element(by.id('currentOrientation'))).toHaveText('Portrait');
     await device.setOrientation('landscape');
     await expect(element(by.id('currentOrientation'))).toHaveText('Landscape');
     await device.setOrientation('portrait');
-    await expect(element(by.id('currentOrientation'))).toHaveText('Portrait');
+    await expect(element(by.id('currentOrientation'))).toHaveText('Landscape');
+    await elementByLabel('Dismiss').tap();
   });
 });

playground/src/containers/OrientationScreen.js → playground/src/containers/OrientationDetectScreen.js

@@ -1,11 +1,11 @@
 const React = require('react');
 const { Component } = require('react');
 
-const { View, Text } = require('react-native');
+const { View, Text, Button } = require('react-native');
 
 const Navigation = require('react-native-navigation');
 
-class OrientationScreen extends Component {
+class OrientationDetectScreen extends Component {
   constructor(props) {
     super(props);
 
@@ -20,6 +20,7 @@ class OrientationScreen extends Component {
     return (
       <View style={styles.root} onLayout={this.detectHorizontal}>
         <Text style={styles.h1}>{`Orientation Screen`}</Text>
+        <Button title="Dismiss" onPress={() => Navigation.dismissModal(this.props.containerId)} />
         <Text style={styles.footer}>{`this.props.containerId = ${this.props.containerId}`}</Text>
         <Text style={styles.footer} testID="currentOrientation">{this.state.horizontal ? 'Landscape' : 'Portrait'}</Text>
       </View>
@@ -56,4 +57,4 @@ const styles = {
   }
 };
 
-module.exports = OrientationScreen;
+module.exports = OrientationDetectScreen;

playground/src/containers/OrientationMenuScreen.js

@@ -1,53 +0,0 @@
-const React = require('react');
-const { Component } = require('react');
-const { View, Text, Button } = require('react-native');
-
-const Navigation = require('react-native-navigation');
-
-class OrientationMenuScreen extends Component {
-  constructor(props) {
-    super(props);
-    this.onClickPushOrientationScreen = this.onClickPushOrientationScreen.bind(this);
-  }
-
-  render() {
-    return (
-      <View style={styles.root}>
-        <Text style={styles.h1}>{`Orientation Menu`}</Text>
-        <Button title="Push landscape only screen" onPress={() => this.onClickPushOrientationScreen(['landscape'])} />
-        <Button title="Push portrait only screen" onPress={() => this.onClickPushOrientationScreen('portrait')} />
-        <Button title="Push landscape and portrait" onPress={() => this.onClickPushOrientationScreen(['landscape', 'portrait'])} />
-        <Button title="Push default" onPress={() => this.onClickPushOrientationScreen('default')} />
-      </View>
-    );
-  }
-
-  onClickPushOrientationScreen(orientation) {
-    Navigation.push(this.props.containerId, {
-      name: 'navigation.playground.OrientationScreen',
-      passProps: {
-        orientation
-      }
-    });
-  }
-}
-
-module.exports = OrientationMenuScreen;
-
-const styles = {
-  root: {
-    flexGrow: 1,
-    justifyContent: 'center',
-    alignItems: 'center'
-  },
-  h1: {
-    fontSize: 24,
-    textAlign: 'center',
-    margin: 30
-  },
-  footer: {
-    fontSize: 10,
-    color: '#888',
-    marginTop: 10
-  }
-};

playground/src/containers/OrientationSelectScreen.js

@@ -0,0 +1,51 @@
+const React = require('react');
+const { Component } = require('react');
+const { View, Text, Button } = require('react-native');
+
+const Navigation = require('react-native-navigation');
+
+class OrientationSelectScreen extends Component {
+
+  render() {
+    return (
+      <View style={styles.root}>
+        <Text style={styles.h1}>{`Orientation Menu`}</Text>
+        <Button title="default" onPress={() => this.onClickOrientationScreen('default')} />
+        <Button title="landscape and portrait" onPress={() => this.onClickOrientationScreen(['landscape', 'portrait'])} />
+        <Button title="portrait only" onPress={() => this.onClickOrientationScreen('portrait')} />
+        <Button title="landscape only" onPress={() => this.onClickOrientationScreen(['landscape'])} />
+      </View>
+    );
+  }
+
+  onClickOrientationScreen(orientation) {
+    Navigation.showModal({
+      container: {
+        name: 'navigation.playground.OrientationDetectScreen',
+        passProps: {
+          orientation
+        }
+      }
+    });
+  }
+}
+
+module.exports = OrientationSelectScreen;
+
+const styles = {
+  root: {
+    flexGrow: 1,
+    justifyContent: 'center',
+    alignItems: 'center'
+  },
+  h1: {
+    fontSize: 24,
+    textAlign: 'center',
+    margin: 30
+  },
+  footer: {
+    fontSize: 10,
+    color: '#888',
+    marginTop: 10
+  }
+};

playground/src/containers/WelcomeScreen.js

@@ -136,7 +136,7 @@ class WelcomeScreen extends Component {
 
   onClickPushOrientationMenuScreen() {
     Navigation.push(this.props.containerId, {
-      name: 'navigation.playground.OrientationMenuScreen'
+      name: 'navigation.playground.OrientationSelectScreen'
     });
   }
 }

playground/src/containers/index.js

@@ -5,8 +5,8 @@ const PushedScreen = require('./PushedScreen');
 const LifecycleScreen = require('./LifecycleScreen');
 const ModalScreen = require('./ModalScreen');
 const OptionsScreen = require('./OptionsScreen');
-const OrientationScreen = require('./OrientationScreen');
-const OrientationMenuScreen = require('./OrientationMenuScreen');
+const OrientationSelectScreen = require('./OrientationSelectScreen');
+const OrientationDetectScreen = require('./OrientationDetectScreen');
 const ScrollViewScreen = require('./ScrollViewScreen');
 
 function registerContainers() {
@@ -17,8 +17,8 @@ function registerContainers() {
   Navigation.registerContainer(`navigation.playground.TextScreen`, () => TextScreen);
   Navigation.registerContainer(`navigation.playground.PushedScreen`, () => PushedScreen);
   Navigation.registerContainer(`navigation.playground.OptionsScreen`, () => OptionsScreen);
-  Navigation.registerContainer(`navigation.playground.OrientationScreen`, () => OrientationScreen);
-  Navigation.registerContainer(`navigation.playground.OrientationMenuScreen`, () => OrientationMenuScreen);
+  Navigation.registerContainer(`navigation.playground.OrientationSelectScreen`, () => OrientationSelectScreen);
+  Navigation.registerContainer(`navigation.playground.OrientationDetectScreen`, () => OrientationDetectScreen);
 }
 
 module.exports = {