Skip to content

ENA-136 Fix context menu closing on the same right-click which opened it #2834

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
towerofnix wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

ENA-136 Fix context menu closing on the same right-click which opened it #2834

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85c1a4b
Fix ctx menu closing on the same click it opens
towerofnix Jun 20, 2022
38b468b
formally subclass goog.ui.MenuItem with desired custom behavior
towerofnix Aug 16, 2022
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
28 changes: 23 additions & 5 deletions core/contextmenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
*/
goog.provide('Blockly.ContextMenu');

goog.provide('Blockly.ContextMenuItem');

goog.require('Blockly.Events.BlockCreate');
goog.require('Blockly.scratchBlocksUtils');
goog.require('Blockly.utils');
Expand Down Expand Up @@ -96,17 +98,16 @@ Blockly.ContextMenu.populate_ = function(options, rtl) {
var menu = new goog.ui.Menu();
menu.setRightToLeft(rtl);
for (var i = 0, option; option = options[i]; i++) {
var menuItem = new goog.ui.MenuItem(option.text);
// Use a custom class for the menu item instance. This is a subclass of
// goog.ui.MenuItem and has all the same behavior as usual, with minor
// tweaks for use in Blockly (and Scratch Blocks).
var menuItem = new Blockly.ContextMenuItem(option.text);
menuItem.setRightToLeft(rtl);
menu.addChild(menuItem, true);
menuItem.setEnabled(option.enabled);
if (option.enabled) {
goog.events.listen(
menuItem, goog.ui.Component.EventType.ACTION, option.callback);
menuItem.handleContextMenu = function(/* e */) {
// Right-clicking on menu option should count as a click.
goog.events.dispatchEvent(this, goog.ui.Component.EventType.ACTION);
};
}
}
return menu;
Expand Down Expand Up @@ -517,3 +518,20 @@ Blockly.ContextMenu.workspaceCommentOption = function(ws, e) {
};

// End helper functions for creating context menu options.


Blockly.ContextMenuItem = function(content) {
Blockly.ContextMenuItem.superClass_.constructor.call(this, content);
};
goog.inherits(Blockly.ContextMenuItem, goog.ui.MenuItem);

Blockly.ContextMenuItem.prototype.handleMouseDown = function(e) {
// Menu options only respond to left clicking (browser action button).
// Override the event to let right clicking work too.
e.isMouseActionButton = function() {
return this.isButton(goog.events.BrowserEvent.MouseButton.LEFT) ||
this.isButton(goog.events.BrowserEvent.MouseButton.RIGHT);
};

Blockly.ContextMenuItem.superClass_.handleMouseDown.call(this, e);
};