From d041430dc5c2b5013ba2ab645191dd5abd157cc2 Mon Sep 17 00:00:00 2001
From: Mellet Solbakk <mellet89@gmail.com>
Date: Sun, 4 Feb 2018 00:05:09 +0100
Subject: [PATCH] Fix tabBarOnPress to destructure arguments

---
 types/react-navigation/index.d.ts                 |  4 ++--
 types/react-navigation/react-navigation-tests.tsx | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index 1c6f6716a9..49164e353f 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -347,10 +347,10 @@ export interface NavigationTabScreenOptions extends NavigationScreenOptions {
     > | string | null));
   tabBarVisible?: boolean;
   tabBarTestIDProps?: { testID?: string, accessibilityLabel?: string };
-  tabBarOnPress?: (
+  tabBarOnPress?: (options: {
     scene: TabScene,
     jumpToIndex: (index: number) => void
-  ) => void;
+  }) => void;
 }
 
 export interface NavigationDrawerScreenOptions extends NavigationScreenOptions {
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 9b61d11c2d..662cd0bb9d 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -140,7 +140,7 @@ const tabNavigatorScreenOptions: NavigationTabScreenOptions = {
     tabBarVisible: true,
     tabBarIcon: <View />,
     tabBarLabel: 'label',
-    tabBarOnPress: (scene, index) => {}
+    tabBarOnPress: ({scene, jumpToIndex}) => {}
 };
 
 const tabNavigatorConfig: TabNavigatorConfig = {
@@ -154,6 +154,15 @@ const tabNavigatorConfigWithInitialLayout: TabNavigatorConfig = {
   initialLayout: { height: 0, width: 100 },
 };
 
+const tabNavigatorConfigWithNavigationOptions: TabNavigatorConfig = {
+    ...tabNavigatorConfig,
+    navigationOptions: {
+        tabBarOnPress: ({scene, jumpToIndex}) => {
+            jumpToIndex(scene.index);
+        }
+    },
+};
+
 const BasicTabNavigator = TabNavigator(
     routeConfigMap,
     tabNavigatorConfig,