Skip to content

Rpf 622 #9845

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
lizschwab wants to merge 2 commits into
base: v13
Choose a base branch
from
+119 −6
Open

Rpf 622 #9845

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
abbe58e
feat: Added additional keyboard shortcuts for context menu
lizschwab May 8, 2026
f1cc24e
formatting
lizschwab May 8, 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
9 changes: 7 additions & 2 deletions packages/blockly/core/shortcut_items.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,14 +558,19 @@ export function registerMovementShortcuts() {
}

/**
* Keyboard shortcut to show the context menu on ctrl/cmd+Enter.
* Keyboard shortcut to show the context menu on ctrl/cmd+Enter, shift+F10, and
* the menu key.
*/
export function registerShowContextMenu() {
const ctrlEnter = ShortcutRegistry.registry.createSerializedKey(
KeyCodes.ENTER,
[KeyCodes.CTRL_CMD],
);

const shiftF10 = ShortcutRegistry.registry.createSerializedKey(KeyCodes.F10, [
KeyCodes.SHIFT,
]);

const contextMenuShortcut: KeyboardShortcut = {
name: names.MENU,
preconditionFn: (workspace) => {
Expand All @@ -582,7 +587,7 @@ export function registerShowContextMenu() {
}
return false;
},
keyCodes: [ctrlEnter],
keyCodes: [ctrlEnter, shiftF10, KeyCodes.CONTEXT_MENU],
displayText: () => Msg['SHORTCUTS_SHOW_CONTEXT_MENU'],
};
ShortcutRegistry.registry.register(contextMenuShortcut);
Expand Down
116 changes: 112 additions & 4 deletions packages/blockly/tests/mocha/shortcut_items_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,13 +468,21 @@ suite('Keyboard Shortcut Items', function () {
);
});

suite('Show context menu (Ctrl/Cmd+Enter)', function () {
suite('Show context menu', function () {
const contextMenuKeyEvent = createKeyDownEvent(
Blockly.utils.KeyCodes.ENTER,
[Blockly.utils.KeyCodes.CTRL_CMD],
);

test('Displays context menu on a block using the keyboard shortcut', function () {
const shiftF10KeyEvent = createKeyDownEvent(Blockly.utils.KeyCodes.F10, [
Blockly.utils.KeyCodes.SHIFT,
]);

const menuKeyEvent = createKeyDownEvent(
Blockly.utils.KeyCodes.CONTEXT_MENU,
);

test('Displays context menu on a block using Ctrl/Cmd+Enter', function () {
const block = setSelectedBlock(this.workspace);
this.injectionDiv.dispatchEvent(contextMenuKeyEvent);

Expand All @@ -491,7 +499,7 @@ suite('Keyboard Shortcut Items', function () {
}
});

test('Displays context menu on the workspace using the keyboard shortcut', function () {
test('Displays context menu on the workspace using Ctrl/Cmd+Enter', function () {
Blockly.getFocusManager().focusNode(this.workspace);
this.injectionDiv.dispatchEvent(contextMenuKeyEvent);

Expand All @@ -507,7 +515,7 @@ suite('Keyboard Shortcut Items', function () {
}
});

test('Displays context menu on a workspace comment using the keyboard shortcut', function () {
test('Displays context menu on a workspace comment using Ctrl/Cmd+Enter', function () {
Blockly.ContextMenuItems.registerCommentOptions();
const comment = setSelectedComment(this.workspace);
this.injectionDiv.dispatchEvent(contextMenuKeyEvent);
Expand All @@ -524,6 +532,106 @@ suite('Keyboard Shortcut Items', function () {
}
});

test('Displays context menu on a block using Shift+F10', function () {
const block = setSelectedBlock(this.workspace);
this.injectionDiv.dispatchEvent(shiftF10KeyEvent);

const menu = Blockly.ContextMenu.getMenu();
assert.instanceOf(menu, Blockly.Menu, 'Context menu should be shown');

const menuOptions =
Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
{block, focusedNode: block},
shiftF10KeyEvent,
);
for (const option of menuOptions) {
assert.include(menu.getElement().textContent, option.text);
}
});

test('Displays context menu on the workspace using Shift+F10', function () {
Blockly.getFocusManager().focusNode(this.workspace);
this.injectionDiv.dispatchEvent(shiftF10KeyEvent);

const menu = Blockly.ContextMenu.getMenu();
assert.instanceOf(menu, Blockly.Menu, 'Context menu should be shown');
const menuOptions =
Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
{workspace: this.workspace, focusedNode: this.workspace},
shiftF10KeyEvent,
);
for (const option of menuOptions) {
assert.include(menu.getElement().textContent, option.text);
}
});

test('Displays context menu on a workspace comment using Shift+F10', function () {
Blockly.ContextMenuItems.registerCommentOptions();
const comment = setSelectedComment(this.workspace);
this.injectionDiv.dispatchEvent(shiftF10KeyEvent);

const menu = Blockly.ContextMenu.getMenu();
assert.instanceOf(menu, Blockly.Menu, 'Context menu should be shown');
const menuOptions =
Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
{comment, focusedNode: comment},
shiftF10KeyEvent,
);
for (const option of menuOptions) {
assert.include(menu.getElement().textContent, option.text);
}
});

test('Displays context menu on a block using the menu button', function () {
const block = setSelectedBlock(this.workspace);
this.injectionDiv.dispatchEvent(menuKeyEvent);

const menu = Blockly.ContextMenu.getMenu();
assert.instanceOf(menu, Blockly.Menu, 'Context menu should be shown');

const menuOptions =
Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
{block, focusedNode: block},
menuKeyEvent,
);
for (const option of menuOptions) {
assert.include(menu.getElement().textContent, option.text);
}
});

test('Displays context menu on the workspace using the menu button', function () {
Blockly.getFocusManager().focusNode(this.workspace);
this.injectionDiv.dispatchEvent(menuKeyEvent);

const menu = Blockly.ContextMenu.getMenu();
assert.instanceOf(menu, Blockly.Menu, 'Context menu should be shown');
const menuOptions =
Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
{workspace: this.workspace, focusedNode: this.workspace},
menuKeyEvent,
);
for (const option of menuOptions) {
assert.include(menu.getElement().textContent, option.text);
}
});

test('Displays context menu on a workspace comment using the menu button', function () {
Blockly.ContextMenuItems.registerCommentOptions();
const comment = setSelectedComment(this.workspace);
this.injectionDiv.dispatchEvent(menuKeyEvent);

const menu = Blockly.ContextMenu.getMenu();
assert.instanceOf(menu, Blockly.Menu, 'Context menu should be shown');
const menuOptions =
Blockly.ContextMenuRegistry.registry.getContextMenuOptions(
{comment, focusedNode: comment},
menuKeyEvent,
);
for (const option of menuOptions) {
assert.include(menu.getElement().textContent, option.text);
}
});

test('First menu item is highlighted when context menu is shown via keyboard shortcut', function () {
setSelectedBlock(this.workspace);
this.injectionDiv.dispatchEvent(contextMenuKeyEvent);
Expand Down
Loading