fix: fix types for tab bar button component

react-navigation · Sep 19, 2019 · 8f26d12 · 8f26d12
1 parent 34fd957
commit 8f26d12
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/src/types.tsx b/src/types.tsx
@@ -57,6 +57,18 @@ export type BottomTabBarOptions = {
   style?: StyleProp<ViewStyle>;
 };
 
+export type ButtonComponentProps = {
+  route: NavigationRoute;
+  focused: boolean;
+  onPress: () => void;
+  onLongPress: () => void;
+  testID?: string;
+  accessibilityLabel?: string;
+  accessibilityRole?: AccessibilityRole;
+  accessibilityStates?: AccessibilityState[];
+  style?: StyleProp<ViewStyle>;
+};
+
 export type BottomTabBarProps = BottomTabBarOptions & {
   navigation: NavigationTabProp;
   onTabPress: (props: { route: NavigationRoute }) => void;
@@ -73,7 +85,7 @@ export type BottomTabBarProps = BottomTabBarOptions & {
   }) => AccessibilityState[];
   getButtonComponent: (props: {
     route: NavigationRoute;
-  }) => React.ComponentType<any> | undefined;
+  }) => React.ComponentType<ButtonComponentProps> | undefined;
   getLabelText: (props: {
     route: NavigationRoute;
   }) =>
@@ -172,7 +184,7 @@ export type NavigationCommonTabOptions = {
 };
 
 export type NavigationBottomTabOptions = NavigationCommonTabOptions & {
-  tabBarButtonComponent?: React.ComponentType<BottomTabBarProps>;
+  tabBarButtonComponent?: React.ComponentType<ButtonComponentProps>;
 };
 
 export type NavigationMaterialTabOptions = NavigationCommonTabOptions & {

diff --git a/src/views/BottomTabBar.tsx b/src/views/BottomTabBar.tsx
@@ -13,7 +13,7 @@ import { ThemeColors, ThemeContext, NavigationRoute } from 'react-navigation';
 
 import CrossFadeIcon from './CrossFadeIcon';
 import withDimensions from '../utils/withDimensions';
-import { BottomTabBarProps } from '../types';
+import { BottomTabBarProps, ButtonComponentProps } from '../types';
 
 type State = {
   layout: { height: number; width: number };
@@ -28,19 +28,21 @@ const isIOS11 = majorVersion >= 11 && isIos;
 const DEFAULT_MAX_TAB_ITEM_WIDTH = 125;
 
 class TouchableWithoutFeedbackWrapper extends React.Component<
-  React.ComponentProps<typeof TouchableWithoutFeedback> & {
-    children: React.ReactNode;
-  }
+  ButtonComponentProps
 > {
   render() {
     const {
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      route,
+      // eslint-disable-next-line @typescript-eslint/no-unused-vars
+      focused,
       onPress,
       onLongPress,
       testID,
       accessibilityLabel,
       accessibilityRole,
       accessibilityStates,
-      ...props
+      ...rest
     } = this.props;
 
     return (
@@ -53,7 +55,7 @@ class TouchableWithoutFeedbackWrapper extends React.Component<
         accessibilityRole={accessibilityRole}
         accessibilityStates={accessibilityStates}
       >
-        <View {...props} />
+        <View {...rest} />
       </TouchableWithoutFeedback>
     );
   }
@@ -407,6 +409,8 @@ class TabBarBottom extends React.Component<BottomTabBarProps, State> {
             return (
               <ButtonComponent
                 key={route.key}
+                route={route}
+                focused={focused}
                 onPress={() => onTabPress({ route })}
                 onLongPress={() => onTabLongPress({ route })}
                 testID={testID}