From d668e46831de9709f3588bd76ec89538a325ad88 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Tue, 27 Sep 2022 16:59:49 +1300
Subject: [PATCH 1/2] Add some guards to prevent crashing if some vars no
 longer defined

---
 .../src/components/block-parent-selector/index.js             | 4 ++--
 .../block-editor/src/components/block-popover/inbetween.js    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/block-editor/src/components/block-parent-selector/index.js b/packages/block-editor/src/components/block-parent-selector/index.js
index 8d24ba26794d5..caf488ac06ec6 100644
--- a/packages/block-editor/src/components/block-parent-selector/index.js
+++ b/packages/block-editor/src/components/block-parent-selector/index.js
@@ -83,10 +83,10 @@ export default function BlockParentSelector() {
 				label={ sprintf(
 					/* translators: %s: Name of the block's parent. */
 					__( 'Select %s' ),
-					blockInformation.title
+					blockInformation?.title
 				) }
 				showTooltip
-				icon={ <BlockIcon icon={ blockInformation.icon } /> }
+				icon={ <BlockIcon icon={ blockInformation?.icon } /> }
 			/>
 		</div>
 	);
diff --git a/packages/block-editor/src/components/block-popover/inbetween.js b/packages/block-editor/src/components/block-popover/inbetween.js
index e7e207cb733f1..30964a8c667da 100644
--- a/packages/block-editor/src/components/block-popover/inbetween.js
+++ b/packages/block-editor/src/components/block-popover/inbetween.js
@@ -218,7 +218,7 @@ function BlockPopoverInbetween( {
 	}, [ nextElement ] );
 
 	useLayoutEffect( () => {
-		if ( ! previousElement ) {
+		if ( ! previousElement?.ownerDocument?.defaultView ) {
 			return;
 		}
 		previousElement.ownerDocument.defaultView.addEventListener(

From 667bb275903762ec695d073285cfaef0533a3fe9 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@automattic.com>
Date: Tue, 27 Sep 2022 17:10:48 +1300
Subject: [PATCH 2/2] Go back to just the guard in the return call

---
 .../block-editor/src/components/block-popover/inbetween.js    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/block-popover/inbetween.js b/packages/block-editor/src/components/block-popover/inbetween.js
index 30964a8c667da..ae8a3b3203800 100644
--- a/packages/block-editor/src/components/block-popover/inbetween.js
+++ b/packages/block-editor/src/components/block-popover/inbetween.js
@@ -218,7 +218,7 @@ function BlockPopoverInbetween( {
 	}, [ nextElement ] );
 
 	useLayoutEffect( () => {
-		if ( ! previousElement?.ownerDocument?.defaultView ) {
+		if ( ! previousElement ) {
 			return;
 		}
 		previousElement.ownerDocument.defaultView.addEventListener(
@@ -226,7 +226,7 @@ function BlockPopoverInbetween( {
 			forcePopoverRecompute
 		);
 		return () => {
-			previousElement.ownerDocument.defaultView.removeEventListener(
+			previousElement.ownerDocument.defaultView?.removeEventListener(
 				'resize',
 				forcePopoverRecompute
 			);