diff options
| author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2019-06-06 19:30:14 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-06 12:30:14 +0200 |
| commit | c402c291f4991e2b021d8c13b557e6a8f650dcf3 (patch) | |
| tree | a06b15f7c62d70cc139ec98ece895279d5b73865 /app/javascript/mastodon/features/compose/components/compose_form.js | |
| parent | 8f3c32e29cf13a84b2f0a58da0ab0c99a88caad5 (diff) | |
Fix emoji picker being always displayed (#10979)
* Fix emoji picker being always displayed * Remove duplicate content with other pull-requests
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/compose_form.js')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 2 |
1 files changed, 1 insertions, 1 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> |