fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-29 20:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not scroll in the compose panel on single-column (#11093)

Browse source
This commit is contained in:
ThibG 2019-06-16 18:46:55 +02:00 committed by Eugen Rochko
parent 0828126784
commit 01e362316c
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/javascript/mastodon/features/compose/components/compose_form.js
View file

@ -60,6 +60,7 @@ class ComposeForm extends ImmutablePureComponent {
onPickEmoji: PropTypes.func.isRequired,
showSearch: PropTypes.bool,
anyMedia: PropTypes.bool,
singleColumn: PropTypes.bool,
};
static defaultProps = {
@ -115,7 +116,7 @@ class ComposeForm extends ImmutablePureComponent {
}
handleFocus = () => {
if (this.composeForm) {
if (this.composeForm && !this.props.singleColumn) {
this.composeForm.scrollIntoView();
}
}

2
app/javascript/mastodon/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>
);