From aaba10f5a3bec5c56ae286b22531e3ad085f5d2f Mon Sep 17 00:00:00 2001 From: Daniel Richards Date: Tue, 17 Dec 2024 15:56:21 +0800 Subject: [PATCH] Update template part block editing modes to behave more like synced patterns --- packages/block-editor/src/store/private-selectors.js | 4 +++- packages/block-editor/src/store/reducer.js | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/block-editor/src/store/private-selectors.js b/packages/block-editor/src/store/private-selectors.js index c46778d889b3e..dd61b979fa47c 100644 --- a/packages/block-editor/src/store/private-selectors.js +++ b/packages/block-editor/src/store/private-selectors.js @@ -505,7 +505,9 @@ export function isSectionBlock( state, clientId ) { const sectionRootClientId = getSectionRootClientId( state ); const sectionClientIds = getBlockOrder( state, sectionRootClientId ); return ( - getBlockName( state, clientId ) === 'core/block' || + [ 'core/block', 'core/template-part' ].includes( + getBlockName( state, clientId ) + ) || getTemplateLock( state, clientId ) === 'contentOnly' || ( isNavigationMode( state ) && sectionClientIds.includes( clientId ) ) ); diff --git a/packages/block-editor/src/store/reducer.js b/packages/block-editor/src/store/reducer.js index edae9c392c37d..b46011c688086 100644 --- a/packages/block-editor/src/store/reducer.js +++ b/packages/block-editor/src/store/reducer.js @@ -2260,9 +2260,10 @@ function getDerivedBlockEditingModesForTree( const sectionClientIds = state.blocks.order.get( sectionRootClientId ); const syncedPatternClientIds = Object.keys( state.blocks.controlledInnerBlocks - ).filter( - ( clientId ) => - state.blocks.byClientId?.get( clientId )?.name === 'core/block' + ).filter( ( clientId ) => + [ 'core/block', 'core/template-part' ].includes( + state.blocks.byClientId?.get( clientId )?.name + ) ); traverseBlockTree( state, treeClientId, ( block ) => {