From 6ef8ce0fd5e0ffce71fa7cceb1b99ef3ebad9187 Mon Sep 17 00:00:00 2001
From: Chau Tran <ctch5@mail.umsl.edu>
Date: Tue, 4 Jun 2019 03:12:41 -0500
Subject: [PATCH] fix: fix navigationOptions type in
 NavigationScreenConfig<Options> (#5962)

- `NavigationScreenProp<NavigationRoute>` is the type of `navigation` property which contains `state` and such. This is not applicable to `navigationOptions` at all.
---
 packages/react-navigation/CHANGELOG.md                     | 5 +++++
 packages/react-navigation/typescript/react-navigation.d.ts | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/react-navigation/CHANGELOG.md b/packages/react-navigation/CHANGELOG.md
index c3055ec1..e67f4855 100644
--- a/packages/react-navigation/CHANGELOG.md
+++ b/packages/react-navigation/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+## Fixes
+- Fix `navigationOptions` type from `NavigationScreenProp<NavigationRoute>` to `NavigationScreenConfig<Options>`.
+
 ## [3.11.0]
 
 ## New Features
diff --git a/packages/react-navigation/typescript/react-navigation.d.ts b/packages/react-navigation/typescript/react-navigation.d.ts
index 4789b7ea..2f7c30bd 100644
--- a/packages/react-navigation/typescript/react-navigation.d.ts
+++ b/packages/react-navigation/typescript/react-navigation.d.ts
@@ -244,7 +244,7 @@ declare module 'react-navigation' {
     | Options
     | ((
         navigationOptionsContainer: NavigationScreenConfigProps & {
-          navigationOptions: NavigationScreenProp<NavigationRoute>;
+          navigationOptions: NavigationScreenConfig<Options>;
         }
       ) => Options);