passProps stays in JS using PropRegistry, not exporting Screen anymore, FragmentScreen broken

android/app/src/main/java/com/reactnativenavigation/params/ScreenParams.java

@@ -7,7 +7,6 @@ import java.util.List;
 
 public class ScreenParams {
     public String screenId;
-    public Bundle passProps;
     public List<TitleBarButtonParams> rightButtons;
     public TitleBarLeftButtonParams leftButton;
     public String title;
@@ -16,8 +15,6 @@ public class ScreenParams {
     public String fragmentCreatorClassName;
     public boolean animateScreenTransitions;
 
-    //    public String tabLabel; TODO when tabs are supported move to TabParams
-    //    public Drawable tabIcon;
     public String tabLabel;
     public Drawable tabIcon;
 

android/app/src/main/java/com/reactnativenavigation/params/TopTabParams.java

@@ -1,9 +1,6 @@
 package com.reactnativenavigation.params;
 
-import android.os.Bundle;
-
 public class TopTabParams {
     public String screenId;
     public String title;
-    public Bundle passProps;
 }

android/app/src/main/java/com/reactnativenavigation/params/parsers/ScreenParamsParser.java

@@ -13,7 +13,6 @@ public class ScreenParamsParser extends Parser {
     private static final String KEY_SCREEN_ID = "screenId";
     private static final String KEY_SCREEN_INSTANCE_ID = "screenInstanceID";
     private static final String KEY_NAVIGATOR_EVENT_ID = "navigatorEventID";
-    private static final String KEY_PROPS = "passProps";
     private static final String KEY_NAVIGATION_PARAMS = "navigationParams";
     private static final String KEY_RIGHT_BUTTONS = "rightButtons";
     private static final String KEY_LEFT_BUTTON = "leftButton";
@@ -26,7 +25,6 @@ public class ScreenParamsParser extends Parser {
         ScreenParams result = new ScreenParams();
         result.screenId = params.getString(KEY_SCREEN_ID);
         result.screenInstanceId = params.getString(KEY_SCREEN_INSTANCE_ID);
-        result.passProps = params.getBundle(KEY_PROPS);
         assertKeyExists(params, KEY_NAVIGATION_PARAMS);
         result.navigationParams = params.getBundle(KEY_NAVIGATION_PARAMS);
         result.navigatorEventId = result.navigationParams.getString(KEY_NAVIGATOR_EVENT_ID);

android/app/src/main/java/com/reactnativenavigation/params/parsers/TopTabParamsParser.java

@@ -11,7 +11,6 @@ import java.util.List;
 public class TopTabParamsParser extends Parser {
     private static final String KEY_SCREEN_ID = "screenId";
     private static final String KEY_TITLE = "title";
-    private static final String KEY_PROPS = "passProps";
 
     @SuppressWarnings("ConstantConditions")
     public static List<TopTabParams> parse(Bundle params) {
@@ -27,7 +26,6 @@ public class TopTabParamsParser extends Parser {
         TopTabParams result = new TopTabParams();
         result.screenId = params.getString(KEY_SCREEN_ID);
         result.title = params.getString(KEY_TITLE);
-        result.passProps = params.getBundle(KEY_PROPS);
         return result;
     }
 }

android/app/src/main/java/com/reactnativenavigation/screens/FragmentScreen.java

@@ -42,8 +42,7 @@ public class FragmentScreen extends Screen {
     private void addContent() {
         ContentView contentView = new ContentView(getContext(),
                 screenParams,
-                screenParams.screenId,
-                screenParams.passProps);
+                screenParams.screenId);
         addView(contentView, 0, 0);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         if (screenParams.styleParams.drawScreenBelowTopBar) {
@@ -92,7 +91,7 @@ public class FragmentScreen extends Screen {
             String className = screenParams.fragmentCreatorClassName;
             Class<?> fragmentCreatorClass = Class.forName(className);
             Method method = fragmentCreatorClass.getMethod(CONTRACT_GET_FRAGMENT, Bundle.class);
-            return (android.app.Fragment) method.invoke(null, screenParams.passProps);
+            return (android.app.Fragment) method.invoke(null, "TODO");
         } catch (NoSuchMethodException noSuchMethod) {
             return null;
         }
@@ -104,7 +103,7 @@ public class FragmentScreen extends Screen {
             String className = screenParams.fragmentCreatorClassName;
             Class<?> fragmentCreatorClass = Class.forName(className);
             Method method = fragmentCreatorClass.getMethod(CONTRACT_GET_SUPPORT_FRAGMENT, Bundle.class);
-            return (android.support.v4.app.Fragment) method.invoke(null, screenParams.passProps);
+            return (android.support.v4.app.Fragment) method.invoke(null, "TODO");
         } catch (NoSuchMethodException noSuchMethod) {
             return null;
         }

android/app/src/main/java/com/reactnativenavigation/screens/SingleScreen.java

@@ -19,7 +19,7 @@ public class SingleScreen extends Screen {
 
     @Override
     protected void createContent() {
-        contentView = new ContentView(getContext(), screenParams, screenParams.screenId, screenParams.passProps);
+        contentView = new ContentView(getContext(), screenParams, screenParams.screenId);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         if (screenParams.styleParams.drawScreenBelowTopBar) {
             params.addRule(BELOW, topBar.getId());

android/app/src/main/java/com/reactnativenavigation/screens/ViewPagerScreen.java

@@ -45,7 +45,7 @@ public class ViewPagerScreen extends Screen {
     private void addPages() {
         contentViews = new ArrayList<>();
         for (TopTabParams tab : screenParams.topTabParams) {
-            ContentView contentView = new ContentView(getContext(), screenParams, tab.screenId, tab.passProps);
+            ContentView contentView = new ContentView(getContext(), screenParams, tab.screenId);
             addContent(contentView);
             contentViews.add(contentView);
         }

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

@@ -12,13 +12,13 @@ public class ContentView extends ReactRootView {
 
     private final String screenId;
     private final String navigatorEventId;
-    private final Bundle passProps;
+    private final Bundle navigationParams;
 
-    public ContentView(Context context, ScreenParams screenParams, String screenId, Bundle passProps) {
+    public ContentView(Context context, ScreenParams screenParams, String screenId) {
         super(context);
         this.screenId = screenId;
         navigatorEventId = screenParams.navigatorEventId;
-        this.passProps = mergePropsAndNavigationParams(screenParams, passProps);
+        navigationParams = screenParams.navigationParams;
         attachToJS();
     }
 
@@ -39,14 +39,6 @@ public class ContentView extends ReactRootView {
     }
 
     private void attachToJS() {
-        startReactApplication(NavigationApplication.instance.getReactGateway().getReactInstanceManager(), screenId, passProps);
-    }
-
-    private Bundle mergePropsAndNavigationParams(ScreenParams screenParams, Bundle passProps) {
-        Bundle navigationParams = (Bundle) screenParams.navigationParams.clone();
-        if (passProps != null) {
-            navigationParams.putAll(passProps);
-        }
-        return navigationParams;
+        startReactApplication(NavigationApplication.instance.getReactGateway().getReactInstanceManager(), screenId, navigationParams);
     }
 }

example-redux/src/app.js

@@ -35,72 +35,75 @@ export default class App {
   startApp(root) {
     switch (root) {
       case 'login':
-        //Navigation.startSingleScreenApp({
-        //  screen: {
-        //    screen: 'example.LoginScreen',
-        //    title: 'Login',
-        //    navigatorStyle: {}
-        //  },
-        //  passProps: {
-        //    str: 'This is a prop passed in \'startSingleScreenApp()\'!',
-        //    obj: {
-        //      str: 'This is a prop passed in an object!',
-        //      arr: [
-        //        {
-        //          str: 'This is a prop in an object in an array in an object!'
-        //        }
-        //      ],
-        //      arr2: [
-        //        [
-        //          'array of strings',
-        //          'with two strings'
-        //        ],
-        //        [
-        //          1, 2, 3
-        //        ]
-        //      ]
-        //    },
-        //    num: 1234
-        //  }
-        //});
         Navigation.startSingleScreenApp({
           screen: {
-            screen: 'example.FirstTabScreen',
+            screen: 'example.LoginScreen',
             title: 'Login',
-            topTabs: [
-              {
-                screenId: 'example.ListScreen',
-                title: 'Tab1',
-                 passProps: {
-                   str: 'This is a prop passed to Tab1'
-                 }
-              },
-              {
-                screenId: 'example.PushedScreen',
-                title: 'Tab2',
-                passProps: {
-                  str: 'This is a prop passed to Tab2'
-                }
-
-              },
-              {
-                screenId: 'example.PushedScreen',
-                title: 'Tab3',
-                passProps: {
-                  str: 'This is a prop passed to Tab3'
-                }
-              },
-              {
-                screenId: 'example.FirstTabScreen',
-                title: 'Tab4',
-                passProps: {
-                  str: 'This is a prop passed to Tab4'
-                }
-              }
-            ],
             navigatorStyle: {}
+          },
+          passProps: {
+            str: 'This is a prop passed in \'startSingleScreenApp()\'!',
+            obj: {
+              str: 'This is a prop passed in an object!',
+              arr: [
+                {
+                  str: 'This is a prop in an object in an array in an object!'
+                }
+              ],
+              arr2: [
+                [
+                  'array of strings',
+                  'with two strings'
+                ],
+                [
+                  1, 2, 3
+                ]
+              ]
+            },
+            num: 1234,
+            fn: function() {
+              return 'Hello from a function!';
+            }
           }
         });
+        //Navigation.startSingleScreenApp({
+        //  screen: {
+        //    screen: 'example.FirstTabScreen',
+        //    title: 'Login',
+        //    topTabs: [
+        //      {
+        //        screenId: 'example.ListScreen',
+        //        title: 'Tab1',
+        //         passProps: {
+        //           str: 'This is a prop passed to Tab1'
+        //         }
+        //      },
+        //      {
+        //        screenId: 'example.PushedScreen',
+        //        title: 'Tab2',
+        //        passProps: {
+        //          str: 'This is a prop passed to Tab2'
+        //        }
+        //
+        //      },
+        //      {
+        //        screenId: 'example.PushedScreen',
+        //        title: 'Tab3',
+        //        passProps: {
+        //          str: 'This is a prop passed to Tab3'
+        //        }
+        //      },
+        //      {
+        //        screenId: 'example.FirstTabScreen',
+        //        title: 'Tab4',
+        //        passProps: {
+        //          str: 'This is a prop passed to Tab4'
+        //        }
+        //      }
+        //    ],
+        //    navigatorStyle: {}
+        //  }
+        //});
         return;
       case 'after-login':
         Navigation.startTabBasedApp({

example-redux/src/screens/LoginScreen.js

@@ -47,6 +47,7 @@ class LoginScreen extends Component {
           <Text style={styles.button}>Show another login as modal</Text>
         </TouchableOpacity>
 
+        <Text style={{fontWeight: '500'}}>Function prop: {this.props.fn()}</Text>
         <Text style={{fontWeight: '500'}}>String prop: {this.props.str}</Text>
         <Text style={{fontWeight: '500'}}>Number prop: {this.props.num}</Text>
         <Text style={{fontWeight: '500'}}>Object prop: {this.props.obj.str}</Text>

src/Navigation.js

@@ -3,6 +3,8 @@ import {AppRegistry} from 'react-native';
 import platformSpecific from './deprecated/platformSpecificDeprecated';
 import Screen from './Screen';
 
+import PropRegistry from './PropRegistry';
+
 const registeredScreens = {};
 
 function registerScreen(screenID, generator) {
@@ -25,9 +27,14 @@ function _registerComponentNoRedux(screenID, generator) {
       static navigatorStyle = InternalComponent.navigatorStyle || {};
       static navigatorButtons = InternalComponent.navigatorButtons || {};
 
+      constructor(props) {
+        super(props);
+        this.allProps = {...props, ...PropRegistry.load(this.navigator.screenInstanceID)};
+      }
+
       render() {
         return (
-          <InternalComponent navigator={this.navigator} {...this.props} />
+          <InternalComponent navigator={this.navigator} {...this.allProps} />
         );
       }
     };
@@ -43,10 +50,15 @@ function _registerComponentRedux(screenID, generator, store, Provider) {
       static navigatorStyle = InternalComponent.navigatorStyle || {};
       static navigatorButtons = InternalComponent.navigatorButtons || {};
 
+      constructor(props) {
+        super(props);
+        this.allProps = {...props, ...PropRegistry.load(this.navigator.screenInstanceID)};
+      }
+
       render() {
         return (
           <Provider store={store}>
-            <InternalComponent navigator={this.navigator} {...this.props} />
+            <InternalComponent navigator={this.navigator} {...this.allProps} />
           </Provider>
         );
       }
@@ -102,7 +114,6 @@ function startSingleScreenApp(params) {
 }
 
 export default {
-  registerScreen,
   getRegisteredScreen,
   registerComponent,
   showModal: showModal,

src/PropRegistry.js

@@ -0,0 +1,15 @@
+class PropRegistry {
+  constructor() {
+    this.registry = {};
+  }
+
+  save(screenInstanceId, passProps) {
+    this.registry[screenInstanceId] = passProps;
+  }
+
+  load(screenInstanceId = '') {
+    return this.registry[screenInstanceId] || {};
+  }
+}
+
+module.exports = new PropRegistry();

src/deprecated/platformSpecificDeprecated.android.js

@@ -4,6 +4,8 @@ import _ from 'lodash';
 
 import Navigation from './../Navigation';
 
+import PropRegistry from '../PropRegistry';
+
 const resolveAssetSource = require('react-native/Libraries/Image/resolveAssetSource');
 
 import * as newPlatformSpecific from './../platformSpecific';
@@ -18,6 +20,7 @@ function startSingleScreenApp(params) {
   addNavigatorButtons(screen);
   addNavigationStyleParams(screen);
   screen.passProps = params.passProps;
+  PropRegistry.save(screen.screenInstanceID, screen.passProps);
   //const drawer = setupDrawer(params.drawer);
 
   /*
@@ -137,7 +140,6 @@ function startTabBasedApp(params) {
   }
 
   params.tabs.forEach(function(tab, idx) {
-    debugger;
     addNavigatorParams(tab, null, idx);
     addNavigatorButtons(tab);
     addNavigationStyleParams(tab);

src/index.js

@@ -1,9 +1,7 @@
 import Navigation from './Navigation';
-import Screen from './Screen';
 import {NavigationToolBarIOS} from 'react-native-controllers';
 
 module.exports = {
   Navigation,
-  NavigationToolBarIOS,
-  Screen
+  NavigationToolBarIOS
 };