Remove unnecessary code now that we use BlockTitle

WordPress · Feb 3, 2021 · b1371d0 · b1371d0
1 parent a5e572f
commit b1371d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
@@ -42,11 +42,9 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 		blockTitle,
 	} = useSelect(
 		( select ) => {
-			const {
-				getBlockRootClientId,
-				getBlockTransformItems,
-				__experimentalGetReusableBlockTitle,
-			} = select( blockEditorStore );
+			const { getBlockRootClientId, getBlockTransformItems } = select(
+				blockEditorStore
+			);
 
 			const { getBlockStyles, getBlockType } = select( blocksStore );
 			const rootClientId = getBlockRootClientId(
@@ -57,14 +55,8 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 			const styles =
 				_isSingleBlockSelected && getBlockStyles( firstBlockName );
 			let _icon;
-			let reusableBlockTitle;
 			if ( _isSingleBlockSelected ) {
 				_icon = blockInformation?.icon; // Take into account active block variations.
-				reusableBlockTitle =
-					isReusableBlock( blocks[ 0 ] ) &&
-					__experimentalGetReusableBlockTitle(
-						blocks[ 0 ].attributes.ref
-					);
 			} else {
 				const isSelectionOfSameType =
 					uniq( blocks.map( ( { name } ) => name ) ).length === 1;
@@ -82,8 +74,7 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 				),
 				hasBlockStyles: !! styles?.length,
 				icon: _icon,
-				blockTitle:
-					reusableBlockTitle || getBlockType( firstBlockName ).title,
+				blockTitle: getBlockType( firstBlockName ).title,
 			};
 		},
 		[ clientIds, blocks, blockInformation?.icon ]

diff --git a/packages/block-library/src/template-part/index.js b/packages/block-library/src/template-part/index.js
@@ -20,6 +20,6 @@ export { metadata, name };
 export const settings = {
 	title: _x( 'Template Part', 'block title' ),
 	keywords: [ __( 'template part' ) ],
-	__experimentalLabel: ( { title: slug } ) => startCase( slug ),
+	__experimentalLabel: ( slug ) => startCase( slug ),
 	edit,
 };