Merge branch 'master' into emoji4

release
Etienne Lemay 2017-05-27 11:03:41 -04:00
commit 92985ecf29
5 changed files with 496 additions and 494 deletions

View File

@ -26,7 +26,7 @@ import { Picker } from 'emoji-mart'
| ---- | :------: | ------- | ----------- | | ---- | :------: | ------- | ----------- |
| **autoFocus** | | `false` | Auto focus the search input when mounted | | **autoFocus** | | `false` | Auto focus the search input when mounted |
| **color** | | `#ae65c5` | The top bar anchors select and hover color | | **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. | | **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). | | **exclude** | | `[]` | Don't load excluded categories. Accepts [I18n categories keys](#i18n). |
| **emojiSize** | | `24` | The emoji width and height | | **emojiSize** | | `24` | The emoji width and height |

View File

@ -40,9 +40,8 @@
"karma-webpack": "^2.0.2", "karma-webpack": "^2.0.2",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"prop-types": "^15.5.8", "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", "rimraf": "2.5.2",
"svg-inline-loader": "0.4.1", "svg-inline-loader": "0.4.1",
"svg-inline-react": "1.0.2", "svg-inline-react": "1.0.2",

View File

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

View File

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

977
yarn.lock

File diff suppressed because it is too large Load Diff