Merge pull request #270 from dwijesingheWR/master

Fixed bug where selecting the first emoji search result with the ENTER KEY ignores skin tone selection
missive · Mar 8, 2019 · 420e2c7 · 420e2c7
2 parents bae7afb + 17db4cc
commit 420e2c7
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/components/picker/nimble-picker.js b/src/components/picker/nimble-picker.js
@@ -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)
         }