Avoid passing undefined selectedBlockClientId in BlockActionsMenu (…

…#52595) When determining if the block is groupable/ungroupable, we now avoid passing an undefined value which leads to a crash.
WordPress · Jul 13, 2023 · 2001df4 · 2001df4 · github-actions · Jul 13, 2023
1 parent c7391e1
commit 2001df4
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/packages/block-editor/src/components/block-toolbar/block-toolbar-menu.native.js b/packages/block-editor/src/components/block-toolbar/block-toolbar-menu.native.js
@@ -100,9 +100,11 @@ const BlockActionsMenu = ( {
 	} = getMoversSetup( isStackedHorizontally, moversOptions );
 
 	// Check if selected block is Groupable and/or Ungroupable.
-	const convertToGroupButtonProps = useConvertToGroupButtonProps( [
-		selectedBlockClientId,
-	] );
+	const convertToGroupButtonProps = useConvertToGroupButtonProps(
+		// `selectedBlockClientId` can be undefined in some cases where this
+		// component gets re-rendered right after the block is removed.
+		selectedBlockClientId ? [ selectedBlockClientId ] : []
+	);
 	const { isGroupable, isUngroupable } = convertToGroupButtonProps;
 	const showConvertToGroupButton =
 		( isGroupable || isUngroupable ) && canRemove;