Skip to content

Commit 2e654ea

Browse files
author
aksonov
committed
Fixes #2163
1 parent cb00c89 commit 2e654ea

File tree

6 files changed

+11
-7
lines changed

6 files changed

+11
-7
lines changed

Example/.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"presets": [
33
"react-native"
4+
],
5+
"plugins": [
6+
"transform-decorators-legacy"
47
]
58
}

Example/Example.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ const Example = () => {
5757
<Router createReducer={reducerCreate} tintColor='red' getSceneStyle={getSceneStyle}>
5858
<Scene overlay>
5959
<Scene key="messageBar" component={MessageBar} />
60-
<Scene key="lightbox" lightbox leftButtonTextStyle={{color: 'green'}} backButtonTextStyle={{color: 'red'}} initial>
61-
<Scene key="modal" modal hideNavBar>
60+
<Scene key="modal" modal hideNavBar initial>
61+
<Scene key="lightbox" lightbox leftButtonTextStyle={{color: 'green'}} backButtonTextStyle={{color: 'red'}} initial>
6262
<Scene key="root" hideNavBar hideTabBar>
6363
<Scene key="echo" back clone component={EchoView} getTitle={({navigation}) => navigation.state.key}/>
6464
<Scene key="register" back>
@@ -122,6 +122,7 @@ const Example = () => {
122122
</Scene>
123123
</Scene>
124124
</Scene>
125+
<Scene key="error" component={Error}/>
125126
</Scene>
126127
<Scene key="login">
127128
<Scene key="loginModal" component={Login} title="Login"
@@ -145,7 +146,6 @@ const Example = () => {
145146
duration={1}
146147
/>
147148
</Scene>
148-
<Scene key="error" component={Error}/>
149149
</Scene>
150150
</Scene>
151151
</Router>

Example/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
},
99
"dependencies": {
1010
"autobind-decorator": "^1.4.1",
11+
"babel-plugin-transform-decorators-legacy": "^1.3.4",
1112
"mobx": "^3.2.1",
1213
"mobx-react": "^4.2.1",
1314
"react": "16.0.0-alpha.6",

Example/yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3237,9 +3237,9 @@ react-native-message-bar@^1.6.0:
32373237
version "1.6.0"
32383238
resolved "https://registry.yarnpkg.com/react-native-message-bar/-/react-native-message-bar-1.6.0.tgz#79623e89655475216927090771b0238616b6f1c7"
32393239

3240-
react-native-router-flux@4.0.0-beta.15:
3240+
"react-native-router-flux@github:aksonov/react-native-router-flux#c029b4f2ae8cb972b4cda365ed8995b191fd5df4":
32413241
version "4.0.0-beta.15"
3242-
resolved "https://registry.yarnpkg.com/react-native-router-flux/-/react-native-router-flux-4.0.0-beta.15.tgz#d4c340568677336a59f0cb704e308a449ce0245e"
3242+
resolved "https://codeload.github.com/aksonov/react-native-router-flux/tar.gz/c029b4f2ae8cb972b4cda365ed8995b191fd5df4"
32433243
dependencies:
32443244
mobx "^3.1.16"
32453245
mobx-react "^4.2.1"

dist/navigationStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ navigation:_propTypes2.default.object};
202202
return wrapper(wrapped);
203203
}
204204

205-
function filterParam(data){
205+
function filterParam(){var data=arguments.length>0&&arguments[0]!==undefined?arguments[0]:{};
206206
if(data.toString()!=='[object Object]'){
207207
return{data:data};
208208
}

src/navigationStore.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ function createWrapper(Component, wrapBy) {
202202
return wrapper(wrapped);
203203
}
204204

205-
function filterParam(data) {
205+
function filterParam(data = {}) {
206206
if (data.toString() !== '[object Object]') {
207207
return { data };
208208
}

0 commit comments

Comments
 (0)