From e98e22600e2f1e49a719f71aca1fc47bb4c8f7a2 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 14 Nov 2017 20:06:55 -0500
Subject: [PATCH] RN-465 Fixed emoji autocomplete removing spaces before emoji
 (#1150)

---
 .../autocomplete/emoji_suggestion/emoji_suggestion.js          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
index d4bf71806..a380724e3 100644
--- a/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
+++ b/app/components/autocomplete/emoji_suggestion/emoji_suggestion.js
@@ -14,6 +14,7 @@ import Emoji from 'app/components/emoji';
 import {makeStyleSheetFromTheme, changeOpacity} from 'app/utils/theme';
 
 const EMOJI_REGEX = /(^|\s|^\+|^-)(:([^:\s]*))$/i;
+const EMOJI_REGEX_WITHOUT_PREFIX = /\B(:([^:\s]*))$/i;
 
 export default class EmojiSuggestion extends Component {
     static propTypes = {
@@ -81,7 +82,7 @@ export default class EmojiSuggestion extends Component {
             actions.addReactionToLatestPost(emoji, rootId);
             onChangeText('');
         } else {
-            let completedDraft = emojiPart.replace(EMOJI_REGEX, `:${emoji}: `);
+            let completedDraft = emojiPart.replace(EMOJI_REGEX_WITHOUT_PREFIX, `:${emoji}: `);
 
             if (value.length > cursorPosition) {
                 completedDraft += value.substring(cursorPosition);