Merge branch 'master' into glitch-soc/merge-upstream

2019-06-16 21:09:19 +02:00
parent d3aaacb6d4 65efe892cf
commit 5717f75340
8 changed files with 59 additions and 92 deletions
--- a/app/javascript/mastodon/features/compose/components/compose_form.js
+++ b/app/javascript/mastodon/features/compose/components/compose_form.js
@ -61,6 +61,7 @@ class ComposeForm extends ImmutablePureComponent {
    onPickEmoji: PropTypes.func.isRequired,
    showSearch: PropTypes.bool,
    anyMedia: PropTypes.bool,
+    singleColumn: PropTypes.bool,
  };

  static defaultProps = {
@ -116,7 +117,7 @@ class ComposeForm extends ImmutablePureComponent {
  }

  handleFocus = () => {
-    if (this.composeForm) {
+    if (this.composeForm && !this.props.singleColumn) {
      this.composeForm.scrollIntoView();
    }
  }