From 55474f92f8c8fc4c1562f9605030076c17256770 Mon Sep 17 00:00:00 2001 From: Tugdual de Kerviler Date: Thu, 6 Dec 2018 09:37:30 +0100 Subject: [PATCH] Simplify condition since className is always a string --- packages/components/src/primitives/svg/index.native.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/components/src/primitives/svg/index.native.js b/packages/components/src/primitives/svg/index.native.js index e485897375a32..b0272e6b5a7b9 100644 --- a/packages/components/src/primitives/svg/index.native.js +++ b/packages/components/src/primitives/svg/index.native.js @@ -17,12 +17,8 @@ export { } from 'react-native-svg'; export const SVG = ( props ) => { - let styleValues = {}; - if ( typeof props.className === 'string' ) { - const oneStyle = props.className.split( ' ' ).map( ( element ) => styles[ element ] ).filter( Boolean ); - styleValues = Object.assign( styleValues, ...oneStyle ); - } - + const stylesFromClasses = ( props.className || '' ).split( ' ' ).map( ( element ) => styles[ element ] ).filter( Boolean ); + const styleValues = Object.assign( {}, props.style, ...stylesFromClasses ); const safeProps = { ...props, style: styleValues }; return (