diff options
| author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2019-06-06 19:30:14 +0900 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-11-19 16:37:35 -0600 |
| commit | d602531a8f959ecde51e7b3051fffdf3c3bcc42e (patch) | |
| tree | cbbecef138ee9aa755733d7ebd95c874e5262967 /app | |
| parent | 168b4cf1b04b4d09dfe92f2f60fe0cab50cd2dcb (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')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 2 | ||||
| -rw-r--r-- | 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 8c6e4f158..ff22a2953 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -209,7 +209,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 312d59e6e..44e5335d9 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; |