tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Do not scroll in the compose panel on single-column

Browse Source
This commit is contained in:
Thibaut Girka 2019-06-16 16:02:26 +02:00 committed by ThibG
parent a29ab6f1bd
commit d3aaacb6d4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
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.

2
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>
);