Skip to content

Focus selected Blockly block on Ctrl+E before activating keyboard navigation #576

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

Closed
tracygardner wants to merge 4 commits into from
Closed

Focus selected Blockly block on Ctrl+E before activating keyboard navigation #576

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e77f5d
Improve Ctrl+E focus for highlighted Blockly blocks
tracygardner Apr 27, 2026
ca0c18a
Stabilize passive Blockly highlight focus restoration
tracygardner Apr 27, 2026
1b8f46b
Keep block selection when Blockly reports null selected id
tracygardner Apr 27, 2026
853e37a
Remove stale focusHighlightedBlock usage from Ctrl+E
tracygardner Apr 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
27 changes: 26 additions & 1 deletion ui/blocklyutil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function clearAddMenuHighlight(workspace, newSelectedId) {
if (
!lastAddMenuHighlighted ||
lastAddMenuHighlighted.workspace !== workspace ||
!newSelectedId ||
lastAddMenuHighlighted.blockId === newSelectedId
) {
return;
Expand All @@ -28,6 +29,30 @@ function clearAddMenuHighlight(workspace, newSelectedId) {
lastAddMenuHighlighted = null;
}

function restoreFocusAfterPassiveHighlight(previouslyFocused) {
const canFocus = (el) =>
!!el &&
typeof el.focus === "function" &&
document.contains(el) &&
!el.hasAttribute?.("disabled");

if (canFocus(previouslyFocused)) {
previouslyFocused.focus({ preventScroll: true });
return;
}

const activeGizmoButton = document.querySelector(".gizmo-button.active");
if (canFocus(activeGizmoButton)) {
activeGizmoButton.focus({ preventScroll: true });
return;
}

const canvas = document.getElementById("renderCanvas");
if (canFocus(canvas)) {
canvas.focus({ preventScroll: true });
}
}

export function appendWithUndo(spec, ws, groupId) {
let block;
try {
Expand Down Expand Up @@ -60,7 +85,7 @@ export function highlightBlockById(workspace, block) {
Blockly.keyboardNavigationController?.setIsActive?.(true);
const focusManager = Blockly.getFocusManager?.();
focusManager?.focusNode?.(block);
previouslyFocused?.focus?.({ preventScroll: true });
restoreFocusAfterPassiveHighlight(previouslyFocused);

trackAddMenuHighlight(workspace, block.id);

Expand Down
Loading