Browse Source

added shortcut key, fixed regression impacting other tools

zsviczian 1 year ago
parent
commit
76795c7d1b
4 changed files with 3 additions and 4 deletions
  1. 0 2
      src/actions/actionCanvas.tsx
  2. 2 0
      src/actions/shortcuts.ts
  3. 1 1
      src/components/App.tsx
  4. 0 1
      src/keys.ts

+ 0 - 2
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,
 });

+ 2 - 0
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) => {

+ 1 - 1
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);

+ 0 - 1
src/keys.ts

@@ -22,7 +22,6 @@ export const CODES = {
   Z: "KeyZ",
   R: "KeyR",
   S: "KeyS",
-  K: "KeyK",
 } as const;
 
 export const KEYS = {