From dad6daf7587bcd7df65046c82061ee5b37b2869e Mon Sep 17 00:00:00 2001
From: Proful Sadangi <proful.sadangi@gmail.com>
Date: Mon, 22 Nov 2021 23:28:56 +1100
Subject: [PATCH] [feature] Added LineTool functionality (#343)

* Added LineTool functionality

* Fix Typo error

* Create LineIcon

* Update useKeyboardShortcuts.tsx

Co-authored-by: Steve Ruiz <steveruizok@gmail.com>
---
 .../components/Primitives/icons/LineIcon.tsx  |  9 +++++
 .../src/components/Primitives/icons/index.ts  |  1 +
 .../components/ToolsPanel/PrimaryTools.tsx    |  6 ++--
 .../src/components/ToolsPanel/ShapesMenu.tsx  |  6 ++--
 .../tldraw/src/hooks/useKeyboardShortcuts.tsx | 14 ++++++--
 packages/tldraw/src/state/TldrawApp.ts        |  2 ++
 .../src/state/tools/LineTool/LineTool.spec.ts |  9 +++++
 .../src/state/tools/LineTool/LineTool.ts      | 36 +++++++++++++++++++
 .../tldraw/src/state/tools/LineTool/index.ts  |  1 +
 packages/tldraw/src/state/tools/index.ts      |  3 ++
 packages/tldraw/src/types.ts                  |  2 ++
 11 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 packages/tldraw/src/components/Primitives/icons/LineIcon.tsx
 create mode 100644 packages/tldraw/src/state/tools/LineTool/LineTool.spec.ts
 create mode 100644 packages/tldraw/src/state/tools/LineTool/LineTool.ts
 create mode 100644 packages/tldraw/src/state/tools/LineTool/index.ts

diff --git a/packages/tldraw/src/components/Primitives/icons/LineIcon.tsx b/packages/tldraw/src/components/Primitives/icons/LineIcon.tsx
new file mode 100644
index 000000000..2ab367dea
--- /dev/null
+++ b/packages/tldraw/src/components/Primitives/icons/LineIcon.tsx
@@ -0,0 +1,9 @@
+import * as React from 'react'
+
+export function LineIcon() {
+  return (
+    <svg width="15" height="15" viewBox="0 0 15 15" fill="black" xmlns="http://www.w3.org/2000/svg">
+      <path d="M3.64645 11.3536C3.45118 11.1583 3.45118 10.8417 3.64645 10.6465L11.1464 3.14645C11.3417 2.95118 11.6583 2.95118 11.8536 3.14645C12.0488 3.34171 12.0488 3.65829 11.8536 3.85355L4.35355 11.3536C4.15829 11.5488 3.84171 11.5488 3.64645 11.3536Z" />
+    </svg>
+  )
+}
diff --git a/packages/tldraw/src/components/Primitives/icons/index.ts b/packages/tldraw/src/components/Primitives/icons/index.ts
index 03a08533a..95521c38a 100644
--- a/packages/tldraw/src/components/Primitives/icons/index.ts
+++ b/packages/tldraw/src/components/Primitives/icons/index.ts
@@ -14,3 +14,4 @@ export * from './SizeLargeIcon'
 export * from './EraserIcon'
 export * from './MultiplayerIcon'
 export * from './DiscordIcon'
+export * from './LineIcon'
diff --git a/packages/tldraw/src/components/ToolsPanel/PrimaryTools.tsx b/packages/tldraw/src/components/ToolsPanel/PrimaryTools.tsx
index 58ce890ac..e8510fa1c 100644
--- a/packages/tldraw/src/components/ToolsPanel/PrimaryTools.tsx
+++ b/packages/tldraw/src/components/ToolsPanel/PrimaryTools.tsx
@@ -75,7 +75,7 @@ export const PrimaryTools = React.memo(function PrimaryTools(): JSX.Element {
       </ToolButtonWithTooltip>
       <ShapesMenu activeTool={activeTool} isToolLocked={isToolLocked} />
       <ToolButtonWithTooltip
-        kbd={'6'}
+        kbd={'7'}
         label={TDShapeType.Arrow}
         onClick={selectArrowTool}
         isLocked={isToolLocked}
@@ -84,7 +84,7 @@ export const PrimaryTools = React.memo(function PrimaryTools(): JSX.Element {
         <ArrowTopRightIcon />
       </ToolButtonWithTooltip>
       <ToolButtonWithTooltip
-        kbd={'7'}
+        kbd={'8'}
         label={TDShapeType.Text}
         onClick={selectTextTool}
         isLocked={isToolLocked}
@@ -93,7 +93,7 @@ export const PrimaryTools = React.memo(function PrimaryTools(): JSX.Element {
         <TextIcon />
       </ToolButtonWithTooltip>
       <ToolButtonWithTooltip
-        kbd={'8'}
+        kbd={'9'}
         label={TDShapeType.Sticky}
         onClick={selectStickyTool}
         isActive={activeTool === TDShapeType.Sticky}
diff --git a/packages/tldraw/src/components/ToolsPanel/ShapesMenu.tsx b/packages/tldraw/src/components/ToolsPanel/ShapesMenu.tsx
index bf01f3230..d5ceb29fd 100644
--- a/packages/tldraw/src/components/ToolsPanel/ShapesMenu.tsx
+++ b/packages/tldraw/src/components/ToolsPanel/ShapesMenu.tsx
@@ -6,17 +6,19 @@ import { TDShapeType, TDToolType } from '~types'
 import { useTldrawApp } from '~hooks'
 import { SquareIcon, CircleIcon } from '@radix-ui/react-icons'
 import { Tooltip } from '~components/Primitives/Tooltip'
+import { LineIcon } from '~components/Primitives/icons'
 
 interface ShapesMenuProps {
   activeTool: TDToolType
   isToolLocked: boolean
 }
 
-type ShapeShape = TDShapeType.Rectangle | TDShapeType.Ellipse
-const shapeShapes: ShapeShape[] = [TDShapeType.Rectangle, TDShapeType.Ellipse]
+type ShapeShape = TDShapeType.Rectangle | TDShapeType.Ellipse | TDShapeType.Line
+const shapeShapes: ShapeShape[] = [TDShapeType.Rectangle, TDShapeType.Ellipse, TDShapeType.Line]
 const shapeShapeIcons = {
   [TDShapeType.Rectangle]: <SquareIcon />,
   [TDShapeType.Ellipse]: <CircleIcon />,
+  [TDShapeType.Line]: <LineIcon />,
 }
 
 export const ShapesMenu = React.memo(function ShapesMenu({
diff --git a/packages/tldraw/src/hooks/useKeyboardShortcuts.tsx b/packages/tldraw/src/hooks/useKeyboardShortcuts.tsx
index f50e6850e..c66bf5b3b 100644
--- a/packages/tldraw/src/hooks/useKeyboardShortcuts.tsx
+++ b/packages/tldraw/src/hooks/useKeyboardShortcuts.tsx
@@ -66,7 +66,7 @@ export function useKeyboardShortcuts(ref: React.RefObject<HTMLDivElement>) {
     'a,6',
     () => {
       if (!canHandleEvent()) return
-      app.selectTool(TDShapeType.Arrow)
+      app.selectTool(TDShapeType.Line)
     },
     undefined,
     [app]
@@ -76,7 +76,7 @@ export function useKeyboardShortcuts(ref: React.RefObject<HTMLDivElement>) {
     't,7',
     () => {
       if (!canHandleEvent()) return
-      app.selectTool(TDShapeType.Text)
+      app.selectTool(TDShapeType.Arrow)
     },
     undefined,
     [app]
@@ -84,6 +84,16 @@ export function useKeyboardShortcuts(ref: React.RefObject<HTMLDivElement>) {
 
   useHotkeys(
     'n,8',
+    () => {
+      if (!canHandleEvent()) return
+      app.selectTool(TDShapeType.Text)
+    },
+    undefined,
+    [app]
+  )
+
+  useHotkeys(
+    'n,9',
     () => {
       if (!canHandleEvent()) return
       app.selectTool(TDShapeType.Sticky)
diff --git a/packages/tldraw/src/state/TldrawApp.ts b/packages/tldraw/src/state/TldrawApp.ts
index 9b53be208..b8fda364d 100644
--- a/packages/tldraw/src/state/TldrawApp.ts
+++ b/packages/tldraw/src/state/TldrawApp.ts
@@ -56,6 +56,7 @@ import { TextTool } from './tools/TextTool'
 import { DrawTool } from './tools/DrawTool'
 import { EllipseTool } from './tools/EllipseTool'
 import { RectangleTool } from './tools/RectangleTool'
+import { LineTool } from './tools/LineTool'
 import { ArrowTool } from './tools/ArrowTool'
 import { StickyTool } from './tools/StickyTool'
 
@@ -130,6 +131,7 @@ export class TldrawApp extends StateManager<TDSnapshot> {
     [TDShapeType.Draw]: new DrawTool(this),
     [TDShapeType.Ellipse]: new EllipseTool(this),
     [TDShapeType.Rectangle]: new RectangleTool(this),
+    [TDShapeType.Line]: new LineTool(this),
     [TDShapeType.Arrow]: new ArrowTool(this),
     [TDShapeType.Sticky]: new StickyTool(this),
   }
diff --git a/packages/tldraw/src/state/tools/LineTool/LineTool.spec.ts b/packages/tldraw/src/state/tools/LineTool/LineTool.spec.ts
new file mode 100644
index 000000000..7a1d76b08
--- /dev/null
+++ b/packages/tldraw/src/state/tools/LineTool/LineTool.spec.ts
@@ -0,0 +1,9 @@
+import { TldrawApp } from '~state'
+import { LineTool } from '.'
+
+describe('LineTool', () => {
+  it('creates tool', () => {
+    const app = new TldrawApp()
+    new LineTool(app)
+  })
+})
diff --git a/packages/tldraw/src/state/tools/LineTool/LineTool.ts b/packages/tldraw/src/state/tools/LineTool/LineTool.ts
new file mode 100644
index 000000000..d74b60f56
--- /dev/null
+++ b/packages/tldraw/src/state/tools/LineTool/LineTool.ts
@@ -0,0 +1,36 @@
+import { Utils, TLPointerEventHandler } from '@tldraw/core'
+import { Arrow } from '~state/shapes'
+import { SessionType, TDShapeType } from '~types'
+import { BaseTool, Status } from '../BaseTool'
+
+export class LineTool extends BaseTool {
+  type = TDShapeType.Line as const
+
+  /* ----------------- Event Handlers ----------------- */
+
+  onPointerDown: TLPointerEventHandler = () => {
+    const {
+      currentPoint,
+      appState: { currentPageId, currentStyle },
+    } = this.app
+
+    const childIndex = this.getNextChildIndex()
+
+    const id = Utils.uniqueId()
+
+    const newShape = Arrow.create({
+      id,
+      parentId: currentPageId,
+      childIndex,
+      point: currentPoint,
+      decorations: undefined,
+      style: { ...currentStyle },
+    })
+
+    this.app.patchCreate([newShape])
+
+    this.app.startSession(SessionType.Arrow, newShape.id, 'end', true)
+
+    this.setStatus(Status.Creating)
+  }
+}
diff --git a/packages/tldraw/src/state/tools/LineTool/index.ts b/packages/tldraw/src/state/tools/LineTool/index.ts
new file mode 100644
index 000000000..a59ca3d7a
--- /dev/null
+++ b/packages/tldraw/src/state/tools/LineTool/index.ts
@@ -0,0 +1 @@
+export * from './LineTool'
diff --git a/packages/tldraw/src/state/tools/index.ts b/packages/tldraw/src/state/tools/index.ts
index 955e07721..5c4f13bba 100644
--- a/packages/tldraw/src/state/tools/index.ts
+++ b/packages/tldraw/src/state/tools/index.ts
@@ -1,5 +1,6 @@
 import { TDShapeType, TDToolType } from '~types'
 import { ArrowTool } from './ArrowTool'
+import { LineTool } from './LineTool'
 import { DrawTool } from './DrawTool'
 import { EllipseTool } from './EllipseTool'
 import { RectangleTool } from './RectangleTool'
@@ -15,6 +16,7 @@ export interface ToolsMap {
   [TDShapeType.Draw]: typeof DrawTool
   [TDShapeType.Ellipse]: typeof EllipseTool
   [TDShapeType.Rectangle]: typeof RectangleTool
+  [TDShapeType.Line]: typeof LineTool
   [TDShapeType.Arrow]: typeof ArrowTool
   [TDShapeType.Sticky]: typeof StickyTool
 }
@@ -30,6 +32,7 @@ export const tools: { [K in TDToolType]: ToolsMap[K] } = {
   [TDShapeType.Draw]: DrawTool,
   [TDShapeType.Ellipse]: EllipseTool,
   [TDShapeType.Rectangle]: RectangleTool,
+  [TDShapeType.Line]: LineTool,
   [TDShapeType.Arrow]: ArrowTool,
   [TDShapeType.Sticky]: StickyTool,
 }
diff --git a/packages/tldraw/src/types.ts b/packages/tldraw/src/types.ts
index a45e38d06..bdefafbd7 100644
--- a/packages/tldraw/src/types.ts
+++ b/packages/tldraw/src/types.ts
@@ -205,6 +205,7 @@ export type TDToolType =
   | TDShapeType.Draw
   | TDShapeType.Ellipse
   | TDShapeType.Rectangle
+  | TDShapeType.Line
   | TDShapeType.Arrow
   | TDShapeType.Sticky
 
@@ -270,6 +271,7 @@ export enum TDShapeType {
   Rectangle = 'rectangle',
   Draw = 'draw',
   Arrow = 'arrow',
+  Line = 'line',
   Text = 'text',
   Group = 'group',
 }