marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[Glitch] Fix emoji picker being always displayed 

Port c402c291f4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
master
Takeshi Umeda 2019-06-06 19:30:14 +09:00 committed by ThibG
parent a5398c3df8
commit 8f924eb961
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/flavours/glitch/features/compose/components/compose_form.js
View File

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

10
app/javascript/flavours/glitch/styles/components/composer.scss
View File

@ -289,12 +289,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 {
display: block; display: block;
position: absolute; position: absolute;