From 76795c7d1b0abe1115f879ac446f6e87feb60d5f Mon Sep 17 00:00:00 2001
From: zsviczian <viczian.zsolt@gmail.com>
Date: Fri, 6 Oct 2023 16:38:37 +0000
Subject: [PATCH] added shortcut key, fixed regression impacting other tools

---
 src/actions/actionCanvas.tsx | 2 --
 src/actions/shortcuts.ts     | 2 ++
 src/components/App.tsx       | 2 +-
 src/keys.ts                  | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/actions/actionCanvas.tsx b/src/actions/actionCanvas.tsx
index 9dcb4ec60..24cfa23e9 100644
--- a/src/actions/actionCanvas.tsx
+++ b/src/actions/actionCanvas.tsx
@@ -480,6 +480,4 @@ export const actionToggleLaserPointer = register({
   },
   checked: (appState) => appState.activeTool.type === "laser",
   contextItemLabel: "labels.laser",
-  keyTest: (event) =>
-    event.code === CODES.K && !event[KEYS.CTRL_OR_CMD] && !event.altKey,
 });
diff --git a/src/actions/shortcuts.ts b/src/actions/shortcuts.ts
index 20ab9f7b4..517a5fbca 100644
--- a/src/actions/shortcuts.ts
+++ b/src/actions/shortcuts.ts
@@ -36,6 +36,7 @@ export type ShortcutName =
       | "flipVertical"
       | "hyperlink"
       | "toggleElementLock"
+      | "toggleLaserPointerTool"
     >
   | "saveScene"
   | "imageExport";
@@ -83,6 +84,7 @@ const shortcutMap: Record<ShortcutName, string[]> = {
   viewMode: [getShortcutKey("Alt+R")],
   hyperlink: [getShortcutKey("CtrlOrCmd+K")],
   toggleElementLock: [getShortcutKey("CtrlOrCmd+Shift+L")],
+  toggleLaserPointerTool: [getShortcutKey("K")],
 };
 
 export const getShortcutFromShortcutName = (name: ShortcutName) => {
diff --git a/src/components/App.tsx b/src/components/App.tsx
index d3ea746b6..554a1bd7f 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -4620,7 +4620,7 @@ class App extends React.Component<AppProps, AppState> {
 
     lastPointerUp = onPointerUp;
 
-    if (this.state.activeTool.type === "laser") {
+    if (!this.state.viewModeEnabled || this.state.activeTool.type === "laser") {
       window.addEventListener(EVENT.POINTER_MOVE, onPointerMove);
       window.addEventListener(EVENT.POINTER_UP, onPointerUp);
       window.addEventListener(EVENT.KEYDOWN, onKeyDown);
diff --git a/src/keys.ts b/src/keys.ts
index d4cf0c6f4..f7bf54db5 100644
--- a/src/keys.ts
+++ b/src/keys.ts
@@ -22,7 +22,6 @@ export const CODES = {
   Z: "KeyZ",
   R: "KeyR",
   S: "KeyS",
-  K: "KeyK",
 } as const;
 
 export const KEYS = {