Dylan/excalidraw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added shortcut key, fixed regression impacting other tools

Browse Source
This commit is contained in:
zsviczian 2023-10-06 16:38:37 +00:00
parent ca22a52102
commit 76795c7d1b
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions/actionCanvas.tsx
View File

@ -480,6 +480,4 @@ export const actionToggleLaserPointer = register({
}, },
checked: (appState) => appState.activeTool.type === "laser", checked: (appState) => appState.activeTool.type === "laser",
contextItemLabel: "labels.laser", contextItemLabel: "labels.laser",
keyTest: (event) =>
event.code === CODES.K && !event[KEYS.CTRL_OR_CMD] && !event.altKey,
}); });

2
src/actions/shortcuts.ts
View File

@ -36,6 +36,7 @@ export type ShortcutName =
| "flipVertical" | "flipVertical"
| "hyperlink" | "hyperlink"
| "toggleElementLock" | "toggleElementLock"
| "toggleLaserPointerTool"
> >
| "saveScene" | "saveScene"
| "imageExport"; | "imageExport";
@ -83,6 +84,7 @@ const shortcutMap: Record<ShortcutName, string[]> = {
viewMode: [getShortcutKey("Alt+R")], viewMode: [getShortcutKey("Alt+R")],
hyperlink: [getShortcutKey("CtrlOrCmd+K")], hyperlink: [getShortcutKey("CtrlOrCmd+K")],
toggleElementLock: [getShortcutKey("CtrlOrCmd+Shift+L")], toggleElementLock: [getShortcutKey("CtrlOrCmd+Shift+L")],
toggleLaserPointerTool: [getShortcutKey("K")],
}; };
export const getShortcutFromShortcutName = (name: ShortcutName) => { export const getShortcutFromShortcutName = (name: ShortcutName) => {

2
src/components/App.tsx
View File

@ -4620,7 +4620,7 @@ class App extends React.Component<AppProps, AppState> {
lastPointerUp = onPointerUp; 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_MOVE, onPointerMove);
window.addEventListener(EVENT.POINTER_UP, onPointerUp); window.addEventListener(EVENT.POINTER_UP, onPointerUp);
window.addEventListener(EVENT.KEYDOWN, onKeyDown); window.addEventListener(EVENT.KEYDOWN, onKeyDown);

1
src/keys.ts
View File

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