* Pass exception after failure as ‘error’ param to next scene

* Run custom navigator (if ‘navigator’ is passed) even if ’tabs’ is defined - it allows not to use clone scenes within ‘tabbed’ custom navigators
* Refresh state after switching tab for JUMP action and non-empty params because React Navigation doesn’t do it (it just switched index)
* Throw exception if ‘component’ & ‘children’ to avoid ‘Actions.{key} not found’ error (breaking changes for v3)
* Throw exception if there is multiple children for Router (breaking changes for v3)

Author: aksonov

Example/components/TabView.js

@@ -29,6 +29,7 @@ const TabView = (props) => {
   return (
     <View style={[styles.container, props.sceneStyle ]}>
       <Text>Tab title:{props.title} name:{props.name}</Text>
+      <Text>Tab data:{props.data}</Text>
       {props.name === 'tab1_1' &&
         <Button onPress={()=>Actions.tab1_2()}>next screen for tab1_1</Button>
       }
@@ -40,7 +41,7 @@ const TabView = (props) => {
       <Button onPress={() => { Actions.tab2(); }}>Switch to tab2</Button>
       <Button onPress={() => { Actions.tab3(); }}>Switch to tab3</Button>
       <Button onPress={() => { Actions.tab4(); }}>Switch to tab4</Button>
-      <Button onPress={() => { Actions.tab5(); }}>Switch to tab5</Button>
+      <Button onPress={() => { Actions.tab5({ data: 'test!' }); }}>Switch to tab5 with data</Button>
       <Button onPress={() => { Actions.echo(); }}>push clone scene (EchoView)</Button>
     </View>
   );

dist/Router.js

@@ -244,10 +244,12 @@ _navigationStore2.default.states[key][transition]=transition[props];
 }
 delete props.children;
 if(success){
-_navigationStore2.default.states[key].success=success instanceof Function?success:function(args){console.log('Transition to state='+success);_navigationStore2.default[success](args);};
+_navigationStore2.default.states[key].success=success instanceof Function?
+success:function(args){console.log('Transition to state='+success);_navigationStore2.default[success](args);};
 }
 if(failure){
-_navigationStore2.default.states[key].failure=failure instanceof Function?failure:function(args){console.log('Transition to state='+failure);_navigationStore2.default[failure](args);};
+_navigationStore2.default.states[key].failure=failure instanceof Function?
+failure:function(args){console.log('Transition to state='+failure);_navigationStore2.default[failure](args);};
 }
 
 var screen={
@@ -285,6 +287,9 @@ initialRouteParams=_extends({},commonProps,props);
 }};for(var _iterator3=children,_isArray3=Array.isArray(_iterator3),_i4=0,_iterator3=_isArray3?_iterator3:_iterator3[typeof Symbol==='function'?Symbol.iterator:'@@iterator']();;){var _ref7;if(_isArray3){if(_i4>=_iterator3.length)break;_ref7=_iterator3[_i4++];}else{_i4=_iterator3.next();if(_i4.done)break;_ref7=_i4.value;}var _child=_ref7;_loop(_child);
 }
 var mode=modal?'modal':'card';
+if(navigator){
+return navigator(res,_extends({lazy:lazy,initialRouteName:initialRouteName,initialRouteParams:initialRouteParams,order:order},commonProps,{navigationOptions:createNavigationOptions(commonProps)}));
+}
 if(lightbox){
 return(0,_LightboxNavigator2.default)(res,{mode:mode,initialRouteParams:initialRouteParams,initialRouteName:initialRouteName,navigationOptions:createNavigationOptions(commonProps)});
 }else if(tabs){
@@ -293,20 +298,18 @@ tabBarOptions:createTabBarOptions(commonProps),navigationOptions:createNavigatio
 }else if(drawer){
 return(0,_reactNavigation.DrawerNavigator)(res,_extends({initialRouteName:initialRouteName,contentComponent:contentComponent,order:order},commonProps));
 }
