From 5ecba055105e3e96246eeb1895d5c9e019cebd14 Mon Sep 17 00:00:00 2001
From: Omar Diab <me@omardiab.com>
Date: Wed, 20 Jun 2018 20:19:07 -0700
Subject: [PATCH] update withNavigation types, add test

---
 types/react-navigation/index.d.ts              |  2 +-
 .../react-navigation-tests.tsx                 | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 332f4e4645..0c67c333a0 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -1162,7 +1162,7 @@ export interface NavigationInjectedProps {
 
 export function withNavigation<T = {}>(
   Component: React.ComponentType<T & NavigationInjectedProps>
-): React.ComponentType<T>;
+): React.ComponentType<T & { onRef?: React.Ref<typeof Component> }>;
 
 export function withNavigationFocus<T = {}>(
   Component: React.ComponentType<T & NavigationInjectedProps>
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 03b6f76775..38aa495240 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -40,6 +40,8 @@ import {
     NavigationPopToTopAction,
     NavigationScreenComponent,
     NavigationContainerComponent,
+    withNavigation,
+    NavigationInjectedProps,
 } from 'react-navigation';
 
 // Constants
@@ -514,3 +516,19 @@ class SetParamsTest extends React.Component<NavigationScreenProps<ScreenProps>>
         );
     }
 }
+
+// Test withNavigation
+
+interface BackButtonProps { title: string; }
+class MyBackButton extends React.Component<BackButtonProps & NavigationInjectedProps> {
+    render() {
+      return <button title={this.props.title} onClick={() => { this.props.navigation.goBack(); }} />;
+    }
+}
+
+// withNavigation returns a component that wraps MyBackButton and passes in the
+// navigation prop
+const BackButtonWithNavigation = withNavigation<BackButtonProps>(MyBackButton);
+const BackButtonInstance = <BackButtonWithNavigation
+    title="Back" onRef={ref => { const backButtonRef = ref; }}
+/>;