fix ts

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

excalidraw-app/components/DebugCanvas.tsx

@@ -3,24 +3,41 @@ import {
   CloseIcon,
   TrashIcon,
 } from "@excalidraw/excalidraw/components/icons";
+import { useExcalidrawAPI } from "@excalidraw/excalidraw/index";
 import {
   bootstrapCanvas,
+  fillCircle,
   getNormalizedCanvasDimensions,
 } from "@excalidraw/excalidraw/renderer/helpers";
 import { type AppState } from "@excalidraw/excalidraw/types";
-import { arrayToMap, throttleRAF } from "@excalidraw/common";
-import { useCallback } from "react";
+import {
+  arrayToMap,
+  sceneCoordsToViewportCoords,
+  throttleRAF,
+  viewportCoordsToSceneCoords,
+} from "@excalidraw/common";
+import { useCallback, useEffect, useRef, useState } from "react";
 
 import {
+  CaptureUpdateAction,
+  clearSimpleArrowTangentOverride,
   getGlobalFixedPointForBindableElement,
+  getElementAbsoluteCoords,
+  getSimpleArrowCurveDebugData,
   isArrowElement,
   isBindableElement,
+  setSimpleArrowTangentOverride,
+  ShapeCache,
 } from "@excalidraw/element";
 
 import {
   isLineSegment,
+  pointFrom,
+  pointRotateRads,
   type GlobalPoint,
+  type LocalPoint,
   type LineSegment,
+  type Radians,
 } from "@excalidraw/math";
 import { isCurve } from "@excalidraw/math/curve";
 
@@ -36,11 +53,260 @@ import type {
   ExcalidrawArrowElement,
   ExcalidrawBindableElement,
   FixedPointBinding,
+  Ordered,
   OrderedExcalidrawElement,
 } from "@excalidraw/element/types";
+import type { SimpleArrowCurveDebugData } from "@excalidraw/element";
 
 import { STORAGE_KEYS } from "../app_constants";
 
