mirrors
/
emoji-mart-lazyload
mirror of https://github.com/mashirozx/emoji-mart.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #270 from dwijesingheWR/master 

Fixed bug where selecting the first emoji search result with the ENTER KEY ignores skin tone selection
nolan/hinaloe-test
Nolan Lawson 2019-03-07 17:35:22 -08:00 committed by GitHub
parent bae7afb282 17db4cc913
commit 420e2c7e86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/picker/nimble-picker.js
View File

@ -6,7 +6,7 @@ import PropTypes from 'prop-types'
import * as icons from '../../svgs' import * as icons from '../../svgs'
import store from '../../utils/store' import store from '../../utils/store'
import frequently from '../../utils/frequently' import frequently from '../../utils/frequently'
import { deepMerge, measureScrollbar } from '../../utils' import { deepMerge, measureScrollbar, getSanitizedData } from '../../utils'
import { uncompress } from '../../utils/data' import { uncompress } from '../../utils/data'
import { PickerPropTypes, PickerDefaultProps } from '../../utils/shared-props' import { PickerPropTypes, PickerDefaultProps } from '../../utils/shared-props'
@ -396,7 +396,12 @@ export default class NimblePicker extends React.PureComponent {
if ( if (
this.SEARCH_CATEGORY.emojis && 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) this.handleEmojiSelect(emoji)
} }