Fix selector specificity and legacy layout logic.

WordPress · Sep 23, 2022 · 08fe809 · 08fe809
1 parent 1b29729
commit 08fe809
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/packages/block-editor/src/hooks/layout.js b/packages/block-editor/src/hooks/layout.js
@@ -114,13 +114,9 @@ export function useLayoutStyles( block = {}, selector ) {
 	const { layout = {}, style = {} } = attributes;
 	// Update type for blocks using legacy layouts.
 	const usedLayout =
-		layout &&
-		( layout?.type === 'constrained' ||
-			layout?.inherit ||
-			layout?.contentSize ||
-			layout?.wideSize )
+		layout?.inherit || layout?.contentSize || layout?.wideSize
 			? { ...layout, type: 'constrained' }
-			: { ...layout, type: 'default' };
+			: layout || {};
 	const fullLayoutType = getLayoutType( usedLayout?.type || 'default' );
 	const globalLayoutSettings = useSetting( 'layout' ) || {};
 	const blockGapSupport = useSetting( 'spacing.blockGap' );

diff --git a/packages/edit-post/src/components/visual-editor/index.js b/packages/edit-post/src/components/visual-editor/index.js
@@ -231,14 +231,13 @@ export default function VisualEditor( { styles } ) {
 	const blockListLayoutClass = classnames(
 		{
 			'is-layout-flow': ! themeSupportsLayout,
-			'wp-container-visual-editor': themeSupportsLayout,
 		},
 		postContentLayoutClasses
 	);
 
 	const postContentLayoutStyles = useLayoutStyles(
 		postContentBlock,
-		'.wp-container-visual-editor'
+		'.block-editor-block-list__layout.is-root-container'
 	);
 
 	const { attributes = {} } = postContentBlock;