Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Block Editor: Avoid rendering empty Slot for block alignments #55689

Merged
merged 1 commit into from
Oct 30, 2023
Merged

Block Editor: Avoid rendering empty Slot for block alignments #55689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions packages/block-editor/src/hooks/align.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,17 +120,20 @@ export const withToolbarControls = createHigherOrderComponent(
( BlockEdit ) => ( props ) => {
const blockEdit = <BlockEdit key="edit" { ...props } />;
const { name: blockName } = props;

const blockEditingMode = useBlockEditingMode();
if ( blockEditingMode !== 'default' ) {
return blockEdit;
}

// Compute the block valid alignments by taking into account,
// if the theme supports wide alignments or not and the layout's
// availble alignments. We do that for conditionally rendering
// Slot.
const blockAllowedAlignments = getValidAlignments(
getBlockSupport( blockName, 'align' ),
hasBlockSupport( blockName, 'alignWide', true )
);
if ( blockAllowedAlignments.length === 0 ) {

const validAlignments = useAvailableAlignments(
blockAllowedAlignments
).map( ( { name } ) => name );
const blockEditingMode = useBlockEditingMode();
if ( ! validAlignments.length || blockEditingMode !== 'default' ) {
return blockEdit;
}

Expand All @@ -151,7 +154,7 @@ export const withToolbarControls = createHigherOrderComponent(
<BlockAlignmentControl
value={ props.attributes.align }
onChange={ updateAlignment }
controls={ blockAllowedAlignments }
controls={ validAlignments }
/>
</BlockControls>
{ blockEdit }
Expand Down