Resizing in Auto mode shouldn't add columnStart and rowStart valu…

…es (WordPress#63160) Co-authored-by: tellthemachines <[email protected]> Co-authored-by: noisysocks <[email protected]>
MaxMood96 · Jul 5, 2024 · ccc5b43 · ccc5b43
1 parent aaadab3
commit ccc5b43
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 18 deletions.
diff --git a/packages/block-editor/src/components/block-mover/index.js b/packages/block-editor/src/components/block-mover/index.js
@@ -62,7 +62,7 @@ function BlockMover( {
 				orientation: getBlockListSettings( _rootClientId )?.orientation,
 				isManualGrid:
 					layout.type === 'grid' &&
-					!! layout.columnCount &&
+					layout.isManualPlacement &&
 					window.__experimentalEnableGridInteractivity,
 			};
 		},

diff --git a/packages/block-editor/src/components/grid/grid-item-resizer.js b/packages/block-editor/src/components/grid/grid-item-resizer.js
@@ -19,7 +19,7 @@ export function GridItemResizer( {
 } ) {
 	const blockElement = useBlockElement( clientId );
 	const rootBlockElement = blockElement?.parentElement;
-	const { columnCount } = parentLayout;
+	const { isManualPlacement } = parentLayout;
 
 	if ( ! blockElement || ! rootBlockElement ) {
 		return null;
@@ -33,7 +33,8 @@ export function GridItemResizer( {
 			rootBlockElement={ rootBlockElement }
 			onChange={ onChange }
 			isManualGrid={
-				!! columnCount && window.__experimentalEnableGridInteractivity
+				isManualPlacement &&
+				window.__experimentalEnableGridInteractivity
 			}
 		/>
 	);

diff --git a/packages/block-editor/src/components/grid/grid-visualizer.js b/packages/block-editor/src/components/grid/grid-visualizer.js
@@ -32,7 +32,7 @@ export function GridVisualizer( { clientId, contentRef, parentLayout } ) {
 	}
 
 	const isManualGrid =
-		parentLayout?.columnCount &&
+		parentLayout?.isManualPlacement &&
 		window.__experimentalEnableGridInteractivity;
 	return (
 		<GridVisualizerGrid

diff --git a/packages/block-editor/src/components/grid/use-grid-layout-sync.js b/packages/block-editor/src/components/grid/use-grid-layout-sync.js
@@ -31,9 +31,8 @@ export function useGridLayoutSync( { clientId: gridClientId } ) {
 		const updates = {};
 
 		const { columnCount, rowCount, isManualPlacement } = gridLayout;
-		const isManualGrid = !! isManualPlacement;
 
-		if ( isManualGrid ) {
+		if ( isManualPlacement ) {
 			const rects = [];
 
 			// Respect the position of blocks that already have a columnStart and rowStart value.

diff --git a/packages/block-editor/src/hooks/layout-child.js b/packages/block-editor/src/hooks/layout-child.js
@@ -152,7 +152,7 @@ function ChildLayoutControlsPure( { clientId, style, setAttributes } ) {
 	const {
 		type: parentLayoutType = 'default',
 		allowSizingOnChildren = false,
-		columnCount,
+		isManualPlacement,
 	} = parentLayout;
 
 	const rootClientId = useSelect(
@@ -169,8 +169,6 @@ function ChildLayoutControlsPure( { clientId, style, setAttributes } ) {
 		return null;
 	}
 
-	const isManualGrid = !! columnCount;
-
 	function updateLayout( layout ) {
 		setAttributes( {
 			style: {
@@ -199,15 +197,16 @@ function ChildLayoutControlsPure( { clientId, style, setAttributes } ) {
 					parentLayout={ parentLayout }
 				/>
 			) }
-			{ isManualGrid && window.__experimentalEnableGridInteractivity && (
-				<GridItemMovers
-					layout={ style?.layout }
-					parentLayout={ parentLayout }
-					onChange={ updateLayout }
-					gridClientId={ rootClientId }
-					blockClientId={ clientId }
-				/>
-			) }
+			{ isManualPlacement &&
+				window.__experimentalEnableGridInteractivity && (
+					<GridItemMovers
+						layout={ style?.layout }
+						parentLayout={ parentLayout }
+						onChange={ updateLayout }
+						gridClientId={ rootClientId }
+						blockClientId={ clientId }
+					/>
+				) }
 		</>
 	);
 }