Block Editor: Ensure that blockType is defined when accessing `apiV…

…ersion` (#34346)
WordPress · Sep 1, 2021 · 0114164 · 0114164
1 parent 3b3339d
commit 0114164
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
@@ -111,11 +111,11 @@ function BlockListBlock( {
 
 	const blockType = getBlockType( name );
 	const lightBlockWrapper =
-		blockType.apiVersion > 1 ||
+		blockType?.apiVersion > 1 ||
 		hasBlockSupport( blockType, 'lightBlockWrapper', false );
 
 	// Determine whether the block has props to apply to the wrapper.
-	if ( blockType.getEditWrapperProps ) {
+	if ( blockType?.getEditWrapperProps ) {
 		wrapperProps = mergeWrapperProps(
 			wrapperProps,
 			blockType.getEditWrapperProps( attributes )

diff --git a/...ges/block-editor/src/components/block-list/use-block-props/use-block-custom-class-name.js b/...ges/block-editor/src/components/block-list/use-block-props/use-block-custom-class-name.js
@@ -33,7 +33,7 @@ export function useBlockCustomClassName( clientId ) {
 
 			const blockType = getBlockType( getBlockName( clientId ) );
 			const hasLightBlockWrapper =
-				blockType.apiVersion > 1 ||
+				blockType?.apiVersion > 1 ||
 				hasBlockSupport( blockType, 'lightBlockWrapper', false );
 
 			if ( ! hasLightBlockWrapper ) {