diff --git a/packages/block-editor/src/components/block-controls/fill.js b/packages/block-editor/src/components/block-controls/fill.js index 10b94728306863..73c6a4c8c912f4 100644 --- a/packages/block-editor/src/components/block-controls/fill.js +++ b/packages/block-editor/src/components/block-controls/fill.js @@ -21,9 +21,12 @@ export default function BlockControlsFill( { group = 'default', controls, children, - __experimentalExposeToChildren = false, + __experimentalShareWithChildBlocks = false, } ) { - const Fill = useBlockControlsFill( group, __experimentalExposeToChildren ); + const Fill = useBlockControlsFill( + group, + __experimentalShareWithChildBlocks + ); if ( ! Fill ) { return null; } diff --git a/packages/block-editor/src/components/block-controls/hook.js b/packages/block-editor/src/components/block-controls/hook.js index d907a9aad5c364..caeb2fd9e04a06 100644 --- a/packages/block-editor/src/components/block-controls/hook.js +++ b/packages/block-editor/src/components/block-controls/hook.js @@ -12,7 +12,7 @@ import { store as blockEditorStore } from '../../store'; import { useBlockEditContext } from '../block-edit/context'; import useDisplayBlockControls from '../use-display-block-controls'; -export default function useBlockControlsFill( group, exposeToChildren ) { +export default function useBlockControlsFill( group, shareWithChildBlocks ) { const isDisplayed = useDisplayBlockControls(); const { clientId } = useBlockEditContext(); const isParentDisplayed = useSelect( @@ -22,7 +22,7 @@ export default function useBlockControlsFill( group, exposeToChildren ) { ); const { hasBlockSupport } = select( blocksStore ); return ( - exposeToChildren && + shareWithChildBlocks && hasBlockSupport( getBlockName( clientId ), '__experimentalExposeControlsToChildren', @@ -31,7 +31,7 @@ export default function useBlockControlsFill( group, exposeToChildren ) { hasSelectedInnerBlock( clientId ) ); }, - [ exposeToChildren, clientId ] + [ shareWithChildBlocks, clientId ] ); if ( isDisplayed ) { diff --git a/packages/block-editor/src/hooks/align.js b/packages/block-editor/src/hooks/align.js index c72b1aa29f796a..5a25d43385f2c6 100644 --- a/packages/block-editor/src/hooks/align.js +++ b/packages/block-editor/src/hooks/align.js @@ -140,7 +140,10 @@ export const withToolbarControls = createHigherOrderComponent( return ( <> { blockAllowedAlignments.length > 0 && ( - + + + - +