passing props works except for arrays

android/app/src/main/java/com/reactnativenavigation/core/objects/Screen.java

@@ -1,15 +1,18 @@
 package com.reactnativenavigation.core.objects;
 
+import android.os.Bundle;
 import android.support.annotation.ColorInt;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.ReadableNativeMap;
 
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -35,6 +38,7 @@ public class Screen extends JsonObject implements Serializable {
     private static final String KEY_TAB_NORMAL_TEXT_COLOR = "tabNormalTextColor";
     private static final String KEY_TAB_SELECTED_TEXT_COLOR = "tabSelectedTextColor";
     private static final String KEY_TAB_INDICATOR_COLOR = "tabIndicatorColor";
+    public static final String KEY_PROPS = "passProps";
 
     public final String title;
     public final String label;
@@ -44,6 +48,7 @@ public class Screen extends JsonObject implements Serializable {
     public final String navigatorEventId;
     public final int icon;
     public final ArrayList<Button> buttons;
+    public final HashMap passedProps;
 
     // Navigation styling
     @Nullable @ColorInt public Integer toolBarColor;
@@ -68,15 +73,18 @@ public class Screen extends JsonObject implements Serializable {
         navigatorId = getString(screen, KEY_NAVIGATOR_ID);
         navigatorEventId = getString(screen, KEY_NAVIGATOR_EVENT_ID);
         icon = getInt(screen, KEY_ICON);
+        if(screen.hasKey(KEY_PROPS))
+            passedProps = ((ReadableNativeMap)screen.getMap(KEY_PROPS)).toHashMap();
+        else
+            passedProps = null;
 
         buttons = getButtons(screen);
         setToolbarStyle(screen);
     }
 
     private ArrayList<Button> getButtons(ReadableMap screen) {
-        ArrayList<Button> ret = null;
+        ArrayList<Button> ret = new ArrayList();
         if (screen.hasKey(KEY_RIGHT_BUTTONS)) {
-            ret = new ArrayList<>();
             ReadableArray rightButtons = screen.getArray(KEY_RIGHT_BUTTONS);
             for (int i = 0; i < rightButtons.size(); i++) {
                 ret.add(new Button(rightButtons.getMap(i)));
@@ -85,6 +93,7 @@ public class Screen extends JsonObject implements Serializable {
         return ret;
     }
 
+
     public void setToolbarStyle(ReadableMap screen) {
         ReadableMap style = getMap(screen, KEY_TOOL_BAR_STYLE);
         if (style != null) {

android/app/src/main/java/com/reactnativenavigation/views/RctView.java

@@ -9,6 +9,8 @@ import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.activities.BaseReactActivity;
 import com.reactnativenavigation.core.objects.Screen;
 
+import java.util.HashMap;
+
 /**
  * Created by guyc on 10/03/16.
  */
@@ -47,6 +49,9 @@ public class RctView extends FrameLayout {
         passProps.putString(Screen.KEY_SCREEN_INSTANCE_ID, screen.screenInstanceId);
         passProps.putString(Screen.KEY_NAVIGATOR_ID, screen.navigatorId);
         passProps.putString(Screen.KEY_NAVIGATOR_EVENT_ID, screen.navigatorEventId);
+        if (screen.passedProps != null) {
+            spreadHashMap(screen.passedProps, passProps);
+        }
 
         mReactRootView.startReactApplication(rctInstanceManager, componentName, passProps);
 
@@ -62,5 +67,24 @@ public class RctView extends FrameLayout {
 
         addView(mReactRootView);
     }
+
+    private Bundle spreadHashMap(HashMap<String, Object> map, Bundle bundle) {
+        for (String key : map.keySet()) {
+            Object value = map.get(key);
+            if (value instanceof String) {
+                bundle.putString(key, (String) value);
+            } else if (value instanceof Integer) {
+                bundle.putInt(key, (Integer) value);
+            } else if (value instanceof Double) {
+                bundle.putDouble(key, ((Double) value).doubleValue());
+            } else if (value instanceof Boolean) {
+                bundle.putBoolean(key, (Boolean) value);
+            } else if (value instanceof HashMap) {
+                bundle.putBundle(key, spreadHashMap((HashMap<String, Object>) value, new Bundle()));
+                //TODO nulls and Arrays needed
+            }
+        }
+        return bundle;
+    }
 }
 

example-redux/src/app.js

@@ -39,7 +39,16 @@ export default class App {
           screen: {
             screen: 'example.LoginScreen',
             title: 'Login',
-            navigatorStyle: {}
+            navigatorStyle: {},
+            passProps: {
+              passed: 'This is a prop passed in \'startSingleScreenApp\'!',
+              deep: {
+                deepProp: 123,
+                deeper: {
+                  deeperProp: 'Deep!'
+                }
+              }
+            }
           }
         });
         return;
@@ -52,7 +61,10 @@ export default class App {
               icon: require('../img/one.png'),
               selectedIcon: require('../img/one_selected.png'),
               title: 'Screen One',
-              navigatorStyle: {}
+              navigatorStyle: {},
+              passProps: {
+                passed: 'This is a prop passed in \'startTabBasedApp\'!'
+  }
             },
             {
               label: 'Two',
@@ -60,7 +72,10 @@ export default class App {
               icon: require('../img/two.png'),
               selectedIcon: require('../img/two_selected.png'),
               title: 'Screen Two',
-              navigatorStyle: {}
+              navigatorStyle: {},
+              passProps: {
+                passed: 'This is a prop passed in \'startTabBasedApp\'!'
+              }
             }
           ],
           animationType: 'slide-down',

example-redux/src/screens/FirstTabScreen.js

@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component, PropTypes} from 'react';
 import {
   Text,
   View,
@@ -36,11 +36,17 @@ class FirstTabScreen extends Component {
       }
     ]
   };
+
+  static propTypes = {
+    passed: PropTypes.string.isRequired
+  };
+
   constructor(props) {
     super(props);
     // if you want to listen on navigator events, set this up
     this.props.navigator.setOnNavigatorEvent(this.onNavigatorEvent.bind(this));
   }
+
   onNavigatorEvent(event) {
     switch (event.id) {
       case 'edit':
@@ -75,6 +81,8 @@ class FirstTabScreen extends Component {
         <TouchableOpacity onPress={ this.onShowModalPress.bind(this) }>
           <Text style={styles.button}>Modal Screen</Text>
         </TouchableOpacity>
+
+        <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
       </View>
     );
   }
@@ -86,14 +94,20 @@ class FirstTabScreen extends Component {
   onPushPress() {
     this.props.navigator.push({
       title: "More",
-      screen: "example.PushedScreen"
+      screen: "example.PushedScreen",
+      passProps: {
+        passed: 'This is a prop passed in \'navigator.push()\'!'
+      }
     });
   }
 
   onShowModalPress() {
     this.props.navigator.showModal({
       title: "Modal Screen",
-      screen: "example.PushedScreen"
+      screen: "example.PushedScreen",
+      passProps: {
+        passed: 'This is a prop passed in \'navigator.showModal()\'!'
+      }
     });
   }
 }

example-redux/src/screens/LoginScreen.js

@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component, PropTypes} from 'react';
 import {
   Text,
   View,
@@ -12,9 +12,15 @@ import * as appActions from '../reducers/app/actions';
 
 // this is a traditional React component connected to the redux store
 class LoginScreen extends Component {
+
+  static propTypes = {
+    passed: PropTypes.string.isRequired
+  };
+
   constructor(props) {
     super(props);
   }
+
   render() {
     return (
       <View style={{flex: 1, padding: 20}}>
@@ -31,6 +37,9 @@ class LoginScreen extends Component {
           <Text style={styles.button}>Login</Text>
         </TouchableOpacity>
 
+
+        <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
+
       </View>
     );
   }

example-redux/src/screens/PushedScreen.js

@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component, PropTypes} from 'react';
 import {
   Text,
   View,
@@ -23,6 +23,10 @@ class PushedScreen extends Component {
     tabIndicatorColor: '#FF4081'
   };
 
+  static propTypes = {
+    passed: PropTypes.string.isRequired
+  };
+
   constructor(props) {
     super(props);
     this.bgColor = this.getRandomColor();
@@ -72,6 +76,8 @@ class PushedScreen extends Component {
 
         <TextInput style={{height: 40, borderColor: 'gray', borderWidth: 1}}/>
 
+        <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
+
       </View>
     );
   }

example-redux/src/screens/SecondTabScreen.js

@@ -1,4 +1,4 @@
-import React, {Component} from 'react';
+import React, {Component, PropTypes} from 'react';
 import {
   Text,
   Image,
@@ -18,6 +18,11 @@ class SecondTabScreen extends Component {
     drawUnderTabBar: true,
     navBarTranslucent: true
   };
+
+  static propTypes = {
+    passed: PropTypes.string.isRequired
+  };
+
   constructor(props) {
     super(props);
     this.buttonsCounter = 0;
@@ -38,6 +43,8 @@ class SecondTabScreen extends Component {
             <Text style={styles.button}>Increment Counter</Text>
           </TouchableOpacity>
 
+          <Text style={{fontWeight: '500'}}>{this.props.passed}</Text>
+
         </View>
 
       </ScrollView>