Skip to content

Commit f51f469

Browse files
aksonovaksonov
committed
update Example to RN0.57
1 parent bf478c2 commit f51f469

File tree

7 files changed

+1003
-1246
lines changed

7 files changed

+1003
-1246
lines changed

‎examples/react-native/.babelrc.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = {
2+
"extends": "./babel.config.js"
3+
};

‎examples/react-native/Example.js‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,19 @@ const getSceneStyle = () => ({
5757
const prefix = Platform.OS === 'android' ? 'mychat://mychat/' : 'mychat://';
5858

5959
const transitionConfig = () => ({
60-
screenInterpolator:
61-
StackViewStyleInterpolator.forFadeFromBottomAndroid,
60+
screenInterpolator: StackViewStyleInterpolator.forFadeFromBottomAndroid,
6261
});
6362

6463
const Example = () => (
6564
<Router createReducer={reducerCreate} onStateChange={stateHandler} getSceneStyle={getSceneStyle} uriPrefix={prefix}>
6665
<Overlay key="overlay">
6766
<Modal key="modal" hideNavBar transitionConfig={transitionConfig}>
6867
<Lightbox key="lightbox">
69-
<Stack key="root" titleStyle={{ alignSelf: 'center' }}>
68+
<Stack key="root" titleStyle={{ alignSelf: 'center' }} hideNavBar>
7069
<Scene key="echo" back clone component={EchoView} getTitle={({ navigation }) => navigation.state.key} />
7170
<Scene key="launch" component={Launch} title="Launch" initial type={ActionConst.RESET} />
7271

73-
<Stack key="customNavBar" hideTabBar headerLayoutPreset='center'>
72+
<Stack key="customNavBar" hideTabBar headerLayoutPreset="center">
7473
<Scene key="customNavBar1" title="CustomNavBar 1" navBar={CustomNavBar} component={CustomNavBarView} back />
7574
<Scene key="customNavBar2" title="CustomNavBar 2" navBar={CustomNavBar} component={CustomNavBarView} back />
7675
<Scene key="customNavBar3" title="Another CustomNavBar" navBar={CustomNavBar2} component={CustomNavBarView} back />
@@ -83,7 +82,19 @@ const Example = () => (
8382
<Scene key="home" component={Home} title="Replace" type={ActionConst.REPLACE} />
8483
</Stack>
8584

86-
<Drawer hideNavBar key="drawer" onExit={() => { console.log('Drawer closed') }} onEnter={() => { console.log('Drawer opened') }} contentComponent={DrawerContent} drawerImage={MenuIcon} drawerWidth={300}>
85+
<Drawer
86+
hideNavBar
87+
key="drawer"
88+
onExit={() => {
89+
console.log('Drawer closed');
90+
}}
91+
onEnter={() => {
92+
console.log('Drawer opened');
93+
}}
94+
contentComponent={DrawerContent}
95+
drawerImage={MenuIcon}
96+
drawerWidth={300}
97+
>
8798
{/*
8899
Wrapper Scene needed to fix a bug where the tabs would
89100
reload as a modal ontop of itself
@@ -94,7 +105,9 @@ const Example = () => (
94105
routeName="tabbar"
95106
legacy
96107
backToInitial
97-
onTabOnPress={() => { console.log('Back to initial and also print this') }}
108+
onTabOnPress={() => {
109+
console.log('Back to initial and also print this');
110+
}}
98111
swipeEnabled
99112
showLabel={false}
100113
tabBarStyle={styles.tabBarStyle}
@@ -136,10 +149,19 @@ const Example = () => (
136149
<Scene key="demo_lightbox" component={DemoLightbox} />
137150
</Lightbox>
138151
<Scene key="error" component={ErrorModal} />
139-
<Stack key="login" headerLayoutPreset='center' path="login/:data" titleStyle={{ alignSelf: 'center' }}>
152+
<Stack key="login" headerLayoutPreset="center" path="login/:data" titleStyle={{ alignSelf: 'center' }}>
140153
<Scene key="loginModal" component={Login} title="Login" onExit={() => console.log('Login: onExit')} leftTitle="Cancel" onLeft={Actions.pop} />
141-
<Scene key="loginModal2" component={Login2} title="Login2" onEnter={() => console.log('Login2: onEnter') } backTitle="Back" panHandlers={null} duration={1} />
142-
<Scene key="loginModal3" hideNavBar component={Login3} title="Login3" onEnter={() => console.log('Login3: onEnter') } onExit={() => console.log('Login3: onExit')} panHandlers={null} duration={1} />
154+
<Scene key="loginModal2" component={Login2} title="Login2" onEnter={() => console.log('Login2: onEnter')} backTitle="Back" panHandlers={null} duration={1} />
155+
<Scene
156+
key="loginModal3"
157+
hideNavBar
158+
component={Login3}
159+
title="Login3"
160+
onEnter={() => console.log('Login3: onEnter')}
161+
onExit={() => console.log('Login3: onExit')}
162+
panHandlers={null}
163+
duration={1}
164+
/>
143165
</Stack>
144166
</Modal>
145167

‎examples/react-native/babel.config.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
module.exports = {
22
"presets": [
3-
"babel-preset-react-native"
3+
"module:metro-react-native-babel-preset"
44
],
55
"plugins": [
6-
["@babel/plugin-proposal-decorators", { "legacy": true }]
6+
["@babel/plugin-proposal-decorators", { "legacy": true }],
7+
"@babel/plugin-transform-runtime"
78
]
89
}

‎examples/react-native/package.json‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,39 +13,37 @@
1313
"test": "jest",
1414
"postinstall": "node_modules/.bin/rnrf dedup"
1515
},
16-
"resolutions": {
17-
"*/@babel/cli": "7.0.0-beta.47",
18-
"*/@babel/core": "7.0.0-beta.47",
19-
"*/@babel/code-frame": "7.0.0-beta.47",
20-
"*/@babel/generator": "7.0.0-beta.47",
21-
"*/@babel/highlight": "7.0.0-beta.47"
22-
},
2316
"dependencies": {
2417
"prop-types": "^15.6.2",
25-
"react": "16.4.1",
26-
"react-native": "0.56.0",
18+
"react": "16.5.0",
19+
"react-native": "0.57.1",
2720
"react-native-button": "^2.3.0",
2821
"react-native-message-bar": "^2.0.10",
2922
"react-native-router-flux": "file:../..",
3023
"react-native-router-flux-cli": "file:../../packages/react-native-router-flux-cli",
31-
"react-navigation": "2.13.x",
32-
"react-navigation-stack": "^0.4.0"
24+
"react-native-screens": "^1.0.0-alpha.12",
25+
"react-navigation": "2.16.x",
26+
"react-navigation-deprecated-tab-navigator": "^1.3.0",
27+
"react-navigation-stack": "^0.6.0"
3328
},
3429
"devDependencies": {
35-
"@babel/code-frame": "7.0.0-beta.47",
36-
"@babel/core": "7.0.0-beta.47",
37-
"@babel/plugin-proposal-decorators": "7.0.0-beta.47",
30+
"@babel/code-frame": "^7.0.0",
31+
"@babel/core": "^7.1.0",
32+
"@babel/plugin-proposal-decorators": "^7.1.0",
33+
"@babel/plugin-transform-runtime": "^7.1.0",
34+
"@babel/runtime": "^7.0.0",
3835
"autobind-decorator": "^2.1.0",
3936
"babel-core": "^7.0.0-0",
40-
"babel-jest": "^23.4.0",
41-
"babel-preset-react-native": "5.0.2",
42-
"jest": "^23.4.1",
43-
"react-test-renderer": "^16.4.2"
37+
"babel-jest": "^23.6.0",
38+
"jest": "^23.6.0",
39+
"metro-react-native-babel-preset": "^0.45.0",
40+
"react-test-renderer": "16.5.2",
41+
"schedule": "0.4.0"
4442
},
4543
"jest": {
4644
"preset": "react-native",
4745
"transformIgnorePatterns": [
48-
"node_modules/(?!(jest-)?react-native|react-navigation)"
46+
"node_modules/(?!(jest-)?react-native|react-navigation|react-navigation-(tabs|drawer|deprecated-tab-navigator|stack))"
4947
],
5048
"setupFiles": [
5149
"./test/setup.js"

0 commit comments

Comments
 (0)