-if(navigator){
-return navigator(res,_extends({lazy:lazy,initialRouteName:initialRouteName,initialRouteParams:initialRouteParams,order:order},commonProps,{navigationOptions:createNavigationOptions(commonProps)}));
-}
 return(0,_reactNavigation.StackNavigator)(res,_extends({mode:mode,initialRouteParams:initialRouteParams,initialRouteName:initialRouteName},commonProps,{navigationOptions:createNavigationOptions(commonProps)}));
 }
 
 var Router=function Router(_ref9){var createReducer=_ref9.createReducer,_ref9$wrapBy=_ref9.wrapBy,wrapBy=_ref9$wrapBy===undefined?function(props){return props;}:_ref9$wrapBy,props=_objectWithoutProperties(_ref9,['createReducer','wrapBy']);
+(0,_Util.assert)(!Array.isArray(props.children),'Router should contain only one scene, please wrap your scenes with Scene ');
 var scene=props.children;
 var AppNavigator=processScene(scene,props,[],wrapBy);
 _navigationStore2.default.router=AppNavigator.router;
 _navigationStore2.default.reducer=createReducer&&createReducer(props);
 RightNavBarButton=wrapBy(_NavBar.RightButton);
 LeftNavBarButton=wrapBy(_NavBar.LeftButton);
-return _react2.default.createElement(App,{navigator:AppNavigator,__source:{fileName:_jsxFileName,lineNumber:309}});
+return _react2.default.createElement(App,{navigator:AppNavigator,__source:{fileName:_jsxFileName,lineNumber:312}});
 };
 Router.propTypes={
 createReducer:_propTypes2.default.func,

dist/navigationStore.js

@@ -130,8 +130,8 @@ function NavigationStore(){var _this=this;_classCallCheck(this,NavigationStore);
 
 nextState=function(state,cmd){return _this.reducer?_this.reducer(state,cmd):_this._router.getStateForAction(cmd,state);};this.
 
-dispatch=function(cmd,type){
-_this.setState(_this.nextState(_this.state,cmd),type);
+dispatch=function(cmd,type,params){
+_this.setState(_this.nextState(_this.state,cmd),type,params);
 };_initDefineProp(this,'setState',_descriptor4,this);this.
 
 
@@ -149,6 +149,9 @@ _this.setState(_this.nextState(_this.state,cmd),type);
 
 
 
+
+
+
 run=function(){for(var _len=arguments.length,params=Array(_len>3?_len-3:0),_key=3;_key<_len;_key++){params[_key-3]=arguments[_key];}var type=arguments.length>0&&arguments[0]!==undefined?arguments[0]:ActionConst.PUSH;var routeName=arguments[1];var actions=arguments[2];
 var res={};
 for(var _iterator=params,_isArray=Array.isArray(_iterator),_i=0,_iterator=_isArray?_iterator:_iterator[typeof Symbol==='function'?typeof Symbol==='function'?Symbol.iterator:'@@iterator':'@@iterator']();;){var _ref;if(_isArray){if(_i>=_iterator.length)break;_ref=_iterator[_i++];}else{_i=_iterator.next();if(_i.done)break;_ref=_i.value;}var param=_ref;
@@ -158,7 +161,7 @@ res=_extends({},res,filterParam(param));
 }
 res.routeName=routeName;
 if(supportedActions[type]){
-_this.dispatch(createAction(supportedActions[type])({routeName:routeName,index:0,actions:actions,params:res}),type);
+_this.dispatch(createAction(supportedActions[type])({routeName:routeName,index:0,actions:actions,params:res}),type,res);
 }else if(type===ActionConst.POP_TO){
 var nextScene='';
 var newState=_this._state;
@@ -235,7 +238,7 @@ _this.run(ActionConst.REPLACE,routeName,[_reactNavigation.NavigationActions.navi
 routeName:routeName,
 params:res})]);
 
-};var defaultSuccess=function defaultSuccess(){};var defaultFailure=function defaultFailure(){};(0,_mobx.autorunAsync)(function _callee(){var handler,res,_handler,success,failure,params,_res;return regeneratorRuntime.async(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:_context.prev=0;if(_this.prevScene&&_this.currentScene!==_this.prevScene){handler=_this[_this.prevScene+_Util.OnExit];if(handler){try{res=handler();if(res instanceof Promise){res.then(defaultSuccess,defaultFailure);}}catch(e){console.error('Error during onExit handler:',e);}}}if(!(_this.currentScene&&_this.currentScene!==_this.prevScene&&_this.states[_this.currentScene])){_context.next=20;break;}_handler=_this[_this.currentScene+_Util.OnEnter];success=_this.states[_this.currentScene].success||defaultSuccess;failure=_this.states[_this.currentScene].failure||defaultFailure;if(!_handler){_context.next=20;break;}_context.prev=7;params=_this.currentState().params;console.log('RUN onEnter handler for state=',_this.currentScene,' params='+JSON.stringify(params));_context.next=12;return regeneratorRuntime.awrap(_handler(params));case 12:_res=_context.sent;if(_res){console.log('SUCCESS',_res);success(_res);}else{console.log('FAILURE NULL RES');failure();}_context.next=20;break;case 16:_context.prev=16;_context.t0=_context['catch'](7);console.log('FAILURE EXCEPTION',_context.t0);failure(_context.t0);case 20:_context.next=25;break;case 22:_context.prev=22;_context.t1=_context['catch'](0);console.error('Error handling:'+_context.t1);case 25:case'end':return _context.stop();}}},null,_this,[[0,22],[7,16]]);});}return NavigationStore;}(),(_descriptor=_applyDecoratedDescriptor(_class.prototype,'currentScene',[_mobx.observable],{enumerable:true,initializer:function initializer(){return'';}}),_descriptor2=_applyDecoratedDescriptor(_class.prototype,'prevScene',[_mobx.observable],{enumerable:true,initializer:function initializer(){return'';}}),_descriptor3=_applyDecoratedDescriptor(_class.prototype,'currentParams',[_mobx.observable],{enumerable:true,initializer:null}),_descriptor4=_applyDecoratedDescriptor(_class.prototype,'setState',[_mobx.action],{enumerable:true,initializer:function initializer(){var _this2=this;return function(newState,type){if(!newState){return;}var state=_this2.currentState(newState);if(type===ActionConst.JUMP&&state.routeName===_this2.currentScene){return;}_this2._state=newState;_this2.prevScene=_this2.currentScene;_this2.currentScene=state.routeName;_this2.currentParams=state.params;};}})),_class);exports.default=
+};var defaultSuccess=function defaultSuccess(){};var defaultFailure=function defaultFailure(){};(0,_mobx.autorunAsync)(function _callee(){var handler,res,_handler,success,failure,params,_res;return regeneratorRuntime.async(function _callee$(_context){while(1){switch(_context.prev=_context.next){case 0:_context.prev=0;if(_this.prevScene&&_this.currentScene!==_this.prevScene){handler=_this[_this.prevScene+_Util.OnExit];if(handler){try{res=handler();if(res instanceof Promise){res.then(defaultSuccess,defaultFailure);}}catch(e){console.error('Error during onExit handler:',e);}}}if(!(_this.currentScene&&_this.currentScene!==_this.prevScene&&_this.states[_this.currentScene])){_context.next=20;break;}_handler=_this[_this.currentScene+_Util.OnEnter];success=_this.states[_this.currentScene].success||defaultSuccess;failure=_this.states[_this.currentScene].failure||defaultFailure;if(!_handler){_context.next=20;break;}_context.prev=7;params=_this.currentState().params;console.log('RUN onEnter handler for state=',_this.currentScene,' params='+JSON.stringify(params));_context.next=12;return regeneratorRuntime.awrap(_handler(params));case 12:_res=_context.sent;if(_res){console.log('SUCCESS',_res);success(_res);}else{console.log('FAILURE NULL RES');failure();}_context.next=20;break;case 16:_context.prev=16;_context.t0=_context['catch'](7);console.log('FAILURE EXCEPTION',_context.t0);failure({error:_context.t0});case 20:_context.next=25;break;case 22:_context.prev=22;_context.t1=_context['catch'](0);console.error('Error handling:'+_context.t1);case 25:case'end':return _context.stop();}}},null,_this,[[0,22],[7,16]]);});}return NavigationStore;}(),(_descriptor=_applyDecoratedDescriptor(_class.prototype,'currentScene',[_mobx.observable],{enumerable:true,initializer:function initializer(){return'';}}),_descriptor2=_applyDecoratedDescriptor(_class.prototype,'prevScene',[_mobx.observable],{enumerable:true,initializer:function initializer(){return'';}}),_descriptor3=_applyDecoratedDescriptor(_class.prototype,'currentParams',[_mobx.observable],{enumerable:true,initializer:null}),_descriptor4=_applyDecoratedDescriptor(_class.prototype,'setState',[_mobx.action],{enumerable:true,initializer:function initializer(){var _this2=this;return function(newState,type,params){if(!newState){return;}var state=_this2.currentState(newState);if(type===ActionConst.JUMP&&state.routeName===_this2.currentScene){return;}_this2._state=newState;_this2.prevScene=_this2.currentScene;_this2.currentScene=state.routeName;_this2.currentParams=state.params;if(type===ActionConst.JUMP&&params){_this2.refresh(params);}};}})),_class);exports.default=
 
 
 

