Use section object

WordPress · Apr 21, 2022 · 698c1c2 · 698c1c2
1 parent 227c8e9
commit 698c1c2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 19 deletions.
diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
@@ -91,7 +91,7 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 						firstBlockName,
 						'__experimentalSection',
 						false
-					) && getBlockAttributes( clientId ).isSection,
+					) && !! getBlockAttributes( clientId ).section,
 			};
 		},
 		[ clientIds, blocks, blockInformation?.icon ]

diff --git a/packages/block-editor/src/components/block-title/test/index.js b/packages/block-editor/src/components/block-title/test/index.js
@@ -189,7 +189,7 @@ describe( 'BlockTitle', () => {
 	it( 'should return section title if the block supports it', () => {
 		useSelect.mockImplementation( () => ( {
 			name: 'name-with-section',
-			attributes: { isSection: true, sectionName: 'My custom section' },
+			attributes: { section: { name: 'My custom section' } },
 		} ) );
 
 		const wrapper = shallow(

diff --git a/packages/block-editor/src/components/block-title/use-block-display-title.js b/packages/block-editor/src/components/block-title/use-block-display-title.js
@@ -74,9 +74,7 @@ export default function useBlockDisplayTitle( clientId, maximumLength ) {
 
 	const sectionTitle =
 		hasBlockSupport( name, '__experimentalSection', false ) &&
-		attributes.isSection
-			? attributes.sectionName
-			: undefined;
+		attributes.section?.name;
 
 	const label = sectionTitle || reusableBlockTitle || blockLabel;
 	// Label will fallback to the title if no label is defined for the current

diff --git a/packages/block-editor/src/hooks/sections.js b/packages/block-editor/src/hooks/sections.js
@@ -18,22 +18,12 @@ import { hasBlockSupport } from '@wordpress/blocks';
  */
 export function addAttribute( settings ) {
 	if ( hasBlockSupport( settings, '__experimentalSection', false ) ) {
-		// Allow blocks to specify their own isSection attribute definition with default value if needed.
-		if ( ! has( settings.attributes, [ 'isSection' ] ) ) {
+		// Allow blocks to specify their own section attribute definition with default value if needed.
+		if ( ! has( settings.attributes, [ 'section' ] ) ) {
 			settings.attributes = {
 				...settings.attributes,
-				isSection: {
-					type: 'boolean',
-				},
-			};
-		}
-
-		// Allow blocks to specify their own sectionName attribute definition with default value if needed.
-		if ( ! has( settings.attributes, [ 'sectionName' ] ) ) {
-			settings.attributes = {
-				...settings.attributes,
-				sectionName: {
-					type: 'string',
+				section: {
+					type: 'object',
 				},
 			};
 		}