zoriya/react-native-svg
1
0
Fork 0
mirror of https://github.com/zoriya/react-native-svg.git synced 2026-06-02 14:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor web implementation

Browse Source
This commit is contained in:
Mikael Sand
2019-03-09 05:55:55 +02:00
parent 21c236abef
commit f9c9ac8920
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.web.js
+6 -6
View File
@@ -1,16 +1,16 @@
import { createElement, StyleSheet } from 'react-native-web';
function resolve(style1, style2) {
if (style1 && style2) {
function resolve(styleProp, cleanedProps) {
if (styleProp) {
return StyleSheet
? [style1, style2]
? [styleProp, cleanedProps]
: {
// Compatibility for arrays of styles in plain react web
...(style1.length ? Object.assign({}, ...style1) : style1),
...style2,
...(styleProp.length ? Object.assign({}, ...styleProp) : styleProp),
...cleanedProps,
};
} else {
return style1 || style2;
return cleanedProps;
}
}