Merge pull request #30 from santomegonzalo/rollback-breaking-changes

support old actionsTextColor and actionsTextBackground properties for now
santomegonzalo · Feb 9, 2018 · 8b34ca0 · 8b34ca0
2 parents 9f6a177 + 0106033
commit 8b34ca0
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/component/FloatingAction.js b/component/FloatingAction.js
@@ -205,7 +205,9 @@ class FloatingAction extends Component {
       position,
       overrideWithAction,
       distanceToEdge,
-      actionsPaddingTopBottom
+      actionsPaddingTopBottom,
+      actionsTextBackground,
+      actionsTextColor
     } = this.props;
     const { active } = this.state;
 
@@ -231,17 +233,24 @@ class FloatingAction extends Component {
     return (
       <Animated.View style={actionsStyles} pointerEvents="box-none">
         {
-          sortBy(actions, ['position']).map(action => (
-            <FloatingActionItem
-              paddingTopBottom={actionsPaddingTopBottom}
-              distanceToEdge={distanceToEdge}
-              key={action.name}
-              {...action}
-              position={position}
-              active={active}
-              onPress={this.handlePressItem}
-            />
-          ))
+          sortBy(actions, ['position']).map((action) => {
+            const textColor = action.textColor || action.actionsTextColor;
+            const textBackground = action.textBackground || action.actionsTextBackground;
+
+            return (
+              <FloatingActionItem
+                paddingTopBottom={actionsPaddingTopBottom}
+                distanceToEdge={distanceToEdge}
+                key={action.name}
+                textColor={textColor}
+                textBackground={textBackground}
+                {...action}
+                position={position}
+                active={active}
+                onPress={this.handlePressItem}
+              />
+            )
+          })
         }
       </Animated.View>
     );
@@ -294,6 +303,8 @@ FloatingAction.propTypes = {
     name: PropTypes.string.isRequired,
     position: PropTypes.number.isRequired
   })),
+  actionsTextBackground: PropTypes.string, // @deprecated in favor of textBackground
+  actionsTextColor: PropTypes.string, // @deprecated in favor of textColor
   textBackground: PropTypes.string,
   textColor: PropTypes.string,
   position: PropTypes.oneOf(['right', 'left', 'center']),

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-floating-action",
-  "version": "1.8.2",
+  "version": "1.9.0",
   "description": "floating action component for react-native",
   "main": "index.js",
   "directories": {