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

Fix Spacer orientation when inside a block with default flex layout. #58921

Merged
merged 3 commits into from
Feb 12, 2024
Merged

Fix Spacer orientation when inside a block with default flex layout. #58921

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee2340a
Fix Spacer orientation when inside a block with default flex layout.
tellthemachines Feb 12, 2024
240209f
Update packages/block-library/src/spacer/edit.js
tellthemachines Feb 12, 2024
bed3611
Fix linting error
andrewserong Feb 12, 2024
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
9 changes: 7 additions & 2 deletions packages/block-library/src/spacer/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,14 @@ const SpacerEdit = ( {
return editorSettings?.disableCustomSpacingSizes;
} );
const { orientation } = context;
const { orientation: parentOrientation, type } = parentLayout || {};
const {
orientation: parentOrientation,
type,
default: { type: defaultType } = {},
} = parentLayout || {};
// Check if the spacer is inside a flex container.
const isFlexLayout = type === 'flex';
const isFlexLayout =
type === 'flex' || ( ! type && defaultType === 'flex' );
// If the spacer is inside a flex container, it should either inherit the orientation
// of the parent or use the flex default orientation.
const inheritedOrientation =
Expand Down
Loading