Conditionally call focus when using getEditorRegion (WordPress#62980)

MaxMood96 · Jun 28, 2024 · 15da2aa · 15da2aa
1 parent ab116d8
commit 15da2aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packages/block-editor/src/components/block-breadcrumb/index.js b/packages/block-editor/src/components/block-breadcrumb/index.js
@@ -74,7 +74,7 @@ function BlockBreadcrumb( { rootLabelText } ) {
 
 							clearSelectedBlock();
 
-							getEditorRegion( blockEditor ).focus();
+							getEditorRegion( blockEditor )?.focus();
 						} }
 					>
 						{ rootLabel }

diff --git a/packages/block-editor/src/components/block-tools/index.js b/packages/block-editor/src/components/block-tools/index.js
@@ -162,7 +162,7 @@ export default function BlockTools( {
 			) {
 				event.preventDefault();
 				clearSelectedBlock();
-				getEditorRegion( __unstableContentRef.current ).focus();
+				getEditorRegion( __unstableContentRef.current )?.focus();
 			}
 		} else if ( isMatch( 'core/block-editor/collapse-list-view', event ) ) {
 			// If focus is currently within a text field, such as a rich text block or other editable field,