Use availableTemplates when theme doesn't support block templates

WordPress · Jul 25, 2022 · 7ff4411 · 7ff4411
1 parent 67f76a0
commit 7ff4411
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/packages/edit-post/src/components/sidebar/post-template/index.js b/packages/edit-post/src/components/sidebar/post-template/index.js
@@ -69,9 +69,10 @@ function PostTemplateToggle( { isOpen, onClick } ) {
 		const templateSlug =
 			select( editorStore ).getEditedPostAttribute( 'template' );
 
-		const settings = select( editorStore ).getEditorSettings();
-		if ( templateSlug && settings.availableTemplates[ templateSlug ] ) {
-			return settings.availableTemplates[ templateSlug ];
+		const { supportsTemplateMode, availableTemplates } =
+			select( editorStore ).getEditorSettings();
+		if ( ! supportsTemplateMode && availableTemplates[ templateSlug ] ) {
+			return availableTemplates[ templateSlug ];
 		}
 
 		const template = select( editPostStore ).getEditedPostTemplate();