Browse Source

Do not scroll in the compose panel on single-column

closed-social-glitch-2
Thibaut Girka 5 years ago
committed by ThibG
parent
commit
d3aaacb6d4
2 changed files with 5 additions and 3 deletions
  1. +4
    -2
      app/javascript/flavours/glitch/features/compose/components/compose_form.js
  2. +1
    -1
      app/javascript/flavours/glitch/features/ui/components/compose_panel.js

+ 4
- 2
app/javascript/flavours/glitch/features/compose/components/compose_form.js View File

@ -55,6 +55,7 @@ class ComposeForm extends ImmutablePureComponent {
onPickEmoji: PropTypes.func,
showSearch: PropTypes.bool,
anyMedia: PropTypes.bool,
singleColumn: PropTypes.bool,
advancedOptions: ImmutablePropTypes.map,
layout: PropTypes.string,
@ -195,7 +196,7 @@ class ComposeForm extends ImmutablePureComponent {
}
handleFocus = () => {
if (this.composeForm) {
if (this.composeForm && !this.props.singleColumn) {
this.composeForm.scrollIntoView();
}
}
@ -219,6 +220,7 @@ class ComposeForm extends ImmutablePureComponent {
preselectDate,
text,
preselectOnReply,
singleColumn,
} = this.props;
let selectionEnd, selectionStart;
@ -238,7 +240,7 @@ class ComposeForm extends ImmutablePureComponent {
if (textarea) {
textarea.setSelectionRange(selectionStart, selectionEnd);
textarea.focus();
textarea.scrollIntoView();
if (!singleColumn) textarea.scrollIntoView();
}
// Refocuses the textarea after submitting.

+ 1
- 1
app/javascript/flavours/glitch/features/ui/components/compose_panel.js View File

@ -8,7 +8,7 @@ const ComposePanel = () => (
<div className='compose-panel'>
<SearchContainer openInRoute />
<NavigationContainer />
<ComposeFormContainer />
<ComposeFormContainer singleColumn />
<LinkFooter withHotkeys />
</div>
);

Loading…
Cancel
Save