From e2f4ce1ff9803ec85e700363bc1963358d39175d Mon Sep 17 00:00:00 2001
From: Pavlo Aksonov <aksonov@MacBook-Pro-Pavlo.local>
Date: Tue, 24 Nov 2015 18:31:02 +0100
Subject: [PATCH] fixes

---
 .babelrc            |  6 ------
 .idea/workspace.xml | 29 ++++++++++++++++++++++++-----
 actions.js          | 38 +++++++++++++++++++++++++++-----------
 index.js            | 17 ++++++++++++-----
 package.json        |  2 +-
 reducer.js          |  3 +--
 6 files changed, 65 insertions(+), 30 deletions(-)
 delete mode 100644 .babelrc

diff --git a/.babelrc b/.babelrc
deleted file mode 100644
index a969c99..0000000
--- a/.babelrc
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "presets": ["react", "es2015"],
-  "ignore": [
-    "foo.js",
-  ]
-}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1489c3f..a4ea188 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="524839ff-09d4-4312-bab4-50dee2a2f426" name="Default" comment="" />
+    <list default="true" id="524839ff-09d4-4312-bab4-50dee2a2f426" name="Default" comment="">
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.babelrc" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+    </list>
     <ignored path="react-native-redux-router.iws" />
     <ignored path=".idea/workspace.xml" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -45,8 +48,16 @@
         <entry file="file://$PROJECT_DIR$/package.json">
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="2.7916667">
-              <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-              <folding />
+              <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+              <folding>
+                <marker date="1448373276000" expanded="true" signature="14:115" placeholder="{&quot;name&quot;: &quot;Pavlo Aksonov&quot;...}" />
+                <marker date="1448373276000" expanded="true" signature="135:191" placeholder="{&quot;react-redux&quot;: &quot;^3.1.0&quot;...}" />
+                <marker date="1448373276000" expanded="true" signature="206:266" placeholder="{&quot;test&quot;: &quot;mocha --compilers js:babel-core/register&quot;...}" />
+                <marker date="1448373276000" expanded="true" signature="289:483" placeholder="{&quot;babel&quot;: &quot;^6.1.18&quot;...}" />
+                <marker date="1448373276000" expanded="true" signature="608:772" placeholder="[...]" />
+                <marker date="1448373276000" expanded="true" signature="833:916" placeholder="[...]" />
+                <marker date="1448373276000" expanded="true" signature="839:912" placeholder="{&quot;name&quot;: &quot;aksonov&quot;...}" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -338,8 +349,16 @@
     <entry file="file://$PROJECT_DIR$/package.json">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="2.7916667">
-          <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-          <folding />
+          <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
+          <folding>
+            <marker date="1448373276000" expanded="true" signature="14:115" placeholder="{&quot;name&quot;: &quot;Pavlo Aksonov&quot;...}" />
+            <marker date="1448373276000" expanded="true" signature="135:191" placeholder="{&quot;react-redux&quot;: &quot;^3.1.0&quot;...}" />
+            <marker date="1448373276000" expanded="true" signature="206:266" placeholder="{&quot;test&quot;: &quot;mocha --compilers js:babel-core/register&quot;...}" />
+            <marker date="1448373276000" expanded="true" signature="289:483" placeholder="{&quot;babel&quot;: &quot;^6.1.18&quot;...}" />
+            <marker date="1448373276000" expanded="true" signature="608:772" placeholder="[...]" />
+            <marker date="1448373276000" expanded="true" signature="833:916" placeholder="[...]" />
+            <marker date="1448373276000" expanded="true" signature="839:912" placeholder="{&quot;name&quot;: &quot;aksonov&quot;...}" />
+          </folding>
         </state>
       </provider>
     </entry>
