]> cat aescling's git repositories - mastodon.git/commitdiff
Reset textarea height when press submit key (#2681)
authorYamagishi Kazutoshi <ykzts@desire.sh>
Tue, 2 May 2017 18:08:21 +0000 (03:08 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Tue, 2 May 2017 18:08:21 +0000 (20:08 +0200)
* Reset textarea height when press submit key

* dry

* DON'T NEED props

app/assets/javascripts/components/components/autosuggest_textarea.jsx
app/assets/javascripts/components/features/compose/components/compose_form.jsx

index d548eeeca916c779242d3f4ae5c2a639f4023549..9a4d5b7e32940318d1d44de35bccc80b90cfb91b 100644 (file)
@@ -58,7 +58,6 @@ class AutosuggestTextarea extends React.Component {
     }
 
     // auto-resize textarea
-    e.target.style.height = 'auto';
     e.target.style.height = `${e.target.scrollHeight}px`;
 
     this.props.onChange(e);
@@ -147,6 +146,10 @@ class AutosuggestTextarea extends React.Component {
     }
   }
 
+  reset () {
+    this.textarea.style.height = 'auto';
+  }
+
   render () {
     const { value, suggestions, disabled, placeholder, onKeyUp } = this.props;
     const { suggestionsHidden, selectedSuggestion } = this.state;
index 7955aaba9c8156a31440e186d0b274675c0ac22f..6bc811160c5771bb7af03fd2bfbd999cb7b1f197 100644 (file)
@@ -44,12 +44,12 @@ class ComposeForm extends React.PureComponent {
 
   handleKeyDown (e) {
     if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
-      this.props.onSubmit();
+      this.handleSubmit();
     }
   }
 
   handleSubmit () {
-    this.autosuggestTextarea.textarea.style.height = "auto";
+    this.autosuggestTextarea.reset();
     this.props.onSubmit();
   }