Check for content blocks

WordPress · Jun 7, 2024 · c50b7ba · c50b7ba
1 parent 4886740
commit c50b7ba
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js b/packages/editor/src/components/block-settings-menu/content-only-settings-menu.js
@@ -17,6 +17,7 @@ import { __ } from '@wordpress/i18n';
  */
 import { store as editorStore } from '../../store';
 import { unlock } from '../../lock-unlock';
+import { CONTENT_ONLY_BLOCKS } from '../provider/disable-non-page-content-blocks';
 
 function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 	const { entity, onNavigateToEntityRecord, canEditTemplates } = useSelect(
@@ -26,6 +27,7 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 				getBlockParentsByBlockName,
 				getSettings,
 				getBlockAttributes,
+				getBlockName,
 			} = select( blockEditorStore );
 			const contentOnly =
 				getBlockEditingMode( clientId ) === 'contentOnly';
@@ -48,7 +50,10 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 			} else {
 				const { getCurrentTemplateId } = select( editorStore );
 				const templateId = getCurrentTemplateId();
-				if ( templateId ) {
+				if (
+					CONTENT_ONLY_BLOCKS.includes( getBlockName( clientId ) ) &&
+					templateId
+				) {
 					record = select( coreStore ).getEntityRecord(
 						'postType',
 						'wp_template',

diff --git a/packages/editor/src/components/provider/disable-non-page-content-blocks.js b/packages/editor/src/components/provider/disable-non-page-content-blocks.js
@@ -6,12 +6,15 @@ import { store as blockEditorStore } from '@wordpress/block-editor';
 import { useEffect } from '@wordpress/element';
 import { applyFilters } from '@wordpress/hooks';
 
-const CONTENT_ONLY_BLOCKS = applyFilters( 'editor.postContentBlockTypes', [
-	'core/post-title',
-	'core/post-featured-image',
-	'core/post-content',
-	'core/template-part',
-] );
+export const CONTENT_ONLY_BLOCKS = applyFilters(
+	'editor.postContentBlockTypes',
+	[
+		'core/post-title',
+		'core/post-featured-image',
+		'core/post-content',
+		'core/template-part',
+	]
+);
 
 /**
  * Component that when rendered, makes it so that the site editor allows only