From 25545cd3251836597cb50d7c16bc1a2792ff5fdc Mon Sep 17 00:00:00 2001
From: Pavlo Aksonov <aksonov@Pavlos-MacBook-Pro.local>
Date: Tue, 29 Sep 2015 16:56:32 +0200
Subject: [PATCH] fix to work with latest RN

---
 Example/.idea/workspace.xml | 111 ++++++++++++------------------------
 actions.js                  |  34 ++++++++++-
 index.js                    |   9 +--
 package.json                |   8 +--
 4 files changed, 76 insertions(+), 86 deletions(-)

diff --git a/Example/.idea/workspace.xml b/Example/.idea/workspace.xml
index 1be3499ae..993eaae5e 100644
--- a/Example/.idea/workspace.xml
+++ b/Example/.idea/workspace.xml
@@ -2,11 +2,6 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="97450839-8f3e-45e1-8596-afe33fd2bfc3" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iOS/AppDelegate.m" afterPath="$PROJECT_DIR$/iOS/AppDelegate.m" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/ExampleTests/ExampleTests.m" afterPath="$PROJECT_DIR$/ExampleTests/ExampleTests.m" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/iOS/Info.plist" afterPath="$PROJECT_DIR$/iOS/Info.plist" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/components/TabBarFlux.js" afterPath="$PROJECT_DIR$/components/TabBarFlux.js" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/package.json" afterPath="$PROJECT_DIR$/package.json" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
     </list>
     <ignored path="Example.iws" />
@@ -38,20 +33,10 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="TabBarFlux.js" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/components/TabBarFlux.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.0">
-              <caret line="11" column="32" selection-start-line="11" selection-start-column="32" selection-end-line="11" selection-end-column="32" />
-              <folding />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="README.md" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/node_modules/react-native-router-flux/README.md">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="35.666668">
+            <state vertical-scroll-proportion="0.0">
               <caret line="4" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
               <folding />
             </state>
@@ -71,7 +56,7 @@
       <file leaf-file-name="package.json" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/node_modules/react-native-tabs/package.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-1.25">
+            <state vertical-scroll-proportion="0.0">
               <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
               <folding />
             </state>
@@ -83,7 +68,9 @@
           <provider selected="true" editor-type-id="text-editor">
             <state vertical-scroll-proportion="0.0">
               <caret line="29" column="26" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />
-              <folding />
+              <folding>
+                <marker date="1443535550000" expanded="true" signature="1436:1647" placeholder="&lt;xml/&gt;" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -108,10 +95,20 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Container.js" pinned="false" current-in-tab="true">
+      <file leaf-file-name="NavBar.js" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/components/NavBar.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state vertical-scroll-proportion="0.5546624">
+              <caret line="23" column="55" selection-start-line="0" selection-start-column="0" selection-end-line="49" selection-end-column="39" />
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="Container.js" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/node_modules/react-native-router-flux/Container.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="0.78365386">
+            <state vertical-scroll-proportion="0.0">
               <caret line="101" column="0" selection-start-line="101" selection-start-column="0" selection-end-line="101" selection-end-column="0" />
               <folding />
             </state>
@@ -121,7 +118,7 @@
       <file leaf-file-name="package.json" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/node_modules/react-native-router-flux/package.json">
           <provider selected="true" editor-type-id="text-editor">
-            <state vertical-scroll-proportion="-0.625">
+            <state vertical-scroll-proportion="0.0">
               <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
               <folding />
             </state>
@@ -200,8 +197,6 @@
       <sortByType />
     </navigator>
     <panes>
-      <pane id="Scratches" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -220,42 +215,6 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Example" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Example" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="node_modules" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="react-native-tabs" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Example" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="Example" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="node_modules" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="react-native-router-flux" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="Example" />
@@ -286,6 +245,8 @@
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scratches" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -366,7 +327,7 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="55" y="23" width="1865" height="1057" extended-state="6" />
-    <editor active="true" />
+    <editor active="false" />
     <layout>
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.21149674" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -374,7 +335,7 @@
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32574975" sideWeight="0.55430186" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32642487" sideWeight="0.55430186" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -634,14 +595,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/components/NavBar.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.0">
-          <caret line="23" column="55" selection-start-line="23" selection-start-column="55" selection-end-line="23" selection-end-column="55" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/node_modules/react-native/Libraries/Utilities/buildStyleInterpolator.js">
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
@@ -743,7 +696,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/node_modules/react-native-router-flux/README.md">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="35.666668">
+        <state vertical-scroll-proportion="0.0">
           <caret line="4" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
           <folding />
         </state>
