Use getContentLockingParent

Whoops, too many exclamation marks :)
WordPress · Jun 11, 2024 · 77a02a4 · 77a02a4
1 parent e17d37d
commit 77a02a4
Show file tree

Hide file tree

Showing 2 changed files with 5 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,7 +17,6 @@ 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(
@@ -27,7 +26,6 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 				getBlockParentsByBlockName,
 				getSettings,
 				getBlockAttributes,
-				getBlockName,
 			} = select( blockEditorStore );
 			const contentOnly =
 				getBlockEditingMode( clientId ) === 'contentOnly';
@@ -50,10 +48,10 @@ function ContentOnlySettingsMenuItems( { clientId, onClose } ) {
 			} else {
 				const { getCurrentTemplateId } = select( editorStore );
 				const templateId = getCurrentTemplateId();
-				if (
-					CONTENT_ONLY_BLOCKS.includes( getBlockName( clientId ) ) &&
-					templateId
-				) {
+				const { getContentLockingParent } = unlock(
+					select( blockEditorStore )
+				);
+				if ( ! getContentLockingParent( 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,7 +6,7 @@ import { store as blockEditorStore } from '@wordpress/block-editor';
 import { useEffect } from '@wordpress/element';
 import { applyFilters } from '@wordpress/hooks';
 
-export const DEFAULT_CONTENT_ONLY_BLOCKS = [
+const DEFAULT_CONTENT_ONLY_BLOCKS = [
 	'core/post-title',
 	'core/post-featured-image',
 	'core/post-content',