treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

Fix emoji picker being always displayed (#10979) 

* Fix emoji picker being always displayed

* Remove duplicate content with other pull-requests
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Takeshi Umeda 2019-06-06 19:30:14 +09:00 committed by Eugen Rochko
parent 8f3c32e29c
commit c402c291f4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/mastodon/features/compose/components/compose_form.js
View File

@ -208,7 +208,7 @@ class ComposeForm extends ImmutablePureComponent {
/> />
</div> </div>
<div className='emoji-picker-wrapper'> <div className={`emoji-picker-wrapper ${this.props.showSearch ? 'emoji-picker-wrapper--hidden' : ''}`}>
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} /> <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
</div> </div>

10
app/javascript/styles/mastodon/components.scss
View File

@ -408,12 +408,20 @@
} }
} }
.emoji-picker-wrapper,
.autosuggest-textarea__suggestions-wrapper { .autosuggest-textarea__suggestions-wrapper {
position: relative; position: relative;
height: 0; height: 0;
} }
.emoji-picker-wrapper {
position: relative;
height: 0;
&.emoji-picker-wrapper--hidden {
display: none;
}
}
.autosuggest-textarea__suggestions { .autosuggest-textarea__suggestions {
box-sizing: border-box; box-sizing: border-box;
display: none; display: none;