Editable: Avoid unnecessary updateContent calls

blocks/components/editable/index.js

@@ -108,8 +108,9 @@ export default class Editable extends wp.element.Component {
 			return;
 		}
 
+		this.savedContent = this.getContent();
 		this.editor.save();
-		this.props.onChange( this.getContent() );
+		this.props.onChange( this.savedContent );
 	}
 
 	isStartOfEditor() {
@@ -216,7 +217,8 @@ export default class Editable extends wp.element.Component {
 
 	updateContent() {
 		const bookmark = this.editor.selection.getBookmark( 2, true );
-		this.setContent( this.props.value );
+		this.savedContent = this.props.value;
+		this.setContent( this.savedContent );
 		this.editor.selection.moveToBookmark( bookmark );
 		// Saving the editor on updates avoid unecessary onChanges calls
 		// These calls can make the focus jump
@@ -266,10 +268,13 @@ export default class Editable extends wp.element.Component {
 			this.focus();
 		}
 
+		// The savedContent var allows us to avoid updating the content right after an onChange call
 		if (
 			this.props.tagName === prevProps.tagName &&
 			this.props.value !== prevProps.value &&
-			! isEqual( this.props.value, prevProps.value )
+			this.props.value !== this.savedContent &&
+			! isEqual( this.props.value, prevProps.value ) &&
+			! isEqual( this.props.value, this.savedContent )
 		) {
 			this.updateContent();
 		}