Merge branch 'master' into emoji4

README.md

@@ -26,7 +26,7 @@ import { Picker } from 'emoji-mart'
 | ---- | :------: | ------- | ----------- |
 | **autoFocus** | | `false` | Auto focus the search input when mounted |
 | **color** | | `#ae65c5` | The top bar anchors select and hover color |
-| **emoji** | | `department_store` | The emoji shown when no emojis are hovered |
+| **emoji** | | `department_store` | The emoji shown when no emojis are hovered, set to an empty string to show nothing |
 | **include** | | `[]` | Only load included categories. Accepts [I18n categories keys](#i18n). Order will be respected, except for the `recent` category which will always be the first. |
 | **exclude** | | `[]` | Don't load excluded categories. Accepts [I18n categories keys](#i18n). |
 | **emojiSize** | | `24` | The emoji width and height |

package.json

@@ -40,9 +40,8 @@
     "karma-webpack": "^2.0.2",
     "mkdirp": "0.5.1",
     "prop-types": "^15.5.8",
-    "react": "15.2.0",
+    "react": "^15.5.4",
-    "react-addons-test-utils": "15.2.0",
+    "react-dom": "^15.5.4",
-    "react-dom": "15.2.0",
     "rimraf": "2.5.2",
     "svg-inline-loader": "0.4.1",
     "svg-inline-react": "1.0.2",

src/components/pickerSpec.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import TestUtils from 'react-addons-test-utils';
+import TestUtils from 'react-dom/test-utils';
 import Picker from './picker';
 
 const {

src/components/preview.js

@@ -53,10 +53,10 @@ export default class Preview extends React.Component {
     } else {
       return <div className='emoji-mart-preview'>
         <div className='emoji-mart-preview-emoji'>
-          <Emoji
+          {idleEmoji.length > 0 && <Emoji
             emoji={idleEmoji}
             {...emojiProps}
-          />
+          />}
         </div>
 
         <div className='emoji-mart-preview-data'>