diff --git a/src/components/EmojiPicker/EmojiPickerMenuItem/index.js b/src/components/EmojiPicker/EmojiPickerMenuItem/index.js index 728e56792ddb..b51a8b07537c 100644 --- a/src/components/EmojiPicker/EmojiPickerMenuItem/index.js +++ b/src/components/EmojiPicker/EmojiPickerMenuItem/index.js @@ -72,15 +72,16 @@ class EmojiPickerMenuItem extends PureComponent { this.props.onPress(this.props.emoji)} + onPressOut={Browser.isMobile() ? this.props.onHoverOut : undefined} onHoverIn={this.props.onHoverIn} onHoverOut={this.props.onHoverOut} onFocus={this.props.onFocus} onBlur={this.props.onBlur} ref={(ref) => (this.ref = ref)} style={({pressed}) => [ - Browser.isMobile() && StyleUtils.getButtonBackgroundColorStyle(getButtonState(false, pressed)), this.props.isHighlighted && this.props.isUsingKeyboardMovement ? styles.emojiItemKeyboardHighlighted : {}, this.props.isHighlighted && !this.props.isUsingKeyboardMovement ? styles.emojiItemHighlighted : {}, + Browser.isMobile() && StyleUtils.getButtonBackgroundColorStyle(getButtonState(false, pressed)), styles.emojiItem, ]} accessibilityLabel={this.props.emoji} diff --git a/src/components/Pressable/GenericPressable/BaseGenericPressable.js b/src/components/Pressable/GenericPressable/BaseGenericPressable.js index 0c5b75b1bb13..9bb221b2de1e 100644 --- a/src/components/Pressable/GenericPressable/BaseGenericPressable.js +++ b/src/components/Pressable/GenericPressable/BaseGenericPressable.js @@ -5,6 +5,7 @@ import _ from 'underscore'; import Accessibility from '../../../libs/Accessibility'; import HapticFeedback from '../../../libs/HapticFeedback'; import KeyboardShortcut from '../../../libs/KeyboardShortcut'; +import * as Browser from '../../../libs/Browser'; import styles from '../../../styles/styles'; import genericPressablePropTypes from './PropTypes'; import CONST from '../../../CONST'; @@ -127,13 +128,15 @@ const GenericPressable = forwardRef((props, ref) => { return KeyboardShortcut.subscribe(shortcutKey, onPressHandler, descriptionKey, modifiers, true, false, 0, false); }, [keyboardShortcut, onPressHandler]); + const defaultLongPressHandler = Browser.isMobileChrome() ? () => {} : undefined; return ( ({ paddingTop: 2, paddingBottom: 2, height: CONST.EMOJI_PICKER_ITEM_HEIGHT, + ...userSelect.userSelectNone, }, emojiItemHighlighted: {