src/Router.js

@@ -244,10 +244,12 @@ function processScene(scene: Scene, inheritProps = {}, clones = [], wrapBy) {
     }
     delete props.children;
     if (success) {
-      navigationStore.states[key].success = success instanceof Function ? success : args => { console.log(`Transition to state=${success}`); navigationStore[success](args); };
+      navigationStore.states[key].success = success instanceof Function ?
+        success : args => { console.log(`Transition to state=${success}`); navigationStore[success](args); };
     }
     if (failure) {
-      navigationStore.states[key].failure = failure instanceof Function ? failure : args => { console.log(`Transition to state=${failure}`); navigationStore[failure](args); };
+      navigationStore.states[key].failure = failure instanceof Function ?
+        failure : args => { console.log(`Transition to state=${failure}`); navigationStore[failure](args); };
     }
     // console.log(`KEY ${key} DRAWER ${drawer} TABS ${tabs} WRAP ${wrap}`, JSON.stringify(commonProps));
     const screen = {
@@ -285,6 +287,9 @@ function processScene(scene: Scene, inheritProps = {}, clones = [], wrapBy) {
     }
   }
   const mode = modal ? 'modal' : 'card';
+  if (navigator) {
+    return navigator(res, { lazy, initialRouteName, initialRouteParams, order, ...commonProps, navigationOptions: createNavigationOptions(commonProps) });
+  }
   if (lightbox) {
     return LightboxNavigator(res, { mode, initialRouteParams, initialRouteName, navigationOptions: createNavigationOptions(commonProps) });
   } else if (tabs) {
@@ -293,13 +298,11 @@ function processScene(scene: Scene, inheritProps = {}, clones = [], wrapBy) {
   } else if (drawer) {
     return DrawerNavigator(res, { initialRouteName, contentComponent, order, ...commonProps });
   }
-  if (navigator) {
-    return navigator(res, { lazy, initialRouteName, initialRouteParams, order, ...commonProps, navigationOptions: createNavigationOptions(commonProps) });
-  }
   return StackNavigator(res, { mode, initialRouteParams, initialRouteName, ...commonProps, navigationOptions: createNavigationOptions(commonProps) });
 }
 
 const Router = ({ createReducer, wrapBy = props => props, ...props }) => {
+  assert(!Array.isArray(props.children), 'Router should contain only one scene, please wrap your scenes with Scene ');
   const scene: Scene = props.children;
   const AppNavigator = processScene(scene, props, [], wrapBy);
   navigationStore.router = AppNavigator.router;

src/navigationStore.js

@@ -118,7 +118,7 @@ class NavigationStore {
               }
             } catch (e) {
               console.log('FAILURE EXCEPTION', e);
-              failure(e);
+              failure({ error: e });
             }
           }
         }
