Skip to content

Prevent 't' toolbox shortcut from inserting into toolbox search #274

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

Merged
tracygardner merged 19 commits into from
Jan 19, 2026
Merged

Prevent 't' toolbox shortcut from inserting into toolbox search #274

Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5b58847
Prevent toolbox shortcut from typing in search
tracygardner Jan 19, 2026
9aac697
Wrap toolbox shortcut to avoid search input
tracygardner Jan 19, 2026
d2e5e82
Avoid toolbox shortcut key mapping collision
tracygardner Jan 19, 2026
fcabf31
Only show search flyout when selected
tracygardner Jan 19, 2026
0c60f9c
Refresh flyout on search blur
tracygardner Jan 19, 2026
34c19bf
Guard search flyout updates by selection
tracygardner Jan 19, 2026
4745e7c
Allow search results when input focused
tracygardner Jan 19, 2026
b686e95
Only show search flyout when input focused
tracygardner Jan 19, 2026
39427e6
Blur search input on toolbox navigation
tracygardner Jan 19, 2026
a984591
Blur search input on arrow navigation
tracygardner Jan 19, 2026
4ca6155
Only show search results when selected
tracygardner Jan 19, 2026
9f49056
Refocus search when typing in toolbox
tracygardner Jan 19, 2026
8fcf50c
Clear search selection on arrow blur
tracygardner Jan 19, 2026
27d0935
Move focus out of search on arrow nav
tracygardner Jan 19, 2026
2f037e1
Select search on focus and move focus out
tracygardner Jan 19, 2026
3342c26
Move toolbox selection on arrow from search
tracygardner Jan 19, 2026
0ec0f48
Focus toolbox div after leaving search
tracygardner Jan 19, 2026
946b9f5
Keep focus on toolbox when leaving search
tracygardner Jan 19, 2026
276bf5c
Return focus to toolbox after search nav
tracygardner Jan 19, 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
158 changes: 158 additions & 0 deletions main/blocklyinit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,45 @@ export function createBlocklyWorkspace() {

const keyboardNav = new KeyboardNavigation(workspace);

(function preventToolboxShortcutTextEntry() {
const shortcutRegistry = Blockly.ShortcutRegistry.registry;
const registry = shortcutRegistry.getRegistry?.();
const toolboxShortcut = registry?.toolbox;

if (!toolboxShortcut) {
return;
}

const wrappedShortcut = {
...toolboxShortcut,
callback: (ws, event, shortcut, scope) => {
const keyboardEvent =
event instanceof KeyboardEvent
? event
: null;
if (
keyboardEvent &&
(keyboardEvent.key || "")
.toLowerCase() === "t"
) {
keyboardEvent.preventDefault();
}

return toolboxShortcut.callback
? toolboxShortcut.callback(
ws,
event,
shortcut,
scope,
)
: false;
},
};

shortcutRegistry.removeAllKeyMappings?.("toolbox");
shortcutRegistry.register(wrappedShortcut, true);
})();

// Keep scrolling; remove only the obvious flyout-width bump.
(function simpleNoBumpTranslate() {
const ws = Blockly.getMainWorkspace();
Expand Down Expand Up @@ -1266,6 +1305,21 @@ export function overrideSearchPlugin(workspace) {
}

const toolboxBlocks = getBlocksFromToolbox(workspace);
const isSearchCategorySelected = (category = null) => {
const toolbox = workspace.getToolbox?.();
const selectedItem = toolbox?.getSelectedItem?.();
const selectedDef =
selectedItem?.getToolboxItemDef?.() ||
selectedItem?.toolboxItemDef;
const isSelectedSearch =
selectedDef?.kind === "search" ||
(category && selectedItem === category);

return (
category?.searchField === document.activeElement &&
isSelectedSearch
);
};

function getBlockMessage(blockType) {
const definition = Blockly.Blocks?.[blockType];
Expand Down Expand Up @@ -1524,6 +1578,9 @@ export function overrideSearchPlugin(workspace) {
const searchCategory = workspace.flockSearchCategory;
if (searchCategory) {
const showAllBlocksAsync = () => {
if (!isSearchCategorySelected(searchCategory)) {
return;
}
if (
searchCategory.searchField?.value
.toLowerCase()
Expand Down Expand Up @@ -1567,6 +1624,92 @@ export function overrideSearchPlugin(workspace) {
}

workspace.flockSearchCategory = this;

if (!this.flockSearchKeydownAttached && this.searchField) {
this.flockSearchKeydownAttached = true;
this.searchField.addEventListener("keydown", (event) => {
if (
event.key !== "ArrowDown" &&
event.key !== "ArrowUp"
) {
return;
}

event.preventDefault();
this.searchField.value = "";
this.searchField?.blur();
this.searchField?.setSelectionRange?.(0, 0);
setTimeout(() => {
const toolbox =
this.workspace_?.getToolbox?.();
const toolboxDiv = toolbox?.getDiv?.();
if (toolboxDiv) {
if (toolboxDiv.tabIndex < 0) {
toolboxDiv.tabIndex = 0;
}
toolboxDiv.focus();
}
if (toolbox) {
if (event.key === "ArrowDown") {
toolbox.selectNext?.();
} else {
toolbox.selectPrevious?.();
}
toolbox.refreshSelection?.();
}
toolboxDiv?.focus?.();
Blockly.getFocusManager?.()?.focusTree?.(
toolbox || null,
);
}, 0);
});
}

if (!this.flockSearchFocusAttached && this.searchField) {
this.flockSearchFocusAttached = true;
this.searchField.addEventListener("focus", () => {
this.parentToolbox_?.setSelectedItem?.(this);
});
}

if (!this.flockSearchToolboxKeydownAttached && this.searchField) {
this.flockSearchToolboxKeydownAttached = true;
const toolboxDiv =
this.workspace_
?.getToolbox?.()
?.getDiv?.() ||
document.querySelector(".blocklyToolboxDiv");
if (toolboxDiv) {
toolboxDiv.addEventListener("keydown", (event) => {
if (
event.ctrlKey ||
event.metaKey ||
event.altKey ||
event.key.length !== 1
) {
return;
}

const target = event.target;
const isEditable =
target instanceof HTMLElement &&
(target.isContentEditable ||
target.closest(
"input, textarea, [contenteditable='true']",
));
if (isEditable) {
return;
}

event.preventDefault();
event.stopPropagation();
this.parentToolbox_?.setSelectedItem?.(this);
this.searchField.value = event.key;
this.searchField.focus();
this.matchBlocks?.();
});
}
}
};

const searchToolboxItem = workspace
Expand All @@ -1593,6 +1736,9 @@ export function overrideSearchPlugin(workspace) {

if (!query) {
const showAllBlocksAsync = () => {
if (!isSearchCategorySelected(this)) {
return;
}
if (!Array.isArray(this.blockSearcher.indexedBlocks_)) {
return;
}
Expand Down Expand Up @@ -1698,6 +1844,15 @@ export function overrideSearchPlugin(workspace) {
this.showMatchingBlocks(matches);
};

const originalOnNodeBlur = SearchCategory.prototype.onNodeBlur;
SearchCategory.prototype.onNodeBlur = function () {
if (originalOnNodeBlur) {
originalOnNodeBlur.call(this);
}

this.workspace_?.getToolbox?.()?.refreshSelection?.();
};

function createXmlFromJson(
blockJson,
isShadow = false,
Expand Down Expand Up @@ -1777,6 +1932,9 @@ export function overrideSearchPlugin(workspace) {
}

SearchCategory.prototype.showMatchingBlocks = function (matches) {
if (!isSearchCategorySelected(this)) {
return;
}
const flyout = this.workspace_.getToolbox().getFlyout();
if (!flyout) {
console.error("Flyout not found!");
Expand Down