From a53aeb9e0d6a1016d4abeaa0b0ff6d7f91e03b3e Mon Sep 17 00:00:00 2001
From: Proful Sadangi <proful.sadangi@gmail.com>
Date: Sun, 21 Nov 2021 02:18:06 +1100
Subject: [PATCH] [feature] Shift drag arrow functionality (#319)

* Shift drag arrow functionality

* fix

* Remove shift effect in onHandleChange

Co-authored-by: Steve Ruiz <steveruizok@gmail.com>
---
 .../tldraw/src/hooks/useKeyboardShortcuts.tsx |  2 -
 .../sessions/ArrowSession/ArrowSession.ts     | 20 ++++++----
 .../src/state/shapes/ArrowUtil/ArrowUtil.tsx  | 39 +++----------------
 3 files changed, 18 insertions(+), 43 deletions(-)

diff --git a/packages/tldraw/src/hooks/useKeyboardShortcuts.tsx b/packages/tldraw/src/hooks/useKeyboardShortcuts.tsx
index c1221553e..f50e6850e 100644
--- a/packages/tldraw/src/hooks/useKeyboardShortcuts.tsx
+++ b/packages/tldraw/src/hooks/useKeyboardShortcuts.tsx
@@ -172,8 +172,6 @@ export function useKeyboardShortcuts(ref: React.RefObject<HTMLDivElement>) {
     () => {
       if (!canHandleEvent()) return
 
-      console.log('Hello')
-
       if (app.session) {
         app.cancelSession()
       } else {
diff --git a/packages/tldraw/src/state/sessions/ArrowSession/ArrowSession.ts b/packages/tldraw/src/state/sessions/ArrowSession/ArrowSession.ts
index a0b806e78..ca01d2403 100644
--- a/packages/tldraw/src/state/sessions/ArrowSession/ArrowSession.ts
+++ b/packages/tldraw/src/state/sessions/ArrowSession/ArrowSession.ts
@@ -85,8 +85,16 @@ export class ArrowSession extends BaseSession {
     if (!handles[handleId].canBind) return
 
     // First update the handle's next point
+    let delta = Vec.sub(currentPoint, handles[handleId].point)
 
-    const delta = Vec.sub(currentPoint, handles[handleId].point)
+    if (shiftKey) {
+      const A = handles[handleId === 'start' ? 'end' : 'start'].point
+      const B = handles[handleId].point
+      const C = Vec.round(Vec.sub(Vec.add(B, delta), shape.point))
+      const angle = Vec.angle(A, C)
+      const adjusted = Vec.rotWith(C, A, Utils.snapAngleToSegments(angle, 24) - angle)
+      delta = Vec.add(delta, Vec.sub(adjusted, C))
+    }
 
     const handle = {
       ...handles[handleId],
@@ -96,13 +104,9 @@ export class ArrowSession extends BaseSession {
 
     const utils = shapeUtils[TDShapeType.Arrow]
 
-    const change = utils.onHandleChange?.(
-      shape,
-      {
-        [handleId]: handle,
-      },
-      { delta, shiftKey, altKey, metaKey }
-    )
+    const change = utils.onHandleChange?.(shape, {
+      [handleId]: handle,
+    })
 
     // If the handle changed produced no change, bail here
     if (!change) return
diff --git a/packages/tldraw/src/state/shapes/ArrowUtil/ArrowUtil.tsx b/packages/tldraw/src/state/shapes/ArrowUtil/ArrowUtil.tsx
index b4938e897..394a5f7f3 100644
--- a/packages/tldraw/src/state/shapes/ArrowUtil/ArrowUtil.tsx
+++ b/packages/tldraw/src/state/shapes/ArrowUtil/ArrowUtil.tsx
@@ -511,45 +511,18 @@ export class ArrowUtil extends TDShapeUtil<T, E> {
       }
     }
 
-    return this.onHandleChange(
-      shape,
-      {
-        [handle.id]: {
-          ...handle,
-          point: Vec.round(handlePoint),
-        },
+    return this.onHandleChange(shape, {
+      [handle.id]: {
+        ...handle,
+        point: Vec.round(handlePoint),
       },
-      { shiftKey: false }
-    )
+    })
   }
 
-  onHandleChange = (
-    shape: T,
-    handles: Partial<T['handles']>,
-    { shiftKey }: Partial<TLPointerInfo>
-  ): Partial<T> | void => {
+  onHandleChange = (shape: T, handles: Partial<T['handles']>): Partial<T> | void => {
     let nextHandles = Utils.deepMerge<ArrowShape['handles']>(shape.handles, handles)
     let nextBend = shape.bend
 
-    // If the user is holding shift, we want to snap the handles to angles
-    Object.values(handles).forEach((handle) => {
-      if (!handle) return
-
-      if ((handle.id === 'start' || handle.id === 'end') && shiftKey) {
-        const point = handle.point
-
-        const other = handle.id === 'start' ? shape.handles.end : shape.handles.start
-
-        const angle = Vec.angle(other.point, point)
-
-        const distance = Vec.dist(other.point, point)
-
-        const newAngle = Utils.snapAngleToSegments(angle, 24)
-
-        handle.point = Vec.nudgeAtAngle(other.point, newAngle, distance)
-      }
-    })
-
     nextHandles = {
       ...nextHandles,
       start: {