@@ -751,7 +704,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/node_modules/react-native-router-flux/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-0.625">
+        <state vertical-scroll-proportion="0.0">
           <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
           <folding />
         </state>
@@ -759,7 +712,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/node_modules/react-native-tabs/package.json">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="-1.25">
+        <state vertical-scroll-proportion="0.0">
           <caret line="2" column="19" selection-start-line="2" selection-start-column="19" selection-end-line="2" selection-end-column="19" />
           <folding />
         </state>
@@ -769,7 +722,9 @@
       <provider selected="true" editor-type-id="text-editor">
         <state vertical-scroll-proportion="0.0">
           <caret line="29" column="26" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />
-          <folding />
+          <folding>
+            <marker date="1443535550000" expanded="true" signature="1436:1647" placeholder="&lt;xml/&gt;" />
+          </folding>
         </state>
       </provider>
     </entry>
@@ -783,11 +738,19 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/node_modules/react-native-router-flux/Container.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state vertical-scroll-proportion="0.78365386">
+        <state vertical-scroll-proportion="0.0">
           <caret line="101" column="0" selection-start-line="101" selection-start-column="0" selection-end-line="101" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/components/NavBar.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state vertical-scroll-proportion="0.5546624">
+          <caret line="23" column="55" selection-start-line="0" selection-start-column="0" selection-end-line="49" selection-end-column="39" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
 </project>
\ No newline at end of file
diff --git a/actions.js b/actions.js
index 3d2fda60b..5b572f824 100644
--- a/actions.js
+++ b/actions.js
@@ -1,9 +1,39 @@
 'use strict';
 var alt = require('./alt');
 
+function filterParam(data){
+    if (!data){
+        return;
+    }
+    var proto = (data||{}).constructor.name;
+    // avoid passing React Native parameters 
+    if (proto != 'Object'){
+        data = {};
+    }
+    if (data.data){
+        data.data = filterParam(data.data);
+    }
+    return data;
+}
+
 class Actions {
-    constructor(){
-        this.generateActions('push', 'pop','dismiss','reset','init','custom');
+    push(data){
+        this.dispatch(filterParam(data));
+    }
+    pop(data){
+        this.dispatch(filterParam(data));
+    }
+    dismiss(data){
+        this.dispatch(filterParam(data));
+    }
+    reset(data){
+        this.dispatch(filterParam(data));
+    }
+    init(data){
+        this.dispatch(filterParam(data));
+    }
+    custom(data){
+        this.dispatch(filterParam(data));
     }
 }
 
diff --git a/index.js b/index.js
index 37c485f26..954539771 100644
--- a/index.js
+++ b/index.js
@@ -78,7 +78,9 @@ class Router extends React.Component {
                 //console.log("Added action: " + name);
                 if (!(RouterActions[name])) {
                     RouterActions[name] = alt.createAction(name, function(data){
-                        RouterActions.custom({name, props: child.props, data:data})});
+                        var props = self.extend({}, self.props);
+                        props = self.extend(props, child.props);
+                        RouterActions.custom({name, props, data})});
                 }
             }
         });
@@ -190,11 +192,6 @@ class Router extends React.Component {
     }
 
     getRoute(route, data) {
-        var proto = (data||{}).constructor.name;
-        // avoid passing React Native parameters 
-        if (proto != 'Object'){
-            data = {};
-        }
         var schema = this.schemas[route.schema || 'default'] || {};
         var sceneConfig = route.sceneConfig || schema.sceneConfig || Animations.None;
         var NavBar = route.navBar || schema.navBar;
diff --git a/package.json b/package.json
index 48ee02958..07fde45d9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-router-flux",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "React Native Router using Flux architecture",
   "main": "index.js",
   "scripts": {
@@ -24,9 +24,9 @@
     "alt": "^0.17.1"
   },
   "gitHead": "ac054cfda0894ba1db6c4901ebdddc83b3b2d083",
-  "_id": "react-native-router-flux@0.1.8",
-  "_shasum": "0e4671550c307ce7ea940eb4ff624e217bcc5225",
-  "_from": "react-native-router-flux@0.1.8",
+  "_id": "react-native-router-flux@0.2.1",
+  "_shasum": "6b9eff8bfc2ec266b09822b24da78b61c705274e",
+  "_from": "react-native-router-flux@>=0.2.0 <0.3.0",
   "_npmVersion": "2.13.2",
   "_nodeVersion": "2.5.0",
   "_npmUser": {