From efcbf996d6458d0be199ca645a16a194f0c4d33e Mon Sep 17 00:00:00 2001 From: Ben Gotow Date: Sat, 3 Nov 2018 19:34:42 -0700 Subject: [PATCH] Require three characters to match :100, :1234 to avoid catching times #1148 --- app/src/components/composer-editor/emoji-plugins.jsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/components/composer-editor/emoji-plugins.jsx b/app/src/components/composer-editor/emoji-plugins.jsx index 3329d7f68..9a57f581a 100644 --- a/app/src/components/composer-editor/emoji-plugins.jsx +++ b/app/src/components/composer-editor/emoji-plugins.jsx @@ -252,10 +252,15 @@ function onKeyUp(event, change, editor) { } let suggestions = []; let picked = emoji.data.get('picked'); + if (typed.length >= 3) { - suggestions = getEmojiSuggestions(typed.replace(':', '')); - const pickedIdx = suggestions.indexOf(picked); - picked = suggestions[pickedIdx === -1 ? 0 : pickedIdx]; + const typedEmoji = typed.replace(':', ''); + const isNumeric = `${typedEmoji / 1}` === typedEmoji; + if (!isNumeric || typedEmoji.length >= 3) { + suggestions = getEmojiSuggestions(typedEmoji); + const pickedIdx = suggestions.indexOf(picked); + picked = suggestions[pickedIdx === -1 ? 0 : pickedIdx]; + } } updateEmojiMark(change, emoji, { typed, suggestions, picked }); }