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

Jump to bottom

Resizing in Auto mode shouldn't add columnStart and rowStart values #63160

Merged
merged 2 commits into from
Jul 5, 2024
Merged

Resizing in Auto mode shouldn't add columnStart and rowStart values #63160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3e3432
Resizing in Auto mode shouldn't add colum and row values
tellthemachines Jul 5, 2024
1114f45
Fix other instances of `isManualGrid` referring to `columnCount`
tellthemachines Jul 5, 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
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/block-mover/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function BlockMover( {
orientation: getBlockListSettings( _rootClientId )?.orientation,
isManualGrid:
layout.type === 'grid' &&
!! layout.columnCount &&
layout.isManualPlacement &&
window.__experimentalEnableGridInteractivity,
};
},
Expand Down
5 changes: 3 additions & 2 deletions packages/block-editor/src/components/grid/grid-item-resizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -33,7 +33,8 @@ export function GridItemResizer( {
rootBlockElement={ rootBlockElement }
onChange={ onChange }
isManualGrid={
!! columnCount && window.__experimentalEnableGridInteractivity
isManualPlacement &&
window.__experimentalEnableGridInteractivity
}
/>
);
Expand Down
2 changes: 1 addition & 1 deletion packages/block-editor/src/components/grid/grid-visualizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function GridVisualizer( { clientId, contentRef, parentLayout } ) {
}

const isManualGrid =
parentLayout?.columnCount &&
parentLayout?.isManualPlacement &&
window.__experimentalEnableGridInteractivity;
return (
<GridVisualizerGrid
Expand Down
3 changes: 1 addition & 2 deletions packages/block-editor/src/components/grid/use-grid-layout-sync.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
23 changes: 11 additions & 12 deletions packages/block-editor/src/hooks/layout-child.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ function ChildLayoutControlsPure( { clientId, style, setAttributes } ) {
const {
type: parentLayoutType = 'default',
allowSizingOnChildren = false,
columnCount,
isManualPlacement,
} = parentLayout;

const rootClientId = useSelect(
Expand All @@ -169,8 +169,6 @@ function ChildLayoutControlsPure( { clientId, style, setAttributes } ) {
return null;
}

const isManualGrid = !! columnCount;

function updateLayout( layout ) {
setAttributes( {
style: {
Expand Down Expand Up @@ -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 }
/>
) }
</>
);
}
Expand Down
Loading