From c56a962fb5bb9503f80c72113febd4cbf702e169 Mon Sep 17 00:00:00 2001
From: Brent Vatne <brentvatne@gmail.com>
Date: Mon, 26 Feb 2018 14:03:56 -0800
Subject: [PATCH] Apply StyleSheet.flatten properly to headerStyle. Fixes #3608

---
 .../src/navigators/__tests__/StackNavigator-test.js      | 9 ++++++++-
 packages/react-navigation/src/views/Header/Header.js     | 5 +----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/react-navigation/src/navigators/__tests__/StackNavigator-test.js b/packages/react-navigation/src/navigators/__tests__/StackNavigator-test.js
index 426ca66a..d1cd79b4 100644
--- a/packages/react-navigation/src/navigators/__tests__/StackNavigator-test.js
+++ b/packages/react-navigation/src/navigators/__tests__/StackNavigator-test.js
@@ -1,15 +1,22 @@
 import React, { Component } from 'react';
-import { View } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import renderer from 'react-test-renderer';
 
 import StackNavigator from '../StackNavigator';
 
+const styles = StyleSheet.create({
+  header: {
+    opacity: 0.5,
+  },
+});
+
 class HomeScreen extends Component {
   static navigationOptions = ({ navigation }) => ({
     title: `Welcome ${
       navigation.state.params ? navigation.state.params.user : 'anonymous'
     }`,
     gesturesEnabled: true,
+    headerStyle: [{ backgroundColor: 'red' }, styles.header],
   });
 
   render() {
diff --git a/packages/react-navigation/src/views/Header/Header.js b/packages/react-navigation/src/views/Header/Header.js
index 1b246d3b..bc657d69 100644
--- a/packages/react-navigation/src/views/Header/Header.js
+++ b/packages/react-navigation/src/views/Header/Header.js
@@ -441,10 +441,7 @@ class Header extends React.PureComponent {
 
     const { options } = this.props.getScreenDetails(scene);
     const { headerStyle = {} } = options;
-    const headerStyleObj =
-      typeof headerStyle === 'number'
-        ? StyleSheet.flatten(headerStyle)
-        : headerStyle;
+    const headerStyleObj = StyleSheet.flatten(headerStyle);
     const appBarHeight = getAppBarHeight(isLandscape);
 
     const {