Merge branch 'Kerrick-textarea-height-fix'

adopted-ember-addons · Nov 2, 2016 · 4c5a8fb · 4c5a8fb
2 parents 4214ba0 + 785dd15
commit 4c5a8fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,7 @@ Contributions and pull requests are always welcome. Contributors may often be fo
 #### master
 - [#531](https://github.com/miguelcobain/ember-paper/pull/531) paper-select focus fix - doesn't call focusTarget.focus if there is no focusTarget (which is perfectly possible)
 - [#507](https://github.com/miguelcobain/ember-paper/issues/507) replace all instances of attribute based flex layout and replace with class based ones
+- [#469](https://github.com/miguelcobain/ember-paper/pull/469) Set the value before growing the textarea on render
 
 #### 1.0.0-alpha.6
 - [#395](https://github.com/miguelcobain/ember-paper/pull/395) The Great Update of paper-menu et al:

diff --git a/addon/components/paper-input.js b/addon/components/paper-input.js
@@ -72,9 +72,9 @@ export default Component.extend(FocusableMixin, ColorMixin, ChildMixin, Validati
 
   didRender() {
     this._super(...arguments);
-    this.growTextarea();
     // setValue below ensures that the input value is the same as this.value
     this.setValue(this.get('value'));
+    this.growTextarea();
   },
 
   willClearRender() {