diff --git a/lib/Drawer/Header.js b/lib/Drawer/Header.js index a82b624..4b48567 100644 --- a/lib/Drawer/Header.js +++ b/lib/Drawer/Header.js @@ -19,12 +19,12 @@ export default class Header extends Component { if (image) { return React.cloneElement(image, { - style: Object.assign(styles.header, { height }) + style: [styles.header, { height: height }] }, children); } return ( - + {children} ); diff --git a/lib/Drawer/index.js b/lib/Drawer/index.js index 453af0d..3583241 100644 --- a/lib/Drawer/index.js +++ b/lib/Drawer/index.js @@ -41,7 +41,7 @@ export default class Drawer extends Component { })(); return ( - + {React.Children.map(children, (child) => { return React.cloneElement(child, { theme diff --git a/lib/helpers.js b/lib/helpers.js index 33fb8b5..4906df1 100644 --- a/lib/helpers.js +++ b/lib/helpers.js @@ -8,7 +8,7 @@ import { PRIMARY, COLOR } from './config'; */ export function getColor(string) { if (string) { - if (string.contains('#') || string.contains('rgba')) { + if (string.indexOf('#') > -1 || string.indexOf('rgba') > -1) { return string; }