cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Fix ordering of keyboard access between CW field, textarea and emoji picker (#11066)

This commit is contained in:
ThibG 2019-06-13 17:07:43 +02:00 committed by Eugen Rochko
parent dd45c63921
commit b4d67fe57a
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,10 +210,6 @@ class ComposeForm extends ImmutablePureComponent {
/> />
</div> </div>
<div className={`emoji-picker-wrapper ${this.props.showSearch ? 'emoji-picker-wrapper--hidden' : ''}`}>
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
</div>
<AutosuggestTextarea <AutosuggestTextarea
ref={this.setAutosuggestTextarea} ref={this.setAutosuggestTextarea}
placeholder={intl.formatMessage(messages.placeholder)} placeholder={intl.formatMessage(messages.placeholder)}
@ -229,6 +225,7 @@ class ComposeForm extends ImmutablePureComponent {
onPaste={onPaste} onPaste={onPaste}
autoFocus={!showSearch && !isMobile(window.innerWidth)} autoFocus={!showSearch && !isMobile(window.innerWidth)}
> >
<EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} />
<div className='compose-form__modifiers'> <div className='compose-form__modifiers'>
<UploadFormContainer /> <UploadFormContainer />
<PollFormContainer /> <PollFormContainer />

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

@ -337,7 +337,6 @@
position: absolute; position: absolute;
top: 5px; top: 5px;
right: 5px; right: 5px;
z-index: 1;
} }
.compose-form__autosuggest-wrapper { .compose-form__autosuggest-wrapper {
@ -413,15 +412,6 @@
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;