Merge branch 'master' into mtolmacs/fix/grid-binding

Signed-off-by: Mark Tolmacs <mark@lazycat.hu>
fix: Elbow midpoint
2026-06-04 15:54:48 +00:00 · 2026-03-19 19:46:56 +00:00 · 2026-03-19 16:47:43 +00:00 · 2026-03-19 14:55:56 +00:00 · 2026-03-18 20:25:19 +00:00 · 2026-03-18 16:29:09 +00:00
22 changed files with 773 additions and 538 deletions
@@ -1,4 +1,5 @@
 import {
+  pointFrom,
  pointFromPair,
  type GlobalPoint,
  type LocalPoint,
@@ -69,12 +70,12 @@ export const getGridPoint = (
  x: number,
  y: number,
  gridSize: NullableGridSize,
-): [number, number] => {
+): GlobalPoint => {
  if (gridSize) {
-    return [
+    return pointFrom<GlobalPoint>(
      Math.round(x / gridSize) * gridSize,
      Math.round(y / gridSize) * gridSize,
-    ];
+    );
  }
-  return [x, y];
+  return pointFrom<GlobalPoint>(x, y);
 };
@@ -10,6 +10,7 @@ import {
  getBindingGap,
  getGlobalFixedPointForBindableElement,
  isBindingEnabled,
+  maxBindingDistance_simple,
  unbindBindingElement,
  updateBoundPoint,
 } from "../binding";
@@ -19,7 +20,7 @@ import {
  isElbowArrow,
 } from "../typeChecks";
 import { LinearElementEditor } from "../linearElementEditor";
-import { getHoveredElementForBinding, hitElementItself } from "../collision";
+import { getHoveredElementForFocusPoint, hitElementItself } from "../collision";
 import { moveArrowAboveBindable } from "../zindex";

 import type {
@@ -91,7 +92,7 @@ export const isFocusPointVisible = (
      element: bindableElement,
      elementsMap,
      point: focusPoint,
-      threshold: getBindingGap(bindableElement),
+      threshold: getBindingGap(bindableElement, arrow),
      overrideShouldTestInside: true,
    })
  );
@@ -233,12 +234,12 @@ export const handleFocusPointDrag = (
    pointerCoords.y - offsetY,
  );
  const bindingField = isStartBinding ? "startBinding" : "endBinding";
-  const hit = getHoveredElementForBinding(
-    arrow,
+  const hit = getHoveredElementForFocusPoint(
    point,
+    arrow,
    scene.getNonDeletedElements(),
    elementsMap,
-    appState.zoom,
+    maxBindingDistance_simple(appState.zoom),
  );

  // Hovering a bindable element
@@ -269,7 +270,6 @@ export const handleFocusPointDrag = (
        newMode || "orbit",
        linearElementEditor.draggedFocusPointBinding,
        scene,
-        appState.zoom,
        point,
      );
    }
@@ -1,6 +1,7 @@
 import {
  arrayToMap,
  getFeatureFlag,
+  getGridPoint,
  invariant,
  isTransparent,
 } from "@excalidraw/common";
@@ -22,7 +23,7 @@ import {
 } from "@excalidraw/math";

 import type { LineSegment, LocalPoint, Radians } from "@excalidraw/math";
-import type { AppState } from "@excalidraw/excalidraw/types";
+import type { AppState, NullableGridSize } from "@excalidraw/excalidraw/types";
 import type { MapEntry, Mutable } from "@excalidraw/common/utility-types";
 import type { Bounds } from "@excalidraw/common";

@@ -60,7 +61,6 @@ import { updateElbowArrowPoints } from "./elbowArrow";
 import {
  deconstructDiamondElement,
  deconstructRectanguloidElement,
-  getSnapOutlineMidPoint,
  projectFixedPointOntoDiagonal,
 } from "./utils";

@@ -111,13 +111,18 @@ export type BindingStrategy =
 * IMPORTANT: currently must be > 0 (this also applies to the computed gap)
 */
 export const BASE_BINDING_GAP = 5;
