From 1f1ed9478d4829769cdc6a45515e8719e8adbabe Mon Sep 17 00:00:00 2001 From: ramon Date: Tue, 3 Sep 2024 09:56:50 +1000 Subject: [PATCH] Simplify condition --- packages/block-editor/src/components/block-switcher/index.js | 3 +++ packages/block-editor/src/components/block-toolbar/index.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js index 982b6e80792d7..610f2c0580b5b 100644 --- a/packages/block-editor/src/components/block-switcher/index.js +++ b/packages/block-editor/src/components/block-switcher/index.js @@ -237,6 +237,9 @@ export const BlockSwitcher = ( { clientIds, disabled, isUsingBindings } ) => { } else { const isSelectionOfSameType = new Set( _blocks.map( ( { name } ) => name ) ).size === 1; + _hasTemplateLock = clientIds.some( + ( id ) => getTemplateLock( id ) === 'contentOnly' + ); // When selection consists of blocks of multiple types, display an // appropriate icon to communicate the non-uniformity. _icon = isSelectionOfSameType ? blockType.icon : copy; diff --git a/packages/block-editor/src/components/block-toolbar/index.js b/packages/block-editor/src/components/block-toolbar/index.js index 984670762262c..95e94d65ead10 100644 --- a/packages/block-editor/src/components/block-toolbar/index.js +++ b/packages/block-editor/src/components/block-toolbar/index.js @@ -78,6 +78,7 @@ export function PrivateBlockToolbar( { getBlockEditingMode, getBlockAttributes, canRemoveBlock, + getTemplateLock, } = select( blockEditorStore ); const selectedBlockClientIds = getSelectedBlockClientIds(); const selectedBlockClientId = selectedBlockClientIds[ 0 ]; @@ -99,6 +100,8 @@ export function PrivateBlockToolbar( { ( clientId ) => !! getBlockAttributes( clientId )?.metadata?.bindings ); + // @TODO If a selected block is locked, we should not show the BlockGroupToolbar. + return { blockClientId: selectedBlockClientId, blockClientIds: selectedBlockClientIds,