diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js index 13021a636459..c7d0ffaa06e3 100755 --- a/src/components/EmojiPicker/EmojiPickerMenu/index.js +++ b/src/components/EmojiPicker/EmojiPickerMenu/index.js @@ -307,7 +307,9 @@ function EmojiPickerMenu(props) { } const emoji = lodashGet(item, ['types', preferredSkinTone], item.code); onEmojiSelected(emoji, item); + // On web, avoid this Enter default input action; otherwise, it will add a new line in the subsequently focused composer. keyBoardEvent.preventDefault(); + // On mWeb, avoid propagating this Enter keystroke to Pressable child component; otherwise, it will trigger the onEmojiSelected callback again. keyBoardEvent.stopPropagation(); return; }