Better check for the edit form ref, which exist only when isEditing.

WordPress · Apr 30, 2018 · 36ffa4c · 36ffa4c
1 parent e8de48e
commit 36ffa4c
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/core-blocks/block/edit-panel/index.js b/core-blocks/block/edit-panel/index.js
@@ -38,11 +38,8 @@ class SharedBlockEditPanel extends Component {
 	}
 
 	handleClickOutside( event ) {
-		if ( ! this.editForm.current ) {
-			return;
-		}
-
-		if ( ! this.editForm.current.contains( event.target ) ) {
+		// The form is rendered only when isEditing.
+		if ( this.props.isEditing && ! this.editForm.current.contains( event.target ) ) {
 			this.props.onCancel();
 		}
 	}