Merge branch 'master' of https://github.com/aksonov/react-native-router-flux

Author: aksonov

README.md

@@ -52,7 +52,7 @@ Actions.refresh({param1: 'hello', param2: 'world'})
 
 ```bash
 # Get the code
-git clone [email protected]:aksonov/react-native-router-flux.git`
+git clone [email protected]:aksonov/react-native-router-flux.git
 cd react-native-router-flux/Example
 
 # Install dependencies

dist/Router.js

@@ -238,8 +238,8 @@ if(!_navigationStore2.default.states[key]){
 _navigationStore2.default.states[key]={};
 }
 for(var _iterator4=Object.keys(props),_isArray4=Array.isArray(_iterator4),_i5=0,_iterator4=_isArray4?_iterator4:_iterator4[typeof Symbol==='function'?Symbol.iterator:'@@iterator']();;){var _ref8;if(_isArray4){if(_i5>=_iterator4.length)break;_ref8=_iterator4[_i5++];}else{_i5=_iterator4.next();if(_i5.done)break;_ref8=_i5.value;}var transition=_ref8;
-if(reservedKeys.indexOf(transition)===-1&&transition[props]instanceof Function){
-_navigationStore2.default.states[key][transition]=transition[props];
+if(reservedKeys.indexOf(transition)===-1&&props[transition]instanceof Function){
+_navigationStore2.default.states[key][transition]=props[transition];
 }
 }
 delete props.children;

docs/MIGRATION.md

@@ -1,6 +1,5 @@
-# Migrating from 3.x
+## Migrating from 3.x
 
-## Breaking changes (compared to v3):
 * `Actions.create` (alternative syntax to define scenes) is not available (for simplicity) - just use `<Router>` as top component for your App. You may wrap it with Redux as well.
 * No `duration`/`panHandlers` support - you have to implement custom navigator now instead and pass it as ‘navigator’ prop
 https://reactnavigation.org/docs/navigators/custom. You could still pass `panHandlers={null}` to disable gestures or `gesturedEnabled={false}`
@@ -12,10 +11,13 @@ https://github.com/react-community/react-navigation/issues/1493
 * `Switch` is removed - you may use onEnter/onExit handlers for more flexible logic.
 * `getSceneStyle` is removed (no needed in v4, you may pass any values to Router now and they will be inherited by all scenes).
 * Custom reducer is supported (`createReducer` prop for Router) but Redux actions now are passed directly from React Navigation (‘Navigation/BACK’, ‘Navigation/NAVIGATE’, etc.)
-* Drawer is 'drawer' attribute Scene
+* Use 'replace' instead of `ActionConst.REPLACE` within Scene declaration
+* Scenes cannot have both 'component' and 'children'
+* Drawer syntax was changed (boolean `drawer` attribute + `contentComponent` for side menu component + `Actions.drawerOpen`/`Actions.drawerClose` to open/close drawer) 
 * Modal is 'lightbox' attribute for Scene (used for popups, like Error)
 * Container scenes (that has children) cannot have `component` (or it will be considered as child!). If you want to customize containers, use react navigation custom navigators and pass it as `navigator` prop.
 * No `position` attribute is supported for custom transitions. For vertical transition add `modal` to parent `Scene`.
 * No flux 'focus' actions - use onEnter/onExit handlers instead.
 * tabBarSelectedItemStyle is not supported. Instead please use React Navigation TabBar params for tabs Scene: `activeTintColor`, `inactiveTintColor`, etc (https://reactnavigation.org/docs/navigators/tab)
+* To make multiple pops you could use `Actions.popTo(sceneName)` where sceneName is name of scene you want to see (it should be not container, i.e. scene with `component`)
 * Possible other stuff.

src/Router.js

@@ -238,8 +238,8 @@ function processScene(scene: Scene, inheritProps = {}, clones = [], wrapBy) {
       navigationStore.states[key] = {};
     }
     for (const transition of Object.keys(props)) {
-      if (reservedKeys.indexOf(transition) === -1 && (transition[props] instanceof Function)) {
-        navigationStore.states[key][transition] = transition[props];
+      if (reservedKeys.indexOf(transition) === -1 && (props[transition] instanceof Function)) {
+        navigationStore.states[key][transition] = props[transition];
       }
     }
     delete props.children;