@@ -130,11 +130,11 @@ class NavigationStore {
 
   nextState = (state, cmd) => (this.reducer ? this.reducer(state, cmd) : this._router.getStateForAction(cmd, state));
 
-  dispatch = (cmd, type) => {
-    this.setState(this.nextState(this.state, cmd), type);
+  dispatch = (cmd, type, params) => {
+    this.setState(this.nextState(this.state, cmd), type, params);
   };
 
-  @action setState = (newState, type) => {
+  @action setState = (newState, type, params) => {
     // don't allow null state
     if (!newState) {
       return;
@@ -147,6 +147,9 @@ class NavigationStore {
     this.prevScene = this.currentScene;
     this.currentScene = state.routeName;
     this.currentParams = state.params;
+    if (type === ActionConst.JUMP && params) {
+      this.refresh(params);
+    }
   };
 
   run = (type = ActionConst.PUSH, routeName, actions, ...params) => {
@@ -158,7 +161,7 @@ class NavigationStore {
     }
     res.routeName = routeName;
     if (supportedActions[type]) {
-      this.dispatch(createAction(supportedActions[type])({ routeName, index: 0, actions, params: res }), type);
+      this.dispatch(createAction(supportedActions[type])({ routeName, index: 0, actions, params: res }), type, res);
     } else if (type === ActionConst.POP_TO) {
       let nextScene = '';
       let newState = this._state;