From 87fdea3a342d1aba9348e23101f1953a658c98fd Mon Sep 17 00:00:00 2001
From: Joe Noon <joenoon@gmail.com>
Date: Fri, 20 May 2016 17:59:54 -0700
Subject: [PATCH] cherry-pick 0e997c6eabae79c99823459b39b885547f824955:   fixes
 a bug where NavigationPropTypes.SceneRenderer was a plain object

---
 .../NavigationExperimental/NavigationCard.js               | 2 +-
 .../NavigationExperimental/NavigationHeader.js             | 2 +-
 Libraries/NavigationExperimental/NavigationPropTypes.js    | 7 +++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js b/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js
index 5dbff5d770f361..ad78173777ce53 100644
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js
+++ b/Libraries/CustomComponents/NavigationExperimental/NavigationCard.js
@@ -92,7 +92,7 @@ class NavigationCard extends React.Component<any, Props, any> {
   props: Props;
 
   static propTypes = {
-    ...NavigationPropTypes.SceneRenderer,
+    ...NavigationPropTypes.SceneRendererProps,
     onComponentRef: PropTypes.func.isRequired,
     panHandlers: NavigationPropTypes.panHandlers,
     pointerEvents: PropTypes.string.isRequired,
diff --git a/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js b/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js
index b1e58136ca3172..1c199a38a966a1 100644
--- a/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js
+++ b/Libraries/CustomComponents/NavigationExperimental/NavigationHeader.js
@@ -95,7 +95,7 @@ class NavigationHeader extends React.Component<DefaultProps, Props, any> {
   };
 
   static propTypes = {
-    ...NavigationPropTypes.SceneRenderer,
+    ...NavigationPropTypes.SceneRendererProps,
     renderLeftComponent: PropTypes.func,
     renderRightComponent: PropTypes.func,
     renderTitleComponent: PropTypes.func,
diff --git a/Libraries/NavigationExperimental/NavigationPropTypes.js b/Libraries/NavigationExperimental/NavigationPropTypes.js
index 6a8a0488614b90..6939e8193465fc 100644
--- a/Libraries/NavigationExperimental/NavigationPropTypes.js
+++ b/Libraries/NavigationExperimental/NavigationPropTypes.js
@@ -65,7 +65,7 @@ const scene = PropTypes.shape({
 });
 
 /* NavigationSceneRendererProps */
-const SceneRenderer = {
+const SceneRendererProps = {
   layout: layout.isRequired,
   navigationState: navigationParentState.isRequired,
   onNavigate: PropTypes.func.isRequired,
@@ -74,6 +74,8 @@ const SceneRenderer = {
   scenes: PropTypes.arrayOf(scene).isRequired,
 };
 
+const SceneRenderer = PropTypes.shape(SceneRendererProps);
+
 /* NavigationPanPanHandlers */
 const panHandlers = PropTypes.shape({
   onMoveShouldSetResponder: PropTypes.func.isRequired,
@@ -111,11 +113,12 @@ module.exports = {
   extractSceneRendererProps,
 
   // Bundled propTypes.
-  SceneRenderer,
+  SceneRendererProps,
 
   // propTypes
   action,
   navigationParentState,
   navigationState,
   panHandlers,
+  SceneRenderer,
 };