Fix ordering of keyboard access between CW field, textarea and emoji picker

build-json
ThibG 2021-08-28 14:26:20 +02:00 zatwierdzone przez marcin mikołajczak
rodzic 4b4e815e40
commit 2ef0cdb71b
3 zmienionych plików z 2 dodań i 11 usunięć

Wyświetl plik

@ -314,10 +314,6 @@ export default class ComposeForm extends ImmutablePureComponent {
/> />
</div> </div>
<div className='emoji-picker-wrapper'>
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
</div>
<AutosuggestTextarea <AutosuggestTextarea
ref={(isModalOpen && shouldCondense) ? null : this.setAutosuggestTextarea} ref={(isModalOpen && shouldCondense) ? null : this.setAutosuggestTextarea}
placeholder={intl.formatMessage(messages.placeholder)} placeholder={intl.formatMessage(messages.placeholder)}
@ -333,6 +329,7 @@ export default class ComposeForm extends ImmutablePureComponent {
onPaste={onPaste} onPaste={onPaste}
autoFocus={shouldAutoFocus} autoFocus={shouldAutoFocus}
> >
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
{ {
!condensed && !condensed &&
<div className='compose-form__modifiers'> <div className='compose-form__modifiers'>

Wyświetl plik

@ -62,9 +62,8 @@
.emoji-picker-dropdown { .emoji-picker-dropdown {
position: absolute; position: absolute;
top: 5px; top: 10px;
right: 5px; right: 5px;
z-index: 1;
} }
.compose-form__autosuggest-wrapper { .compose-form__autosuggest-wrapper {
@ -141,7 +140,6 @@
} }
} }
.emoji-picker-wrapper,
.autosuggest-textarea__suggestions-wrapper { .autosuggest-textarea__suggestions-wrapper {
position: relative; position: relative;
height: 0; height: 0;

Wyświetl plik

@ -148,10 +148,6 @@
padding: 20px; padding: 20px;
margin-bottom: 20px; margin-bottom: 20px;
.emoji-picker-wrapper {
.emoji-picker-dropdown { top: 10px; }
}
.compose-form { .compose-form {
flex: 1 1; flex: 1 1;
padding: 0 0 0 20px !important; padding: 0 0 0 20px !important;