fixed passProps for iOS when starting app (tabs or single screen)

src/deprecated/platformSpecificDeprecated.ios.js

@@ -9,11 +9,35 @@ const {
 } = React;
 import _ from 'lodash';
 
+import PropRegistry from '../PropRegistry';
+
 function startTabBasedApp(params) {
   if (!params.tabs) {
     console.error('startTabBasedApp(params): params.tabs is required');
     return;
   }
+
+  params.tabs.map(function(tab, index) {
+    const navigatorID = controllerID + '_nav' + index;
+    const screenInstanceID = _.uniqueId('screenInstanceID');
+    if (!tab.screen) {
+      console.error('startTabBasedApp(params): every tab must include a screen property, take a look at tab#' + (index + 1));
+      return;
+    }
+    const {
+      navigatorStyle,
+      navigatorButtons,
+      navigatorEventID
+    } = _mergeScreenSpecificSettings(tab.screen, screenInstanceID, tab);
+    tab.navigationParams = {
+      screenInstanceID,
+      navigatorStyle,
+      navigatorButtons,
+      navigatorEventID,
+      navigatorID
+    };
+  });
+
   const controllerID = _.uniqueId('controllerID');
   const Controller = Controllers.createClass({
     render: function() {
@@ -43,32 +67,21 @@ function startTabBasedApp(params) {
           style={params.tabsStyle}>
           {
             params.tabs.map(function(tab, index) {
-              const navigatorID = controllerID + '_nav' + index;
-              const screenInstanceID = _.uniqueId('screenInstanceID');
-              if (!tab.screen) {
-                console.error('startTabBasedApp(params): every tab must include a screen property, take a look at tab#' + (index + 1));
-                return;
-              }
-              const {
-                navigatorStyle,
-                navigatorButtons,
-                navigatorEventID
-              } = _mergeScreenSpecificSettings(tab.screen, screenInstanceID, tab);
               return (
                 <TabBarControllerIOS.Item {...tab} title={tab.label}>
                   <NavigationControllerIOS
-                    id={navigatorID}
+                    id={tab.navigationParams.navigatorID}
                     title={tab.title}
                     titleImage={tab.titleImage}
                     component={tab.screen}
                     passProps={{
-                    navigatorID: navigatorID,
-                    screenInstanceID: screenInstanceID,
-                    navigatorEventID: navigatorEventID
+                    navigatorID: tab.navigationParams.navigatorID,
+                    screenInstanceID: tab.navigationParams.screenInstanceID,
+                    navigatorEventID: tab.navigationParams.navigatorEventID
                   }}
-                    style={navigatorStyle}
-                    leftButtons={navigatorButtons.leftButtons}
-                    rightButtons={navigatorButtons.rightButtons}
+                    style={tab.navigationParams.navigatorStyle}
+                    leftButtons={tab.navigationParams.navigatorButtons.leftButtons}
+                    rightButtons={tab.navigationParams.navigatorButtons.rightButtons}
                   />
                 </TabBarControllerIOS.Item>
               );
@@ -89,7 +102,29 @@ function startSingleScreenApp(params) {
     console.error('startSingleScreenApp(params): params.screen is required');
     return;
   }
+
   const controllerID = _.uniqueId('controllerID');
+  const screen = params.screen;
+  if (!screen.screen) {
+    console.error('startSingleScreenApp(params): screen must include a screen property');
+    return;
+  }
+
+  const navigatorID = controllerID + '_nav';
+  const screenInstanceID = _.uniqueId('screenInstanceID');
+  const {
+    navigatorStyle,
+    navigatorButtons,
+    navigatorEventID
+  } = _mergeScreenSpecificSettings(screen.screen, screenInstanceID, screen);
+  params.navigationParams = {
+    screenInstanceID,
+    navigatorStyle,
+    navigatorButtons,
+    navigatorEventID,
+    navigatorID
+  };
+
   const Controller = Controllers.createClass({
     render: function() {
       if (!params.drawer || (!params.drawer.left && !params.drawer.right)) {
@@ -112,18 +147,6 @@ function startSingleScreenApp(params) {
       }
     },
     renderBody: function() {
-      const screen = params.screen;
-      const navigatorID = controllerID + '_nav';
-      const screenInstanceID = _.uniqueId('screenInstanceID');
-      if (!screen.screen) {
-        console.error('startSingleScreenApp(params): screen must include a screen property');
-        return;
-      }
-      const {
-        navigatorStyle,
-        navigatorButtons,
-        navigatorEventID
-      } = _mergeScreenSpecificSettings(screen.screen, screenInstanceID, screen);
       return (
         <NavigationControllerIOS
           id={navigatorID}
@@ -475,7 +498,9 @@ function savePassProps(params) {
 
   if (params.tabs) {
     _.forEach(params.tabs, (tab) => {
-      tab.passProps = params.passProps;
+      if(!tab.passProps) {
+        tab.passProps = params.passProps;
+      }
       savePassProps(tab);
     });
   }