From 1b2dcd77d4a6934efda5cf03209e312659b89002 Mon Sep 17 00:00:00 2001
From: "satyajit.happy" <satyajit.happy@gmail.com>
Date: Fri, 14 Jun 2019 23:23:45 +0200
Subject: [PATCH] fix: fix header tint color not applied

---
 .../__snapshots__/NestedNavigator.test.tsx.snap    | 14 ++++++++++++--
 .../__snapshots__/StackNavigator.test.tsx.snap     | 14 ++++++++++++--
 packages/stack/src/types.tsx                       |  2 +-
 packages/stack/src/views/Header/HeaderSegment.tsx  |  6 ++++--
 4 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/packages/stack/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap b/packages/stack/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap
index 9b913af9..6139c435 100644
--- a/packages/stack/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap
+++ b/packages/stack/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap
@@ -463,7 +463,12 @@ Array [
                                 "fontSize": 17,
                                 "fontWeight": "600",
                               },
-                              undefined,
+                              Array [
+                                Object {
+                                  "color": undefined,
+                                },
+                                undefined,
+                              ],
                             ]
                           }
                         >
@@ -589,7 +594,12 @@ Array [
                   "fontSize": 17,
                   "fontWeight": "600",
                 },
-                undefined,
+                Array [
+                  Object {
+                    "color": undefined,
+                  },
+                  undefined,
+                ],
               ]
             }
           >
diff --git a/packages/stack/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap b/packages/stack/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap
index fc127fba..bde01829 100644
--- a/packages/stack/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap
+++ b/packages/stack/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap
@@ -297,7 +297,12 @@ Array [
                   "fontSize": 17,
                   "fontWeight": "600",
                 },
-                undefined,
+                Array [
+                  Object {
+                    "color": undefined,
+                  },
+                  undefined,
+                ],
               ]
             }
           >
@@ -627,7 +632,12 @@ Array [
                   "fontSize": 17,
                   "fontWeight": "600",
                 },
-                undefined,
+                Array [
+                  Object {
+                    "color": undefined,
+                  },
+                  undefined,
+                ],
               ]
             }
           >
diff --git a/packages/stack/src/types.tsx b/packages/stack/src/types.tsx
index 60e96e24..4a5c2888 100644
--- a/packages/stack/src/types.tsx
+++ b/packages/stack/src/types.tsx
@@ -73,7 +73,7 @@ export type HeaderOptions = {
   headerTruncatedBackTitle?: string;
   headerLeft?: (props: HeaderBackButtonProps) => React.ReactNode;
   headerLeftContainerStyle?: StyleProp<ViewStyle>;
-  headerRight?: () => React.ReactNode;
+  headerRight?: (props: { tintColor?: string }) => React.ReactNode;
   headerRightContainerStyle?: StyleProp<ViewStyle>;
   headerBackImage?: HeaderBackButtonProps['backImage'];
   headerPressColorAndroid?: string;
diff --git a/packages/stack/src/views/Header/HeaderSegment.tsx b/packages/stack/src/views/Header/HeaderSegment.tsx
index 43943e63..a895d5f7 100644
--- a/packages/stack/src/views/Header/HeaderSegment.tsx
+++ b/packages/stack/src/views/Header/HeaderSegment.tsx
@@ -125,6 +125,7 @@ export default class HeaderSegment extends React.Component<Props, State> {
         <HeaderBackButton {...props} />
       ),
       headerBackground,
+      headerTintColor,
       // @ts-ignore
       headerStatusBarHeight = getStatusBarHeight(layout.width > layout.height),
       headerRight: right,
@@ -186,6 +187,7 @@ export default class HeaderSegment extends React.Component<Props, State> {
                 onLabelLayout: this.handleLeftLabelLayout,
                 screenLayout: layout,
                 titleLayout,
+                tintColor: headerTintColor,
               })}
             </Animated.View>
           ) : null}
@@ -204,7 +206,7 @@ export default class HeaderSegment extends React.Component<Props, State> {
               <HeaderTitle
                 onLayout={this.handleTitleLayout}
                 allowFontScaling={titleAllowFontScaling}
-                style={customTitleStyle}
+                style={[{ color: headerTintColor }, customTitleStyle]}
               >
                 {currentTitle}
               </HeaderTitle>
@@ -214,7 +216,7 @@ export default class HeaderSegment extends React.Component<Props, State> {
             <Animated.View
               style={[styles.right, rightButtonStyle, rightContainerStyle]}
             >
-              {right()}
+              {right({ tintColor: headerTintColor })}
             </Animated.View>
           ) : null}
         </View>