fix flow and wrong spread

Author: vonovak

src/HeaderButton.js

@@ -5,12 +5,12 @@ import * as React from 'react';
 const BUTTON_HIT_SLOP = { top: 5, bottom: 5, left: 5, right: 5 };
 import { StyleSheet, View } from 'react-native';
 import Touchable from 'react-native-platform-touchable';
-import type { StyleObj } from 'react-native/Libraries/StyleSheet/StyleSheetTypes';
+import type { ViewStyleProp } from 'react-native/Libraries/StyleSheet/StyleSheet';
 
 // from <Item />
 export type HeaderButtonProps = {
   onPress: ?() => any,
-  buttonWrapperStyle?: StyleObj,
+  buttonWrapperStyle?: ViewStyleProp,
   ButtonElement?: React.Element<any>,
   testID?: string,
 };
@@ -20,7 +20,7 @@ export type HeaderButtonProps = {
 export type VisibleButtonProps = $Exact<{
   iconName?: string,
   title: string,
-  buttonStyle?: StyleObj,
+  buttonStyle?: ViewStyleProp,
 
   IconComponent?: React.ComponentType<*>,
   iconSize?: number,
@@ -32,9 +32,13 @@ type OtherProps = {
   getButtonElement: VisibleButtonProps => React.Element<any>,
 };
 
-export class HeaderButton extends React.PureComponent<
-  HeaderButtonProps & VisibleButtonProps & OtherProps
-> {
+type Props = $Exact<{
+  ...$Exact<HeaderButtonProps>,
+  ...$Exact<VisibleButtonProps>,
+  ...$Exact<OtherProps>,
+}>;
+
+export class HeaderButton extends React.PureComponent<Props> {
   static defaultProps = {
     background: Touchable.SelectableBackgroundBorderless(),
   };
@@ -52,7 +56,7 @@ export class HeaderButton extends React.PureComponent<
       IconComponent,
       iconSize,
       color,
-      other,
+      ...other
     } = this.props;
 
     const ButtonElement =

src/HeaderButtons.js

@@ -1,11 +1,11 @@
 /*
-* @flow
-*/
+ * @flow
+ */
 import * as React from 'react';
 import { HeaderButton, type HeaderButtonProps, type VisibleButtonProps } from './HeaderButton';
 import { StyleSheet, Platform, View, Text } from 'react-native';
 import { OverflowButton, type OverflowButtonProps, IS_IOS } from './OverflowButton';
-import type { StyleObj } from 'react-native/Libraries/StyleSheet/StyleSheetTypes';
+import type { ViewStyleProp } from 'react-native/Libraries/StyleSheet/StyleSheet';
 
 const textTransformer = (label: string) =>
   IS_IOS ? label.charAt(0).toUpperCase() + label.substr(1) : label.toUpperCase();
@@ -32,7 +32,7 @@ export class Item extends React.Component<ItemProps> {
 type HeaderButtonsProps = {
   children: React.Node,
   left: boolean,
-  overflowButtonWrapperStyle?: StyleObj,
+  overflowButtonWrapperStyle?: ViewStyleProp,
   HeaderButtonComponent: React.ComponentType<*>,
   ...$Exact<OverflowButtonProps>,
 };

src/OverflowButton.js

@@ -1,6 +1,6 @@
 /*
-* @flow
-*/
+ * @flow
+ */
 import * as React from 'react';
 import {
   View,
@@ -11,19 +11,19 @@ import {
   Platform,
 } from 'react-native';
 import { HeaderButton, type VisibleButtonProps } from './HeaderButton';
-import type { StyleObj } from 'react-native/Libraries/StyleSheet/StyleSheetTypes';
+import type { ViewStyleProp } from 'react-native/Libraries/StyleSheet/StyleSheet';
 export const OVERFLOW_BUTTON_TEST_ID = 'headerOverflowButton';
 
 export const IS_IOS = Platform.OS === 'ios';
 
 export type OverflowButtonProps = {
-  OverflowIcon: React.Node,
+  OverflowIcon: React.Element<*>,
   onOverflowMenuPress?: ({ hiddenButtons: Array<React.Element<*>> }) => any,
 };
 
 type Props = {
   hiddenButtons: Array<React.Element<*>>,
-  buttonWrapperStyle?: StyleObj,
+  buttonWrapperStyle?: ViewStyleProp,
   ...$Exact<OverflowButtonProps>,
 };