topTab passProps works

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

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

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

@@ -11,6 +11,7 @@ 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 NAVIGATION_PARAMS = "navigationParams";
 
     @SuppressWarnings("ConstantConditions")
     public static List<TopTabParams> parse(Bundle params) {
@@ -26,6 +27,7 @@ public class TopTabParamsParser extends Parser {
         TopTabParams result = new TopTabParams();
         result.screenId = params.getString(KEY_SCREEN_ID);
         result.title = params.getString(KEY_TITLE);
+        result.navigationParams = params.getBundle(NAVIGATION_PARAMS);
         return result;
     }
 }

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

@@ -39,8 +39,9 @@ public class FragmentScreen extends Screen {
 
     private void addContent() {
         ContentView contentView = new ContentView(getContext(),
-                screenParams,
-                screenParams.screenId);
+                screenParams.screenId,
+                screenParams.navigatorEventId,
+                screenParams.navigationParams);
         addView(contentView, 0, 0);
         LayoutParams params = new LayoutParams(MATCH_PARENT, MATCH_PARENT);
         if (screenParams.styleParams.drawScreenBelowTopBar) {

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);
+        contentView = new ContentView(getContext(), screenParams.screenId, screenParams.navigatorEventId, screenParams.navigationParams);
         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);
+            ContentView contentView = new ContentView(getContext(), tab.screenId, screenParams.navigatorEventId, tab.navigationParams);
             addContent(contentView);
             contentViews.add(contentView);
         }

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

@@ -5,7 +5,6 @@ import android.os.Bundle;
 
 import com.facebook.react.ReactRootView;
 import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.params.ScreenParams;
 import com.reactnativenavigation.react.ReactViewHacks;
 
 public class ContentView extends ReactRootView {
@@ -14,11 +13,11 @@ public class ContentView extends ReactRootView {
     private final String navigatorEventId;
     private final Bundle navigationParams;
 
-    public ContentView(Context context, ScreenParams screenParams, String screenId) {
+    public ContentView(Context context, String screenId, String navigatorEventId, Bundle navigationParams) {
         super(context);
         this.screenId = screenId;
-        navigatorEventId = screenParams.navigatorEventId;
-        navigationParams = screenParams.navigationParams;
+        this.navigatorEventId = navigatorEventId;
+        this.navigationParams = navigationParams;
         attachToJS();
     }
 

example-redux/src/app.js

@@ -35,75 +35,76 @@ 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,
-            fn: function() {
-              return 'Hello from a function!';
-            }
-          }
-        });
         //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',
+                  fn: () => 'Hello from a function passed as passProps!'
+                }
+              }
+            ],
+            navigatorStyle: {}
+          }
+        });
         return;
       case 'after-login':
         Navigation.startTabBasedApp({

example-redux/src/screens/FirstTabScreen.js

@@ -69,7 +69,7 @@ class FirstTabScreen extends Component {
     console.log('selectedTabChanged ' + position);
     let rightButtons;
 
-    switch(position) {
+    switch (position) {
       case 0:
         rightButtons = [
           {
@@ -133,7 +133,7 @@ class FirstTabScreen extends Component {
         </TouchableOpacity>
 
         <Text style={{fontWeight: '500'}}>String prop: {this.props.str}</Text>
-        <Text style={{fontWeight: '500'}}>Number prop: {this.props.num}</Text>
+        <Text style={{fontWeight: '500'}}>Function prop: {this.props.fn ? this.props.fn() : ''}</Text>
         {this.props.obj ? <Text style={{fontWeight: '500'}}>Object prop: {this.props.obj.str}</Text> : false}
         {this.props.obj && this.props.obj.arr ? <Text style={{fontWeight: '500'}}>Array prop: {this.props.obj.arr[0].str}</Text> : false}
       </View>

src/deprecated/platformSpecificDeprecated.android.js

@@ -18,6 +18,14 @@ function startSingleScreenApp(params) {
   addNavigatorButtons(screen);
   addNavigationStyleParams(screen);
   screen.passProps = params.passProps;
+
+  if (screen.topTabs) {
+    _.forEach(screen.topTabs, (tab) => {
+      addNavigatorParams(tab);
+      adaptNavigationParams(tab);
+    });
+  }
+
   //const drawer = setupDrawer(params.drawer);
 
   /*
@@ -127,7 +135,7 @@ function adaptNavigationParams(screen) {
     navigatorID: screen.navigatorID,
     navigatorEventID: screen.navigatorEventID
   };
-  return _.omit(screen, ['screenInstanceID', 'navigatorID', 'navigatorEventID']);
+  return screen;
 }
 
 function startTabBasedApp(params) {

src/platformSpecific.android.js

@@ -60,7 +60,6 @@ function dismissAllModals() {
 function savePassProps(params) {
   //TODO this needs to be handled in a common place,
   //TODO also, all global passProps should be handled differently
-  //TODO also, topTabs passProps not working
   if (params.navigationParams && params.passProps) {
     PropRegistry.save(params.navigationParams.screenInstanceID, params.passProps);
   }