diff options
| author | Erik Larkö <erik@mullvad.net> | 2018-01-04 11:36:38 +0100 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2018-01-08 14:53:23 +0100 |
| commit | e2ba51a0421ba1b77b98da928bd84acc7b7fc822 (patch) | |
| tree | c25932f5c6f7f23fc8eca38aca3c40c120617c23 | |
| parent | 038f658866c610b7619af0e10bd3e922211e6e31 (diff) | |
| download | mullvadvpn-e2ba51a0421ba1b77b98da928bd84acc7b7fc822.tar.xz mullvadvpn-e2ba51a0421ba1b77b98da928bd84acc7b7fc822.zip | |
Fix lint error in styled bytton
| -rw-r--r-- | app/components/styled/Button.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/components/styled/Button.js b/app/components/styled/Button.js index df880701cd..59d2371480 100644 --- a/app/components/styled/Button.js +++ b/app/components/styled/Button.js @@ -10,11 +10,7 @@ const defaultStyle = ReactXP.Styles.createViewStyle({ export function Button(props: *) { const { style, cursor, ...rest } = props; - const stylePropArray = Array.isArray(props.style) - ? props.style - : [props.style]; - - const concreteStyle = ReactXP.Styles.combine([defaultStyle, ...stylePropArray]); + const concreteStyle = ReactXP.Styles.combine([defaultStyle, style]); // Can be removed when we upgrade to ReactXP 0.51 const concreteCursor = cursor || concreteStyle.cursor || 'default'; |