From 6ee380e3fcd0cf817e1e62674ffdfb3c56c366b5 Mon Sep 17 00:00:00 2001
From: Peng Xiao <pengxiao@freewheel.tv>
Date: Tue, 6 Dec 2022 12:42:08 +0800
Subject: [PATCH] fix: add letter shortcuts to some shapes

---
 .../tldraw-logseq/src/components/ToolButton/ToolButton.tsx    | 4 ++--
 tldraw/apps/tldraw-logseq/src/lib/tools/BoxTool.tsx           | 2 +-
 tldraw/apps/tldraw-logseq/src/lib/tools/EllipseTool.tsx       | 1 +
 tldraw/apps/tldraw-logseq/src/lib/tools/EraseTool.tsx         | 2 +-
 tldraw/apps/tldraw-logseq/src/lib/tools/HighlighterTool.tsx   | 2 +-
 tldraw/apps/tldraw-logseq/src/lib/tools/TextTool.tsx          | 2 +-
 tldraw/packages/core/src/lib/tools/TLMoveTool/TLMoveTool.ts   | 2 +-
 .../packages/core/src/lib/tools/TLSelectTool/TLSelectTool.tsx | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tldraw/apps/tldraw-logseq/src/components/ToolButton/ToolButton.tsx b/tldraw/apps/tldraw-logseq/src/components/ToolButton/ToolButton.tsx
index c0735d654d..965164fdf9 100644
--- a/tldraw/apps/tldraw-logseq/src/components/ToolButton/ToolButton.tsx
+++ b/tldraw/apps/tldraw-logseq/src/components/ToolButton/ToolButton.tsx
@@ -24,9 +24,9 @@ export const ToolButton = observer(({ id, icon, title, ...props }: ToolButtonPro
   // Tool must exist
   const Tool = [...app.Tools, TLSelectTool, TLMoveTool]?.find(T => T.id === id)
 
-  const shortcut = ((Tool as any)['shortcut'] as string[])?.[0]
+  const shortcut = ((Tool as any)['shortcut'] as string[])?.join(', ').toUpperCase()
 
-  const titleWithShortcut = shortcut ? `${title} (${shortcut})` : title
+  const titleWithShortcut = shortcut ? `${title} - ${shortcut}` : title
   return (
     <Button
       {...props}
diff --git a/tldraw/apps/tldraw-logseq/src/lib/tools/BoxTool.tsx b/tldraw/apps/tldraw-logseq/src/lib/tools/BoxTool.tsx
index 5b9b30c8db..5cf43c92e5 100644
--- a/tldraw/apps/tldraw-logseq/src/lib/tools/BoxTool.tsx
+++ b/tldraw/apps/tldraw-logseq/src/lib/tools/BoxTool.tsx
@@ -4,6 +4,6 @@ import { BoxShape, type Shape } from '../shapes'
 
 export class BoxTool extends TLBoxTool<BoxShape, Shape, TLReactEventMap> {
   static id = 'box'
-  static shortcut = ['7']
+  static shortcut = ['7', 'r']
   Shape = BoxShape
 }
diff --git a/tldraw/apps/tldraw-logseq/src/lib/tools/EllipseTool.tsx b/tldraw/apps/tldraw-logseq/src/lib/tools/EllipseTool.tsx
index f12b08e85c..825d9c4087 100644
--- a/tldraw/apps/tldraw-logseq/src/lib/tools/EllipseTool.tsx
+++ b/tldraw/apps/tldraw-logseq/src/lib/tools/EllipseTool.tsx
@@ -4,5 +4,6 @@ import { EllipseShape, type Shape } from '../shapes'
 
 export class EllipseTool extends TLBoxTool<EllipseShape, Shape, TLReactEventMap> {
   static id = 'ellipse'
+  static shortcut = ['o']
   Shape = EllipseShape
 }
diff --git a/tldraw/apps/tldraw-logseq/src/lib/tools/EraseTool.tsx b/tldraw/apps/tldraw-logseq/src/lib/tools/EraseTool.tsx
index f0d5aa85bc..99b24c4ca1 100644
--- a/tldraw/apps/tldraw-logseq/src/lib/tools/EraseTool.tsx
+++ b/tldraw/apps/tldraw-logseq/src/lib/tools/EraseTool.tsx
@@ -4,5 +4,5 @@ import type { Shape } from '../shapes'
 
 export class NuEraseTool extends TLEraseTool<Shape, TLReactEventMap> {
   static id = 'erase'
-  static shortcut = ['4']
+  static shortcut = ['4', 'e']
 }
diff --git a/tldraw/apps/tldraw-logseq/src/lib/tools/HighlighterTool.tsx b/tldraw/apps/tldraw-logseq/src/lib/tools/HighlighterTool.tsx
index 661ca3448c..02468efe1e 100644
--- a/tldraw/apps/tldraw-logseq/src/lib/tools/HighlighterTool.tsx
+++ b/tldraw/apps/tldraw-logseq/src/lib/tools/HighlighterTool.tsx
@@ -4,7 +4,7 @@ import { HighlighterShape, type Shape } from '../shapes'
 
 export class HighlighterTool extends TLDrawTool<HighlighterShape, Shape, TLReactEventMap> {
   static id = 'highlighter'
-  static shortcut = ['3']
+  static shortcut = ['3', 'h']
   Shape = HighlighterShape
   simplify = true
   simplifyTolerance = 0.618
diff --git a/tldraw/apps/tldraw-logseq/src/lib/tools/TextTool.tsx b/tldraw/apps/tldraw-logseq/src/lib/tools/TextTool.tsx
index 8bf38f675e..889dfe5e01 100644
--- a/tldraw/apps/tldraw-logseq/src/lib/tools/TextTool.tsx
+++ b/tldraw/apps/tldraw-logseq/src/lib/tools/TextTool.tsx
@@ -4,6 +4,6 @@ import { TextShape, type Shape } from '../shapes'
 
 export class TextTool extends TLTextTool<TextShape, Shape, TLReactEventMap> {
   static id = 'text'
-  static shortcut = ['6']
+  static shortcut = ['6', 't']
   Shape = TextShape
 }
diff --git a/tldraw/packages/core/src/lib/tools/TLMoveTool/TLMoveTool.ts b/tldraw/packages/core/src/lib/tools/TLMoveTool/TLMoveTool.ts
index bb49bde8f1..12377e1928 100644
--- a/tldraw/packages/core/src/lib/tools/TLMoveTool/TLMoveTool.ts
+++ b/tldraw/packages/core/src/lib/tools/TLMoveTool/TLMoveTool.ts
@@ -10,7 +10,7 @@ export class TLMoveTool<
   R extends TLApp<S, K> = TLApp<S, K>
 > extends TLTool<S, K, R> {
   static id = 'move'
-  static shortcut = ['9']
+  static shortcut = ['m', '9']
 
   static states = [IdleState, IdleHoldState, PanningState, PinchingState]
 
diff --git a/tldraw/packages/core/src/lib/tools/TLSelectTool/TLSelectTool.tsx b/tldraw/packages/core/src/lib/tools/TLSelectTool/TLSelectTool.tsx
index 68f51161a6..0c87cdcde0 100644
--- a/tldraw/packages/core/src/lib/tools/TLSelectTool/TLSelectTool.tsx
+++ b/tldraw/packages/core/src/lib/tools/TLSelectTool/TLSelectTool.tsx
@@ -33,7 +33,7 @@ export class TLSelectTool<
 
   static initial = 'idle'
 
-  static shortcut = ['8']
+  static shortcut = ['s', '8']
 
   static states = [
     IdleState,