From 1351c672d76dc9fcba4ce28916be9632dc542c04 Mon Sep 17 00:00:00 2001 From: Daniel Richards Date: Thu, 2 May 2024 12:49:38 +0800 Subject: [PATCH] Use contentOnly locking for pattern block, remove hard-coded block check in block inspector (#61227) Co-authored-by: talldan Co-authored-by: aaronrobertshaw --- packages/block-editor/src/components/block-inspector/index.js | 3 +-- packages/block-library/src/block/edit.js | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js index 6da035a883ffb1..1fa6c3ea507d9f 100644 --- a/packages/block-editor/src/components/block-inspector/index.js +++ b/packages/block-editor/src/components/block-inspector/index.js @@ -95,8 +95,7 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => { blockType: _blockType, topLevelLockedBlock: getContentLockingParent( _selectedBlockClientId ) || - ( getTemplateLock( _selectedBlockClientId ) === 'contentOnly' || - _selectedBlockName === 'core/block' + ( getTemplateLock( _selectedBlockClientId ) === 'contentOnly' ? _selectedBlockClientId : undefined ), }; diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js index 8a2c292f395b5d..7b555c1c7186e4 100644 --- a/packages/block-library/src/block/edit.js +++ b/packages/block-library/src/block/edit.js @@ -402,7 +402,7 @@ function ReusableBlockEdit( { } ); const innerBlocksProps = useInnerBlocksProps( blockProps, { - templateLock: 'all', + templateLock: 'contentOnly', layout, renderAppender: innerBlocks?.length ? undefined