Merge pull request #1490 from ghalestrilo/fix/mobile-crash-on-leave-preview

catarak · web-flow · commit 97c3b3549c9a · 2020-07-06T15:20:39.000-04:00
Fixes #1487
diff --git a/client/modules/IDE/components/PreviewFrame.jsx b/client/modules/IDE/components/PreviewFrame.jsx
@@ -64,7 +64,8 @@ class PreviewFrame extends React.Component {
 
   componentWillUnmount() {
     window.removeEventListener('message', this.handleConsoleEvent);
-    ReactDOM.unmountComponentAtNode(this.iframeElement.contentDocument.body);
+    const iframeBody = this.iframeElement.contentDocument.body;
+    if (iframeBody) { ReactDOM.unmountComponentAtNode(iframeBody); }
   }
 
   handleConsoleEvent(messageEvent) {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@ class PreviewFrame extends React.Component {`
`64`	`64`
`65`	`65`	`componentWillUnmount() {`
`66`	`66`	`window.removeEventListener('message', this.handleConsoleEvent);`
`67`		`- ReactDOM.unmountComponentAtNode(this.iframeElement.contentDocument.body);`
	`67`	`+ const iframeBody = this.iframeElement.contentDocument.body;`
	`68`	`+ if (iframeBody) { ReactDOM.unmountComponentAtNode(iframeBody); }`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`handleConsoleEvent(messageEvent) {`