Block Inspector and Block Switcher: Refactor section block detection to improve handling of multiple selected blocks, ensuring accurate identification of section blocks in selection.

ramonjd · ramonjd · commit 8a109fbe47bc · 2025-09-18T13:49:54.000+10:00
diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js
@@ -47,6 +47,7 @@ function BlockInspector() {
 		selectedBlockClientId,
 		blockType,
 		isSectionBlock,
+		isSectionBlockInSelection,
 	} = useSelect( ( select ) => {
 		const {
 			getSelectedBlockClientId,
@@ -65,16 +66,17 @@ function BlockInspector() {
 		const _blockType =
 			_selectedBlockName && getBlockType( _selectedBlockName );
 		const selectedBlockClientIds = getSelectedBlockClientIds();
-		const isSectionInSelection = selectedBlockClientIds.some( ( id ) =>
-			_isSectionBlock( id )
+		const _isSectionBlockInSelection = selectedBlockClientIds.some(
+			( id ) => _isSectionBlock( id )
 		);
 
 		return {
 			count: getSelectedBlockCount(),
 			selectedBlockClientId: renderedBlockClientId,
 			selectedBlockName: _selectedBlockName,
 			blockType: _blockType,
-			isSectionBlock: isSectionInSelection,
+			isSectionBlockInSelection: _isSectionBlockInSelection,
+			isSectionBlock: _isSectionBlock( renderedBlockClientId ),
 		};
 	}, [] );
 
@@ -96,7 +98,7 @@ function BlockInspector() {
 
 	const hasSelectedBlocks = count > 1;
 
-	if ( hasSelectedBlocks && ! isSectionBlock ) {
+	if ( hasSelectedBlocks && ! isSectionBlockInSelection ) {
 		return (
 			<div className="block-editor-block-inspector">
 				<MultiSelectionInspector />
@@ -133,7 +135,7 @@ function BlockInspector() {
 		);
 	}
 
-	if ( hasSelectedBlocks && isSectionBlock ) {
+	if ( hasSelectedBlocks && isSectionBlockInSelection ) {
 		return (
 			<div className="block-editor-block-inspector">
 				<MultiSelectionInspector />
diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
@@ -199,7 +199,7 @@ export const BlockSwitcher = ( { clientIds } ) => {
 		isReusable,
 		isTemplate,
 		isDisabled,
-		isSection,
+		isSectionInSelection,
 	} = useSelect(
 		( select ) => {
 			const {
@@ -243,7 +243,7 @@ export const BlockSwitcher = ( { clientIds } ) => {
 				_icon = isSelectionOfSameType ? blockType.icon : copy;
 			}
 
-			const isSectionInSelection = clientIds.some( ( id ) =>
+			const _isSectionInSelection = clientIds.some( ( id ) =>
 				isSectionBlock( id )
 			);
 
@@ -259,7 +259,7 @@ export const BlockSwitcher = ( { clientIds } ) => {
 					_isSingleBlockSelected && isTemplatePart( _blocks[ 0 ] ),
 				hasContentOnlyLocking: _hasTemplateLock,
 				isDisabled: editingMode !== 'default',
-				isSection: isSectionInSelection,
+				isSectionInSelection: _isSectionInSelection,
 			};
 		},
 		[ clientIds ]
@@ -289,7 +289,8 @@ export const BlockSwitcher = ( { clientIds } ) => {
 			: undefined;
 
 	const hideTransformsForSections =
-		window?.__experimentalContentOnlyPatternInsertion && isSection;
+		window?.__experimentalContentOnlyPatternInsertion &&
+		isSectionInSelection;
 	const hideDropdown =
 		hideTransformsForSections ||
 		isDisabled ||
