fix: Jump inside

Signed-off-by: Mark Tolmacs <mark@lazycat.hu>

packages/element/src/binding.ts

@@ -694,6 +694,7 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
     localPoint,
     elementsMap,
   );
+
   const hit = getHoveredElementForBinding(
     globalPoint,
     elements,
@@ -749,7 +750,8 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
           : // NOTE: Can only affect the start point because new arrows always drag the end point
           opts?.newArrow
           ? appState.selectedLinearElement!.initialState.origin!
-          : LinearElementEditor.getPointAtIndexGlobalCoordinates(
+          : appState.selectedLinearElement?.initialState.altFocusPoint ||
+            LinearElementEditor.getPointAtIndexGlobalCoordinates(
               arrow,
               0,
               elementsMap,
@@ -760,7 +762,8 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
         element: hit,
         focusPoint: endDragged
           ? globalPoint
-          : LinearElementEditor.getPointAtIndexGlobalCoordinates(
+          : appState.selectedLinearElement?.initialState.altFocusPoint ||
+            LinearElementEditor.getPointAtIndexGlobalCoordinates(
               arrow,
               -1,
               elementsMap,
@@ -833,41 +836,56 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
       overrideShouldTestInside: true,
     });
   const otherPointWasInsideAtStart =
-    !appState.selectedLinearElement?.initialState.altFocusPoint ||
+    appState.selectedLinearElement?.initialState
-    pointsEqual(
+      .arrowOtherEndpointInitialBinding?.mode === "inside";
-      appState.selectedLinearElement.initialState.altFocusPoint,
-      otherEndpoint,
-    );
   const otherNeverOverride = opts?.newArrow
     ? appState.selectedLinearElement?.initialState.arrowStartIsInside
     : otherBinding?.mode === "inside" && otherPointWasInsideAtStart;
-  const other: BindingStrategy = !otherNeverOverride
+
-    ? otherBindableElement &&
+  let other: BindingStrategy = { mode: undefined };
+  if (!otherNeverOverride) {
+    if (
+      otherBinding?.mode === "inside" &&
+      !otherPointWasInsideAtStart &&
+      otherBindableElement
+    ) {
+      other = {
+        mode: "orbit",
+        element: otherBindableElement,
+        focusPoint: getGlobalFixedPointForBindableElement(
+          otherBinding.fixedPoint,
+          otherBindableElement,
+          elementsMap,
+        ),
+      };
+    } else if (
+      otherBindableElement &&
       !otherFocusPointIsInElement &&
       !pointIsCloseToOtherElement &&
       appState.selectedLinearElement?.initialState.altFocusPoint
-      ? {
+    ) {
-          mode: "orbit",
+      other = {
-          element: otherBindableElement,
+        mode: "orbit",
-          focusPoint: appState.selectedLinearElement.initialState.altFocusPoint,
+        element: otherBindableElement,
-        }
+        focusPoint: appState.selectedLinearElement.initialState.altFocusPoint,
-      : opts?.angleLocked && otherBindableElement
+      };
-      ? {
+    } else if (opts?.angleLocked && otherBindableElement) {
-          mode: "orbit",
+      other = {
-          element: otherBindableElement,
+        mode: "orbit",
-          focusPoint:
+        element: otherBindableElement,
-            projectFixedPointOntoDiagonal(
+        focusPoint:
-              arrow,
+          projectFixedPointOntoDiagonal(
-              otherEndpoint,
+            arrow,
-              otherBindableElement,
+            otherEndpoint,
-              startDragged ? "end" : "start",
+            otherBindableElement,
-              elementsMap,
+            startDragged ? "end" : "start",
-              appState.zoom,
+            elementsMap,
-              appState.isMidpointSnappingEnabled,
+            appState.zoom,
-            ) || otherEndpoint,
+            appState.isMidpointSnappingEnabled,
-        }
+          ) || otherEndpoint,
-      : { mode: undefined }
+      };
-    : { mode: undefined };
+    }
+  }
 
   return {
     start: startDragged ? current : other,

packages/element/src/linearElementEditor.ts

@@ -141,6 +141,7 @@ export class LinearElementEditor {
     };
     arrowStartIsInside: boolean;
     altFocusPoint: Readonly<GlobalPoint> | null;
+    arrowOtherEndpointInitialBinding: FixedPointBinding | null;
   }>;
 
   /** whether you're dragging a point */
@@ -193,6 +194,7 @@ export class LinearElementEditor {
         added: false,
       },
       arrowStartIsInside: false,
+      arrowOtherEndpointInitialBinding: null,
       altFocusPoint: null,
     };
     this.hoverPointIndex = -1;
@@ -764,6 +766,7 @@ export class LinearElementEditor {
         ...editingLinearElement.initialState,
         origin: null,
         arrowStartIsInside: false,
+        arrowOtherEndpointInitialBinding: null,
       },
     };
   }
