ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Port b4d67fe57a to glitch-soc
rebase/4.0.0rc2
ThibG 2019-06-13 17:07:43 +02:00
parent d1edbfaed3
commit 80849812d2
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/flavours/glitch/features/compose/components/compose_form.js
View File

@ -337,10 +337,6 @@ class ComposeForm extends ImmutablePureComponent {
/> />
</div> </div>
<div className={`emoji-picker-wrapper ${this.props.showSearch ? 'emoji-picker-wrapper--hidden' : ''}`}>
<EmojiPicker onPickEmoji={handleEmoji} />
</div>
<AutosuggestTextarea <AutosuggestTextarea
ref={this.setAutosuggestTextarea} ref={this.setAutosuggestTextarea}
placeholder={intl.formatMessage(messages.placeholder)} placeholder={intl.formatMessage(messages.placeholder)}
@ -356,6 +352,7 @@ class ComposeForm extends ImmutablePureComponent {
onPaste={onPaste} onPaste={onPaste}
autoFocus={!showSearch && !isMobile(window.innerWidth, layout)} autoFocus={!showSearch && !isMobile(window.innerWidth, layout)}
> >
<EmojiPicker onPickEmoji={handleEmoji} />
<TextareaIcons advancedOptions={advancedOptions} /> <TextareaIcons advancedOptions={advancedOptions} />
<div className='compose-form__modifiers'> <div className='compose-form__modifiers'>
<UploadFormContainer /> <UploadFormContainer />

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

@ -222,7 +222,6 @@
position: absolute; position: absolute;
right: 5px; right: 5px;
top: 5px; top: 5px;
z-index: 1;
::-webkit-scrollbar-track:hover, ::-webkit-scrollbar-track:hover,
::-webkit-scrollbar-track:active { ::-webkit-scrollbar-track:active {
@ -294,15 +293,6 @@
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;