From b24d471fb2d5e2c22095d3a75c2e7f6253f80cbd Mon Sep 17 00:00:00 2001
From: Eric Vicenti <evv@fb.com>
Date: Mon, 9 May 2016 08:32:29 -0700
Subject: [PATCH] Backed out D3033933

Reviewed By: hedgerwang

Differential Revision: D3273603

fb-gh-sync-id: e013fd3efd793960d076d2a01447b2a11f483ede
fbshipit-source-id: e013fd3efd793960d076d2a01447b2a11f483ede
---
 .../NavigationExperimental/NavigationAnimatedExample.js      | 1 +
 Libraries/NavigationExperimental/NavigationAnimatedView.js   | 2 --
 Libraries/NavigationExperimental/NavigationPropTypes.js      | 2 --
 Libraries/NavigationExperimental/NavigationTypeDefinition.js | 3 ---
 Libraries/NavigationExperimental/NavigationView.js           | 5 +----
 5 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js
index 1df559843..4c7c3377c 100644
--- a/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js
+++ b/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js
@@ -122,6 +122,7 @@ class NavigationAnimatedExample extends React.Component {
     return (
       <NavigationCard
         {...props}
+        key={'card_' + props.scene.navigationState.key}
         renderScene={this._renderScene}
       />
     );
diff --git a/Libraries/NavigationExperimental/NavigationAnimatedView.js b/Libraries/NavigationExperimental/NavigationAnimatedView.js
index f9faa5cc4..059407b20 100644
--- a/Libraries/NavigationExperimental/NavigationAnimatedView.js
+++ b/Libraries/NavigationExperimental/NavigationAnimatedView.js
@@ -188,7 +188,6 @@ class NavigationAnimatedView
       onNavigate,
       position,
       scene,
-      key: 'scene_' + scene.navigationState.key,
       scenes,
     });
   }
@@ -208,7 +207,6 @@ class NavigationAnimatedView
 
       return renderOverlay({
         layout: this.state.layout,
-        key: navigationState.key,
         navigationState,
         onNavigate,
         position,
diff --git a/Libraries/NavigationExperimental/NavigationPropTypes.js b/Libraries/NavigationExperimental/NavigationPropTypes.js
index 0c604675d..6a8a04886 100644
--- a/Libraries/NavigationExperimental/NavigationPropTypes.js
+++ b/Libraries/NavigationExperimental/NavigationPropTypes.js
@@ -66,7 +66,6 @@ const scene = PropTypes.shape({
 
 /* NavigationSceneRendererProps */
 const SceneRenderer = {
-  key: PropTypes.string.isRequired,
   layout: layout.isRequired,
   navigationState: navigationParentState.isRequired,
   onNavigate: PropTypes.func.isRequired,
@@ -98,7 +97,6 @@ function extractSceneRendererProps(
   props: NavigationSceneRendererProps,
 ): NavigationSceneRendererProps {
   return {
-    key: props.scene.navigationState.key,
     layout: props.layout,
     navigationState: props.navigationState,
     onNavigate: props.onNavigate,
diff --git a/Libraries/NavigationExperimental/NavigationTypeDefinition.js b/Libraries/NavigationExperimental/NavigationTypeDefinition.js
index d36ee54a4..f0dff93ed 100644
--- a/Libraries/NavigationExperimental/NavigationTypeDefinition.js
+++ b/Libraries/NavigationExperimental/NavigationTypeDefinition.js
@@ -66,9 +66,6 @@ export type NavigationSceneRendererProps = {
   // The scene to render.
   scene: NavigationScene,
 
-  // The key of the scene
-  key: string,
-
   // All the scenes of the containing view's.
   scenes: Array<NavigationScene>,
 };
diff --git a/Libraries/NavigationExperimental/NavigationView.js b/Libraries/NavigationExperimental/NavigationView.js
index 533b9ea44..6a24564fa 100644
--- a/Libraries/NavigationExperimental/NavigationView.js
+++ b/Libraries/NavigationExperimental/NavigationView.js
@@ -121,15 +121,12 @@ class NavigationView extends React.Component<any, Props, any> {
       scenes,
     } = this.state;
 
-    const scene = scenes[navigationState.index];
-
     const sceneProps = {
-      key: 'scene_' + scene.navigationState.key,
       layout,
       navigationState: navigationState,
       onNavigate: onNavigate,
       position: this._position,
-      scene,
+      scene: scenes[navigationState.index],
       scenes,
     };