set the template on click

WordPress · Sep 26, 2023 · b0e1bcf · b0e1bcf
1 parent 35476e4
commit b0e1bcf
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/packages/edit-site/src/components/sidebar-edit-mode/page-panels/hooks.js b/packages/edit-site/src/components/sidebar-edit-mode/page-panels/hooks.js
@@ -101,21 +101,18 @@ function injectThemeAttributeInBlockTemplateContent(
 	block,
 	currentThemeStylesheet
 ) {
-	if (
-		block.innerBlocks.find(
-			( innerBlock ) => innerBlock.name === 'core/template-part'
-		)
-	) {
-		block.innerBlocks = block.innerBlocks.map( ( innerBlock ) => {
-			if (
-				innerBlock.name === 'core/template-part' &&
-				innerBlock.attributes.theme === undefined
-			) {
-				innerBlock.attributes.theme = currentThemeStylesheet;
-			}
-			return innerBlock;
-		} );
-	}
+	block.innerBlocks = block.innerBlocks.map( ( innerBlock ) => {
+		if (
+			innerBlock.name === 'core/template-part' &&
+			innerBlock.attributes.theme === undefined
+		) {
+			innerBlock.attributes.theme = currentThemeStylesheet;
+		}
+		return injectThemeAttributeInBlockTemplateContent(
+			innerBlock,
+			currentThemeStylesheet
+		);
+	} );
 
 	if (
 		block.name === 'core/template-part' &&

diff --git a/...ages/edit-site/src/components/sidebar-edit-mode/template-panel/replace-template-button.js b/...ages/edit-site/src/components/sidebar-edit-mode/template-panel/replace-template-button.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { useSelect } from '@wordpress/data';
+import { useSelect, useDispatch } from '@wordpress/data';
 import { useState, useCallback } from '@wordpress/element';
 import { __experimentalBlockPatternsList as BlockPatternsList } from '@wordpress/block-editor';
 import { MenuItem, Modal } from '@wordpress/components';
@@ -16,8 +16,10 @@ import { store as editSiteStore } from '../../../store';
 
 export default function ReplaceTemplateButton( {
 	onClick,
+	template,
 	availableTemplates,
 } ) {
+	const { setTemplate } = useDispatch( editSiteStore );
 	const [ showModal, setShowModal ] = useState( false );
 	const onClose = useCallback( () => {
 		setShowModal( false );
@@ -30,12 +32,12 @@ export default function ReplaceTemplateButton( {
 		};
 	}, [] );
 
-	const entitiy = useEntityRecord( 'postType', postType, postId );
-
+	const entity = useEntityRecord( 'postType', postType, postId );
 	const onTemplateSelect = async ( selectedTemplate ) => {
-		// TODO - trigger a reload
-		entitiy.edit( { content: selectedTemplate.content } );
-
+		//FIXME: This is a hack to get around the fact that the template is not being set correctly.
+		await setTemplate( null, null );
+		await entity.edit( { content: selectedTemplate.content } );
+		await setTemplate( postId, template.slug );
 		onClose(); // Close the template suggestions modal first.
 		onClick();
 	};