From 01e362316c5273ab5ae6acaa44834260b731fe57 Mon Sep 17 00:00:00 2001 From: ThibG Date: Sun, 16 Jun 2019 18:46:55 +0200 Subject: [PATCH] Do not scroll in the compose panel on single-column (#11093) --- .../mastodon/features/compose/components/compose_form.js | 3 ++- .../mastodon/features/ui/components/compose_panel.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index 60d6ce6733..c846ad6e7d 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -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(); } } diff --git a/app/javascript/mastodon/features/ui/components/compose_panel.js b/app/javascript/mastodon/features/ui/components/compose_panel.js index a05fbbe39c..c7821f473a 100644 --- a/app/javascript/mastodon/features/ui/components/compose_panel.js +++ b/app/javascript/mastodon/features/ui/components/compose_panel.js @@ -8,7 +8,7 @@ const ComposePanel = () => (
- +
);