Update Prop type of CardList

99x · Apr 1, 2019 · 3976e00 · 3976e00
1 parent f28ec48
commit 3976e00
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/src/molecules/floatingButton/FloatingButtonItem.js b/src/molecules/floatingButton/FloatingButtonItem.js
@@ -38,6 +38,12 @@ class FloatingButtonItem extends Component {
             textContainerStyle
         } = this.props;
 
+        const textItemStyle = {
+            ...styles.text,
+            color: textColor,
+            ...textStyle
+        };
+
         if (text) {
             return (
                 <View
@@ -55,10 +61,7 @@ class FloatingButtonItem extends Component {
                         textContainerStyle
                     ]}
                 >
-                    <Text
-                        style={[styles.text, { color: textColor }, textStyle]}
-                        {...textProps}
-                    >
+                    <Text {...textProps} style={textItemStyle}>
                         {text}
                     </Text>
                 </View>

diff --git a/src/organisms/CardList.js b/src/organisms/CardList.js
@@ -1,5 +1,6 @@
 import React, { Component } from "react";
 import { FlatList, View, Platform } from "react-native";
+import PropTypes from "prop-types";
 import { Card } from "../molecules/cards/Card";
 import { deviceVariables } from "../variables/deviceVariables";
 
@@ -48,6 +49,7 @@ export class CardList extends Component {
 }
 
 CardList.propTypes = {
+    backgroundColor: PropTypes.string,
     ...FlatList.propTypes
 };