Show preview panel when showPreview is false but showSkinTones is true.
This is necessary in order to be able to show skin tone picker even when one desires for the mouseover preview to be invisible. This is an important case because mouseover displays must be disabled in order to enable single click emoji typing on iOS without disabling the skin tone picker.release
parent
7c2e2a840b
commit
caba7d0b34
|
@ -560,7 +560,7 @@ export default class NimblePicker extends React.PureComponent {
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{showPreview && (
|
{(showPreview || showSkinTones) && (
|
||||||
<div className="emoji-mart-bar">
|
<div className="emoji-mart-bar">
|
||||||
<Preview
|
<Preview
|
||||||
ref={this.setPreviewRef}
|
ref={this.setPreviewRef}
|
||||||
|
@ -568,6 +568,7 @@ export default class NimblePicker extends React.PureComponent {
|
||||||
title={title}
|
title={title}
|
||||||
emoji={emoji}
|
emoji={emoji}
|
||||||
showSkinTones={showSkinTones}
|
showSkinTones={showSkinTones}
|
||||||
|
showPreview={showPreview}
|
||||||
emojiProps={{
|
emojiProps={{
|
||||||
native: native,
|
native: native,
|
||||||
size: 38,
|
size: 38,
|
||||||
|
|
|
@ -23,9 +23,10 @@ export default class Preview extends React.PureComponent {
|
||||||
title,
|
title,
|
||||||
emoji: idleEmoji,
|
emoji: idleEmoji,
|
||||||
i18n,
|
i18n,
|
||||||
|
showPreview,
|
||||||
} = this.props
|
} = this.props
|
||||||
|
|
||||||
if (emoji) {
|
if (emoji && showPreview) {
|
||||||
var emojiData = getData(emoji, null, null, this.data),
|
var emojiData = getData(emoji, null, null, this.data),
|
||||||
{ emoticons = [] } = emojiData,
|
{ emoticons = [] } = emojiData,
|
||||||
knownEmoticons = [],
|
knownEmoticons = [],
|
||||||
|
|
Loading…
Reference in New Issue