Work on fixing menu shortcuts

Author: RoboErikG

src/actions/action_menu.ts

@@ -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;
         }

src/navigation.ts

@@ -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.