From ca27f3af069d40d1119801b71714dae1e73add18 Mon Sep 17 00:00:00 2001
From: Stephan Meijer <stephan@meijer.ws>
Date: Sat, 4 Feb 2017 12:00:22 +0100
Subject: [PATCH] allow style overrides from user

Change order of object merge, so the width can be overridden to for example '100%'
---
 src/components/picker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/picker.js b/src/components/picker.js
index a42fdea..be954d0 100644
--- a/src/components/picker.js
+++ b/src/components/picker.js
@@ -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'