From c402c291f4991e2b021d8c13b557e6a8f650dcf3 Mon Sep 17 00:00:00 2001
From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Thu, 6 Jun 2019 19:30:14 +0900
Subject: [PATCH] Fix emoji picker being always displayed (#10979)
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
---
.../features/compose/components/compose_form.js | 2 +-
app/javascript/styles/mastodon/components.scss | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index fb0c75fd3..531b28866 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@@ -208,7 +208,7 @@ class ComposeForm extends ImmutablePureComponent {
/>
</div>
- <div className='emoji-picker-wrapper'>
+ <div className={`emoji-picker-wrapper ${this.props.showSearch ? 'emoji-picker-wrapper--hidden' : ''}`}>
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
</div>
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index acb349a7c..543d20128 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -408,12 +408,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 {
box-sizing: border-box;
display: none;