Merge pull request #180 from rpellerin/master

Fix #179
zenoamaro · Apr 7, 2017 · fa44857 · fa44857
2 parents 5fdb6bf + a1071fb
commit fa44857
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/component.js b/src/component.js
@@ -143,12 +143,6 @@ var QuillComponent = React.createClass({
 	},
 
 	componentWillReceiveProps: function(nextProps, nextState) {
-		// If we need to regenerate the component, we can avoid a detailed
-		// in-place update step, and just let everything rerender.
-		if (this.shouldComponentRegenerate(nextProps, nextState)) {
-			return this.regenerate();
-		}
-
 		var editor = this.editor;
 
 		// If the component is unmounted and mounted too quickly
@@ -176,6 +170,12 @@ var QuillComponent = React.createClass({
 				this.setEditorReadOnly(editor, nextProps.readOnly);
 			}
 		}
+
+		// If we need to regenerate the component, we can avoid a detailed
+		// in-place update step, and just let everything rerender.
+		if (this.shouldComponentRegenerate(nextProps, nextState)) {
+			return this.regenerate();
+		}
 	},
 
 	componentDidMount: function() {