Browse Source

[Glitch] Fix emoji picker being always displayed

Port c402c291f4 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
closed-social-glitch-2
Takeshi Umeda 5 years ago
committed by ThibG
parent
commit
8f924eb961
2 changed files with 10 additions and 2 deletions
  1. +1
    -1
      app/javascript/flavours/glitch/features/compose/components/compose_form.js
  2. +9
    -1
      app/javascript/flavours/glitch/styles/components/composer.scss

+ 1
- 1
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>

+ 9
- 1
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;

Loading…
Cancel
Save