From 14140a2daa8ad53f42a594b4587fb8e2808e66f8 Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Thu, 13 Jun 2019 17:07:43 +0200
Subject: [Glitch] Fix ordering of keyboard access between CW field, textarea
 and emoji picker

Port b4d67fe57af4d45082dc92eef20d5bb758bd8379 to glitch-soc
---
 .../flavours/glitch/features/compose/components/compose_form.js      | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'app/javascript/flavours/glitch/features/compose/components/compose_form.js')

diff --git a/app/javascript/flavours/glitch/features/compose/components/compose_form.js b/app/javascript/flavours/glitch/features/compose/components/compose_form.js
index 2ec77f61b..ba768c097 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js
@@ -350,10 +350,6 @@ class ComposeForm extends ImmutablePureComponent {
           />
         </div>
 
-        <div className={`emoji-picker-wrapper ${this.props.showSearch ? 'emoji-picker-wrapper--hidden' : ''}`}>
-          <EmojiPicker onPickEmoji={handleEmoji} />
-        </div>
-
         <AutosuggestTextarea
           ref={this.setAutosuggestTextarea}
           placeholder={nickname ? intl.formatMessage(messages.placeholder_as, { nickname: nickname }) : intl.formatMessage(messages.placeholder)}
@@ -369,6 +365,7 @@ class ComposeForm extends ImmutablePureComponent {
           onPaste={onPaste}
           autoFocus={!showSearch && !isMobile(window.innerWidth, layout)}
         >
+          <EmojiPicker onPickEmoji={handleEmoji} />
           <TextareaIcons advancedOptions={advancedOptions} />
           <div className='compose-form__modifiers'>
             <UploadFormContainer />
-- 
cgit