+type DebugCanvasOverlayState = Pick<
+  AppState,
+  | "width"
+  | "height"
+  | "zoom"
+  | "scrollX"
+  | "scrollY"
+  | "offsetLeft"
+  | "offsetTop"
+  | "selectedElementIds"
+>;
+
+type SimpleArrowHandleDirection = "incoming" | "outgoing";
+
+type SimpleArrowHandleDescriptor = {
+  key: string;
+  elementId: string;
+  pointIndex: number;
+  direction: SimpleArrowHandleDirection;
+  point: GlobalPoint;
+  handle: GlobalPoint;
+  isOverridden: boolean;
+  title: string;
+};
+
+type SelectedSimpleArrowDebugState = {
+  element: ExcalidrawArrowElement;
+  debugData: SimpleArrowCurveDebugData<GlobalPoint>;
+  handles: SimpleArrowHandleDescriptor[];
+};
+
+const areSimpleArrowTangentHandlesEnabled = () =>
+  window.EXCALIDRAW_DEBUG_LINEAR_ARROW_TANGENTS !== false;
+
+const pickOverlayState = (appState: AppState): DebugCanvasOverlayState => ({
+  width: appState.width,
+  height: appState.height,
+  zoom: appState.zoom,
+  scrollX: appState.scrollX,
+  scrollY: appState.scrollY,
+  offsetLeft: appState.offsetLeft,
+  offsetTop: appState.offsetTop,
+  selectedElementIds: appState.selectedElementIds,
+});
+
+const getSimpleArrowTransform = (
+  element: ExcalidrawArrowElement,
+  elementsMap: ElementsMap,
+) => {
+  const [, , , , cx, cy] = getElementAbsoluteCoords(element, elementsMap);
+  const center = pointFrom<GlobalPoint>(cx, cy);
+
+  return {
+    pointToGlobal: (point: LocalPoint): GlobalPoint => {
+      const rotated = pointRotateRads(
+        pointFrom<GlobalPoint>(element.x + point[0], element.y + point[1]),
+        center,
+        element.angle,
+      );
+
+      return pointFrom<GlobalPoint>(rotated[0], rotated[1]);
+    },
+    vectorToGlobal: (vector: [number, number]): [number, number] => {
+      const rotated = pointRotateRads(
+        pointFrom<GlobalPoint>(vector[0], vector[1]),
+        pointFrom<GlobalPoint>(0, 0),
+        element.angle,
+      );
+
+      return [rotated[0], rotated[1]];
+    },
+    vectorToLocal: (vector: [number, number]): [number, number] => {
+      const rotated = pointRotateRads(
+        pointFrom<GlobalPoint>(vector[0], vector[1]),
+        pointFrom<GlobalPoint>(0, 0),
+        -element.angle as Radians,
+      );
+
+      return [rotated[0], rotated[1]];
+    },
+  };
+};
+
+const getSimpleArrowDebugStateForElement = (
+  elements: readonly OrderedExcalidrawElement[],
+  elementId: string,
+): SelectedSimpleArrowDebugState | null => {
+  const element = elements.find(
+    (candidate): candidate is Ordered<ExcalidrawArrowElement> =>
+      candidate.id === elementId &&
+      !candidate.isDeleted &&
+      isArrowElement(candidate) &&
+      !!candidate.roundness &&
+      !candidate.elbowed,
+  );
+
+  if (!element) {
+    return null;
+  }
+
+  const elementsMap = arrayToMap(elements);
+  const transform = getSimpleArrowTransform(element, elementsMap);
+  const localDebugData = getSimpleArrowCurveDebugData(element.points, 0.5, {
+    elementId: element.id,
+  });
+  const debugData: SimpleArrowCurveDebugData<GlobalPoint> = {
+    ...localDebugData,
+    tangents: localDebugData.tangents.map((tangent) => ({
+      ...tangent,
+      point: transform.pointToGlobal(tangent.point as LocalPoint),
+      base: transform.vectorToGlobal(tangent.base),
+      autoScaled: transform.vectorToGlobal(tangent.autoScaled),
+      scaled: transform.vectorToGlobal(tangent.scaled),
+    })),
+    segments: localDebugData.segments.map((segment) => ({
+      ...segment,
+      start: transform.pointToGlobal(segment.start as LocalPoint),
+      end: transform.pointToGlobal(segment.end as LocalPoint),
+      baseCp1: transform.pointToGlobal(segment.baseCp1 as LocalPoint),
+      baseCp2: transform.pointToGlobal(segment.baseCp2 as LocalPoint),
+      cp1: transform.pointToGlobal(segment.cp1 as LocalPoint),
+      cp2: transform.pointToGlobal(segment.cp2 as LocalPoint),
+    })),
+  };
+  const handles = debugData.tangents.flatMap((tangent, pointIndex) => {
+    const descriptors: SimpleArrowHandleDescriptor[] = [];
+    const lengthRatio =
+      tangent.normalized.finalLengthVsMinNeighbor === null
+        ? "n/a"
+        : tangent.normalized.finalLengthVsMinNeighbor.toFixed(3);
+    const angleDelta = tangent.normalized.angleDelta.toFixed(3);
+    const title = `point ${pointIndex} · len/min ${lengthRatio} · dAngle ${angleDelta} · dblclick resets`;
+
+    if (pointIndex < debugData.tangents.length - 1) {
+      descriptors.push({
+        key: `${element.id}:${pointIndex}:out`,
+        elementId: element.id,
+        pointIndex,
+        direction: "outgoing",
+        point: tangent.point,
+        handle: pointFrom<GlobalPoint>(
+          tangent.point[0] + tangent.scaled[0] / 3,
+          tangent.point[1] + tangent.scaled[1] / 3,
+        ),
+        isOverridden: tangent.isOverridden,
+        title,
+      });
+    }
+
+    if (pointIndex > 0) {
+      descriptors.push({
+        key: `${element.id}:${pointIndex}:in`,
+        elementId: element.id,
+        pointIndex,
+        direction: "incoming",
+        point: tangent.point,
+        handle: pointFrom<GlobalPoint>(
+          tangent.point[0] - tangent.scaled[0] / 3,
+          tangent.point[1] - tangent.scaled[1] / 3,
+        ),
+        isOverridden: tangent.isOverridden,
+        title,
+      });
+    }
+
+    return descriptors;
+  });
+
+  return {
+    element,
+    debugData,
+    handles,
+  };
+};
+
+const getSelectedSimpleArrowDebugState = (
+  elements: readonly OrderedExcalidrawElement[],
+  appState: Pick<AppState, "selectedElementIds">,
+) => {
+  const selectedIds = Object.keys(appState.selectedElementIds);
+
+  if (selectedIds.length !== 1) {
+    return null;
+  }
+
+  return getSimpleArrowDebugStateForElement(elements, selectedIds[0]);
+};
+
+const renderSelectedSimpleArrowTangentOverlay = (
+  context: CanvasRenderingContext2D,
+  zoom: number,
+  debugState: SelectedSimpleArrowDebugState,
+) => {
+  context.save();
+  context.lineWidth = 1;
+
+  context.setLineDash([6, 4]);
+  context.strokeStyle = "rgba(134, 142, 150, 0.75)";
+
+  for (const segment of debugState.debugData.segments) {
+    context.beginPath();
+    context.moveTo(segment.start[0] * zoom, segment.start[1] * zoom);
+    context.lineTo(segment.baseCp1[0] * zoom, segment.baseCp1[1] * zoom);
+    context.lineTo(segment.baseCp2[0] * zoom, segment.baseCp2[1] * zoom);
+    context.lineTo(segment.end[0] * zoom, segment.end[1] * zoom);
+    context.stroke();
+  }
+
+  context.setLineDash([]);
+
+  for (const segment of debugState.debugData.segments) {
+    context.strokeStyle = segment.overshootsBaseline
+      ? "rgba(245, 159, 0, 0.9)"
+      : "rgba(94, 90, 216, 0.85)";
+
+    context.beginPath();
+    context.moveTo(segment.start[0] * zoom, segment.start[1] * zoom);
+    context.lineTo(segment.cp1[0] * zoom, segment.cp1[1] * zoom);
+    context.lineTo(segment.cp2[0] * zoom, segment.cp2[1] * zoom);
+    context.lineTo(segment.end[0] * zoom, segment.end[1] * zoom);
+    context.stroke();
+  }
+
+  for (const tangent of debugState.debugData.tangents) {
+    if (!tangent.isAdjusted) {
+      continue;
+    }
+
+    context.strokeStyle = tangent.isOverridden
+      ? "rgba(230, 73, 128, 0.95)"
+      : "rgba(201, 42, 42, 0.85)";
+    context.fillStyle = tangent.isOverridden
+      ? "rgba(230, 73, 128, 0.95)"
+      : "rgba(201, 42, 42, 0.95)";
+
+    fillCircle(
+      context,
+      tangent.point[0] * zoom,
+      tangent.point[1] * zoom,
+      3,
+      true,
+    );
+  }
+
+  context.restore();
+};
+
 const renderLine = (
   context: CanvasRenderingContext2D,
   zoom: number,
@@ -359,6 +625,13 @@ const _debugRenderer = (
   renderOrigin(context, appState.zoom.value);
   renderBindings(context, elements, appState.zoom.value);
 
+  const selectedSimpleArrowDebugState = areSimpleArrowTangentHandlesEnabled()
+    ? getSelectedSimpleArrowDebugState(elements, appState)
+    : null;
+
+  window.EXCALIDRAW_DEBUG_SELECTED_LINEAR_ARROW =
+    selectedSimpleArrowDebugState?.debugData;
+
   if (
     window.visualDebug?.currentFrame &&
     window.visualDebug?.data &&
@@ -375,6 +648,14 @@ const _debugRenderer = (
     });
   }
 
+  if (selectedSimpleArrowDebugState) {
+    renderSelectedSimpleArrowTangentOverlay(
+      context,
+      appState.zoom.value,
+      selectedSimpleArrowDebugState,
+    );
+  }
+
   if (window.visualDebug) {
     window.visualDebug!.data =
       window.visualDebug?.data.map((frame) =>
@@ -542,23 +823,324 @@ interface DebugCanvasProps {
 
 const DebugCanvas = React.forwardRef<HTMLCanvasElement, DebugCanvasProps>(
   ({ appState, scale }, ref) => {
-    const { width, height } = appState;
+    const excalidrawAPI = useExcalidrawAPI();
+    const [overlayState, setOverlayState] = useState<DebugCanvasOverlayState>(
+      () => pickOverlayState(appState),
+    );
+    const [selectedSimpleArrowDebugState, setSelectedSimpleArrowDebugState] =
+      useState<SelectedSimpleArrowDebugState | null>(null);
+    const dragStateRef = useRef<{
+      elementId: string;
+      pointIndex: number;
+      direction: SimpleArrowHandleDirection;
+    } | null>(null);
+
+    const syncSelectedSimpleArrowDebugState = useCallback(
+      (
+        nextAppState: AppState,
+        nextElements?: readonly OrderedExcalidrawElement[],
+      ) => {
+        if (!excalidrawAPI || excalidrawAPI.isDestroyed) {
+          return;
+        }
+
+        const elements =
+          nextElements ??
+          (excalidrawAPI.getSceneElements() as OrderedExcalidrawElement[]);
+
+        setOverlayState(pickOverlayState(nextAppState));
+
+        const nextDebugState = areSimpleArrowTangentHandlesEnabled()
+          ? getSelectedSimpleArrowDebugState(elements, nextAppState)
+          : null;
+
+        window.EXCALIDRAW_DEBUG_SELECTED_LINEAR_ARROW =
+          nextDebugState?.debugData;
+        setSelectedSimpleArrowDebugState(nextDebugState);
+      },
+      [excalidrawAPI],
+    );
+
+    useEffect(() => {
+      if (!excalidrawAPI || excalidrawAPI.isDestroyed) {
+        return;
+      }
+
+      syncSelectedSimpleArrowDebugState(excalidrawAPI.getAppState());
+
+      const unsubscribeChange = excalidrawAPI.onChange(
+        (elements, nextAppState) =>
+          syncSelectedSimpleArrowDebugState(
+            nextAppState,
+            elements as readonly OrderedExcalidrawElement[],
+          ),
+      );
+      const unsubscribeState = excalidrawAPI.onStateChange(
+        [
+          "selectedElementIds",
+          "zoom",
+          "scrollX",
+          "scrollY",
+          "offsetLeft",
+          "offsetTop",
+          "width",
+          "height",
+        ],
+        (_value, nextAppState) =>
+          syncSelectedSimpleArrowDebugState(nextAppState),
+      );
+
+      return () => {
+        unsubscribeChange();
+        unsubscribeState();
+      };
+    }, [excalidrawAPI, syncSelectedSimpleArrowDebugState]);
+
+    const rerenderSceneForSimpleArrowOverride = useCallback(() => {
+      if (!excalidrawAPI || excalidrawAPI.isDestroyed) {
+        return;
+      }
+
+      excalidrawAPI.updateScene({
+        elements: excalidrawAPI.getSceneElementsIncludingDeleted(),
+        captureUpdate: CaptureUpdateAction.NEVER,
+      });
+    }, [excalidrawAPI]);
+
+    const commitOverrideForHandle = useCallback(
+      (
+        handle: Pick<
+          SimpleArrowHandleDescriptor,
+          "elementId" | "pointIndex" | "direction"
+        >,
+        clientX: number,
+        clientY: number,
+      ) => {
+        if (!excalidrawAPI || excalidrawAPI.isDestroyed) {
+          return;
+        }
+
+        const nextAppState = excalidrawAPI.getAppState();
+        const nextElements =
+          excalidrawAPI.getSceneElements() as OrderedExcalidrawElement[];
+        const debugState = getSimpleArrowDebugStateForElement(
+          nextElements,
+          handle.elementId,
+        );
+
+        if (!debugState) {
+          return;
+        }
+
+        const scenePoint = viewportCoordsToSceneCoords(
+          { clientX, clientY },
+          nextAppState,
+        );
+        const tangent =
+          handle.direction === "outgoing"
+            ? ([
+                (scenePoint.x -
+                  debugState.debugData.tangents[handle.pointIndex].point[0]) *
+                  3,
+                (scenePoint.y -
+                  debugState.debugData.tangents[handle.pointIndex].point[1]) *
+                  3,
+              ] as [number, number])
+            : ([
+                (debugState.debugData.tangents[handle.pointIndex].point[0] -
+                  scenePoint.x) *
+                  3,
+                (debugState.debugData.tangents[handle.pointIndex].point[1] -
+                  scenePoint.y) *
+                  3,
+              ] as [number, number]);
+        const localTangent = getSimpleArrowTransform(
+          debugState.element,
+          arrayToMap(nextElements),
+        ).vectorToLocal(tangent);
+
+        setSimpleArrowTangentOverride(
+          debugState.element.id,
+          handle.pointIndex,
+          localTangent,
+        );
+        ShapeCache.delete(debugState.element);
+        rerenderSceneForSimpleArrowOverride();
+        syncSelectedSimpleArrowDebugState(nextAppState, nextElements);
+      },
+      [
+        excalidrawAPI,
+        rerenderSceneForSimpleArrowOverride,
+        syncSelectedSimpleArrowDebugState,
+      ],
+    );
+
+    const onPointerMove = useCallback(
+      (event: PointerEvent) => {
+        if (!dragStateRef.current) {
+          return;
+        }
+
+        event.preventDefault();
+        commitOverrideForHandle(
+          dragStateRef.current,
+          event.clientX,
+          event.clientY,
+        );
+      },
+      [commitOverrideForHandle],
+    );
+
+    const onPointerUp = useCallback(
+      (event: PointerEvent) => {
+        if (!dragStateRef.current) {
+          return;
+        }
+
+        event.preventDefault();
+        dragStateRef.current = null;
+        window.removeEventListener("pointermove", onPointerMove);
+        window.removeEventListener("pointerup", onPointerUp);
+        window.removeEventListener("pointercancel", onPointerUp);
+      },
+      [onPointerMove],
+    );
+
+    useEffect(() => {
+      return () => {
+        dragStateRef.current = null;
+        window.removeEventListener("pointermove", onPointerMove);
+        window.removeEventListener("pointerup", onPointerUp);
+        window.removeEventListener("pointercancel", onPointerUp);
+      };
+    }, [onPointerMove, onPointerUp]);
+
+    const handlePointerDown = useCallback(
+      (
+        handle: SimpleArrowHandleDescriptor,
+        event: React.PointerEvent<HTMLDivElement>,
+      ) => {
+        event.preventDefault();
+        event.stopPropagation();
+
+        dragStateRef.current = {
+          elementId: handle.elementId,
+          pointIndex: handle.pointIndex,
+          direction: handle.direction,
+        };
+
+        window.addEventListener("pointermove", onPointerMove, {
+          passive: false,
+        });
+        window.addEventListener("pointerup", onPointerUp, {
+          passive: false,
+        });
+        window.addEventListener("pointercancel", onPointerUp, {
+          passive: false,
+        });
+
+        commitOverrideForHandle(handle, event.clientX, event.clientY);
+      },
+      [commitOverrideForHandle, onPointerMove, onPointerUp],
+    );
+
+    const resetHandleOverride = useCallback(
+      (
+        handle: SimpleArrowHandleDescriptor,
+        event: React.MouseEvent<HTMLDivElement>,
+      ) => {
+        event.preventDefault();
+        event.stopPropagation();
+
+        if (!excalidrawAPI || excalidrawAPI.isDestroyed) {
+          return;
+        }
+
+        clearSimpleArrowTangentOverride(handle.elementId, handle.pointIndex);
+
+        const nextElements =
+          excalidrawAPI.getSceneElements() as OrderedExcalidrawElement[];
+        const element = nextElements.find(
+          (candidate): candidate is Ordered<ExcalidrawArrowElement> =>
+            candidate.id === handle.elementId &&
+            !candidate.isDeleted &&
+            isArrowElement(candidate),
+        );
+
+        if (element) {
+          ShapeCache.delete(element);
+          rerenderSceneForSimpleArrowOverride();
+        }
+
+        syncSelectedSimpleArrowDebugState(
+          excalidrawAPI.getAppState(),
+          nextElements,
+        );
+      },
+      [
+        excalidrawAPI,
+        rerenderSceneForSimpleArrowOverride,
+        syncSelectedSimpleArrowDebugState,
+      ],
+    );
+
+    const { width, height } = overlayState;
 
     return (
-      <canvas
-        style={{
-          width,
-          height,
-          position: "absolute",
-          zIndex: 2,
-          pointerEvents: "none",
-        }}
-        width={width * scale}
-        height={height * scale}
-        ref={ref}
-      >
-        Debug Canvas
-      </canvas>
+      <>
+        <canvas
+          style={{
+            width,
+            height,
+            position: "absolute",
+            inset: 0,
+            zIndex: 2,
+            pointerEvents: "none",
+          }}
+          width={width * scale}
+          height={height * scale}
+          ref={ref}
+        >
+          Debug Canvas
+        </canvas>
+        {selectedSimpleArrowDebugState?.handles.map((handle) => {
+          const { x, y } = sceneCoordsToViewportCoords(
+            {
+              sceneX: handle.handle[0],
+              sceneY: handle.handle[1],
+            },
+            overlayState,
+          );
+
+          return (
+            <div
+              key={handle.key}
+              title={handle.title}
+              onPointerDown={(event) => handlePointerDown(handle, event)}
+              onDoubleClick={(event) => resetHandleOverride(handle, event)}
+              style={{
+                position: "absolute",
+                left: x - overlayState.offsetLeft,
+                top: y - overlayState.offsetTop,
+                width: 12,
+                height: 12,
+                zIndex: 3,
+                borderRadius: handle.direction === "outgoing" ? "999px" : 3,
+                transform: "translate(-50%, -50%)",
+                background: handle.isOverridden
+                  ? "rgba(230, 73, 128, 0.95)"
+                  : handle.direction === "outgoing"
+                  ? "rgba(94, 90, 216, 0.95)"
+                  : "rgba(245, 159, 0, 0.95)",
+                border: "2px solid rgba(255,255,255,0.95)",
+                boxShadow: "0 0 0 1px rgba(0, 0, 0, 0.18)",
+                pointerEvents: "auto",
+                cursor: "grab",
+              }}
+            />
+          );
+        })}
+      </>
     );
   },
 );

packages/element/src/__tests__/__snapshots__/transform.test.ts.snap

@@ -1822,7 +1822,7 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "versionNonce": Any<Number>,
   "verticalAlign": "middle",
   "width": 120,
-  "x": 187.75450000000004,
+  "x": 187.7545,
   "y": 44.5,
 }
 `;

packages/element/src/bounds.ts

@@ -789,27 +789,41 @@ export const getArrowheadPoints = (
     p0 = pointFrom(prevOp.data[4], prevOp.data[5]);
   }
 
-  // B(t) = p0 * (1-t)^3 + 3p1 * t * (1-t)^2 + 3p2 * t^2 * (1-t) + p3 * t^3
-  const equation = (t: number, idx: number) =>
-    Math.pow(1 - t, 3) * p3[idx] +
-    3 * t * Math.pow(1 - t, 2) * p2[idx] +
-    3 * Math.pow(t, 2) * (1 - t) * p1[idx] +
-    p0[idx] * Math.pow(t, 3);
-
-  // Ee know the last point of the arrow (or the first, if start arrowhead).
+  // We know the last point of the arrow (or the first, if start arrowhead).
   const [x2, y2] = position === "start" ? p0 : p3;
 
-  // By using cubic bezier equation (B(t)) and the given parameters,
-  // we calculate a point that is closer to the last point.
-  // The value 0.3 is chosen arbitrarily and it works best for all
-  // the tested cases.
-  const [x1, y1] = [equation(0.3, 0), equation(0.3, 1)];
-
-  // Find the normalized direction vector based on the
-  // previously calculated points.
-  const distance = Math.hypot(x2 - x1, y2 - y1);
-  const nx = (x2 - x1) / distance;
-  const ny = (y2 - y1) / distance;
+  // Use the analytic tangent at the Bézier endpoint for a precise arrowhead
+  // direction. For a cubic Bézier B(t) with control points p0p3:
+  //   B'(1): (p3 − p2) tangent at the end
+  //   B'(0): (p1 − p0) for start arrowhead, arrow points away: (p0 − p1)
+  let dx: number;
+  let dy: number;
+  if (position === "end") {
+    dx = p3[0] - p2[0];
+    dy = p3[1] - p2[1];
+    if (Math.hypot(dx, dy) < 1e-6) {
+      dx = p3[0] - p1[0];
+      dy = p3[1] - p1[1];
+    }
+    if (Math.hypot(dx, dy) < 1e-6) {
+      dx = p3[0] - p0[0];
+      dy = p3[1] - p0[1];
+    }
+  } else {
+    dx = p0[0] - p1[0];
+    dy = p0[1] - p1[1];
+    if (Math.hypot(dx, dy) < 1e-6) {
+      dx = p0[0] - p2[0];
+      dy = p0[1] - p2[1];
+    }
+    if (Math.hypot(dx, dy) < 1e-6) {
+      dx = p0[0] - p3[0];
+      dy = p0[1] - p3[1];
+    }
+  }
+  const distance = Math.hypot(dx, dy);
+  const nx = dx / distance;
+  const ny = dy / distance;
 
   const size = getArrowheadSize(arrowhead);
 

packages/element/src/collision.ts

@@ -465,12 +465,7 @@ export const intersectElementWithLineSegment = (
     case "line":
     case "freedraw":
     case "arrow":
-      return intersectLinearOrFreeDrawWithLineSegment(
-        element,
-        line,
-        elementsMap,
-        onlyFirst,
-      );
+      return intersectLinearOrFreeDrawWithLineSegment(element, line, onlyFirst);
   }
 };
 
@@ -537,15 +532,11 @@ const lineIntersections = (
 const intersectLinearOrFreeDrawWithLineSegment = (
   element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
   segment: LineSegment<GlobalPoint>,
-  elementsMap: ElementsMap,
   onlyFirst = false,
 ): GlobalPoint[] => {
   // NOTE: This is the only one which return the decomposed elements
   // rotated! This is due to taking advantage of roughjs definitions.
-  const [lines, curves] = deconstructLinearOrFreeDrawElement(
-    element,
-    elementsMap,
-  );
+  const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
   const intersections: GlobalPoint[] = [];
 
   for (const l of lines) {

packages/element/src/distance.ts

@@ -48,7 +48,7 @@ export const distanceToElement = (
     case "line":
     case "arrow":
     case "freedraw":
-      return distanceToLinearOrFreeDraElement(element, elementsMap, p);
+      return distanceToLinearOrFreeDraElement(element, p);
   }
 };
 
@@ -133,13 +133,9 @@ const distanceToEllipseElement = (
 
 const distanceToLinearOrFreeDraElement = (
   element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
-  elementsMap: ElementsMap,
   p: GlobalPoint,
 ) => {
-  const [lines, curves] = deconstructLinearOrFreeDrawElement(
-    element,
-    elementsMap,
-  );
+  const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
   return Math.min(
     ...lines.map((s) => distanceToLineSegment(p, s)),
     ...curves.map((a) => curvePointDistance(a, p)),

packages/element/src/linearElementEditor.ts

@@ -476,22 +476,16 @@ export class LinearElementEditor {
       });
     }
 
-    if (
-      lastClickedPoint < 0 ||
-      !selectedPointsIndices.includes(lastClickedPoint) ||
-      !element.points[lastClickedPoint]
-    ) {
-      console.error(
-        `There must be a valid lastClickedPoint in order to drag it. selectedPointsIndices(${JSON.stringify(
-          selectedPointsIndices,
-        )}) points(0..${
-          element.points.length - 1
-        }) lastClickedPoint(${lastClickedPoint})`,
-      );
-
-      // Fall back to the actual last point as a last resort.
-      lastClickedPoint = element.points.length - 1;
-    }
+    invariant(
+      lastClickedPoint > -1 &&
+        selectedPointsIndices.includes(lastClickedPoint) &&
+        element.points[lastClickedPoint],
+      `There must be a valid lastClickedPoint in order to drag it. selectedPointsIndices(${JSON.stringify(
+        selectedPointsIndices,
+      )}) points(0..${
+        element.points.length - 1
+      }) lastClickedPoint(${lastClickedPoint})`,
+    );
 
     // point that's being dragged (out of all selected points)
     const draggingPoint = element.points[lastClickedPoint];
@@ -790,9 +784,20 @@ export class LinearElementEditor {
       elementsMap,
     );
 
+    // For curved (non-elbow) arrows the quadratic spline produces N-2 arcs
+    // for N anchor points. Cap the loop to the actual segment count so we
+    // don't request a midpoint for a segment that doesn't exist.
+    const [lines, segCurves] = deconstructLinearOrFreeDrawElement(element);
+    const segmentCount = lines.length + segCurves.length;
+
     let index = 0;
     const midpoints: (GlobalPoint | null)[] = [];
     while (index < points.length - 1) {
+      if (segmentCount > 0 && index >= segmentCount) {
+        midpoints.push(null);
+        index++;
+        continue;
+      }
       if (
         LinearElementEditor.isSegmentTooShort(
           element,
@@ -800,7 +805,6 @@ export class LinearElementEditor {
           element.points[index + 1],
           index,
           appState.zoom,
-          elementsMap,
         )
       ) {
         midpoints.push(null);
@@ -810,7 +814,6 @@ export class LinearElementEditor {
       const segmentMidPoint = LinearElementEditor.getSegmentMidPoint(
         element,
         index + 1,
-        elementsMap,
       );
       midpoints.push(segmentMidPoint);
       index++;
@@ -898,7 +901,6 @@ export class LinearElementEditor {
     endPoint: P,
     index: number,
     zoom: Zoom,
-    elementsMap: ElementsMap,
   ) {
     if (isElbowArrow(element)) {
       if (index >= 0 && index < element.points.length) {
@@ -913,10 +915,7 @@ export class LinearElementEditor {
 
     let distance = pointDistance(startPoint, endPoint);
     if (element.points.length > 2 && element.roundness) {
-      const [lines, curves] = deconstructLinearOrFreeDrawElement(
-        element,
-        elementsMap,
-      );
+      const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
 
       invariant(
         lines.length === 0 && curves.length > 0,
@@ -936,7 +935,6 @@ export class LinearElementEditor {
   static getSegmentMidPoint(
     element: NonDeleted<ExcalidrawLinearElement>,
     index: number,
-    elementsMap: ElementsMap,
   ): GlobalPoint {
     if (isElbowArrow(element)) {
       invariant(
@@ -949,10 +947,7 @@ export class LinearElementEditor {
       return pointFrom<GlobalPoint>(element.x + p[0], element.y + p[1]);
     }
 
-    const [lines, curves] = deconstructLinearOrFreeDrawElement(
-      element,
-      elementsMap,
-    );
+    const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
 
     invariant(
       (lines.length === 0 && curves.length > 0) ||
@@ -1867,7 +1862,6 @@ export class LinearElementEditor {
       const midSegmentMidpoint = LinearElementEditor.getSegmentMidPoint(
         element,
         index + 1,
-        elementsMap,
       );
 
       x = midSegmentMidpoint[0] - boundTextElement.width / 2;
@@ -2417,7 +2411,7 @@ const pointDraggingUpdates = (
     ? nextArrow.points[0]
     : endBindable
     ? updateBoundPoint(
-        nextArrow,
+        element,
         "endBinding",
         nextArrow.endBinding,
         endBindable,
@@ -2448,7 +2442,7 @@ const pointDraggingUpdates = (
       ? endLocalPoint
       : startBindable
       ? updateBoundPoint(
-          nextArrow,
+          element,
           "startBinding",
           nextArrow.startBinding,
           startBindable,

packages/element/src/shape.ts

@@ -57,8 +57,8 @@ import { headingForPointIsHorizontal } from "./heading";
 
 import { canChangeRoundness } from "./comparisons";
 import {
-  elementCenterPoint,
   getArrowheadPoints,
+  getCenterForBounds,
   getDiamondPoints,
   getElementAbsoluteCoords,
 } from "./bounds";
@@ -583,11 +583,7 @@ const getArrowheadShapes = (
 
 export const generateLinearCollisionShape = (
   element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
-  elementsMap: ElementsMap,
-): {
-  op: string;
-  data: number[];
-}[] => {
+) => {
   const generator = new RoughGenerator();
   const options: Options = {
     seed: element.seed,
@@ -596,7 +592,20 @@ export const generateLinearCollisionShape = (
     roughness: 0,
     preserveVertices: true,
   };
-  const center = elementCenterPoint(element, elementsMap);
+  const center = getCenterForBounds(
+    // Need a non-rotated center point
+    element.points.reduce(
+      (acc, point) => {
+        return [
+          Math.min(element.x + point[0], acc[0]),
+          Math.min(element.y + point[1], acc[1]),
+          Math.max(element.x + point[0], acc[2]),
+          Math.max(element.y + point[1], acc[3]),
+        ];
+      },
+      [Infinity, Infinity, -Infinity, -Infinity],
+    ),
+  );
 
   switch (element.type) {
     case "line":
@@ -625,60 +634,34 @@ export const generateLinearCollisionShape = (
         });
       }
 
-      return generator
-        .curve(points as unknown as RoughPoint[], options)
-        .sets[0].ops.slice(0, element.points.length)
-        .map((op, i) => {
-          if (i === 0) {
-            const p = pointRotateRads<GlobalPoint>(
-              pointFrom<GlobalPoint>(
-                element.x + op.data[0],
-                element.y + op.data[1],
-              ),
-              center,
-              element.angle,
-            );
+      // Rotate the same cubic ops used for rendering so hit-testing matches the
+      // visible arrow path.
+      const rotateLocal = (lx: number, ly: number): LocalPoint => {
+        const g = pointRotateRads<GlobalPoint>(
+          pointFrom<GlobalPoint>(element.x + lx, element.y + ly),
+          center,
+          element.angle,
+        );
+        return pointFrom<LocalPoint>(g[0] - element.x, g[1] - element.y);
+      };
 
-            return {
-              op: "move",
-              data: pointFrom<LocalPoint>(p[0] - element.x, p[1] - element.y),
-            };
-          }
+      return generateSimpleArrowPathOps(points, 0.5, element.id).map((op) => {
+        if (op.op === "bcurveTo") {
+          const rcp1 = rotateLocal(op.data[0], op.data[1]);
+          const rcp2 = rotateLocal(op.data[2], op.data[3]);
+          const rend = rotateLocal(op.data[4], op.data[5]);
 
           return {
             op: "bcurveTo",
-            data: [
-              pointRotateRads(
-                pointFrom<GlobalPoint>(
-                  element.x + op.data[0],
-                  element.y + op.data[1],
-                ),
-                center,
-                element.angle,
-              ),
-              pointRotateRads(
-                pointFrom<GlobalPoint>(
-                  element.x + op.data[2],
-                  element.y + op.data[3],
-                ),
-                center,
-                element.angle,
-              ),
-              pointRotateRads(
-                pointFrom<GlobalPoint>(
-                  element.x + op.data[4],
-                  element.y + op.data[5],
-                ),
-                center,
-                element.angle,
-              ),
-            ]
-              .map((p) =>
-                pointFrom<LocalPoint>(p[0] - element.x, p[1] - element.y),
-              )
-              .flat(),
+            data: [rcp1[0], rcp1[1], rcp2[0], rcp2[1], rend[0], rend[1]],
           };
-        });
+        }
+
+        return {
+          op: op.op,
+          data: rotateLocal(op.data[0], op.data[1]),
+        };
+      });
     }
     case "freedraw": {
       if (element.points.length < 2) {
@@ -920,7 +903,12 @@ const _generateElementShape = (
           ];
         }
       } else {
-        shape = [generator.curve(points as unknown as RoughPoint[], options)];
+        shape = [
+          generator.path(
+            generateSimpleArrowShape(points, 0.5, element.id),
+            generateRoughOptions(element, true, isDarkMode),
+          ),
+        ];
       }
 
       // add lines only in arrow
@@ -1004,10 +992,754 @@ const _generateElementShape = (
   }
 };
 
+type SimpleArrowPathOp =
+  | { op: "move" | "lineTo"; data: LocalPoint }
+  | { op: "bcurveTo"; data: [number, number, number, number, number, number] };
+
+const SIMPLE_ARROW_OVERSHOOT_EPSILON = 0.5;
+const SIMPLE_ARROW_SCALE_EPSILON = 1e-4;
+const SIMPLE_ARROW_SCALE_SEARCH_STEPS = 24;
+const SIMPLE_ARROW_SCALE_PASSES = 8;
+
+type SimpleArrowVector = [number, number];
+
+type SimpleArrowTangentOverrides = Record<
+  string,
+  Record<number, SimpleArrowVector>
+>;
+
+declare global {
+  interface Window {
+    EXCALIDRAW_DEBUG_LINEAR_ARROW_TANGENT_OVERRIDES?:
+      | SimpleArrowTangentOverrides
+      | undefined;
+  }
+}
+
+type SimpleArrowCurveDebugDataOptions = {
+  elementId?: string;
+};
+
+export type SimpleArrowCurveDebugData<
+  Point extends GlobalPoint | LocalPoint = LocalPoint,
+> = {
+  elementId?: string;
+  tangents: Array<{
+    point: Point;
+    base: SimpleArrowVector;
+    autoScaled: SimpleArrowVector;
+    scale: number;
+    autoScale: number;
+    scaled: SimpleArrowVector;
+    isAdjusted: boolean;
+    isOverridden: boolean;
+    normalized: {
+      baseLength: number;
+      autoLength: number;
+      finalLength: number;
+      prevSegmentLength: number | null;
+      nextSegmentLength: number | null;
+      minNeighborLength: number | null;
+      finalLengthVsMinNeighbor: number | null;
+      autoLengthVsMinNeighbor: number | null;
+      angleDelta: number;
+      turnAngle: number | null;
+    };
+  }>;
+  segments: Array<{
+    start: Point;
+    end: Point;
+    baseCp1: Point;
+    baseCp2: Point;
+    cp1: Point;
+    cp2: Point;
+    overshootsBaseline: boolean;
+    overshootsResolved: boolean;
+    metrics: {
+      chordLength: number;
+      baseStartProjection: number;
+      baseEndProjection: number;
+      finalStartProjection: number;
+      finalEndProjection: number;
+    };
+  }>;
+  inference: {
+    overriddenPointIndices: number[];
+  };
+};
+
+const SIMPLE_ARROW_ADJUSTMENT_EPSILON = 1e-3;
+
+const getSimpleArrowTangentOverrideStore = () => {
+  if (typeof window === "undefined") {
+    return null;
+  }
+
+  window.EXCALIDRAW_DEBUG_LINEAR_ARROW_TANGENT_OVERRIDES ??= {};
+  return window.EXCALIDRAW_DEBUG_LINEAR_ARROW_TANGENT_OVERRIDES;
+};
+
+export const setSimpleArrowTangentOverride = (
+  elementId: string,
+  pointIndex: number,
+  tangent: SimpleArrowVector,
+) => {
+  const store = getSimpleArrowTangentOverrideStore();
+
+  if (!store) {
+    return;
+  }
+
+  store[elementId] = {
+    ...(store[elementId] ?? {}),
+    [pointIndex]: [tangent[0], tangent[1]],
+  };
+};
+
+export const clearSimpleArrowTangentOverride = (
+  elementId: string,
+  pointIndex?: number,
+) => {
+  const store = getSimpleArrowTangentOverrideStore();
+
+  if (!store?.[elementId]) {
+    return;
+  }
+
+  if (typeof pointIndex === "number") {
+    delete store[elementId][pointIndex];
+
+    if (Object.keys(store[elementId]).length === 0) {
+      delete store[elementId];
+    }
+    return;
+  }
+
+  delete store[elementId];
+};
+
+const getSimpleArrowTangentOverrides = (elementId?: string) => {
+  if (!elementId) {
+    return null;
+  }
+
+  return getSimpleArrowTangentOverrideStore()?.[elementId] ?? null;
+};
+
+const getSimpleArrowVectorLength = ([x, y]: SimpleArrowVector) =>
+  Math.hypot(x, y);
+
+const normalizeSimpleArrowAngle = (angle: number) => {
+  let normalized = angle;
+
+  while (normalized <= -Math.PI) {
+    normalized += Math.PI * 2;
+  }
+  while (normalized > Math.PI) {
+    normalized -= Math.PI * 2;
+  }
+
+  return normalized;
+};
+
+const getSimpleArrowBezierValue = (
+  p0: number,
+  p1: number,
+  p2: number,
+  p3: number,
+  t: number,
+) => {
+  const mt = 1 - t;
+
+  return (
+    mt * mt * mt * p0 +
+    3 * mt * mt * t * p1 +
+    3 * mt * t * t * p2 +
+    t * t * t * p3
+  );
+};
+
+const doesSimpleArrowSegmentOvershoot = (
+  startProjection: number,
+  endProjection: number,
+  segmentLength: number,
+) => {
+  const a = -3 * startProjection + 3 * endProjection + segmentLength;
+  const b = 2 * (segmentLength - 2 * endProjection + startProjection);
+  const c = startProjection;
+  const candidateTs = [0, 1];
+
+  if (Math.abs(a) < 1e-8) {
+    if (Math.abs(b) >= 1e-8) {
+      candidateTs.push(-c / b);
+    }
+  } else {
+    const discriminant = b * b - 4 * a * c;
+
+    if (discriminant >= 0) {
+      const discriminantRoot = Math.sqrt(discriminant);
+      candidateTs.push((-b + discriminantRoot) / (2 * a));
+      candidateTs.push((-b - discriminantRoot) / (2 * a));
+    }
+  }
+
+  let minProjection = Infinity;
+  let maxProjection = -Infinity;
+
+  for (const t of candidateTs) {
+    if (t < 0 || t > 1) {
+      continue;
+    }
+
+    const projection = getSimpleArrowBezierValue(
+      0,
+      startProjection,
+      endProjection,
+      segmentLength,
+      t,
+    );
+
+    minProjection = Math.min(minProjection, projection);
+    maxProjection = Math.max(maxProjection, projection);
+  }
+
+  return (
+    minProjection < -SIMPLE_ARROW_OVERSHOOT_EPSILON ||
+    maxProjection > segmentLength + SIMPLE_ARROW_OVERSHOOT_EPSILON
+  );
+};
+
+const getSimpleArrowBaseTangents = <Point extends GlobalPoint | LocalPoint>(
+  points: readonly Point[],
+  tension: number,
+): [Float64Array, Float64Array] => {
+  const tx = new Float64Array(points.length);
+  const ty = new Float64Array(points.length);
+
+  for (let i = 0; i < points.length; i++) {
+    if (i === 0) {
+      const pbx = 3 * points[0][0] - 3 * points[1][0] + points[2][0];
+      const pby = 3 * points[0][1] - 3 * points[1][1] + points[2][1];
+      tx[i] = tension * (points[1][0] - pbx);
+      ty[i] = tension * (points[1][1] - pby);
+    } else if (i === points.length - 1) {
+      const pax =
+        3 * points[points.length - 1][0] -
+        3 * points[points.length - 2][0] +
+        points[points.length - 3][0];
+      const pay =
+        3 * points[points.length - 1][1] -
+        3 * points[points.length - 2][1] +
+        points[points.length - 3][1];
+      tx[i] = tension * (pax - points[points.length - 2][0]);
+      ty[i] = tension * (pay - points[points.length - 2][1]);
+    } else {
+      tx[i] = tension * (points[i + 1][0] - points[i - 1][0]);
+      ty[i] = tension * (points[i + 1][1] - points[i - 1][1]);
+    }
+  }
+
+  return [tx, ty];
+};
+
+const getSimpleArrowSegmentProjections = <
+  Point extends GlobalPoint | LocalPoint,
+>(
+  points: readonly Point[],
+  tangentX: Float64Array,
+  tangentY: Float64Array,
+  scales: Float64Array | undefined,
+  segmentIndex: number,
+  segmentScale = 1,
+) => {
+  const start = points[segmentIndex];
+  const end = points[segmentIndex + 1];
+  const segmentDx = end[0] - start[0];
+  const segmentDy = end[1] - start[1];
+  const segmentLength = Math.hypot(segmentDx, segmentDy);
+
+  if (!segmentLength) {
+    return {
+      segmentLength,
+      startProjection: 0,
+      endProjection: 0,
+    };
+  }
+
+  const segmentUx = segmentDx / segmentLength;
+  const segmentUy = segmentDy / segmentLength;
+  const startScale = scales?.[segmentIndex] ?? 1;
+  const endScale = scales?.[segmentIndex + 1] ?? 1;
+  const startProjection =
+    startScale *
+    segmentScale *
+    ((tangentX[segmentIndex] * segmentUx + tangentY[segmentIndex] * segmentUy) /
+      3);
+  const endProjection =
+    segmentLength -
+    endScale *
+      segmentScale *
+      ((tangentX[segmentIndex + 1] * segmentUx +
+        tangentY[segmentIndex + 1] * segmentUy) /
+        3);
+
+  return {
+    segmentLength,
+    startProjection,
+    endProjection,
+  };
+};
+
+const isSimpleArrowSegmentOvershooting = <
+  Point extends GlobalPoint | LocalPoint,
+>(
+  points: readonly Point[],
+  tangentX: Float64Array,
+  tangentY: Float64Array,
+  scales: Float64Array | undefined,
+  segmentIndex: number,
+  segmentScale = 1,
+) => {
+  const { segmentLength, startProjection, endProjection } =
+    getSimpleArrowSegmentProjections(
+      points,
+      tangentX,
+      tangentY,
+      scales,
+      segmentIndex,
+      segmentScale,
+    );
+
+  if (!segmentLength) {
+    return false;
+  }
+
+  return doesSimpleArrowSegmentOvershoot(
+    startProjection,
+    endProjection,
+    segmentLength,
+  );
+};
+
+const getSimpleArrowSegmentScale = <Point extends GlobalPoint | LocalPoint>(
+  points: readonly Point[],
+  tx: Float64Array,
+  ty: Float64Array,
+  scales: Float64Array,
+  segmentIndex: number,
+) => {
+  if (
+    !isSimpleArrowSegmentOvershooting(points, tx, ty, scales, segmentIndex, 1)
+  ) {
+    return 1;
+  }
+
+  let low = 0;
+  let high = 1;
+
+  for (let i = 0; i < SIMPLE_ARROW_SCALE_SEARCH_STEPS; i++) {
+    const mid = (low + high) / 2;
+    if (
+      isSimpleArrowSegmentOvershooting(
+        points,
+        tx,
+        ty,
+        scales,
+        segmentIndex,
+        mid,
+      )
+    ) {
+      high = mid;
+    } else {
+      low = mid;
+    }
+  }
+
+  return low;
+};
+
+const getSimpleArrowTangentScales = <Point extends GlobalPoint | LocalPoint>(
+  points: readonly Point[],
+  tx: Float64Array,
+  ty: Float64Array,
+) => {
+  const scales = new Float64Array(points.length);
+  scales.fill(1);
+
+  for (let pass = 0; pass < SIMPLE_ARROW_SCALE_PASSES; pass++) {
+    const nextScales = new Float64Array(scales);
+    let didChange = false;
+
+    for (
+      let segmentIndex = 0;
+      segmentIndex < points.length - 1;
+      segmentIndex++
+    ) {
+      if (
+        !isSimpleArrowSegmentOvershooting(points, tx, ty, scales, segmentIndex)
+      ) {
+        continue;
+      }
+
+      const segmentScale = getSimpleArrowSegmentScale(
+        points,
+        tx,
+        ty,
+        scales,
+        segmentIndex,
+      );
+
+      const nextStartScale = scales[segmentIndex] * segmentScale;
+      const nextEndScale = scales[segmentIndex + 1] * segmentScale;
+
+      if (
+        nextStartScale <
+        nextScales[segmentIndex] - SIMPLE_ARROW_SCALE_EPSILON
+      ) {
+        nextScales[segmentIndex] = nextStartScale;
+        didChange = true;
+      }
+
+      if (
+        nextEndScale <
+        nextScales[segmentIndex + 1] - SIMPLE_ARROW_SCALE_EPSILON
+      ) {
+        nextScales[segmentIndex + 1] = nextEndScale;
+        didChange = true;
+      }
+    }
+
+    if (!didChange) {
+      return scales;
+    }
+
+    scales.set(nextScales);
+  }
+
+  return scales;
+};
+
+const getSimpleArrowFinalTangents = (
+  tx: Float64Array,
+  ty: Float64Array,
+  scales: Float64Array,
+  elementId?: string,
+) => {
+  const finalX = new Float64Array(tx.length);
+  const finalY = new Float64Array(ty.length);
+
+  for (let i = 0; i < tx.length; i++) {
+    finalX[i] = tx[i] * scales[i];
+    finalY[i] = ty[i] * scales[i];
+  }
+
+  const overrides = getSimpleArrowTangentOverrides(elementId);
+
+  if (!overrides) {
+    return {
+      finalX,
+      finalY,
+      overriddenPointIndices: [] as number[],
+    };
+  }
+
+  const overriddenPointIndices: number[] = [];
+
+  for (const [indexKey, tangent] of Object.entries(overrides)) {
+    const index = Number(indexKey);
+
+    if (!Number.isInteger(index) || index < 0 || index >= finalX.length) {
+      continue;
+    }
+
+    finalX[index] = tangent[0];
+    finalY[index] = tangent[1];
+    overriddenPointIndices.push(index);
+  }
+
+  overriddenPointIndices.sort((a, b) => a - b);
+
+  return {
+    finalX,
+    finalY,
+    overriddenPointIndices,
+  };
+};
+
+export const getSimpleArrowCurveDebugData = <
+  Point extends GlobalPoint | LocalPoint,
+>(
+  points: readonly Point[],
+  tension = 0.5,
+  options?: SimpleArrowCurveDebugDataOptions,
+): SimpleArrowCurveDebugData<Point> => {
+  if (points.length < 2) {
+    return {
+      elementId: options?.elementId,
+      tangents: [],
+      segments: [],
+      inference: {
+        overriddenPointIndices: [],
+      },
+    };
+  }
+
+  if (points.length === 2) {
+    return {
+      elementId: options?.elementId,
+      tangents: points.map((point) => ({
+        point,
+        base: [0, 0],
+        autoScaled: [0, 0],
+        scale: 1,
+        autoScale: 1,
+        scaled: [0, 0],
+        isAdjusted: false,
+        isOverridden: false,
+        normalized: {
+          baseLength: 0,
+          autoLength: 0,
+          finalLength: 0,
+          prevSegmentLength: null,
+          nextSegmentLength: null,
+          minNeighborLength: null,
+          finalLengthVsMinNeighbor: null,
+          autoLengthVsMinNeighbor: null,
+          angleDelta: 0,
+          turnAngle: null,
+        },
+      })),
+      segments: [],
+      inference: {
+        overriddenPointIndices: [],
+      },
+    };
+  }
+
+  const [tx, ty] = getSimpleArrowBaseTangents(points, tension);
+  const scales = getSimpleArrowTangentScales(points, tx, ty);
+  const baselineScales = new Float64Array(points.length);
+  baselineScales.fill(1);
+  const { finalX, finalY, overriddenPointIndices } =
+    getSimpleArrowFinalTangents(tx, ty, scales, options?.elementId);
+
+  return {
+    elementId: options?.elementId,
+    tangents: points.map((point, index) => ({
+      point,
+      base: [tx[index], ty[index]],
+      autoScaled: [tx[index] * scales[index], ty[index] * scales[index]],
+      scale:
+        getSimpleArrowVectorLength([tx[index], ty[index]]) > 0
+          ? getSimpleArrowVectorLength([finalX[index], finalY[index]]) /
+            getSimpleArrowVectorLength([tx[index], ty[index]])
+          : 1,
+      autoScale: scales[index],
+      scaled: [finalX[index], finalY[index]],
+      isAdjusted:
+        Math.abs(scales[index] - 1) > SIMPLE_ARROW_ADJUSTMENT_EPSILON ||
+        Math.abs(
+          normalizeSimpleArrowAngle(
+            Math.atan2(finalY[index], finalX[index]) -
+              Math.atan2(ty[index], tx[index]),
+          ),
+        ) > SIMPLE_ARROW_ADJUSTMENT_EPSILON,
+      isOverridden: overriddenPointIndices.includes(index),
+      normalized: (() => {
+        const base = [tx[index], ty[index]] as SimpleArrowVector;
+        const autoScaled = [
+          tx[index] * scales[index],
+          ty[index] * scales[index],
+        ] as SimpleArrowVector;
+        const scaled = [finalX[index], finalY[index]] as SimpleArrowVector;
+        const baseLength = getSimpleArrowVectorLength(base);
+        const autoLength = getSimpleArrowVectorLength(autoScaled);
+        const finalLength = getSimpleArrowVectorLength(scaled);
+        const prevSegmentLength =
+          index > 0 ? pointDistance(points[index - 1], point) : null;
+        const nextSegmentLength =
+          index < points.length - 1
+            ? pointDistance(point, points[index + 1])
+            : null;
+        const minNeighborLength =
+          prevSegmentLength === null
+            ? nextSegmentLength
+            : nextSegmentLength === null
+            ? prevSegmentLength
+            : Math.min(prevSegmentLength, nextSegmentLength);
+        const turnAngle =
+          prevSegmentLength !== null && nextSegmentLength !== null
+            ? normalizeSimpleArrowAngle(
+                Math.atan2(
+                  points[index + 1][1] - point[1],
+                  points[index + 1][0] - point[0],
+                ) -
+                  Math.atan2(
+                    point[1] - points[index - 1][1],
+                    point[0] - points[index - 1][0],
+                  ),
+              )
+            : null;
+
+        return {
+          baseLength,
+          autoLength,
+          finalLength,
+          prevSegmentLength,
+          nextSegmentLength,
+          minNeighborLength,
+          finalLengthVsMinNeighbor:
+            minNeighborLength && minNeighborLength > 0
+              ? finalLength / minNeighborLength
+              : null,
+          autoLengthVsMinNeighbor:
+            minNeighborLength && minNeighborLength > 0
+              ? autoLength / minNeighborLength
+              : null,
+          angleDelta: normalizeSimpleArrowAngle(
+            Math.atan2(finalY[index], finalX[index]) -
+              Math.atan2(ty[index], tx[index]),
+          ),
+          turnAngle,
+        };
+      })(),
+    })),
+    segments: points.slice(0, -1).map((start, index) => {
+      const end = points[index + 1];
+      const {
+        segmentLength: chordLength,
+        startProjection: baseStartProjection,
+        endProjection: baseEndProjection,
+      } = getSimpleArrowSegmentProjections(
+        points,
+        tx,
+        ty,
+        baselineScales,
+        index,
+      );
+      const {
+        startProjection: finalStartProjection,
+        endProjection: finalEndProjection,
+      } = getSimpleArrowSegmentProjections(
+        points,
+        finalX,
+        finalY,
+        undefined,
+        index,
+      );
+      const baseCp1 = pointFrom<Point>(
+        start[0] + tx[index] / 3,
+        start[1] + ty[index] / 3,
+      );
+      const baseCp2 = pointFrom<Point>(
+        end[0] - tx[index + 1] / 3,
+        end[1] - ty[index + 1] / 3,
+      );
+      const cp1 = pointFrom<Point>(
+        start[0] + finalX[index] / 3,
+        start[1] + finalY[index] / 3,
+      );
+      const cp2 = pointFrom<Point>(
+        end[0] - finalX[index + 1] / 3,
+        end[1] - finalY[index + 1] / 3,
+      );
+
+      return {
+        start,
+        end,
+        baseCp1,
+        baseCp2,
+        cp1,
+        cp2,
+        overshootsBaseline: isSimpleArrowSegmentOvershooting(
+          points,
+          tx,
+          ty,
+          baselineScales,
+          index,
+        ),
+        overshootsResolved: isSimpleArrowSegmentOvershooting(
+          points,
+          finalX,
+          finalY,
+          undefined,
+          index,
+        ),
+        metrics: {
+          chordLength,
+          baseStartProjection,
+          baseEndProjection,
+          finalStartProjection,
+          finalEndProjection,
+        },
+      };
+    }),
+    inference: {
+      overriddenPointIndices,
+    },
+  };
+};
+
+const generateSimpleArrowPathOps = (
+  points: readonly LocalPoint[],
+  tension = 0.5,
+  elementId?: string,
+): SimpleArrowPathOp[] => {
+  if (points.length < 2) {
+    return [];
+  }
+
+  const ops: SimpleArrowPathOp[] = [
+    {
+      op: "move",
+      data: pointFrom<LocalPoint>(points[0][0], points[0][1]),
+    },
+  ];
+
+  if (points.length === 2) {
+    ops.push({
+      op: "lineTo",
+      data: pointFrom<LocalPoint>(points[1][0], points[1][1]),
+    });
+
+    return ops;
+  }
+  const debugData = getSimpleArrowCurveDebugData(points, tension, {
+    elementId,
+  });
+
+  for (const segment of debugData.segments) {
+    const { cp1, cp2, end } = segment;
+
+    ops.push({
+      op: "bcurveTo",
+      data: [cp1[0], cp1[1], cp2[0], cp2[1], end[0], end[1]],
+    });
+  }
+
+  return ops;
+};
+
+const generateSimpleArrowShape = (
+  points: readonly LocalPoint[],
+  tension = 0.5,
+  elementId?: string,
+): string => {
+  return generateSimpleArrowPathOps(points, tension, elementId)
+    .map((op) => {
+      if (op.op === "bcurveTo") {
+        return `C ${op.data[0]} ${op.data[1]} ${op.data[2]} ${op.data[3]} ${op.data[4]} ${op.data[5]}`;
+      }
+
+      return `${op.op === "move" ? "M" : "L"} ${op.data[0]} ${op.data[1]}`;
+    })
+    .join(" ");
+};
+
 const generateElbowArrowShape = (
   points: readonly LocalPoint[],
   radius: number,
-) => {
+): string => {
   const subpoints = [] as [number, number][];
   for (let i = 1; i < points.length - 1; i += 1) {
     const prev = points[i - 1];

packages/element/src/textElement.ts

@@ -347,7 +347,6 @@ export const getContainerCenter = (
     midSegmentMidpoint = LinearElementEditor.getSegmentMidPoint(
       container,
       index + 1,
-      elementsMap,
     );
   }
   return { x: midSegmentMidpoint[0], y: midSegmentMidpoint[1] };

packages/element/src/utils.ts

@@ -124,7 +124,6 @@ const setElementShapesCacheEntry = <T extends ExcalidrawElement>(
  */
 export function deconstructLinearOrFreeDrawElement(
   element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
-  elementsMap: ElementsMap,
 ): [LineSegment<GlobalPoint>[], Curve<GlobalPoint>[]] {
   const cachedShape = getElementShapesCacheEntry(element, 0);
 
@@ -132,7 +131,10 @@ export function deconstructLinearOrFreeDrawElement(
     return cachedShape;
   }
 
-  const ops = generateLinearCollisionShape(element, elementsMap);
+  const ops = generateLinearCollisionShape(element) as {
+    op: string;
+    data: number[];
+  }[];
   const lines = [];
   const curves = [];
 

packages/element/tests/bounds.test.ts

@@ -135,9 +135,9 @@ describe("getElementBounds", () => {
     } as ExcalidrawLinearElement;
 
     const [x1, y1, x2, y2] = getElementBounds(element, arrayToMap([element]));
-    expect(x1).toEqual(360.9291017525165);
-    expect(y1).toEqual(185.24770129343722);
-    expect(x2).toEqual(481.4815539037601);
-    expect(y2).toEqual(319.8162855827246);
+    expect(x1).toEqual(360.3176068760539);
+    expect(y1).toEqual(185.90654264413516);
+    expect(x2).toEqual(486.6924560404731);
+    expect(y2).toEqual(320.391865303557);
   });
 });

packages/element/tests/collision.test.tsx

@@ -1,7 +1,8 @@
-import { arrayToMap, ROUNDNESS } from "@excalidraw/common";
+import { arrayToMap } from "@excalidraw/common";
 import { type GlobalPoint, type LocalPoint, pointFrom } from "@excalidraw/math";
 import { Excalidraw } from "@excalidraw/excalidraw";
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
+import { UI } from "@excalidraw/excalidraw/tests/helpers/ui";
 import "@excalidraw/utils/test-utils";
 import { render } from "@excalidraw/excalidraw/tests/test-utils";
 
@@ -9,29 +10,29 @@ import * as distance from "../src/distance";
 import { hitElementItself } from "../src/collision";
 
 describe("check rotated elements can be hit:", () => {
+  beforeEach(async () => {
+    localStorage.clear();
+    await render(<Excalidraw handleKeyboardGlobally={true} />);
+  });
+
   it("arrow", () => {
-    const element = API.createElement({
-      type: "arrow",
+    UI.createElement("arrow", {
       x: 0,
       y: 0,
       width: 124,
       height: 302,
       angle: 1.8700426423973724,
-      roundness: { type: ROUNDNESS.PROPORTIONAL_RADIUS },
-      endArrowhead: "arrow",
       points: [
         [0, 0],
         [120, -198],
         [-4, -302],
       ] as LocalPoint[],
     });
-    const elementsMap = arrayToMap([element]);
-
     const hit = hitElementItself({
       point: pointFrom<GlobalPoint>(88, -68),
-      element,
+      element: window.h.elements[0],
       threshold: 10,
-      elementsMap,
+      elementsMap: window.h.scene.getNonDeletedElementsMap(),
     });
     expect(hit).toBe(true);
   });

packages/element/tests/linearElementEditor.test.tsx

@@ -434,12 +434,12 @@ describe("Test Linear Elements", () => {
       expect(midPointsWithRoundEdge).toMatchInlineSnapshot(`
         [
           [
-            "54.27552",
-            "46.16120",
+            "53.63967",
+            "47.15774",
           ],
           [
-            "76.95494",
-            "44.56052",
+            "78.65236",
+            "44.31886",
           ],
         ]
       `);
@@ -499,12 +499,12 @@ describe("Test Linear Elements", () => {
       expect(newMidPoints).toMatchInlineSnapshot(`
         [
           [
-            "104.27552",
-            "66.16120",
+            "103.63967",
+            "67.15774",
           ],
           [
-            "126.95494",
-            "64.56052",
+            "128.65236",
+            "64.31886",
           ],
         ]
       `);
@@ -815,12 +815,12 @@ describe("Test Linear Elements", () => {
         expect(newMidPoints).toMatchInlineSnapshot(`
           [
             [
-              "29.28349",
-              "20.91105",
+              "28.64089",
+              "21.69997",
             ],
             [
-              "78.86048",
-              "46.12277",
+              "82.34322",
+              "47.57759",
             ],
           ]
         `);
@@ -904,12 +904,12 @@ describe("Test Linear Elements", () => {
         expect(newMidPoints).toMatchInlineSnapshot(`
           [
             [
-              "54.27552",
-              "46.16120",
+              "53.63967",
+              "47.15774",
             ],
             [
-              "76.95494",
-              "44.56052",
+              "78.65236",
+              "44.31886",
             ],
           ]
         `);
@@ -1191,7 +1191,7 @@ describe("Test Linear Elements", () => {
           20,
           105,
           80,
-          "55.45894",
+          "56.00000",
           45,
         ]
       `);
@@ -1202,7 +1202,7 @@ describe("Test Linear Elements", () => {
         .toMatchInlineSnapshot(`
           {
             "height": 130,
-            "width": "366.11716",
+            "width": "367.18528",
           }
         `);
 
@@ -1214,7 +1214,7 @@ describe("Test Linear Elements", () => {
         ),
       ).toMatchInlineSnapshot(`
         {
-          "x": "271.11716",
+          "x": "272.18528",
           "y": 45,
         }
       `);
@@ -1231,9 +1231,9 @@ describe("Test Linear Elements", () => {
         [
           20,
           35,
-          "501.11716",
+          "502.18528",
           95,
-          "205.45894",
+          "208.69244",
           "52.50000",
         ]
       `);

packages/excalidraw/actions/actionDeselect.ts

@@ -1,145 +0,0 @@
-import {
-  getElementsInGroup,
-  isSomeElementSelected,
-  makeNextSelectedElementIds,
-  selectGroupsForSelectedElements,
-} from "@excalidraw/element";
-import { CaptureUpdateAction } from "@excalidraw/element";
-import { KEYS, isWritableElement, updateActiveTool } from "@excalidraw/common";
-
-import type { GroupId } from "@excalidraw/element/types";
-
-import { register } from "./register";
-
-import type { AppClassProperties, AppState } from "../types";
-
-const getNextActiveTool = (
-  appState: Readonly<AppState>,
-  app: AppClassProperties,
-) => {
-  if (appState.activeTool.type === "eraser") {
-    return updateActiveTool(appState, {
-      ...(appState.activeTool.lastActiveTool || {
-        type: app.state.preferredSelectionTool.type,
-      }),
-      lastActiveToolBeforeEraser: null,
-    });
-  }
-
-  return updateActiveTool(appState, {
-    type: app.state.preferredSelectionTool.type,
-  });
-};
-
-const getParentEditingGroupId = (
-  appState: Readonly<AppState>,
-  app: AppClassProperties,
-  selectedElementIds: AppState["selectedElementIds"],
-): GroupId | null => {
-  if (!appState.editingGroupId) {
-    return null;
-  }
-
-  const nonDeletedElements = app.scene.getNonDeletedElements();
-  const selectedElements = app.scene.getSelectedElements({
-    selectedElementIds,
-    elements: nonDeletedElements,
-  });
-  const candidateElements = selectedElements.length
-    ? selectedElements
-    : getElementsInGroup(nonDeletedElements, appState.editingGroupId);
-
-  for (const element of candidateElements) {
-    const editingGroupIndex = element.groupIds.indexOf(appState.editingGroupId);
-    if (editingGroupIndex !== -1 && element.groupIds[editingGroupIndex + 1]) {
-      return element.groupIds[editingGroupIndex + 1] as GroupId;
-    }
-  }
-
-  return null;
-};
-
-export const actionDeselect = register({
-  name: "deselect",
-  label: "",
-  trackEvent: false,
-  perform: (_elements, appState, _, app) => {
-    const activeTool = getNextActiveTool(appState, app);
-
-    if (appState.editingGroupId) {
-      const nonDeletedElements = app.scene.getNonDeletedElements();
-      const selectedElementIds =
-        Object.keys(appState.selectedElementIds).length > 0
-          ? appState.selectedElementIds
-          : getElementsInGroup(
-              nonDeletedElements,
-              appState.editingGroupId,
-            ).reduce((acc, element) => {
-              acc[element.id] = true;
-              return acc;
-            }, {} as Record<string, true>);
-
-      return {
-        appState: {
-          ...appState,
-          ...selectGroupsForSelectedElements(
-            {
-              editingGroupId: getParentEditingGroupId(
-                appState,
-                app,
-                selectedElementIds,
-              ),
-              selectedElementIds,
-            },
-            nonDeletedElements,
-            appState,
-            app,
-          ),
-          activeEmbeddable: null,
-          activeTool,
-          selectedLinearElement: null,
-          selectionElement: null,
-          showHyperlinkPopup: false,
-          suggestedBinding: null,
-        },
-        captureUpdate: CaptureUpdateAction.IMMEDIATELY,
-      };
-    }
-
-    return {
-      appState: {
-        ...appState,
-        activeEmbeddable: null,
-        activeTool,
-        editingGroupId: null,
-        selectedElementIds: makeNextSelectedElementIds({}, appState),
-        selectedGroupIds: {},
-        selectedLinearElement: null,
-        selectionElement: null,
-        showHyperlinkPopup: false,
-        suggestedBinding: null,
-      },
-      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
-    };
-  },
-  keyTest: (event, appState, _, app) => {
-    if (event.key !== KEYS.ESCAPE) {
-      return false;
-    }
-
-    if (isWritableElement(event.target)) {
-      return false;
-    }
-
-    return (
-      !appState.newElement &&
-      appState.multiElement === null &&
-      !appState.selectedLinearElement?.isEditing &&
-      (appState.activeEmbeddable !== null ||
-        appState.activeTool.type !== app.state.preferredSelectionTool.type ||
-        !!appState.editingGroupId ||
-        !!appState.selectedLinearElement ||
-        isSomeElementSelected(app.scene.getNonDeletedElements(), appState))
-    );
-  },
-});

packages/excalidraw/actions/actionFinalize.tsx

@@ -348,7 +348,9 @@ export const actionFinalize = register<FormData>({
     };
   },
   keyTest: (event, appState) =>
-    (event.key === KEYS.ESCAPE && appState.selectedLinearElement?.isEditing) ||
+    (event.key === KEYS.ESCAPE &&
+      (appState.selectedLinearElement?.isEditing ||
+        (!appState.newElement && appState.multiElement === null))) ||
     ((event.key === KEYS.ESCAPE || event.key === KEYS.ENTER) &&
       appState.multiElement !== null),
   PanelComponent: ({ appState, updateData, data }) => (

packages/excalidraw/actions/index.ts

@@ -34,7 +34,6 @@ export {
 export { actionSetEmbeddableAsActiveTool } from "./actionEmbeddable";
 
 export { actionFinalize } from "./actionFinalize";
-export { actionDeselect } from "./actionDeselect";
 
 export {
   actionChangeProjectName,

packages/excalidraw/actions/types.ts

@@ -114,7 +114,6 @@ export type ActionName =
   | "distributeVertically"
   | "flipHorizontal"
   | "flipVertical"
-  | "deselect"
   | "viewMode"
   | "exportWithDarkMode"
   | "toggleTheme"

packages/excalidraw/components/App.tsx

@@ -5725,13 +5725,13 @@ class App extends React.Component<AppProps, AppState> {
         const isDeleted = !nextOriginalText.trim();
         updateElement(nextOriginalText, isDeleted);
 
-        // keyboard-submit keeps focus on the edited object. For bound text, keep
-        // the container selected even if the text becomes empty and is deleted.
-        const elementIdToSelect = viaKeyboard
-          ? element.containerId || (!isDeleted ? element.id : null)
-          : null;
+        // select the created text element only if submitting via keyboard
+        // (when submitting via click it should act as signal to deselect)
+        if (!isDeleted && viaKeyboard) {
+          const elementIdToSelect = element.containerId
+            ? element.containerId
+            : element.id;
 
-        if (elementIdToSelect) {
           // needed to ensure state is updated before "finalize" action
           // that's invoked on keyboard-submit as well
           // TODO either move this into finalize as well, or handle all state
@@ -6995,23 +6995,27 @@ class App extends React.Component<AppProps, AppState> {
           },
           { informMutation: false, isDragging: false },
         );
-        const newLastIdx = multiElement.points.length - 1;
         this.setState({
           selectedLinearElement: {
             ...selectedLinearElement,
-            selectedPointsIndices: selectedLinearElement.selectedPointsIndices
-              ? [
-                  ...new Set(
-                    selectedLinearElement.selectedPointsIndices.map((idx) =>
-                      Math.min(idx, newLastIdx),
+            selectedPointsIndices:
+              selectedLinearElement.selectedPointsIndices?.includes(
+                multiElement.points.length,
+              )
+                ? [
+                    ...selectedLinearElement.selectedPointsIndices.filter(
+                      (idx) =>
+                        idx !== multiElement.points.length &&
+                        idx !== multiElement.points.length - 1,
                     ),
-                  ),
-                ]
-              : selectedLinearElement.selectedPointsIndices,
-            lastCommittedPoint: multiElement.points[newLastIdx],
+                    multiElement.points.length - 1,
+                  ]
+                : selectedLinearElement.selectedPointsIndices,
+            lastCommittedPoint:
+              multiElement.points[multiElement.points.length - 1],
             initialState: {
               ...selectedLinearElement.initialState,
-              lastClickedPoint: newLastIdx,
+              lastClickedPoint: multiElement.points.length - 1,
             },
           },
         });

packages/excalidraw/components/FontPicker/FontPickerList.tsx

@@ -46,7 +46,6 @@ import {
 import { fontPickerKeyHandler } from "./keyboardNavHandlers";
 
 import type { JSX } from "react";
-import type { ExcalidrawFontFace } from "../../fonts/ExcalidrawFontFace";
 
 export interface FontDescriptor {
   value: number;
@@ -87,15 +86,6 @@ const getFontFamilyIcon = (fontFamily: FontFamilyValues): JSX.Element => {
   }
 };
 
-const getFontFamilyLabel = (
-  fontFamily: FontFamilyValues,
-  fontFaces: ExcalidrawFontFace[],
-) =>
-  // prefer our config as the browser resolved names may be wrapped in quotes and such
-  Object.entries(FONT_FAMILY).find(([, id]) => id === fontFamily)?.[0] ??
-  fontFaces[0]?.fontFace?.family ??
-  "Unknown";
-
 export const FontPickerList = React.memo(
   ({
     selectedFontFamily,
@@ -124,7 +114,7 @@ export const FontPickerList = React.memo(
             const fontDescriptor = {
               value: familyId,
               icon: getFontFamilyIcon(familyId),
-              text: getFontFamilyLabel(familyId, fontFaces),
+              text: fontFaces[0]?.fontFace?.family ?? "Unknown",
             };
 
             if (metadata.deprecated) {

packages/excalidraw/data/restore.ts

@@ -251,9 +251,7 @@ const repairBinding = <T extends ExcalidrawArrowElement>(
       };
     }
 
-    console.error(
-      `Could not repair binding for element "${boundElement?.id}" out of (${elementsMap?.size}) elements`,
-    );
+    console.error(`could not repair binding for element`);
   } catch (error) {
     console.error("Error repairing binding:", error);
   }

packages/excalidraw/global.d.ts

@@ -4,6 +4,8 @@ interface Window {
   EXCALIDRAW_ASSET_PATH: string | string[] | undefined;
   EXCALIDRAW_THROTTLE_RENDER: boolean | undefined;
   DEBUG_FRACTIONAL_INDICES: boolean | undefined;
+  EXCALIDRAW_DEBUG_LINEAR_ARROW_TANGENTS: boolean | undefined;
+  EXCALIDRAW_DEBUG_SELECTED_LINEAR_ARROW: unknown;
   EXCALIDRAW_EXPORT_SOURCE: string;
   gtag: Function;
   sa_event: Function;

packages/excalidraw/index.tsx

@@ -382,8 +382,6 @@ export { DiagramToCodePlugin } from "./components/DiagramToCodePlugin/DiagramToC
 export { getDataURL } from "./data/blob";
 export { isElementLink } from "@excalidraw/element";
 
-export { Fonts } from "./fonts/Fonts";
-
 export { setCustomTextMetricsProvider } from "@excalidraw/element";
 
 export { CommandPalette } from "./components/CommandPalette/CommandPalette";

packages/excalidraw/locales/en.json

@@ -661,7 +661,7 @@
     "placeholder": {
       "title": "Let's design your diagram",
       "description": "Describe the diagram you want to create, and we'll generate it for you.",
-      "hint": "At the moment we know Flowchart, Sequence, Class, State, and Entity Relationship diagrams."
+      "hint": "At the moment we know Flowchart, Sequence, Class, and Entity Relationship diagrams."
     },
     "preview": "Preview",
     "insert": "Insert",

packages/excalidraw/package.json

@@ -88,7 +88,7 @@
     "@excalidraw/element": "0.18.0",
     "@excalidraw/laser-pointer": "1.3.1",
     "@excalidraw/math": "0.18.0",
-    "@excalidraw/mermaid-to-excalidraw": "2.2.2",
+    "@excalidraw/mermaid-to-excalidraw": "2.1.1",
     "@excalidraw/random-username": "1.1.0",
     "browser-fs-access": "0.38.0",
     "canvas-roundrect-polyfill": "0.0.1",

packages/excalidraw/renderer/interactiveScene.ts

@@ -42,6 +42,7 @@ import {
   isTextElement,
   LinearElementEditor,
   getActiveTextElement,
+  getSimpleArrowCurveDebugData,
 } from "@excalidraw/element";
 
 import { renderSelectionElement } from "@excalidraw/element";
@@ -1156,7 +1157,6 @@ const renderLinearPointHandles = (
           points[idx],
           idx,
           appState.zoom,
-          elementsMap,
         )
       ) {
         renderSingleLinearPoint(
@@ -1202,6 +1202,105 @@ const renderLinearPointHandles = (
   context.restore();
 };
 
+const isSimpleArrowTangentDebugEnabled = () =>
+  window.EXCALIDRAW_DEBUG_LINEAR_ARROW_TANGENTS === true;
+
+const renderSimpleArrowTangentOverlay = (
+  context: CanvasRenderingContext2D,
+  appState: InteractiveCanvasAppState,
+  element: NonDeleted<ExcalidrawArrowElement>,
+  elementsMap: RenderableElementsMap,
+) => {
+  const points = LinearElementEditor.getPointsGlobalCoordinates(
+    element,
+    elementsMap,
+  );
+  const debugData = getSimpleArrowCurveDebugData(points);
+
+  window.EXCALIDRAW_DEBUG_SELECTED_LINEAR_ARROW = debugData;
+
+  context.save();
+  context.translate(appState.scrollX, appState.scrollY);
+  context.lineWidth = 1 / appState.zoom.value;
+
+  context.setLineDash([6 / appState.zoom.value, 4 / appState.zoom.value]);
+  context.strokeStyle = "rgba(134, 142, 150, 0.75)";
+
+  for (const segment of debugData.segments) {
+    context.beginPath();
+    context.moveTo(segment.start[0], segment.start[1]);
+    context.lineTo(segment.baseCp1[0], segment.baseCp1[1]);
+    context.lineTo(segment.baseCp2[0], segment.baseCp2[1]);
+    context.lineTo(segment.end[0], segment.end[1]);
+    context.stroke();
+  }
+
+  context.setLineDash([]);
+
+  for (const segment of debugData.segments) {
+    const strokeStyle = segment.overshootsBaseline
+      ? "rgba(245, 159, 0, 0.9)"
+      : "rgba(94, 90, 216, 0.85)";
+
+    context.strokeStyle = strokeStyle;
+    context.fillStyle = "rgba(255, 255, 255, 0.95)";
+
+    context.beginPath();
+    context.moveTo(segment.start[0], segment.start[1]);
+    context.lineTo(segment.cp1[0], segment.cp1[1]);
+    context.lineTo(segment.cp2[0], segment.cp2[1]);
+    context.lineTo(segment.end[0], segment.end[1]);
+    context.stroke();
+
+    fillCircle(
+      context,
+      segment.cp1[0],
+      segment.cp1[1],
+      4 / appState.zoom.value,
+      true,
+      true,
+    );
+    fillCircle(
+      context,
+      segment.cp2[0],
+      segment.cp2[1],
+      4 / appState.zoom.value,
+      true,
+      true,
+    );
+  }
+
+  context.strokeStyle = "rgba(201, 42, 42, 0.85)";
+  context.fillStyle = "rgba(201, 42, 42, 0.95)";
+
+  for (const tangent of debugData.tangents) {
+    if (!tangent.isAdjusted) {
+      continue;
+    }
+
+    const handle = pointFrom<GlobalPoint>(
+      tangent.point[0] + tangent.scaled[0] / 3,
+      tangent.point[1] + tangent.scaled[1] / 3,
+    );
+
+    context.beginPath();
+    context.moveTo(tangent.point[0], tangent.point[1]);
+    context.lineTo(handle[0], handle[1]);
+    context.stroke();
+
+    fillCircle(
+      context,
+      tangent.point[0],
+      tangent.point[1],
+      3 / appState.zoom.value,
+      true,
+      true,
+    );
+  }
+
+  context.restore();
+};
+
 const renderFocusPointConnectionLine = (
   context: CanvasRenderingContext2D,
   appState: InteractiveCanvasAppState,
@@ -1723,6 +1822,13 @@ const _renderInteractiveScene = ({
   const selectedLinearElement =
     linearState &&
     LinearElementEditor.getElement(linearState.elementId, allElementsMap);
+  const selectedRoundedArrow =
+    selectedElements.length === 1 &&
+    isArrowElement(selectedElements[0]) &&
+    !isElbowArrow(selectedElements[0]) &&
+    !!selectedElements[0].roundness
+      ? (selectedElements[0] as NonDeleted<ExcalidrawArrowElement>)
+      : null;
   // Arrows have a different highlight behavior when
   // they are the only selected element
   if (selectedLinearElement) {
@@ -1759,6 +1865,17 @@ const _renderInteractiveScene = ({
     }
   }
 
+  if (selectedRoundedArrow && isSimpleArrowTangentDebugEnabled()) {
+    renderSimpleArrowTangentOverlay(
+      context,
+      appState,
+      selectedRoundedArrow,
+      elementsMap,
+    );
+  } else {
+    window.EXCALIDRAW_DEBUG_SELECTED_LINEAR_ARROW = undefined;
+  }
+
   // Paint selected elements
   if (
     !appState.multiElement &&

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

@@ -224,7 +224,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 22,
+  "version": 28,
   "width": "94.00000",
   "x": 0,
   "y": 0,
@@ -350,9 +350,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
               ],
               "mode": "orbit",
             },
-            "version": 21,
+            "version": 27,
             "width": "88.00000",
-            "y": "7.20923",
           },
           "inserted": {
             "endBinding": {
@@ -382,9 +381,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
               ],
               "mode": "orbit",
             },
-            "version": 20,
+            "version": 24,
             "width": "88.00000",
-            "y": "0.01000",
           },
         },
       },
@@ -439,7 +437,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
               ],
             ],
             "startBinding": null,
-            "version": 22,
+            "version": 28,
             "width": "94.00000",
             "x": 0,
             "y": 0,
@@ -464,7 +462,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
               ],
               "mode": "orbit",
             },
-            "version": 21,
+            "version": 27,
             "width": "88.00000",
             "x": 6,
             "y": "7.20923",
@@ -11222,489 +11220,6 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
 
 exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end of test] undo stack 1`] = `[]`;
 
-exports[`history > multiplayer undo/redo > should support undo and redo when escape unwinds nested group editing > [end of test] appState 1`] = `
-{
-  "activeEmbeddable": null,
-  "activeLockedId": null,
-  "activeTool": {
-    "customType": null,
-    "fromSelection": false,
-    "lastActiveTool": null,
-    "locked": false,
-    "type": "selection",
-  },
-  "bindMode": "orbit",
-  "bindingPreference": "enabled",
-  "collaborators": Map {},
-  "contextMenu": null,
-  "croppingElementId": null,
-  "currentHoveredFontFamily": null,
-  "currentItemArrowType": "round",
-  "currentItemBackgroundColor": "transparent",
-  "currentItemEndArrowhead": "arrow",
-  "currentItemFillStyle": "solid",
-  "currentItemFontFamily": 5,
-  "currentItemFontSize": 20,
-  "currentItemOpacity": 100,
-  "currentItemRoughness": 1,
-  "currentItemRoundness": "sharp",
-  "currentItemStartArrowhead": null,
-  "currentItemStrokeColor": "#1e1e1e",
-  "currentItemStrokeStyle": "solid",
-  "currentItemStrokeWidth": 2,
-  "currentItemTextAlign": "left",
-  "cursorButton": "up",
-  "defaultSidebarDockedPreference": false,
-  "editingFrame": null,
-  "editingGroupId": null,
-  "editingTextElement": null,
-  "elementsToHighlight": null,
-  "errorMessage": null,
-  "exportBackground": true,
-  "exportEmbedScene": false,
-  "exportScale": 1,
-  "exportWithDarkMode": false,
-  "fileHandle": null,
-  "followedBy": Set {},
-  "frameRendering": {
-    "clip": true,
-    "enabled": true,
-    "name": true,
-    "outline": true,
-  },
-  "frameToHighlight": null,
-  "gridModeEnabled": false,
-  "gridSize": 20,
-  "gridStep": 5,
-  "height": 0,
-  "hoveredElementIds": {},
-  "isBindingEnabled": true,
-  "isCropping": false,
-  "isLoading": false,
-  "isMidpointSnappingEnabled": true,
-  "isResizing": false,
-  "isRotating": false,
-  "lastPointerDownWith": "mouse",
-  "lockedMultiSelections": {},
-  "multiElement": null,
-  "newElement": null,
-  "objectsSnapModeEnabled": false,
-  "offsetLeft": 0,
-  "offsetTop": 0,
-  "openDialog": null,
-  "openMenu": null,
-  "openPopup": null,
-  "openSidebar": null,
-  "originSnapOffset": null,
-  "penDetected": false,
-  "penMode": false,
-  "preferredSelectionTool": {
-    "initialized": true,
-    "type": "selection",
-  },
-  "previousSelectedElementIds": {},
-  "resizingElement": null,
-  "scrollX": 0,
-  "scrollY": 0,
-  "searchMatches": null,
-  "selectedElementIds": {},
-  "selectedElementsAreBeingDragged": false,
-  "selectedGroupIds": {},
-  "selectionElement": null,
-  "shouldCacheIgnoreZoom": false,
-  "showHyperlinkPopup": false,
-  "showWelcomeScreen": true,
-  "snapLines": [],
-  "startBoundElement": null,
-  "stats": {
-    "open": false,
-    "panels": 3,
-  },
-  "suggestedBinding": null,
-  "theme": "light",
-  "toast": null,
-  "userToFollow": null,
-  "viewBackgroundColor": "#ffffff",
-  "viewModeEnabled": false,
-  "width": 0,
-  "zenModeEnabled": false,
-  "zoom": {
-    "value": 1,
-  },
-}
-`;
-
-exports[`history > multiplayer undo/redo > should support undo and redo when escape unwinds nested group editing > [end of test] element 0 1`] = `
-{
-  "angle": 0,
-  "backgroundColor": "transparent",
-  "boundElements": null,
-  "customData": undefined,
-  "fillStyle": "solid",
-  "frameId": null,
-  "groupIds": [
-    "inner",
-    "outer",
-  ],
-  "height": 100,
-  "id": "id0",
-  "index": "a0",
-  "isDeleted": false,
-  "link": null,
-  "locked": false,
-  "opacity": 100,
-  "roughness": 1,
-  "roundness": null,
-  "strokeColor": "#1e1e1e",
-  "strokeStyle": "solid",
-  "strokeWidth": 2,
-  "type": "rectangle",
-  "updated": 1,
-  "version": 2,
-  "width": 100,
-  "x": 0,
-  "y": 0,
-}
-`;
-
-exports[`history > multiplayer undo/redo > should support undo and redo when escape unwinds nested group editing > [end of test] element 1 1`] = `
-{
-  "angle": 0,
-  "backgroundColor": "transparent",
-  "boundElements": null,
-  "customData": undefined,
-  "fillStyle": "solid",
-  "frameId": null,
-  "groupIds": [
-    "outer",
-  ],
-  "height": 100,
-  "id": "id1",
-  "index": "a1",
-  "isDeleted": false,
-  "link": null,
-  "locked": false,
-  "opacity": 100,
-  "roughness": 1,
-  "roundness": null,
-  "strokeColor": "#1e1e1e",
-  "strokeStyle": "solid",
-  "strokeWidth": 2,
-  "type": "rectangle",
-  "updated": 1,
-  "version": 2,
-  "width": 100,
-  "x": 100,
-  "y": 100,
-}
-`;
-
-exports[`history > multiplayer undo/redo > should support undo and redo when escape unwinds nested group editing > [end of test] element 2 1`] = `
-{
-  "angle": 0,
-  "backgroundColor": "transparent",
-  "boundElements": null,
-  "customData": undefined,
-  "fillStyle": "solid",
-  "frameId": null,
-  "groupIds": [
-    "inner",
-    "outer",
-  ],
-  "height": 100,
-  "id": "id2",
-  "index": "a2",
-  "isDeleted": false,
-  "link": null,
-  "locked": false,
-  "opacity": 100,
-  "roughness": 1,
-  "roundness": null,
-  "strokeColor": "#1e1e1e",
-  "strokeStyle": "solid",
-  "strokeWidth": 2,
-  "type": "rectangle",
-  "updated": 1,
-  "version": 2,
-  "width": 100,
-  "x": 200,
-  "y": 200,
-}
-`;
-
-exports[`history > multiplayer undo/redo > should support undo and redo when escape unwinds nested group editing > [end of test] number of elements 1`] = `3`;
-
-exports[`history > multiplayer undo/redo > should support undo and redo when escape unwinds nested group editing > [end of test] number of renders 1`] = `16`;
-
-exports[`history > multiplayer undo/redo > should support undo and redo when escape unwinds nested group editing > [end of test] redo stack 1`] = `[]`;
-
-exports[`history > multiplayer undo/redo > should support undo and redo when escape unwinds nested group editing > [end of test] undo stack 1`] = `
-[
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "selectedElementIds": {
-            "id0": true,
-            "id1": true,
-            "id2": true,
-          },
-          "selectedGroupIds": {
-            "outer": true,
-          },
-        },
-        "inserted": {
-          "selectedElementIds": {},
-          "selectedGroupIds": {},
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {
-        "id0": {
-          "deleted": {
-            "angle": 0,
-            "backgroundColor": "transparent",
-            "boundElements": null,
-            "customData": undefined,
-            "fillStyle": "solid",
-            "frameId": null,
-            "groupIds": [
-              "inner",
-              "outer",
-            ],
-            "height": 100,
-            "index": "a0",
-            "isDeleted": false,
-            "link": null,
-            "locked": false,
-            "opacity": 100,
-            "roughness": 1,
-            "roundness": null,
-            "strokeColor": "#1e1e1e",
-            "strokeStyle": "solid",
-            "strokeWidth": 2,
-            "type": "rectangle",
-            "version": 2,
-            "width": 100,
-            "x": 0,
-            "y": 0,
-          },
-          "inserted": {
-            "isDeleted": true,
-            "version": 1,
-          },
-        },
-        "id1": {
-          "deleted": {
-            "angle": 0,
-            "backgroundColor": "transparent",
-            "boundElements": null,
-            "customData": undefined,
-            "fillStyle": "solid",
-            "frameId": null,
-            "groupIds": [
-              "outer",
-            ],
-            "height": 100,
-            "index": "a1",
-            "isDeleted": false,
-            "link": null,
-            "locked": false,
-            "opacity": 100,
-            "roughness": 1,
-            "roundness": null,
-            "strokeColor": "#1e1e1e",
-            "strokeStyle": "solid",
-            "strokeWidth": 2,
-            "type": "rectangle",
-            "version": 2,
-            "width": 100,
-            "x": 100,
-            "y": 100,
-          },
-          "inserted": {
-            "isDeleted": true,
-            "version": 1,
-          },
-        },
-        "id2": {
-          "deleted": {
-            "angle": 0,
-            "backgroundColor": "transparent",
-            "boundElements": null,
-            "customData": undefined,
-            "fillStyle": "solid",
-            "frameId": null,
-            "groupIds": [
-              "inner",
-              "outer",
-            ],
-            "height": 100,
-            "index": "a2",
-            "isDeleted": false,
-            "link": null,
-            "locked": false,
-            "opacity": 100,
-            "roughness": 1,
-            "roundness": null,
-            "strokeColor": "#1e1e1e",
-            "strokeStyle": "solid",
-            "strokeWidth": 2,
-            "type": "rectangle",
-            "version": 2,
-            "width": 100,
-            "x": 200,
-            "y": 200,
-          },
-          "inserted": {
-            "isDeleted": true,
-            "version": 1,
-          },
-        },
-      },
-      "updated": {},
-    },
-    "id": "id5",
-  },
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "editingGroupId": "outer",
-          "selectedElementIds": {},
-          "selectedGroupIds": {
-            "inner": true,
-          },
-        },
-        "inserted": {
-          "editingGroupId": null,
-          "selectedElementIds": {
-            "id1": true,
-          },
-          "selectedGroupIds": {
-            "outer": true,
-          },
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id7",
-  },
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "editingGroupId": "inner",
-          "selectedElementIds": {},
-          "selectedGroupIds": {},
-        },
-        "inserted": {
-          "editingGroupId": "outer",
-          "selectedElementIds": {
-            "id2": true,
-          },
-          "selectedGroupIds": {
-            "inner": true,
-          },
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id9",
-  },
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "editingGroupId": "outer",
-          "selectedElementIds": {
-            "id2": true,
-          },
-          "selectedGroupIds": {
-            "inner": true,
-          },
-        },
-        "inserted": {
-          "editingGroupId": "inner",
-          "selectedElementIds": {},
-          "selectedGroupIds": {},
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id19",
-  },
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "editingGroupId": null,
-          "selectedElementIds": {
-            "id1": true,
-          },
-          "selectedGroupIds": {
-            "outer": true,
-          },
-        },
-        "inserted": {
-          "editingGroupId": "outer",
-          "selectedElementIds": {},
-          "selectedGroupIds": {
-            "inner": true,
-          },
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id20",
-  },
-  {
-    "appState": AppStateDelta {
-      "delta": Delta {
-        "deleted": {
-          "selectedElementIds": {},
-          "selectedGroupIds": {},
-        },
-        "inserted": {
-          "selectedElementIds": {
-            "id0": true,
-            "id1": true,
-            "id2": true,
-          },
-          "selectedGroupIds": {
-            "outer": true,
-          },
-        },
-      },
-    },
-    "elements": {
-      "added": {},
-      "removed": {},
-      "updated": {},
-    },
-    "id": "id21",
-  },
-]
-`;
-
 exports[`history > multiplayer undo/redo > should update history entries after remote changes on the same properties > [end of test] appState 1`] = `
 {
   "activeEmbeddable": null,
@@ -16739,7 +16254,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 10,
+  "version": 11,
   "width": "88.00000",
   "x": 6,
   "y": "0.01000",
@@ -16792,7 +16307,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
               ],
               "mode": "orbit",
             },
-            "version": 10,
+            "version": 11,
           },
           "inserted": {
             "endBinding": {
@@ -16812,7 +16327,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
               ],
               "mode": "orbit",
             },
-            "version": 8,
+            "version": 9,
           },
         },
       },
@@ -17121,7 +16636,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": 0,
+            "height": "0.00120",
             "index": "a3",
             "isDeleted": false,
             "link": null,
@@ -17134,7 +16649,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
               ],
               [
                 "88.00000",
-                0,
+                "0.00120",
               ],
             ],
             "roughness": 1,
@@ -17154,14 +16669,14 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 7,
+            "version": 8,
             "width": "88.00000",
             "x": 6,
-            "y": "0.01000",
+            "y": "0.00880",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 6,
+            "version": 7,
           },
         },
       },
@@ -17487,7 +17002,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 10,
+  "version": 11,
   "width": "88.00000",
   "x": 6,
   "y": "0.01000",
@@ -17792,14 +17307,14 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 10,
+            "version": 11,
             "width": "88.00000",
             "x": 6,
             "y": "0.01000",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 8,
+            "version": 9,
           },
         },
       },
@@ -18133,7 +17648,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 10,
+  "version": 11,
   "width": "88.00000",
   "x": 6,
   "y": "0.01000",
@@ -18438,14 +17953,14 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 10,
+            "version": 11,
             "width": "88.00000",
             "x": 6,
             "y": "0.01000",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 8,
+            "version": 9,
           },
         },
       },
@@ -18777,7 +18292,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 10,
+  "version": 11,
   "width": "88.00000",
   "x": 6,
   "y": "0.01000",
@@ -18846,7 +18361,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
               ],
               "mode": "orbit",
             },
-            "version": 10,
+            "version": 11,
           },
           "inserted": {
             "endBinding": {
@@ -18858,7 +18373,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
               "mode": "orbit",
             },
             "startBinding": null,
-            "version": 8,
+            "version": 9,
           },
         },
         "id2": {
@@ -19135,7 +18650,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": 0,
+            "height": "0.00120",
             "index": "a3",
             "isDeleted": false,
             "link": null,
@@ -19148,7 +18663,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
               ],
               [
                 "88.00000",
-                0,
+                "0.00120",
               ],
             ],
             "roughness": 1,
@@ -19168,14 +18683,14 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 7,
+            "version": 8,
             "width": "88.00000",
             "x": 6,
-            "y": "0.01000",
+            "y": "0.00880",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 6,
+            "version": 7,
           },
         },
       },
@@ -19529,7 +19044,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 11,
+  "version": 12,
   "width": "88.00000",
   "x": 6,
   "y": "0.01000",
@@ -19609,12 +19124,12 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
               ],
               "mode": "orbit",
             },
-            "version": 11,
+            "version": 12,
           },
           "inserted": {
             "endBinding": null,
             "startBinding": null,
-            "version": 9,
+            "version": 10,
           },
         },
       },
@@ -19883,7 +19398,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": 0,
+            "height": "0.00120",
             "index": "a3",
             "isDeleted": false,
             "link": null,
@@ -19896,7 +19411,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
               ],
               [
                 "88.00000",
-                0,
+                "0.00120",
               ],
             ],
             "roughness": 1,
@@ -19916,14 +19431,14 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "strokeStyle": "solid",
             "strokeWidth": 2,
             "type": "arrow",
-            "version": 7,
+            "version": 8,
             "width": "88.00000",
             "x": 6,
-            "y": "0.01000",
+            "y": "0.00880",
           },
           "inserted": {
             "isDeleted": true,
-            "version": 6,
+            "version": 7,
           },
         },
       },

packages/excalidraw/tests/history.test.tsx

@@ -2971,82 +2971,6 @@ describe("history", () => {
       expect(h.state.editingGroupId).toBeNull();
     });
 
-    // TODO mark with "noncritical" tag once we migrate to vitest 4
-    it.skip("should support undo and redo when escape unwinds nested group editing", async () => {
-      const rectA = API.createElement({
-        type: "rectangle",
-        groupIds: ["inner", "outer"],
-        x: 0,
-      });
-      const rectB = API.createElement({
-        type: "rectangle",
-        groupIds: ["outer"],
-        x: 100,
-      });
-      const rectC = API.createElement({
-        type: "rectangle",
-        groupIds: ["inner", "outer"],
-        x: 200,
-      });
-
-      API.setElements([rectA, rectB, rectC]);
-      mouse.select(rectA);
-      mouse.doubleClickOn(rectA);
-      mouse.doubleClickOn(rectA);
-
-      assertSelectedElements([rectA]);
-      expect(h.state.editingGroupId).toBe("inner");
-      expect(API.getUndoStack().length).toBe(3);
-      expect(API.getRedoStack().length).toBe(0);
-
-      Keyboard.keyPress(KEYS.ESCAPE);
-      assertSelectedElements([rectA, rectC]);
-      expect(h.state.editingGroupId).toBe("outer");
-      expect(API.getUndoStack().length).toBe(4);
-      expect(API.getRedoStack().length).toBe(0);
-
-      Keyboard.keyPress(KEYS.ESCAPE);
-      assertSelectedElements([rectA, rectB, rectC]);
-      expect(h.state.editingGroupId).toBeNull();
-      expect(h.state.selectedGroupIds).toEqual({ outer: true });
-      expect(API.getUndoStack().length).toBe(5);
-      expect(API.getRedoStack().length).toBe(0);
-
-      Keyboard.keyPress(KEYS.ESCAPE);
-      expect(API.getSelectedElements()).toEqual([]);
-      expect(h.state.editingGroupId).toBeNull();
-      expect(h.state.selectedGroupIds).toEqual({});
-      expect(API.getUndoStack().length).toBe(6);
-      expect(API.getRedoStack().length).toBe(0);
-
-      Keyboard.undo();
-      assertSelectedElements([rectA, rectB, rectC]);
-      expect(h.state.editingGroupId).toBeNull();
-      expect(h.state.selectedGroupIds).toEqual({ outer: true });
-
-      Keyboard.undo();
-      assertSelectedElements([rectA, rectC]);
-      expect(h.state.editingGroupId).toBe("outer");
-
-      Keyboard.undo();
-      assertSelectedElements([rectA]);
-      expect(h.state.editingGroupId).toBe("inner");
-
-      Keyboard.redo();
-      assertSelectedElements([rectA, rectC]);
-      expect(h.state.editingGroupId).toBe("outer");
-
-      Keyboard.redo();
-      assertSelectedElements([rectA, rectB, rectC]);
-      expect(h.state.editingGroupId).toBeNull();
-      expect(h.state.selectedGroupIds).toEqual({ outer: true });
-
-      Keyboard.redo();
-      expect(API.getSelectedElements()).toEqual([]);
-      expect(h.state.editingGroupId).toBeNull();
-      expect(h.state.selectedGroupIds).toEqual({});
-    });
-
     it("should iterate through the history when selected or editing linear element was remotely deleted", async () => {
       // create three point arrow
       UI.clickTool("arrow");

packages/excalidraw/tests/selection.test.tsx

@@ -326,7 +326,7 @@ describe("select single element on the scene", () => {
     fireEvent.pointerUp(canvas);
 
     expect(renderInteractiveScene).toHaveBeenCalledTimes(8);
-    expect(renderStaticScene).toHaveBeenCalledTimes(7);
+    expect(renderStaticScene).toHaveBeenCalledTimes(6);
     expect(h.state.selectionElement).toBeNull();
     expect(h.elements.length).toEqual(1);
     expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
@@ -359,7 +359,7 @@ describe("select single element on the scene", () => {
     fireEvent.pointerUp(canvas);
 
     expect(renderInteractiveScene).toHaveBeenCalledTimes(8);
-    expect(renderStaticScene).toHaveBeenCalledTimes(7);
+    expect(renderStaticScene).toHaveBeenCalledTimes(6);
     expect(h.state.selectionElement).toBeNull();
     expect(h.elements.length).toEqual(1);
     expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
@@ -392,7 +392,7 @@ describe("select single element on the scene", () => {
     fireEvent.pointerUp(canvas);
 
     expect(renderInteractiveScene).toHaveBeenCalledTimes(8);
-    expect(renderStaticScene).toHaveBeenCalledTimes(7);
+    expect(renderStaticScene).toHaveBeenCalledTimes(6);
     expect(h.state.selectionElement).toBeNull();
     expect(h.elements.length).toEqual(1);
     expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
@@ -438,7 +438,7 @@ describe("select single element on the scene", () => {
     fireEvent.pointerUp(canvas);
 
     expect(renderInteractiveScene).toHaveBeenCalledTimes(10);
-    expect(renderStaticScene).toHaveBeenCalledTimes(9);
+    expect(renderStaticScene).toHaveBeenCalledTimes(8);
     expect(h.state.selectionElement).toBeNull();
     expect(h.elements.length).toEqual(1);
     expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
@@ -483,7 +483,7 @@ describe("select single element on the scene", () => {
     fireEvent.pointerUp(canvas);
 
     expect(renderInteractiveScene).toHaveBeenCalledTimes(10);
-    expect(renderStaticScene).toHaveBeenCalledTimes(9);
+    expect(renderStaticScene).toHaveBeenCalledTimes(8);
     expect(h.state.selectionElement).toBeNull();
     expect(h.elements.length).toEqual(1);
     expect(h.state.selectedElementIds[h.elements[0].id]).toBeTruthy();
@@ -558,58 +558,3 @@ describe("selectedElementIds stability", () => {
     expect(h.state.selectedElementIds).toBe(selectedElementIds_2);
   });
 });
-
-describe("deselecting", () => {
-  beforeEach(async () => {
-    await render(<Excalidraw handleKeyboardGlobally={true} />);
-  });
-
-  it("esc unwinds nested group editing before deselecting", () => {
-    const rectA = API.createElement({
-      type: "rectangle",
-      x: 0,
-      y: 0,
-      groupIds: ["inner", "outer"],
-    });
-    const rectB = API.createElement({
-      type: "rectangle",
-      x: 100,
-      y: 0,
-      groupIds: ["outer"],
-    });
-    const rectC = API.createElement({
-      type: "rectangle",
-      x: 200,
-      y: 0,
-      groupIds: ["inner", "outer"],
-    });
-
-    API.setElements([rectA, rectB, rectC]);
-
-    mouse.select(rectA);
-    assertSelectedElements(rectA, rectB, rectC);
-    expect(h.state.editingGroupId).toBeNull();
-
-    mouse.doubleClickOn(rectA);
-    assertSelectedElements(rectA, rectC);
-    expect(h.state.editingGroupId).toBe("outer");
-
-    mouse.doubleClickOn(rectA);
-    assertSelectedElements(rectA);
-    expect(h.state.editingGroupId).toBe("inner");
-
-    Keyboard.keyPress(KEYS.ESCAPE);
-    assertSelectedElements(rectA, rectC);
-    expect(h.state.editingGroupId).toBe("outer");
-
-    Keyboard.keyPress(KEYS.ESCAPE);
-    assertSelectedElements(rectA, rectB, rectC);
-    expect(h.state.editingGroupId).toBeNull();
-    expect(h.state.selectedGroupIds).toEqual({ outer: true });
-
-    Keyboard.keyPress(KEYS.ESCAPE);
-    expect(API.getSelectedElements()).toEqual([]);
-    expect(h.state.editingGroupId).toBeNull();
-    expect(h.state.selectedGroupIds).toEqual({});
-  });
-});

packages/excalidraw/wysiwyg/textWysiwyg.test.tsx

@@ -45,28 +45,6 @@ unmountComponent();
 const tab = "    ";
 const mouse = new Pointer("mouse");
 
-const exitTextEditorAndAssertSelection = async ({
-  editor,
-  selectedIds,
-  nextText,
-}: {
-  editor: HTMLTextAreaElement;
-  selectedIds: string[];
-  nextText?: string;
-}) => {
-  if (nextText !== undefined) {
-    updateTextEditor(editor, nextText);
-  }
-
-  Keyboard.exitTextEditor(editor);
-
-  expect(await getTextEditor({ waitForEditor: false })).toBe(null);
-  expect(window.h.state.editingTextElement).toBeNull();
-  expect(API.getSelectedElements().map((element) => element.id)).toEqual(
-    selectedIds,
-  );
-};
-
 describe("textWysiwyg", () => {
   describe("start text editing", () => {
     const { h } = window;
@@ -293,33 +271,6 @@ describe("textWysiwyg", () => {
       expect(h.elements.length).toBe(1);
     });
 
-    it("should reselect text after exiting wysiwyg with escape", async () => {
-      const text = API.createElement({
-        type: "text",
-        text: "ola",
-        x: 60,
-        y: 0,
-        width: 100,
-        height: 100,
-      });
-
-      API.setElements([text]);
-      API.setSelectedElements([text]);
-      UI.clickTool("selection");
-
-      Keyboard.keyPress(KEYS.ENTER);
-
-      const editor = await getTextEditor();
-
-      expect(editor).not.toBe(null);
-      expect(h.state.editingTextElement?.id).toBe(text.id);
-
-      await exitTextEditorAndAssertSelection({
-        editor,
-        selectedIds: [text.id],
-      });
-    });
-
     it("should edit selected bound text on single click", async () => {
       const container = API.createElement({
         type: "rectangle",
@@ -1354,40 +1305,6 @@ describe("textWysiwyg", () => {
       );
     });
 
-    it.each([
-      {
-        label: "container",
-        createElements: () => API.createTextContainer(),
-      },
-      {
-        label: "arrow",
-        createElements: () => API.createLabeledArrow(),
-      },
-    ])(
-      "should reselect $label after deleting bound text with escape",
-      async ({ createElements }) => {
-        const [selectedElement, text] = createElements();
-        API.setElements([selectedElement, text]);
-        API.setSelectedElements([selectedElement]);
-
-        Keyboard.keyPress(KEYS.ENTER);
-        const editor = await getTextEditor();
-
-        await exitTextEditorAndAssertSelection({
-          editor,
-          nextText: "",
-          selectedIds: [selectedElement.id],
-        });
-
-        expect(selectedElement.boundElements).toStrictEqual([]);
-        expect(h.elements[1]).toEqual(
-          expect.objectContaining({
-            isDeleted: true,
-          }),
-        );
-      },
-    );
-
     it("should restore original container height and clear cache once text is unbind", async () => {
       const container = API.createElement({
         type: "rectangle",

packages/math/src/segment.ts

@@ -40,7 +40,7 @@ export const isLineSegment = <Point extends GlobalPoint | LocalPoint>(
   Array.isArray(segment) &&
   segment.length === 2 &&
   isPoint(segment[0]) &&
-  isPoint(segment[1]);
+  isPoint(segment[0]);
 
 /**
  * Return the coordinates resulting from rotating the given line about an origin by an angle in radians

packages/math/tests/segment.test.ts

@@ -1,9 +1,5 @@
 import { pointFrom } from "../src/point";
-import {
-  lineSegment,
-  lineSegmentIntersectionPoints,
-  isLineSegment,
-} from "../src/segment";
+import { lineSegment, lineSegmentIntersectionPoints } from "../src/segment";
 
 describe("line-segment intersections", () => {
   it("should correctly detect intersection", () => {
@@ -23,23 +19,3 @@ describe("line-segment intersections", () => {
     ).toEqual(null);
   });
 });
-describe("isLineSegment validation", () => {
-  it("should return true for a valid segment", () => {
-    expect(
-      isLineSegment([
-        [0, 0],
-        [1, 1],
-      ]),
-    ).toBe(true);
-  });
-
-  it("should return false if second element is not a point", () => {
-    const invalidSegment = [[0, 0], "not-a-point"] as any;
-
-    expect(isLineSegment(invalidSegment)).toBe(false);
-  });
-
-  it("should return false for wrong length", () => {
-    expect(isLineSegment([[0, 0]])).toBe(false);
-  });
-});

packages/utils/src/shape.ts

@@ -196,7 +196,7 @@ export const getEllipseShape = <Point extends GlobalPoint | LocalPoint>(
 
 export const getCurvePathOps = (shape: Drawable): Op[] => {
   // NOTE (mtolmacs): Temporary fix for extremely large elements
-  if (!shape) {
+  if (!shape || shape.sets.length === 0) {
     return [];
   }
 
@@ -205,6 +205,7 @@ export const getCurvePathOps = (shape: Drawable): Op[] => {
       return set.ops;
     }
   }
+
   return shape.sets[0].ops;
 };
 
@@ -316,26 +317,29 @@ export const getClosedCurveShape = <Point extends GlobalPoint | LocalPoint>(
     };
   }
 
-  const ops = getCurvePathOps(roughShape);
+  // Prefer the fillPath set
+  const fillPathSet = roughShape.sets.find((s) => s.type === "fillPath");
+  const ops = fillPathSet ? fillPathSet.ops : getCurvePathOps(roughShape);
 
   const points: Point[] = [];
   let odd = false;
   for (const operation of ops) {
     if (operation.op === "move") {
-      odd = !odd;
-      if (odd) {
+      if (fillPathSet) {
+        // fillPath is always a single run — no odd/even skipping needed
         points.push(pointFrom(operation.data[0], operation.data[1]));
+      } else {
+        odd = !odd;
+        if (odd) {
+          points.push(pointFrom(operation.data[0], operation.data[1]));
+        }
       }
     } else if (operation.op === "bcurveTo") {
-      if (odd) {
+      if (fillPathSet || odd) {
         points.push(pointFrom(operation.data[0], operation.data[1]));
         points.push(pointFrom(operation.data[2], operation.data[3]));
         points.push(pointFrom(operation.data[4], operation.data[5]));
       }
-    } else if (operation.op === "lineTo") {
-      if (odd) {
-        points.push(pointFrom(operation.data[0], operation.data[1]));
-      }
     }
   }
 

yarn.lock

@@ -1531,10 +1531,10 @@
   resolved "https://registry.yarnpkg.com/@excalidraw/markdown-to-text/-/markdown-to-text-0.1.2.tgz#1703705e7da608cf478f17bfe96fb295f55a23eb"
   integrity sha512-1nDXBNAojfi3oSFwJswKREkFm5wrSjqay81QlyRv2pkITG/XYB5v+oChENVBQLcxQwX4IUATWvXM5BcaNhPiIg==
 
-"@excalidraw/mermaid-to-excalidraw@2.2.2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@excalidraw/mermaid-to-excalidraw/-/mermaid-to-excalidraw-2.2.2.tgz#ee6b597a0d95b9a76f7ae41ce0e3733a9b96e4a0"
-  integrity sha512-5VKQq5CdRocC82vOIUpQ5ufJOVV9FpBTdHGA+ULqazeIVV+cr299877omQCibsdS3Bpitz2fsnTwnIXEmLVDSg==
+"@excalidraw/mermaid-to-excalidraw@2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@excalidraw/mermaid-to-excalidraw/-/mermaid-to-excalidraw-2.1.0.tgz#a5b9cf87c3185558cda7f9687d87b9937f452358"
+  integrity sha512-RMd+c2b7WzzUjhERMpKwp8PhF2/XlHDjr/zK+Gxfp8K9sVlafPYJ5OEa/GkN6edi2rBUXRfW+41WdO6L56b6Kw==
   dependencies:
     "@excalidraw/markdown-to-text" "0.1.2"
     "@mermaid-js/parser" "^0.6.3"