Skip to content

fix: constrained move mode improvements #10026

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

Open
mikeharv wants to merge 2 commits into
base: main
Choose a base branch
from
+29 −30
Open

fix: constrained move mode improvements #10026

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e673bd4
fix: constrained move mode improvements
mikeharv Jun 17, 2026
2a11197
chore: linting
mikeharv Jun 17, 2026
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
59 changes: 29 additions & 30 deletions packages/blockly/core/dragging/block_drag_strategy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,12 +604,10 @@ export class BlockDragStrategy implements IDragStrategy {
private determineConnectionOffset(): Coordinate {
const {local, neighbour} = this.connectionCandidate!;

const dx = neighbour.x - local.x;
const dy = neighbour.y - local.y;
const connOffset = local.getOffsetInBlock();

// Base aligned position
let x = this.startLoc!.x + dx;
let y = this.startLoc!.y + dy;
let x = neighbour.x - connOffset.x;
let y = neighbour.y - connOffset.y;

// Decide offset direction
const becomingChild =
Expand Down Expand Up @@ -650,51 +648,52 @@ export class BlockDragStrategy implements IDragStrategy {
const newCandidate =
this.getInitialCandidate() ?? this.getConnectionCandidate(delta);

this.connectionPreviewer?.hidePreview();
this.connectionCandidate = null;
if (!newCandidate) {
// Position above or below the first/last block.
if (this.moveMode === MoveMode.CONSTRAINED) {
const connectedBlock = currCandidate?.neighbour.getSourceBlock();
const connectedBlock =
currCandidate?.neighbour.getSourceBlock() ?? null;
let root = connectedBlock?.getRootBlock() ?? connectedBlock;
if (root === draggingBlock) root = connectedBlock;
const direction = this.getDirectionToNewLocation(
Coordinate.sum(this.startLoc!, delta),
);
const bounds = root?.getBoundingRectangle();
if (!bounds) return;
if (!root) return;

const blockRects = draggingBlock.workspace
.getTopBlocks()
.filter((block) => block !== draggingBlock.getRootBlock())
.map((block) => block.getBoundingRectangle());
const blocksLeft = Math.min(...blockRects.map((rect) => rect.left));
if (!blockRects.length) return;

// If the block was previously connected, position the block near its previous connection.
const destinationX =
currCandidate?.neighbour.x ??
draggingBlock.getRelativeToSurfaceXY().x;
let destinationY: number;
const offset = this.BLOCK_CONNECTION_OFFSET * 2;

let destination: Coordinate;
let blockBound: number;
const direction = this.getDirectionToNewLocation(
Coordinate.sum(this.startLoc!, delta),
);
switch (direction) {
case Direction.LEFT:
case Direction.UP:
blockBound = Math.min(...blockRects.map((rect) => rect.top));
destination = new Coordinate(
blocksLeft,
blockBound -
this.BLOCK_CONNECTION_OFFSET * 2 -
draggingBlock.getHeightWidth().height,
);
destinationY =
Math.min(...blockRects.map((rect) => rect.top)) -
offset -
draggingBlock.getHeightWidth().height;
break;
case Direction.RIGHT:
case Direction.DOWN:
default:
blockBound = Math.max(...blockRects.map((rect) => rect.bottom));
destination = new Coordinate(
blocksLeft,
blockBound + this.BLOCK_CONNECTION_OFFSET * 2,
);
destinationY =
Math.max(...blockRects.map((rect) => rect.bottom)) + offset;
break;
}
draggingBlock.moveDuringDrag(destination);
draggingBlock.moveDuringDrag(
new Coordinate(destinationX, destinationY),
);
}

this.connectionPreviewer?.hidePreview();
this.connectionCandidate = null;
return;
}
const candidate =
Expand Down
Loading