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 edge case where the default layout could be undefined #30024

Merged
merged 1 commit into from
Mar 22, 2021
Merged

Fix edge case where the default layout could be undefined #30024

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion packages/block-editor/src/hooks/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ export const withLayoutStyles = createHigherOrderComponent(
const { name, attributes } = props;
const supportLayout = hasBlockSupport( name, '__experimentalLayout' );
const id = useInstanceId( BlockListBlock );
const defaultLayout = useEditorFeature( 'layout' );
const defaultLayout = useEditorFeature( 'layout' ) || {};
if ( ! supportLayout ) {
return <BlockListBlock { ...props } />;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/group/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function GroupEdit( { attributes, setAttributes, clientId } ) {
},
[ clientId ]
);
const defaultLayout = useEditorFeature( 'layout' );
const defaultLayout = useEditorFeature( 'layout' ) || {};
const { tagName: TagName = 'div', templateLock, layout = {} } = attributes;
const usedLayout = !! layout && layout.inherit ? defaultLayout : layout;
const { contentSize, wideSize } = usedLayout;
Expand Down
2 changes: 1 addition & 1 deletion packages/block-library/src/post-content/edit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function Content( { layout, postType, postId } ) {
const { getSettings } = select( blockEditorStore );
return getSettings()?.supportsLayout;
}, [] );
const defaultLayout = useEditorFeature( 'layout' );
const defaultLayout = useEditorFeature( 'layout' ) || {};
const usedLayout = !! layout && layout.inherit ? defaultLayout : layout;
const { contentSize, wideSize } = usedLayout;
const alignments =
Expand Down