make templateAreas optional

WordPress · Nov 25, 2024 · 078d2f6 · 078d2f6
1 parent 1f47713
commit 078d2f6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 23 deletions.
diff --git a/packages/edit-site/src/components/editor/use-editor-title.js b/packages/edit-site/src/components/editor/use-editor-title.js
@@ -28,18 +28,14 @@ function useEditorTitle( postType, postId ) {
 				postId
 			);
 
-			const {
-				default_template_part_areas: templateAreas = [],
-				default_template_types: templateTypes = [],
-			} =
+			const { default_template_types: templateTypes = [] } =
 				select( coreStore ).getEntityRecord(
 					'root',
 					'__unstableBase'
 				) ?? {};
 
 			const templateInfo = getTemplateInfo( {
 				template: _record,
-				templateAreas,
 				templateTypes,
 			} );
 

diff --git a/packages/editor/src/components/document-bar/index.js b/packages/editor/src/components/document-bar/index.js
@@ -82,15 +82,11 @@ export default function DocumentBar( props ) {
 			_postId
 		);
 
-		const {
-			default_template_part_areas: templateAreas = [],
-			default_template_types: templateTypes = [],
-		} =
+		const { default_template_types: templateTypes = [] } =
 			select( coreStore ).getEntityRecord( 'root', '__unstableBase' ) ??
 			{};
 
 		const _templateInfo = getTemplateInfo( {
-			templateAreas,
 			templateTypes,
 			template: _document,
 		} );

diff --git a/packages/editor/src/components/entities-saved-states/entity-record-item.js b/packages/editor/src/components/entities-saved-states/entity-record-item.js
@@ -35,10 +35,7 @@ export default function EntityRecordItem( { record, checked, onChange } ) {
 				key
 			);
 
-			const {
-				default_template_part_areas: templateAreas = [],
-				default_template_types: templateTypes = [],
-			} =
+			const { default_template_types: templateTypes = [] } =
 				select( coreStore ).getEntityRecord(
 					'root',
 					'__unstableBase'
@@ -47,7 +44,6 @@ export default function EntityRecordItem( { record, checked, onChange } ) {
 			return {
 				entityRecordTitle: getTemplateInfo( {
 					template,
-					templateAreas,
 					templateTypes,
 				} ).title,
 				hasPostMetaChanges: unlock(

diff --git a/packages/editor/src/components/post-card-panel/index.js b/packages/editor/src/components/post-card-panel/index.js
@@ -38,10 +38,7 @@ export default function PostCardPanel( {
 				postId
 			);
 
-			const {
-				default_template_part_areas: templateAreas = [],
-				default_template_types: templateTypes = [],
-			} =
+			const { default_template_types: templateTypes = [] } =
 				select( coreStore ).getEntityRecord(
 					'root',
 					'__unstableBase'
@@ -53,7 +50,6 @@ export default function PostCardPanel( {
 			].includes( postType )
 				? getTemplateInfo( {
 						template: _record,
-						templateAreas,
 						templateTypes,
 				  } )
 				: {};

diff --git a/packages/editor/src/utils/get-template-info.js b/packages/editor/src/utils/get-template-info.js
@@ -12,7 +12,7 @@ const EMPTY_OBJECT = {};
  * Helper function to retrieve the corresponding template info for a given template.
  * @param {Object} params
  * @param {Array}  params.templateTypes
- * @param {Array}  params.templateAreas
+ * @param {Array}  [params.templateAreas]
  * @param {Object} params.template
  */
 export const getTemplateInfo = ( params ) => {
@@ -32,13 +32,13 @@ export const getTemplateInfo = ( params ) => {
 	const templateDescription =
 		typeof description === 'string' ? description : description?.raw;
 
-	const templateAreasWithIcon = templateAreas.map( ( item ) => ( {
+	const templateAreasWithIcon = templateAreas?.map( ( item ) => ( {
 		...item,
 		icon: getTemplatePartIcon( item.icon ),
 	} ) );
 
 	const templateIcon =
-		templateAreasWithIcon.find( ( item ) => area === item.area )?.icon ||
+		templateAreasWithIcon?.find( ( item ) => area === item.area )?.icon ||
 		layout;
 
 	return {