From feb4da874bdf702ebbc349e3f9255e9855cef72c Mon Sep 17 00:00:00 2001
From: Ken Powers <ken@signal.org>
Date: Thu, 30 May 2019 14:15:10 -0400
Subject: [PATCH] Enable keyboard navigation in EmojiPicker.

---
 js/views/conversation_view.js       |  1 -
 ts/components/emoji/EmojiPicker.tsx | 12 +++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 1794c77fc..bbbb9c9e3 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -1714,7 +1714,6 @@
       } else {
         textarea.value += colons;
       }
-      this.focusMessageField();
     },
 
     async setQuoteMessage(messageId) {
diff --git a/ts/components/emoji/EmojiPicker.tsx b/ts/components/emoji/EmojiPicker.tsx
index 06159f6e1..c61afbb49 100644
--- a/ts/components/emoji/EmojiPicker.tsx
+++ b/ts/components/emoji/EmojiPicker.tsx
@@ -130,7 +130,17 @@ export const EmojiPicker = React.memo(
               setSearchText('');
               setSearchMode(false);
               setScrollToRow(0);
-            } else if (!searchMode) {
+            } else if (
+              !searchMode &&
+              ![
+                'ArrowUp',
+                'ArrowDown',
+                'ArrowLeft',
+                'ArrowRight',
+                'Tab',
+                ' ', // Space
+              ].includes(e.key)
+            ) {
               onClose();
             }
           };