Layout: Fix toggling off inner blocks content width setting for legac…

…y markup (#43888) * Layout: Fix toggling off inner blocks content width setting for legacy markup * Move common checks to a const
WordPress · Sep 8, 2022 · fa80a98 · fa80a98
1 parent f1ceba2
commit fa80a98
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/packages/block-editor/src/hooks/layout.js b/packages/block-editor/src/hooks/layout.js
@@ -143,11 +143,10 @@ function LayoutPanel( { setAttributes, attributes, name: blockName } ) {
 		return null;
 	}
 	const layoutType = getLayoutType( type );
-
 	const constrainedType = getLayoutType( 'constrained' );
-
 	const displayControlsForLegacyLayouts =
 		! usedLayout.type && ( contentSize || inherit );
+	const hasContentSizeOrLegacySettings = !! inherit || !! contentSize;
 
 	const onChangeType = ( newType ) =>
 		setAttributes( { layout: { type: newType } } );
@@ -164,23 +163,23 @@ function LayoutPanel( { setAttributes, attributes, name: blockName } ) {
 								label={ __( 'Inner blocks use content width' ) }
 								checked={
 									layoutType?.name === 'constrained' ||
-									!! inherit ||
-									!! contentSize
+									hasContentSizeOrLegacySettings
 								}
 								onChange={ () =>
 									setAttributes( {
 										layout: {
 											type:
 												layoutType?.name ===
-												'constrained'
+													'constrained' ||
+												hasContentSizeOrLegacySettings
 													? 'default'
 													: 'constrained',
 										},
 									} )
 								}
 								help={
-									!! inherit ||
-									layoutType?.name === 'constrained'
+									layoutType?.name === 'constrained' ||
+									hasContentSizeOrLegacySettings
 										? __(
 												'Nested blocks use content width with options for full and wide widths.'
 										  )