[Glitch] Fix emoji picker being always displayed

Port c402c291f4991e2b021d8c13b557e6a8f650dcf3 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>

2 files changed, 10 insertions, 2 deletions

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 87ab2aa04..52aa79b35 100644
--- a/app/javascript/flavours/glitch/features/compose/components/compose_form.js
+++ b/app/javascript/flavours/glitch/features/compose/components/compose_form.js
@@ -335,7 +335,7 @@ class ComposeForm extends ImmutablePureComponent {
           />
         </div>
 
-        <div className='emoji-picker-wrapper'>
+        <div className={`emoji-picker-wrapper ${this.props.showSearch ? 'emoji-picker-wrapper--hidden' : ''}`}>
           <EmojiPicker onPickEmoji={handleEmoji} />
         </div>
 
diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss
index b2603a008..746698c5b 100644
--- a/app/javascript/flavours/glitch/styles/components/composer.scss
+++ b/app/javascript/flavours/glitch/styles/components/composer.scss
@@ -289,12 +289,20 @@
   }
 }
 
-.emoji-picker-wrapper,
 .autosuggest-textarea__suggestions-wrapper {
   position: relative;
   height: 0;
 }
 
+.emoji-picker-wrapper {
+  position: relative;
+  height: 0;
+
+  &.emoji-picker-wrapper--hidden {
+    display: none;
+  }
+}
+
 .autosuggest-textarea__suggestions {
   display: block;
   position: absolute;