diff --git a/actions.js b/actions.js
index e58adfa..f31f314 100644
--- a/actions.js
+++ b/actions.js
@@ -26,15 +26,24 @@ function filterParam(data){
 
 let CoreActions = {
     push: function(data) {
-        return Object.assign({type: PUSH}, filterParam(data));
+        return {
+            ... filterParam(data),
+            type: PUSH
+        }
     },
 
     pop: function(data = {}) {
-        return Object.assign({type: POP}, filterParam(data));
+        return {
+            ... filterParam(data),
+            type: POP
+        }
     },
 
     dismiss: function(data) {
-        return Object.assign({type: DISMISS}, filterParam(data));
+        return {
+            ... filterParam(data),
+            type: DISMISS
+        }
     },
 
     reset: function(initial) {
@@ -55,23 +64,30 @@ let CoreActions = {
     },
 
     custom: function(data) {
-        return Object.assign({type: CUSTOM}, filterParam(data));
+        return {
+            ... filterParam(data),
+            type: CUSTOM
+        }
     },
 
     replace: function(data) {
-        return Object.assign({type: REPLACE}, filterParam(data));
+        return {
+            ... filterParam(data),
+            type: REPLACE
+        }
     },
 
     select: function(data) {
-        return Object.assign({type: SELECT}, filterParam(data));
+        return {
+            ... filterParam(data),
+            type: SELECT
+        }
     }
-};
-
-let Actions = Object.assign({}, CoreActions);
+}
 
-export {CoreActions};
+let Actions = {... CoreActions}
 
-export default Actions;
+export {CoreActions, Actions};
 
 
 
diff --git a/index.js b/index.js
index ed3918b..b6963e5 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 import React from 'react-native';
 const {View, Navigator, Text, StyleSheet} = React;
-import Actions from './actions';
+import {Actions, CoreActions} from './actions';
 import {INIT, PUSH, REPLACE, POP, DISMISS, RESET} from './actions';
 
 import routerReducer from './reducer';
@@ -44,6 +44,10 @@ class Router extends React.Component {
         super(props);
         this.routes = {};
         this.schemas = {};
+        var {dispatch} = props;
+        if (!dispatch){
+            throw new Error("No redux dispatch is provided to Router!");
+        }
 
         var self = this;
         this.initial = props.initial;
@@ -67,7 +71,7 @@ class Router extends React.Component {
                         }
                         var args = {name: name, data:data};
                         var action = child.props.type || 'push';
-                        return RouterActions[action](args);
+                        dispatch(CoreActions[action](args));
                     };
                 }
                 self.routes[name] = child.props;
@@ -82,12 +86,15 @@ class Router extends React.Component {
                     RouterActions[name] = function(data){
                         var props = self.extend({}, self.props);
                         props = self.extend(props, child.props);
-                        return RouterActions.custom({name, props, data})
+                        dispatch(CoreActions.custom({name, props, data}));
                     };
                 }
             }
         });
-        this.routerActions = bindActionCreators(Actions, props.dispatch);
+        let dispatched = bindActionCreators(CoreActions, dispatch);
+        for (var i in dispatched)
+            RouterActions[i] = dispatched[i];
+        this.routerActions = RouterActions;
         this.initialRoute =  this.routes[this.initial] || console.error("No initial route "+this.initial);
         this.state = {initial: this.initial};
     }
@@ -273,4 +280,4 @@ var styles = StyleSheet.create({
     }
 });
 
-module.exports = {Router: connect(state=>state.routerReducer)(Router), Action, Actions, Route, Animations, Schema, routerReducer}
+module.exports = {Router: connect(state=>state.routerReducer)(Router), Actions, Action, Route, Animations, Schema, routerReducer}
diff --git a/package.json b/package.json
index e9f2663..61ddd48 100644
--- a/package.json
+++ b/package.json
@@ -42,5 +42,5 @@
   ],
   "name": "react-native-redux-router",
   "optionalDependencies": {},
-  "version": "1.0.1"
+  "version": "1.0.2"
 }
diff --git a/reducer.js b/reducer.js
index 5f4846d..d2b964d 100644
--- a/reducer.js
+++ b/reducer.js
@@ -39,9 +39,8 @@ export default function reducer(state = { routes: [], currentRoute: null}, actio
             return {
                 mode: POP,
                 routes: [...state.routes.slice(0, state.routes.length - num)],
-                currentRoute: state.routes[state.routes.length - num - 1]
+                currentRoute: state.routes[state.routes[state.routes.length - num - 1]]
             };
-
         case DISMISS:
             if (state.routes.length <= 1) {
                 throw new Error("Number of routes should be greater than 1");