|
|
|
@ -157,7 +157,6 @@ class EmojiPickerMenu extends React.PureComponent {
|
|
|
|
|
intl: PropTypes.object.isRequired,
|
|
|
|
|
skinTone: PropTypes.number.isRequired,
|
|
|
|
|
onSkinTone: PropTypes.func.isRequired,
|
|
|
|
|
autoPlay: PropTypes.bool,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
static defaultProps = {
|
|
|
|
@ -235,7 +234,7 @@ class EmojiPickerMenu extends React.PureComponent {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
render () {
|
|
|
|
|
const { loading, style, intl, custom_emojis, autoPlay, skinTone, frequentlyUsedEmojis } = this.props;
|
|
|
|
|
const { loading, style, intl, custom_emojis, skinTone, frequentlyUsedEmojis } = this.props;
|
|
|
|
|
|
|
|
|
|
if (loading) {
|
|
|
|
|
return <div style={{ width: 299 }} />;
|
|
|
|
@ -250,7 +249,7 @@ class EmojiPickerMenu extends React.PureComponent {
|
|
|
|
|
perLine={8}
|
|
|
|
|
emojiSize={22}
|
|
|
|
|
sheetSize={32}
|
|
|
|
|
custom={buildCustomEmojis(custom_emojis, autoPlay)}
|
|
|
|
|
custom={buildCustomEmojis(custom_emojis)}
|
|
|
|
|
color=''
|
|
|
|
|
emoji=''
|
|
|
|
|
set='twitter'
|
|
|
|
@ -284,7 +283,6 @@ export default class EmojiPickerDropdown extends React.PureComponent {
|
|
|
|
|
static propTypes = {
|
|
|
|
|
custom_emojis: ImmutablePropTypes.list,
|
|
|
|
|
frequentlyUsedEmojis: PropTypes.arrayOf(PropTypes.string),
|
|
|
|
|
autoPlay: PropTypes.bool,
|
|
|
|
|
intl: PropTypes.object.isRequired,
|
|
|
|
|
onPickEmoji: PropTypes.func.isRequired,
|
|
|
|
|
onSkinTone: PropTypes.func.isRequired,
|
|
|
|
@ -346,7 +344,7 @@ export default class EmojiPickerDropdown extends React.PureComponent {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
render () {
|
|
|
|
|
const { intl, onPickEmoji, autoPlay, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
|
|
|
|
|
const { intl, onPickEmoji, onSkinTone, skinTone, frequentlyUsedEmojis } = this.props;
|
|
|
|
|
const title = intl.formatMessage(messages.emoji);
|
|
|
|
|
const { active, loading } = this.state;
|
|
|
|
|
|
|
|
|
@ -366,7 +364,6 @@ export default class EmojiPickerDropdown extends React.PureComponent {
|
|
|
|
|
loading={loading}
|
|
|
|
|
onClose={this.onHideDropdown}
|
|
|
|
|
onPick={onPickEmoji}
|
|
|
|
|
autoPlay={autoPlay}
|
|
|
|
|
onSkinTone={onSkinTone}
|
|
|
|
|
skinTone={skinTone}
|
|
|
|
|
frequentlyUsedEmojis={frequentlyUsedEmojis}
|
|
|
|
|