Merge remote-tracking branch 'durindo/master'

securingsincity · Oct 7, 2016 · c6d9e46 · c6d9e46
2 parents 7b28614 + b321fba
commit c6d9e46
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-ace",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "A react component for Ace Editor",
   "main": "lib/ace.js",
   "scripts": {

diff --git a/src/ace.jsx b/src/ace.jsx
@@ -180,8 +180,12 @@ export default class ReactAce extends Component {
     if (nextProps.focus && !oldProps.focus) {
       this.editor.focus();
     }
+    if(nextProps.height !== this.props.height){
+      this.editor.resize();
+    }
   }
 
+
   componentWillUnmount() {
     this.editor.destroy();
     this.editor = null;