diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-13 17:07:43 +0200 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-13 17:07:43 +0200 |
| commit | b4d67fe57af4d45082dc92eef20d5bb758bd8379 (patch) | |
| tree | 5ba55fdedf8fcda7ac60b989bfb9be3eeeb84e91 /app/javascript/mastodon/features/compose/components/compose_form.js | |
| parent | dd45c63921f6f64096fa6a1693cc84d6aa33c54f (diff) | |
Fix ordering of keyboard access between CW field, textarea and emoji picker (#11066)
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/compose_form.js')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 558b7068b..60d6ce673 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -210,10 +210,6 @@ class ComposeForm extends ImmutablePureComponent { /> </div> - <div className={`emoji-picker-wrapper ${this.props.showSearch ? 'emoji-picker-wrapper--hidden' : ''}`}> - <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} /> - </div> - <AutosuggestTextarea ref={this.setAutosuggestTextarea} placeholder={intl.formatMessage(messages.placeholder)} @@ -229,6 +225,7 @@ class ComposeForm extends ImmutablePureComponent { onPaste={onPaste} autoFocus={!showSearch && !isMobile(window.innerWidth)} > + <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} /> <div className='compose-form__modifiers'> <UploadFormContainer /> <PollFormContainer /> |