Allow style arrays in Text HOC

infinitered · Sep 7, 2018 · d2c0941 · d2c0941
1 parent 2d3c26c
commit d2c0941
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ node_modules
 testgrounds
 IntegrationTest
 integration_test
+ios/Pods
diff --git a/boilerplate/src/views/shared/text/text.props.ts b/boilerplate/src/views/shared/text/text.props.ts
@@ -20,7 +20,7 @@ export interface TextProps extends TextProperties {
   /**
    * An optional style override useful for padding & margin.
    */
-  style?: TextStyle
+  style?: TextStyle | TextStyle[]
 
   /**
    * One of the different types of text presets.

diff --git a/boilerplate/src/views/shared/text/text.tsx b/boilerplate/src/views/shared/text/text.tsx
@@ -3,6 +3,7 @@ import { Text as ReactNativeText } from "react-native"
 import { presets } from "./text.presets"
 import { TextProps } from "./text.props"
 import { translate } from "../../../i18n"
+import { mergeWith, concat } from "ramda"
 
 /**
  * For your text displaying needs.
@@ -19,7 +20,13 @@ export function Text(props: TextProps) {
 
   // assemble the style
   const presetToUse = presets[preset] || presets.default
-  const style = { ...presetToUse, ...styleOverride }
+  let style
+  if (Array.isArray(styleOverride)) {
+    style = mergeWith(concat, ...presetToUse, styleOverride)
+  } else {
+    style = { ...presetToUse, ...styleOverride }
+  }
+
 
   return (
     <ReactNativeText {...rest} style={style}>