status-im
/
react-native
mirror of https://github.com/status-im/react-native.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix lint in StyleSheet.compose 

Reviewed By: TheSavior, yungsters

Differential Revision: D7106910

fbshipit-source-id: e150c6622bb1af9830eef06757897d42002f5676
This commit is contained in:
Spencer Ahrens 2018-03-05 18:35:43 -08:00 committed by Facebook Github Bot
parent b6c7e551a9
commit 52c7957349
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Libraries/StyleSheet/StyleSheet.js
View File

@ -139,10 +139,10 @@ module.exports = {
* PureComponent checks.
*/
compose(style1: ?StyleProp, style2: ?StyleProp): ?StyleProp {
if (style1 && style2) {
if (style1 != null && style2 != null) {
return [style1, style2];
} else {
return style1 || style2;
return style1 != null ? style1 : style2;
}
},