From 4cead8b84761cbf8f5f21152c0c3fcf06182f9ce Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 10 Mar 2025 12:52:36 -0700
Subject: [PATCH] refactor: Move exit action into its own class.

---
 src/actions/exit.ts          | 53 ++++++++++++++++++++++++++++++++++++
 src/navigation_controller.ts | 28 ++++++-------------
 2 files changed, 61 insertions(+), 20 deletions(-)
 create mode 100644 src/actions/exit.ts

diff --git a/src/actions/exit.ts b/src/actions/exit.ts
new file mode 100644
index 00000000..780c4e0f
--- /dev/null
+++ b/src/actions/exit.ts
@@ -0,0 +1,53 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import {ShortcutRegistry, utils as BlocklyUtils} from 'blockly/core';
+
+import type {WorkspaceSvg} from 'blockly/core';
+
+import * as Constants from '../constants';
+import type {Navigation} from '../navigation';
+
+const KeyCodes = BlocklyUtils.KeyCodes;
+
+/**
+ * Class for registering a shortcut for the exit action.
+ */
+export class ExitAction {
+  constructor(
+    private navigation: Navigation,
+    private canCurrentlyNavigate: (ws: WorkspaceSvg) => boolean,
+  ) {}
+
+  /**
+   * Adds the exit action shortcut to the registry.
+   */
+  install() {
+    ShortcutRegistry.registry.register({
+      name: Constants.SHORTCUT_NAMES.EXIT,
+      preconditionFn: (workspace) => this.canCurrentlyNavigate(workspace),
+      callback: (workspace) => {
+        switch (this.navigation.getState(workspace)) {
+          case Constants.STATE.FLYOUT:
+          case Constants.STATE.TOOLBOX:
+            this.navigation.focusWorkspace(workspace);
+            return true;
+          default:
+            return false;
+        }
+      },
+      keyCodes: [KeyCodes.ESC],
+      allowCollision: true,
+    });
+  }
+
+  /**
+   * Removes the exit action shortcut.
+   */
+  uninstall() {
+    ShortcutRegistry.registry.unregister(Constants.SHORTCUT_NAMES.EXIT);
+  }
+}
diff --git a/src/navigation_controller.ts b/src/navigation_controller.ts
index 724799c3..33974eee 100644
--- a/src/navigation_controller.ts
+++ b/src/navigation_controller.ts
@@ -30,6 +30,7 @@ import {DeleteAction} from './actions/delete';
 import {InsertAction} from './actions/insert';
 import {Clipboard} from './actions/clipboard';
 import {WorkspaceMovement} from './actions/ws_movement';
+import {ExitAction} from './actions/exit';
 
 const KeyCodes = BlocklyUtils.KeyCodes;
 const createSerializedKey = ShortcutRegistry.registry.createSerializedKey.bind(
@@ -65,6 +66,11 @@ export class NavigationController {
     this.canCurrentlyEdit.bind(this),
   );
 
+  exitAction: ExitAction = new ExitAction(
+    this.navigation,
+    this.canCurrentlyNavigate.bind(this),
+  );
+
   hasNavigationFocus: boolean = false;
 
   /**
@@ -504,26 +510,6 @@ export class NavigationController {
       keyCodes: [KeyCodes.T],
     },
 
-    /** Exit the current location and focus on the workspace. */
-    exit: {
-      name: Constants.SHORTCUT_NAMES.EXIT,
-      preconditionFn: (workspace) => this.canCurrentlyNavigate(workspace),
-      callback: (workspace) => {
-        switch (this.navigation.getState(workspace)) {
-          case Constants.STATE.FLYOUT:
-            this.navigation.focusWorkspace(workspace);
-            return true;
-          case Constants.STATE.TOOLBOX:
-            this.navigation.focusWorkspace(workspace);
-            return true;
-          default:
-            return false;
-        }
-      },
-      keyCodes: [KeyCodes.ESC],
-      allowCollision: true,
-    },
-
     /** List all of the currently registered shortcuts. */
     announceShortcuts: {
       name: Constants.SHORTCUT_NAMES.LIST_SHORTCUTS,
@@ -680,6 +666,7 @@ export class NavigationController {
     this.deleteAction.install();
     this.insertAction.install();
     this.workspaceMovement.install();
+    this.exitAction.install();
 
     this.clipboard.install();
 
@@ -701,6 +688,7 @@ export class NavigationController {
     this.insertAction.uninstall();
     this.clipboard.uninstall();
     this.workspaceMovement.uninstall();
+    this.exitAction.uninstall();
 
     this.removeShortcutHandlers();
     this.navigation.dispose();