From a14ac29c303094eddedc809a351ea421fdde993e Mon Sep 17 00:00:00 2001
From: Mike Grabowski <grabbou@gmail.com>
Date: Wed, 26 Apr 2017 13:36:00 +0200
Subject: [PATCH] Remove navigationOptions from component props (#1231)

---
 src/createNavigationContainer.js |  1 -
 src/views/CardStack.js           |  2 --
 src/views/Drawer/DrawerScreen.js |  4 ----
 src/views/SceneView.js           | 10 +---------
 src/views/TabView/TabView.js     |  4 ----
 5 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/src/createNavigationContainer.js b/src/createNavigationContainer.js
index fea5fa9e..d39b9916 100644
--- a/src/createNavigationContainer.js
+++ b/src/createNavigationContainer.js
@@ -78,7 +78,6 @@ export default function createNavigationContainer<T: *>(
       const {
         navigation,
         screenProps,
-        navigationOptions,
         ...containerProps
       } = props;
 
diff --git a/src/views/CardStack.js b/src/views/CardStack.js
index 108aec5b..23c6663a 100644
--- a/src/views/CardStack.js
+++ b/src/views/CardStack.js
@@ -387,7 +387,6 @@ class CardStack extends Component {
               screenProps={screenProps}
               navigation={navigation}
               component={SceneComponent}
-              navigationOptions={options}
             />
           </View>
           {this._renderHeader(scene, headerMode)}
@@ -399,7 +398,6 @@ class CardStack extends Component {
         screenProps={this.props.screenProps}
         navigation={navigation}
         component={SceneComponent}
-        navigationOptions={options}
       />
     );
   }
diff --git a/src/views/Drawer/DrawerScreen.js b/src/views/Drawer/DrawerScreen.js
index 646a3f97..a15d7a2b 100644
--- a/src/views/Drawer/DrawerScreen.js
+++ b/src/views/Drawer/DrawerScreen.js
@@ -44,10 +44,6 @@ class DrawerScreen extends PureComponent<void, Props, void> {
         screenProps={screenProps}
         component={Content}
         navigation={childNavigation}
-        navigationOptions={router.getScreenOptions(
-          childNavigation,
-          screenProps,
-        )}
       />
     );
   }
diff --git a/src/views/SceneView.js b/src/views/SceneView.js
index dcf43416..9b30dd6c 100644
--- a/src/views/SceneView.js
+++ b/src/views/SceneView.js
@@ -13,7 +13,6 @@ import type {
 type Props = {
   screenProps?: {},
   navigation: NavigationScreenProp<NavigationRoute, NavigationAction>,
-  navigationOptions: *,
   component: ReactClass<NavigationNavigatorProps<NavigationRoute>>,
 };
 
@@ -34,16 +33,9 @@ export default class SceneView extends PureComponent<void, Props, void> {
     const {
       screenProps,
       navigation,
-      navigationOptions,
       component: Component,
     } = this.props;
 
-    return (
-      <Component
-        screenProps={screenProps}
-        navigation={navigation}
-        navigationOptions={navigationOptions}
-      />
-    );
+    return <Component screenProps={screenProps} navigation={navigation} />;
   }
 }
diff --git a/src/views/TabView/TabView.js b/src/views/TabView/TabView.js
index 08844cc9..c01ba03b 100644
--- a/src/views/TabView/TabView.js
+++ b/src/views/TabView/TabView.js
@@ -66,10 +66,6 @@ class TabView extends PureComponent<void, Props, void> {
         screenProps={screenProps}
         component={TabComponent}
         navigation={childNavigation}
-        navigationOptions={this.props.router.getScreenOptions(
-          childNavigation,
-          screenProps,
-        )}
       />
     );
   };