aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-07-27 06:10:50 +0800
committerDan Finlay <dan@danfinlay.com>2017-07-27 06:11:32 +0800
commitbc65484e1bd15fb6ccc9b94f23c991a170b8d39c (patch)
treee5c6ff524f684242353f25686d67bd3b71a291ee /ui/app/components
parent8e2da52e641ac625bf09efbec804e65e0fc0c753 (diff)
downloadtangerine-wallet-browser-bc65484e1bd15fb6ccc9b94f23c991a170b8d39c.tar
tangerine-wallet-browser-bc65484e1bd15fb6ccc9b94f23c991a170b8d39c.tar.gz
tangerine-wallet-browser-bc65484e1bd15fb6ccc9b94f23c991a170b8d39c.tar.bz2
tangerine-wallet-browser-bc65484e1bd15fb6ccc9b94f23c991a170b8d39c.tar.lz
tangerine-wallet-browser-bc65484e1bd15fb6ccc9b94f23c991a170b8d39c.tar.xz
tangerine-wallet-browser-bc65484e1bd15fb6ccc9b94f23c991a170b8d39c.tar.zst
tangerine-wallet-browser-bc65484e1bd15fb6ccc9b94f23c991a170b8d39c.zip
Remove object spread syntax
Diffstat (limited to 'ui/app/components')
-rw-r--r--ui/app/components/dropdown.js16
1 files changed, 9 insertions, 7 deletions
diff --git a/ui/app/components/dropdown.js b/ui/app/components/dropdown.js
index 70ed388f4..759800fd6 100644
--- a/ui/app/components/dropdown.js
+++ b/ui/app/components/dropdown.js
@@ -2,6 +2,7 @@ const Component = require('react').Component
const PropTypes = require('react').PropTypes
const h = require('react-hyperscript')
const MenuDroppo = require('menu-droppo')
+const extend = require('xtend')
const noop = () => {}
@@ -9,6 +10,13 @@ class Dropdown extends Component {
render () {
const { isOpen, onClickOutside, style, innerStyle, children } = this.props
+ const innerStyleDefaults = extend({
+ borderRadius: '4px',
+ padding: '8px 16px',
+ background: 'rgba(0, 0, 0, 0.8)',
+ boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
+ }, innerStyle)
+
return h(
MenuDroppo,
{
@@ -16,13 +24,7 @@ class Dropdown extends Component {
zIndex: 11,
onClickOutside,
style,
- innerStyle: {
- borderRadius: '4px',
- padding: '8px 16px',
- background: 'rgba(0, 0, 0, 0.8)',
- boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
- ...innerStyle,
- },
+ innerStyle: innerStyleDefaults,
},
[
h(