Deal with the component unmounting while a fetch is ongoing

WordPress · Jun 1, 2017 · ea6ff87 · ea6ff87
1 parent 42172c0
commit ea6ff87
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/blocks/library/embed/index.js b/blocks/library/embed/index.js
@@ -91,6 +91,11 @@ registerBlock( 'core/embed', {
 			}
 		}
 
+		componentWillUnmount() {
+			// can't about the fetch promise, so let it know we will unmount
+			this.unmounting = true;
+		}
+
 		doServerSideRender( event ) {
 			if ( event ) {
 				event.preventDefault();
@@ -103,6 +108,9 @@ registerBlock( 'core/embed', {
 				credentials: 'include',
 			} ).then(
 				( response ) => {
+					if ( this.unmounting ) {
+						return;
+					}
 					response.json().then( ( obj ) => {
 						const { html, type } = obj;
 						if ( html ) {