开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.
fix(hotkey): move preventDefault() into specific conditional branching (#303)
pubuzhixing8df417817f6ce
diff --git a/package-lock.json b/package-lock.jsonindex b10c937..e0f4282 100644--- a/package-lock.json+++ b/package-lock.json@@ -53,6 +53,7 @@"@swc/core": "~1.5.7","@swc/helpers": "~0.5.11","@testing-library/react": "15.0.6",+ "@types/is-hotkey": "^0.1.10","@types/jest": "^29.4.0","@types/node": "18.16.9","@types/react": "18.3.1",@@ -6220,6 +6221,12 @@"integrity": "sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==","dev": true},+ "node_modules/@types/is-hotkey": {+ "version": "0.1.10",+ "resolved": "https://registry.npmjs.org/@types/is-hotkey/-/is-hotkey-0.1.10.tgz",+ "integrity": "sha512-RvC8KMw5BCac1NvRRyaHgMMEtBaZ6wh0pyPTBu7izn4Sj/AX9Y4aXU5c7rX8PnM/knsuUpC1IeoBkANtxBypsQ==",+ "dev": true+ },"node_modules/@types/istanbul-lib-coverage": {"version": "2.0.6","resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",diff --git a/package.json b/package.jsonindex 44ba127..c005595 100644--- a/package.json+++ b/package.json@@ -57,6 +57,7 @@"@swc/core": "~1.5.7","@swc/helpers": "~0.5.11","@testing-library/react": "15.0.6",+ "@types/is-hotkey": "^0.1.10","@types/jest": "^29.4.0","@types/node": "18.16.9","@types/react": "18.3.1",diff --git a/packages/drawnix/src/plugins/with-hotkey.ts b/packages/drawnix/src/plugins/with-hotkey.tsindex c0d2808..2a61395 100644--- a/packages/drawnix/src/plugins/with-hotkey.ts+++ b/packages/drawnix/src/plugins/with-hotkey.ts@@ -50,11 +50,15 @@ export const buildDrawnixHotkeyPlugin = (}if (isHotkey(['mod+u'])(event)) {addImage(board);+ event.preventDefault();+ return;}if (!event.altKey && !event.metaKey && !event.ctrlKey) {if (event.key === 'h') {BoardTransforms.updatePointerType(board, PlaitPointerType.hand);updateAppState({ pointer: PlaitPointerType.hand });+ event.preventDefault();+ return;}if (event.key === 'v') {BoardTransforms.updatePointerType(@@ -62,21 +66,29 @@ export const buildDrawnixHotkeyPlugin = (PlaitPointerType.selection);updateAppState({ pointer: PlaitPointerType.selection });+ event.preventDefault();+ return;}if (event.key === 'm') {setCreationMode(board, BoardCreationMode.dnd);BoardTransforms.updatePointerType(board, MindPointerType.mind);updateAppState({ pointer: MindPointerType.mind });+ event.preventDefault();+ return;}if (event.key === 'e') {setCreationMode(board, BoardCreationMode.drawing);BoardTransforms.updatePointerType(board, FreehandShape.eraser);updateAppState({ pointer: FreehandShape.eraser });+ event.preventDefault();+ return;}if (event.key === 'p') {setCreationMode(board, BoardCreationMode.drawing);BoardTransforms.updatePointerType(board, FreehandShape.feltTipPen);updateAppState({ pointer: FreehandShape.feltTipPen });+ event.preventDefault();+ return;}if (event.key === 'a' && !isHotkey(['mod+a'])(event)) {// will trigger editing text@@ -84,6 +96,8 @@ export const buildDrawnixHotkeyPlugin = (setCreationMode(board, BoardCreationMode.drawing);BoardTransforms.updatePointerType(board, ArrowLineShape.straight);updateAppState({ pointer: ArrowLineShape.straight });+ event.preventDefault();+ return;}}if (event.key === 'r' || event.key === 'o' || event.key === 't') {@@ -99,9 +113,9 @@ export const buildDrawnixHotkeyPlugin = (}BoardTransforms.updatePointerType(board, keyToPointer[event.key]);updateAppState({ pointer: keyToPointer[event.key] });+ event.preventDefault();+ return;}- event.preventDefault();- return;}}globalKeyDown(event);