diff options
| author | Takeshi Umeda <noel.yoshiba@gmail.com> | 2019-06-02 17:05:54 +0900 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2019-06-02 10:05:54 +0200 |
| commit | d93b82af87de90eaa29eb54a423722fb9fb45b38 (patch) | |
| tree | f71fac86a9f0fed2c26615f757a869d285ae2609 /app/javascript/mastodon/features/compose/components/compose_form.js | |
| parent | 2e13f2ac44c688ad87474dc6451243e1c443a7d8 (diff) | |
Improvement variable height in single column layout (#10917)
* Improvement variable height of compose and navigation panel in single column layout * Fix wrong quotes and missing commas
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/compose_form.js')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index cf82ef5a8..eff193929 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -200,29 +200,29 @@ class ComposeForm extends ImmutablePureComponent { /> </div> - <div className='compose-form__autosuggest-wrapper'> - <AutosuggestTextarea - ref={this.setAutosuggestTextarea} - placeholder={intl.formatMessage(messages.placeholder)} - disabled={disabled} - value={this.props.text} - onChange={this.handleChange} - suggestions={this.props.suggestions} - onKeyDown={this.handleKeyDown} - onSuggestionsFetchRequested={this.onSuggestionsFetchRequested} - onSuggestionsClearRequested={this.onSuggestionsClearRequested} - onSuggestionSelected={this.onSuggestionSelected} - onPaste={onPaste} - autoFocus={!showSearch && !isMobile(window.innerWidth)} - /> - + <div className='emoji-picker-wrapper'> <EmojiPickerDropdown onPickEmoji={this.handleEmojiPick} /> </div> - <div className='compose-form__modifiers'> - <UploadFormContainer /> - <PollFormContainer /> - </div> + <AutosuggestTextarea + ref={this.setAutosuggestTextarea} + placeholder={intl.formatMessage(messages.placeholder)} + disabled={disabled} + value={this.props.text} + onChange={this.handleChange} + suggestions={this.props.suggestions} + onKeyDown={this.handleKeyDown} + onSuggestionsFetchRequested={this.onSuggestionsFetchRequested} + onSuggestionsClearRequested={this.onSuggestionsClearRequested} + onSuggestionSelected={this.onSuggestionSelected} + onPaste={onPaste} + autoFocus={!showSearch && !isMobile(window.innerWidth)} + > + <div className='compose-form__modifiers'> + <UploadFormContainer /> + <PollFormContainer /> + </div> + </AutosuggestTextarea> <div className='compose-form__buttons-wrapper'> <div className='compose-form__buttons'> |