Fixed bug where selecting the first emoji search result with the ENTER key ignores skin-tone selection.

release
Dimitri Wijesinghe 2019-02-13 14:56:42 -05:00
parent 7c2e2a840b
commit 17db4cc913
1 changed files with 7 additions and 2 deletions

View File

@ -6,7 +6,7 @@ import PropTypes from 'prop-types'
import * as icons from '../../svgs'
import store from '../../utils/store'
import frequently from '../../utils/frequently'
import { deepMerge, measureScrollbar } from '../../utils'
import { deepMerge, measureScrollbar, getSanitizedData } from '../../utils'
import { uncompress } from '../../utils/data'
import { PickerPropTypes, PickerDefaultProps } from '../../utils/shared-props'
@ -396,7 +396,12 @@ export default class NimblePicker extends React.PureComponent {
if (
this.SEARCH_CATEGORY.emojis &&
(emoji = this.SEARCH_CATEGORY.emojis[0])
(emoji = getSanitizedData(
this.SEARCH_CATEGORY.emojis[0],
this.state.skin,
this.props.set,
this.props.data,
))
) {
this.handleEmojiSelect(emoji)
}