Browse Source

fix most e2e

Daniel Zlotin 7 years ago
parent
commit
ef681b07fd

+ 2
- 2
playground/src/app.js View File

1
 const Navigation = require('react-native-navigation');
1
 const Navigation = require('react-native-navigation');
2
-const { registerComponents } = require('./components');
2
+const { registerScreens } = require('./screens');
3
 
3
 
4
 function start() {
4
 function start() {
5
-  registerComponents();
5
+  registerScreens();
6
   Navigation.events().onAppLaunched(() => {
6
   Navigation.events().onAppLaunched(() => {
7
     Navigation.setRoot({
7
     Navigation.setRoot({
8
       stack: {
8
       stack: {

playground/src/containers/BackHandlerScreen.js → playground/src/screens/BackHandlerScreen.js View File


playground/src/containers/CustomDialog.js → playground/src/screens/CustomDialog.js View File


playground/src/containers/CustomTransitionDestination.js → playground/src/screens/CustomTransitionDestination.js View File


playground/src/containers/CustomTransitionOrigin.js → playground/src/screens/CustomTransitionOrigin.js View File


playground/src/containers/LifecycleScreen.js → playground/src/screens/LifecycleScreen.js View File


playground/src/containers/ModalScreen.js → playground/src/screens/ModalScreen.js View File


playground/src/containers/OptionsScreen.js → playground/src/screens/OptionsScreen.js View File


playground/src/containers/OrientationDetectScreen.js → playground/src/screens/OrientationDetectScreen.js View File


playground/src/containers/OrientationSelectScreen.js → playground/src/screens/OrientationSelectScreen.js View File


playground/src/containers/PushedScreen.js → playground/src/screens/PushedScreen.js View File

36
 
36
 
37
   async onClickPush() {
37
   async onClickPush() {
38
     await Navigation.push(this.props.componentId, {
38
     await Navigation.push(this.props.componentId, {
39
-      name: 'navigation.playground.PushedScreen',
40
-      passProps: {
41
-        stackPosition: this.getStackPosition() + 1,
42
-        previousScreenIds: _.concat([], this.props.previousScreenIds || [], this.props.componentId)
39
+      component: {
40
+        name: 'navigation.playground.PushedScreen',
41
+        passProps: {
42
+          stackPosition: this.getStackPosition() + 1,
43
+          previousScreenIds: _.concat([], this.props.previousScreenIds || [], this.props.componentId)
44
+        }
43
       }
45
       }
44
     });
46
     });
45
   }
47
   }

playground/src/containers/ScrollViewScreen.js → playground/src/screens/ScrollViewScreen.js View File


playground/src/containers/SideMenuScreen.js → playground/src/screens/SideMenuScreen.js View File


playground/src/containers/TextScreen.js → playground/src/screens/TextScreen.js View File


playground/src/containers/TopTabOptionsScreen.js → playground/src/screens/TopTabOptionsScreen.js View File


playground/src/containers/TopTabScreen.js → playground/src/screens/TopTabScreen.js View File


playground/src/containers/WelcomeScreen.js → playground/src/screens/WelcomeScreen.js View File


playground/src/containers/index.js → playground/src/screens/index.js View File

16
 const TopTabScreen = require('./TopTabScreen');
16
 const TopTabScreen = require('./TopTabScreen');
17
 const TopTabOptionsScreen = require('./TopTabOptionsScreen');
17
 const TopTabOptionsScreen = require('./TopTabOptionsScreen');
18
 
18
 
19
-function registerComponents() {
19
+function registerScreens() {
20
   Navigation.registerComponent(`navigation.playground.CustomTransitionDestination`, () => CustomTransitionDestination);
20
   Navigation.registerComponent(`navigation.playground.CustomTransitionDestination`, () => CustomTransitionDestination);
21
   Navigation.registerComponent(`navigation.playground.CustomTransitionOrigin`, () => CustomTransitionOrigin);
21
   Navigation.registerComponent(`navigation.playground.CustomTransitionOrigin`, () => CustomTransitionOrigin);
22
   Navigation.registerComponent(`navigation.playground.ScrollViewScreen`, () => ScrollViewScreen);
22
   Navigation.registerComponent(`navigation.playground.ScrollViewScreen`, () => ScrollViewScreen);
36
 }
36
 }
37
 
37
 
38
 module.exports = {
38
 module.exports = {
39
-  registerComponents
39
+  registerScreens
40
 };
40
 };