@@ -1085,6 +1088,10 @@ export class LinearElementEditor {
             !!app.state.newElement &&
             (app.state.bindMode === "inside" || app.state.bindMode === "skip"),
           altFocusPoint: null,
+          arrowOtherEndpointInitialBinding:
+            linearElementEditor.selectedPointsIndices?.includes(0)
+              ? element.startBinding
+              : element.endBinding,
         },
         selectedPointsIndices: [element.points.length - 1],
         lastUncommittedPoint: null,
@@ -1147,6 +1154,10 @@ export class LinearElementEditor {
           !!app.state.newElement &&
           (app.state.bindMode === "inside" || app.state.bindMode === "skip"),
         altFocusPoint: null,
+        arrowOtherEndpointInitialBinding:
+          linearElementEditor.selectedPointsIndices?.includes(0)
+            ? element.startBinding
+            : element.endBinding,
       },
       selectedPointsIndices: nextSelectedPointsIndices,
       pointerOffset: targetPoint
@@ -2409,22 +2420,21 @@ const pointDraggingUpdates = (
       )! as ExcalidrawBindableElement)
     : null;
 
-  const endLocalPoint = startIsDraggingOverEndElement
+  const endLocalPoint =
-    ? nextArrow.points[nextArrow.points.length - 1]
+    endIsDraggingOverStartElement &&
-    : endIsDraggingOverStartElement &&
+    app.state.bindMode !== "inside" &&
-      app.state.bindMode !== "inside" &&
+    getFeatureFlag("COMPLEX_BINDINGS")
-      getFeatureFlag("COMPLEX_BINDINGS")
+      ? nextArrow.points[0]
-    ? nextArrow.points[0]
+      : endBindable
-    : endBindable
+      ? updateBoundPoint(
-    ? updateBoundPoint(
+          nextArrow,
-        nextArrow,
+          "endBinding",
-        "endBinding",
+          nextArrow.endBinding,
-        nextArrow.endBinding,
+          endBindable,
-        endBindable,
+          elementsMap,
-        elementsMap,
+          endIsDragged,
-        endIsDragged,
+        ) || nextArrow.points[nextArrow.points.length - 1]
-      ) || nextArrow.points[nextArrow.points.length - 1]
+      : nextArrow.points[nextArrow.points.length - 1];
-    : nextArrow.points[nextArrow.points.length - 1];
 
   // We need to keep the simulated next arrow up-to-date, because
   // updateBoundPoint looks at the opposite point
@@ -2458,13 +2468,11 @@ const pointDraggingUpdates = (
       : nextArrow.points[0];
 
   const endChanged =
-    !startIsDraggingOverEndElement &&
     !(
       endIsDraggingOverStartElement &&
       app.state.bindMode !== "inside" &&
       getFeatureFlag("COMPLEX_BINDINGS")
-    ) &&
+    ) && !!endBindable;
-    !!endBindable;
   const startChanged =
     pointDistance(startLocalPoint, nextArrow.points[0]) !== 0;
 

packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap

@@ -8663,6 +8663,7 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] appState 1`
     "hoveredFocusPointBinding": null,
     "initialState": {
       "altFocusPoint": null,
+      "arrowOtherEndpointInitialBinding": null,
       "arrowStartIsInside": false,
       "lastClickedPoint": -1,
       "origin": null,
@@ -8895,6 +8896,7 @@ exports[`regression tests > key 6 selects line tool > [end of test] appState 1`]
     "hoveredFocusPointBinding": null,
     "initialState": {
       "altFocusPoint": null,
+      "arrowOtherEndpointInitialBinding": null,
       "arrowStartIsInside": false,
       "lastClickedPoint": -1,
       "origin": null,
@@ -9317,6 +9319,7 @@ exports[`regression tests > key a selects arrow tool > [end of test] appState 1`
     "hoveredFocusPointBinding": null,
     "initialState": {
       "altFocusPoint": null,
+      "arrowOtherEndpointInitialBinding": null,
       "arrowStartIsInside": false,
       "lastClickedPoint": -1,
       "origin": null,
@@ -9729,6 +9732,7 @@ exports[`regression tests > key l selects line tool > [end of test] appState 1`]
     "hoveredFocusPointBinding": null,
     "initialState": {
       "altFocusPoint": null,
+      "arrowOtherEndpointInitialBinding": null,
       "arrowStartIsInside": false,
       "lastClickedPoint": -1,
       "origin": null,