allow style overrides from user

Change order of object merge, so the width can be overridden to for example '100%'
nolan/hinaloe-test
Stephan Meijer 2017-02-04 12:00:22 +01:00 committed by GitHub
parent 626d5b1ab4
commit ca27f3af06
1 changed files with 1 additions and 1 deletions

View File

@ -242,7 +242,7 @@ export default class Picker extends React.Component {
{ skin } = this.state,
width = (perLine * (emojiSize + 12)) + 12 + 2
return <div style={{...style, width: width}} className='emoji-mart'>
return <div style={{width: width, ...style}} className='emoji-mart'>
<div className='emoji-mart-bar'>
<Anchors
ref='anchors'