mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/1121/head^2
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, onPickEmoji: PropTypes.func.isRequired,
showSearch: PropTypes.bool, showSearch: PropTypes.bool,
anyMedia: PropTypes.bool, anyMedia: PropTypes.bool,
singleColumn: PropTypes.bool,
}; };
static defaultProps = { static defaultProps = {
@ -115,7 +116,7 @@ class ComposeForm extends ImmutablePureComponent {
} }
handleFocus = () => { handleFocus = () => {
if (this.composeForm) { if (this.composeForm && !this.props.singleColumn) {
this.composeForm.scrollIntoView(); 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'> <div className='compose-panel'>
<SearchContainer openInRoute /> <SearchContainer openInRoute />
<NavigationContainer /> <NavigationContainer />
<ComposeFormContainer /> <ComposeFormContainer singleColumn />
<LinkFooter withHotkeys /> <LinkFooter withHotkeys />
</div> </div>
); );