From 9382b2a424503502b309e88f66b6d69d0b6d3937 Mon Sep 17 00:00:00 2001
From: Mario Santos <santosguillamot@gmail.com>
Date: Wed, 4 Sep 2024 17:05:41 +0200
Subject: [PATCH 1/2] Inherit post type from template slug

---
 .../editor/src/components/provider/index.js   | 50 +++++++++++++++----
 1 file changed, 40 insertions(+), 10 deletions(-)

diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
index aaf25621d3324..654fecf2d3ecf 100644
--- a/packages/editor/src/components/provider/index.js
+++ b/packages/editor/src/components/provider/index.js
@@ -4,7 +4,11 @@
 import { useEffect, useLayoutEffect, useMemo } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
-import { EntityProvider, useEntityBlockEditor } from '@wordpress/core-data';
+import {
+	EntityProvider,
+	useEntityBlockEditor,
+	store as coreStore,
+} from '@wordpress/core-data';
 import {
 	BlockEditorProvider,
 	BlockContextProvider,
@@ -48,7 +52,6 @@ const noop = () => {};
  */
 const NON_CONTEXTUAL_POST_TYPES = [
 	'wp_block',
-	'wp_template',
 	'wp_navigation',
 	'wp_template_part',
 ];
@@ -161,31 +164,57 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 		BlockEditorProviderComponent = ExperimentalBlockEditorProvider,
 		__unstableTemplate: template,
 	} ) => {
-		const { editorSettings, selection, isReady, mode } = useSelect(
-			( select ) => {
+		const { editorSettings, selection, isReady, mode, postTypes } =
+			useSelect( ( select ) => {
 				const {
 					getEditorSettings,
 					getEditorSelection,
 					getRenderingMode,
 					__unstableIsEditorReady,
 				} = select( editorStore );
+				const { getPostTypes } = select( coreStore );
+
 				return {
 					editorSettings: getEditorSettings(),
 					isReady: __unstableIsEditorReady(),
 					mode: getRenderingMode(),
 					selection: getEditorSelection(),
+					postTypes:
+						getPostTypes( { per_page: -1 } )?.map(
+							( entity ) => entity.slug
+						) || [],
 				};
-			},
-			[]
-		);
+			}, [] );
 		const shouldRenderTemplate = !! template && mode !== 'post-only';
 		const rootLevelPost = shouldRenderTemplate ? template : post;
 		const defaultBlockContext = useMemo( () => {
-			const postContext =
+			const postContext = {};
+			// If it is a template, try to inherit the post type from the slug.
+			if ( post.type === 'wp_template' ) {
+				if ( ! post.is_custom ) {
+					const [ kind ] = post.slug.split( '-' );
+					switch ( kind ) {
+						case 'page':
+							postContext.postType = 'page';
+							break;
+						case 'single':
+							// Infer the post type from the slug.
+							const match = post.slug.match(
+								`^single-(${ postTypes.join( '|' ) })(?:-.+)?$`
+							);
+							if ( match ) {
+								postContext.postType = match[ 1 ];
+							}
+							break;
+					}
+				}
+			} else if (
 				! NON_CONTEXTUAL_POST_TYPES.includes( rootLevelPost.type ) ||
 				shouldRenderTemplate
-					? { postId: post.id, postType: post.type }
-					: {};
+			) {
+				postContext.postId = post.id;
+				postContext.postType = post.type;
+			}
 
 			return {
 				...postContext,
@@ -200,6 +229,7 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 			post.type,
 			rootLevelPost.type,
 			rootLevelPost.slug,
+			postTypes,
 		] );
 		const { id, type } = rootLevelPost;
 		const blockEditorSettings = useBlockEditorSettings(

From ac443f526aac7bc3f2f2cf949e0582b0cd186f34 Mon Sep 17 00:00:00 2001
From: Mario Santos <santosguillamot@gmail.com>
Date: Thu, 5 Sep 2024 10:29:21 +0200
Subject: [PATCH 2/2] Move map outside of `useSelect`

---
 packages/editor/src/components/provider/index.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/editor/src/components/provider/index.js b/packages/editor/src/components/provider/index.js
index 654fecf2d3ecf..11b1478d58434 100644
--- a/packages/editor/src/components/provider/index.js
+++ b/packages/editor/src/components/provider/index.js
@@ -179,10 +179,7 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 					isReady: __unstableIsEditorReady(),
 					mode: getRenderingMode(),
 					selection: getEditorSelection(),
-					postTypes:
-						getPostTypes( { per_page: -1 } )?.map(
-							( entity ) => entity.slug
-						) || [],
+					postTypes: getPostTypes( { per_page: -1 } ),
 				};
 			}, [] );
 		const shouldRenderTemplate = !! template && mode !== 'post-only';
@@ -199,8 +196,13 @@ export const ExperimentalEditorProvider = withRegistryProvider(
 							break;
 						case 'single':
 							// Infer the post type from the slug.
+							const postTypesSlugs =
+								postTypes?.map( ( entity ) => entity.slug ) ||
+								[];
 							const match = post.slug.match(
-								`^single-(${ postTypes.join( '|' ) })(?:-.+)?$`
+								`^single-(${ postTypesSlugs.join(
+									'|'
+								) })(?:-.+)?$`
 							);
 							if ( match ) {
 								postContext.postType = match[ 1 ];