Blocks: Move the logic for Template Part label to the block (#28828)

WordPress · Feb 8, 2021 · eeea281 · eeea281
1 parent 64bd23a
commit eeea281
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/packages/block-library/src/template-part/index.js b/packages/block-library/src/template-part/index.js
@@ -6,6 +6,8 @@ import { startCase } from 'lodash';
 /**
  * WordPress dependencies
  */
+import { store as coreDataStore } from '@wordpress/core-data';
+import { select } from '@wordpress/data';
 import { __, _x } from '@wordpress/i18n';
 
 /**
@@ -23,6 +25,23 @@ export const settings = {
 		'Edit the different global regions of your site, like the header, footer, sidebar, or create your own.'
 	),
 	keywords: [ __( 'template part' ) ],
-	__experimentalLabel: ( { slug } ) => startCase( slug ),
+	__experimentalLabel: ( { slug, theme } ) => {
+		// Attempt to find entity title if block is a template part.
+		// Require slug to request, otherwise entity is uncreated and will throw 404.
+		if ( ! slug ) {
+			return;
+		}
+
+		const entity = select( coreDataStore ).getEntityRecord(
+			'postType',
+			'wp_template_part',
+			theme + '//' + slug
+		);
+		if ( ! entity ) {
+			return;
+		}
+
+		return startCase( entity.title?.rendered || entity.slug );
+	},
 	edit,
 };
diff --git a/packages/blocks/src/api/utils.js b/packages/blocks/src/api/utils.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { every, has, isFunction, isString, startCase, reduce } from 'lodash';
+import { every, has, isFunction, isString, reduce } from 'lodash';
 import { default as tinycolor, mostReadable } from 'tinycolor2';
 
 /**
@@ -10,7 +10,6 @@ import { default as tinycolor, mostReadable } from 'tinycolor2';
 import { Component, isValidElement } from '@wordpress/element';
 import { __, sprintf } from '@wordpress/i18n';
 import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
-import { select } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -141,19 +140,6 @@ export function normalizeBlockType( blockTypeOrName ) {
  * @return {string} The block label.
  */
 export function getBlockLabel( blockType, attributes, context = 'visual' ) {
-	// Attempt to find entity title if block is a template part.
-	// Require slug to request, otherwise entity is uncreated and will throw 404.
-	if ( 'core/template-part' === blockType.name && attributes.slug ) {
-		const entity = select( 'core' ).getEntityRecord(
-			'postType',
-			'wp_template_part',
-			attributes.theme + '//' + attributes.slug
-		);
-		if ( entity ) {
-			return startCase( entity.title?.rendered || entity.slug );
-		}
-	}
-
 	const { __experimentalLabel: getLabel, title } = blockType;
 
 	const label = getLabel && getLabel( attributes, { context } );