Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix SVG styles for mobile #12608

Merged
merged 2 commits into from
Dec 6, 2018
Merged

Fix SVG styles for mobile #12608

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fde0b6
Fix SVG styles for mobile
Tug Dec 5, 2018
55474f9
Simplify condition since className is always a string
Tug Dec 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions packages/components/src/primitives/svg/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,8 @@ export {
} from 'react-native-svg';

export const SVG = ( props ) => {
// We're using the react-native-classname-to-style plugin, so when a `className` prop is passed it gets converted to `style` here.
// Given it carries a string (as it was originally className) but an object is expected for `style`,
// we need to check whether `style` exists and is a string, and convert it to an object

let styleValues = {};
if ( typeof props.style === 'string' ) {
const oneStyle = props.style.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 (
Expand Down