From 808704569382199439633bc45a6e326fe2df6493 Mon Sep 17 00:00:00 2001
From: Brent Vatne <brentvatne@gmail.com>
Date: Tue, 27 Nov 2018 00:25:14 +0700
Subject: [PATCH] Merge pull request #62 from BrendonSled/patch-1

Bugfix - Card style background
---
 packages/stack/src/views/StackView/StackViewCard.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/stack/src/views/StackView/StackViewCard.js b/packages/stack/src/views/StackView/StackViewCard.js
index 890c5697..ab923f96 100644
--- a/packages/stack/src/views/StackView/StackViewCard.js
+++ b/packages/stack/src/views/StackView/StackViewCard.js
@@ -4,7 +4,6 @@ import { Screen } from 'react-native-screens';
 import createPointerEventsContainer from './createPointerEventsContainer';
 
 const EPS = 1e-5;
-
 function getAccessibilityProps(isActive) {
   if (Platform.OS === 'ios') {
     return {
@@ -49,11 +48,14 @@ class Card extends React.Component {
       ...containerAnimatedStyle
     } = animatedStyle;
 
+    let flattenedStyle = StyleSheet.flatten(style) || {};
+    let { backgroundColor, ...screenStyle } = flattenedStyle;
+
     return (
       <Screen
         pointerEvents={pointerEvents}
         onComponentRef={this.props.onComponentRef}
-        style={[StyleSheet.absoluteFill, containerAnimatedStyle, style]}
+        style={[StyleSheet.absoluteFill, containerAnimatedStyle, screenStyle]}
         active={active}
       >
         {shadowOpacity ? (
@@ -64,7 +66,12 @@ class Card extends React.Component {
         ) : null}
         <Animated.View
           {...getAccessibilityProps(isActive)}
-          style={[transparent ? styles.transparent : styles.card]}
+          style={[
+            transparent ? styles.transparent : styles.card,
+            backgroundColor && backgroundColor !== 'transparent'
+              ? { backgroundColor }
+              : null,
+          ]}
         >
           {children}
         </Animated.View>