From e0b8e6690656617919b00d25679c89566dac01bd Mon Sep 17 00:00:00 2001
From: Peng Xiao <pengxiao@outlook.com>
Date: Wed, 10 Aug 2022 17:26:40 +0800
Subject: [PATCH] fix: some keybindings not working issue

---
 tldraw/packages/core/src/lib/TLState.ts    | 3 ++-
 tldraw/packages/core/src/utils/KeyUtils.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tldraw/packages/core/src/lib/TLState.ts b/tldraw/packages/core/src/lib/TLState.ts
index 3f1fc9ad3..47aa542a2 100644
--- a/tldraw/packages/core/src/lib/TLState.ts
+++ b/tldraw/packages/core/src/lib/TLState.ts
@@ -420,8 +420,9 @@ export abstract class TLState<
     // @ts-ignore
     const shortcut = this.constructor['shortcut'] as string
     if (shortcut) {
-      KeyUtils.registerShortcut(shortcut, () => {
+      KeyUtils.registerShortcut(shortcut, e => {
         this.parent.transition(this.id)
+        e.stopPropagation()
       })
     }
 
diff --git a/tldraw/packages/core/src/utils/KeyUtils.ts b/tldraw/packages/core/src/utils/KeyUtils.ts
index dcd94c574..bcc1dea15 100644
--- a/tldraw/packages/core/src/utils/KeyUtils.ts
+++ b/tldraw/packages/core/src/utils/KeyUtils.ts
@@ -24,7 +24,7 @@ export class KeyUtils {
       }
       callback(keyboardEvent, combo)
     }
-    Mousetrap.bind(keys, fn)
+    Mousetrap.bind(keys, fn, 'keydown')
     return () => Mousetrap.unbind(keys)
   }
 }