+export const BASE_BINDING_GAP_ELBOW = 5;
 export const BASE_ARROW_MIN_LENGTH = 10;
 export const FOCUS_POINT_SIZE = 10 / 1.5;

 export const getBindingGap = (
  bindTarget: ExcalidrawBindableElement,
+  opts: Pick<ExcalidrawArrowElement, "elbowed">,
 ): number => {
-  return BASE_BINDING_GAP + bindTarget.strokeWidth / 2;
+  return (
+    (opts.elbowed ? BASE_BINDING_GAP_ELBOW : BASE_BINDING_GAP) +
+    bindTarget.strokeWidth / 2
+  );
 };

 export const maxBindingDistance_simple = (zoom?: AppState["zoom"]): number => {
@@ -150,6 +155,7 @@ export const bindOrUnbindBindingElement = (
    altKey?: boolean;
    angleLocked?: boolean;
    initialBinding?: boolean;
+    gridSize?: NullableGridSize;
  },
 ) => {
  const { start, end } = getBindingStrategyForDraggingBindingElementEndpoints(
@@ -166,21 +172,24 @@ export const bindOrUnbindBindingElement = (
    },
  );

+  const isMidpointSnappingEnabled =
+    appState.isMidpointSnappingEnabled && !appState.gridModeEnabled;
+
  bindOrUnbindBindingElementEdge(
    arrow,
    start,
    "start",
    scene,
-    appState.zoom,
    appState.isBindingEnabled,
+    isMidpointSnappingEnabled,
  );
  bindOrUnbindBindingElementEdge(
    arrow,
    end,
    "end",
    scene,
-    appState.zoom,
    appState.isBindingEnabled,
+    isMidpointSnappingEnabled,
  );
  if (start.focusPoint || end.focusPoint) {
    // If the strategy dictates a focus point override, then
@@ -224,8 +233,8 @@ const bindOrUnbindBindingElementEdge = (
  { mode, element, focusPoint }: BindingStrategy,
  startOrEnd: "start" | "end",
  scene: Scene,
-  zoom: AppState["zoom"],
  shouldSnapToOutline = true,
+  isMidpointSnappingEnabled = true,
 ): void => {
  if (mode === null) {
    // null means break the binding
@@ -237,9 +246,9 @@ const bindOrUnbindBindingElementEdge = (
      mode,
      startOrEnd,
      scene,
-      zoom,
      focusPoint,
      shouldSnapToOutline,
+      isMidpointSnappingEnabled,
    );
  }
 };
@@ -270,11 +279,10 @@ const bindingStrategyForElbowArrowEndpointDragging = (
    elementsMap,
  );
  const hit = getHoveredElementForBinding(
-    arrow,
    globalPoint,
    elements,
    elementsMap,
-    zoom,
+    maxBindingDistance_simple(zoom),
  );

  const current = hit
@@ -322,7 +330,7 @@ const bindingStrategyForNewSimpleArrowEndpointDragging = (
    draggingPoints.get(startDragged ? startIdx : endIdx)!.point,
    elementsMap,
  );
-  const hit = getHoveredElementForBinding(arrow, point, elements, elementsMap);
+  const hit = getHoveredElementForBinding(point, elements, elementsMap);

  // With new arrows this handles the binding at arrow creation
  if (startDragged) {
@@ -367,12 +375,7 @@ const bindingStrategyForNewSimpleArrowEndpointDragging = (
    // Check and handle nested shapes
    if (hit && arrow.startBinding) {
      const startBinding = arrow.startBinding;
-      const allHits = getAllHoveredElementAtPoint(
-        arrow,
-        point,
-        elements,
-        elementsMap,
-      );
+      const allHits = getAllHoveredElementAtPoint(point, elements, elementsMap);

      if (allHits.find((el) => el.id === startBinding.elementId)) {
        const otherElement = elementsMap.get(
@@ -474,9 +477,9 @@ const bindingStrategyForSimpleArrowEndpointDragging_complex = (
  let other: BindingStrategy = { mode: undefined };

  const isMultiPoint = arrow.points.length > 2;
-  const hit = getHoveredElementForBinding(arrow, point, elements, elementsMap);
+  const hit = getHoveredElementForBinding(point, elements, elementsMap);
  const isOverlapping = oppositeBinding
-    ? getAllHoveredElementAtPoint(arrow, point, elements, elementsMap).some(
+    ? getAllHoveredElementAtPoint(point, elements, elementsMap).some(
        (el) => el.id === oppositeBinding.elementId,
      )
    : false;
@@ -599,6 +602,7 @@ export const getBindingStrategyForDraggingBindingElementEndpoints = (
    finalize?: boolean;
    initialBinding?: boolean;
    zoom?: AppState["zoom"];
+    gridSize?: NullableGridSize;
  },
 ): { start: BindingStrategy; end: BindingStrategy } => {
  if (getFeatureFlag("COMPLEX_BINDINGS")) {
@@ -639,6 +643,7 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
    finalize?: boolean;
    initialBinding?: boolean;
    zoom?: AppState["zoom"];
+    gridSize?: NullableGridSize;
  },
 ): { start: BindingStrategy; end: BindingStrategy } => {
  const startIdx = 0;
@@ -701,11 +706,12 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
    elementsMap,
  );
  const hit = getHoveredElementForBinding(
-    arrow,
-    globalPoint,
+    opts?.angleLocked || appState.gridModeEnabled
+      ? pointFrom<GlobalPoint>(scenePointerX, scenePointerY)
+      : globalPoint,
    elements,
    elementsMap,
-    appState.zoom,
+    maxBindingDistance_simple(appState.zoom),
  );
  const pointInElement =
    hit &&
@@ -754,7 +760,11 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
          ? globalPoint
          : // NOTE: Can only affect the start point because new arrows always drag the end point
          opts?.newArrow
-          ? appState.selectedLinearElement!.initialState.origin!
+          ? getGridPoint(
+              appState.selectedLinearElement!.initialState.origin![0],
+              appState.selectedLinearElement!.initialState.origin![1],
+              opts.gridSize as NullableGridSize,
+            )
          : LinearElementEditor.getPointAtIndexGlobalCoordinates(
              arrow,
              0,
@@ -813,12 +823,27 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
          focusPoint:
            projectFixedPointOntoDiagonal(
              arrow,
-              globalPoint,
+              opts?.angleLocked || appState.gridModeEnabled
+                ? snapBoundPointToGrid(
+                    pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+                    hit,
+                    elementsMap,
+                    appState.gridSize as NullableGridSize,
+                    arrow,
+                    LinearElementEditor.getPointAtIndexGlobalCoordinates(
+                      arrow,
+                      startDragged ? 1 : -2,
+                      elementsMap,
+                    ),
+                  )
+                : globalPoint,
              hit,
              startDragged ? "start" : "end",
              elementsMap,
              appState.zoom,
-              appState.isMidpointSnappingEnabled,
+              appState.isMidpointSnappingEnabled &&
+                !opts?.angleLocked &&
+                !appState.gridModeEnabled,
            ) || globalPoint,
        }
    : { mode: null };
@@ -863,7 +888,7 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
              startDragged ? "end" : "start",
              elementsMap,
              appState.zoom,
-              appState.isMidpointSnappingEnabled,
+              false,
            ) || otherEndpoint,
        }
      : { mode: undefined }
@@ -1026,9 +1051,9 @@ export const bindBindingElement = (
  mode: BindMode,
  startOrEnd: "start" | "end",
  scene: Scene,
-  zoom: AppState["zoom"],
  focusPoint?: GlobalPoint,
  shouldSnapToOutline = true,
+  isMidpointSnappingEnabled = true,
 ): void => {
  const elementsMap = scene.getNonDeletedElementsMap();

@@ -1043,8 +1068,8 @@ export const bindBindingElement = (
        hoveredElement,
        startOrEnd,
        elementsMap,
-        zoom,
        shouldSnapToOutline,
+        isMidpointSnappingEnabled,
      ),
    };
  } else {
@@ -1268,7 +1293,6 @@ const updateArrowBindings = (
        strategy[strategyName].mode,
        strategyName,
        scene,
-        appState.zoom,
        strategy[strategyName].focusPoint,
      );
    }
@@ -1378,7 +1402,6 @@ export const bindPointToSnapToElementOutline = (
  bindableElement: ExcalidrawBindableElement,
  startOrEnd: "start" | "end",
  elementsMap: ElementsMap,
-  zoom: AppState["zoom"],
  customIntersector?: LineSegment<GlobalPoint>,
  isMidpointSnappingEnabled = true,
 ): GlobalPoint => {
@@ -1411,7 +1434,7 @@ export const bindPointToSnapToElementOutline = (
          startOrEnd === "start" ? 1 : -2,
          elementsMap,
        );
-  const bindingGap = getBindingGap(bindableElement);
+  const bindingGap = getBindingGap(bindableElement, arrowElement);
  const aabb = aabbForElement(bindableElement, elementsMap);
  const bindableCenter = getCenterForBounds(aabb);

@@ -1421,13 +1444,7 @@ export const bindPointToSnapToElementOutline = (
      headingForPointFromElement(bindableElement, aabb, point),
    );
    const snapPoint = isMidpointSnappingEnabled
-      ? getSnapOutlineMidPoint(
-          edgePoint,
-          bindableElement,
-          elementsMap,
-          zoom,
-          arrowElement,
-        )
+      ? snapToMid(bindableElement, elementsMap, edgePoint, 0.05, arrowElement)
      : undefined;
    const resolved = snapPoint || point;
    const otherPoint = pointFrom<GlobalPoint>(
@@ -1472,7 +1489,7 @@ export const bindPointToSnapToElementOutline = (
        bindableElement,
        elementsMap,
        anotherIntersector,
-        BASE_BINDING_GAP,
+        BASE_BINDING_GAP_ELBOW,
      ).sort(pointDistanceSq)[0];
    }
  } else {
@@ -1531,7 +1548,7 @@ export const avoidRectangularCorner = (
    -bindTarget.angle as Radians,
  );

-  const bindingGap = getBindingGap(bindTarget);
+  const bindingGap = getBindingGap(bindTarget, arrowElement);

  if (nonRotatedPoint[0] < bindTarget.x && nonRotatedPoint[1] < bindTarget.y) {
    // Top left
@@ -1609,6 +1626,121 @@ export const avoidRectangularCorner = (
  return p;
 };

+export const snapToMid = (
+  bindTarget: ExcalidrawBindableElement,
+  elementsMap: ElementsMap,
+  p: GlobalPoint,
+  tolerance: number = 0.05,
+  arrowElement?: ExcalidrawArrowElement,
+): GlobalPoint | undefined => {
+  const { x, y, width, height, angle } = bindTarget;
+  const center = elementCenterPoint(bindTarget, elementsMap, -0.1, -0.1);
+  const nonRotated = pointRotateRads(p, center, -angle as Radians);
+
+  const bindingGap = arrowElement ? getBindingGap(bindTarget, arrowElement) : 0;
+
+  // snap-to-center point is adaptive to element size, but we don't want to go
+  // above and below certain px distance
+  const verticalThreshold = clamp(tolerance * height, 5, 80);
+  const horizontalThreshold = clamp(tolerance * width, 5, 80);
+
+  // Too close to the center makes it hard to resolve direction precisely
+  if (pointDistance(center, nonRotated) < bindingGap) {
+    return undefined;
+  }
+
+  if (
+    nonRotated[0] <= x + width / 2 &&
+    nonRotated[1] > center[1] - verticalThreshold &&
+    nonRotated[1] < center[1] + verticalThreshold
+  ) {
+    // LEFT
+    return pointRotateRads(
+      pointFrom<GlobalPoint>(x - bindingGap, center[1]),
+      center,
+      angle,
+    );
+  } else if (
+    nonRotated[1] <= y + height / 2 &&
+    nonRotated[0] > center[0] - horizontalThreshold &&
+    nonRotated[0] < center[0] + horizontalThreshold
+  ) {
+    // TOP
+    return pointRotateRads(
+      pointFrom<GlobalPoint>(center[0], y - bindingGap),
+      center,
+      angle,
+    );
+  } else if (
+    nonRotated[0] >= x + width / 2 &&
+    nonRotated[1] > center[1] - verticalThreshold &&
+    nonRotated[1] < center[1] + verticalThreshold
+  ) {
+    // RIGHT
+    return pointRotateRads(
+      pointFrom<GlobalPoint>(x + width + bindingGap, center[1]),
+      center,
+      angle,
+    );
+  } else if (
+    nonRotated[1] >= y + height / 2 &&
+    nonRotated[0] > center[0] - horizontalThreshold &&
+    nonRotated[0] < center[0] + horizontalThreshold
+  ) {
+    // DOWN
+    return pointRotateRads(
+      pointFrom<GlobalPoint>(center[0], y + height + bindingGap),
+      center,
+      angle,
+    );
+  } else if (bindTarget.type === "diamond") {
+    const distance = bindingGap;
+    const topLeft = pointFrom<GlobalPoint>(
+      x + width / 4 - distance,
+      y + height / 4 - distance,
+    );
+    const topRight = pointFrom<GlobalPoint>(
+      x + (3 * width) / 4 + distance,
+      y + height / 4 - distance,
+    );
+    const bottomLeft = pointFrom<GlobalPoint>(
+      x + width / 4 - distance,
+      y + (3 * height) / 4 + distance,
+    );
+    const bottomRight = pointFrom<GlobalPoint>(
+      x + (3 * width) / 4 + distance,
+      y + (3 * height) / 4 + distance,
+    );
+
+    if (
+      pointDistance(topLeft, nonRotated) <
+      Math.max(horizontalThreshold, verticalThreshold)
+    ) {
+      return pointRotateRads(topLeft, center, angle);
+    }
+    if (
+      pointDistance(topRight, nonRotated) <
+      Math.max(horizontalThreshold, verticalThreshold)
+    ) {
+      return pointRotateRads(topRight, center, angle);
+    }
+    if (
+      pointDistance(bottomLeft, nonRotated) <
+      Math.max(horizontalThreshold, verticalThreshold)
+    ) {
+      return pointRotateRads(bottomLeft, center, angle);
+    }
+    if (
+      pointDistance(bottomRight, nonRotated) <
+      Math.max(horizontalThreshold, verticalThreshold)
+    ) {
+      return pointRotateRads(bottomRight, center, angle);
+    }
+  }
+
+  return undefined;
+};
+
 const extractBinding = (
  arrow: ExcalidrawArrowElement,
  startOrEnd: "startBinding" | "endBinding",
@@ -1642,6 +1774,92 @@ const extractBinding = (
  };
 };

+/**
+ * Snaps a bound arrow endpoint to the grid on the axis parallel to the
+ * bindable element's side, while preserving the binding gap distance on the
+ * perpendicular axis. In other words, the grid axis closest to the side's
+ * perpendicular (normal) is used as the snap axis and the other axis is kept at
+ * the binding gap distance.
+ */
+const snapBoundPointToGrid = (
+  outlinePoint: GlobalPoint,
+  bindableElement: ExcalidrawBindableElement,
+  elementsMap: ElementsMap,
+  gridSize: NullableGridSize,
+  arrowElement: ExcalidrawArrowElement,
+  adjacentPoint?: GlobalPoint,
+): GlobalPoint => {
+  if (!gridSize) {
+    return outlinePoint;
+  }
+
+  const aabb = aabbForElement(bindableElement, elementsMap);
+  // For ellipses and diamonds use the arrow's incoming direction instead of
+  // the position-based heading, which can give the wrong axis when the
+  // outline point is near a cardinal zone or an angled diamond face.
+  const heading =
+    adjacentPoint &&
+    (bindableElement.type === "ellipse" || bindableElement.type === "diamond")
+      ? vectorToHeading(vectorFromPoint(adjacentPoint, outlinePoint))
+      : headingForPointFromElement(bindableElement, aabb, outlinePoint);
+
+  const normalLocal = pointFrom<GlobalPoint>(heading[0], heading[1]);
+  const normalGlobal = pointRotateRads(
+    normalLocal,
+    pointFrom<GlobalPoint>(0, 0),
+    bindableElement.angle,
+  );
+
+  const bindingGap = getBindingGap(bindableElement, arrowElement);
+  const extent =
+    Math.max(bindableElement.width, bindableElement.height) + bindingGap * 2;
+  const center = getCenterForBounds(aabb);
+
+  const absNX = Math.abs(normalGlobal[0]);
+  const absNY = Math.abs(normalGlobal[1]);
+  if (absNX >= absNY) {
+    // Global X is closest to the perpendicular so snap Y, intersect horizontal line
+    const [, snappedY] = getGridPoint(
+      outlinePoint[0],
+      outlinePoint[1],
+      gridSize,
+    );
+    const intersector = lineSegment<GlobalPoint>(
+      pointFrom<GlobalPoint>(center[0] - extent, snappedY),
+      pointFrom<GlobalPoint>(center[0] + extent, snappedY),
+    );
+    const intersection = intersectElementWithLineSegment(
+      bindableElement,
+      elementsMap,
+      intersector,
+      bindingGap,
+    ).sort(
+      (a, b) =>
+        pointDistanceSq(a, outlinePoint) - pointDistanceSq(b, outlinePoint),
+    )[0];
+
+    return intersection ?? pointFrom<GlobalPoint>(outlinePoint[0], snappedY);
+  }
+
+  // Global Y is closest to the perpendicular so snap X, intersect vertical line
+  const [snappedX] = getGridPoint(outlinePoint[0], outlinePoint[1], gridSize);
+  const intersector = lineSegment<GlobalPoint>(
+    pointFrom<GlobalPoint>(snappedX, center[1] - extent),
+    pointFrom<GlobalPoint>(snappedX, center[1] + extent),
+  );
+  const intersection = intersectElementWithLineSegment(
+    bindableElement,
+    elementsMap,
+    intersector,
+    bindingGap,
+  ).sort(
+    (a, b) =>
+      pointDistanceSq(a, outlinePoint) - pointDistanceSq(b, outlinePoint),
+  )[0];
+
+  return intersection ?? pointFrom<GlobalPoint>(snappedX, outlinePoint[1]);
+};
+
 const elementArea = (element: ExcalidrawBindableElement) =>
  element.width * element.height;

@@ -1709,7 +1927,7 @@ export const updateBoundPoint = (
      otherBindable,
      elementsMap,
      intersector,
-      getBindingGap(otherBindable),
+      getBindingGap(otherBindable, arrow),
    ).sort(
      (a, b) => pointDistanceSq(a, focusPoint) - pointDistanceSq(b, focusPoint),
    )[0];
@@ -1719,7 +1937,7 @@ export const updateBoundPoint = (
      bindableElement,
      elementsMap,
      intersector,
-      getBindingGap(bindableElement),
+      getBindingGap(bindableElement, arrow),
    ).sort(
      (a, b) =>
        pointDistanceSq(a, otherFocusPointOrArrowPoint) -
@@ -1747,7 +1965,7 @@ export const updateBoundPoint = (
      element: otherBindable,
      point: outlinePoint,
      elementsMap,
-      threshold: getBindingGap(otherBindable),
+      threshold: getBindingGap(otherBindable, arrow),
      overrideShouldTestInside: true,
    })
  ) {
@@ -1808,7 +2026,6 @@ export const calculateFixedPointForElbowArrowBinding = (
  hoveredElement: ExcalidrawBindableElement,
  startOrEnd: "start" | "end",
  elementsMap: ElementsMap,
-  zoom: AppState["zoom"],
  shouldSnapToOutline = true,
  isMidpointSnappingEnabled = true,
 ): { fixedPoint: FixedPoint } => {
@@ -1824,7 +2041,6 @@ export const calculateFixedPointForElbowArrowBinding = (
        hoveredElement,
        startOrEnd,
        elementsMap,
-        zoom,
        undefined,
        isMidpointSnappingEnabled,
      )
@@ -25,7 +25,7 @@ import type {
  Radians,
 } from "@excalidraw/math";

-import type { AppState, FrameNameBounds } from "@excalidraw/excalidraw/types";
+import type { FrameNameBounds } from "@excalidraw/excalidraw/types";

 import { isPathALoop } from "./utils";
 import {
@@ -59,12 +59,13 @@ import { LinearElementEditor } from "./linearElementEditor";

 import { distanceToElement } from "./distance";

-import { getBindingGap, maxBindingDistance_simple } from "./binding";
+import { getBindingGap } from "./binding";

 import { hasBackground } from "./comparisons";

 import type {
  ElementsMap,
+  ExcalidrawArrowElement,
  ExcalidrawBindableElement,
  ExcalidrawDiamondElement,
  ExcalidrawElement,
@@ -253,20 +254,25 @@ export const hitElementBoundText = (
  return isPointInElement(point, boundTextElement, elementsMap);
 };

-const bindableElementBorderDistanceIfClose = (
+const bindingBorderTest = (
  element: NonDeleted<ExcalidrawBindableElement>,
-  point: GlobalPoint,
-  elementsMap: ElementsMap,
+  [x, y]: Readonly<GlobalPoint>,
+  elementsMap: NonDeletedSceneElementsMap,
  tolerance: number = 0,
-) => {
+): boolean => {
+  const p = pointFrom<GlobalPoint>(x, y);
+  const shouldTestInside =
+    // disable fullshape snapping for frame elements so we
+    // can bind to frame children
+    !isFrameLikeElement(element);
+
  // PERF: Run a cheap test to see if the binding element
  // is even close to the element
-  const [x, y] = point;
  const t = Math.max(1, tolerance);
  const bounds = [x - t, y - t, x + t, y + t] as Bounds;
  const elementBounds = getElementBounds(element, elementsMap);
  if (!doBoundsIntersect(bounds, elementBounds)) {
-    return -Infinity;
+    return false;
  }

  // If the element is inside a frame, we should clip the element
@@ -277,29 +283,33 @@ const bindableElementBorderDistanceIfClose = (
        enclosingFrame,
        elementsMap,
      );
-      if (!pointInsideBounds(point, enclosingFrameBounds)) {
-        return -Infinity;
+      if (!pointInsideBounds(p, enclosingFrameBounds)) {
+        return false;
      }
    }
  }

-  const distance = distanceToElement(element, elementsMap, point);
-  if (isPointInElement(point, element, elementsMap)) {
-    return distance;
-  }
+  // Do the intersection test against the element since it's close enough
+  const intersections = intersectElementWithLineSegment(
+    element,
+    elementsMap,
+    lineSegment(elementCenterPoint(element, elementsMap), p),
+  );
+  const distance = distanceToElement(element, elementsMap, p);

-  return distance > tolerance ? -Infinity : -distance;
+  return shouldTestInside
+    ? intersections.length === 0 || distance <= tolerance
+    : intersections.length > 0 && distance <= t;
 };

 export const getAllHoveredElementAtPoint = (
-  arrow: { elbowed: boolean },
  point: Readonly<GlobalPoint>,
  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
  elementsMap: NonDeletedSceneElementsMap,
  tolerance?: number,
 ): NonDeleted<ExcalidrawBindableElement>[] => {
  const candidateElements: NonDeleted<ExcalidrawBindableElement>[] = [];
-  // We need to do hit testing from front (end of the array) to back (beginning of the array)
+  // We need to to hit testing from front (end of the array) to back (beginning of the array)
  // because array is ordered from lower z-index to highest and we want element z-index
  // with higher z-index
  for (let index = elements.length - 1; index >= 0; --index) {
@@ -312,13 +322,7 @@ export const getAllHoveredElementAtPoint = (

    if (
      isBindableElement(element, false) &&
-      hitElementItself({
-        element,
-        point,
-        elementsMap,
-        threshold: tolerance ?? getBindingGap(element),
-        overrideShouldTestInside: true,
-      })
+      bindingBorderTest(element, point, elementsMap, tolerance)
    ) {
      candidateElements.push(element);

@@ -335,92 +339,82 @@ export const getAllHoveredElementAtPoint = (
 };

 export const getHoveredElementForBinding = (
-  arrow: { elbowed: boolean },
  point: Readonly<GlobalPoint>,
  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
  elementsMap: NonDeletedSceneElementsMap,
-  zoom?: AppState["zoom"],
+  tolerance?: number,
 ): NonDeleted<ExcalidrawBindableElement> | null => {
-  type Candidate = {
-    element: NonDeleted<ExcalidrawBindableElement>;
-    distance: number;
-    overlapPercent?: number;
-    relativeArea?: number;
-  };
+  const candidateElements = getAllHoveredElementAtPoint(
+    point,
+    elements,
+    elementsMap,
+    tolerance,
+  );

-  const candidates: Candidate[] = [];
-  for (let index = elements.length - 1; index >= 0; --index) {
-    const element = elements[index];
-
-    if (!isBindableElement(element, false)) {
-      continue;
-    }
-
-    const maxDistance = maxBindingDistance_simple(zoom);
-    const distance = bindableElementBorderDistanceIfClose(
-      element,
-      point,
-      elementsMap,
-      maxDistance,
-    );
-
-    if (distance > -maxDistance) {
-      candidates.push({ element, distance });
-
-      if (!isTransparent(element.backgroundColor) && distance >= 0) {
-        break;
-      }
-    }
-  }
-
-  if (candidates.length === 0) {
+  if (!candidateElements || candidateElements.length === 0) {
    return null;
  }

-  if (candidates.length === 1) {
-    return candidates[0].element;
+  if (candidateElements.length === 1) {
+    return candidateElements[0];
  }

-  const closestElements = candidates.sort(
-    (a, b) => Math.abs(a.distance) - Math.abs(b.distance),
-  );
+  // Prefer smaller shapes
+  return candidateElements
+    .sort(
+      (a, b) => b.width ** 2 + b.height ** 2 - (a.width ** 2 + a.height ** 2),
+    )
+    .pop() as NonDeleted<ExcalidrawBindableElement>;
+};

-  const candidate = closestElements[0];
-  const [cx1, cy1, cx2, cy2] = getElementBounds(candidate.element, elementsMap);
-  const candidateArea = Math.max(
-    0.00001,
-    Math.abs(cx2 - cx1) * Math.abs(cy2 - cy1),
-  );
-  const overlaps = closestElements
-    .map((c) => {
-      if (c.element === candidate.element) {
-        return { ...c, overlapPercent: 0, relativeArea: 1 };
-      }
+export const getHoveredElementForFocusPoint = (
+  point: GlobalPoint,
+  arrow: ExcalidrawArrowElement,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  elementsMap: NonDeletedSceneElementsMap,
+  tolerance?: number,
+): ExcalidrawBindableElement | null => {
+  const candidateElements: NonDeleted<ExcalidrawBindableElement>[] = [];
+  // We need to to hit testing from front (end of the array) to back (beginning of the array)
+  // because array is ordered from lower z-index to highest and we want element z-index
+  // with higher z-index
+  for (let index = elements.length - 1; index >= 0; --index) {
+    const element = elements[index];

-      const [x1, y1, x2, y2] = getElementBounds(c.element, elementsMap);
-      const overlapX1 = x1 > cx1 && x1 < cx2 ? x1 : cx1;
-      const overlapY1 = y1 > cy1 && y1 < cy2 ? y1 : cy1;
-      const overlapX2 = x2 < cx2 && x2 > cx1 ? x2 : cx2;
-      const overlapY2 = y2 < cy2 && y2 > cy1 ? y2 : cy2;
-      const overlapWdith =
-        overlapX1 !== cx1 || overlapX2 !== cx2 ? overlapX2 - overlapX1 : 0;
-      const overlapHeight =
-        overlapY1 !== cy1 || overlapY2 !== cy2 ? overlapY2 - overlapY1 : 0;
-      const area = Math.max(0.00001, Math.abs(x2 - x1) * Math.abs(y2 - y1));
-      const overlapPercent = Math.abs(overlapHeight * overlapWdith) / area;
+    invariant(
+      !element.isDeleted,
+      "Elements in the function parameter for getAllElementsAtPositionForBinding() should not contain deleted elements",
+    );

-      return {
-        ...c,
-        overlapPercent,
-        relativeArea:
-          overlapPercent === 0 ? 1 : Math.min(area / candidateArea, 1),
-      };
-    })
-    .filter((c) => c.overlapPercent > 0.25 && c.relativeArea < 0.75);
+    if (
+      isBindableElement(element, false) &&
+      bindingBorderTest(element, point, elementsMap, tolerance)
+    ) {
+      candidateElements.push(element);
+    }
+  }

-  return candidate.distance >= 0 && overlaps.length > 0
-    ? overlaps[0].element
-    : candidate.element;
+  if (!candidateElements || candidateElements.length === 0) {
+    return null;
+  }
+
+  if (candidateElements.length === 1) {
+    return candidateElements[0];
+  }
+
+  const distanceFilteredCandidateElements = candidateElements
+    // Resolve by distance
+    .filter(
+      (el) =>
+        distanceToElement(el, elementsMap, point) <= getBindingGap(el, arrow) ||
+        isPointInElement(point, el, elementsMap),
+    );
+
+  if (distanceFilteredCandidateElements.length === 0) {
+    return null;
+  }
+
+  return distanceFilteredCandidateElements[0] as NonDeleted<ExcalidrawBindableElement>;
 };

 /**
@@ -21,7 +21,7 @@ import { getPerfectElementSize } from "./sizeHelpers";
 import { getBoundTextElement } from "./textElement";
 import { getMinTextElementWidth } from "./textMeasurements";
 import {
-  isArrowElement as isBindingElement,
+  isArrowElement,
  isElbowArrow,
  isFrameLikeElement,
  isImageElement,
@@ -108,7 +108,19 @@ export const dragSelectedElements = (
  );

  elementsToUpdate.forEach((element) => {
-    if (!isBindingElement(element)) {
+    const isArrow = !isArrowElement(element);
+    const isStartBoundElementSelected =
+      isArrow ||
+      (element.startBinding
+        ? elementsToUpdateIds.has(element.startBinding.elementId)
+        : false);
+    const isEndBoundElementSelected =
+      isArrow ||
+      (element.endBinding
+        ? elementsToUpdateIds.has(element.endBinding.elementId)
+        : false);
+
+    if (!isArrowElement(element)) {
      updateElementCoords(pointerDownState, element, scene, adjustedOffset);

      // skip arrow labels since we calculate its position during render
@@ -131,6 +143,7 @@ export const dragSelectedElements = (
      // NOTE: Add a little initial drag to the arrow dragging when the arrow
      // is the single element being dragged to avoid accidentally unbinding
      // the arrow when the user just wants to select it.
+
      elementsToUpdate.size > 1 ||
      Math.max(Math.abs(adjustedOffset.x), Math.abs(adjustedOffset.y)) >
        DRAGGING_THRESHOLD ||
@@ -138,12 +151,9 @@ export const dragSelectedElements = (
    ) {
      updateElementCoords(pointerDownState, element, scene, adjustedOffset);

-      const shouldUnbindStart = element.startBinding
-        ? !elementsToUpdateIds.has(element.startBinding.elementId)
-        : true;
-      const shouldUnbindEnd = element.endBinding
-        ? !elementsToUpdateIds.has(element.endBinding.elementId)
-        : true;
+      const shouldUnbindStart =
+        element.startBinding && !isStartBoundElementSelected;
+      const shouldUnbindEnd = element.endBinding && !isEndBoundElementSelected;
      if (shouldUnbindStart || shouldUnbindEnd) {
        // NOTE: Moving the bound arrow should unbind it, otherwise we would
        // have weird situations, like 0 lenght arrow when the user moves
@@ -30,7 +30,8 @@ import {
  getHeadingForElbowArrowSnap,
  getGlobalFixedPointForBindableElement,
  getBindingGap,
-  BASE_BINDING_GAP,
+  maxBindingDistance_simple,
+  BASE_BINDING_GAP_ELBOW,
 } from "./binding";
 import { distanceToElement } from "./distance";
 import {
@@ -317,7 +318,6 @@ const handleSegmentRelease = (
    ...rest
  } = getElbowArrowData(
    {
-      ...arrow,
      x,
      y,
      startBinding,
@@ -1041,7 +1041,6 @@ export const updateElbowArrowPoints = (
    ...rest
  } = getElbowArrowData(
    {
-      ...arrow,
      x: arrow.x,
      y: arrow.y,
      startBinding,
@@ -1191,7 +1190,15 @@ export const updateElbowArrowPoints = (
 * - hoveredEndElement: The element being hovered over at the end point.
 */
 const getElbowArrowData = (
-  arrow: ExcalidrawElbowArrowElement,
+  arrow: {
+    x: number;
+    y: number;
+    startBinding: FixedPointBinding | null;
+    endBinding: FixedPointBinding | null;
+    startArrowhead: Arrowhead | null;
+    endArrowhead: Arrowhead | null;
+    points: readonly LocalPoint[];
+  },
  elementsMap: NonDeletedSceneElementsMap,
  nextPoints: readonly LocalPoint[],
  options?: {
@@ -1216,7 +1223,6 @@ const getElbowArrowData = (
    const elements = Array.from(elementsMap.values());
    hoveredStartElement =
      getHoveredElement(
-        arrow,
        origStartGlobalPoint,
        elementsMap,
        elements,
@@ -1224,7 +1230,6 @@ const getElbowArrowData = (
      ) || null;
    hoveredEndElement =
      getHoveredElement(
-        arrow,
        origEndGlobalPoint,
        elementsMap,
        elements,
@@ -1251,7 +1256,6 @@ const getElbowArrowData = (
    "start",
    arrow.startBinding?.fixedPoint,
    origStartGlobalPoint,
-    options?.zoom || ({ value: 1 } as AppState["zoom"]),
    hoveredStartElement,
    elementsMap,
    options?.isDragging,
@@ -1269,7 +1273,6 @@ const getElbowArrowData = (
    "end",
    arrow.endBinding?.fixedPoint,
    origEndGlobalPoint,
-    options?.zoom || ({ value: 1 } as AppState["zoom"]),
    hoveredEndElement,
    elementsMap,
    options?.isDragging,
@@ -1311,8 +1314,8 @@ const getElbowArrowData = (
        offsetFromHeading(
          startHeading,
          arrow.startArrowhead
-            ? getBindingGap(hoveredStartElement) * 6
-            : getBindingGap(hoveredStartElement) * 2,
+            ? getBindingGap(hoveredStartElement, { elbowed: true }) * 6
+            : getBindingGap(hoveredStartElement, { elbowed: true }) * 2,
          1,
        ),
      )
@@ -1324,8 +1327,8 @@ const getElbowArrowData = (
        offsetFromHeading(
          endHeading,
          arrow.endArrowhead
-            ? getBindingGap(hoveredEndElement) * 6
-            : getBindingGap(hoveredEndElement) * 2,
+            ? getBindingGap(hoveredEndElement, { elbowed: true }) * 6
+            : getBindingGap(hoveredEndElement, { elbowed: true }) * 2,
          1,
        ),
      )
@@ -1372,8 +1375,8 @@ const getElbowArrowData = (
            ? 0
            : BASE_PADDING -
                (arrow.startArrowhead
-                  ? BASE_BINDING_GAP * 6
-                  : BASE_BINDING_GAP * 2),
+                  ? BASE_BINDING_GAP_ELBOW * 6
+                  : BASE_BINDING_GAP_ELBOW * 2),
          BASE_PADDING,
        ),
    boundsOverlap
@@ -1388,8 +1391,8 @@ const getElbowArrowData = (
            ? 0
            : BASE_PADDING -
                (arrow.endArrowhead
-                  ? BASE_BINDING_GAP * 6
-                  : BASE_BINDING_GAP * 2),
+                  ? BASE_BINDING_GAP_ELBOW * 6
+                  : BASE_BINDING_GAP_ELBOW * 2),
          BASE_PADDING,
        ),
    boundsOverlap,
@@ -2215,7 +2218,6 @@ const getGlobalPoint = (
  startOrEnd: "start" | "end",
  fixedPointRatio: [number, number] | undefined | null,
  initialPoint: GlobalPoint,
-  zoom: AppState["zoom"],
  element?: ExcalidrawBindableElement | null,
  elementsMap?: ElementsMap,
  isDragging?: boolean,
@@ -2229,7 +2231,6 @@ const getGlobalPoint = (
        element,
        startOrEnd,
        elementsMap,
-        zoom,
        undefined,
        isMidpointSnappingEnabled,
      );
@@ -2278,18 +2279,16 @@ const getBindPointHeading = (
  );

 const getHoveredElement = (
-  arrow: ExcalidrawElbowArrowElement,
  origPoint: GlobalPoint,
  elementsMap: NonDeletedSceneElementsMap,
  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
  zoom?: AppState["zoom"],
 ) => {
  return getHoveredElementForBinding(
-    arrow,
    origPoint,
    elements,
    elementsMap,
-    zoom,
+    maxBindingDistance_simple(zoom),
  );
 };

@@ -452,16 +452,8 @@ const createBindingArrow = (
    "orbit",
    "start",
    scene,
-    appState.zoom,
-  );
-  bindBindingElement(
-    bindingArrow,
-    endBindingElement,
-    "orbit",
-    "end",
-    scene,
-    appState.zoom,
  );
+  bindBindingElement(bindingArrow, endBindingElement, "orbit", "end", scene);

  const changedElements = new Map<string, OrderedExcalidrawElement>();
  changedElements.set(
@@ -48,6 +48,7 @@ import {
  calculateFixedPointForNonElbowArrowBinding,
  getBindingStrategyForDraggingBindingElementEndpoints,
  isBindingEnabled,
+  snapToMid,
  updateBoundPoint,
 } from "./binding";
 import {
@@ -343,7 +344,7 @@ export class LinearElementEditor {

    // Apply the point movement if needed
    let suggestedBinding: AppState["suggestedBinding"] = null;
-    const { positions, updates, hit } = pointDraggingUpdates(
+    const { positions, updates } = pointDraggingUpdates(
      [idx],
      deltaX,
      deltaY,
@@ -358,6 +359,7 @@ export class LinearElementEditor {
      linearElementEditor,
    );

+    const angleLocked = shouldRotateWithDiscreteAngle(event);
    LinearElementEditor.movePoints(
      element,
      app.scene,
@@ -369,7 +371,10 @@ export class LinearElementEditor {
      },
      {
        isBindingEnabled: app.state.isBindingEnabled,
-        isMidpointSnappingEnabled: app.state.isMidpointSnappingEnabled,
+        isMidpointSnappingEnabled:
+          app.state.isMidpointSnappingEnabled &&
+          !angleLocked &&
+          !app.state.gridModeEnabled,
      },
    );
    // Set the suggested binding from the updates if available
@@ -381,20 +386,17 @@ export class LinearElementEditor {

    // Move the arrow over the bindable object in terms of z-index
    if (isBindingElement(element)) {
-      if (hit) {
-        moveArrowAboveBindable(
-          LinearElementEditor.getPointGlobalCoordinates(
-            element,
-            element.points[element.points.length - 1],
-            elementsMap,
-          ),
+      moveArrowAboveBindable(
+        LinearElementEditor.getPointGlobalCoordinates(
          element,
-          elements,
+          element.points[element.points.length - 1],
          elementsMap,
-          app.scene,
-          hit,
-        );
-      }
+        ),
+        element,
+        elements,
+        elementsMap,
+        app.scene,
+      );
    }

    // PERF: Avoid state updates if not absolutely necessary
@@ -429,7 +431,9 @@ export class LinearElementEditor {
                "start",
                elementsMap,
                app.state.zoom,
-                app.state.isMidpointSnappingEnabled,
+                app.state.isMidpointSnappingEnabled &&
+                  !angleLocked &&
+                  !app.state.gridModeEnabled,
              )
            : linearElementEditor.initialState.altFocusPoint,
      },
@@ -541,7 +545,7 @@ export class LinearElementEditor {

    // Apply the point movement if needed
    let suggestedBinding: AppState["suggestedBinding"] = null;
-    const { positions, updates, hit } = pointDraggingUpdates(
+    const { positions, updates } = pointDraggingUpdates(
      selectedPointsIndices,
      deltaX,
      deltaY,
@@ -556,6 +560,8 @@ export class LinearElementEditor {
      linearElementEditor,
    );

+    const angleLocked =
+      shouldRotateWithDiscreteAngle(event) && singlePointDragged;
    LinearElementEditor.movePoints(
      element,
      app.scene,
@@ -567,7 +573,10 @@ export class LinearElementEditor {
      },
      {
        isBindingEnabled: app.state.isBindingEnabled,
-        isMidpointSnappingEnabled: app.state.isMidpointSnappingEnabled,
+        isMidpointSnappingEnabled:
+          app.state.isMidpointSnappingEnabled &&
+          !angleLocked &&
+          !app.state.gridModeEnabled,
      },
    );

@@ -580,22 +589,19 @@ export class LinearElementEditor {

    // Move the arrow over the bindable object in terms of z-index
    if (isBindingElement(element) && startIsSelected !== endIsSelected) {
-      if (hit) {
-        moveArrowAboveBindable(
-          LinearElementEditor.getPointGlobalCoordinates(
-            element,
-            startIsSelected
-              ? element.points[0]
-              : element.points[element.points.length - 1],
-            elementsMap,
-          ),
+      moveArrowAboveBindable(
+        LinearElementEditor.getPointGlobalCoordinates(
          element,
-          elements,
+          startIsSelected
+            ? element.points[0]
+            : element.points[element.points.length - 1],
          elementsMap,
-          app.scene,
-          hit,
-        );
-      }
+        ),
+        element,
+        elements,
+        elementsMap,
+        app.scene,
+      );
    }

    // Attached text might need to update if arrow dimensions change
@@ -666,7 +672,9 @@ export class LinearElementEditor {
                "start",
                elementsMap,
                app.state.zoom,
-                app.state.isMidpointSnappingEnabled,
+                app.state.isMidpointSnappingEnabled &&
+                  !angleLocked &&
+                  !app.state.gridModeEnabled,
              )
            : linearElementEditor.initialState.altFocusPoint,
      },
@@ -2141,7 +2149,6 @@ const pointDraggingUpdates = (
 ): {
  positions: PointsPositionUpdates;
  updates?: PointMoveOtherUpdates;
-  hit?: ExcalidrawBindableElement | null;
 } => {
  const naiveDraggingPoints = new Map(
    selectedPointsIndices.map((pointIndex) => {
@@ -2182,6 +2189,7 @@ const pointDraggingUpdates = (
      newArrow: !!app.state.newElement,
      angleLocked,
      altKey,
+      gridSize: app.getEffectiveGridSize(),
    },
  );

@@ -2199,15 +2207,13 @@ const pointDraggingUpdates = (
          ? {
              element: suggestedBindingElement,
              midPoint: app.state.isMidpointSnappingEnabled
-                ? getSnapOutlineMidPoint(
+                ? snapToMid(
+                    suggestedBindingElement,
+                    elementsMap,
                    pointFrom<GlobalPoint>(
                      scenePointerX - linearElementEditor.pointerOffset.x,
                      scenePointerY - linearElementEditor.pointerOffset.y,
                    ),
-                    suggestedBindingElement,
-                    elementsMap,
-                    app.state.zoom,
-                    element,
                  )
                : undefined,
            }
@@ -2314,7 +2320,6 @@ const pointDraggingUpdates = (
              start.element,
              elementsMap,
              app.state.zoom,
-              element,
            ),
          }
        : null;
@@ -2354,7 +2359,6 @@ const pointDraggingUpdates = (
              end.element,
              elementsMap,
              app.state.zoom,
-              element,
            ),
          }
        : null;
@@ -2507,7 +2511,6 @@ const pointDraggingUpdates = (
        ];
      }),
    ),
-    hit: startIsDragged ? start.element : end.element,
  };
 };

@@ -17,7 +17,6 @@ import {
 } from "@excalidraw/common";

 import type { MarkOptional } from "@excalidraw/common/utility-types";
-import type { Zoom } from "@excalidraw/excalidraw/types";

 import { bindBindingElement } from "./binding";
 import {
@@ -249,7 +248,6 @@ const bindLinearElementToElement = (
  end: ValidLinearElement["end"],
  elementStore: ElementStore,
  scene: Scene,
-  zoom: Zoom,
 ): {
  linearElement: ExcalidrawLinearElement;
  startBoundElement?: ExcalidrawElement;
@@ -337,7 +335,6 @@ const bindLinearElementToElement = (
        "orbit",
        "start",
        scene,
-        zoom,
      );
    }
  }
@@ -414,7 +411,6 @@ const bindLinearElementToElement = (
        "orbit",
        "end",
        scene,
-        zoom,
      );
    }
  }
@@ -700,7 +696,6 @@ export const convertToExcalidrawElements = (
                originalEnd,
                elementStore,
                scene,
-                { value: 1 } as Zoom,
              );
            container = linearElement;
            elementStore.add(linearElement);
@@ -726,7 +721,6 @@ export const convertToExcalidrawElements = (
                  end,
                  elementStore,
                  scene,
-                  { value: 1 } as Zoom,
                );

              elementStore.add(linearElement);
@@ -8,7 +8,6 @@ import {

 import {
  bezierEquation,
-  clamp,
  curve,
  curveCatmullRomCubicApproxPoints,
  curveOffsetPoints,
@@ -27,7 +26,7 @@ import {
  type GlobalPoint,
 } from "@excalidraw/math";

-import type { Curve, LineSegment, LocalPoint, Radians } from "@excalidraw/math";
+import type { Curve, LineSegment, LocalPoint } from "@excalidraw/math";

 import type {
  AppState,
@@ -42,7 +41,7 @@ import { generateLinearCollisionShape } from "./shape";
 import { hitElementItself, isPointInElement } from "./collision";
 import { LinearElementEditor } from "./linearElementEditor";
 import { isRectangularElement } from "./typeChecks";
-import { getBindingGap, maxBindingDistance_simple } from "./binding";
+import { maxBindingDistance_simple } from "./binding";

 import {
  getGlobalFixedPointForBindableElement,
@@ -588,193 +587,67 @@ const getDiagonalsForBindableElement = (
  return [diagonalOne, diagonalTwo];
 };

-const getSnappedMidpointIndexForElbowArrow = (
-  element: ExcalidrawBindableElement,
+export const getSnapOutlineMidPoint = (
  point: GlobalPoint,
-  center: GlobalPoint,
-  horizontalThreshold: number,
-  verticalThreshold: number,
-) => {
-  const { x, y, width, height, angle } = element;
-  const nonRotated = pointRotateRads(point, center, -angle as Radians);
-
-  const bindingGap = getBindingGap(element);
-
-  if (pointDistance(center, nonRotated) < bindingGap) {
-    return -1;
-  }
-
-  if (
-    nonRotated[0] <= x + width / 2 &&
-    nonRotated[1] > center[1] - verticalThreshold &&
-    nonRotated[1] < center[1] + verticalThreshold
-  ) {
-    return 2;
-  } else if (
-    nonRotated[1] <= y + height / 2 &&
-    nonRotated[0] > center[0] - horizontalThreshold &&
-    nonRotated[0] < center[0] + horizontalThreshold
-  ) {
-    return 3;
-  } else if (
-    nonRotated[0] >= x + width / 2 &&
-    nonRotated[1] > center[1] - verticalThreshold &&
-    nonRotated[1] < center[1] + verticalThreshold
-  ) {
-    return 0;
-  } else if (
-    nonRotated[1] >= y + height / 2 &&
-    nonRotated[0] > center[0] - horizontalThreshold &&
-    nonRotated[0] < center[0] + horizontalThreshold
-  ) {
-    return 1;
-  } else if (element.type === "diamond") {
-    const distance = bindingGap;
-    const topLeft = pointFrom<GlobalPoint>(
-      x + width / 4 - distance,
-      y + height / 4 - distance,
-    );
-    const topRight = pointFrom<GlobalPoint>(
-      x + (3 * width) / 4 + distance,
-      y + height / 4 - distance,
-    );
-    const bottomLeft = pointFrom<GlobalPoint>(
-      x + width / 4 - distance,
-      y + (3 * height) / 4 + distance,
-    );
-    const bottomRight = pointFrom<GlobalPoint>(
-      x + (3 * width) / 4 + distance,
-      y + (3 * height) / 4 + distance,
-    );
-
-    if (
-      pointDistance(bottomLeft, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
-    ) {
-      return 1;
-    }
-    if (
-      pointDistance(bottomRight, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
-    ) {
-      return 0;
-    }
-    if (
-      pointDistance(topLeft, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
-    ) {
-      return 2;
-    }
-    if (
-      pointDistance(topRight, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
-    ) {
-      return 3;
-    }
-  }
-
-  return -1;
-};
-
-const getSnappedMidpointIndexForSimpleArrow = (
  element: ExcalidrawBindableElement,
-  point: GlobalPoint,
  elementsMap: ElementsMap,
-  horizontalThreshold: number,
-  verticalThreshold: number,
+  zoom: AppState["zoom"],
 ) => {
-  const baseMidpoints = getAllMidpoints(element, elementsMap);
+  const center = elementCenterPoint(element, elementsMap);
+  const sideMidpoints =
+    element.type === "diamond"
+      ? getDiamondBaseCorners(element).map((curve) => {
+          const point = bezierEquation(curve, 0.5);
+          const rotatedPoint = pointRotateRads(point, center, element.angle);

-  for (let i = 0; i < baseMidpoints.length; i++) {
-    const threshold = i % 2 === 0 ? horizontalThreshold : verticalThreshold;
-
-    if (
-      pointDistance(baseMidpoints[i], point) <= threshold &&
+          return pointFrom<GlobalPoint>(rotatedPoint[0], rotatedPoint[1]);
+        })
+      : [
+          // RIGHT midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(
+              element.x + element.width,
+              element.y + element.height / 2,
+            ),
+            center,
+            element.angle,
+          ),
+          // BOTTOM midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(
+              element.x + element.width / 2,
+              element.y + element.height,
+            ),
+            center,
+            element.angle,
+          ),
+          // LEFT midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x, element.y + element.height / 2),
+            center,
+            element.angle,
+          ),
+          // TOP midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x + element.width / 2, element.y),
+            center,
+            element.angle,
+          ),
+        ];
+  const candidate = sideMidpoints.find(
+    (midpoint) =>
+      pointDistance(point, midpoint) <=
+        maxBindingDistance_simple(zoom) + element.strokeWidth / 2 &&
      !hitElementItself({
        point,
        element,
        threshold: 0,
        elementsMap,
        overrideShouldTestInside: true,
-      })
-    ) {
-      return i;
-    }
-  }
-
-  return -1;
-};
-
-export const getAllMidpoints = (
-  element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
-): GlobalPoint[] => {
-  const center = elementCenterPoint(element, elementsMap);
-
-  if (element.type === "diamond") {
-    return getDiamondBaseCorners(element).map((curve) =>
-      pointRotateRads(bezierEquation(curve, 0.5), center, element.angle),
-    );
-  }
-
-  return [
-    pointFrom(element.width, element.height / 2),
-    pointFrom(element.width / 2, element.height),
-    pointFrom(0, element.height / 2),
-    pointFrom(element.width / 2, 0),
-  ].map(([x, y]) =>
-    pointRotateRads(
-      pointFrom<GlobalPoint>(element.x + x, element.y + y),
-      center,
-      element.angle,
-    ),
+      }),
  );
-};

-export const getSnapOutlineMidPoint = (
-  point: GlobalPoint,
-  element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
-  zoom: AppState["zoom"],
-  arrow: { elbowed: boolean },
-): GlobalPoint | undefined => {
-  const center = elementCenterPoint(element, elementsMap);
-  const baseMidpoints = getAllMidpoints(element, elementsMap);
-  const sideMidpoints =
-    element.type === "diamond"
-      ? baseMidpoints.map((midpoint) => {
-          return pointFrom<GlobalPoint>(
-            midpoint[0] + (midpoint[0] - center[0]) * 0.1,
-            midpoint[1] + (midpoint[1] - center[1]) * 0.1,
-          );
-        })
-      : baseMidpoints;
-
-  const TOLERANCE = 0.05;
-  const maxDistance = maxBindingDistance_simple(zoom) + element.strokeWidth / 2;
-  const verticalThreshold = clamp(TOLERANCE * element.height, 5, maxDistance);
-  const horizontalThreshold = clamp(TOLERANCE * element.width, 5, maxDistance);
-  const idx = arrow.elbowed
-    ? getSnappedMidpointIndexForElbowArrow(
-        element,
-        point,
-        center,
-        horizontalThreshold,
-        verticalThreshold,
-      )
-    : getSnappedMidpointIndexForSimpleArrow(
-        element,
-        point,
-        elementsMap,
-        horizontalThreshold,
-        verticalThreshold,
-      );
-
-  if (idx === -1) {
-    return undefined;
-  }
-
-  return sideMidpoints[idx];
+  return candidate;
 };

 export const projectFixedPointOntoDiagonal = (
@@ -787,6 +660,9 @@ export const projectFixedPointOntoDiagonal = (
  isMidpointSnappingEnabled: boolean = true,
 ): GlobalPoint | null => {
  invariant(arrow.points.length >= 2, "Arrow must have at least two points");
+  if (arrow.width < 3 && arrow.height < 3) {
+    return null;
+  }

  if (isMidpointSnappingEnabled) {
    const sideMidPoint = getSnapOutlineMidPoint(
@@ -794,7 +670,6 @@ export const projectFixedPointOntoDiagonal = (
      element,
      elementsMap,
      zoom,
-      arrow,
    );
    if (sideMidPoint) {
      return sideMidPoint;
@@ -8,6 +8,7 @@ import { getElementsInGroup } from "./groups";
 import { syncMovedIndices } from "./fractionalIndex";
 import { getSelectedElements } from "./selection";
 import { getBoundTextElement, getContainerElement } from "./textElement";
+import { getHoveredElementForBinding } from "./collision";

 import type { Scene } from "./Scene";
 import type {
@@ -155,8 +156,12 @@ export const moveArrowAboveBindable = (
  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
  elementsMap: NonDeletedSceneElementsMap,
  scene: Scene,
-  hoveredElement: NonDeletedExcalidrawElement,
+  hit?: NonDeletedExcalidrawElement,
 ): readonly OrderedExcalidrawElement[] => {
+  const hoveredElement = hit
+    ? hit
+    : getHoveredElementForBinding(point, elements, elementsMap);
+
  if (!hoveredElement) {
    return elements;
  }
@@ -16,7 +16,6 @@ import "@excalidraw/utils/test-utils";
 import { bindBindingElement } from "@excalidraw/element";

 import type { LocalPoint } from "@excalidraw/math";
-import type { Zoom } from "@excalidraw/excalidraw/types";

 import { Scene } from "../src/Scene";

@@ -188,12 +187,8 @@ describe("elbow arrow routing", () => {
    }) as ExcalidrawElbowArrowElement;
    API.setElements([rectangle1, rectangle2, arrow]);

-    bindBindingElement(arrow, rectangle1, "orbit", "start", h.scene, {
-      value: 1,
-    } as Zoom);
-    bindBindingElement(arrow, rectangle2, "orbit", "end", h.scene, {
-      value: 1,
-    } as Zoom);
+    bindBindingElement(arrow, rectangle1, "orbit", "start", h.scene);
+    bindBindingElement(arrow, rectangle2, "orbit", "end", h.scene);

    expect(arrow.startBinding).not.toBe(null);
    expect(arrow.endBinding).not.toBe(null);
@@ -27,7 +27,7 @@ import { isInvisiblySmallElement } from "@excalidraw/element";

 import { CaptureUpdateAction } from "@excalidraw/element";

-import type { GlobalPoint, LocalPoint } from "@excalidraw/math";
+import type { LocalPoint } from "@excalidraw/math";
 import type {
  ExcalidrawElement,
  ExcalidrawLinearElement,
@@ -93,32 +93,40 @@ export const actionFinalize = register<FormData>({
            ? [element.points.length - 1] // New arrow creation
            : appState.selectedLinearElement.selectedPointsIndices;

+        const angleLocked = shouldRotateWithDiscreteAngle(event);
+        const effectiveGridSize = event[KEYS.CTRL_OR_CMD]
+          ? null
+          : app.getEffectiveGridSize();
+
        const draggedPoints: PointsPositionUpdates =
          selectedPointsIndices.reduce((map, index) => {
            map.set(index, {
-              point: LinearElementEditor.pointFromAbsoluteCoords(
-                element,
-                pointFrom<GlobalPoint>(
-                  sceneCoords.x - linearElementEditor.pointerOffset.x,
-                  sceneCoords.y - linearElementEditor.pointerOffset.y,
-                ),
-                elementsMap,
-              ),
+              point: angleLocked
+                ? element.points[index]
+                : LinearElementEditor.createPointAt(
+                    element,
+                    elementsMap,
+                    sceneCoords.x - linearElementEditor.pointerOffset.x,
+                    sceneCoords.y - linearElementEditor.pointerOffset.y,
+                    effectiveGridSize,
+                  ),
            });

            return map;
          }, new Map()) ?? new Map();
+
        bindOrUnbindBindingElement(
          element,
          draggedPoints,
-          sceneCoords.x - linearElementEditor.pointerOffset.x,
-          sceneCoords.y - linearElementEditor.pointerOffset.y,
+          sceneCoords.x,
+          sceneCoords.y,
          scene,
          appState,
          {
            newArrow,
            altKey: event.altKey,
-            angleLocked: shouldRotateWithDiscreteAngle(event),
+            angleLocked,
+            gridSize: app.getEffectiveGridSize(),
          },
        );
      } else if (isLineElement(element)) {
@@ -1897,7 +1897,6 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
                  startElement,
                  "start",
                  elementsMap,
-                  appState.zoom,
                  appState.isBindingEnabled,
                ),
              }
@@ -1912,7 +1911,6 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
                  endElement,
                  "end",
                  elementsMap,
-                  appState.zoom,
                  appState.isBindingEnabled,
                ),
              }
@@ -1945,7 +1943,6 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
              appState.bindMode === "inside" ? "inside" : "orbit",
              "start",
              app.scene,
-              appState.zoom,
            );
          }
        }
@@ -1960,7 +1957,6 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
              appState.bindMode === "inside" ? "inside" : "orbit",
              "end",
              app.scene,
-              appState.zoom,
            );
          }
        }
@@ -248,6 +248,7 @@ import {
  getElementBounds,
  doBoundsIntersect,
  isPointInElement,
+  maxBindingDistance_simple,
  convertToExcalidrawElements,
  type ExcalidrawElementSkeleton,
  getSnapOutlineMidPoint,
@@ -933,20 +934,14 @@ class App extends React.Component<AppProps, AppState> {
        "Missing last pointer move coords when changing bind skip mode for arrow start",
      );
      const elementsMap = this.scene.getNonDeletedElementsMap();
-      const arrow = elementsMap.get(
-        this.state.selectedLinearElement.elementId,
-      ) as ExcalidrawArrowElement | undefined;
-      const hoveredElement =
-        arrow &&
-        getHoveredElementForBinding(
-          arrow,
-          pointFrom<GlobalPoint>(
-            this.lastPointerMoveCoords.x,
-            this.lastPointerMoveCoords.y,
-          ),
-          this.scene.getNonDeletedElements(),
-          elementsMap,
-        );
+      const hoveredElement = getHoveredElementForBinding(
+        pointFrom<GlobalPoint>(
+          this.lastPointerMoveCoords.x,
+          this.lastPointerMoveCoords.y,
+        ),
+        this.scene.getNonDeletedElements(),
+        elementsMap,
+      );
      const element = LinearElementEditor.getElement(
        this.state.selectedLinearElement.elementId,
        elementsMap,
@@ -1076,7 +1071,6 @@ class App extends React.Component<AppProps, AppState> {

      const { x, y } = this.lastPointerMoveCoords;
      const hoveredElement = getHoveredElementForBinding(
-        arrow,
        pointFrom<GlobalPoint>(x, y),
        this.scene.getNonDeletedElements(),
        this.scene.getNonDeletedElementsMap(),
@@ -5383,6 +5377,12 @@ class App extends React.Component<AppProps, AppState> {
          this.state,
        );

+        const hoveredElement = getHoveredElementForBinding(
+          pointFrom<GlobalPoint>(scenePointer.x, scenePointer.y),
+          this.scene.getNonDeletedElements(),
+          this.scene.getNonDeletedElementsMap(),
+        );
+
        if (this.state.selectedLinearElement) {
          const element = LinearElementEditor.getElement(
            this.state.selectedLinearElement.elementId,
@@ -5390,13 +5390,6 @@ class App extends React.Component<AppProps, AppState> {
          );

          if (isBindingElement(element)) {
-            const hoveredElement = getHoveredElementForBinding(
-              element,
-              pointFrom<GlobalPoint>(scenePointer.x, scenePointer.y),
-              this.scene.getNonDeletedElements(),
-              this.scene.getNonDeletedElementsMap(),
-            );
-
            this.handleDelayedBindModeChange(element, hoveredElement);
          }
        }
@@ -7083,11 +7076,10 @@ class App extends React.Component<AppProps, AppState> {
        );
        const elementsMap = this.scene.getNonDeletedElementsMap();
        const hoveredElement = getHoveredElementForBinding(
-          { elbowed: this.state.currentItemArrowType === ARROW_TYPE.elbow },
-          pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+          globalPoint,
          this.scene.getNonDeletedElements(),
          elementsMap,
-          this.state.zoom,
+          maxBindingDistance_simple(this.state.zoom),
        );
        if (hoveredElement) {
          this.setState({
@@ -7098,9 +7090,6 @@ class App extends React.Component<AppProps, AppState> {
                hoveredElement,
                elementsMap,
                this.state.zoom,
-                {
-                  elbowed: this.state.currentItemArrowType === ARROW_TYPE.elbow,
-                },
              ),
            },
          });
@@ -7126,11 +7115,10 @@ class App extends React.Component<AppProps, AppState> {
          isArrowElement(this.state.newElement) &&
          isBindingEnabled(this.state) &&
          getHoveredElementForBinding(
-            this.state.newElement,
            pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
            this.scene.getNonDeletedElements(),
            this.scene.getNonDeletedElementsMap(),
-            this.state.zoom,
+            maxBindingDistance_simple(this.state.zoom),
          );
        if (hoveredElement) {
          this.actionManager.executeAction(actionFinalize, "ui", {
@@ -7245,7 +7233,6 @@ class App extends React.Component<AppProps, AppState> {

        if (isSimpleArrow(multiElement)) {
          const hoveredElement = getHoveredElementForBinding(
-            multiElement,
            pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
            this.scene.getNonDeletedElements(),
            elementsMap,
@@ -7276,15 +7263,16 @@ class App extends React.Component<AppProps, AppState> {
      return;
    }

-    if (this.state.activeTool.type === "arrow") {
+    // Set suggested binding if we're hovering with an arrow tool
+    // and not dragging out a new element
+    if (this.state.activeTool.type === "arrow" && !this.state.newElement) {
+      const scenePointer = pointFrom<GlobalPoint>(scenePointerX, scenePointerY);
      const hit = getHoveredElementForBinding(
-        { elbowed: this.state.currentItemArrowType === ARROW_TYPE.elbow },
-        pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+        scenePointer,
        this.scene.getNonDeletedElements(),
        this.scene.getNonDeletedElementsMap(),
-        this.state.zoom,
+        maxBindingDistance_simple(this.state.zoom),
      );
-      const scenePointer = pointFrom<GlobalPoint>(scenePointerX, scenePointerY);
      const elementsMap = this.scene.getNonDeletedElementsMap();
      if (hit && !isPointInElement(scenePointer, hit, elementsMap)) {
        this.setState({
@@ -7295,7 +7283,6 @@ class App extends React.Component<AppProps, AppState> {
              hit,
              elementsMap,
              this.state.zoom,
-              { elbowed: this.state.currentItemArrowType === ARROW_TYPE.elbow },
            ),
          },
        });
@@ -9282,7 +9269,6 @@ class App extends React.Component<AppProps, AppState> {
      const hoveredElementForBinding =
        isBindingEnabled(this.state) &&
        getHoveredElementForBinding(
-          { elbowed: isElbowArrow(multiElement) },
          pointFrom<GlobalPoint>(
            this.lastPointerMoveCoords?.x ??
              rx + multiElement.points[multiElement.points.length - 1][0],
@@ -9405,7 +9391,6 @@ class App extends React.Component<AppProps, AppState> {
      const elementsMap = this.scene.getNonDeletedElementsMap();
      const boundElement = isBindingEnabled(this.state)
        ? getHoveredElementForBinding(
-            { elbowed: this.state.currentItemArrowType === ARROW_TYPE.elbow },
            point,
            this.scene.getNonDeletedElements(),
            elementsMap,
@@ -9481,6 +9466,7 @@ class App extends React.Component<AppProps, AppState> {
            ...prevState,
            bindMode: "orbit",
            newElement: element,
+            startBoundElement: boundElement,
            suggestedBinding:
              boundElement && isBindingElement(element)
                ? {
@@ -9490,7 +9476,6 @@ class App extends React.Component<AppProps, AppState> {
                      boundElement,
                      elementsMap,
                      this.state.zoom,
-                      element,
                    ),
                  }
                : null,
@@ -9887,16 +9872,16 @@ class App extends React.Component<AppProps, AppState> {
            return;
          }

-          if (isBindingElement(element) && getFeatureFlag("COMPLEX_BINDINGS")) {
+          if (isBindingElement(element)) {
            const hoveredElement = getHoveredElementForBinding(
-              element,
              pointFrom<GlobalPoint>(pointerCoords.x, pointerCoords.y),
              this.scene.getNonDeletedElements(),
              elementsMap,
-              this.state.zoom,
            );

-            this.handleDelayedBindModeChange(element, hoveredElement);
+            if (getFeatureFlag("COMPLEX_BINDINGS")) {
+              this.handleDelayedBindModeChange(element, hoveredElement);
+            }
          }

          if (
@@ -253,6 +253,7 @@ const getRelevantAppStateProps = (
  newElement: appState.newElement,
  isBindingEnabled: appState.isBindingEnabled,
  isMidpointSnappingEnabled: appState.isMidpointSnappingEnabled,
+  gridModeEnabled: appState.gridModeEnabled,
  suggestedBinding: appState.suggestedBinding,
  isRotating: appState.isRotating,
  elementsToHighlight: appState.elementsToHighlight,
@@ -7,6 +7,7 @@ import {
  type Radians,
  bezierEquation,
  pointRotateRads,
+  pointDistance,
 } from "@excalidraw/math";

 import {
@@ -16,6 +17,7 @@ import {
  FRAME_STYLE,
  getFeatureFlag,
  invariant,
+  shouldRotateWithDiscreteAngle,
  THEME,
 } from "@excalidraw/common";

@@ -23,12 +25,13 @@ import {
  deconstructDiamondElement,
  deconstructRectanguloidElement,
  elementCenterPoint,
-  getAllMidpoints,
+  getDiamondBaseCorners,
  FOCUS_POINT_SIZE,
  getOmitSidesForEditorInterface,
  getTransformHandles,
  getTransformHandlesFromCoords,
  hasBoundingBox,
+  hitElementItself,
  isArrowElement,
  isBindableElement,
  isElbowArrow,
@@ -36,6 +39,7 @@ import {
  isImageElement,
  isLinearElement,
  isLineElement,
+  maxBindingDistance_simple,
  isTextElement,
  LinearElementEditor,
  getActiveTextElement,
@@ -226,6 +230,7 @@ const renderBindingHighlightForBindableElement_simple = (
  elementsMap: ElementsMap,
  appState: InteractiveCanvasAppState,
  pointerCoords: GlobalPoint | null,
+  angleLocked = false,
 ) => {
  const enclosingFrame =
    suggestedBinding.element.frameId &&
@@ -410,42 +415,147 @@ const renderBindingHighlightForBindableElement_simple = (
      break;
  }

-  // Draw midpoint indicators
  if (
    appState.isMidpointSnappingEnabled &&
+    !appState.gridModeEnabled &&
+    !angleLocked &&
    (isFrameLikeElement(suggestedBinding.element) ||
      isBindableElement(suggestedBinding.element))
  ) {
-    context.save();
+    // Draw midpoint indicators
+    const linearElement = appState.selectedLinearElement;
+    const arrow =
+      linearElement?.elementId &&
+      LinearElementEditor.getElement(linearElement?.elementId, elementsMap);
+    const cursorIsInsideBindable =
+      pointerCoords &&
+      hitElementItself({
+        point: pointerCoords,
+        element: suggestedBinding.element,
+        elementsMap,
+        threshold: 0,
+        overrideShouldTestInside: true,
+      });

-    const midpointRadius = 4 / appState.zoom.value;
+    const isElbow =
+      (arrow && isElbowArrow(arrow)) ||
+      (appState.activeTool.type === "arrow" &&
+        appState.currentItemArrowType === "elbow");

-    // Render base midpoints
-    const midpoints = getAllMidpoints(suggestedBinding.element, elementsMap);
-    for (const midpoint of midpoints) {
-      context.fillStyle =
-        appState.theme === THEME.DARK
-          ? `rgba(0, 0, 0, 0.8)`
-          : `rgba(65, 65, 65, 0.5)`;
-      context.beginPath();
-      context.arc(midpoint[0], midpoint[1], midpointRadius, 0, 2 * Math.PI);
-      context.fill();
+    if (!cursorIsInsideBindable || isElbow) {
+      context.save();
+
+      const center = elementCenterPoint(suggestedBinding.element, elementsMap);
+
+      let midpoints: GlobalPoint[];
+      if (suggestedBinding.element.type === "diamond") {
+        const center = elementCenterPoint(
+          suggestedBinding.element,
+          elementsMap,
+        );
+        midpoints = getDiamondBaseCorners(suggestedBinding.element).map(
+          (curve) => {
+            const point = bezierEquation(curve, 0.5);
+            const rotatedPoint = pointRotateRads(
+              point,
+              center,
+              suggestedBinding.element.angle,
+            );
+
+            return pointFrom<GlobalPoint>(rotatedPoint[0], rotatedPoint[1]);
+          },
+        );
+      } else {
+        const basePoints = [
+          {
+            x: suggestedBinding.element.width,
+            y: suggestedBinding.element.height / 2,
+          }, // RIGHT
+          {
+            x: suggestedBinding.element.width / 2,
+            y: suggestedBinding.element.height,
+          }, // BOTTOM
+          { x: 0, y: suggestedBinding.element.height / 2 }, // LEFT
+          { x: suggestedBinding.element.width / 2, y: 0 }, // TOP
+        ];
+        midpoints = basePoints.map((point) => {
+          const globalPoint = pointFrom<GlobalPoint>(
+            point.x + suggestedBinding.element.x,
+            point.y + suggestedBinding.element.y,
+          );
+          const rotatedPoint = pointRotateRads(
+            globalPoint,
+            center,
+            suggestedBinding.element.angle,
+          );
+          return pointFrom<GlobalPoint>(rotatedPoint[0], rotatedPoint[1]);
+        });
+      }
+
+      const hoveredMidpoint =
+        pointerCoords &&
+        midpoints.reduce(
+          (
+            closestIdx: {
+              idx: number;
+              distance: number;
+            },
+            point,
+            idx,
+          ) => {
+            const distance = pointDistance(point, pointerCoords);
+            if (idx === -1 || distance < closestIdx.distance) {
+              return { idx, distance };
+            }
+            return closestIdx;
+          },
+          {
+            idx: -1,
+            distance: Infinity,
+          },
+        );
+
+      const midpointRadius = 4 / appState.zoom.value;
+      const highlightThreshold =
+        maxBindingDistance_simple(appState.zoom) +
+        suggestedBinding.element.strokeWidth / 2;
+
+      midpoints.forEach((midpoint, idx) => {
+        const isHighlighted =
+          (!cursorIsInsideBindable || isElbow) &&
+          hoveredMidpoint?.idx === idx &&
+          hoveredMidpoint.distance <= highlightThreshold;
+
+        // also render midpoint if cursor close but not highlighted
+        // (for elbows, always show all points)
+        const isShown =
+          !isHighlighted &&
+          (isElbow ||
+            (idx === hoveredMidpoint?.idx &&
+              hoveredMidpoint.distance <= highlightThreshold * 2));
+
+        if (isHighlighted) {
+          context.fillStyle =
+            appState.theme === THEME.DARK
+              ? `rgba(3, 93, 161, 1)`
+              : `rgba(106, 189, 252, 1)`;
+
+          context.beginPath();
+          context.arc(midpoint[0], midpoint[1], midpointRadius, 0, 2 * Math.PI);
+          context.fill();
+        } else if (isShown) {
+          context.fillStyle =
+            appState.theme === THEME.DARK
+              ? `rgba(0, 0, 0, 0.8)`
+              : `rgba(65, 65, 65, 0.5)`;
+          context.beginPath();
+          context.arc(midpoint[0], midpoint[1], midpointRadius, 0, 2 * Math.PI);
+          context.fill();
+        }
+      });
+
+      context.restore();
    }
-
-    // Render the highlighted midpoint if any
-    const midpoint = appState.suggestedBinding?.midPoint;
-    if (midpoint) {
-      context.fillStyle =
-        appState.theme === THEME.DARK
-          ? `rgba(3, 93, 161, 1)`
-          : `rgba(106, 189, 252, 1)`;
-
-      context.beginPath();
-      context.arc(midpoint[0], midpoint[1], midpointRadius, 0, 2 * Math.PI);
-      context.fill();
-    }
-
-    context.restore();
  }
 };

@@ -701,7 +811,12 @@ const renderBindingHighlightForBindableElement_complex = (

    context.restore();

-    if (appState.isMidpointSnappingEnabled) {
+    if (
+      appState.isMidpointSnappingEnabled &&
+      !appState.gridModeEnabled &&
+      (!app.lastPointerMoveEvent ||
+        !shouldRotateWithDiscreteAngle(app.lastPointerMoveEvent))
+    ) {
      // Draw midpoint indicators
      context.save();
      context.translate(
@@ -814,12 +929,16 @@ const renderBindingHighlightForBindableElement = (
        app.lastPointerMoveCoords.y,
      )
    : null;
+  const angleLocked =
+    !!app.lastPointerMoveEvent &&
+    shouldRotateWithDiscreteAngle(app.lastPointerMoveEvent);
  renderBindingHighlightForBindableElement_simple(
    context,
    suggestedBinding,
    allElementsMap,
    appState,
    pointerCoords,
+    angleLocked,
  );
  context.restore();
 };
@@ -98,6 +98,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -731,6 +732,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -2275,6 +2277,40 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": {
+    "angle": 0,
+    "backgroundColor": "transparent",
+    "boundElements": [
+      {
+        "id": "id4",
+        "type": "arrow",
+      },
+    ],
+    "customData": undefined,
+    "fillStyle": "solid",
+    "frameId": null,
+    "groupIds": [],
+    "height": 100,
+    "id": "id0",
+    "index": "a0",
+    "isDeleted": false,
+    "link": null,
+    "locked": false,
+    "opacity": 100,
+    "roughness": 1,
+    "roundness": null,
+    "seed": 1,
+    "strokeColor": "#1e1e1e",
+    "strokeStyle": "solid",
+    "strokeWidth": 2,
+    "type": "rectangle",
+    "updated": 1,
+    "version": 3,
+    "versionNonce": 493213705,
+    "width": 100,
+    "x": -100,
+    "y": -50,
+  },
  "stats": {
    "open": false,
    "panels": 3,
@@ -2374,7 +2410,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
  "endBinding": {
    "elementId": "id1",
    "fixedPoint": [
-      "0.50010",
+      0,
      "0.50010",
    ],
    "mode": "orbit",
@@ -2382,7 +2418,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
  "fillStyle": "solid",
  "frameId": null,
  "groupIds": [],
-  "height": "399.26547",
+  "height": "439.20000",
  "id": "id4",
  "index": "a2",
  "isDeleted": false,
@@ -2396,8 +2432,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
      0,
    ],
    [
-      "488.00000",
-      "-399.26547",
+      488,
+      "-439.20000",
    ],
  ],
  "roughness": 1,
@@ -2419,9 +2455,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
  "type": "arrow",
  "updated": 1,
  "version": 11,
-  "width": "488.00000",
+  "width": 488,
  "x": 6,
-  "y": "-4.89900",
+  "y": "-5.39000",
 }
 `;

@@ -2542,7 +2578,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
            "endBinding": {
              "elementId": "id1",
              "fixedPoint": [
-                "0.50010",
+                0,
                "0.50010",
              ],
              "mode": "orbit",
@@ -2550,7 +2586,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
            "fillStyle": "solid",
            "frameId": null,
            "groupIds": [],
-            "height": "399.26547",
+            "height": "439.20000",
            "index": "a2",
            "isDeleted": false,
            "link": null,
@@ -2562,8 +2598,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
                0,
              ],
              [
-                "488.00000",
-                "-399.26547",
+                488,
+                "-439.20000",
              ],
            ],
            "roughness": 1,
@@ -2584,9 +2620,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
            "strokeWidth": 2,
            "type": "arrow",
            "version": 11,
-            "width": "488.00000",
+            "width": 488,
            "x": 6,
-            "y": "-4.89900",
+            "y": "-5.39000",
          },
          "inserted": {
            "isDeleted": true,
@@ -7352,6 +7388,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -10323,6 +10360,7 @@ exports[`history > multiplayer undo/redo > should override remotely added points
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -16553,6 +16591,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -17301,6 +17340,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -17947,6 +17987,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -18591,6 +18632,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -19343,6 +19385,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -21560,6 +21603,7 @@ exports[`history > singleplayer undo/redo > should support linear element creati
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -6243,6 +6243,7 @@ exports[`regression tests > draw every type of shape > [end of test] appState 1`
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -8691,6 +8692,7 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] appState 1`
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -8923,6 +8925,7 @@ exports[`regression tests > key 6 selects line tool > [end of test] appState 1`]
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -9345,6 +9348,7 @@ exports[`regression tests > key a selects arrow tool > [end of test] appState 1`
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -9757,6 +9761,7 @@ exports[`regression tests > key l selects line tool > [end of test] appState 1`]
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -14514,6 +14519,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] appStat
  "showHyperlinkPopup": false,
  "showWelcomeScreen": true,
  "snapLines": [],
+  "startBoundElement": null,
  "stats": {
    "open": false,
    "panels": 3,
@@ -5132,7 +5132,7 @@ describe("history", () => {
              }),
              endBinding: expect.objectContaining({
                elementId: rect2.id,
-                fixedPoint: expect.arrayContaining([0.5001, 0.5001]),
+                fixedPoint: expect.arrayContaining([0, 0.5001]),
              }),
              isDeleted: true,
            }),
@@ -16,8 +16,6 @@ import * as StaticScene from "../renderer/staticScene";
 import { UI, Pointer, Keyboard } from "./helpers/ui";
 import { render, fireEvent, act, unmountComponent } from "./test-utils";

-import type { Zoom } from "../types";
-
 unmountComponent();

 const renderInteractiveScene = vi.spyOn(
@@ -90,7 +88,6 @@ describe("move element", () => {
        "orbit",
        "start",
        h.app.scene,
-        { value: 1 } as Zoom,
      );
      bindBindingElement(
        arrow.get() as NonDeleted<ExcalidrawArrowElement>,
@@ -98,7 +95,6 @@ describe("move element", () => {
        "orbit",
        "end",
        h.app.scene,
-        { value: 1 } as Zoom,
      );
    });

@@ -115,13 +111,10 @@ describe("move element", () => {
    expect([rectA.x, rectA.y]).toEqual([0, 0]);
    expect([rectB.x, rectB.y]).toEqual([200, 0]);
    expect([[arrow.x, arrow.y]]).toCloselyEqualPoints(
-      [[106, 56.011199999998695]],
-      0,
-    );
-    expect([[arrow.width, arrow.height]]).toCloselyEqualPoints(
-      [[88, 88.01760000000121]],
+      [[106.00000000000001, 55.6867741935484]],
      0,
    );
+    expect([[arrow.width, arrow.height]]).toCloselyEqualPoints([[88, 88]], 0);

    renderInteractiveScene.mockClear();
    renderStaticScene.mockClear();
@@ -140,13 +133,10 @@ describe("move element", () => {
    expect([rectA.x, rectA.y]).toEqual([0, 0]);
    expect([rectB.x, rectB.y]).toEqual([201, 2]);
    expect([[arrow.x, arrow.y]]).toCloselyEqualPoints(
-      [[106, 56.011199999998695]],
-      0,
-    );
-    expect([[arrow.width, arrow.height]]).toCloselyEqualPoints(
-      [[89, 90.01760000000121]],
+      [[106, 55.6867741935484]],
      0,
    );
+    expect([[arrow.width, arrow.height]]).toCloselyEqualPoints([[89, 90]], 0);

    h.elements.forEach((element) => expect(element).toMatchSnapshot());
  });
@@ -224,6 +224,7 @@ export type InteractiveCanvasAppState = Readonly<
    newElement: AppState["newElement"];
    isBindingEnabled: AppState["isBindingEnabled"];
    isMidpointSnappingEnabled: AppState["isMidpointSnappingEnabled"];
+    gridModeEnabled: AppState["gridModeEnabled"];
    suggestedBinding: AppState["suggestedBinding"];
    isRotating: AppState["isRotating"];
    elementsToHighlight: AppState["elementsToHighlight"];
@@ -845,6 +846,7 @@ export type AppClassProperties = {
  onStateChange: App["onStateChange"];

  lastPointerMoveCoords: App["lastPointerMoveCoords"];
+  lastPointerMoveEvent: App["lastPointerMoveEvent"];
  bindModeHandler: App["bindModeHandler"];

  setAppState: App["setAppState"];
Author	SHA1	Message	Date
Mark Tolmacs	a7a3f9d82b	Merge branch 'master' into mtolmacs/fix/grid-binding Signed-off-by: Mark Tolmacs <mark@lazycat.hu>	2026-06-04 15:54:48 +00:00
Mark Tolmacs	895c2b23c7	fix: Elbow midpoint Signed-off-by: Mark Tolmacs <mark@lazycat.hu>	2026-03-19 19:46:56 +00:00
Mark Tolmacs	50099012c6	fix Suggested binding flicker Signed-off-by: Mark Tolmacs <mark@lazycat.hu>	2026-03-19 16:47:43 +00:00
Mark Tolmacs	de2ad7cd3f	fix: Inside binding grid respect Signed-off-by: Mark Tolmacs <mark@lazycat.hu>	2026-03-19 14:55:56 +00:00
Mark Tolmacs	d7abb6a309	fix: Diamonds and ellipses Signed-off-by: Mark Tolmacs <mark@lazycat.hu>	2026-03-18 20:25:19 +00:00
Mark Tolmacs	9fd91d9a59	fix: False binding Signed-off-by: Mark Tolmacs <mark@lazycat.hu>	2026-03-18 16:29:09 +00:00
Mark Tolmacs	ba087233cb	fix: Grid is secondary to snap distance Signed-off-by: Mark Tolmacs <mark@lazycat.hu>	2026-03-18 12:04:23 +00:00
Mark Tolmacs	7c58d1f6f4	chore: Remove more non-needed grid snapping Signed-off-by: Mark Tolmacs <mark@lazycat.hu>	2026-03-17 20:28:29 +00:00
Mark Tolmacs	d9ab298526	fix: Remove duplicated grid snapping Signed-off-by: Mark Tolmacs <mark@lazycat.hu>	2026-03-17 20:21:45 +00:00
Mark Tolmacs	7b2496bfd7	fix: Dragged arrow endpoint ignore grid and angle locks Signed-off-by: Mark Tolmacs <mark@lazycat.hu>	2026-03-17 19:59:33 +00:00