Check available template first

WordPress · Jul 19, 2022 · 65ec4dc · 65ec4dc
1 parent cf7dd1e
commit 65ec4dc
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/packages/edit-post/src/components/sidebar/post-template/index.js b/packages/edit-post/src/components/sidebar/post-template/index.js
@@ -66,7 +66,16 @@ export default function PostTemplate() {
 
 function PostTemplateToggle( { isOpen, onClick } ) {
 	const templateTitle = useSelect( ( select ) => {
-		return select( editPostStore ).getEditedPostTemplate()?.title;
+		const templateSlug =
+			select( editorStore ).getEditedPostAttribute( 'template' );
+
+		const settings = select( editorStore ).getEditorSettings();
+		if ( templateSlug && settings.availableTemplates[ templateSlug ] ) {
+			return settings.availableTemplates[ templateSlug ];
+		}
+
+		const template = select( editPostStore ).getEditedPostTemplate();
+		return template?.title ?? template?.slug;
 	}, [] );
 
 	return (