From c6bb728acd2af88e98eb71f94f0bd1dc30de9536 Mon Sep 17 00:00:00 2001 From: ntsekouras Date: Thu, 29 Aug 2024 15:04:03 +0300 Subject: [PATCH] feedback --- .../src/components/block-inspector/index.js | 45 +++++++++---------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js index 59976ed860c5a1..75b5239f47d6cc 100644 --- a/packages/block-editor/src/components/block-inspector/index.js +++ b/packages/block-editor/src/components/block-inspector/index.js @@ -9,7 +9,6 @@ import { } from '@wordpress/blocks'; import { PanelBody, __unstableMotion as motion } from '@wordpress/components'; import { useSelect } from '@wordpress/data'; -import { useMemo } from '@wordpress/element'; /** * Internal dependencies @@ -42,29 +41,29 @@ function BlockStylesPanel( { clientId } ) { } function BlockInspectorLockedBlocks( { topLevelLockedBlock } ) { - const { getBlockName, getBlockEditingMode } = useSelect( blockEditorStore ); - const { contentClientIds, hasBlockStyles } = useSelect( + const contentClientIds = useSelect( ( select ) => { - const { getClientIdsOfDescendants } = select( blockEditorStore ); - const { getBlockStyles } = select( blocksStore ); - return { - contentClientIds: - getClientIdsOfDescendants( topLevelLockedBlock ), - hasBlockStyles: !! getBlockStyles( - getBlockName( topLevelLockedBlock ) - )?.length, - }; - }, - [ topLevelLockedBlock, getBlockName ] - ); - const eligibleContentClientIds = useMemo( - () => - contentClientIds.filter( + const { + getClientIdsOfDescendants, + getBlockName, + getBlockEditingMode, + } = select( blockEditorStore ); + return getClientIdsOfDescendants( topLevelLockedBlock ).filter( ( clientId ) => getBlockName( clientId ) !== 'core/list-item' && getBlockEditingMode( clientId ) === 'contentOnly' - ), - [ contentClientIds, getBlockName, getBlockEditingMode ] + ); + }, + [ topLevelLockedBlock ] + ); + const hasBlockStyles = useSelect( + ( select ) => { + const { getBlockName } = select( blockEditorStore ); + const { getBlockStyles } = select( blocksStore ); + return !! getBlockStyles( getBlockName( topLevelLockedBlock ) ) + ?.length; + }, + [ topLevelLockedBlock ] ); const blockInformation = useBlockDisplayInformation( topLevelLockedBlock ); return ( @@ -78,11 +77,9 @@ function BlockInspectorLockedBlocks( { topLevelLockedBlock } ) { { hasBlockStyles && ( ) } - { eligibleContentClientIds.length > 0 && ( + { contentClientIds.length > 0 && ( - + ) }