about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/compose/components/compose_form.js
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-06-16 18:46:55 +0200
committerEugen Rochko <eugen@zeonfederated.com>2019-06-16 18:46:55 +0200
commit01e362316c5273ab5ae6acaa44834260b731fe57 (patch)
tree6a6791e36bd15db5df2c19861badcaf494406899 /app/javascript/mastodon/features/compose/components/compose_form.js
parent082812678411429e1c0d8ce628a428916bb7c703 (diff)
Do not scroll in the compose panel on single-column (#11093)
Diffstat (limited to 'app/javascript/mastodon/features/compose/components/compose_form.js')
-rw-r--r--app/javascript/mastodon/features/compose/components/compose_form.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js
index 60d6ce673..c846ad6e7 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();
     }
   }