Skip to content

fix: Improve fallback for getInitialCandidate #9941

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
microbit-robert wants to merge 2 commits into
base: v13
Choose a base branch
from
+13 −0
Open

fix: Improve fallback for getInitialCandidate #9941

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cb2ef0
fix: Improve fallback for getInitialCandidate
microbit-robert May 27, 2026
c029841
Improve variable name
microbit-robert May 27, 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
13 changes: 13 additions & 0 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 @@ -1238,6 +1238,19 @@ export class BlockDragStrategy implements IDragStrategy {
return this.pairToCandidate(parentPair);
}

// Fall back to the nearest parent block that has a compatible connection.
// This handles the case where a nested value block (e.g. a number input)
// has passive focus but the dragged block is a statement block that should
// be inserted after the containing statement block.
let parentBlock = passiveBlock.getSurroundParent();
while (parentBlock) {
const pair = this.allConnectionPairs.find(
(pair) => pair.neighbour.getSourceBlock() === parentBlock,
);
if (pair) return this.pairToCandidate(pair);
parentBlock = parentBlock.getSurroundParent();
}

return null;
}

Expand Down