cleanup + ensure we unbind the event

WordPress · Mar 9, 2022 · 1473350 · 1473350
1 parent 552ac83
commit 1473350
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/packages/block-editor/src/components/iframe/index.js b/packages/block-editor/src/components/iframe/index.js
@@ -176,7 +176,7 @@ function Iframe(
 			const { contentDocument, ownerDocument } = node;
 			const { readyState, documentElement } = contentDocument;
 
-			if ( readyState !== 'complete' && readyState !== 'interactive' ) {
+			if ( readyState !== 'interactive' && readyState !== 'complete' ) {
 				return false;
 			}
 
@@ -204,9 +204,9 @@ function Iframe(
 		}
 
 		// Document set with srcDoc is not immediately ready.
-		node.addEventListener( 'load', () => {
-			setDocumentIfReady();
-		} );
+		node.addEventListener( 'load', setDocumentIfReady );
+
+		return () => node.removeEventListener( 'load', setDocumentIfReady );
 	}, [] );
 	const headRef = useRefEffect( ( element ) => {
 		scripts