Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
15 changes: 13 additions & 2 deletions src/actions/action_menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,23 @@ export class ActionMenu {
private registerShortcut() {
const menuShortcut: ShortcutRegistry.KeyboardShortcut = {
name: Constants.SHORTCUT_NAMES.MENU,
preconditionFn: (workspace) =>
this.navigation.canCurrentlyNavigate(workspace),
preconditionFn: (workspace) => {
return (
this.navigation.canCurrentlyNavigate(workspace) &&
!workspace.isDragging()
);
},
callback: (workspace) => {
switch (this.navigation.getState(workspace)) {
case Constants.STATE.WORKSPACE:
return this.openActionMenu(workspace);
case Constants.STATE.FLYOUT: {
const flyoutWorkspace = workspace.getFlyout()?.getWorkspace();
if (flyoutWorkspace) {
return this.openActionMenu(flyoutWorkspace);
}
return false;
}
default:
return false;
}
Expand Down
8 changes: 3 additions & 5 deletions src/navigation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,17 @@ export class Navigation {
getState(workspace: Blockly.WorkspaceSvg): Constants.STATE {
const focusedTree = Blockly.getFocusManager().getFocusedTree();
if (focusedTree instanceof Blockly.WorkspaceSvg) {
if (focusedTree.isFlyout && workspace === focusedTree.targetWorkspace) {
if (focusedTree.isFlyout) {
return Constants.STATE.FLYOUT;
} else if (workspace === focusedTree) {
} else {
return Constants.STATE.WORKSPACE;
}
} else if (focusedTree instanceof Blockly.Toolbox) {
if (workspace === focusedTree.getWorkspace()) {
return Constants.STATE.TOOLBOX;
}
} else if (focusedTree instanceof Blockly.Flyout) {
if (workspace === focusedTree.targetWorkspace) {
return Constants.STATE.FLYOUT;
}
return Constants.STATE.FLYOUT;
}
// Either a non-Blockly element currently has DOM focus, or a different
// workspace holds it.
Expand Down
Loading