Skip to content

开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.

fix(hotkey): skip creation hotkey when use press special key and the among of alt, meta and ctrl (#262)

pubuzhixing87edd04fabce7
diff --git a/packages/drawnix/src/plugins/with-hotkey.ts b/packages/drawnix/src/plugins/with-hotkey.ts
index d0a0d4c..c0d2808 100644
--- a/packages/drawnix/src/plugins/with-hotkey.ts
+++ b/packages/drawnix/src/plugins/with-hotkey.ts
@@ -48,53 +48,60 @@ export const buildDrawnixHotkeyPlugin = (
event.preventDefault();
return;
}
- if (event.key === 'h') {
- BoardTransforms.updatePointerType(board, PlaitPointerType.hand);
- updateAppState({ pointer: PlaitPointerType.hand });
- }
- if (event.key === 'v') {
- BoardTransforms.updatePointerType(board, PlaitPointerType.selection);
- updateAppState({ pointer: PlaitPointerType.selection });
- }
- if (event.key === 'm') {
- setCreationMode(board, BoardCreationMode.dnd);
- BoardTransforms.updatePointerType(board, MindPointerType.mind);
- updateAppState({ pointer: MindPointerType.mind });
- }
- if (event.key === 'e') {
- setCreationMode(board, BoardCreationMode.drawing);
- BoardTransforms.updatePointerType(board, FreehandShape.eraser);
- updateAppState({ pointer: FreehandShape.eraser });
- }
- if (event.key === 'p') {
- setCreationMode(board, BoardCreationMode.drawing);
- BoardTransforms.updatePointerType(board, FreehandShape.feltTipPen);
- updateAppState({ pointer: FreehandShape.feltTipPen });
+ if (isHotkey(['mod+u'])(event)) {
+ addImage(board);
}
- if (event.key === 'a' && !isHotkey(['mod+a'])(event)) {
- // will trigger editing text
- if (getSelectedElements(board).length === 0) {
- setCreationMode(board, BoardCreationMode.drawing);
- BoardTransforms.updatePointerType(board, ArrowLineShape.straight);
- updateAppState({ pointer: ArrowLineShape.straight });
+ if (!event.altKey && !event.metaKey && !event.ctrlKey) {
+ if (event.key === 'h') {
+ BoardTransforms.updatePointerType(board, PlaitPointerType.hand);
+ updateAppState({ pointer: PlaitPointerType.hand });
}
- }
- if (event.key === 'r' || event.key === 'o' || event.key === 't') {
- const keyToPointer = {
- r: BasicShapes.rectangle,
- o: BasicShapes.ellipse,
- t: BasicShapes.text,
- };
- if (keyToPointer[event.key] === BasicShapes.text) {
+ if (event.key === 'v') {
+ BoardTransforms.updatePointerType(
+ board,
+ PlaitPointerType.selection
+ );
+ updateAppState({ pointer: PlaitPointerType.selection });
+ }
+ if (event.key === 'm') {
setCreationMode(board, BoardCreationMode.dnd);
- } else {
+ BoardTransforms.updatePointerType(board, MindPointerType.mind);
+ updateAppState({ pointer: MindPointerType.mind });
+ }
+ if (event.key === 'e') {
setCreationMode(board, BoardCreationMode.drawing);
+ BoardTransforms.updatePointerType(board, FreehandShape.eraser);
+ updateAppState({ pointer: FreehandShape.eraser });
}
- BoardTransforms.updatePointerType(board, keyToPointer[event.key]);
- updateAppState({ pointer: keyToPointer[event.key] });
- }
- if (isHotkey(['mod+u'])(event)) {
- addImage(board);
+ if (event.key === 'p') {
+ setCreationMode(board, BoardCreationMode.drawing);
+ BoardTransforms.updatePointerType(board, FreehandShape.feltTipPen);
+ updateAppState({ pointer: FreehandShape.feltTipPen });
+ }
+ if (event.key === 'a' && !isHotkey(['mod+a'])(event)) {
+ // will trigger editing text
+ if (getSelectedElements(board).length === 0) {
+ setCreationMode(board, BoardCreationMode.drawing);
+ BoardTransforms.updatePointerType(board, ArrowLineShape.straight);
+ updateAppState({ pointer: ArrowLineShape.straight });
+ }
+ }
+ if (event.key === 'r' || event.key === 'o' || event.key === 't') {
+ const keyToPointer = {
+ r: BasicShapes.rectangle,
+ o: BasicShapes.ellipse,
+ t: BasicShapes.text,
+ };
+ if (keyToPointer[event.key] === BasicShapes.text) {
+ setCreationMode(board, BoardCreationMode.dnd);
+ } else {
+ setCreationMode(board, BoardCreationMode.drawing);
+ }
+ BoardTransforms.updatePointerType(board, keyToPointer[event.key]);
+ updateAppState({ pointer: keyToPointer[event.key] });
+ }
+ event.preventDefault();
+ return;
}
}
globalKeyDown(event);