From 455ab41dbb61099cd5bd0dcd54a8aa601497e52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ullrich=20Sch=C3=A4fer?= <git@ullrich.is>
Date: Thu, 28 Jun 2018 14:29:19 +0200
Subject: [PATCH 1/2] Adding a test that fails

---
 .../react-navigation/react-navigation-tests.tsx | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 38aa495240..5bdc0f400c 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -41,6 +41,7 @@ import {
     NavigationScreenComponent,
     NavigationContainerComponent,
     withNavigation,
+    withNavigationFocus,
     NavigationInjectedProps,
 } from 'react-navigation';
 
@@ -532,3 +533,19 @@ const BackButtonWithNavigation = withNavigation<BackButtonProps>(MyBackButton);
 const BackButtonInstance = <BackButtonWithNavigation
     title="Back" onRef={ref => { const backButtonRef = ref; }}
 />;
+
+// Test withNavigationFocus
+
+interface MyFocusedComponentProps { expectsFocus: boolean; }
+class MyFocusedComponent extends React.Component<MyFocusedComponentProps & NavigationInjectedProps> {
+    render() {
+      return <button title={`${this.props.expectsFocus} vs ${this.props.isFocused}`} onClick={() => { this.props.navigation.goBack(); }} />;
+    }
+}
+
+// withNavigationFocus returns a component that wraps MyFocusedComponent and passes in the
+// navigation and isFocused prop
+const MyFocusedComponentWithNavigationFocus = withNavigationFocus<MyFocusedComponentProps>(MyFocusedComponent);
+const MyFocusedComponentInstance = <MyFocusedComponentWithNavigationFocus
+    expectsFocus={true} onRef={ref => { const backButtonRef = ref; }}
+/>;

From 3c42098631673b56a278c7cc49da1f19d92015e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ullrich=20Sch=C3=A4fer?= <git@ullrich.is>
Date: Thu, 28 Jun 2018 14:36:27 +0200
Subject: [PATCH 2/2] Adding correct injected props for withNavigationFocus

---
 types/react-navigation/index.d.ts                 | 8 ++++++--
 types/react-navigation/react-navigation-tests.tsx | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 75bc217615..b58f3778ae 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -18,6 +18,7 @@
 //                 Edward Sammut Alessi <https://github.com/Slessi>
 //                 Jérémy Magrin <https://github.com/magrinj>
 //                 Luca Campana <https://github.com/TizioFittizio>
+//                 Ullrich Schaefer <https://github.com/stigi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.6
 
@@ -1165,9 +1166,12 @@ export function withNavigation<T = {}>(
   Component: React.ComponentType<T & NavigationInjectedProps>
 ): React.ComponentType<T & { onRef?: React.Ref<typeof Component> }>;
 
+export interface NavigationFocusInjectedProps extends NavigationInjectedProps {
+  isFocused: boolean;
+}
 export function withNavigationFocus<T = {}>(
-  Component: React.ComponentType<T & NavigationInjectedProps>
-): React.ComponentType<T>;
+  Component: React.ComponentType<T & NavigationFocusInjectedProps>
+): React.ComponentType<T & { onRef?: React.Ref<typeof Component> }>;
 
 /**
  * SafeAreaView Component
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 5bdc0f400c..40aa75cbc3 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -41,8 +41,9 @@ import {
     NavigationScreenComponent,
     NavigationContainerComponent,
     withNavigation,
-    withNavigationFocus,
     NavigationInjectedProps,
+    withNavigationFocus,
+    NavigationFocusInjectedProps
 } from 'react-navigation';
 
 // Constants
@@ -537,7 +538,7 @@ const BackButtonInstance = <BackButtonWithNavigation
 // Test withNavigationFocus
 
 interface MyFocusedComponentProps { expectsFocus: boolean; }
-class MyFocusedComponent extends React.Component<MyFocusedComponentProps & NavigationInjectedProps> {
+class MyFocusedComponent extends React.Component<MyFocusedComponentProps & NavigationFocusInjectedProps> {
     render() {
       return <button title={`${this.props.expectsFocus} vs ${this.props.isFocused}`} onClick={() => { this.props.navigation.goBack(); }} />;
     }