improve balls

.codesandbox/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:24-bullseye
+FROM node:18-bullseye
 
 # Vite wants to open the browser using `open`, so we
 # need to install those utils.

.github/workflows/autorelease-excalidraw.yml

@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: actions/checkout@v2
         with:
           fetch-depth: 2
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v2
         with:
           node-version: 20.x
       - name: Set up publish access

.github/workflows/build-docker.yml

@@ -9,5 +9,5 @@ jobs:
   build-docker:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: actions/checkout@v2
       - run: docker build -t excalidraw .

.github/workflows/lint.yml

@@ -7,10 +7,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: actions/checkout@v2
 
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v2
         with:
           node-version: 20.x
 

.github/workflows/locales-coverage.yml

@@ -10,12 +10,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: actions/checkout@v4
         with:
           token: ${{ secrets.PUSH_TRANSLATIONS_COVERAGE_PAT }}
 
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v2
         with:
           node-version: 20.x
 

.github/workflows/publish-docker.yml

@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@v3
       - name: Login to DockerHub
         uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc # v2
         with:

.github/workflows/semantic-pr-title.yml

@@ -6,97 +6,11 @@ on:
       - opened
       - edited
       - synchronize
-      - labeled
-      - unlabeled
 
 jobs:
   semantic:
     runs-on: ubuntu-latest
-    permissions:
-      pull-requests: read
     steps:
       - uses: amannn/action-semantic-pull-request@e32d7e603df1aa1ba07e981f2a23455dee596825 # v5
-        with:
-          requireScope: true
-          scopes: |
-            app
-            editor
-            packages/excalidraw
-            packages/utils
-            docker
-            repo
-          ignoreLabels: |
-            skip-semantic-title
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  label-scope:
-    needs: semantic
-    if: github.event.pull_request.head.repo.full_name == github.repository
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-    steps:
-      - name: Label scoped PR
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          PR_NUMBER: ${{ github.event.pull_request.number }}
-          PR_TITLE: ${{ github.event.pull_request.title }}
-          REPOSITORY: ${{ github.repository }}
-        run: |
-          set -euo pipefail
-
-          scope_labels=(s-app s-editor s-package)
-
-          readarray -t desired_labels < <(
-            node <<'NODE'
-          const title = process.env.PR_TITLE;
-          const match = title.match(/^[a-z]+(?:\(([^)]+)\))?!?:/i);
-          const scopes = match?.[1]?.split(",").map((scope) => scope.trim()) ?? [];
-          const labels = new Set();
-
-          for (const scope of scopes) {
-            if (scope === "app") {
-              labels.add("s-app");
-            } else if (scope === "editor") {
-              labels.add("s-editor");
-            } else if (scope.startsWith("packages/")) {
-              labels.add("s-package");
-            }
-          }
-
-          process.stdout.write([...labels].join("\n"));
-          NODE
-          )
-
-          should_apply_label() {
-            local label="$1"
-
-            for desired_label in "${desired_labels[@]}"; do
-              if [[ "$desired_label" == "$label" ]]; then
-                return 0
-              fi
-            done
-
-            return 1
-          }
-
-          for label in "${scope_labels[@]}"; do
-            if ! should_apply_label "$label"; then
-              gh api \
-                --method DELETE \
-                "repos/${REPOSITORY}/issues/${PR_NUMBER}/labels/${label}" \
-                --silent 2>/dev/null || true
-            fi
-          done
-
-          for label in "${desired_labels[@]}"; do
-            if ! gh api \
-              --method POST \
-              "repos/${REPOSITORY}/issues/${PR_NUMBER}/labels" \
-              --field "labels[]=${label}" \
-              --silent; then
-              echo "::warning::Could not apply ${label}. The workflow token likely does not have issues:write permission for this PR."
-            fi
-          done

.github/workflows/sentry-production.yml

@@ -9,9 +9,9 @@ jobs:
   sentry:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: actions/checkout@v2
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v2
         with:
           node-version: 20.x
       - name: Install and build

.github/workflows/size-limit.yml

@@ -10,9 +10,9 @@ jobs:
       CI_JOB_NUMBER: 1
     steps:
       - name: Checkout repository
-        uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        uses: actions/checkout@v3
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v3
         with:
           node-version: 20.x
       - name: Install in packages/excalidraw

.github/workflows/test-coverage-pr.yml

@@ -10,9 +10,9 @@ jobs:
       pull-requests: write
 
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: actions/checkout@v2
       - name: "Install Node"
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v2
         with:
           node-version: "20.x"
       - name: "Install Deps"

.github/workflows/test.yml

@@ -8,9 +8,9 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+      - uses: actions/checkout@v4
       - name: Setup Node.js
-        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
+        uses: actions/setup-node@v4
         with:
           node-version: 20.x
       - name: Install and test

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=${BUILDPLATFORM} node:24@sha256:8530f76a96d88820d288761f022e318970dda93d01536919fbc16076b7983e63 AS build
+FROM --platform=${BUILDPLATFORM} node:18 AS build
 
 WORKDIR /opt/node_app
 
@@ -7,13 +7,13 @@ COPY . .
 # do not ignore optional dependencies:
 # Error: Cannot find module @rollup/rollup-linux-x64-gnu
 RUN --mount=type=cache,target=/root/.cache/yarn \
-    npm_config_target_arch=${TARGETARCH} yarn --frozen-lockfile --network-timeout 600000
+    npm_config_target_arch=${TARGETARCH} yarn --network-timeout 600000
 
 ARG NODE_ENV=production
 
 RUN npm_config_target_arch=${TARGETARCH} yarn build:app:docker
 
-FROM nginx:stable-alpine-slim@sha256:2c605dbeab79a6b2a63340474fe58119d0ef95bdc4b1f41df0aa689659b3d13b
+FROM --platform=${TARGETPLATFORM} nginx:1.27-alpine
 
 COPY --from=build /opt/node_app/excalidraw-app/build /usr/share/nginx/html
 

README.md

@@ -29,7 +29,7 @@
   <a href="https://docs.excalidraw.com/docs/introduction/contributing">
     <img alt="PRs welcome!" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat"  /></a>
   <a href="https://discord.gg/UexuTaE">
-    <img alt="Chat on Discord" src="https://img.shields.io/discord/723672430744174682?color=738ad6&label=Chat%20on%20Discord&logo=discord&logoColor=ffffff&widget=false"/></a>
+    <img alt="Chat on Discord" src="https://img.shields.io/discord/723672430744174682?color=738ad6&label=Chat%20on%20Discord&logo=discord&logoColor=ffffff&widge=false"/></a>
   <a href="https://deepwiki.com/excalidraw/excalidraw">
     <img alt="Ask DeepWiki" src="https://deepwiki.com/badge.svg" /></a>
   <a href="https://twitter.com/excalidraw">

dev-docs/docusaurus.config.js

@@ -97,8 +97,8 @@ const config = {
                 href: "https://discord.gg/UexuTaE",
               },
               {
-                label: "𝕏",
+                label: "Twitter",
-                href: "https://x.com/excalidraw",
+                href: "https://twitter.com/excalidraw",
               },
               {
                 label: "Linkedin",

excalidraw-app/data/LocalData.ts

@@ -26,6 +26,7 @@ import {
   get,
 } from "idb-keyval";
 
+import { appJotaiStore, atom } from "excalidraw-app/app-jotai";
 import { getNonDeletedElements } from "@excalidraw/element";
 
 import type { LibraryPersistedData } from "@excalidraw/excalidraw/data/library";
@@ -38,7 +39,6 @@ import type {
 } from "@excalidraw/excalidraw/types";
 import type { MaybePromise } from "@excalidraw/common/utility-types";
 
-import { appJotaiStore, atom } from "../app-jotai";
 import { SAVE_TO_LOCAL_STORAGE_TIMEOUT, STORAGE_KEYS } from "../app_constants";
 
 import { FileManager } from "./FileManager";

excalidraw-app/vite.config.mts

@@ -75,13 +75,6 @@ export default defineConfig(({ mode }) => {
           find: /^@excalidraw\/utils\/(.*?)/,
           replacement: path.resolve(__dirname, "../packages/utils/src/$1"),
         },
-        {
-          find: /^@excalidraw\/fractional-indexing$/,
-          replacement: path.resolve(
-            __dirname,
-            "../packages/fractional-indexing/src/index.ts",
-          ),
-        },
       ],
     },
     build: {

package.json

@@ -56,8 +56,7 @@
     "build:element": "yarn --cwd ./packages/element build:esm",
     "build:excalidraw": "yarn --cwd ./packages/excalidraw build:esm",
     "build:math": "yarn --cwd ./packages/math build:esm",
-    "build:fractional-indexing": "yarn --cwd ./packages/fractional-indexing build:esm",
+    "build:packages": "yarn build:common && yarn build:math && yarn build:element && yarn build:excalidraw",
-    "build:packages": "yarn build:common && yarn build:fractional-indexing && yarn build:math && yarn build:element && yarn build:excalidraw",
     "build:version": "yarn --cwd ./excalidraw-app build:version",
     "build": "yarn --cwd ./excalidraw-app build",
     "build:preview": "yarn --cwd ./excalidraw-app build:preview",

packages/common/src/constants.ts

@@ -337,10 +337,9 @@ export const MAX_DECIMALS_FOR_SVG_EXPORT = 2;
 export const EXPORT_SCALES = [1, 2, 3];
 export const DEFAULT_EXPORT_PADDING = 10; // px
 
-export const DEFAULT_IMAGE_OPTIONS: AppProps["imageOptions"] = {
+export const DEFAULT_MAX_IMAGE_WIDTH_OR_HEIGHT = 1440;
-  maxWidthOrHeight: 1440,
+
-  maxFileSizeBytes: 4 * 1024 * 1024,
+export const MAX_ALLOWED_FILE_BYTES = 4 * 1024 * 1024;
-};
 
 export const SVG_NS = "http://www.w3.org/2000/svg";
 export const SVG_DOCUMENT_PREAMBLE = `<?xml version="1.0" standalone="no"?>
@@ -406,8 +405,9 @@ export const ROUGHNESS = {
 
 export const STROKE_WIDTH = {
   thin: 1,
-  bold: 2,
+  medium: 2,
-  extraBold: 4,
+  bold: 4,
+  extraBold: 8,
 } as const;
 
 export const DEFAULT_ELEMENT_PROPS: {
@@ -430,6 +430,8 @@ export const DEFAULT_ELEMENT_PROPS: {
   locked: false,
 };
 
+export const DEFAULT_FREE_DRAW_STROKE_SHAPE = "variable" as const;
+
 export const LIBRARY_SIDEBAR_TAB = "library";
 export const CANVAS_SEARCH_TAB = "search";
 

packages/element/package.json

@@ -64,7 +64,6 @@
   },
   "dependencies": {
     "@excalidraw/common": "0.18.0",
-    "@excalidraw/math": "0.18.0",
+    "@excalidraw/math": "0.18.0"
-    "@excalidraw/fractional-indexing": "3.3.0"
   }
 }

packages/element/src/Scene.ts

@@ -338,18 +338,27 @@ export class Scene {
     this.callbacks.clear();
   }
 
-  /** low-level - generally use app.insertNewElements() */
+  insertElementAtIndex(element: ExcalidrawElement, index: number) {
-  insertElementsAtIndex(
+    if (!Number.isFinite(index) || index < 0) {
-    elements: ExcalidrawElement[],
+      throw new Error(
-    /** null indicates end of the array */
+        "insertElementAtIndex can only be called with index >= 0",
-    index: number | null,
+      );
-  ) {
-    if (!elements.length) {
-      return;
     }
 
-    if (index === null) {
+    const nextElements = [
-      index = this.elements.length;
+      ...this.elements.slice(0, index),
+      element,
+      ...this.elements.slice(index),
+    ];
+
+    syncMovedIndices(nextElements, arrayToMap([element]));
+
+    this.replaceAllElements(nextElements);
+  }
+
+  insertElementsAtIndex(elements: ExcalidrawElement[], index: number) {
+    if (!elements.length) {
+      return;
     }
 
     if (!Number.isFinite(index) || index < 0) {
@@ -369,9 +378,24 @@ export class Scene {
     this.replaceAllElements(nextElements);
   }
 
-  /** low-level - generally use app.insertNewElement() */
   insertElement = (element: ExcalidrawElement) => {
-    this.insertElementsAtIndex([element], null);
+    const index = element.frameId
+      ? this.getElementIndex(element.frameId)
+      : this.elements.length;
+
+    this.insertElementAtIndex(element, index);
+  };
+
+  insertElements = (elements: ExcalidrawElement[]) => {
+    if (!elements.length) {
+      return;
+    }
+
+    const index = elements[0]?.frameId
+      ? this.getElementIndex(elements[0].frameId)
+      : this.elements.length;
+
+    this.insertElementsAtIndex(elements, index);
   };
 
   getElementIndex(elementId: string) {

packages/element/src/arrows/focus.ts

@@ -10,6 +10,7 @@ import {
   getBindingGap,
   getGlobalFixedPointForBindableElement,
   isBindingEnabled,
+  maxBindingDistance_simple,
   unbindBindingElement,
   updateBoundPoint,
 } from "../binding";
@@ -19,7 +20,7 @@ import {
   isElbowArrow,
 } from "../typeChecks";
 import { LinearElementEditor } from "../linearElementEditor";
-import { getHoveredElementForBinding, hitElementItself } from "../collision";
+import { getHoveredElementForFocusPoint, hitElementItself } from "../collision";
 import { moveArrowAboveBindable } from "../zindex";
 
 import type {
@@ -91,7 +92,7 @@ export const isFocusPointVisible = (
       element: bindableElement,
       elementsMap,
       point: focusPoint,
-      threshold: getBindingGap(bindableElement),
+      threshold: getBindingGap(bindableElement, arrow),
       overrideShouldTestInside: true,
     })
   );
@@ -233,12 +234,12 @@ export const handleFocusPointDrag = (
     pointerCoords.y - offsetY,
   );
   const bindingField = isStartBinding ? "startBinding" : "endBinding";
-  const hit = getHoveredElementForBinding(
+  const hit = getHoveredElementForFocusPoint(
-    arrow,
     point,
+    arrow,
     scene.getNonDeletedElements(),
     elementsMap,
-    appState.zoom,
+    maxBindingDistance_simple(appState.zoom),
   );
 
   // Hovering a bindable element
@@ -269,7 +270,6 @@ export const handleFocusPointDrag = (
         newMode || "orbit",
         linearElementEditor.draggedFocusPointBinding,
         scene,
-        appState.zoom,
         point,
       );
     }

packages/element/src/binding.ts

@@ -60,7 +60,6 @@ import { updateElbowArrowPoints } from "./elbowArrow";
 import {
   deconstructDiamondElement,
   deconstructRectanguloidElement,
-  getSnapOutlineMidPoint,
   projectFixedPointOntoDiagonal,
 } from "./utils";
 
@@ -111,13 +110,18 @@ export type BindingStrategy =
  * IMPORTANT: currently must be > 0 (this also applies to the computed gap)
  */
 export const BASE_BINDING_GAP = 5;
+export const BASE_BINDING_GAP_ELBOW = 5;
 export const BASE_ARROW_MIN_LENGTH = 10;
 export const FOCUS_POINT_SIZE = 10 / 1.5;
 
 export const getBindingGap = (
   bindTarget: ExcalidrawBindableElement,
+  opts: Pick<ExcalidrawArrowElement, "elbowed">,
 ): number => {
-  return BASE_BINDING_GAP + bindTarget.strokeWidth / 2;
+  return (
+    (opts.elbowed ? BASE_BINDING_GAP_ELBOW : BASE_BINDING_GAP) +
+    bindTarget.strokeWidth / 2
+  );
 };
 
 export const maxBindingDistance_simple = (zoom?: AppState["zoom"]): number => {
@@ -171,7 +175,6 @@ export const bindOrUnbindBindingElement = (
     start,
     "start",
     scene,
-    appState.zoom,
     appState.isBindingEnabled,
   );
   bindOrUnbindBindingElementEdge(
@@ -179,7 +182,6 @@ export const bindOrUnbindBindingElement = (
     end,
     "end",
     scene,
-    appState.zoom,
     appState.isBindingEnabled,
   );
   if (start.focusPoint || end.focusPoint) {
@@ -224,7 +226,6 @@ const bindOrUnbindBindingElementEdge = (
   { mode, element, focusPoint }: BindingStrategy,
   startOrEnd: "start" | "end",
   scene: Scene,
-  zoom: AppState["zoom"],
   shouldSnapToOutline = true,
 ): void => {
   if (mode === null) {
@@ -237,7 +238,6 @@ const bindOrUnbindBindingElementEdge = (
       mode,
       startOrEnd,
       scene,
-      zoom,
       focusPoint,
       shouldSnapToOutline,
     );
@@ -270,11 +270,10 @@ const bindingStrategyForElbowArrowEndpointDragging = (
     elementsMap,
   );
   const hit = getHoveredElementForBinding(
-    arrow,
     globalPoint,
     elements,
     elementsMap,
-    zoom,
+    maxBindingDistance_simple(zoom),
   );
 
   const current = hit
@@ -322,7 +321,7 @@ const bindingStrategyForNewSimpleArrowEndpointDragging = (
     draggingPoints.get(startDragged ? startIdx : endIdx)!.point,
     elementsMap,
   );
-  const hit = getHoveredElementForBinding(arrow, point, elements, elementsMap);
+  const hit = getHoveredElementForBinding(point, elements, elementsMap);
 
   // With new arrows this handles the binding at arrow creation
   if (startDragged) {
@@ -367,12 +366,7 @@ const bindingStrategyForNewSimpleArrowEndpointDragging = (
     // Check and handle nested shapes
     if (hit && arrow.startBinding) {
       const startBinding = arrow.startBinding;
-      const allHits = getAllHoveredElementAtPoint(
+      const allHits = getAllHoveredElementAtPoint(point, elements, elementsMap);
-        arrow,
-        point,
-        elements,
-        elementsMap,
-      );
 
       if (allHits.find((el) => el.id === startBinding.elementId)) {
         const otherElement = elementsMap.get(
@@ -474,9 +468,9 @@ const bindingStrategyForSimpleArrowEndpointDragging_complex = (
   let other: BindingStrategy = { mode: undefined };
 
   const isMultiPoint = arrow.points.length > 2;
-  const hit = getHoveredElementForBinding(arrow, point, elements, elementsMap);
+  const hit = getHoveredElementForBinding(point, elements, elementsMap);
   const isOverlapping = oppositeBinding
-    ? getAllHoveredElementAtPoint(arrow, point, elements, elementsMap).some(
+    ? getAllHoveredElementAtPoint(point, elements, elementsMap).some(
         (el) => el.id === oppositeBinding.elementId,
       )
     : false;
@@ -701,11 +695,10 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
     elementsMap,
   );
   const hit = getHoveredElementForBinding(
-    arrow,
     globalPoint,
     elements,
     elementsMap,
-    appState.zoom,
+    maxBindingDistance_simple(appState.zoom),
   );
   const pointInElement =
     hit &&
@@ -741,11 +734,12 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
     });
 
   // Handle outside-outside binding to the same element
-  if (
+  if (otherBinding && otherBinding.elementId === hit?.id) {
-    otherBinding &&
+    invariant(
-    otherBinding.elementId === hit?.id &&
+      !opts?.newArrow || appState.selectedLinearElement?.initialState.origin,
-    (!opts?.newArrow || appState.selectedLinearElement?.initialState.origin)
+      "appState.selectedLinearElement.initialState.origin must be defined for new arrows",
-  ) {
+    );
+
     return {
       start: {
         mode: "inside",
@@ -1026,7 +1020,6 @@ export const bindBindingElement = (
   mode: BindMode,
   startOrEnd: "start" | "end",
   scene: Scene,
-  zoom: AppState["zoom"],
   focusPoint?: GlobalPoint,
   shouldSnapToOutline = true,
 ): void => {
@@ -1043,7 +1036,6 @@ export const bindBindingElement = (
         hoveredElement,
         startOrEnd,
         elementsMap,
-        zoom,
         shouldSnapToOutline,
       ),
     };
@@ -1268,7 +1260,6 @@ const updateArrowBindings = (
         strategy[strategyName].mode,
         strategyName,
         scene,
-        appState.zoom,
         strategy[strategyName].focusPoint,
       );
     }
@@ -1378,7 +1369,6 @@ export const bindPointToSnapToElementOutline = (
   bindableElement: ExcalidrawBindableElement,
   startOrEnd: "start" | "end",
   elementsMap: ElementsMap,
-  zoom: AppState["zoom"],
   customIntersector?: LineSegment<GlobalPoint>,
   isMidpointSnappingEnabled = true,
 ): GlobalPoint => {
@@ -1411,7 +1401,7 @@ export const bindPointToSnapToElementOutline = (
           startOrEnd === "start" ? 1 : -2,
           elementsMap,
         );
-  const bindingGap = getBindingGap(bindableElement);
+  const bindingGap = getBindingGap(bindableElement, arrowElement);
   const aabb = aabbForElement(bindableElement, elementsMap);
   const bindableCenter = getCenterForBounds(aabb);
 
@@ -1421,13 +1411,7 @@ export const bindPointToSnapToElementOutline = (
       headingForPointFromElement(bindableElement, aabb, point),
     );
     const snapPoint = isMidpointSnappingEnabled
-      ? getSnapOutlineMidPoint(
+      ? snapToMid(bindableElement, elementsMap, edgePoint, 0.05, arrowElement)
-          edgePoint,
-          bindableElement,
-          elementsMap,
-          zoom,
-          arrowElement,
-        )
       : undefined;
     const resolved = snapPoint || point;
     const otherPoint = pointFrom<GlobalPoint>(
@@ -1472,7 +1456,7 @@ export const bindPointToSnapToElementOutline = (
         bindableElement,
         elementsMap,
         anotherIntersector,
-        BASE_BINDING_GAP,
+        BASE_BINDING_GAP_ELBOW,
       ).sort(pointDistanceSq)[0];
     }
   } else {
@@ -1531,7 +1515,7 @@ export const avoidRectangularCorner = (
     -bindTarget.angle as Radians,
   );
 
-  const bindingGap = getBindingGap(bindTarget);
+  const bindingGap = getBindingGap(bindTarget, arrowElement);
 
   if (nonRotatedPoint[0] < bindTarget.x && nonRotatedPoint[1] < bindTarget.y) {
     // Top left
@@ -1609,6 +1593,121 @@ export const avoidRectangularCorner = (
   return p;
 };
 
+export const snapToMid = (
+  bindTarget: ExcalidrawBindableElement,
+  elementsMap: ElementsMap,
+  p: GlobalPoint,
+  tolerance: number = 0.05,
+  arrowElement?: ExcalidrawArrowElement,
+): GlobalPoint | undefined => {
+  const { x, y, width, height, angle } = bindTarget;
+  const center = elementCenterPoint(bindTarget, elementsMap, -0.1, -0.1);
+  const nonRotated = pointRotateRads(p, center, -angle as Radians);
+
+  const bindingGap = arrowElement ? getBindingGap(bindTarget, arrowElement) : 0;
+
+  // snap-to-center point is adaptive to element size, but we don't want to go
+  // above and below certain px distance
+  const verticalThreshold = clamp(tolerance * height, 5, 80);
+  const horizontalThreshold = clamp(tolerance * width, 5, 80);
+
+  // Too close to the center makes it hard to resolve direction precisely
+  if (pointDistance(center, nonRotated) < bindingGap) {
+    return undefined;
+  }
+
+  if (
+    nonRotated[0] <= x + width / 2 &&
+    nonRotated[1] > center[1] - verticalThreshold &&
+    nonRotated[1] < center[1] + verticalThreshold
+  ) {
+    // LEFT
+    return pointRotateRads(
+      pointFrom<GlobalPoint>(x - bindingGap, center[1]),
+      center,
+      angle,
+    );
+  } else if (
+    nonRotated[1] <= y + height / 2 &&
+    nonRotated[0] > center[0] - horizontalThreshold &&
+    nonRotated[0] < center[0] + horizontalThreshold
+  ) {
+    // TOP
+    return pointRotateRads(
+      pointFrom<GlobalPoint>(center[0], y - bindingGap),
+      center,
+      angle,
+    );
+  } else if (
+    nonRotated[0] >= x + width / 2 &&
+    nonRotated[1] > center[1] - verticalThreshold &&
+    nonRotated[1] < center[1] + verticalThreshold
+  ) {
+    // RIGHT
+    return pointRotateRads(
+      pointFrom<GlobalPoint>(x + width + bindingGap, center[1]),
+      center,
+      angle,
+    );
+  } else if (
+    nonRotated[1] >= y + height / 2 &&
+    nonRotated[0] > center[0] - horizontalThreshold &&
+    nonRotated[0] < center[0] + horizontalThreshold
+  ) {
+    // DOWN
+    return pointRotateRads(
+      pointFrom<GlobalPoint>(center[0], y + height + bindingGap),
+      center,
+      angle,
+    );
+  } else if (bindTarget.type === "diamond") {
+    const distance = bindingGap;
+    const topLeft = pointFrom<GlobalPoint>(
+      x + width / 4 - distance,
+      y + height / 4 - distance,
+    );
+    const topRight = pointFrom<GlobalPoint>(
+      x + (3 * width) / 4 + distance,
+      y + height / 4 - distance,
+    );
+    const bottomLeft = pointFrom<GlobalPoint>(
+      x + width / 4 - distance,
+      y + (3 * height) / 4 + distance,
+    );
+    const bottomRight = pointFrom<GlobalPoint>(
+      x + (3 * width) / 4 + distance,
+      y + (3 * height) / 4 + distance,
+    );
+
+    if (
+      pointDistance(topLeft, nonRotated) <
+      Math.max(horizontalThreshold, verticalThreshold)
+    ) {
+      return pointRotateRads(topLeft, center, angle);
+    }
+    if (
+      pointDistance(topRight, nonRotated) <
+      Math.max(horizontalThreshold, verticalThreshold)
+    ) {
+      return pointRotateRads(topRight, center, angle);
+    }
+    if (
+      pointDistance(bottomLeft, nonRotated) <
+      Math.max(horizontalThreshold, verticalThreshold)
+    ) {
+      return pointRotateRads(bottomLeft, center, angle);
+    }
+    if (
+      pointDistance(bottomRight, nonRotated) <
+      Math.max(horizontalThreshold, verticalThreshold)
+    ) {
+      return pointRotateRads(bottomRight, center, angle);
+    }
+  }
+
+  return undefined;
+};
+
 const extractBinding = (
   arrow: ExcalidrawArrowElement,
   startOrEnd: "startBinding" | "endBinding",
@@ -1709,7 +1808,7 @@ export const updateBoundPoint = (
       otherBindable,
       elementsMap,
       intersector,
-      getBindingGap(otherBindable),
+      getBindingGap(otherBindable, arrow),
     ).sort(
       (a, b) => pointDistanceSq(a, focusPoint) - pointDistanceSq(b, focusPoint),
     )[0];
@@ -1719,7 +1818,7 @@ export const updateBoundPoint = (
       bindableElement,
       elementsMap,
       intersector,
-      getBindingGap(bindableElement),
+      getBindingGap(bindableElement, arrow),
     ).sort(
       (a, b) =>
         pointDistanceSq(a, otherFocusPointOrArrowPoint) -
@@ -1747,7 +1846,7 @@ export const updateBoundPoint = (
       element: otherBindable,
       point: outlinePoint,
       elementsMap,
-      threshold: getBindingGap(otherBindable),
+      threshold: getBindingGap(otherBindable, arrow),
       overrideShouldTestInside: true,
     })
   ) {
@@ -1808,7 +1907,6 @@ export const calculateFixedPointForElbowArrowBinding = (
   hoveredElement: ExcalidrawBindableElement,
   startOrEnd: "start" | "end",
   elementsMap: ElementsMap,
-  zoom: AppState["zoom"],
   shouldSnapToOutline = true,
   isMidpointSnappingEnabled = true,
 ): { fixedPoint: FixedPoint } => {
@@ -1824,7 +1922,6 @@ export const calculateFixedPointForElbowArrowBinding = (
         hoveredElement,
         startOrEnd,
         elementsMap,
-        zoom,
         undefined,
         isMidpointSnappingEnabled,
       )
@@ -1846,9 +1943,9 @@ export const calculateFixedPointForElbowArrowBinding = (
   return {
     fixedPoint: normalizeFixedPoint([
       (nonRotatedSnappedGlobalPoint[0] - hoveredElement.x) /
-        Math.max(hoveredElement.width, PRECISION),
+        hoveredElement.width,
       (nonRotatedSnappedGlobalPoint[1] - hoveredElement.y) /
-        Math.max(hoveredElement.height, PRECISION),
+        hoveredElement.height,
     ]),
   };
 };
@@ -1879,11 +1976,9 @@ export const calculateFixedPointForNonElbowArrowBinding = (
 
   // Calculate the ratio relative to the element's bounds
   const fixedPointX =
-    (nonRotatedPoint[0] - hoveredElement.x) /
+    (nonRotatedPoint[0] - hoveredElement.x) / hoveredElement.width;
-    Math.max(hoveredElement.width, PRECISION);
   const fixedPointY =
-    (nonRotatedPoint[1] - hoveredElement.y) /
+    (nonRotatedPoint[1] - hoveredElement.y) / hoveredElement.height;
-    Math.max(hoveredElement.height, PRECISION);
 
   return {
     fixedPoint: normalizeFixedPoint([fixedPointX, fixedPointY]),

packages/element/src/bounds.ts

@@ -168,12 +168,14 @@ export class ElementBounds {
           ),
         ),
       );
+      const padding =
+        element.strokeShape === "fixed" ? element.strokeWidth / 2 : 0;
 
       return [
-        minX + element.x,
+        minX + element.x - padding,
-        minY + element.y,
+        minY + element.y - padding,
-        maxX + element.x,
+        maxX + element.x + padding,
-        maxY + element.y,
+        maxY + element.y + padding,
       ];
     } else if (isLinearElement(element)) {
       bounds = getLinearElementRotatedBounds(element, cx, cy, elementsMap);
@@ -703,10 +705,11 @@ const getFreeDrawElementAbsoluteCoords = (
   element: ExcalidrawFreeDrawElement,
 ): [number, number, number, number, number, number] => {
   const [minX, minY, maxX, maxY] = getBoundsFromPoints(element.points);
-  const x1 = minX + element.x;
+  const padding = element.strokeShape === "fixed" ? element.strokeWidth / 2 : 0;
-  const y1 = minY + element.y;
+  const x1 = minX + element.x - padding;
-  const x2 = maxX + element.x;
+  const y1 = minY + element.y - padding;
-  const y2 = maxY + element.y;
+  const x2 = maxX + element.x + padding;
+  const y2 = maxY + element.y + padding;
   return [x1, y1, x2, y2, (x1 + x2) / 2, (y1 + y2) / 2];
 };
 

packages/element/src/collision.ts

@@ -25,8 +25,9 @@ import type {
   Radians,
 } from "@excalidraw/math";
 
-import type { AppState, FrameNameBounds } from "@excalidraw/excalidraw/types";
+import type { FrameNameBounds } from "@excalidraw/excalidraw/types";
 
+import { isLoopFreeDrawElement } from "./freedraw";
 import { isPathALoop } from "./utils";
 import {
   doBoundsIntersect,
@@ -59,12 +60,11 @@ import { LinearElementEditor } from "./linearElementEditor";
 
 import { distanceToElement } from "./distance";
 
-import { getBindingGap, maxBindingDistance_simple } from "./binding";
+import { getBindingGap } from "./binding";
-
-import { hasBackground } from "./comparisons";
 
 import type {
   ElementsMap,
+  ExcalidrawArrowElement,
   ExcalidrawBindableElement,
   ExcalidrawDiamondElement,
   ExcalidrawElement,
@@ -84,7 +84,7 @@ export const shouldTestInside = (element: ExcalidrawElement) => {
   }
 
   const isDraggableFromInside =
-    (hasBackground(element.type) && !isTransparent(element.backgroundColor)) ||
+    !isTransparent(element.backgroundColor) ||
     hasBoundTextElement(element) ||
     isIframeLikeElement(element) ||
     isTextElement(element);
@@ -94,7 +94,7 @@ export const shouldTestInside = (element: ExcalidrawElement) => {
   }
 
   if (element.type === "freedraw") {
-    return isDraggableFromInside && isPathALoop(element.points);
+    return isDraggableFromInside && isLoopFreeDrawElement(element);
   }
 
   return isDraggableFromInside || isImageElement(element);
@@ -253,20 +253,25 @@ export const hitElementBoundText = (
   return isPointInElement(point, boundTextElement, elementsMap);
 };
 
-const bindableElementBorderDistanceIfClose = (
+const bindingBorderTest = (
   element: NonDeleted<ExcalidrawBindableElement>,
-  point: GlobalPoint,
+  [x, y]: Readonly<GlobalPoint>,
-  elementsMap: ElementsMap,
+  elementsMap: NonDeletedSceneElementsMap,
   tolerance: number = 0,
-) => {
+): boolean => {
+  const p = pointFrom<GlobalPoint>(x, y);
+  const shouldTestInside =
+    // disable fullshape snapping for frame elements so we
+    // can bind to frame children
+    !isFrameLikeElement(element);
+
   // PERF: Run a cheap test to see if the binding element
   // is even close to the element
-  const [x, y] = point;
   const t = Math.max(1, tolerance);
   const bounds = [x - t, y - t, x + t, y + t] as Bounds;
   const elementBounds = getElementBounds(element, elementsMap);
   if (!doBoundsIntersect(bounds, elementBounds)) {
-    return -Infinity;
+    return false;
   }
 
   // If the element is inside a frame, we should clip the element
@@ -277,29 +282,33 @@ const bindableElementBorderDistanceIfClose = (
         enclosingFrame,
         elementsMap,
       );
-      if (!pointInsideBounds(point, enclosingFrameBounds)) {
+      if (!pointInsideBounds(p, enclosingFrameBounds)) {
-        return -Infinity;
+        return false;
       }
     }
   }
 
-  const distance = distanceToElement(element, elementsMap, point);
+  // Do the intersection test against the element since it's close enough
-  if (isPointInElement(point, element, elementsMap)) {
+  const intersections = intersectElementWithLineSegment(
-    return distance;
+    element,
-  }
+    elementsMap,
+    lineSegment(elementCenterPoint(element, elementsMap), p),
+  );
+  const distance = distanceToElement(element, elementsMap, p);
 
-  return distance > tolerance ? -Infinity : -distance;
+  return shouldTestInside
+    ? intersections.length === 0 || distance <= tolerance
+    : intersections.length > 0 && distance <= t;
 };
 
 export const getAllHoveredElementAtPoint = (
-  arrow: { elbowed: boolean },
   point: Readonly<GlobalPoint>,
   elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   elementsMap: NonDeletedSceneElementsMap,
   tolerance?: number,
 ): NonDeleted<ExcalidrawBindableElement>[] => {
   const candidateElements: NonDeleted<ExcalidrawBindableElement>[] = [];
-  // We need to do hit testing from front (end of the array) to back (beginning of the array)
+  // We need to to hit testing from front (end of the array) to back (beginning of the array)
   // because array is ordered from lower z-index to highest and we want element z-index
   // with higher z-index
   for (let index = elements.length - 1; index >= 0; --index) {
@@ -312,20 +321,11 @@ export const getAllHoveredElementAtPoint = (
 
     if (
       isBindableElement(element, false) &&
-      hitElementItself({
+      bindingBorderTest(element, point, elementsMap, tolerance)
-        element,
-        point,
-        elementsMap,
-        threshold: tolerance ?? getBindingGap(element),
-        overrideShouldTestInside: true,
-      })
     ) {
       candidateElements.push(element);
 
-      if (
+      if (!isTransparent(element.backgroundColor)) {
-        hasBackground(element.type) &&
-        !isTransparent(element.backgroundColor)
-      ) {
         break;
       }
     }
@@ -335,92 +335,82 @@ export const getAllHoveredElementAtPoint = (
 };
 
 export const getHoveredElementForBinding = (
-  arrow: { elbowed: boolean },
   point: Readonly<GlobalPoint>,
   elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   elementsMap: NonDeletedSceneElementsMap,
-  zoom?: AppState["zoom"],
+  tolerance?: number,
 ): NonDeleted<ExcalidrawBindableElement> | null => {
-  type Candidate = {
+  const candidateElements = getAllHoveredElementAtPoint(
-    element: NonDeleted<ExcalidrawBindableElement>;
+    point,
-    distance: number;
+    elements,
-    overlapPercent?: number;
+    elementsMap,
-    relativeArea?: number;
+    tolerance,
-  };
+  );
 
-  const candidates: Candidate[] = [];
+  if (!candidateElements || candidateElements.length === 0) {
-  for (let index = elements.length - 1; index >= 0; --index) {
-    const element = elements[index];
-
-    if (!isBindableElement(element, false)) {
-      continue;
-    }
-
-    const maxDistance = maxBindingDistance_simple(zoom);
-    const distance = bindableElementBorderDistanceIfClose(
-      element,
-      point,
-      elementsMap,
-      maxDistance,
-    );
-
-    if (distance > -maxDistance) {
-      candidates.push({ element, distance });
-
-      if (!isTransparent(element.backgroundColor) && distance >= 0) {
-        break;
-      }
-    }
-  }
-
-  if (candidates.length === 0) {
     return null;
   }
 
-  if (candidates.length === 1) {
+  if (candidateElements.length === 1) {
-    return candidates[0].element;
+    return candidateElements[0];
   }
 
-  const closestElements = candidates.sort(
+  // Prefer smaller shapes
-    (a, b) => Math.abs(a.distance) - Math.abs(b.distance),
+  return candidateElements
-  );
+    .sort(
+      (a, b) => b.width ** 2 + b.height ** 2 - (a.width ** 2 + a.height ** 2),
+    )
+    .pop() as NonDeleted<ExcalidrawBindableElement>;
+};
 
-  const candidate = closestElements[0];
+export const getHoveredElementForFocusPoint = (
-  const [cx1, cy1, cx2, cy2] = getElementBounds(candidate.element, elementsMap);
+  point: GlobalPoint,
-  const candidateArea = Math.max(
+  arrow: ExcalidrawArrowElement,
-    0.00001,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
-    Math.abs(cx2 - cx1) * Math.abs(cy2 - cy1),
+  elementsMap: NonDeletedSceneElementsMap,
-  );
+  tolerance?: number,
-  const overlaps = closestElements
+): ExcalidrawBindableElement | null => {
-    .map((c) => {
+  const candidateElements: NonDeleted<ExcalidrawBindableElement>[] = [];
-      if (c.element === candidate.element) {
+  // We need to to hit testing from front (end of the array) to back (beginning of the array)
-        return { ...c, overlapPercent: 0, relativeArea: 1 };
+  // because array is ordered from lower z-index to highest and we want element z-index
-      }
+  // with higher z-index
+  for (let index = elements.length - 1; index >= 0; --index) {
+    const element = elements[index];
 
-      const [x1, y1, x2, y2] = getElementBounds(c.element, elementsMap);
+    invariant(
-      const overlapX1 = x1 > cx1 && x1 < cx2 ? x1 : cx1;
+      !element.isDeleted,
-      const overlapY1 = y1 > cy1 && y1 < cy2 ? y1 : cy1;
+      "Elements in the function parameter for getAllElementsAtPositionForBinding() should not contain deleted elements",
-      const overlapX2 = x2 < cx2 && x2 > cx1 ? x2 : cx2;
+    );
-      const overlapY2 = y2 < cy2 && y2 > cy1 ? y2 : cy2;
-      const overlapWdith =
-        overlapX1 !== cx1 || overlapX2 !== cx2 ? overlapX2 - overlapX1 : 0;
-      const overlapHeight =
-        overlapY1 !== cy1 || overlapY2 !== cy2 ? overlapY2 - overlapY1 : 0;
-      const area = Math.max(0.00001, Math.abs(x2 - x1) * Math.abs(y2 - y1));
-      const overlapPercent = Math.abs(overlapHeight * overlapWdith) / area;
 
-      return {
+    if (
-        ...c,
+      isBindableElement(element, false) &&
-        overlapPercent,
+      bindingBorderTest(element, point, elementsMap, tolerance)
-        relativeArea:
+    ) {
-          overlapPercent === 0 ? 1 : Math.min(area / candidateArea, 1),
+      candidateElements.push(element);
-      };
+    }
-    })
+  }
-    .filter((c) => c.overlapPercent > 0.25 && c.relativeArea < 0.75);
 
-  return candidate.distance >= 0 && overlaps.length > 0
+  if (!candidateElements || candidateElements.length === 0) {
-    ? overlaps[0].element
+    return null;
-    : candidate.element;
+  }
+
+  if (candidateElements.length === 1) {
+    return candidateElements[0];
+  }
+
+  const distanceFilteredCandidateElements = candidateElements
+    // Resolve by distance
+    .filter(
+      (el) =>
+        distanceToElement(el, elementsMap, point) <= getBindingGap(el, arrow) ||
+        isPointInElement(point, el, elementsMap),
+    );
+
+  if (distanceFilteredCandidateElements.length === 0) {
+    return null;
+  }
+
+  return distanceFilteredCandidateElements[0] as NonDeleted<ExcalidrawBindableElement>;
 };
 
 /**
@@ -765,8 +755,8 @@ export const isPointInElement = (
   elementsMap: ElementsMap,
 ) => {
   if (
-    (isLinearElement(element) || isFreeDrawElement(element)) &&
+    (isLinearElement(element) && !isPathALoop(element.points)) ||
-    !isPathALoop(element.points)
+    (isFreeDrawElement(element) && !isLoopFreeDrawElement(element))
   ) {
     // There isn't any "inside" for a non-looping path
     return false;

packages/element/src/dragElements.ts

@@ -21,7 +21,7 @@ import { getPerfectElementSize } from "./sizeHelpers";
 import { getBoundTextElement } from "./textElement";
 import { getMinTextElementWidth } from "./textMeasurements";
 import {
-  isArrowElement as isBindingElement,
+  isArrowElement,
   isElbowArrow,
   isFrameLikeElement,
   isImageElement,
@@ -108,7 +108,19 @@ export const dragSelectedElements = (
   );
 
   elementsToUpdate.forEach((element) => {
-    if (!isBindingElement(element)) {
+    const isArrow = !isArrowElement(element);
+    const isStartBoundElementSelected =
+      isArrow ||
+      (element.startBinding
+        ? elementsToUpdateIds.has(element.startBinding.elementId)
+        : false);
+    const isEndBoundElementSelected =
+      isArrow ||
+      (element.endBinding
+        ? elementsToUpdateIds.has(element.endBinding.elementId)
+        : false);
+
+    if (!isArrowElement(element)) {
       updateElementCoords(pointerDownState, element, scene, adjustedOffset);
 
       // skip arrow labels since we calculate its position during render
@@ -131,6 +143,7 @@ export const dragSelectedElements = (
       // NOTE: Add a little initial drag to the arrow dragging when the arrow
       // is the single element being dragged to avoid accidentally unbinding
       // the arrow when the user just wants to select it.
+
       elementsToUpdate.size > 1 ||
       Math.max(Math.abs(adjustedOffset.x), Math.abs(adjustedOffset.y)) >
         DRAGGING_THRESHOLD ||
@@ -138,12 +151,9 @@ export const dragSelectedElements = (
     ) {
       updateElementCoords(pointerDownState, element, scene, adjustedOffset);
 
-      const shouldUnbindStart = element.startBinding
+      const shouldUnbindStart =
-        ? !elementsToUpdateIds.has(element.startBinding.elementId)
+        element.startBinding && !isStartBoundElementSelected;
-        : true;
+      const shouldUnbindEnd = element.endBinding && !isEndBoundElementSelected;
-      const shouldUnbindEnd = element.endBinding
-        ? !elementsToUpdateIds.has(element.endBinding.elementId)
-        : true;
       if (shouldUnbindStart || shouldUnbindEnd) {
         // NOTE: Moving the bound arrow should unbind it, otherwise we would
         // have weird situations, like 0 lenght arrow when the user moves

packages/element/src/duplicate.ts

@@ -111,9 +111,6 @@ export const duplicateElements = (
          * user interaction.
          */
         type: "everything";
-        // TODO remove/review this once we add frame children order migration
-        // and invariant checks
-        preserveFrameChildrenOrder?: boolean;
       }
     | {
         /**
@@ -173,8 +170,6 @@ export const duplicateElements = (
     opts.type === "in-place"
       ? opts.idsOfElementsToDuplicate
       : new Map(elements.map((el) => [el.id, el]));
-  const preserveFrameChildrenOrder =
-    opts.type === "everything" && opts.preserveFrameChildrenOrder;
 
   // For sanity
   if (opts.type === "in-place") {
@@ -255,9 +250,6 @@ export const duplicateElements = (
     elementsWithDuplicates.splice(index + 1, 0, ...castArray(elements));
   };
 
-  // main
-  // ---------------------------------------------------------------------------
-
   const frameIdsToDuplicate = new Set(
     elements
       .filter(
@@ -282,7 +274,7 @@ export const duplicateElements = (
     if (groupId) {
       const groupElements = getElementsInGroup(elements, groupId).flatMap(
         (element) =>
-          isFrameLikeElement(element) && !preserveFrameChildrenOrder
+          isFrameLikeElement(element)
             ? [...getFrameChildren(elements, element.id), element]
             : [element],
       );
@@ -298,25 +290,13 @@ export const duplicateElements = (
     // frame duplication
     // -------------------------------------------------------------------------
 
-    if (
+    if (element.frameId && frameIdsToDuplicate.has(element.frameId)) {
-      !preserveFrameChildrenOrder &&
-      element.frameId &&
-      frameIdsToDuplicate.has(element.frameId)
-    ) {
       continue;
     }
 
     if (isFrameLikeElement(element)) {
       const frameId = element.id;
 
-      if (preserveFrameChildrenOrder) {
-        insertBeforeOrAfterIndex(
-          findLastIndex(elementsWithDuplicates, (el) => el.id === frameId),
-          copyElements(element),
-        );
-        continue;
-      }
-
       const frameChildren = getFrameChildren(elements, frameId);
 
       const targetIndex = findLastIndex(elementsWithDuplicates, (el) => {

packages/element/src/elbowArrow.ts

@@ -30,7 +30,8 @@ import {
   getHeadingForElbowArrowSnap,
   getGlobalFixedPointForBindableElement,
   getBindingGap,
-  BASE_BINDING_GAP,
+  maxBindingDistance_simple,
+  BASE_BINDING_GAP_ELBOW,
 } from "./binding";
 import { distanceToElement } from "./distance";
 import {
@@ -317,7 +318,6 @@ const handleSegmentRelease = (
     ...rest
   } = getElbowArrowData(
     {
-      ...arrow,
       x,
       y,
       startBinding,
@@ -1041,7 +1041,6 @@ export const updateElbowArrowPoints = (
     ...rest
   } = getElbowArrowData(
     {
-      ...arrow,
       x: arrow.x,
       y: arrow.y,
       startBinding,
@@ -1191,7 +1190,15 @@ export const updateElbowArrowPoints = (
  * - hoveredEndElement: The element being hovered over at the end point.
  */
 const getElbowArrowData = (
-  arrow: ExcalidrawElbowArrowElement,
+  arrow: {
+    x: number;
+    y: number;
+    startBinding: FixedPointBinding | null;
+    endBinding: FixedPointBinding | null;
+    startArrowhead: Arrowhead | null;
+    endArrowhead: Arrowhead | null;
+    points: readonly LocalPoint[];
+  },
   elementsMap: NonDeletedSceneElementsMap,
   nextPoints: readonly LocalPoint[],
   options?: {
@@ -1216,7 +1223,6 @@ const getElbowArrowData = (
     const elements = Array.from(elementsMap.values());
     hoveredStartElement =
       getHoveredElement(
-        arrow,
         origStartGlobalPoint,
         elementsMap,
         elements,
@@ -1224,7 +1230,6 @@ const getElbowArrowData = (
       ) || null;
     hoveredEndElement =
       getHoveredElement(
-        arrow,
         origEndGlobalPoint,
         elementsMap,
         elements,
@@ -1251,7 +1256,6 @@ const getElbowArrowData = (
     "start",
     arrow.startBinding?.fixedPoint,
     origStartGlobalPoint,
-    options?.zoom || ({ value: 1 } as AppState["zoom"]),
     hoveredStartElement,
     elementsMap,
     options?.isDragging,
@@ -1269,7 +1273,6 @@ const getElbowArrowData = (
     "end",
     arrow.endBinding?.fixedPoint,
     origEndGlobalPoint,
-    options?.zoom || ({ value: 1 } as AppState["zoom"]),
     hoveredEndElement,
     elementsMap,
     options?.isDragging,
@@ -1311,8 +1314,8 @@ const getElbowArrowData = (
         offsetFromHeading(
           startHeading,
           arrow.startArrowhead
-            ? getBindingGap(hoveredStartElement) * 6
+            ? getBindingGap(hoveredStartElement, { elbowed: true }) * 6
-            : getBindingGap(hoveredStartElement) * 2,
+            : getBindingGap(hoveredStartElement, { elbowed: true }) * 2,
           1,
         ),
       )
@@ -1324,8 +1327,8 @@ const getElbowArrowData = (
         offsetFromHeading(
           endHeading,
           arrow.endArrowhead
-            ? getBindingGap(hoveredEndElement) * 6
+            ? getBindingGap(hoveredEndElement, { elbowed: true }) * 6
-            : getBindingGap(hoveredEndElement) * 2,
+            : getBindingGap(hoveredEndElement, { elbowed: true }) * 2,
           1,
         ),
       )
@@ -1372,8 +1375,8 @@ const getElbowArrowData = (
             ? 0
             : BASE_PADDING -
                 (arrow.startArrowhead
-                  ? BASE_BINDING_GAP * 6
+                  ? BASE_BINDING_GAP_ELBOW * 6
-                  : BASE_BINDING_GAP * 2),
+                  : BASE_BINDING_GAP_ELBOW * 2),
           BASE_PADDING,
         ),
     boundsOverlap
@@ -1388,8 +1391,8 @@ const getElbowArrowData = (
             ? 0
             : BASE_PADDING -
                 (arrow.endArrowhead
-                  ? BASE_BINDING_GAP * 6
+                  ? BASE_BINDING_GAP_ELBOW * 6
-                  : BASE_BINDING_GAP * 2),
+                  : BASE_BINDING_GAP_ELBOW * 2),
           BASE_PADDING,
         ),
     boundsOverlap,
@@ -2121,8 +2124,8 @@ const normalizeArrowElementUpdate = (
     offsetY < -MAX_POS ||
     offsetY > MAX_POS ||
     offsetX + points[points.length - 1][0] < -MAX_POS ||
-    offsetX + points[points.length - 1][0] > MAX_POS ||
+    offsetY + points[points.length - 1][0] > MAX_POS ||
-    offsetY + points[points.length - 1][1] < -MAX_POS ||
+    offsetX + points[points.length - 1][1] < -MAX_POS ||
     offsetY + points[points.length - 1][1] > MAX_POS
   ) {
     console.error(
@@ -2215,7 +2218,6 @@ const getGlobalPoint = (
   startOrEnd: "start" | "end",
   fixedPointRatio: [number, number] | undefined | null,
   initialPoint: GlobalPoint,
-  zoom: AppState["zoom"],
   element?: ExcalidrawBindableElement | null,
   elementsMap?: ElementsMap,
   isDragging?: boolean,
@@ -2229,7 +2231,6 @@ const getGlobalPoint = (
         element,
         startOrEnd,
         elementsMap,
-        zoom,
         undefined,
         isMidpointSnappingEnabled,
       );
@@ -2278,18 +2279,16 @@ const getBindPointHeading = (
   );
 
 const getHoveredElement = (
-  arrow: ExcalidrawElbowArrowElement,
   origPoint: GlobalPoint,
   elementsMap: NonDeletedSceneElementsMap,
   elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   zoom?: AppState["zoom"],
 ) => {
   return getHoveredElementForBinding(
-    arrow,
     origPoint,
     elements,
     elementsMap,
-    zoom,
+    maxBindingDistance_simple(zoom),
   );
 };
 

packages/element/src/flowchart.ts

@@ -452,16 +452,8 @@ const createBindingArrow = (
     "orbit",
     "start",
     scene,
-    appState.zoom,
-  );
-  bindBindingElement(
-    bindingArrow,
-    endBindingElement,
-    "orbit",
-    "end",
-    scene,
-    appState.zoom,
   );
+  bindBindingElement(bindingArrow, endBindingElement, "orbit", "end", scene);
 
   const changedElements = new Map<string, OrderedExcalidrawElement>();
   changedElements.set(

packages/element/src/fractionalIndex.ts

@@ -1,9 +1,6 @@
-import { arrayToMap } from "@excalidraw/common";
+import { generateNKeysBetween } from "fractional-indexing";
 
-import {
+import { arrayToMap } from "@excalidraw/common";
-  validateOrderKey,
-  generateNKeysBetween,
-} from "@excalidraw/fractional-indexing";
 
 import { mutateElement, newElementWith } from "./mutateElement";
 import { getBoundTextElement } from "./textElement";
@@ -385,13 +382,6 @@ const isValidFractionalIndex = (
     return false;
   }
 
-  try {
-    // Format validation
-    validateOrderKey(index);
-  } catch {
-    return false;
-  }
-
   if (predecessor && successor) {
     return predecessor < index && index < successor;
   }

packages/element/src/frame.ts

@@ -19,11 +19,9 @@ import {
   getElementAbsoluteCoords,
   doBoundsIntersect,
   getElementBounds,
-  boundsContainBounds,
 } from "./bounds";
 import { mutateElement } from "./mutateElement";
 import { getBoundTextElement, getContainerElement } from "./textElement";
-import { syncMovedIndices } from "./fractionalIndex";
 import {
   isFrameElement,
   isFrameLikeElement,
@@ -103,9 +101,8 @@ export const isElementContainingFrame = (
   frame: ExcalidrawFrameLikeElement,
   elementsMap: ElementsMap,
 ) => {
-  return boundsContainBounds(
+  return getElementsWithinSelection([frame], element, elementsMap).some(
-    getElementBounds(element, elementsMap),
+    (e) => e.id === frame.id,
-    getElementBounds(frame, elementsMap),
   );
 };
 
@@ -492,44 +489,10 @@ export const filterElementsEligibleAsFrameChildren = (
   return eligibleElements;
 };
 
-export const getCommonFrameId = (elements: readonly ExcalidrawElement[]) => {
-  let commonFrameId: ExcalidrawElement["frameId"] | undefined;
-
-  for (const element of elements) {
-    if (isFrameLikeElement(element) || !element.frameId) {
-      return null;
-    }
-
-    if (commonFrameId === undefined) {
-      commonFrameId = element.frameId;
-    } else if (commonFrameId !== element.frameId) {
-      return null;
-    }
-  }
-
-  return commonFrameId ?? null;
-};
-
-export const getFrameChildrenInsertionIndex = (
-  elements: readonly ExcalidrawElement[],
-  frameId: ExcalidrawFrameLikeElement["id"],
-): number | null => {
-  for (let index = elements.length - 1; index >= 0; index--) {
-    const element = elements[index];
-
-    if (element.id === frameId) {
-      return index;
-    } else if (element.frameId === frameId) {
-      return index + 1;
-    }
-  }
-
-  return null;
-};
-
 /**
- * Adds elements and their bound elements to frame. Reorders added elements to
+ * Retains (or repairs for target frame) the ordering invriant where children
- * be just below frame, or just above its highest child (whichever is higher).
+ * elements come right before the parent frame:
+ * [el, el, child, child, frame, el]
  *
  * @returns mutated allElements (same data structure)
  */
@@ -537,11 +500,19 @@ export const addElementsToFrame = <T extends ElementsMapOrArray>(
   allElements: T,
   elementsToAdd: NonDeletedExcalidrawElement[],
   frame: ExcalidrawFrameLikeElement,
+  appState: AppState,
 ): T => {
   const elementsMap = arrayToMap(allElements);
-  const commonFrameId = getCommonFrameId(elementsToAdd);
+  const currTargetFrameChildrenMap = new Map<ExcalidrawElement["id"], true>();
+  for (const element of allElements.values()) {
+    if (element.frameId === frame.id) {
+      currTargetFrameChildrenMap.set(element.id, true);
+    }
+  }
 
-  const finalElementsToAdd = new Set<ExcalidrawElement>();
+  const suppliedElementsToAddSet = new Set(elementsToAdd.map((el) => el.id));
+
+  const finalElementsToAdd: ExcalidrawElement[] = [];
 
   const otherFrames = new Set<ExcalidrawFrameLikeElement["id"]>();
 
@@ -552,8 +523,7 @@ export const addElementsToFrame = <T extends ElementsMapOrArray>(
   }
 
   // - add bound text elements if not already in the array
-  // - keep elements already in the frame so mixed selections can be reordered
+  // - filter out elements that are already in the frame
-  //   together
   for (const element of omitGroupsContainingFrameLikes(
     allElements,
     elementsToAdd,
@@ -566,68 +536,38 @@ export const addElementsToFrame = <T extends ElementsMapOrArray>(
       continue;
     }
 
-    if (element.frameId && element.frameId !== frame.id) {
+    // if the element is already in another frame (which is also in elementsToAdd),
+    // it means that frame and children are selected at the same time
+    // => keep original frame membership, do not add to the target frame
+    if (
+      element.frameId &&
+      appState.selectedElementIds[element.id] &&
+      appState.selectedElementIds[element.frameId]
+    ) {
       continue;
     }
 
-    finalElementsToAdd.add(element);
+    if (!currTargetFrameChildrenMap.has(element.id)) {
+      finalElementsToAdd.push(element);
+    }
 
     const boundTextElement = getBoundTextElement(element, elementsMap);
-    if (boundTextElement && !finalElementsToAdd.has(boundTextElement)) {
+    if (
-      finalElementsToAdd.add(boundTextElement);
+      boundTextElement &&
+      !suppliedElementsToAddSet.has(boundTextElement.id) &&
+      !currTargetFrameChildrenMap.has(boundTextElement.id)
+    ) {
+      finalElementsToAdd.push(boundTextElement);
     }
   }
 
   for (const element of finalElementsToAdd) {
-    // we don't always need to update the element if it's already in the frame,
+    mutateElement(element, elementsMap, {
-    // but we still need to accumulate in finalElementsToAdd so we potentially
+      frameId: frame.id,
-    // reorder them if added together
+    });
-    if (element.frameId !== frame.id) {
-      mutateElement(element, elementsMap, {
-        frameId: frame.id,
-      });
-    }
   }
 
-  // (re)order elements to be just below the frame,
+  return allElements;
-  // or just above the highest child if that is higher
-  // (latter case is denormalized order until we migrate)
-  // ---------------------------------------------------------------------------
-
-  if (
-    !finalElementsToAdd.size ||
-    // if all elements to add already belong to the frame, then we don't want to
-    // reorder (case: we're dragging element children within the frame)
-    commonFrameId === frame.id
-  ) {
-    return allElements;
-  }
-
-  const otherElements = Array.from(allElements.values()).filter(
-    (element) => !finalElementsToAdd.has(element),
-  );
-  const insertionIndex = getFrameChildrenInsertionIndex(
-    otherElements,
-    frame.id,
-  );
-
-  if (insertionIndex === null) {
-    return allElements;
-  }
-
-  const reorderedElements = [
-    ...otherElements.slice(0, insertionIndex),
-    ...finalElementsToAdd,
-    ...otherElements.slice(insertionIndex),
-  ];
-
-  syncMovedIndices(reorderedElements, arrayToMap([...finalElementsToAdd]));
-
-  return (
-    Array.isArray(allElements)
-      ? reorderedElements
-      : new Map(reorderedElements.map((element) => [element.id, element]))
-  ) as T;
 };
 
 export const removeElementsFromFrame = (
@@ -681,11 +621,13 @@ export const replaceAllElementsInFrame = <T extends ExcalidrawElement>(
   allElements: readonly T[],
   nextElementsInFrame: ExcalidrawElement[],
   frame: ExcalidrawFrameLikeElement,
+  app: AppClassProperties,
 ): T[] => {
   return addElementsToFrame(
     removeAllElementsFromFrame(allElements, frame),
     nextElementsInFrame,
     frame,
+    app.state,
   ).slice();
 };
 

packages/element/src/freedraw.ts

@@ -0,0 +1,181 @@
+import {
+  pointDistance,
+  vectorCross,
+  vectorDot,
+  vectorFromPoint,
+} from "@excalidraw/math";
+
+import type { LocalPoint } from "@excalidraw/math";
+
+import { isPathALoop } from "./utils";
+
+import type { ExcalidrawFreeDrawElement } from "./types";
+
+type ZoomValue = NonNullable<Parameters<typeof isPathALoop>[1]>;
+
+type FixedFreeDrawSimplificationProfile = {
+  minPointDistancePx: number;
+  maxPointDistance: number;
+  strokeDistanceFactor: number;
+  collinearityFactor: number;
+  minAlignment: number;
+  zoomScaling: "sqrt" | "none";
+};
+
+const FIXED_FREEDRAW_CAPTURE_PROFILE: FixedFreeDrawSimplificationProfile = {
+  minPointDistancePx: 0.35,
+  maxPointDistance: 0.85,
+  strokeDistanceFactor: 0.08,
+  collinearityFactor: 0.3,
+  minAlignment: 0.985,
+  zoomScaling: "sqrt",
+};
+
+const hasSyntheticLoopClosure = (
+  points: readonly LocalPoint[],
+): points is readonly [LocalPoint, LocalPoint, ...LocalPoint[]] => {
+  if (points.length < 3) {
+    return false;
+  }
+
+  const firstPoint = points[0];
+  const lastPoint = points[points.length - 1];
+
+  return firstPoint[0] === lastPoint[0] && firstPoint[1] === lastPoint[1];
+};
+
+const stripSyntheticLoopClosure = (points: readonly LocalPoint[]) =>
+  hasSyntheticLoopClosure(points) ? points.slice(0, -1) : points;
+
+export const isLoopFreeDrawElement = (
+  element: ExcalidrawFreeDrawElement,
+  zoomValue: ZoomValue = 1 as ZoomValue,
+) => element.strokeShape !== "fixed" && isPathALoop(element.points, zoomValue);
+
+export const getFixedFreeDrawPoints = (
+  element: ExcalidrawFreeDrawElement,
+): readonly LocalPoint[] => stripSyntheticLoopClosure(element.points);
+
+export const getFixedFreeDrawPointSamplingDistance = (
+  strokeWidth: number,
+  zoomValue: ZoomValue = 1 as ZoomValue,
+  profile: FixedFreeDrawSimplificationProfile = FIXED_FREEDRAW_CAPTURE_PROFILE,
+) =>
+  Math.min(
+    Math.max(
+      profile.minPointDistancePx /
+        (profile.zoomScaling === "sqrt"
+          ? Math.max(1, Math.sqrt(zoomValue))
+          : 1),
+      strokeWidth * profile.strokeDistanceFactor,
+    ),
+    profile.maxPointDistance,
+  );
+
+const isRedundantFixedFreeDrawPoint = (
+  previousPoint: LocalPoint,
+  currentPoint: LocalPoint,
+  nextPoint: LocalPoint,
+  strokeWidth: number,
+  zoomValue: ZoomValue,
+  profile: FixedFreeDrawSimplificationProfile,
+) => {
+  const previousSegmentLength = pointDistance(previousPoint, currentPoint);
+  const nextSegmentLength = pointDistance(currentPoint, nextPoint);
+
+  if (!previousSegmentLength || !nextSegmentLength) {
+    return true;
+  }
+
+  const previousVector = vectorFromPoint(currentPoint, previousPoint);
+  const nextVector = vectorFromPoint(nextPoint, currentPoint);
+  const alignment =
+    vectorDot(previousVector, nextVector) /
+    (previousSegmentLength * nextSegmentLength);
+
+  if (alignment < profile.minAlignment) {
+    return false;
+  }
+
+  const chord = vectorFromPoint(nextPoint, previousPoint);
+  const chordLength = pointDistance(previousPoint, nextPoint);
+
+  if (!chordLength) {
+    return true;
+  }
+
+  const distanceToChord =
+    Math.abs(vectorCross(vectorFromPoint(currentPoint, previousPoint), chord)) /
+    chordLength;
+
+  return (
+    distanceToChord <=
+    getFixedFreeDrawPointSamplingDistance(strokeWidth, zoomValue, profile) *
+      profile.collinearityFactor
+  );
+};
+
+export const getFixedFreeDrawPointAction = ({
+  points,
+  nextPoint,
+  strokeWidth,
+  zoomValue,
+  isFinalPoint = false,
+  profile,
+}: {
+  points: readonly LocalPoint[];
+  nextPoint: LocalPoint;
+  strokeWidth: number;
+  zoomValue: ZoomValue;
+  isFinalPoint?: boolean;
+  profile?: FixedFreeDrawSimplificationProfile;
+}) => {
+  const simplificationProfile = profile ?? FIXED_FREEDRAW_CAPTURE_PROFILE;
+  const lastPoint = points[points.length - 1];
+
+  if (!lastPoint) {
+    return "append" as const;
+  }
+
+  if (lastPoint[0] === nextPoint[0] && lastPoint[1] === nextPoint[1]) {
+    return "discard" as const;
+  }
+
+  const samplingDistance = getFixedFreeDrawPointSamplingDistance(
+    strokeWidth,
+    zoomValue,
+    simplificationProfile,
+  );
+
+  if (points.length === 1) {
+    return !isFinalPoint &&
+      pointDistance(lastPoint, nextPoint) < samplingDistance
+      ? ("discard" as const)
+      : ("append" as const);
+  }
+
+  const previousPoint = points[points.length - 2];
+
+  if (
+    isRedundantFixedFreeDrawPoint(
+      previousPoint,
+      lastPoint,
+      nextPoint,
+      strokeWidth,
+      zoomValue,
+      simplificationProfile,
+    )
+  ) {
+    return "replace" as const;
+  }
+
+  if (!isFinalPoint && pointDistance(lastPoint, nextPoint) < samplingDistance) {
+    return "discard" as const;
+  }
+
+  return "append" as const;
+};
+
+export const getRenderableFixedFreeDrawPoints = (
+  element: ExcalidrawFreeDrawElement,
+): readonly LocalPoint[] => getFixedFreeDrawPoints(element);

packages/element/src/index.ts

@@ -69,6 +69,7 @@ export * from "./duplicate";
 export * from "./elbowArrow";
 export * from "./elementLink";
 export * from "./embeddable";
+export * from "./freedraw";
 export * from "./flowchart";
 export * from "./arrows/focus";
 export * from "./fractionalIndex";

packages/element/src/linearElementEditor.ts

@@ -48,6 +48,7 @@ import {
   calculateFixedPointForNonElbowArrowBinding,
   getBindingStrategyForDraggingBindingElementEndpoints,
   isBindingEnabled,
+  snapToMid,
   updateBoundPoint,
 } from "./binding";
 import {
@@ -343,7 +344,7 @@ export class LinearElementEditor {
 
     // Apply the point movement if needed
     let suggestedBinding: AppState["suggestedBinding"] = null;
-    const { positions, updates, hit } = pointDraggingUpdates(
+    const { positions, updates } = pointDraggingUpdates(
       [idx],
       deltaX,
       deltaY,
@@ -381,20 +382,17 @@ export class LinearElementEditor {
 
     // Move the arrow over the bindable object in terms of z-index
     if (isBindingElement(element)) {
-      if (hit) {
+      moveArrowAboveBindable(
-        moveArrowAboveBindable(
+        LinearElementEditor.getPointGlobalCoordinates(
-          LinearElementEditor.getPointGlobalCoordinates(
-            element,
-            element.points[element.points.length - 1],
-            elementsMap,
-          ),
           element,
-          elements,
+          element.points[element.points.length - 1],
           elementsMap,
-          app.scene,
+        ),
-          hit,
+        element,
-        );
+        elements,
-      }
+        elementsMap,
+        app.scene,
+      );
     }
 
     // PERF: Avoid state updates if not absolutely necessary
@@ -488,7 +486,7 @@ export class LinearElementEditor {
           selectedPointsIndices,
         )}) points(0..${
           element.points.length - 1
-        }) lastClickedPoint(${lastClickedPoint}) isElbowArrow: ${elbowed}`,
+        }) lastClickedPoint(${lastClickedPoint})`,
       );
 
       // Fall back to the actual last point as a last resort.
@@ -541,7 +539,7 @@ export class LinearElementEditor {
 
     // Apply the point movement if needed
     let suggestedBinding: AppState["suggestedBinding"] = null;
-    const { positions, updates, hit } = pointDraggingUpdates(
+    const { positions, updates } = pointDraggingUpdates(
       selectedPointsIndices,
       deltaX,
       deltaY,
@@ -580,22 +578,19 @@ export class LinearElementEditor {
 
     // Move the arrow over the bindable object in terms of z-index
     if (isBindingElement(element) && startIsSelected !== endIsSelected) {
-      if (hit) {
+      moveArrowAboveBindable(
-        moveArrowAboveBindable(
+        LinearElementEditor.getPointGlobalCoordinates(
-          LinearElementEditor.getPointGlobalCoordinates(
-            element,
-            startIsSelected
-              ? element.points[0]
-              : element.points[element.points.length - 1],
-            elementsMap,
-          ),
           element,
-          elements,
+          startIsSelected
+            ? element.points[0]
+            : element.points[element.points.length - 1],
           elementsMap,
-          app.scene,
+        ),
-          hit,
+        element,
-        );
+        elements,
-      }
+        elementsMap,
+        app.scene,
+      );
     }
 
     // Attached text might need to update if arrow dimensions change
@@ -2141,17 +2136,16 @@ const pointDraggingUpdates = (
 ): {
   positions: PointsPositionUpdates;
   updates?: PointMoveOtherUpdates;
-  hit?: ExcalidrawBindableElement | null;
 } => {
   const naiveDraggingPoints = new Map(
     selectedPointsIndices.map((pointIndex) => {
-      // NOTE: Avoid stale point index issue potentially caused by elbow
-      // arrows unpredictably changing the number of points during dragging
-      const point = element.points[pointIndex] ?? element.points.at(-1);
       return [
         pointIndex,
         {
-          point: pointFrom<LocalPoint>(point[0] + deltaX, point[1] + deltaY),
+          point: pointFrom<LocalPoint>(
+            element.points[pointIndex][0] + deltaX,
+            element.points[pointIndex][1] + deltaY,
+          ),
           isDragging: true,
         },
       ];
@@ -2199,15 +2193,13 @@ const pointDraggingUpdates = (
           ? {
               element: suggestedBindingElement,
               midPoint: app.state.isMidpointSnappingEnabled
-                ? getSnapOutlineMidPoint(
+                ? snapToMid(
+                    suggestedBindingElement,
+                    elementsMap,
                     pointFrom<GlobalPoint>(
                       scenePointerX - linearElementEditor.pointerOffset.x,
                       scenePointerY - linearElementEditor.pointerOffset.y,
                     ),
-                    suggestedBindingElement,
-                    elementsMap,
-                    app.state.zoom,
-                    element,
                   )
                 : undefined,
             }
@@ -2314,7 +2306,6 @@ const pointDraggingUpdates = (
               start.element,
               elementsMap,
               app.state.zoom,
-              element,
             ),
           }
         : null;
@@ -2354,7 +2345,6 @@ const pointDraggingUpdates = (
               end.element,
               elementsMap,
               app.state.zoom,
-              element,
             ),
           }
         : null;
@@ -2507,7 +2497,6 @@ const pointDraggingUpdates = (
         ];
       }),
     ),
-    hit: startIsDragged ? start.element : end.element,
   };
 };
 

packages/element/src/mutateElement.ts

@@ -1,4 +1,5 @@
 import {
+  DEFAULT_FREE_DRAW_STROKE_SHAPE,
   getSizeFromPoints,
   randomInteger,
   getUpdatedTimestamp,
@@ -18,6 +19,8 @@ import type {
   ElementsMap,
   ExcalidrawElbowArrowElement,
   ExcalidrawElement,
+  ExcalidrawFreeDrawElement,
+  FreeDrawStrokeShape,
   NonDeletedSceneElementsMap,
 } from "./types";
 
@@ -177,6 +180,30 @@ export const newElementWith = <TElement extends ExcalidrawElement>(
   };
 };
 
+export const newFreeDrawElementWithStrokeShape = <
+  TElement extends ExcalidrawFreeDrawElement,
+>(
+  element: TElement,
+  strokeShape: FreeDrawStrokeShape,
+): TElement => {
+  if (strokeShape === DEFAULT_FREE_DRAW_STROKE_SHAPE) {
+    if (!("strokeShape" in element)) {
+      return element;
+    }
+    const nextElement = newElementWith(
+      element,
+      {} as ElementUpdate<TElement>,
+      true,
+    );
+    delete (nextElement as Mutable<Partial<TElement>>).strokeShape;
+    return nextElement;
+  }
+
+  return newElementWith(element, {
+    strokeShape,
+  } as ElementUpdate<TElement>);
+};
+
 /**
  * Mutates element, bumping `version`, `versionNonce`, and `updated`.
  *

packages/element/src/newElement.ts

@@ -445,6 +445,7 @@ export const newFreeDrawElement = (
     points?: ExcalidrawFreeDrawElement["points"];
     simulatePressure: boolean;
     pressures?: ExcalidrawFreeDrawElement["pressures"];
+    strokeShape?: ExcalidrawFreeDrawElement["strokeShape"];
   } & ElementConstructorOpts,
 ): NonDeleted<ExcalidrawFreeDrawElement> => {
   return {
@@ -452,6 +453,7 @@ export const newFreeDrawElement = (
     points: opts.points || [],
     pressures: opts.pressures || [],
     simulatePressure: opts.simulatePressure,
+    ...(opts.strokeShape === "fixed" ? { strokeShape: opts.strokeShape } : {}),
   };
 };
 

packages/element/src/renderElement.ts

@@ -417,16 +417,27 @@ const drawElementOnCanvas = (
     case "freedraw": {
       // Draw directly to canvas
       context.save();
+      context.lineJoin = "round";
+      context.lineCap = "round";
 
       const shapes = ShapeCache.generateElementShape(element, renderConfig);
+      const isFixedStroke = element.strokeShape === "fixed";
 
       for (const shape of shapes) {
         if (typeof shape === "string") {
-          context.fillStyle =
+          const strokeColor =
             renderConfig.theme === THEME.DARK
               ? applyDarkModeFilter(element.strokeColor)
               : element.strokeColor;
-          context.fill(new Path2D(shape));
+
+          if (isFixedStroke) {
+            context.strokeStyle = strokeColor;
+            context.lineWidth = element.strokeWidth;
+            context.stroke(new Path2D(shape));
+          } else {
+            context.fillStyle = strokeColor;
+            context.fill(new Path2D(shape));
+          }
         } else {
           rc.draw(shape);
         }

packages/element/src/selection.ts

@@ -34,6 +34,7 @@ import {
   elementOverlapsWithFrame,
   getContainingFrame,
   getFrameChildren,
+  isElementIntersectingFrame,
 } from "./frame";
 
 import { LinearElementEditor } from "./linearElementEditor";
@@ -129,24 +130,13 @@ export const getElementsWithinSelection = (
   const framesInSelection = excludeElementsInFrames
     ? new Set<NonDeletedExcalidrawElement["id"]>()
     : null;
-  const groups: Record<string, NonDeletedExcalidrawElement[]> = {};
+  let elementsInSelection: NonDeletedExcalidrawElement[] = [];
-  const elementsInSelection: Set<NonDeletedExcalidrawElement> = new Set();
 
   for (const element of elements) {
     if (shouldIgnoreElementFromSelection(element)) {
       continue;
     }
 
-    // Track only selectable top-level group members, so ignored elements such
-    // as bound text and locked elements don't affect group selection.
-    const groupId = element.groupIds.at(-1);
-    if (groupId) {
-      if (!groups[groupId]) {
-        groups[groupId] = [];
-      }
-      groups[groupId].push(element);
-    }
-
     const strokeWidth = element.strokeWidth;
     let labelAABB: Bounds | null = null;
     let elementAABB = getElementBounds(element, elementsMap);
@@ -180,7 +170,7 @@ export const getElementsWithinSelection = (
     const associatedFrame = getContainingFrame(element, elementsMap);
     if (
       associatedFrame &&
-      elementOverlapsWithFrame(element, associatedFrame, elementsMap)
+      isElementIntersectingFrame(element, associatedFrame, elementsMap)
     ) {
       const frameAABB = getElementBounds(associatedFrame, elementsMap);
       elementAABB = [
@@ -219,9 +209,10 @@ export const getElementsWithinSelection = (
     if (boundsContainBounds(selectionBounds, commonAABB)) {
       if (framesInSelection && isFrameLikeElement(element)) {
         framesInSelection.add(element.id);
+      } else {
+        elementsInSelection.push(element);
+        continue;
       }
-      elementsInSelection.add(element);
-      continue;
     }
 
     // 2. Handle the case where the label is overlapped by the selection box
@@ -230,7 +221,7 @@ export const getElementsWithinSelection = (
       labelAABB &&
       doBoundsIntersect(selectionBounds, labelAABB)
     ) {
-      elementsInSelection.add(element);
+      elementsInSelection.push(element);
       continue;
     }
 
@@ -320,7 +311,7 @@ export const getElementsWithinSelection = (
           framesInSelection.add(element.id);
         }
 
-        elementsInSelection.add(element);
+        elementsInSelection.push(element);
         continue;
       }
     }
@@ -329,41 +320,21 @@ export const getElementsWithinSelection = (
     //    as it is separately handled in App.
   }
 
-  if (framesInSelection) {
+  elementsInSelection = framesInSelection
-    elementsInSelection.forEach((element) => {
+    ? excludeElementsFromFrames(elementsInSelection, framesInSelection)
-      if (element.frameId && framesInSelection.has(element.frameId)) {
+    : elementsInSelection;
-        elementsInSelection.delete(element);
-      }
-    });
-  }
 
-  if (boxSelectionMode === "overlap") {
+  elementsInSelection = elementsInSelection.filter((element) => {
-    Array.from(elementsInSelection).forEach((element) => {
+    const containingFrame = getContainingFrame(element, elementsMap);
-      const groupId = element.groupIds.at(-1);
-      const group = groupId ? groups[groupId] : null;
 
-      group?.forEach((groupElement) => elementsInSelection.add(groupElement));
+    if (containingFrame) {
-    });
+      return elementOverlapsWithFrame(element, containingFrame, elementsMap);
-  } else if (boxSelectionMode === "contain") {
+    }
-    elementsInSelection.forEach((element) => {
-      // note: currently we only support top-level group handling since
-      // we don't support box selecting while editing the group/subgroup
-      // see https://github.com/excalidraw/excalidraw/pull/11234#issuecomment-4387654451
-      const groupId = element.groupIds.at(-1);
 
-      const group = groupId ? groups[groupId] : null;
+    return true;
+  });
 
-      if (
+  return elementsInSelection;
-        group &&
-        !group.every((groupElement) => elementsInSelection.has(groupElement))
-      ) {
-        elementsInSelection.delete(element);
-      }
-    });
-  }
-
-  // to maintain original order elements (namely for group selection)
-  return elements.filter((element) => elementsInSelection.has(element));
 };
 
 export const getVisibleAndNonSelectedElements = (

packages/element/src/shape.ts

@@ -1,4 +1,5 @@
 import { simplify } from "points-on-curve";
+import { DEFAULT_FREE_DRAW_STROKE_SHAPE } from "@excalidraw/common";
 import { getStroke } from "perfect-freehand";
 
 import {
@@ -13,6 +14,7 @@ import {
 import {
   pointFrom,
   pointDistance,
+  round,
   type LocalPoint,
   pointRotateRads,
 } from "@excalidraw/math";
@@ -52,6 +54,10 @@ import {
   isIframeLikeElement,
   isLinearElement,
 } from "./typeChecks";
+import {
+  getRenderableFixedFreeDrawPoints,
+  isLoopFreeDrawElement,
+} from "./freedraw";
 import { getCornerRadius, isPathALoop } from "./utils";
 import { headingForPointIsHorizontal } from "./heading";
 
@@ -244,7 +250,12 @@ export const generateRoughOptions = (
     }
     case "line":
     case "freedraw": {
-      if (isPathALoop(element.points)) {
+      const isLoop =
+        element.type === "freedraw"
+          ? isLoopFreeDrawElement(element)
+          : isPathALoop(element.points);
+
+      if (isLoop) {
         options.fillStyle = element.fillStyle;
         options.fill =
           element.backgroundColor === "transparent"
@@ -966,7 +977,7 @@ const _generateElementShape = (
       const shapes: ElementShapes[typeof element.type] = [];
 
       // (1) background fill (rc shape), optional
-      if (isPathALoop(element.points)) {
+      if (isLoopFreeDrawElement(element)) {
         // generate rough polygon to fill freedraw shape
         const simplifiedPoints = simplify(
           element.points as Mutable<LocalPoint[]>,
@@ -1173,6 +1184,13 @@ export const toggleLinePolygonState = (
 
 // NOTE not cached (-> for SVG export)
 const getFreeDrawSvgPath = (element: ExcalidrawFreeDrawElement) => {
+  if (element.strokeShape === "fixed") {
+    return getSvgPathFromFixedFreeDrawPoints(
+      getRenderableFixedFreeDrawPoints(element),
+      element.strokeWidth,
+    ) as SVGPathString;
+  }
+
   return getSvgPathFromStroke(
     getFreedrawOutlinePoints(element),
   ) as SVGPathString;
@@ -1181,34 +1199,243 @@ const getFreeDrawSvgPath = (element: ExcalidrawFreeDrawElement) => {
 export const getFreedrawOutlinePoints = (
   element: ExcalidrawFreeDrawElement,
 ) => {
+  const strokeShape = element.strokeShape ?? DEFAULT_FREE_DRAW_STROKE_SHAPE;
+  const isFixedStroke = strokeShape === "fixed";
   // If input points are empty (should they ever be?) return a dot
-  const inputPoints = element.simulatePressure
+  const inputPoints = isFixedStroke
+    ? element.points.length
+      ? element.points
+      : [[0, 0]]
+    : element.simulatePressure
     ? element.points
     : element.points.length
     ? element.points.map(([x, y], i) => [x, y, element.pressures[i]])
     : [[0, 0, 0.5]];
 
   return getStroke(inputPoints as number[][], {
-    simulatePressure: element.simulatePressure,
+    simulatePressure: isFixedStroke ? false : element.simulatePressure,
-    size: element.strokeWidth * 4.25,
+    size: isFixedStroke ? element.strokeWidth : element.strokeWidth * 4.25,
-    thinning: 0.6,
+    thinning: isFixedStroke ? 0 : 0.6,
     smoothing: 0.5,
     streamline: 0.5,
-    easing: (t) => Math.sin((t * Math.PI) / 2), // https://easings.net/#easeOutSine
+    easing: isFixedStroke ? (t) => t : (t) => Math.sin((t * Math.PI) / 2), // https://easings.net/#easeOutSine
     last: true,
   }) as [number, number][];
 };
 
-const med = (A: number[], B: number[]) => {
+const med = (A: readonly number[], B: readonly number[]) => {
   return [(A[0] + B[0]) / 2, (A[1] + B[1]) / 2];
 };
 
+const roundPoint = (point: readonly number[]) =>
+  `${round(point[0], 2)},${round(point[1], 2)} `;
+
+const averagePoint = (A: readonly number[], B: readonly number[]) =>
+  `${round((A[0] + B[0]) / 2, 2)},${round((A[1] + B[1]) / 2, 2)} `;
+
+const getReadonlyPointDistance = (
+  pointA: readonly number[],
+  pointB: readonly number[],
+) => Math.hypot(pointA[0] - pointB[0], pointA[1] - pointB[1]);
+
 // Trim SVG path data so number are each two decimal points. This
 // improves SVG exports, and prevents rendering errors on points
 // with long decimals.
 const TO_FIXED_PRECISION = /(\s?[A-Z]?,?-?[0-9]*\.[0-9]{0,2})(([0-9]|e|-)*)/g;
 
-const getSvgPathFromStroke = (points: number[][]): string => {
+const getSvgPathFromPoints = (
+  points: ReadonlyArray<readonly number[]>,
+  closed = false,
+): string => {
+  const len = points.length;
+
+  if (len < 2) {
+    return "";
+  }
+
+  const path = points
+    .slice(1)
+    .map((point) => `L${roundPoint(point)}`)
+    .join("");
+
+  return `M${roundPoint(points[0])}${path}${closed ? "Z" : ""}`;
+};
+
+const FIXED_FREEDRAW_MIN_SMOOTH_ALIGNMENT = 0.6;
+const FIXED_FREEDRAW_MIN_SMOOTH_SEGMENT_LENGTH = 0.2;
+const FIXED_FREEDRAW_MIN_CORNER_ALIGNMENT = -0.25;
+const FIXED_FREEDRAW_MIN_CORNER_ROUNDING = 0.75;
+const FIXED_FREEDRAW_MAX_CORNER_ROUNDING = 6;
+const FIXED_FREEDRAW_CORNER_ROUNDING_FACTOR = 0.35;
+const FIXED_FREEDRAW_CORNER_ROUNDING_WIDTH_FACTOR = 1.5;
+const FIXED_FREEDRAW_MIN_TERMINAL_STUB = 0.75;
+const FIXED_FREEDRAW_MAX_TERMINAL_STUB = 2.5;
+const FIXED_FREEDRAW_TERMINAL_STUB_WIDTH_FACTOR = 1.5;
+
+const shouldSmoothFixedFreeDrawPoint = (
+  previousPoint: readonly number[],
+  currentPoint: readonly number[],
+  nextPoint: readonly number[],
+) => {
+  const previousDeltaX = currentPoint[0] - previousPoint[0];
+  const previousDeltaY = currentPoint[1] - previousPoint[1];
+  const nextDeltaX = nextPoint[0] - currentPoint[0];
+  const nextDeltaY = nextPoint[1] - currentPoint[1];
+  const previousSegmentLength = Math.hypot(previousDeltaX, previousDeltaY);
+  const nextSegmentLength = Math.hypot(nextDeltaX, nextDeltaY);
+
+  if (
+    previousSegmentLength < FIXED_FREEDRAW_MIN_SMOOTH_SEGMENT_LENGTH ||
+    nextSegmentLength < FIXED_FREEDRAW_MIN_SMOOTH_SEGMENT_LENGTH
+  ) {
+    return false;
+  }
+
+  const alignment =
+    (previousDeltaX * nextDeltaX + previousDeltaY * nextDeltaY) /
+    (previousSegmentLength * nextSegmentLength);
+
+  return alignment >= FIXED_FREEDRAW_MIN_SMOOTH_ALIGNMENT;
+};
+
+const getFixedFreeDrawRoundedCorner = (
+  previousPoint: readonly number[],
+  currentPoint: readonly number[],
+  nextPoint: readonly number[],
+  strokeWidth: number,
+) => {
+  const previousDeltaX = currentPoint[0] - previousPoint[0];
+  const previousDeltaY = currentPoint[1] - previousPoint[1];
+  const nextDeltaX = nextPoint[0] - currentPoint[0];
+  const nextDeltaY = nextPoint[1] - currentPoint[1];
+  const previousSegmentLength = Math.hypot(previousDeltaX, previousDeltaY);
+  const nextSegmentLength = Math.hypot(nextDeltaX, nextDeltaY);
+
+  if (!previousSegmentLength || !nextSegmentLength) {
+    return null;
+  }
+
+  const alignment =
+    (previousDeltaX * nextDeltaX + previousDeltaY * nextDeltaY) /
+    (previousSegmentLength * nextSegmentLength);
+
+  if (
+    alignment >= FIXED_FREEDRAW_MIN_SMOOTH_ALIGNMENT ||
+    alignment <= FIXED_FREEDRAW_MIN_CORNER_ALIGNMENT
+  ) {
+    return null;
+  }
+
+  const cornerRounding = Math.min(
+    Math.max(
+      strokeWidth * FIXED_FREEDRAW_CORNER_ROUNDING_WIDTH_FACTOR,
+      FIXED_FREEDRAW_MIN_CORNER_ROUNDING,
+    ),
+    previousSegmentLength * FIXED_FREEDRAW_CORNER_ROUNDING_FACTOR,
+    nextSegmentLength * FIXED_FREEDRAW_CORNER_ROUNDING_FACTOR,
+    FIXED_FREEDRAW_MAX_CORNER_ROUNDING,
+  );
+
+  if (!cornerRounding) {
+    return null;
+  }
+
+  return {
+    entryPoint: [
+      currentPoint[0] - (previousDeltaX / previousSegmentLength) * cornerRounding,
+      currentPoint[1] - (previousDeltaY / previousSegmentLength) * cornerRounding,
+    ] as const,
+    exitPoint: [
+      currentPoint[0] + (nextDeltaX / nextSegmentLength) * cornerRounding,
+      currentPoint[1] + (nextDeltaY / nextSegmentLength) * cornerRounding,
+    ] as const,
+  };
+};
+
+const getFixedFreeDrawTerminalStubThreshold = (strokeWidth: number) =>
+  Math.min(
+    Math.max(
+      strokeWidth * FIXED_FREEDRAW_TERMINAL_STUB_WIDTH_FACTOR,
+      FIXED_FREEDRAW_MIN_TERMINAL_STUB,
+    ),
+    FIXED_FREEDRAW_MAX_TERMINAL_STUB,
+  );
+
+const getSvgPathFromFixedFreeDrawPoints = (
+  points: ReadonlyArray<readonly number[]>,
+  strokeWidth: number,
+): string => {
+  const len = points.length;
+
+  if (len < 2) {
+    return "";
+  }
+
+  if (len === 2) {
+    return `M${roundPoint(points[0])}L${roundPoint(points[1])}`;
+  }
+
+  let path = `M${roundPoint(points[0])}`;
+  const lastPoint = points[len - 1];
+  let endsAtLastPoint = false;
+
+  for (let index = 1; index < len - 1; index++) {
+    const previousPoint = points[index - 1];
+    const currentPoint = points[index];
+    const nextPoint = points[index + 1];
+    const isLastCurveSegment = index === len - 2;
+    const terminalStubThreshold = getFixedFreeDrawTerminalStubThreshold(
+      strokeWidth,
+    );
+    const shouldSmooth = shouldSmoothFixedFreeDrawPoint(
+      previousPoint,
+      currentPoint,
+      nextPoint,
+    );
+    const roundedCorner = shouldSmooth
+      ? null
+      : getFixedFreeDrawRoundedCorner(
+          previousPoint,
+          currentPoint,
+          nextPoint,
+          strokeWidth,
+        );
+    const shouldCollapseSmoothTerminalStub =
+      isLastCurveSegment &&
+      shouldSmooth &&
+      getReadonlyPointDistance(currentPoint, nextPoint) / 2 <=
+        terminalStubThreshold;
+    const shouldCollapseRoundedTerminalStub =
+      isLastCurveSegment &&
+      !!roundedCorner &&
+      getReadonlyPointDistance(roundedCorner.exitPoint, lastPoint) <=
+        terminalStubThreshold;
+
+    path += shouldSmooth
+      ? `Q${roundPoint(currentPoint)}${
+          shouldCollapseSmoothTerminalStub
+            ? roundPoint(lastPoint)
+            : averagePoint(currentPoint, nextPoint)
+        }`
+      : roundedCorner
+        ? `L${roundPoint(roundedCorner.entryPoint)}Q${roundPoint(
+            currentPoint,
+          )}${
+            shouldCollapseRoundedTerminalStub
+              ? roundPoint(lastPoint)
+              : roundPoint(roundedCorner.exitPoint)
+          }`
+        : `L${roundPoint(currentPoint)}`;
+    endsAtLastPoint =
+      shouldCollapseSmoothTerminalStub || shouldCollapseRoundedTerminalStub;
+  }
+
+  return endsAtLastPoint ? path : `${path}L${roundPoint(lastPoint)}`;
+};
+
+const getSvgPathFromStroke = (
+  points: ReadonlyArray<readonly number[]>,
+): string => {
   if (!points.length) {
     return "";
   }

packages/element/src/sortElements.ts

@@ -1,56 +1,59 @@
-import { arrayToMap } from "@excalidraw/common";
+import { arrayToMapWithIndex } from "@excalidraw/common";
 
 import type { ExcalidrawElement } from "./types";
 
-const defragmentGroups = (elements: readonly ExcalidrawElement[]) => {
+const normalizeGroupElementOrder = (elements: readonly ExcalidrawElement[]) => {
-  const groupIdAtLevel = (element: ExcalidrawElement, level: number) => {
+  const origElements: ExcalidrawElement[] = elements.slice();
-    return element.groupIds[element.groupIds.length - level - 1];
+  const sortedElements = new Set<ExcalidrawElement>();
-  };
 
-  const orderLevel = (
+  const orderInnerGroups = (
-    levelElements: readonly ExcalidrawElement[],
+    elements: readonly ExcalidrawElement[],
-    level: number,
   ): ExcalidrawElement[] => {
-    const buckets = new Map<string, ExcalidrawElement[]>();
+    const firstGroupSig = elements[0]?.groupIds?.join("");
-    // Slots preserve first-occurrence order: a groupId reserves its slot
+    const aGroup: ExcalidrawElement[] = [elements[0]];
-    // the first time one of its members is seen; loose elements occupy
+    const bGroup: ExcalidrawElement[] = [];
-    // their own slot. Groups are then expanded (and recursed into) in place.
+    for (const element of elements.slice(1)) {
-    const slots: (ExcalidrawElement | string)[] = [];
+      if (element.groupIds?.join("") === firstGroupSig) {
-
+        aGroup.push(element);
-    for (const element of levelElements) {
+      } else {
-      const groupId = groupIdAtLevel(element, level);
+        bGroup.push(element);
-      if (groupId === undefined) {
-        slots.push(element);
-        continue;
       }
-      let bucket = buckets.get(groupId);
-      if (!bucket) {
-        bucket = [];
-        buckets.set(groupId, bucket);
-        slots.push(groupId);
-      }
-      bucket.push(element);
     }
-
+    return bGroup.length ? [...aGroup, ...orderInnerGroups(bGroup)] : aGroup;
-    return slots.flatMap((slot) =>
-      typeof slot === "string"
-        ? orderLevel(buckets.get(slot)!, level + 1)
-        : [slot],
-    );
   };
 
-  // `groupIds` is stored innermost-first, so the outermost group is the
+  const groupHandledElements = new Map<string, true>();
-  // last entry. We recurse from level 0 (outermost) inward.
+
-  const sortedElements = orderLevel(elements, 0);
+  origElements.forEach((element, idx) => {
+    if (groupHandledElements.has(element.id)) {
+      return;
+    }
+    if (element.groupIds?.length) {
+      const topGroup = element.groupIds[element.groupIds.length - 1];
+      const groupElements = origElements.slice(idx).filter((element) => {
+        const ret = element?.groupIds?.some((id) => id === topGroup);
+        if (ret) {
+          groupHandledElements.set(element!.id, true);
+        }
+        return ret;
+      });
+
+      for (const elem of orderInnerGroups(groupElements)) {
+        sortedElements.add(elem);
+      }
+    } else {
+      sortedElements.add(element);
+    }
+  });
 
   // if there's a bug which resulted in losing some of the elements, return
   // original instead as that's better than losing data
-  if (sortedElements.length !== elements.length) {
+  if (sortedElements.size !== elements.length) {
-    console.error("defragmentGroups: lost some elements... bailing!");
+    console.error("normalizeGroupElementOrder: lost some elements... bailing!");
     return elements;
   }
 
-  return sortedElements;
+  return [...sortedElements];
 };
 
 /**
@@ -65,40 +68,39 @@ const defragmentGroups = (elements: readonly ExcalidrawElement[]) => {
 const normalizeBoundElementsOrder = (
   elements: readonly ExcalidrawElement[],
 ) => {
-  const elementsMap = arrayToMap(elements);
+  const elementsMap = arrayToMapWithIndex(elements);
 
+  const origElements: (ExcalidrawElement | null)[] = elements.slice();
   const sortedElements = new Set<ExcalidrawElement>();
 
-  for (const element of elements) {
+  origElements.forEach((element, idx) => {
-    if (sortedElements.has(element)) {
+    if (!element) {
-      continue;
+      return;
     }
-
     if (element.boundElements?.length) {
       sortedElements.add(element);
-      for (const boundElement of element.boundElements) {
+      origElements[idx] = null;
+      element.boundElements.forEach((boundElement) => {
         const child = elementsMap.get(boundElement.id);
         if (child && boundElement.type === "text") {
-          sortedElements.add(child);
+          sortedElements.add(child[0]);
+          origElements[child[1]] = null;
         }
+      });
+    } else if (element.type === "text" && element.containerId) {
+      const parent = elementsMap.get(element.containerId);
+      if (!parent?.[0].boundElements?.find((x) => x.id === element.id)) {
+        sortedElements.add(element);
+        origElements[idx] = null;
+
+        // if element has a container and container lists it, skip this element
+        // as it'll be taken care of by the container
       }
-      continue;
+    } else {
+      sortedElements.add(element);
+      origElements[idx] = null;
     }
-
+  });
-    // if element has a container and container lists it, skip this element
-    // as it'll be taken care of by the container
-    if (
-      element.type === "text" &&
-      element.containerId &&
-      elementsMap
-        .get(element.containerId)
-        ?.boundElements?.some((el) => el.id === element.id)
-    ) {
-      continue;
-    }
-
-    sortedElements.add(element);
-  }
 
   // if there's a bug which resulted in losing some of the elements, return
   // original instead as that's better than losing data
@@ -115,5 +117,5 @@ const normalizeBoundElementsOrder = (
 export const normalizeElementOrder = (
   elements: readonly ExcalidrawElement[],
 ) => {
-  return normalizeBoundElementsOrder(defragmentGroups(elements));
+  return normalizeBoundElementsOrder(normalizeGroupElementOrder(elements));
 };

packages/element/src/transform.ts

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

packages/element/src/typeChecks.ts

@@ -392,23 +392,3 @@ export const canBecomePolygon = (
     (points.length === 3 && !pointsEqual(points[0], points[points.length - 1]))
   );
 };
-
-export const isEligibleFrameChildType = (type: ElementOrToolType) => {
-  switch (type) {
-    case "rectangle":
-    case "diamond":
-    case "ellipse":
-    case "arrow":
-    case "line":
-    case "freedraw":
-    case "text":
-    case "image":
-    case "frame":
-    case "embeddable": {
-      return true;
-    }
-    default: {
-      return false;
-    }
-  }
-};

packages/element/src/types.ts

@@ -26,6 +26,7 @@ export type PointerType = "mouse" | "pen" | "touch";
 export type StrokeRoundness = "round" | "sharp";
 export type RoundnessType = ValueOf<typeof ROUNDNESS>;
 export type StrokeStyle = "solid" | "dashed" | "dotted";
+export type FreeDrawStrokeShape = "variable" | "fixed";
 export type TextAlign = typeof TEXT_ALIGN[keyof typeof TEXT_ALIGN];
 
 type VerticalAlignKeys = keyof typeof VERTICAL_ALIGN;
@@ -390,6 +391,7 @@ export type ExcalidrawFreeDrawElement = _ExcalidrawElementBase &
     points: readonly LocalPoint[];
     pressures: readonly number[];
     simulatePressure: boolean;
+    strokeShape?: FreeDrawStrokeShape;
   }>;
 
 export type FileId = string & { _brand: "FileId" };

packages/element/src/utils.ts

@@ -8,7 +8,6 @@ import {
 
 import {
   bezierEquation,
-  clamp,
   curve,
   curveCatmullRomCubicApproxPoints,
   curveOffsetPoints,
@@ -27,7 +26,7 @@ import {
   type GlobalPoint,
 } from "@excalidraw/math";
 
-import type { Curve, LineSegment, LocalPoint, Radians } from "@excalidraw/math";
+import type { Curve, LineSegment, LocalPoint } from "@excalidraw/math";
 
 import type {
   AppState,
@@ -42,7 +41,7 @@ import { generateLinearCollisionShape } from "./shape";
 import { hitElementItself, isPointInElement } from "./collision";
 import { LinearElementEditor } from "./linearElementEditor";
 import { isRectangularElement } from "./typeChecks";
-import { getBindingGap, maxBindingDistance_simple } from "./binding";
+import { maxBindingDistance_simple } from "./binding";
 
 import {
   getGlobalFixedPointForBindableElement,
@@ -588,193 +587,67 @@ const getDiagonalsForBindableElement = (
   return [diagonalOne, diagonalTwo];
 };
 
-const getSnappedMidpointIndexForElbowArrow = (
+export const getSnapOutlineMidPoint = (
-  element: ExcalidrawBindableElement,
   point: GlobalPoint,
-  center: GlobalPoint,
-  horizontalThreshold: number,
-  verticalThreshold: number,
-) => {
-  const { x, y, width, height, angle } = element;
-  const nonRotated = pointRotateRads(point, center, -angle as Radians);
-
-  const bindingGap = getBindingGap(element);
-
-  if (pointDistance(center, nonRotated) < bindingGap) {
-    return -1;
-  }
-
-  if (
-    nonRotated[0] <= x + width / 2 &&
-    nonRotated[1] > center[1] - verticalThreshold &&
-    nonRotated[1] < center[1] + verticalThreshold
-  ) {
-    return 2;
-  } else if (
-    nonRotated[1] <= y + height / 2 &&
-    nonRotated[0] > center[0] - horizontalThreshold &&
-    nonRotated[0] < center[0] + horizontalThreshold
-  ) {
-    return 3;
-  } else if (
-    nonRotated[0] >= x + width / 2 &&
-    nonRotated[1] > center[1] - verticalThreshold &&
-    nonRotated[1] < center[1] + verticalThreshold
-  ) {
-    return 0;
-  } else if (
-    nonRotated[1] >= y + height / 2 &&
-    nonRotated[0] > center[0] - horizontalThreshold &&
-    nonRotated[0] < center[0] + horizontalThreshold
-  ) {
-    return 1;
-  } else if (element.type === "diamond") {
-    const distance = bindingGap;
-    const topLeft = pointFrom<GlobalPoint>(
-      x + width / 4 - distance,
-      y + height / 4 - distance,
-    );
-    const topRight = pointFrom<GlobalPoint>(
-      x + (3 * width) / 4 + distance,
-      y + height / 4 - distance,
-    );
-    const bottomLeft = pointFrom<GlobalPoint>(
-      x + width / 4 - distance,
-      y + (3 * height) / 4 + distance,
-    );
-    const bottomRight = pointFrom<GlobalPoint>(
-      x + (3 * width) / 4 + distance,
-      y + (3 * height) / 4 + distance,
-    );
-
-    if (
-      pointDistance(bottomLeft, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
-    ) {
-      return 1;
-    }
-    if (
-      pointDistance(bottomRight, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
-    ) {
-      return 0;
-    }
-    if (
-      pointDistance(topLeft, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
-    ) {
-      return 2;
-    }
-    if (
-      pointDistance(topRight, nonRotated) <
-      Math.max(horizontalThreshold, verticalThreshold)
-    ) {
-      return 3;
-    }
-  }
-
-  return -1;
-};
-
-const getSnappedMidpointIndexForSimpleArrow = (
   element: ExcalidrawBindableElement,
-  point: GlobalPoint,
   elementsMap: ElementsMap,
-  horizontalThreshold: number,
+  zoom: AppState["zoom"],
-  verticalThreshold: number,
 ) => {
-  const baseMidpoints = getAllMidpoints(element, elementsMap);
+  const center = elementCenterPoint(element, elementsMap);
+  const sideMidpoints =
+    element.type === "diamond"
+      ? getDiamondBaseCorners(element).map((curve) => {
+          const point = bezierEquation(curve, 0.5);
+          const rotatedPoint = pointRotateRads(point, center, element.angle);
 
-  for (let i = 0; i < baseMidpoints.length; i++) {
+          return pointFrom<GlobalPoint>(rotatedPoint[0], rotatedPoint[1]);
-    const threshold = i % 2 === 0 ? horizontalThreshold : verticalThreshold;
+        })
-
+      : [
-    if (
+          // RIGHT midpoint
-      pointDistance(baseMidpoints[i], point) <= threshold &&
+          pointRotateRads(
+            pointFrom<GlobalPoint>(
+              element.x + element.width,
+              element.y + element.height / 2,
+            ),
+            center,
+            element.angle,
+          ),
+          // BOTTOM midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(
+              element.x + element.width / 2,
+              element.y + element.height,
+            ),
+            center,
+            element.angle,
+          ),
+          // LEFT midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x, element.y + element.height / 2),
+            center,
+            element.angle,
+          ),
+          // TOP midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x + element.width / 2, element.y),
+            center,
+            element.angle,
+          ),
+        ];
+  const candidate = sideMidpoints.find(
+    (midpoint) =>
+      pointDistance(point, midpoint) <=
+        maxBindingDistance_simple(zoom) + element.strokeWidth / 2 &&
       !hitElementItself({
         point,
         element,
         threshold: 0,
         elementsMap,
         overrideShouldTestInside: true,
-      })
+      }),
-    ) {
-      return i;
-    }
-  }
-
-  return -1;
-};
-
-export const getAllMidpoints = (
-  element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
-): GlobalPoint[] => {
-  const center = elementCenterPoint(element, elementsMap);
-
-  if (element.type === "diamond") {
-    return getDiamondBaseCorners(element).map((curve) =>
-      pointRotateRads(bezierEquation(curve, 0.5), center, element.angle),
-    );
-  }
-
-  return [
-    pointFrom(element.width, element.height / 2),
-    pointFrom(element.width / 2, element.height),
-    pointFrom(0, element.height / 2),
-    pointFrom(element.width / 2, 0),
-  ].map(([x, y]) =>
-    pointRotateRads(
-      pointFrom<GlobalPoint>(element.x + x, element.y + y),
-      center,
-      element.angle,
-    ),
   );
-};
 
-export const getSnapOutlineMidPoint = (
+  return candidate;
-  point: GlobalPoint,
-  element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
-  zoom: AppState["zoom"],
-  arrow: { elbowed: boolean },
-): GlobalPoint | undefined => {
-  const center = elementCenterPoint(element, elementsMap);
-  const baseMidpoints = getAllMidpoints(element, elementsMap);
-  const sideMidpoints =
-    element.type === "diamond"
-      ? baseMidpoints.map((midpoint) => {
-          return pointFrom<GlobalPoint>(
-            midpoint[0] + (midpoint[0] - center[0]) * 0.1,
-            midpoint[1] + (midpoint[1] - center[1]) * 0.1,
-          );
-        })
-      : baseMidpoints;
-
-  const TOLERANCE = 0.05;
-  const maxDistance = maxBindingDistance_simple(zoom) + element.strokeWidth / 2;
-  const verticalThreshold = clamp(TOLERANCE * element.height, 5, maxDistance);
-  const horizontalThreshold = clamp(TOLERANCE * element.width, 5, maxDistance);
-  const idx = arrow.elbowed
-    ? getSnappedMidpointIndexForElbowArrow(
-        element,
-        point,
-        center,
-        horizontalThreshold,
-        verticalThreshold,
-      )
-    : getSnappedMidpointIndexForSimpleArrow(
-        element,
-        point,
-        elementsMap,
-        horizontalThreshold,
-        verticalThreshold,
-      );
-
-  if (idx === -1) {
-    return undefined;
-  }
-
-  return sideMidpoints[idx];
 };
 
 export const projectFixedPointOntoDiagonal = (
@@ -787,6 +660,9 @@ export const projectFixedPointOntoDiagonal = (
   isMidpointSnappingEnabled: boolean = true,
 ): GlobalPoint | null => {
   invariant(arrow.points.length >= 2, "Arrow must have at least two points");
+  if (arrow.width < 3 && arrow.height < 3) {
+    return null;
+  }
 
   if (isMidpointSnappingEnabled) {
     const sideMidPoint = getSnapOutlineMidPoint(
@@ -794,7 +670,6 @@ export const projectFixedPointOntoDiagonal = (
       element,
       elementsMap,
       zoom,
-      arrow,
     );
     if (sideMidPoint) {
       return sideMidPoint;

packages/element/src/zindex.ts

@@ -8,6 +8,7 @@ import { getElementsInGroup } from "./groups";
 import { syncMovedIndices } from "./fractionalIndex";
 import { getSelectedElements } from "./selection";
 import { getBoundTextElement, getContainerElement } from "./textElement";
+import { getHoveredElementForBinding } from "./collision";
 
 import type { Scene } from "./Scene";
 import type {
@@ -155,8 +156,12 @@ export const moveArrowAboveBindable = (
   elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   elementsMap: NonDeletedSceneElementsMap,
   scene: Scene,
-  hoveredElement: NonDeletedExcalidrawElement,
+  hit?: NonDeletedExcalidrawElement,
 ): readonly OrderedExcalidrawElement[] => {
+  const hoveredElement = hit
+    ? hit
+    : getHoveredElementForBinding(point, elements, elementsMap);
+
   if (!hoveredElement) {
     return elements;
   }

packages/element/tests/bounds.test.ts

@@ -6,7 +6,11 @@ import type { LocalPoint } from "@excalidraw/math";
 
 import { getElementAbsoluteCoords, getElementBounds } from "../src/bounds";
 
-import type { ExcalidrawElement, ExcalidrawLinearElement } from "../src/types";
+import type {
+  ExcalidrawElement,
+  ExcalidrawFreeDrawElement,
+  ExcalidrawLinearElement,
+} from "../src/types";
 
 const _ce = ({
   x,
@@ -117,6 +121,31 @@ describe("getElementBounds", () => {
     expect(y2).toEqual(42.90569415042095);
   });
 
+  it("fixed freedraw", () => {
+    const element = {
+      ..._ce({
+        x: 40,
+        y: 30,
+        w: 10,
+        h: 0,
+        a: 0,
+        t: "freedraw",
+      }),
+      strokeWidth: 8,
+      points: [pointFrom<LocalPoint>(0, 0), pointFrom<LocalPoint>(10, 0)],
+      pressures: [],
+      simulatePressure: true,
+      strokeShape: "fixed",
+    } as unknown as ExcalidrawFreeDrawElement;
+
+    const [x1, y1, x2, y2] = getElementBounds(element, arrayToMap([element]));
+
+    expect(x1).toEqual(36);
+    expect(y1).toEqual(26);
+    expect(x2).toEqual(54);
+    expect(y2).toEqual(34);
+  });
+
   it("curved line", () => {
     const element = {
       ..._ce({

packages/element/tests/elbowArrow.test.tsx

@@ -16,7 +16,6 @@ import "@excalidraw/utils/test-utils";
 import { bindBindingElement } from "@excalidraw/element";
 
 import type { LocalPoint } from "@excalidraw/math";
-import type { Zoom } from "@excalidraw/excalidraw/types";
 
 import { Scene } from "../src/Scene";
 
@@ -188,12 +187,8 @@ describe("elbow arrow routing", () => {
     }) as ExcalidrawElbowArrowElement;
     API.setElements([rectangle1, rectangle2, arrow]);
 
-    bindBindingElement(arrow, rectangle1, "orbit", "start", h.scene, {
+    bindBindingElement(arrow, rectangle1, "orbit", "start", h.scene);
-      value: 1,
+    bindBindingElement(arrow, rectangle2, "orbit", "end", h.scene);
-    } as Zoom);
-    bindBindingElement(arrow, rectangle2, "orbit", "end", h.scene, {
-      value: 1,
-    } as Zoom);
 
     expect(arrow.startBinding).not.toBe(null);
     expect(arrow.endBinding).not.toBe(null);

packages/element/tests/fractionalIndex.test.ts

@@ -1,8 +1,9 @@
 /* eslint-disable no-lone-blocks */
+import { generateKeyBetween } from "fractional-indexing";
+
 import { arrayToMap } from "@excalidraw/common";
 
 import {
-  InvalidFractionalIndexError,
   syncInvalidIndices,
   syncMovedIndices,
   validateFractionalIndices,
@@ -12,34 +13,13 @@ import { deepCopyElement } from "@excalidraw/element";
 
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 
-import {
-  generateKeyBetween,
-  validateOrderKey,
-} from "@excalidraw/fractional-indexing";
-
 import type {
   ElementsMap,
   ExcalidrawElement,
   FractionalIndex,
 } from "@excalidraw/element/types";
 
-describe("fractional index format validation", () => {
+import { InvalidFractionalIndexError } from "../src/fractionalIndex";
-  it("should reject malformed base62 order keys", () => {
-    expect(() => validateOrderKey("a!")).toThrow();
-    expect(() => validateOrderKey("a_")).toThrow();
-    expect(() => validateOrderKey("a1!")).toThrow();
-    expect(() => validateOrderKey("a1_")).toThrow();
-    expect(() => validateOrderKey("zd0032")).toThrow();
-  });
-
-  it("should accept valid base62 order keys", () => {
-    expect(() => validateOrderKey("Zz")).not.toThrow();
-    expect(() => validateOrderKey("a0")).not.toThrow();
-    expect(() => validateOrderKey("a1")).not.toThrow();
-    expect(() => validateOrderKey("a1V")).not.toThrow();
-    expect(() => validateOrderKey("z".padEnd(28, "z"))).not.toThrow();
-  });
-});
 
 describe("sync invalid indices with array order", () => {
   describe("should NOT sync empty array", () => {
@@ -124,46 +104,6 @@ describe("sync invalid indices with array order", () => {
     });
   });
 
-  describe("should sync when fractional index is malformed", () => {
-    // "zd0032" has head "z" which requires length 28 per getIntegerLength,
-    // but the string is far too short, so validateOrderKey throws for it
-    testInvalidIndicesSync({
-      elements: [{ id: "A", index: "zd0032" }],
-      expect: {
-        unchangedElements: [],
-      },
-    });
-
-    testInvalidIndicesSync({
-      elements: [
-        { id: "A", index: "a1" },
-        { id: "B", index: "zd0032" },
-        { id: "C", index: "a3" },
-      ],
-      expect: {
-        unchangedElements: ["A", "C"],
-      },
-    });
-
-    testInvalidIndicesSync({
-      elements: [{ id: "A", index: "a!" }],
-      expect: {
-        unchangedElements: [],
-      },
-    });
-
-    testInvalidIndicesSync({
-      elements: [
-        { id: "A", index: "a1" },
-        { id: "B", index: "a!" },
-        { id: "C", index: "a2" },
-      ],
-      expect: {
-        unchangedElements: ["A", "C"],
-      },
-    });
-  });
-
   describe("should sync when fractional indices are duplicated", () => {
     testInvalidIndicesSync({
       elements: [

packages/element/tests/frame.test.tsx

@@ -2,24 +2,15 @@ import {
   convertToExcalidrawElements,
   Excalidraw,
 } from "@excalidraw/excalidraw";
-import { arrayToMap } from "@excalidraw/common";
 
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
-import { Keyboard, Pointer, UI } from "@excalidraw/excalidraw/tests/helpers/ui";
+import { Keyboard, Pointer } from "@excalidraw/excalidraw/tests/helpers/ui";
-import { getTextEditor } from "@excalidraw/excalidraw/tests/queries/dom";
 import {
   getCloneByOrigId,
   render,
 } from "@excalidraw/excalidraw/tests/test-utils";
 
-import { getSelectedElements } from "@excalidraw/excalidraw/scene";
+import type { ExcalidrawElement } from "../src/types";
-
-import { elementOverlapsWithFrame } from "../src/frame";
-
-import type {
-  ExcalidrawElement,
-  ExcalidrawFrameLikeElement,
-} from "../src/types";
 
 const { h } = window;
 const mouse = new Pointer("mouse");
@@ -134,250 +125,6 @@ describe("adding elements to frames", () => {
     });
   });
 
-  it("should treat an element fully containing a frame as overlapping the frame", () => {
-    const containingRect = API.createElement({
-      type: "rectangle",
-      x: -50,
-      y: -50,
-      width: 250,
-      height: 250,
-    });
-
-    API.setElements([containingRect, frame]);
-
-    expect(
-      elementOverlapsWithFrame(
-        containingRect,
-        frame as ExcalidrawFrameLikeElement,
-        arrayToMap(h.elements),
-      ),
-    ).toBe(true);
-  });
-
-  it("should not add a newly created element to a frame behind a non-frame element", () => {
-    const cover = API.createElement({
-      id: "cover",
-      type: "rectangle",
-      x: 10,
-      y: 10,
-      width: 80,
-      height: 80,
-      backgroundColor: "#ffc9c9",
-    });
-
-    API.setElements([frame, cover]);
-
-    UI.clickTool("rectangle");
-    mouse.downAt(20, 20);
-    mouse.moveTo(40, 40);
-    mouse.upAt(40, 40);
-
-    const createdElement = h.elements.find(
-      (element) => element.id !== frame.id && element.id !== cover.id,
-    );
-
-    expect(createdElement?.frameId).toBe(null);
-    expect(h.elements.map((element) => element.id)).toEqual([
-      frame.id,
-      cover.id,
-      createdElement?.id,
-    ]);
-  });
-
-  it("should add a newly created element to a frame over a non-frame element", () => {
-    const cover = API.createElement({
-      id: "cover",
-      type: "rectangle",
-      x: 10,
-      y: 10,
-      width: 80,
-      height: 80,
-      backgroundColor: "#ffc9c9",
-    });
-
-    API.setElements([cover, frame]);
-
-    UI.clickTool("rectangle");
-    mouse.downAt(20, 20);
-    mouse.moveTo(40, 40);
-    mouse.upAt(40, 40);
-
-    const createdElement = h.elements.find(
-      (element) => element.id !== frame.id && element.id !== cover.id,
-    );
-
-    expect(createdElement?.frameId).toBe(frame.id);
-  });
-
-  it("should highlight the target frame while creating a new element", () => {
-    API.setElements([frame]);
-
-    UI.clickTool("rectangle");
-    mouse.downAt(20, 20);
-    mouse.moveTo(40, 40);
-
-    expect(h.state.frameToHighlight?.id).toBe(frame.id);
-
-    mouse.upAt(40, 40);
-
-    expect(h.state.frameToHighlight).toBe(null);
-  });
-
-  it("should highlight the target frame while hovering with a creation tool", () => {
-    API.setElements([frame]);
-
-    UI.clickTool("rectangle");
-    mouse.moveTo(20, 20);
-
-    expect(h.state.frameToHighlight?.id).toBe(frame.id);
-
-    mouse.moveTo(200, 200);
-
-    expect(h.state.frameToHighlight).toBe(null);
-  });
-
-  it("should not add grid-snapped text outside the frame to the clicked frame", async () => {
-    const offsetFrame = API.createElement({
-      id: "offsetFrame",
-      type: "frame",
-      x: 10,
-      y: 0,
-      width: 150,
-      height: 150,
-    });
-
-    API.setElements([offsetFrame]);
-    API.setAppState({
-      gridModeEnabled: true,
-    });
-
-    UI.clickTool("text");
-    mouse.clickAt(12, 0);
-
-    await getTextEditor();
-
-    const createdText = h.elements.find(
-      (element) => element.id !== offsetFrame.id,
-    );
-
-    expect(createdText?.x).toBe(0);
-    expect(createdText?.y).toBe(0);
-    expect(createdText?.frameId).toBe(null);
-  });
-
-  it("should add a newly created element to a frame behind another frame", () => {
-    const lockedFrame = API.createElement({
-      id: "lockedFrame",
-      type: "frame",
-      x: 10,
-      y: 10,
-      width: 80,
-      height: 80,
-      locked: true,
-    });
-
-    API.setElements([frame, lockedFrame]);
-
-    UI.clickTool("rectangle");
-    mouse.downAt(20, 20);
-    mouse.moveTo(40, 40);
-    mouse.upAt(40, 40);
-
-    const createdElement = h.elements.find(
-      (element) => element.id !== frame.id && element.id !== lockedFrame.id,
-    );
-
-    expect(createdElement?.frameId).toBe(frame.id);
-  });
-
-  it("should insert a newly created frame child just below its frame", () => {
-    const frameChildUnderCursor = API.createElement({
-      id: "frameChildUnderCursor",
-      type: "rectangle",
-      x: 10,
-      y: 10,
-      width: 80,
-      height: 80,
-      backgroundColor: "#ffc9c9",
-      frameId: frame.id,
-    });
-    const otherFrameChild = API.createElement({
-      id: "otherFrameChild",
-      type: "rectangle",
-      x: 100,
-      y: 20,
-      width: 20,
-      height: 20,
-      frameId: frame.id,
-    });
-
-    API.setElements([frameChildUnderCursor, otherFrameChild, frame]);
-
-    UI.clickTool("rectangle");
-    mouse.downAt(20, 20);
-    mouse.moveTo(40, 40);
-    mouse.upAt(40, 40);
-
-    const createdElement = h.elements.find(
-      (element) =>
-        element.id !== frame.id &&
-        element.id !== frameChildUnderCursor.id &&
-        element.id !== otherFrameChild.id,
-    );
-
-    expect(createdElement?.frameId).toBe(frame.id);
-    expect(h.elements.map((element) => element.id)).toEqual([
-      frameChildUnderCursor.id,
-      otherFrameChild.id,
-      createdElement?.id,
-      frame.id,
-    ]);
-  });
-
-  it("should insert a newly created frame child above the highest frame child", () => {
-    const frameChildUnderCursor = API.createElement({
-      id: "frameChildUnderCursor",
-      type: "rectangle",
-      x: 10,
-      y: 10,
-      width: 80,
-      height: 80,
-      backgroundColor: "#ffc9c9",
-      frameId: frame.id,
-    });
-    const otherFrameChild = API.createElement({
-      id: "otherFrameChild",
-      type: "rectangle",
-      x: 100,
-      y: 20,
-      width: 20,
-      height: 20,
-      frameId: frame.id,
-    });
-
-    API.setElements([frame, frameChildUnderCursor, otherFrameChild]);
-
-    UI.clickTool("rectangle");
-    mouse.downAt(20, 20);
-    mouse.moveTo(40, 40);
-    mouse.upAt(40, 40);
-
-    const createdElement = h.elements.find(
-      (element) =>
-        element.id !== frame.id &&
-        element.id !== frameChildUnderCursor.id &&
-        element.id !== otherFrameChild.id,
-    );
-
-    expect(createdElement?.frameId).toBe(frame.id);
-    expect(h.elements.map((element) => element.id)).toEqual([
-      frame.id,
-      frameChildUnderCursor.id,
-      otherFrameChild.id,
-      createdElement?.id,
-    ]);
-  });
-
   const commonTestCases = async (
     func: typeof resizeFrameOverElement | typeof dragElementIntoFrame,
   ) => {
@@ -668,345 +415,6 @@ describe("adding elements to frames", () => {
   describe("dragging elements into the frame", async () => {
     await commonTestCases(dragElementIntoFrame);
 
-    it("should add a dragged element fully containing the frame", () => {
-      const containingRect = API.createElement({
-        type: "rectangle",
-        x: 220,
-        y: 20,
-        width: 300,
-        height: 300,
-      });
-
-      API.setElements([frame, containingRect]);
-
-      dragElementIntoFrame(frame, containingRect);
-
-      expect(API.getElement(containingRect).frameId).toBe(frame.id);
-    });
-
-    it("should drag an element into a frame", () => {
-      API.setElements([rect2, frame]);
-
-      dragElementIntoFrame(frame, rect2);
-
-      expect(rect2.frameId).toBe(frame.id);
-    });
-
-    it("should layer a dragged element above the highest frame child", () => {
-      const frameChild = API.createElement({
-        id: "frameChild",
-        type: "rectangle",
-        x: 10,
-        y: 10,
-        width: 20,
-        height: 20,
-        frameId: frame.id,
-      });
-
-      API.setElements([frame, frameChild, rect2]);
-
-      dragElementIntoFrame(frame, rect2);
-
-      expect(rect2.frameId).toBe(frame.id);
-      expect(h.elements.map((element) => element.id)).toEqual([
-        frame.id,
-        frameChild.id,
-        rect2.id,
-      ]);
-      expect(rect2.index! > frameChild.index!).toBe(true);
-      expect(rect2.index! > frame.index!).toBe(true);
-    });
-
-    it("should preview a dragged element above the highest frame child before pointerup", () => {
-      const frameChild = API.createElement({
-        id: "frameChild",
-        type: "rectangle",
-        x: 10,
-        y: 10,
-        width: 20,
-        height: 20,
-        frameId: frame.id,
-      });
-
-      API.setElements([rect2, frame, frameChild]);
-      API.setSelectedElements([rect2]);
-      API.updateElement(rect2, {
-        x: 10,
-        y: 10,
-      });
-
-      const getRenderableElementIds = (
-        selectedElementsAreBeingDragged: boolean,
-      ) => {
-        return h.app.renderer
-          .getRenderableElements({
-            zoom: h.state.zoom,
-            offsetLeft: 0,
-            offsetTop: 0,
-            scrollX: 0,
-            scrollY: 0,
-            height: 1000,
-            width: 1000,
-            editingTextElement: h.state.editingTextElement,
-            newElement: h.state.newElement,
-            selectedElements: getSelectedElements(h.elements, h.state),
-            selectedElementsAreBeingDragged,
-            frameToHighlight: frame as ExcalidrawFrameLikeElement,
-          })
-          .visibleElements.map((element) => element.id);
-      };
-
-      expect(h.elements.map((element) => element.id)).toEqual([
-        rect2.id,
-        frame.id,
-        frameChild.id,
-      ]);
-      expect(getRenderableElementIds(false)).toEqual([
-        rect2.id,
-        frame.id,
-        frameChild.id,
-      ]);
-      expect(getRenderableElementIds(true)).toEqual([
-        frame.id,
-        frameChild.id,
-        rect2.id,
-      ]);
-      expect(h.elements.map((element) => element.id)).toEqual([
-        rect2.id,
-        frame.id,
-        frameChild.id,
-      ]);
-      expect(rect2.frameId).toBe(null);
-    });
-
-    it("should not preview reorder dragged elements already in the highlighted frame", () => {
-      const frameChild = API.createElement({
-        id: "frameChild",
-        type: "rectangle",
-        x: 10,
-        y: 10,
-        width: 20,
-        height: 20,
-        frameId: frame.id,
-      });
-      const otherFrameChild = API.createElement({
-        id: "otherFrameChild",
-        type: "rectangle",
-        x: 40,
-        y: 10,
-        width: 20,
-        height: 20,
-        frameId: frame.id,
-      });
-
-      API.setElements([frameChild, frame, otherFrameChild]);
-      API.setSelectedElements([frameChild]);
-
-      const renderableElementIds = h.app.renderer
-        .getRenderableElements({
-          zoom: h.state.zoom,
-          offsetLeft: 0,
-          offsetTop: 0,
-          scrollX: 0,
-          scrollY: 0,
-          height: 1000,
-          width: 1000,
-          editingTextElement: h.state.editingTextElement,
-          newElement: h.state.newElement,
-          selectedElements: getSelectedElements(h.elements, h.state),
-          selectedElementsAreBeingDragged: true,
-          frameToHighlight: frame as ExcalidrawFrameLikeElement,
-        })
-        .visibleElements.map((element) => element.id);
-
-      expect(renderableElementIds).toEqual([
-        frameChild.id,
-        frame.id,
-        otherFrameChild.id,
-      ]);
-    });
-
-    it("should put a dragged mixed selection above the highest frame child", () => {
-      const frameChild = API.createElement({
-        id: "frameChild",
-        type: "rectangle",
-        x: 50,
-        y: 10,
-        width: 20,
-        height: 20,
-        frameId: frame.id,
-        boundElements: [{ id: "boundText", type: "text" }],
-      });
-      const boundText = API.createElement({
-        id: "boundText",
-        type: "text",
-        x: 50,
-        y: 10,
-        width: 20,
-        height: 20,
-        containerId: frameChild.id,
-        frameId: frame.id,
-      });
-      const otherFrameChild = API.createElement({
-        id: "otherFrameChild",
-        type: "rectangle",
-        x: 80,
-        y: 10,
-        width: 20,
-        height: 20,
-        frameId: frame.id,
-      });
-      const nonFrameElement = API.createElement({
-        id: "nonFrameElement",
-        type: "rectangle",
-        x: 155,
-        y: 10,
-        width: 20,
-        height: 20,
-      });
-
-      API.setElements([
-        frame,
-        frameChild,
-        boundText,
-        otherFrameChild,
-        nonFrameElement,
-      ]);
-      API.setSelectedElements([frameChild, nonFrameElement]);
-
-      mouse.downAt(
-        nonFrameElement.x + nonFrameElement.width / 2,
-        nonFrameElement.y + nonFrameElement.height / 2,
-      );
-      mouse.moveTo(frame.x + frame.width - 5, nonFrameElement.y + 10);
-      mouse.up();
-
-      expect(frameChild.frameId).toBe(frame.id);
-      expect(boundText.frameId).toBe(frame.id);
-      expect(nonFrameElement.frameId).toBe(frame.id);
-      expect(h.elements.map((element) => element.id)).toEqual([
-        frame.id,
-        otherFrameChild.id,
-        frameChild.id,
-        boundText.id,
-        nonFrameElement.id,
-      ]);
-    });
-
-    it("should not reorder dragged elements already in the highlighted frame", () => {
-      const frameChild = API.createElement({
-        id: "frameChild",
-        type: "rectangle",
-        x: 50,
-        y: 10,
-        width: 20,
-        height: 20,
-        frameId: frame.id,
-      });
-      const otherFrameChild = API.createElement({
-        id: "otherFrameChild",
-        type: "rectangle",
-        x: 80,
-        y: 10,
-        width: 20,
-        height: 20,
-        frameId: frame.id,
-      });
-
-      API.setElements([frame, frameChild, otherFrameChild]);
-      API.setSelectedElements([frameChild]);
-
-      mouse.downAt(
-        frameChild.x + frameChild.width / 2,
-        frameChild.y + frameChild.height / 2,
-      );
-      mouse.moveTo(frameChild.x + frameChild.width / 2 + 5, frameChild.y + 10);
-      mouse.up();
-
-      expect(frameChild.frameId).toBe(frame.id);
-      expect(h.elements.map((element) => element.id)).toEqual([
-        frame.id,
-        frameChild.id,
-        otherFrameChild.id,
-      ]);
-    });
-
-    it("should not drag an element into a frame behind a non-frame element", () => {
-      const cover = API.createElement({
-        id: "cover",
-        type: "rectangle",
-        x: 10,
-        y: 10,
-        width: 80,
-        height: 80,
-        backgroundColor: "#ffc9c9",
-      });
-      API.setElements([frame, cover, rect2]);
-
-      mouse.clickAt(rect2.x, rect2.y);
-      mouse.downAt(rect2.x + rect2.width / 2, rect2.y + rect2.height / 2);
-      mouse.moveTo(20, 20);
-      mouse.upAt(20, 20);
-
-      expect(rect2.frameId).toBe(null);
-    });
-
-    it("should drag an element into a frame over a non-frame element", () => {
-      const cover = API.createElement({
-        id: "cover",
-        type: "rectangle",
-        x: 10,
-        y: 10,
-        width: 80,
-        height: 80,
-        backgroundColor: "#ffc9c9",
-      });
-      API.setElements([cover, rect2, frame]);
-
-      mouse.clickAt(rect2.x, rect2.y);
-      mouse.downAt(rect2.x + rect2.width / 2, rect2.y + rect2.height / 2);
-      mouse.moveTo(20, 20);
-      mouse.upAt(20, 20);
-
-      expect(rect2.frameId).toBe(frame.id);
-    });
-
-    it("should keep dragging a frame child over a non-frame element above its frame", () => {
-      const cover = API.createElement({
-        id: "cover",
-        type: "rectangle",
-        x: 10,
-        y: 10,
-        width: 80,
-        height: 80,
-        backgroundColor: "#ffc9c9",
-      });
-      const frameChild = API.createElement({
-        id: "frameChild",
-        type: "rectangle",
-        x: 100,
-        y: 20,
-        width: 20,
-        height: 20,
-        frameId: frame.id,
-      });
-
-      API.setElements([frameChild, frame, cover]);
-      API.setSelectedElements([frameChild]);
-
-      mouse.downAt(
-        frameChild.x + frameChild.width / 2,
-        frameChild.y + frameChild.height / 2,
-      );
-      mouse.moveTo(20, 20);
-
-      expect(h.state.frameToHighlight?.id).toBe(frame.id);
-
-      mouse.upAt(20, 20);
-
-      expect(frameChild.frameId).toBe(frame.id);
-    });
-
     it.skip("should drag element inside, duplicate it and keep it in frame", () => {
       API.setElements([frame, rect2]);
 

packages/element/tests/shape.test.ts

@@ -0,0 +1,160 @@
+import { pointFrom } from "@excalidraw/math";
+import { API } from "@excalidraw/excalidraw/tests/helpers/api";
+import { vi } from "vitest";
+
+vi.mock("perfect-freehand", () => ({
+  getStroke: vi.fn(() => []),
+}));
+
+import { getStroke } from "perfect-freehand";
+
+import { getFreedrawOutlinePoints, ShapeCache } from "../src/shape";
+
+describe("freedraw stroke shape", () => {
+  beforeEach(() => {
+    vi.mocked(getStroke).mockClear();
+    ShapeCache.destroy();
+  });
+
+  it("renders fixed strokes from the centerline path", () => {
+    const element = API.createElement({
+      type: "freedraw",
+      strokeShape: "fixed",
+      points: [pointFrom(0, 0), pointFrom(10, 10), pointFrom(20, 15)],
+    });
+
+    const shapes = ShapeCache.generateElementShape(element, null);
+
+    expect(shapes).toEqual([expect.any(String)]);
+    expect(shapes[0]).not.toContain("Z");
+    expect(vi.mocked(getStroke)).not.toHaveBeenCalled();
+  });
+
+  it("rounds fixed stroke corners without flattening them", () => {
+    const element = API.createElement({
+      type: "freedraw",
+      strokeShape: "fixed",
+      strokeWidth: 1,
+      points: [pointFrom(0, 0), pointFrom(10, 0), pointFrom(10, 10)],
+    });
+
+    const [path] = ShapeCache.generateElementShape(element, null);
+
+    expect(path).toBe("M0,0 L8.5,0 Q10,0 10,1.5 L10,10 ");
+  });
+
+  it("does not round fixed stroke hairpin turns", () => {
+    const element = API.createElement({
+      type: "freedraw",
+      strokeShape: "fixed",
+      strokeWidth: 1,
+      points: [pointFrom(0, 0), pointFrom(10, 0), pointFrom(9, 1)],
+    });
+
+    const [path] = ShapeCache.generateElementShape(element, null);
+
+    expect(path).toBe("M0,0 L10,0 L9,1 ");
+  });
+
+  it("curves directly to the endpoint for tiny final smooth segments", () => {
+    const element = API.createElement({
+      type: "freedraw",
+      strokeShape: "fixed",
+      strokeWidth: 1,
+      points: [pointFrom(0, 0), pointFrom(0.5, 0.1), pointFrom(0.8, 0.3)],
+    });
+
+    const [path] = ShapeCache.generateElementShape(element, null);
+
+    expect(path).toBe("M0,0 Q0.5,0.1 0.8,0.3 ");
+  });
+
+  it("curves directly to the endpoint for tiny final rounded corners", () => {
+    const element = API.createElement({
+      type: "freedraw",
+      strokeShape: "fixed",
+      strokeWidth: 1,
+      points: [pointFrom(0, 0), pointFrom(10, 0), pointFrom(10, 1)],
+    });
+
+    const [path] = ShapeCache.generateElementShape(element, null);
+
+    expect(path).toBe("M0,0 L9.65,0 Q10,0 10,1 ");
+  });
+
+  it("smooths dense fixed stroke points without dropping them", () => {
+    const element = API.createElement({
+      type: "freedraw",
+      strokeShape: "fixed",
+      points: [
+        pointFrom(0, 0),
+        pointFrom(0.3, 0.1),
+        pointFrom(0.6, 0.35),
+        pointFrom(1, 0.9),
+      ],
+    });
+
+    const [path] = ShapeCache.generateElementShape(element, null);
+
+    expect(path).toContain("Q0.3,0.1 ");
+    expect(path).toContain("Q0.6,0.35 ");
+  });
+
+  it("drops synthetic loop closure for fixed strokes", () => {
+    const element = API.createElement({
+      type: "freedraw",
+      strokeShape: "fixed",
+      points: [pointFrom(0, 0), pointFrom(10, 0), pointFrom(0, 0)],
+    });
+
+    const [path] = ShapeCache.generateElementShape(element, null);
+
+    expect(path).toBe("M0,0 L10,0 ");
+  });
+
+  it("uses fixed perfect-freehand settings for fixed strokes", () => {
+    const element = API.createElement({
+      type: "freedraw",
+      strokeShape: "fixed",
+      strokeWidth: 8,
+      points: [pointFrom(0, 0), pointFrom(10, 10), pointFrom(20, 15)],
+    });
+
+    getFreedrawOutlinePoints(element);
+
+    expect(vi.mocked(getStroke)).toHaveBeenCalledWith(
+      element.points,
+      expect.objectContaining({
+        simulatePressure: false,
+        size: element.strokeWidth,
+        thinning: 0,
+      }),
+    );
+  });
+
+  it("keeps pressure-aware perfect-freehand settings for variable strokes", () => {
+    const element = API.createElement({
+      type: "freedraw",
+      points: [pointFrom(0, 0), pointFrom(10, 10), pointFrom(20, 15)],
+    });
+
+    getFreedrawOutlinePoints({
+      ...element,
+      simulatePressure: false,
+      pressures: [0.2, 0.8, 0.4],
+    });
+
+    expect(vi.mocked(getStroke)).toHaveBeenCalledWith(
+      [
+        [0, 0, 0.2],
+        [10, 10, 0.8],
+        [20, 15, 0.4],
+      ],
+      expect.objectContaining({
+        simulatePressure: false,
+        size: element.strokeWidth * 4.25,
+        thinning: 0.6,
+      }),
+    );
+  });
+});

packages/element/tests/sortElements.test.ts

@@ -326,59 +326,19 @@ describe("normalizeElementsOrder", () => {
       ]),
       [
         "BA_rect1",
-        "CBA_rect3",
-        "CBA_rect7",
         "BA_rect5",
         "BA_rect6",
         "A_rect2",
         "A_rect5",
+        "CBA_rect3",
+        "CBA_rect7",
         "rect4",
         "X_rect8",
-        "YX_rect10",
         "X_rect11",
+        "YX_rect10",
         "rect9",
       ],
     );
-    assertOrder(
-      normalizeElementOrder([
-        API.createElement({
-          id: "A_rect1",
-          type: "rectangle",
-          groupIds: ["A"],
-        }),
-        API.createElement({
-          id: "CBA_rect2",
-          type: "rectangle",
-          groupIds: ["C", "B", "A"],
-        }),
-        API.createElement({
-          id: "A_rect3",
-          type: "rectangle",
-          groupIds: ["A"],
-        }),
-      ]),
-      ["A_rect1", "CBA_rect2", "A_rect3"],
-    );
-    assertOrder(
-      normalizeElementOrder([
-        API.createElement({
-          id: "abcT_rect1",
-          type: "rectangle",
-          groupIds: ["ab", "c", "T"],
-        }),
-        API.createElement({
-          id: "abcT_rect2",
-          type: "rectangle",
-          groupIds: ["a", "bc", "T"],
-        }),
-        API.createElement({
-          id: "abcT_rect3",
-          type: "rectangle",
-          groupIds: ["ab", "c", "T"],
-        }),
-      ]),
-      ["abcT_rect1", "abcT_rect3", "abcT_rect2"],
-    );
   });
 
   // TODO

packages/excalidraw/actions/actionDeselect.ts

@@ -101,7 +101,6 @@ export const actionDeselect = register({
           selectionElement: null,
           showHyperlinkPopup: false,
           suggestedBinding: null,
-          frameToHighlight: null,
         },
         captureUpdate: CaptureUpdateAction.IMMEDIATELY,
       };
@@ -119,7 +118,6 @@ export const actionDeselect = register({
         selectionElement: null,
         showHyperlinkPopup: false,
         suggestedBinding: null,
-        frameToHighlight: null,
       },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };

packages/excalidraw/actions/actionFinalize.tsx

@@ -2,6 +2,7 @@ import { pointFrom } from "@excalidraw/math";
 
 import { bindOrUnbindBindingElement } from "@excalidraw/element/binding";
 import {
+  isLoopFreeDrawElement,
   isValidPolygon,
   LinearElementEditor,
   newElementWith,
@@ -242,7 +243,11 @@ export const actionFinalize = register<FormData>({
         // If the multi point line closes the loop,
         // set the last point to first point.
         // This ensures that loop remains closed at different scales.
-        const isLoop = isPathALoop(element.points, appState.zoom.value);
+        const isLoop = isLineElement(element)
+          ? isPathALoop(element.points, appState.zoom.value)
+          : isFreeDrawElement(element)
+          ? isLoopFreeDrawElement(element, appState.zoom.value)
+          : false;
 
         if (isLoop && (isLineElement(element) || isFreeDrawElement(element))) {
           const linePoints = element.points;
@@ -329,8 +334,8 @@ export const actionFinalize = register<FormData>({
         selectionElement: null,
         multiElement: null,
         editingTextElement: null,
+        startBoundElement: null,
         suggestedBinding: null,
-        frameToHighlight: null,
         selectedElementIds:
           element &&
           !appState.activeTool.locked &&

packages/excalidraw/actions/actionFrame.ts

@@ -205,6 +205,7 @@ export const actionWrapSelectionInFrame = register({
       [...app.scene.getElementsIncludingDeleted(), frame],
       selectedElements,
       frame,
+      appState,
     );
 
     return {

packages/excalidraw/actions/actionGroup.tsx

@@ -277,6 +277,7 @@ export const actionUngroup = register({
             elementsMap,
           ),
           frame,
+          app,
         );
       }
     });

packages/excalidraw/actions/actionHistory.tsx

@@ -1,4 +1,5 @@
 import {
+  isWindows,
   KEYS,
   matchKey,
   arrayToMap,
@@ -113,7 +114,7 @@ export const createRedoAction: ActionCreator = (history) => ({
     ),
   keyTest: (event) =>
     (event[KEYS.CTRL_OR_CMD] && event.shiftKey && matchKey(event, KEYS.Z)) ||
-    (event[KEYS.CTRL_OR_CMD] && !event.shiftKey && matchKey(event, KEYS.Y)),
+    (isWindows && event.ctrlKey && !event.shiftKey && matchKey(event, KEYS.Y)),
   PanelComponent: ({ appState, updateData, data, app }) => {
     const { isRedoStackEmpty } = useEmitter(
       history.onHistoryChangedEmitter,

packages/excalidraw/actions/actionProperties.test.tsx

@@ -1,4 +1,5 @@
 import { queryByTestId } from "@testing-library/react";
+import { pointFrom } from "@excalidraw/math";
 
 import {
   COLOR_PALETTE,
@@ -10,7 +11,7 @@ import {
 import { Excalidraw } from "../index";
 import { API } from "../tests/helpers/api";
 import { UI } from "../tests/helpers/ui";
-import { render } from "../tests/test-utils";
+import { act, render } from "../tests/test-utils";
 
 describe("element locking", () => {
   beforeEach(async () => {
@@ -80,6 +81,20 @@ describe("element locking", () => {
       const centerTextAlign = queryByTestId(document.body, `align-right`);
       expect(centerTextAlign).toBeChecked();
     });
+
+    it("should show the active freedraw stroke type", () => {
+      UI.clickTool("freedraw");
+
+      API.setAppState({
+        currentItemStrokeShape: "fixed",
+      });
+
+      const fixedStrokeShape = queryByTestId(
+        document.body,
+        "strokeShape-fixed",
+      );
+      expect(fixedStrokeShape).toBeChecked();
+    });
   });
 
   describe("properties when elements selected", () => {
@@ -144,6 +159,9 @@ describe("element locking", () => {
       expect(
         queryByTestId(document.body, `strokeWidth-thin`),
       ).not.toBeChecked();
+      expect(
+        queryByTestId(document.body, `strokeWidth-medium`),
+      ).not.toBeChecked();
       expect(
         queryByTestId(document.body, `strokeWidth-bold`),
       ).not.toBeChecked();
@@ -159,6 +177,7 @@ describe("element locking", () => {
       });
       const text = API.createElement({
         type: "text",
+        strokeWidth: STROKE_WIDTH.bold,
         fontFamily: FONT_FAMILY["Comic Shanns"],
       });
       API.setElements([rect, text]);
@@ -169,5 +188,35 @@ describe("element locking", () => {
         "active",
       );
     });
+
+    it("should highlight the fixed freedraw stroke type for selected elements", () => {
+      const freedraw = API.createElement({
+        type: "freedraw",
+        strokeShape: "fixed",
+        points: [pointFrom(0, 0), pointFrom(10, 10), pointFrom(20, 15)],
+      });
+      API.setElements([freedraw]);
+      API.setSelectedElements([freedraw]);
+
+      const fixedStrokeShape = queryByTestId(
+        document.body,
+        "strokeShape-fixed",
+      );
+      expect(fixedStrokeShape).toBeChecked();
+    });
+
+    it("should apply fixed freedraw stroke type to newly drawn strokes", () => {
+      UI.clickTool("freedraw");
+
+      act(() => {
+        queryByTestId(document.body, "strokeShape-fixed")?.click();
+      });
+
+      const freedraw = UI.createElement("freedraw", {
+        points: [pointFrom(0, 0), pointFrom(10, 10), pointFrom(20, 15)],
+      });
+
+      expect(freedraw.strokeShape).toBe("fixed");
+    });
   });
 });

packages/excalidraw/actions/actionProperties.tsx

@@ -3,6 +3,7 @@ import { pointFrom } from "@excalidraw/math";
 import { useEffect, useMemo, useRef, useState } from "react";
 
 import {
+  DEFAULT_FREE_DRAW_STROKE_SHAPE,
   DEFAULT_ELEMENT_BACKGROUND_COLOR_PALETTE,
   DEFAULT_ELEMENT_BACKGROUND_PICKS,
   DEFAULT_ELEMENT_STROKE_COLOR_PALETTE,
@@ -36,6 +37,7 @@ import {
 import { LinearElementEditor } from "@excalidraw/element";
 
 import { newElementWith } from "@excalidraw/element";
+import { newFreeDrawElementWithStrokeShape } from "@excalidraw/element";
 import { getArrowheadForPicker } from "@excalidraw/element";
 
 import {
@@ -47,6 +49,7 @@ import {
   isArrowElement,
   isBoundToContainer,
   isElbowArrow,
+  isFreeDrawElement,
   isLinearElement,
   isLineElement,
   isTextElement,
@@ -70,6 +73,7 @@ import type {
   ElementsMap,
   ExcalidrawBindableElement,
   ExcalidrawElement,
+  ExcalidrawFreeDrawElement,
   ExcalidrawLinearElement,
   ExcalidrawTextElement,
   FontFamilyValues,
@@ -105,8 +109,11 @@ import {
   SloppinessArtistIcon,
   SloppinessCartoonistIcon,
   StrokeWidthBaseIcon,
+  StrokeWidthMediumIcon,
   StrokeWidthBoldIcon,
   StrokeWidthExtraBoldIcon,
+  StrokeShapeFixedIcon,
+  StrokeShapeVariableIcon,
   FontSizeSmallIcon,
   FontSizeMediumIcon,
   FontSizeLargeIcon,
@@ -187,6 +194,29 @@ export const changeProperty = (
   });
 };
 
+const getFreeDrawStrokeShape = (item: {
+  strokeShape?: ExcalidrawFreeDrawElement["strokeShape"];
+  currentItemStrokeShape?: AppState["currentItemStrokeShape"];
+}) =>
+  item.strokeShape ??
+  item.currentItemStrokeShape ??
+  DEFAULT_FREE_DRAW_STROKE_SHAPE;
+
+const getAppStateWithCurrentItemStrokeShape = (
+  appState: AppState,
+  strokeShape: NonNullable<ExcalidrawFreeDrawElement["strokeShape"]>,
+) => {
+  // if (strokeShape === DEFAULT_FREE_DRAW_STROKE_SHAPE) {
+  //   const { currentItemStrokeShape, ...nextAppState } = appState;
+  //   return nextAppState;
+  // }
+
+  return {
+    ...appState,
+    currentItemStrokeShape: strokeShape,
+  };
+};
+
 export const getFormValue = function <T extends Primitive>(
   elements: readonly ExcalidrawElement[],
   app: AppClassProperties,
@@ -574,6 +604,12 @@ export const actionChangeStrokeWidth = register<
               icon: StrokeWidthBaseIcon,
               testId: "strokeWidth-thin",
             },
+            {
+              value: STROKE_WIDTH.medium,
+              text: t("labels.medium"),
+              icon: StrokeWidthMediumIcon,
+              testId: "strokeWidth-medium",
+            },
             {
               value: STROKE_WIDTH.bold,
               text: t("labels.bold"),
@@ -602,6 +638,60 @@ export const actionChangeStrokeWidth = register<
   ),
 });
 
+export const actionChangeStrokeShape = register<
+  NonNullable<ExcalidrawFreeDrawElement["strokeShape"]>
+>({
+  name: "changeStrokeShape",
+  label: "labels.strokeShape",
+  trackEvent: false,
+  perform: (elements, appState, value) => {
+    invariant(value, "actionChangeStrokeShape: value must be defined");
+    return {
+      elements: changeProperty(elements, appState, (el) =>
+        isFreeDrawElement(el)
+          ? newFreeDrawElementWithStrokeShape(el, value)
+          : el,
+      ),
+      appState: getAppStateWithCurrentItemStrokeShape(appState, value),
+      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
+    };
+  },
+  PanelComponent: ({ elements, appState, updateData, app }) => (
+    <fieldset>
+      <legend>{t("labels.strokeShape")}</legend>
+      <div className="buttonList">
+        <RadioSelection
+          group="stroke-shape"
+          options={[
+            {
+              value: "variable",
+              text: t("labels.strokeShape_variable"),
+              icon: StrokeShapeVariableIcon,
+              testId: "strokeShape-variable",
+            },
+            {
+              value: "fixed",
+              text: t("labels.strokeShape_fixed"),
+              icon: StrokeShapeFixedIcon,
+              testId: "strokeShape-fixed",
+            },
+          ]}
+          value={getFormValue(
+            elements,
+            app,
+            (element) =>
+              getFreeDrawStrokeShape(element as ExcalidrawFreeDrawElement),
+            isFreeDrawElement,
+            (hasSelection) =>
+              hasSelection ? null : getFreeDrawStrokeShape(appState),
+          )}
+          onChange={(value) => updateData(value)}
+        />
+      </div>
+    </fieldset>
+  ),
+});
+
 export const actionChangeSloppiness = register<ExcalidrawElement["roughness"]>({
   name: "changeSloppiness",
   label: "labels.sloppiness",
@@ -1897,7 +1987,6 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
                   startElement,
                   "start",
                   elementsMap,
-                  appState.zoom,
                   appState.isBindingEnabled,
                 ),
               }
@@ -1912,7 +2001,6 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
                   endElement,
                   "end",
                   elementsMap,
-                  appState.zoom,
                   appState.isBindingEnabled,
                 ),
               }
@@ -1945,7 +2033,6 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
               appState.bindMode === "inside" ? "inside" : "orbit",
               "start",
               app.scene,
-              appState.zoom,
             );
           }
         }
@@ -1960,7 +2047,6 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
               appState.bindMode === "inside" ? "inside" : "orbit",
               "end",
               app.scene,
-              appState.zoom,
             );
           }
         }

packages/excalidraw/actions/actionStyles.ts

@@ -1,4 +1,5 @@
 import {
+  DEFAULT_FREE_DRAW_STROKE_SHAPE,
   DEFAULT_FONT_SIZE,
   DEFAULT_FONT_FAMILY,
   DEFAULT_TEXT_ALIGN,
@@ -10,6 +11,7 @@ import {
 import { newElementWith } from "@excalidraw/element";
 
 import {
+  isFreeDrawElement,
   hasBoundTextElement,
   canApplyRoundnessTypeToElement,
   getDefaultRoundnessTypeForElement,
@@ -18,6 +20,7 @@ import {
   isExcalidrawElement,
   isTextElement,
 } from "@excalidraw/element";
+import { newFreeDrawElementWithStrokeShape } from "@excalidraw/element";
 
 import {
   getBoundTextElement,
@@ -154,6 +157,17 @@ export const actionPasteStyles = register({
             });
           }
 
+          if (
+            isFreeDrawElement(newElement) &&
+            isFreeDrawElement(elementStylesToCopyFrom)
+          ) {
+            newElement = newFreeDrawElementWithStrokeShape(
+              newElement,
+              elementStylesToCopyFrom.strokeShape ??
+                DEFAULT_FREE_DRAW_STROKE_SHAPE,
+            );
+          }
+
           if (isFrameLikeElement(element)) {
             newElement = newElementWith(newElement, {
               roundness: null,

packages/excalidraw/animated-trail.ts

@@ -1,4 +1,5 @@
 import { LaserPointer } from "@excalidraw/laser-pointer";
+
 import {
   SVG_NS,
   getSvgPathFromStroke,
@@ -7,8 +8,7 @@ import {
 
 import type { LaserPointerOptions } from "@excalidraw/laser-pointer";
 
-import { AnimationController } from "./renderer/animation";
+import type { AnimationFrameHandler } from "./animation-frame-handler";
-
 import type App from "./components/App";
 import type { AppState } from "./types";
 
@@ -34,16 +34,15 @@ export class AnimatedTrail implements Trail {
   private container?: SVGSVGElement;
   private trailElement: SVGPathElement;
   private trailAnimation?: SVGAnimateElement;
-  private key: string;
-
-  private static counter = 0;
 
   constructor(
+    private animationFrameHandler: AnimationFrameHandler,
     protected app: App,
     private options: Partial<LaserPointerOptions> &
       Partial<AnimatedTrailOptions>,
   ) {
-    this.key = `animated-trail-${AnimatedTrail.counter++}`;
+    this.animationFrameHandler.register(this, this.onFrame.bind(this));
+
     this.trailElement = document.createElementNS(SVG_NS, "path");
     if (this.options.animateTrail) {
       this.trailAnimation = document.createElementNS(SVG_NS, "animate");
@@ -74,15 +73,6 @@ export class AnimatedTrail implements Trail {
     return false;
   }
 
-  private cleanup() {
-    this.pastTrails = [];
-    this.currentTrail = undefined;
-
-    if (this.trailElement.parentNode === this.container) {
-      this.container?.removeChild(this.trailElement);
-    }
-  }
-
   start(container?: SVGSVGElement) {
     if (container) {
       this.container = container;
@@ -92,23 +82,15 @@ export class AnimatedTrail implements Trail {
       this.container.appendChild(this.trailElement);
     }
 
-    if (!AnimationController.running(this.key)) {
+    this.animationFrameHandler.start(this);
-      AnimationController.start(this.key, () => {
-        const needsNext = this.onFrame();
-        if (needsNext) {
-          return { keep: true };
-        }
-
-        this.cleanup();
-
-        return null;
-      });
-    }
   }
 
   stop() {
-    AnimationController.cancel(this.key);
+    this.animationFrameHandler.stop(this);
-    this.cleanup();
+
+    if (this.trailElement.parentNode === this.container) {
+      this.container?.removeChild(this.trailElement);
+    }
   }
 
   startPath(x: number, y: number) {
@@ -163,25 +145,21 @@ export class AnimatedTrail implements Trail {
 
     if (this.currentTrail) {
       const currentPath = this.drawTrail(this.currentTrail, this.app.state);
+
       paths.push(currentPath);
     }
 
-    this.pastTrails = this.pastTrails.filter(
+    this.pastTrails = this.pastTrails.filter((trail) => {
-      (t) =>
+      return trail.getStrokeOutline().length !== 0;
-        t.getStrokeOutline(t.options.size / this.app.state.zoom.value)
+    });
-          .length !== 0,
-    );
 
     if (paths.length === 0) {
-      // Clean up the SVG path if there are no trails to render
+      this.stop();
-      this.trailElement.setAttribute("d", "");
-
-      return false;
     }
 
     const svgPaths = paths.join(" ").trim();
-    this.trailElement.setAttribute("d", svgPaths);
 
+    this.trailElement.setAttribute("d", svgPaths);
     if (this.trailAnimation) {
       this.trailElement.setAttribute(
         "fill",
@@ -197,8 +175,6 @@ export class AnimatedTrail implements Trail {
         (this.options.fill ?? (() => "black"))(this),
       );
     }
-
-    return true;
   }
 
   private drawTrail(trail: LaserPointer, state: AppState): string {

packages/excalidraw/animation-frame-handler.ts

@@ -0,0 +1,79 @@
+export type AnimationCallback = (timestamp: number) => void | boolean;
+
+export type AnimationTarget = {
+  callback: AnimationCallback;
+  stopped: boolean;
+};
+
+export class AnimationFrameHandler {
+  private targets = new WeakMap<object, AnimationTarget>();
+  private rafIds = new WeakMap<object, number>();
+
+  register(key: object, callback: AnimationCallback) {
+    this.targets.set(key, { callback, stopped: true });
+  }
+
+  start(key: object) {
+    const target = this.targets.get(key);
+
+    if (!target) {
+      return;
+    }
+
+    if (this.rafIds.has(key)) {
+      return;
+    }
+
+    this.targets.set(key, { ...target, stopped: false });
+    this.scheduleFrame(key);
+  }
+
+  stop(key: object) {
+    const target = this.targets.get(key);
+    if (target && !target.stopped) {
+      this.targets.set(key, { ...target, stopped: true });
+    }
+
+    this.cancelFrame(key);
+  }
+
+  private constructFrame(key: object): FrameRequestCallback {
+    return (timestamp: number) => {
+      const target = this.targets.get(key);
+
+      if (!target) {
+        return;
+      }
+
+      const shouldAbort = this.onFrame(target, timestamp);
+
+      if (!target.stopped && !shouldAbort) {
+        this.scheduleFrame(key);
+      } else {
+        this.cancelFrame(key);
+      }
+    };
+  }
+
+  private scheduleFrame(key: object) {
+    const rafId = requestAnimationFrame(this.constructFrame(key));
+
+    this.rafIds.set(key, rafId);
+  }
+
+  private cancelFrame(key: object) {
+    if (this.rafIds.has(key)) {
+      const rafId = this.rafIds.get(key)!;
+
+      cancelAnimationFrame(rafId);
+    }
+
+    this.rafIds.delete(key);
+  }
+
+  private onFrame(target: AnimationTarget, timestamp: number): boolean {
+    const shouldAbort = target.callback(timestamp);
+
+    return shouldAbort ?? false;
+  }
+}

packages/excalidraw/appState.ts

@@ -99,6 +99,7 @@ export const getDefaultAppState = (): Omit<
       open: false,
       panels: STATS_PANELS.generalStats | STATS_PANELS.elementProperties,
     },
+    startBoundElement: null,
     suggestedBinding: null,
     frameRendering: { enabled: true, clip: true, name: true, outline: true },
     frameToHighlight: null,
@@ -171,6 +172,7 @@ const APP_STATE_STORAGE_CONF = (<
   currentItemStrokeColor: { browser: true, export: false, server: false },
   currentItemStrokeStyle: { browser: true, export: false, server: false },
   currentItemStrokeWidth: { browser: true, export: false, server: false },
+  currentItemStrokeShape: { browser: true, export: false, server: false },
   currentItemTextAlign: { browser: true, export: false, server: false },
   currentHoveredFontFamily: { browser: false, export: false, server: false },
   cursorButton: { browser: true, export: false, server: false },
@@ -230,6 +232,7 @@ const APP_STATE_STORAGE_CONF = (<
   selectionElement: { browser: false, export: false, server: false },
   shouldCacheIgnoreZoom: { browser: true, export: false, server: false },
   stats: { browser: true, export: false, server: false },
+  startBoundElement: { browser: false, export: false, server: false },
   suggestedBinding: { browser: false, export: false, server: false },
   frameRendering: { browser: false, export: false, server: false },
   frameToHighlight: { browser: false, export: false, server: false },

packages/excalidraw/components/Actions.tsx

@@ -394,6 +394,11 @@ const CombinedShapeProperties = ({
                   hasStrokeWidth(element.type),
                 )) &&
                 renderAction("changeStrokeWidth")}
+              {(appState.activeTool.type === "freedraw" ||
+                targetElements.some(
+                  (element) => element.type === "freedraw",
+                )) &&
+                renderAction("changeStrokeShape")}
               {(hasStrokeStyle(appState.activeTool.type) ||
                 targetElements.some((element) =>
                   hasStrokeStyle(element.type),

packages/excalidraw/components/LayerUI.tsx

@@ -650,7 +650,8 @@ const LayerUI = ({
 };
 
 const stripIrrelevantAppStateProps = (appState: AppState): UIAppState => {
-  const { cursorButton, scrollX, scrollY, ...ret } = appState;
+  const { startBoundElement, cursorButton, scrollX, scrollY, ...ret } =
+    appState;
   return ret;
 };
 

packages/excalidraw/components/LibraryMenuItems.tsx

@@ -199,7 +199,6 @@ export default function LibraryMenuItems({
             type: "everything",
             elements: item.elements,
             randomizeSeed: true,
-            preserveFrameChildrenOrder: true,
           }).duplicatedElements,
         };
       });

packages/excalidraw/components/SVGLayer.tsx

@@ -2,7 +2,7 @@ import { useEffect, useRef } from "react";
 
 import "./SVGLayer.scss";
 
-import type { Trail } from "../animatedTrail";
+import type { Trail } from "../animated-trail";
 
 type SVGLayerProps = {
   trails: Trail[];

packages/excalidraw/components/Stats/Dimension.tsx

@@ -206,6 +206,7 @@ const handleDimensionChange: DragInputCallbackType<
           scene.getElementsIncludingDeleted(),
           nextElementsInFrame,
           latestElement,
+          app,
         );
 
         scene.replaceAllElements(updatedElements);
@@ -301,6 +302,7 @@ const handleDragFinished: DragFinishedCallbackType = ({
       app.scene.getElementsIncludingDeleted(),
       nextElementsInFrame,
       latestElement,
+      app,
     );
 
     app.scene.replaceAllElements(updatedElements);

packages/excalidraw/components/Stats/MultiDimension.tsx

@@ -261,6 +261,7 @@ const handleDimensionChange: DragInputCallbackType<
               scene.getElementsIncludingDeleted(),
               nextElementsInFrame,
               latestElement,
+              app,
             );
 
             scene.replaceAllElements(updatedElements);
@@ -415,6 +416,7 @@ const handleDragFinished: DragFinishedCallbackType = ({
       app.scene.getElementsIncludingDeleted(),
       nextElementsInFrame,
       latestElement,
+      app,
     );
 
     app.scene.replaceAllElements(updatedElements);

packages/excalidraw/components/canvases/InteractiveCanvas.tsx

@@ -39,7 +39,7 @@ type InteractiveCanvasProps = {
   visibleElements: readonly NonDeletedExcalidrawElement[];
   selectedElements: readonly NonDeletedExcalidrawElement[];
   allElementsMap: NonDeletedSceneElementsMap;
-  canvasNonce: string;
+  sceneNonce: number | undefined;
   selectionNonce: number | undefined;
   scale: number;
   appState: InteractiveCanvasAppState;
@@ -279,10 +279,10 @@ const areEqual = (
   // This could be further optimised if needed, as we don't have to render interactive canvas on each scene mutation
   if (
     prevProps.selectionNonce !== nextProps.selectionNonce ||
-    prevProps.canvasNonce !== nextProps.canvasNonce ||
+    prevProps.sceneNonce !== nextProps.sceneNonce ||
     prevProps.scale !== nextProps.scale ||
     // we need to memoize on elementsMap because they may have renewed
-    // even if canvasNonce didn't change (e.g. we filter elements out based
+    // even if sceneNonce didn't change (e.g. we filter elements out based
     // on appState)
     prevProps.elementsMap !== nextProps.elementsMap ||
     prevProps.visibleElements !== nextProps.visibleElements ||

packages/excalidraw/components/canvases/NewElementCanvas.tsx

@@ -14,7 +14,6 @@ import type { RoughCanvas } from "roughjs/bin/canvas";
 
 interface NewElementCanvasProps {
   appState: AppState;
-  newElement: NonNullable<AppState["newElement"]>;
   elementsMap: RenderableElementsMap;
   allElementsMap: NonDeletedSceneElementsMap;
   scale: number;
@@ -32,7 +31,7 @@ const NewElementCanvas = (props: NewElementCanvasProps) => {
       {
         canvas: canvasRef.current,
         scale: props.scale,
-        newElement: props.newElement,
+        newElement: props.appState.newElement,
         elementsMap: props.elementsMap,
         allElementsMap: props.allElementsMap,
         rc: props.rc,

packages/excalidraw/components/canvases/StaticCanvas.tsx

@@ -23,7 +23,7 @@ type StaticCanvasProps = {
   elementsMap: RenderableElementsMap;
   allElementsMap: NonDeletedSceneElementsMap;
   visibleElements: readonly NonDeletedExcalidrawElement[];
-  canvasNonce: string;
+  sceneNonce: number | undefined;
   selectionNonce: number | undefined;
   scale: number;
   appState: StaticCanvasAppState;
@@ -110,10 +110,10 @@ const areEqual = (
   nextProps: StaticCanvasProps,
 ) => {
   if (
-    prevProps.canvasNonce !== nextProps.canvasNonce ||
+    prevProps.sceneNonce !== nextProps.sceneNonce ||
     prevProps.scale !== nextProps.scale ||
     // we need to memoize on elementsMap because they may have renewed
-    // even if canvasNonce didn't change (e.g. we filter elements out based
+    // even if sceneNonce didn't change (e.g. we filter elements out based
     // on appState)
     prevProps.elementsMap !== nextProps.elementsMap ||
     prevProps.visibleElements !== nextProps.visibleElements

packages/excalidraw/components/icons.tsx

@@ -1164,7 +1164,7 @@ export const StrokeWidthBaseIcon = createIcon(
   modifiedTablerIconProps,
 );
 
-export const StrokeWidthBoldIcon = createIcon(
+export const StrokeWidthMediumIcon = createIcon(
   <path
     d="M5 10h10"
     stroke="currentColor"
@@ -1175,7 +1175,7 @@ export const StrokeWidthBoldIcon = createIcon(
   modifiedTablerIconProps,
 );
 
-export const StrokeWidthExtraBoldIcon = createIcon(
+export const StrokeWidthBoldIcon = createIcon(
   <path
     d="M5 10h10"
     stroke="currentColor"
@@ -1186,6 +1186,48 @@ export const StrokeWidthExtraBoldIcon = createIcon(
   modifiedTablerIconProps,
 );
 
+export const StrokeWidthExtraBoldIcon = createIcon(
+  <path
+    d="M5 10h10"
+    stroke="currentColor"
+    strokeWidth="5"
+    strokeLinecap="round"
+    strokeLinejoin="round"
+  />,
+  modifiedTablerIconProps,
+);
+
+export const StrokeShapeVariableIcon = createIcon(
+  <>
+    <path
+      d="M3.5 12.5c1.8-3.5 4.1-5.2 6.8-5.2 2.4 0 4.4 1.3 6.2 3.9"
+      stroke="currentColor"
+      strokeWidth="1.25"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+    <path
+      d="M7.75 10.8c1-.9 2-1.35 3.05-1.35 1.2 0 2.4.57 3.7 1.72"
+      stroke="currentColor"
+      strokeWidth="2.5"
+      strokeLinecap="round"
+      strokeLinejoin="round"
+    />
+  </>,
+  modifiedTablerIconProps,
+);
+
+export const StrokeShapeFixedIcon = createIcon(
+  <path
+    d="M3.5 12h13"
+    stroke="currentColor"
+    strokeWidth="2.5"
+    strokeLinecap="round"
+    strokeLinejoin="round"
+  />,
+  modifiedTablerIconProps,
+);
+
 export const StrokeStyleSolidIcon = React.memo(({ theme }: { theme: Theme }) =>
   createIcon(
     <path

packages/excalidraw/components/shapes.tsx

@@ -119,12 +119,15 @@ export const SHAPES = [
 export const getToolbarTools = (app: AppClassProperties) => {
   return app.state.preferredSelectionTool.type === "lasso"
     ? ([
-        SHAPES[0],
         {
-          ...SHAPES[1],
           value: "lasso",
+          icon: SelectionIcon,
+          key: KEYS.V,
+          numericKey: KEYS["1"],
+          fillable: true,
+          toolbar: true,
         },
-        ...SHAPES.slice(2),
+        ...SHAPES.slice(1),
       ] as const)
     : SHAPES;
 };

packages/excalidraw/css/styles.scss

@@ -814,14 +814,6 @@ body.excalidraw-cursor-resize * {
   .excalidraw__embeddable__outer {
     width: 100%;
     height: 100%;
-  }
-
-  .excalidraw__embeddable__content {
-    width: 100%;
-    height: 100%;
-    transform-origin: top left;
-
-    &,
     & > * {
       border-radius: var(--embeddable-radius);
     }

packages/excalidraw/data/blob.ts

@@ -311,48 +311,6 @@ export const dataURLToString = (dataURL: DataURL) => {
   return base64ToString(dataURL.slice(dataURL.indexOf(",") + 1));
 };
 
-const getImageFileDimensions = async (file: File) => {
-  const browserURL = typeof window !== "undefined" ? window.URL : undefined;
-  let objectURL: string | null = null;
-  let imageSource: string;
-
-  try {
-    imageSource = browserURL?.createObjectURL
-      ? (objectURL = browserURL.createObjectURL(file))
-      : await getDataURL(file);
-  } catch {
-    objectURL = null;
-    imageSource = await getDataURL(file);
-  }
-
-  return new Promise<{ width: number; height: number }>((resolve, reject) => {
-    const image = new Image();
-
-    const cleanup = () => {
-      image.onload = null;
-      image.onerror = null;
-
-      if (objectURL && browserURL?.revokeObjectURL) {
-        browserURL.revokeObjectURL(objectURL);
-      }
-    };
-
-    image.onload = () => {
-      cleanup();
-      resolve({
-        width: image.naturalWidth || image.width,
-        height: image.naturalHeight || image.height,
-      });
-    };
-    image.onerror = (error) => {
-      cleanup();
-      reject(error);
-    };
-
-    image.src = imageSource;
-  });
-};
-
 export const resizeImageFile = async (
   file: File,
   opts: {
@@ -366,20 +324,6 @@ export const resizeImageFile = async (
     return file;
   }
 
-  if (!isSupportedImageFile(file)) {
-    throw new Error("Error: unsupported file type", { cause: "UNSUPPORTED" });
-  }
-
-  if (!opts.outputType || opts.outputType === file.type) {
-    const dimensions = await getImageFileDimensions(file);
-
-    if (
-      Math.max(dimensions.width, dimensions.height) <= opts.maxWidthOrHeight
-    ) {
-      return file;
-    }
-  }
-
   const [pica, imageBlobReduce] = await Promise.all([
     import("pica").then((res) => res.default),
     // a wrapper for pica for better API
@@ -403,6 +347,10 @@ export const resizeImageFile = async (
     };
   }
 
+  if (!isSupportedImageFile(file)) {
+    throw new Error("Error: unsupported file type", { cause: "UNSUPPORTED" });
+  }
+
   return new File(
     [await reduce.toBlob(file, { max: opts.maxWidthOrHeight, alpha: true })],
     file.name,

packages/excalidraw/data/restore.ts

@@ -1,4 +1,4 @@
-import { isFiniteNumber, isValidPoint, pointFrom } from "@excalidraw/math";
+import { isFiniteNumber, pointFrom } from "@excalidraw/math";
 
 import {
   type CombineBrandsIfNeeded,
@@ -96,68 +96,12 @@ type RestoredAppState = Omit<
   "offsetTop" | "offsetLeft" | "width" | "height"
 >;
 
-const MAX_ARROW_PX = 75_000;
+const normalizeFreeDrawStrokeShape = (
-
+  strokeShape: unknown,
-const restoreLinearElementPoints = (
+): AppState["currentItemStrokeShape"] =>
-  points: unknown,
+  strokeShape === "fixed" || strokeShape === "stable"
-  width: unknown,
+    ? "fixed"
-  height: unknown,
+    : undefined;
-): LocalPoint[] => {
-  const restoredPoints = Array.isArray(points)
-    ? points.reduce<LocalPoint[]>((acc, point) => {
-        if (isValidPoint(point)) {
-          acc.push(pointFrom<LocalPoint>(point[0], point[1]));
-        }
-        return acc;
-      }, [])
-    : [];
-
-  return restoredPoints.length < 2
-    ? [
-        pointFrom<LocalPoint>(0, 0),
-        pointFrom<LocalPoint>(
-          isFiniteNumber(width) ? width : 0,
-          isFiniteNumber(height) ? height : 0,
-        ),
-      ]
-    : restoredPoints;
-};
-
-const restoreFreedrawPoints = (
-  points: unknown,
-  pressures: unknown,
-): {
-  points: LocalPoint[];
-  pressures: number[];
-} => {
-  if (!Array.isArray(points)) {
-    return {
-      points: [],
-      pressures: [],
-    };
-  }
-
-  const pressureValues: readonly unknown[] = Array.isArray(pressures)
-    ? pressures
-    : [];
-  const restoredPoints: LocalPoint[] = [];
-  const restoredPressures: number[] = [];
-
-  points.forEach((point, index) => {
-    if (isValidPoint(point)) {
-      restoredPoints.push(pointFrom<LocalPoint>(point[0], point[1]));
-      if (index in pressureValues) {
-        const pressure = pressureValues[index];
-        restoredPressures.push(isFiniteNumber(pressure) ? pressure : 0.5);
-      }
-    }
-  });
-
-  return {
-    points: restoredPoints,
-    pressures: restoredPressures,
-  };
-};
 
 export const AllowedExcalidrawActiveTools: Record<
   AppState["activeTool"]["type"],
@@ -475,15 +419,12 @@ export const restoreElement = (
 
       return element;
     case "freedraw": {
-      const { points, pressures } = restoreFreedrawPoints(
+      const strokeShape = normalizeFreeDrawStrokeShape(element.strokeShape);
-        element.points,
-        element.pressures,
-      );
-
       return restoreElementWithProperties(element, {
-        points,
+        points: element.points,
         simulatePressure: element.simulatePressure,
-        pressures,
+        pressures: element.pressures,
+        ...(strokeShape ? { strokeShape } : {}),
       });
     }
     case "image":
@@ -501,20 +442,14 @@ export const restoreElement = (
       const endArrowhead = normalizeArrowhead(element.endArrowhead);
       let x = element.x;
       let y = element.y;
-      let points = restoreLinearElementPoints(
+      let points = // migrate old arrow model to new one
-        element.points,
+        !Array.isArray(element.points) || element.points.length < 2
-        element.width,
+          ? [pointFrom(0, 0), pointFrom(element.width, element.height)]
-        element.height,
+          : element.points;
-      );
 
       if (points[0][0] !== 0 || points[0][1] !== 0) {
         ({ points, x, y } =
-          LinearElementEditor.getNormalizeElementPointsAndCoords({
+          LinearElementEditor.getNormalizeElementPointsAndCoords(element));
-            ...element,
-            points,
-            x: x ?? 0,
-            y: y ?? 0,
-          } as ExcalidrawLinearElement));
       }
 
       return restoreElementWithProperties(element, {
@@ -528,7 +463,7 @@ export const restoreElement = (
         y,
         ...(isLineElement(element)
           ? {
-              polygon: isValidPolygon(points)
+              polygon: isValidPolygon(element.points)
                 ? element.polygon ?? false
                 : false,
             }
@@ -541,31 +476,24 @@ export const restoreElement = (
         element.endArrowhead === undefined
           ? "arrow"
           : normalizeArrowhead(element.endArrowhead);
-      const x = element.x as number | undefined;
+      const x: number | undefined = element.x;
-      const y = element.y as number | undefined;
+      const y: number | undefined = element.y;
-      const points = restoreLinearElementPoints(
+      const points: readonly LocalPoint[] | undefined = // migrate old arrow model to new one
-        element.points,
+        !Array.isArray(element.points) || element.points.length < 2
-        element.width,
+          ? [pointFrom(0, 0), pointFrom(element.width, element.height)]
-        element.height,
+          : element.points;
-      );
-      const elementWithRestoredPoints = {
-        ...element,
-        points,
-        x: x ?? 0,
-        y: y ?? 0,
-      } as ExcalidrawArrowElement;
 
       const base = {
         type: element.type,
         startBinding: repairBinding(
-          elementWithRestoredPoints,
+          element as ExcalidrawArrowElement,
           element.startBinding,
           targetElementsMap,
           existingElementsMap,
           "start",
         ),
         endBinding: repairBinding(
-          elementWithRestoredPoints,
+          element as ExcalidrawArrowElement,
           element.endBinding,
           targetElementsMap,
           existingElementsMap,
@@ -574,8 +502,8 @@ export const restoreElement = (
         startArrowhead,
         endArrowhead,
         points,
-        x: x ?? 0,
+        x,
-        y: y ?? 0,
+        y,
         elbowed: (element as ExcalidrawArrowElement).elbowed,
         ...getSizeFromPoints(points),
       };
@@ -594,44 +522,12 @@ export const restoreElement = (
           })
         : restoreElementWithProperties(element as ExcalidrawArrowElement, base);
 
-      const normalizedRestoredElement = {
+      return {
         ...restoredElement,
         ...LinearElementEditor.getNormalizeElementPointsAndCoords(
           restoredElement,
         ),
       };
-
-      // Last resort fix for extremely large arrows
-      if (
-        normalizedRestoredElement.width > MAX_ARROW_PX ||
-        normalizedRestoredElement.height > MAX_ARROW_PX
-      ) {
-        console.error(
-          `Removing extremely large arrow ${
-            normalizedRestoredElement.id
-          } (type: ${
-            isElbowArrow(normalizedRestoredElement) ? "elbow" : "simple"
-          }, width: ${normalizedRestoredElement.width}, height: ${
-            normalizedRestoredElement.height
-          }, x: ${normalizedRestoredElement.x}, y: ${
-            normalizedRestoredElement.y
-          })`,
-        );
-        return {
-          ...normalizedRestoredElement,
-          x: 0,
-          y: 0,
-          width: 100,
-          height: 100,
-          points: [
-            pointFrom<LocalPoint>(0, 0),
-            pointFrom<LocalPoint>(100, 100),
-          ],
-          isDeleted: true,
-        };
-      }
-
-      return normalizedRestoredElement;
     }
 
     // generic elements
@@ -779,7 +675,6 @@ export const restoreElements = <T extends ExcalidrawElement>(
   const existingElementsMap = existingElements
     ? arrayToMap(existingElements)
     : null;
-
   const restoredElements = syncInvalidIndices(
     (targetElements || []).reduce((elements, element) => {
       // filtering out selection, which is legacy, no longer kept in elements,
@@ -876,7 +771,7 @@ export const restoreElements = <T extends ExcalidrawElement>(
     }
   }
 
-  // NOTE (mtolmacs): Temporary fix for invalid/self-bound elbow arrows
+  // NOTE (mtolmacs): Temporary fix for extremely large arrows
   // Need to iterate again so we have attached text nodes in elementsMap
   return restoredElements.map((element) => {
     if (
@@ -1058,6 +953,16 @@ export const restoreAppState = (
 
   return {
     ...nextAppState,
+    ...(normalizeFreeDrawStrokeShape(
+      appState.currentItemStrokeShape ?? localAppState?.currentItemStrokeShape,
+    )
+      ? {
+          currentItemStrokeShape: normalizeFreeDrawStrokeShape(
+            appState.currentItemStrokeShape ??
+              localAppState?.currentItemStrokeShape,
+          ),
+        }
+      : {}),
     cursorButton: localAppState?.cursorButton || "up",
     // reset on fresh restore so as to hide the UI button if penMode not active
     penDetected:

packages/excalidraw/eraser/index.ts

@@ -33,7 +33,9 @@ import type { Bounds } from "@excalidraw/common";
 import type { GlobalPoint, LineSegment } from "@excalidraw/math/types";
 import type { ElementsMap, ExcalidrawElement } from "@excalidraw/element/types";
 
-import { AnimatedTrail } from "../animatedTrail";
+import { AnimatedTrail } from "../animated-trail";
+
+import type { AnimationFrameHandler } from "../animation-frame-handler";
 
 import type App from "../components/App";
 
@@ -41,8 +43,8 @@ export class EraserTrail extends AnimatedTrail {
   private elementsToErase: Set<ExcalidrawElement["id"]> = new Set();
   private groupsToErase: Set<ExcalidrawElement["id"]> = new Set();
 
-  constructor(app: App) {
+  constructor(animationFrameHandler: AnimationFrameHandler, app: App) {
-    super(app, {
+    super(animationFrameHandler, app, {
       streamline: 0.2,
       size: 5,
       keepHead: true,

packages/excalidraw/index.tsx

@@ -6,11 +6,7 @@ import React, {
   useState,
 } from "react";
 
-import {
+import { DEFAULT_UI_OPTIONS, isShallowEqual } from "@excalidraw/common";
-  DEFAULT_IMAGE_OPTIONS,
-  DEFAULT_UI_OPTIONS,
-  isShallowEqual,
-} from "@excalidraw/common";
 
 import App, {
   ExcalidrawAPIContext,
@@ -102,7 +98,6 @@ const ExcalidrawBase = (props: ExcalidrawProps) => {
     aiEnabled,
     showDeprecatedFonts,
     renderScrollbars,
-    imageOptions,
   } = props;
 
   const canvasActions = props.UIOptions?.canvasActions;
@@ -133,13 +128,6 @@ const ExcalidrawBase = (props: ExcalidrawProps) => {
     UIOptions.canvasActions.toggleTheme = true;
   }
 
-  const normalizedImageOptions: AppProps["imageOptions"] = {
-    maxFileSizeBytes:
-      imageOptions?.maxFileSizeBytes ?? DEFAULT_IMAGE_OPTIONS.maxFileSizeBytes,
-    maxWidthOrHeight:
-      imageOptions?.maxWidthOrHeight ?? DEFAULT_IMAGE_OPTIONS.maxWidthOrHeight,
-  };
-
   const setExcalidrawAPI = useContext(ExcalidrawAPISetContext);
 
   const onExcalidrawAPIRef = useRef(onExcalidrawAPI);
@@ -220,7 +208,6 @@ const ExcalidrawBase = (props: ExcalidrawProps) => {
           aiEnabled={aiEnabled !== false}
           showDeprecatedFonts={showDeprecatedFonts}
           renderScrollbars={renderScrollbars}
-          imageOptions={normalizedImageOptions}
         >
           {children}
         </App>
@@ -238,13 +225,11 @@ const areEqual = (prevProps: ExcalidrawProps, nextProps: ExcalidrawProps) => {
   const {
     initialData: prevInitialData,
     UIOptions: prevUIOptions = {},
-    imageOptions: prevImageOptions,
     ...prev
   } = prevProps;
   const {
     initialData: nextInitialData,
     UIOptions: nextUIOptions = {},
-    imageOptions: nextImageOptions,
     ...next
   } = nextProps;
 
@@ -288,17 +273,7 @@ const areEqual = (prevProps: ExcalidrawProps, nextProps: ExcalidrawProps) => {
     return prevUIOptions[key] === nextUIOptions[key];
   });
 
-  const isImageOptionsSame =
+  return isUIOptionsSame && isShallowEqual(prev, next);
-    (prevImageOptions?.maxWidthOrHeight ??
-      DEFAULT_IMAGE_OPTIONS.maxWidthOrHeight) ===
-      (nextImageOptions?.maxWidthOrHeight ??
-        DEFAULT_IMAGE_OPTIONS.maxWidthOrHeight) &&
-    (prevImageOptions?.maxFileSizeBytes ??
-      DEFAULT_IMAGE_OPTIONS.maxFileSizeBytes) ===
-      (nextImageOptions?.maxFileSizeBytes ??
-        DEFAULT_IMAGE_OPTIONS.maxFileSizeBytes);
-
-  return isUIOptionsSame && isImageOptionsSame && isShallowEqual(prev, next);
 };
 
 export const Excalidraw = React.memo(ExcalidrawBase, areEqual);

packages/excalidraw/laser-trails.ts

@@ -2,20 +2,27 @@ import { DEFAULT_LASER_COLOR, easeOut } from "@excalidraw/common";
 
 import type { LaserPointerOptions } from "@excalidraw/laser-pointer";
 
-import { AnimatedTrail } from "./animatedTrail";
+import { AnimatedTrail } from "./animated-trail";
 import { getClientColor } from "./clients";
 
-import type { Trail } from "./animatedTrail";
+import type { Trail } from "./animated-trail";
+import type { AnimationFrameHandler } from "./animation-frame-handler";
 import type App from "./components/App";
 import type { SocketId } from "./types";
 
 export class LaserTrails implements Trail {
   public localTrail: AnimatedTrail;
   private collabTrails = new Map<SocketId, AnimatedTrail>();
+
   private container?: SVGSVGElement;
 
-  constructor(private app: App) {
+  constructor(
-    this.localTrail = new AnimatedTrail(app, {
+    private animationFrameHandler: AnimationFrameHandler,
+    private app: App,
+  ) {
+    this.animationFrameHandler.register(this, this.onFrame.bind(this));
+
+    this.localTrail = new AnimatedTrail(animationFrameHandler, app, {
       ...this.getTrailOptions(),
       fill: () => DEFAULT_LASER_COLOR,
     });
@@ -56,45 +63,30 @@ export class LaserTrails implements Trail {
 
   start(container: SVGSVGElement) {
     this.container = container;
+
+    this.animationFrameHandler.start(this);
     this.localTrail.start(container);
   }
 
   stop() {
+    this.animationFrameHandler.stop(this);
     this.localTrail.stop();
-    this.stopCollabTrails();
-    this.container = undefined;
   }
 
-  private stopCollabTrails(collaborators?: App["state"]["collaborators"]) {
+  onFrame() {
-    for (const [key, trail] of this.collabTrails) {
+    this.updateCollabTrails();
-      const collaborator = collaborators?.get(key);
-
-      if (!collaborator) {
-        trail.stop();
-        this.collabTrails.delete(key);
-      }
-    }
   }
 
-  updateCollabTrails(collaborators: App["state"]["collaborators"]) {
+  private updateCollabTrails() {
-    this.stopCollabTrails(collaborators);
+    if (!this.container || this.app.state.collaborators.size === 0) {
-
-    if (!this.container || collaborators.size === 0) {
       return;
     }
 
-    for (const [key, collaborator] of collaborators.entries()) {
+    for (const [key, collaborator] of this.app.state.collaborators.entries()) {
-      // Current user has their own trail drawn via localTrail
+      let trail!: AnimatedTrail;
-      if (collaborator.isCurrentUser) {
-        continue;
-      }
 
-      // IDEA: Use the collaborator pointer coordinates to trace out the
+      if (!this.collabTrails.has(key)) {
-      // laser pointer trail when 1) the selected collab tool is the laser
+        trail = new AnimatedTrail(this.animationFrameHandler, this.app, {
-      // pointer and 2) the collab pointer button is in the "down" state.
-      let trail = this.collabTrails.get(key);
-      if (!trail) {
-        trail = new AnimatedTrail(this.app, {
           ...this.getTrailOptions(),
           fill: () =>
             collaborator.pointer?.laserColor ||
@@ -103,33 +95,36 @@ export class LaserTrails implements Trail {
         trail.start(this.container);
 
         this.collabTrails.set(key, trail);
+      } else {
+        trail = this.collabTrails.get(key)!;
       }
 
       if (collaborator.pointer && collaborator.pointer.tool === "laser") {
-        const buttonDown = collaborator.button === "down";
+        if (collaborator.button === "down" && !trail.hasCurrentTrail) {
-        const buttonUp = collaborator.button === "up";
-        const hasTrail = trail.hasCurrentTrail;
-
-        // Initialize a new trail
-        if (buttonDown && !hasTrail) {
           trail.startPath(collaborator.pointer.x, collaborator.pointer.y);
         }
 
-        // Add only original points
+        if (
-        const lastPointOriginal = !trail.hasLastPoint(
+          collaborator.button === "down" &&
-          collaborator.pointer.x,
+          trail.hasCurrentTrail &&
-          collaborator.pointer.y,
+          !trail.hasLastPoint(collaborator.pointer.x, collaborator.pointer.y)
-        );
+        ) {
-        if (buttonDown && lastPointOriginal) {
           trail.addPointToPath(collaborator.pointer.x, collaborator.pointer.y);
         }
 
-        // End the trail on button up
+        if (collaborator.button === "up" && trail.hasCurrentTrail) {
-        if (buttonUp && hasTrail) {
           trail.addPointToPath(collaborator.pointer.x, collaborator.pointer.y);
           trail.endPath();
         }
       }
     }
+
+    for (const key of this.collabTrails.keys()) {
+      if (!this.app.state.collaborators.has(key)) {
+        const trail = this.collabTrails.get(key)!;
+        trail.stop();
+        this.collabTrails.delete(key);
+      }
+    }
   }
 }

packages/excalidraw/lasso/index.ts

@@ -25,7 +25,9 @@ import type {
   NonDeleted,
 } from "@excalidraw/element/types";
 
-import { AnimatedTrail } from "../animatedTrail";
+import { type AnimationFrameHandler } from "../animation-frame-handler";
+
+import { AnimatedTrail } from "../animated-trail";
 
 import { getLassoSelectedElementIds } from "./utils";
 
@@ -45,8 +47,8 @@ export class LassoTrail extends AnimatedTrail {
   private canvasTranslate: CanvasTranslate | null = null;
   private keepPreviousSelection: boolean = false;
 
-  constructor(app: App) {
+  constructor(animationFrameHandler: AnimationFrameHandler, app: App) {
-    super(app, {
+    super(animationFrameHandler, app, {
       animateTrail: true,
       streamline: 0.4,
       sizeMapping: (c) => {

packages/excalidraw/locales/en.json

@@ -30,6 +30,9 @@
     "changeBackground": "Change background color",
     "fill": "Fill",
     "strokeWidth": "Stroke width",
+    "strokeShape": "Stroke type",
+    "strokeShape_variable": "Variable",
+    "strokeShape_fixed": "Fixed",
     "strokeStyle": "Stroke style",
     "strokeStyle_solid": "Solid",
     "strokeStyle_dashed": "Dashed",

packages/excalidraw/package.json

@@ -95,6 +95,7 @@
     "clsx": "1.1.1",
     "cross-env": "7.0.3",
     "es6-promise-pool": "2.5.0",
+    "fractional-indexing": "3.2.0",
     "fuzzy": "0.1.3",
     "image-blob-reduce": "3.0.1",
     "jotai": "2.11.0",

packages/excalidraw/polyfill.ts

@@ -23,94 +23,6 @@ const polyfill = () => {
     });
   }
 
-  if (!Array.prototype.findLast) {
-    Object.defineProperty(Array.prototype, "findLast", {
-      value: function <T>(
-        this: T[],
-        predicate: (value: T, index: number, array: T[]) => unknown,
-        thisArg?: unknown,
-      ) {
-        return this
-          .slice()
-          .reverse()
-          .find((value, index) =>
-            predicate.call(thisArg, value, this.length - index - 1, this),
-          );
-      },
-      writable: true,
-      enumerable: false,
-      configurable: true,
-    });
-  }
-
-  if (!Array.prototype.findIndex) {
-    Object.defineProperty(Array.prototype, "findIndex", {
-      value: function <T>(
-        this: T[],
-        predicate: (value: T, index: number, array: T[]) => unknown,
-        thisArg?: unknown,
-      ) {
-        for (let index = 0; index < this.length; index++) {
-          if (predicate.call(thisArg, this[index], index, this)) {
-            return index;
-          }
-        }
-
-        return -1;
-      },
-      writable: true,
-      enumerable: false,
-      configurable: true,
-    });
-  }
-
-  if (!Array.prototype.findLastIndex) {
-    Object.defineProperty(Array.prototype, "findLastIndex", {
-      value: function <T>(
-        this: T[],
-        predicate: (value: T, index: number, array: T[]) => unknown,
-        thisArg?: unknown,
-      ) {
-        const index = this
-          .slice()
-          .reverse()
-          .findIndex((value, index) =>
-            predicate.call(thisArg, value, this.length - index - 1, this),
-          );
-
-        return index === -1 ? -1 : this.length - index - 1;
-      },
-      writable: true,
-      enumerable: false,
-      configurable: true,
-    });
-  }
-
-  if (!Array.prototype.toReversed) {
-    Object.defineProperty(Array.prototype, "toReversed", {
-      value: function <T>(this: T[]) {
-        return this.slice().reverse();
-      },
-      writable: true,
-      enumerable: false,
-      configurable: true,
-    });
-  }
-
-  if (!Array.prototype.toSorted) {
-    Object.defineProperty(Array.prototype, "toSorted", {
-      value: function <T>(
-        this: T[],
-        compareFn?: (a: T, b: T) => number,
-      ) {
-        return this.slice().sort(compareFn);
-      },
-      writable: true,
-      enumerable: false,
-      configurable: true,
-    });
-  }
-
   if (!Element.prototype.replaceChildren) {
     Element.prototype.replaceChildren = function (...nodes) {
       this.innerHTML = "";

packages/excalidraw/reactUtils.ts

@@ -11,10 +11,10 @@ export const withBatchedUpdates = <
   TFunction extends ((event: any) => void) | (() => void),
 >(
   func: Parameters<TFunction>["length"] extends 0 | 1 ? TFunction : never,
-) =>
+) => func;
-  ((event) => {
+// ((event) => {
-    unstable_batchedUpdates(func as TFunction, event);
+//   unstable_batchedUpdates(func as TFunction, event);
-  }) as TFunction;
+// }) as TFunction;
 
 /**
  * barches React state updates and throttles the calls to a single call per

packages/excalidraw/renderer/animation.ts

@@ -6,10 +6,7 @@ export type Animation<R extends object> = (params: {
 }) => R | null | undefined;
 
 export class AnimationController {
-  private static scheduledFrame:
+  private static isRunning = false;
-    | { id: ReturnType<typeof requestAnimationFrame>; type: "raf" }
-    | { id: ReturnType<typeof setTimeout>; type: "timeout" }
-    | null = null;
   private static animations = new Map<
     string,
     {
@@ -20,10 +17,6 @@ export class AnimationController {
   >();
 
   static start<R extends object>(key: string, animation: Animation<R>) {
-    if (AnimationController.animations.has(key)) {
-      return;
-    }
-
     const initialState = animation({
       deltaTime: 0,
       state: undefined,
@@ -36,54 +29,19 @@ export class AnimationController {
         state: initialState,
       });
 
-      AnimationController.scheduleNextFrame();
+      if (!AnimationController.isRunning) {
+        AnimationController.isRunning = true;
+
+        if (isRenderThrottlingEnabled()) {
+          requestAnimationFrame(AnimationController.tick);
+        } else {
+          setTimeout(AnimationController.tick, 0);
+        }
+      }
     }
   }
 
-  private static scheduleNextFrame() {
-    if (AnimationController.scheduledFrame) {
-      return;
-    }
-
-    if (isRenderThrottlingEnabled()) {
-      AnimationController.scheduledFrame = {
-        id: requestAnimationFrame(AnimationController.tick),
-        type: "raf",
-      };
-    } else {
-      AnimationController.scheduledFrame = {
-        id: setTimeout(AnimationController.tick, 0),
-        type: "timeout",
-      };
-    }
-  }
-
-  private static cancelScheduledFrame() {
-    if (!AnimationController.scheduledFrame) {
-      return;
-    }
-
-    if (AnimationController.scheduledFrame.type === "raf") {
-      cancelAnimationFrame(AnimationController.scheduledFrame.id);
-    } else {
-      clearTimeout(AnimationController.scheduledFrame.id);
-    }
-
-    AnimationController.scheduledFrame = null;
-  }
-
-  private static cancelScheduledFrameIfIdle() {
-    if (AnimationController.animations.size > 0) {
-      return false;
-    }
-
-    AnimationController.cancelScheduledFrame();
-    return true;
-  }
-
   private static tick() {
-    AnimationController.scheduledFrame = null;
-
     if (AnimationController.animations.size > 0) {
       for (const [key, animation] of AnimationController.animations) {
         const now = performance.now();
@@ -98,7 +56,8 @@ export class AnimationController {
         if (!state) {
           AnimationController.animations.delete(key);
 
-          if (AnimationController.cancelScheduledFrameIfIdle()) {
+          if (AnimationController.animations.size === 0) {
+            AnimationController.isRunning = false;
             return;
           }
         } else {
@@ -107,11 +66,11 @@ export class AnimationController {
         }
       }
 
-      if (AnimationController.cancelScheduledFrameIfIdle()) {
+      if (isRenderThrottlingEnabled()) {
-        return;
+        requestAnimationFrame(AnimationController.tick);
+      } else {
+        setTimeout(AnimationController.tick, 0);
       }
-
-      AnimationController.scheduleNextFrame();
     }
   }
 
@@ -121,6 +80,5 @@ export class AnimationController {
 
   static cancel(key: string) {
     AnimationController.animations.delete(key);
-    AnimationController.cancelScheduledFrameIfIdle();
   }
 }

packages/excalidraw/renderer/interactiveScene.ts

@@ -7,6 +7,7 @@ import {
   type Radians,
   bezierEquation,
   pointRotateRads,
+  pointDistance,
 } from "@excalidraw/math";
 
 import {
@@ -23,12 +24,13 @@ import {
   deconstructDiamondElement,
   deconstructRectanguloidElement,
   elementCenterPoint,
-  getAllMidpoints,
+  getDiamondBaseCorners,
   FOCUS_POINT_SIZE,
   getOmitSidesForEditorInterface,
   getTransformHandles,
   getTransformHandlesFromCoords,
   hasBoundingBox,
+  hitElementItself,
   isArrowElement,
   isBindableElement,
   isElbowArrow,
@@ -36,6 +38,7 @@ import {
   isImageElement,
   isLinearElement,
   isLineElement,
+  maxBindingDistance_simple,
   isTextElement,
   LinearElementEditor,
   getActiveTextElement,
@@ -410,42 +413,145 @@ const renderBindingHighlightForBindableElement_simple = (
       break;
   }
 
-  // Draw midpoint indicators
   if (
     appState.isMidpointSnappingEnabled &&
     (isFrameLikeElement(suggestedBinding.element) ||
       isBindableElement(suggestedBinding.element))
   ) {
-    context.save();
+    // Draw midpoint indicators
+    const linearElement = appState.selectedLinearElement;
+    const arrow =
+      linearElement?.elementId &&
+      LinearElementEditor.getElement(linearElement?.elementId, elementsMap);
+    const cursorIsInsideBindable =
+      pointerCoords &&
+      hitElementItself({
+        point: pointerCoords,
+        element: suggestedBinding.element,
+        elementsMap,
+        threshold: 0,
+        overrideShouldTestInside: true,
+      });
 
-    const midpointRadius = 4 / appState.zoom.value;
+    const isElbow =
+      (arrow && isElbowArrow(arrow)) ||
+      (appState.activeTool.type === "arrow" &&
+        appState.currentItemArrowType === "elbow");
 
-    // Render base midpoints
+    if (!cursorIsInsideBindable || isElbow) {
-    const midpoints = getAllMidpoints(suggestedBinding.element, elementsMap);
+      context.save();
-    for (const midpoint of midpoints) {
+
-      context.fillStyle =
+      const center = elementCenterPoint(suggestedBinding.element, elementsMap);
-        appState.theme === THEME.DARK
+
-          ? `rgba(0, 0, 0, 0.8)`
+      let midpoints: GlobalPoint[];
-          : `rgba(65, 65, 65, 0.5)`;
+      if (suggestedBinding.element.type === "diamond") {
-      context.beginPath();
+        const center = elementCenterPoint(
-      context.arc(midpoint[0], midpoint[1], midpointRadius, 0, 2 * Math.PI);
+          suggestedBinding.element,
-      context.fill();
+          elementsMap,
+        );
+        midpoints = getDiamondBaseCorners(suggestedBinding.element).map(
+          (curve) => {
+            const point = bezierEquation(curve, 0.5);
+            const rotatedPoint = pointRotateRads(
+              point,
+              center,
+              suggestedBinding.element.angle,
+            );
+
+            return pointFrom<GlobalPoint>(rotatedPoint[0], rotatedPoint[1]);
+          },
+        );
+      } else {
+        const basePoints = [
+          {
+            x: suggestedBinding.element.width,
+            y: suggestedBinding.element.height / 2,
+          }, // RIGHT
+          {
+            x: suggestedBinding.element.width / 2,
+            y: suggestedBinding.element.height,
+          }, // BOTTOM
+          { x: 0, y: suggestedBinding.element.height / 2 }, // LEFT
+          { x: suggestedBinding.element.width / 2, y: 0 }, // TOP
+        ];
+        midpoints = basePoints.map((point) => {
+          const globalPoint = pointFrom<GlobalPoint>(
+            point.x + suggestedBinding.element.x,
+            point.y + suggestedBinding.element.y,
+          );
+          const rotatedPoint = pointRotateRads(
+            globalPoint,
+            center,
+            suggestedBinding.element.angle,
+          );
+          return pointFrom<GlobalPoint>(rotatedPoint[0], rotatedPoint[1]);
+        });
+      }
+
+      const hoveredMidpoint =
+        pointerCoords &&
+        midpoints.reduce(
+          (
+            closestIdx: {
+              idx: number;
+              distance: number;
+            },
+            point,
+            idx,
+          ) => {
+            const distance = pointDistance(point, pointerCoords);
+            if (idx === -1 || distance < closestIdx.distance) {
+              return { idx, distance };
+            }
+            return closestIdx;
+          },
+          {
+            idx: -1,
+            distance: Infinity,
+          },
+        );
+
+      const midpointRadius = 4 / appState.zoom.value;
+      const highlightThreshold =
+        maxBindingDistance_simple(appState.zoom) +
+        suggestedBinding.element.strokeWidth / 2;
+
+      midpoints.forEach((midpoint, idx) => {
+        const isHighlighted =
+          (!cursorIsInsideBindable || isElbow) &&
+          hoveredMidpoint?.idx === idx &&
+          hoveredMidpoint.distance <= highlightThreshold;
+
+        // also render midpoint if cursor close but not highlighted
+        // (for elbows, always show all points)
+        const isShown =
+          !isHighlighted &&
+          (isElbow ||
+            (idx === hoveredMidpoint?.idx &&
+              hoveredMidpoint.distance <= highlightThreshold * 2));
+
+        if (isHighlighted) {
+          context.fillStyle =
+            appState.theme === THEME.DARK
+              ? `rgba(3, 93, 161, 1)`
+              : `rgba(106, 189, 252, 1)`;
+
+          context.beginPath();
+          context.arc(midpoint[0], midpoint[1], midpointRadius, 0, 2 * Math.PI);
+          context.fill();
+        } else if (isShown) {
+          context.fillStyle =
+            appState.theme === THEME.DARK
+              ? `rgba(0, 0, 0, 0.8)`
+              : `rgba(65, 65, 65, 0.5)`;
+          context.beginPath();
+          context.arc(midpoint[0], midpoint[1], midpointRadius, 0, 2 * Math.PI);
+          context.fill();
+        }
+      });
+
+      context.restore();
     }
-
-    // Render the highlighted midpoint if any
-    const midpoint = appState.suggestedBinding?.midPoint;
-    if (midpoint) {
-      context.fillStyle =
-        appState.theme === THEME.DARK
-          ? `rgba(3, 93, 161, 1)`
-          : `rgba(106, 189, 252, 1)`;
-
-      context.beginPath();
-      context.arc(midpoint[0], midpoint[1], midpointRadius, 0, 2 * Math.PI);
-      context.fill();
-    }
-
-    context.restore();
   }
 };
 

packages/excalidraw/renderer/staticSvgScene.ts

@@ -376,6 +376,11 @@ const renderElementToSvg = (
     }
     case "freedraw": {
       const wrapper = svgRoot.ownerDocument.createElementNS(SVG_NS, "g");
+      const isFixedStroke = element.strokeShape === "fixed";
+      const strokeColor =
+        renderConfig.theme === THEME.DARK
+          ? applyDarkModeFilter(element.strokeColor)
+          : element.strokeColor;
 
       const shapes = ShapeCache.generateElementShape(element, renderConfig);
       // always ordered as [background, stroke]
@@ -384,12 +389,15 @@ const renderElementToSvg = (
           // stroke (SVGPathString)
 
           const path = svgRoot.ownerDocument.createElementNS(SVG_NS, "path");
-          path.setAttribute(
+          if (isFixedStroke) {
-            "fill",
+            path.setAttribute("fill", "none");
-            renderConfig.theme === THEME.DARK
+            path.setAttribute("stroke", strokeColor);
-              ? applyDarkModeFilter(element.strokeColor)
+            path.setAttribute("stroke-width", `${element.strokeWidth}`);
-              : element.strokeColor,
+            path.setAttribute("stroke-linecap", "round");
-          );
+            path.setAttribute("stroke-linejoin", "round");
+          } else {
+            path.setAttribute("fill", strokeColor);
+          }
           path.setAttribute("d", shape);
           wrapper.appendChild(path);
         } else {

packages/excalidraw/scene/Renderer.ts

@@ -1,15 +1,9 @@
-import {
+import { isElementInViewport } from "@excalidraw/element";
-  getCommonFrameId,
-  getFrameChildrenInsertionIndex,
-  isElementInViewport,
-} from "@excalidraw/element";
 
-import { arrayToMap, memoize, toBrandedType } from "@excalidraw/common";
+import { memoize, toBrandedType } from "@excalidraw/common";
 
 import type {
   ExcalidrawElement,
-  ExcalidrawFrameLikeElement,
-  NonDeleted,
   NonDeletedElementsMap,
   NonDeletedExcalidrawElement,
 } from "@excalidraw/element/types";
@@ -22,21 +16,6 @@ import type { RenderableElementsMap } from "./types";
 
 import type { AppState } from "../types";
 
-type GetRenderableElementsOpts = {
-  zoom: AppState["zoom"];
-  offsetLeft: AppState["offsetLeft"];
-  offsetTop: AppState["offsetTop"];
-  scrollX: AppState["scrollX"];
-  scrollY: AppState["scrollY"];
-  height: AppState["height"];
-  width: AppState["width"];
-  editingTextElement: AppState["editingTextElement"];
-  newElement: AppState["newElement"];
-  selectedElements: readonly NonDeletedExcalidrawElement[];
-  selectedElementsAreBeingDragged: AppState["selectedElementsAreBeingDragged"];
-  frameToHighlight: AppState["frameToHighlight"];
-};
-
 export class Renderer {
   private scene: Scene;
 
@@ -44,121 +23,9 @@ export class Renderer {
     this.scene = scene;
   }
 
-  private getVisibleCanvasElements({
+  public getRenderableElements = (() => {
-    elementsMap,
+    const getVisibleCanvasElements = ({
-    zoom,
+      elementsMap,
-    offsetLeft,
-    offsetTop,
-    scrollX,
-    scrollY,
-    height,
-    width,
-  }: {
-    elementsMap: NonDeletedElementsMap;
-    zoom: AppState["zoom"];
-    offsetLeft: AppState["offsetLeft"];
-    offsetTop: AppState["offsetTop"];
-    scrollX: AppState["scrollX"];
-    scrollY: AppState["scrollY"];
-    height: AppState["height"];
-    width: AppState["width"];
-  }): readonly NonDeletedExcalidrawElement[] {
-    const visibleElements: NonDeletedExcalidrawElement[] = [];
-    for (const element of elementsMap.values()) {
-      if (
-        isElementInViewport(
-          element,
-          width,
-          height,
-          {
-            zoom,
-            offsetLeft,
-            offsetTop,
-            scrollX,
-            scrollY,
-          },
-          elementsMap,
-        )
-      ) {
-        visibleElements.push(element);
-      }
-    }
-    return visibleElements;
-  }
-
-  private getRenderableElementsMap({
-    elements,
-    editingTextElement,
-    newElement,
-  }: {
-    elements: readonly NonDeletedExcalidrawElement[];
-    editingTextElement: AppState["editingTextElement"];
-    newElement: AppState["newElement"];
-  }) {
-    const elementsMap = toBrandedType<RenderableElementsMap>(new Map());
-    const newElementCanvasElement = newElement?.frameId ? null : newElement;
-
-    for (const element of elements) {
-      if (newElementCanvasElement?.id === element.id) {
-        continue;
-      }
-
-      // we don't want to render text element that's being currently edited
-      // (it's rendered on remote only)
-      if (
-        !editingTextElement ||
-        editingTextElement.type !== "text" ||
-        element.id !== editingTextElement.id
-      ) {
-        elementsMap.set(element.id, element);
-      }
-    }
-    return { elementsMap, newElementCanvasElement };
-  }
-
-  private sortSelectedElementsIntoHighlightedFrame<
-    T extends ExcalidrawElement,
-  >({
-    visibleElements,
-    selectedElements,
-    frameToHighlight,
-  }: {
-    selectedElements: readonly NonDeletedExcalidrawElement[];
-    visibleElements: readonly T[];
-    frameToHighlight: NonDeleted<ExcalidrawFrameLikeElement>;
-  }): readonly T[] {
-    if (!selectedElements.length) {
-      return visibleElements;
-    }
-
-    // we assume all selected elements are eligible frame children if
-    // frameToHighlight is defined
-    const selectedElementsMap = arrayToMap(selectedElements);
-
-    // thus, all deselected elements are the ones we won't reorder
-    const deselectedElements = visibleElements.filter(
-      (element) => !selectedElementsMap.has(element.id),
-    );
-
-    const insertionIndex = getFrameChildrenInsertionIndex(
-      deselectedElements,
-      frameToHighlight.id,
-    );
-
-    if (insertionIndex === null) {
-      return visibleElements;
-    }
-
-    return [
-      ...deselectedElements.slice(0, insertionIndex),
-      ...selectedElements,
-      ...deselectedElements.slice(insertionIndex),
-    ] as readonly T[];
-  }
-
-  private _getRenderableElements = memoize(
-    ({
-      canvasNonce,
       zoom,
       offsetLeft,
       offsetTop,
@@ -166,27 +33,70 @@ export class Renderer {
       scrollY,
       height,
       width,
+    }: {
+      elementsMap: NonDeletedElementsMap;
+      zoom: AppState["zoom"];
+      offsetLeft: AppState["offsetLeft"];
+      offsetTop: AppState["offsetTop"];
+      scrollX: AppState["scrollX"];
+      scrollY: AppState["scrollY"];
+      height: AppState["height"];
+      width: AppState["width"];
+    }): readonly NonDeletedExcalidrawElement[] => {
+      const visibleElements: NonDeletedExcalidrawElement[] = [];
+      for (const element of elementsMap.values()) {
+        if (
+          isElementInViewport(
+            element,
+            width,
+            height,
+            {
+              zoom,
+              offsetLeft,
+              offsetTop,
+              scrollX,
+              scrollY,
+            },
+            elementsMap,
+          )
+        ) {
+          visibleElements.push(element);
+        }
+      }
+      return visibleElements;
+    };
+
+    const getRenderableElements = ({
+      elements,
       editingTextElement,
-      newElement,
+      newElementId,
-    }: Omit<
+    }: {
-      GetRenderableElementsOpts,
+      elements: readonly NonDeletedExcalidrawElement[];
-      | "selectedElements"
+      editingTextElement: AppState["editingTextElement"];
-      | "selectedElementsAreBeingDragged"
+      newElementId: ExcalidrawElement["id"] | undefined;
-      | "frameToHighlight"
-    > & {
-      canvasNonce: string;
     }) => {
-      const elements = this.scene.getNonDeletedElements();
+      const elementsMap = toBrandedType<RenderableElementsMap>(new Map());
 
-      const { elementsMap, newElementCanvasElement } =
+      for (const element of elements) {
-        this.getRenderableElementsMap({
+        if (newElementId === element.id) {
-          elements,
+          continue;
-          editingTextElement,
+        }
-          newElement,
-        });
 
-      const visibleElements = this.getVisibleCanvasElements({
+        // we don't want to render text element that's being currently edited
-        elementsMap,
+        // (it's rendered on remote only)
+        if (
+          !editingTextElement ||
+          editingTextElement.type !== "text" ||
+          element.id !== editingTextElement.id
+        ) {
+          elementsMap.set(element.id, element);
+        }
+      }
+      return elementsMap;
+    };
+
+    return memoize(
+      ({
         zoom,
         offsetLeft,
         offsetTop,
@@ -194,69 +104,52 @@ export class Renderer {
         scrollY,
         height,
         width,
-      });
+        editingTextElement,
+        newElementId,
+        // cache-invalidation nonce
+        sceneNonce: _sceneNonce,
+      }: {
+        zoom: AppState["zoom"];
+        offsetLeft: AppState["offsetLeft"];
+        offsetTop: AppState["offsetTop"];
+        scrollX: AppState["scrollX"];
+        scrollY: AppState["scrollY"];
+        height: AppState["height"];
+        width: AppState["width"];
+        editingTextElement: AppState["editingTextElement"];
+        /** note: first render of newElement will always bust the cache
+         * (we'd have to prefilter elements outside of this function) */
+        newElementId: ExcalidrawElement["id"] | undefined;
+        sceneNonce: ReturnType<InstanceType<typeof Scene>["getSceneNonce"]>;
+      }) => {
+        const elements = this.scene.getNonDeletedElements();
 
-      return {
+        const elementsMap = getRenderableElements({
-        elementsMap,
+          elements,
-        visibleElements,
+          editingTextElement,
-        newElementCanvasElement,
+          newElementId,
-        canvasNonce,
-      };
-    },
-  );
-
-  public getRenderableElements = (opts: GetRenderableElementsOpts) => {
-    const { newElement } = opts;
-    const canvasNonce = `${this.scene.getSceneNonce()}${
-      newElement?.frameId ? `:${newElement.versionNonce}` : ""
-    }`;
-
-    const ret = this._getRenderableElements({
-      canvasNonce,
-
-      // don't spread `opts` because we don't want to memoize on some props
-
-      zoom: opts.zoom,
-      offsetLeft: opts.offsetLeft,
-      offsetTop: opts.offsetTop,
-      scrollX: opts.scrollX,
-      scrollY: opts.scrollY,
-      height: opts.height,
-      width: opts.width,
-      editingTextElement: opts.editingTextElement,
-      newElement: opts.newElement,
-    });
-
-    // if we're dragging elements over a frame, reorder the selected elements
-    // inside the frame during render (we don't set the `element.frameId` until
-    // pointerup else we'd have to painstainly restore the orig index if user
-    // didn't end up adding elements to the frame)
-    if (
-      opts.frameToHighlight &&
-      opts.selectedElementsAreBeingDragged &&
-      // if all dragged elements are already in the frame, don't reorder
-      getCommonFrameId(opts.selectedElements) !== opts.frameToHighlight.id
-    ) {
-      const reorderedVisibleElements =
-        this.sortSelectedElementsIntoHighlightedFrame({
-          visibleElements: ret.visibleElements,
-          selectedElements: opts.selectedElements,
-          frameToHighlight: opts.frameToHighlight,
         });
 
-      return {
+        const visibleElements = getVisibleCanvasElements({
-        ...ret,
+          elementsMap,
-        visibleElements: reorderedVisibleElements,
+          zoom,
-      };
+          offsetLeft,
-    }
+          offsetTop,
+          scrollX,
+          scrollY,
+          height,
+          width,
+        });
 
-    return ret;
+        return { elementsMap, visibleElements };
-  };
+      },
+    );
+  })();
 
   // NOTE Doesn't destroy everything (scene, rc, etc.) because it may not be
   // safe to break TS contract here (for upstream cases)
   public destroy() {
     renderStaticSceneThrottled.cancel();
-    this._getRenderableElements.clear();
+    this.getRenderableElements.clear();
   }
 }

packages/excalidraw/tests/MermaidToExcalidraw.test.tsx

@@ -83,26 +83,6 @@ mockMermaidToExcalidraw({
   },
 });
 
-const normalizeDialogSnapshot = (dialog: Element) => {
-  const dialogClone = dialog.cloneNode(true) as HTMLElement;
-
-  dialogClone
-    .querySelectorAll<HTMLElement>(".ttd-dialog-content")
-    .forEach((element) => {
-      // Radix Tabs injects this during initial mount animation prevention.
-      // Its presence depends on render timing and is unrelated to this test.
-      if (element.style.animationDuration === "0s") {
-        element.style.removeProperty("animation-duration");
-      }
-
-      if (!element.getAttribute("style")) {
-        element.removeAttribute("style");
-      }
-    });
-
-  return dialogClone.outerHTML;
-};
-
 describe("Test <MermaidToExcalidraw/>", () => {
   beforeEach(async () => {
     await render(
@@ -119,7 +99,7 @@ describe("Test <MermaidToExcalidraw/>", () => {
   it("should open mermaid popup when active tool is mermaid", async () => {
     const dialog = document.querySelector(".ttd-dialog")!;
     await waitFor(() => expect(dialog.querySelector("canvas")).not.toBeNull());
-    expect(normalizeDialogSnapshot(dialog)).toMatchSnapshot();
+    expect(dialog.outerHTML).toMatchSnapshot();
   });
 
   it("should show error in preview when mermaid library throws error", async () => {

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

@@ -1,6 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`Test <MermaidToExcalidraw/> > should open mermaid popup when active tool is mermaid 1`] = `"<div class="Modal Dialog ttd-dialog" role="dialog" aria-modal="true" aria-labelledby="dialog-title"><div class="Modal__background"></div><div class="Modal__content" style="--max-width: 1520px;" tabindex="0"><div class="Island"><div class="Dialog__content"><div dir="ltr" data-orientation="horizontal" class="ttd-dialog-tabs-root"><p class="dialog-mermaid-title">Mermaid to Excalidraw</p><div data-state="active" data-orientation="horizontal" role="tabpanel" aria-labelledby="radix-:r4:-trigger-mermaid" id="radix-:r4:-content-mermaid" tabindex="0" class="ttd-dialog-content"><div class="ttd-dialog-desc">Currently only <a href="https://mermaid.js.org/syntax/flowchart.html" target="_blank" rel="noreferrer">Flowchart</a>, <a href="https://mermaid.js.org/syntax/sequenceDiagram.html" target="_blank" rel="noreferrer">Sequence</a>, <a href="https://mermaid.js.org/syntax/classDiagram.html" target="_blank" rel="noreferrer">Class</a>, and <a href="https://mermaid.js.org/syntax/entityRelationshipDiagram.html" target="_blank" rel="noreferrer">Entity Relationship</a> Diagrams are supported. The other types will be rendered as image in Excalidraw.</div><div class="ttd-dialog-panels"><div class="ttd-dialog-panel"><div class="ttd-dialog-panel-button-container invisible" style="justify-content: flex-start;"></div></div><div class="ttd-dialog-panel"><div class="ttd-dialog-output-wrapper "><div class="ttd-dialog-output-canvas-container"><div class="ttd-dialog-output-canvas-content"><canvas width="89" height="158" dir="ltr"></canvas></div></div></div><div class="ttd-dialog-panel-button-container" style="justify-content: flex-start;"><button type="button" class="excalidraw-button ttd-dialog-panel-button"><div class="">Insert<span><svg aria-hidden="true" focusable="false" role="img" viewBox="0 0 20 20" class="" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"><g stroke-width="1.25"><path d="M4.16602 10H15.8327"></path><path d="M12.5 13.3333L15.8333 10"></path><path d="M12.5 6.66666L15.8333 9.99999"></path></g></svg></span></div></button><div class="ttd-dialog-submit-shortcut"><div class="ttd-dialog-submit-shortcut__key">Ctrl</div><div class="ttd-dialog-submit-shortcut__key">Enter</div></div></div></div></div></div></div></div></div></div></div>"`;
+exports[`Test <MermaidToExcalidraw/> > should open mermaid popup when active tool is mermaid 1`] = `"<div class="Modal Dialog ttd-dialog" role="dialog" aria-modal="true" aria-labelledby="dialog-title"><div class="Modal__background"></div><div class="Modal__content" style="--max-width: 1520px;" tabindex="0"><div class="Island"><div class="Dialog__content"><div dir="ltr" data-orientation="horizontal" class="ttd-dialog-tabs-root"><p class="dialog-mermaid-title">Mermaid to Excalidraw</p><div data-state="active" data-orientation="horizontal" role="tabpanel" aria-labelledby="radix-:r4:-trigger-mermaid" id="radix-:r4:-content-mermaid" tabindex="0" class="ttd-dialog-content" style=""><div class="ttd-dialog-desc">Currently only <a href="https://mermaid.js.org/syntax/flowchart.html" target="_blank" rel="noreferrer">Flowchart</a>, <a href="https://mermaid.js.org/syntax/sequenceDiagram.html" target="_blank" rel="noreferrer">Sequence</a>, <a href="https://mermaid.js.org/syntax/classDiagram.html" target="_blank" rel="noreferrer">Class</a>, and <a href="https://mermaid.js.org/syntax/entityRelationshipDiagram.html" target="_blank" rel="noreferrer">Entity Relationship</a> Diagrams are supported. The other types will be rendered as image in Excalidraw.</div><div class="ttd-dialog-panels"><div class="ttd-dialog-panel"><div class="ttd-dialog-panel-button-container invisible" style="justify-content: flex-start;"></div></div><div class="ttd-dialog-panel"><div class="ttd-dialog-output-wrapper "><div class="ttd-dialog-output-canvas-container"><div class="ttd-dialog-output-canvas-content"><canvas width="89" height="158" dir="ltr"></canvas></div></div></div><div class="ttd-dialog-panel-button-container" style="justify-content: flex-start;"><button type="button" class="excalidraw-button ttd-dialog-panel-button"><div class="">Insert<span><svg aria-hidden="true" focusable="false" role="img" viewBox="0 0 20 20" class="" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"><g stroke-width="1.25"><path d="M4.16602 10H15.8327"></path><path d="M12.5 13.3333L15.8333 10"></path><path d="M12.5 6.66666L15.8333 9.99999"></path></g></svg></span></div></button><div class="ttd-dialog-submit-shortcut"><div class="ttd-dialog-submit-shortcut__key">Ctrl</div><div class="ttd-dialog-submit-shortcut__key">Enter</div></div></div></div></div></div></div></div></div></div></div>"`;
 
 exports[`Test <MermaidToExcalidraw/> > should show error in preview when mermaid library throws error 1`] = `
 "flowchart TD

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

@@ -979,6 +979,7 @@ exports[`contextMenu element > right-clicking on a group should select whole gro
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -1172,6 +1173,7 @@ exports[`contextMenu element > selecting 'Add to library' in context menu adds e
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -1386,6 +1388,7 @@ exports[`contextMenu element > selecting 'Bring forward' in context menu brings
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -1717,6 +1720,7 @@ exports[`contextMenu element > selecting 'Bring to front' in context menu brings
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2048,6 +2052,7 @@ exports[`contextMenu element > selecting 'Copy styles' in context menu copies st
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2260,6 +2265,7 @@ exports[`contextMenu element > selecting 'Delete' in context menu deletes elemen
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2503,6 +2509,7 @@ exports[`contextMenu element > selecting 'Duplicate' in context menu duplicates
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2806,6 +2813,7 @@ exports[`contextMenu element > selecting 'Group selection' in context menu group
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3173,6 +3181,7 @@ exports[`contextMenu element > selecting 'Paste styles' in context menu pastes s
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3666,6 +3675,7 @@ exports[`contextMenu element > selecting 'Send backward' in context menu sends e
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3989,6 +3999,7 @@ exports[`contextMenu element > selecting 'Send to back' in context menu sends el
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -4315,6 +4326,7 @@ exports[`contextMenu element > selecting 'Ungroup selection' in context menu ung
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -5600,6 +5612,7 @@ exports[`contextMenu element > shows 'Group selection' in context menu for multi
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -6819,6 +6832,7 @@ exports[`contextMenu element > shows 'Ungroup selection' in context menu for gro
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -7772,6 +7786,7 @@ exports[`contextMenu element > shows context menu for canvas > [end of test] app
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -8771,6 +8786,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -9765,6 +9781,7 @@ exports[`contextMenu element > shows context menu for element > [end of test] ap
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,

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

@@ -98,6 +98,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -731,6 +732,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -1291,6 +1293,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -1651,6 +1654,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2013,6 +2017,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2275,6 +2280,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2374,7 +2380,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "endBinding": {
     "elementId": "id1",
     "fixedPoint": [
-      "0.50010",
+      0,
       "0.50010",
     ],
     "mode": "orbit",
@@ -2382,7 +2388,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "fillStyle": "solid",
   "frameId": null,
   "groupIds": [],
-  "height": "399.26547",
+  "height": "439.20000",
   "id": "id4",
   "index": "a2",
   "isDeleted": false,
@@ -2396,8 +2402,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       0,
     ],
     [
-      "488.00000",
+      488,
-      "-399.26547",
+      "-439.20000",
     ],
   ],
   "roughness": 1,
@@ -2419,9 +2425,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
   "type": "arrow",
   "updated": 1,
   "version": 11,
-  "width": "488.00000",
+  "width": 488,
   "x": 6,
-  "y": "-4.89900",
+  "y": "-5.39000",
 }
 `;
 
@@ -2542,7 +2548,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
             "endBinding": {
               "elementId": "id1",
               "fixedPoint": [
-                "0.50010",
+                0,
                 "0.50010",
               ],
               "mode": "orbit",
@@ -2550,7 +2556,7 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
             "fillStyle": "solid",
             "frameId": null,
             "groupIds": [],
-            "height": "399.26547",
+            "height": "439.20000",
             "index": "a2",
             "isDeleted": false,
             "link": null,
@@ -2562,8 +2568,8 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
                 0,
               ],
               [
-                "488.00000",
+                488,
-                "-399.26547",
+                "-439.20000",
               ],
             ],
             "roughness": 1,
@@ -2584,9 +2590,9 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
             "strokeWidth": 2,
             "type": "arrow",
             "version": 11,
-            "width": "488.00000",
+            "width": 488,
             "x": 6,
-            "y": "-4.89900",
+            "y": "-5.39000",
           },
           "inserted": {
             "isDeleted": true,
@@ -2729,6 +2735,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3032,6 +3039,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3351,6 +3359,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3645,6 +3654,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3931,6 +3941,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -4166,6 +4177,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -4423,6 +4435,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -4694,6 +4707,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -4923,6 +4937,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -5152,6 +5167,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -5399,6 +5415,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -5655,6 +5672,7 @@ exports[`history > multiplayer undo/redo > conflicts in frames and their childre
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -5912,6 +5930,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -6241,6 +6260,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -6671,6 +6691,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -7051,6 +7072,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -7352,6 +7374,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -7644,6 +7667,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -7874,6 +7898,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -8226,6 +8251,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -8584,6 +8610,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -8984,6 +9011,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -9265,6 +9293,7 @@ exports[`history > multiplayer undo/redo > should not let remote changes to inte
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -9529,6 +9558,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -9794,6 +9824,7 @@ exports[`history > multiplayer undo/redo > should not override remote changes on
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -10027,6 +10058,7 @@ exports[`history > multiplayer undo/redo > should override remotely added groups
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -10323,6 +10355,7 @@ exports[`history > multiplayer undo/redo > should override remotely added points
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -10638,6 +10671,7 @@ exports[`history > multiplayer undo/redo > should redistribute deltas when eleme
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -10877,6 +10911,7 @@ exports[`history > multiplayer undo/redo > should redraw arrows on undo > [end o
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -11801,6 +11836,7 @@ exports[`history > multiplayer undo/redo > should update history entries after r
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -12059,6 +12095,7 @@ exports[`history > singleplayer undo/redo > remounting undo/redo buttons should
   "showHyperlinkPopup": false,
   "showWelcomeScreen": false,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -12296,6 +12333,7 @@ exports[`history > singleplayer undo/redo > should clear the redo stack on eleme
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -12531,6 +12569,7 @@ exports[`history > singleplayer undo/redo > should create entry when selecting f
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -12927,6 +12966,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -13134,6 +13174,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on e
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -13345,6 +13386,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on i
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -13643,6 +13685,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on i
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -13941,6 +13984,7 @@ exports[`history > singleplayer undo/redo > should create new history entry on s
   "showHyperlinkPopup": false,
   "showWelcomeScreen": false,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -14185,6 +14229,7 @@ exports[`history > singleplayer undo/redo > should disable undo/redo buttons whe
   "showHyperlinkPopup": false,
   "showWelcomeScreen": false,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -14422,6 +14467,7 @@ exports[`history > singleplayer undo/redo > should end up with no history entry
   "showHyperlinkPopup": false,
   "showWelcomeScreen": false,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -14659,6 +14705,7 @@ exports[`history > singleplayer undo/redo > should iterate through the history w
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -14906,6 +14953,7 @@ exports[`history > singleplayer undo/redo > should not clear the redo stack on s
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -15238,6 +15286,7 @@ exports[`history > singleplayer undo/redo > should not collapse when applying co
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -15410,6 +15459,7 @@ exports[`history > singleplayer undo/redo > should not end up with history entry
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -15692,6 +15742,7 @@ exports[`history > singleplayer undo/redo > should not end up with history entry
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -15955,6 +16006,7 @@ exports[`history > singleplayer undo/redo > should not modify anything on unrela
   "showHyperlinkPopup": false,
   "showWelcomeScreen": false,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -16109,6 +16161,7 @@ exports[`history > singleplayer undo/redo > should not override appstate changes
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -16390,6 +16443,7 @@ exports[`history > singleplayer undo/redo > should support appstate name or view
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -16553,6 +16607,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -17301,6 +17356,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -17947,6 +18003,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -18591,6 +18648,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -19343,6 +19401,7 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -20111,6 +20170,7 @@ exports[`history > singleplayer undo/redo > should support changes in elements'
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -20593,6 +20653,7 @@ exports[`history > singleplayer undo/redo > should support duplication of groups
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -21099,6 +21160,7 @@ exports[`history > singleplayer undo/redo > should support element creation, del
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -21560,6 +21622,7 @@ exports[`history > singleplayer undo/redo > should support linear element creati
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,

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

@@ -106,6 +106,7 @@ exports[`given element A and group of elements B and given both are selected whe
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -534,6 +535,7 @@ exports[`given element A and group of elements B and given both are selected whe
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -941,6 +943,7 @@ exports[`regression tests > Cmd/Ctrl-click exclusively select element under poin
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -1507,6 +1510,7 @@ exports[`regression tests > Drags selected element when hitting only bounding bo
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -1719,6 +1723,7 @@ exports[`regression tests > adjusts z order when grouping > [end of test] appSta
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2100,6 +2105,7 @@ exports[`regression tests > alt-drag duplicates an element > [end of test] appSt
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2343,6 +2349,7 @@ exports[`regression tests > arrow keys > [end of test] appState 1`] = `
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2525,6 +2532,7 @@ exports[`regression tests > can drag element that covers another element, while
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -2848,6 +2856,7 @@ exports[`regression tests > change the properties of a shape > [end of test] app
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3105,6 +3114,7 @@ exports[`regression tests > click on an element and drag it > [dragged] appState
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3346,6 +3356,7 @@ exports[`regression tests > click on an element and drag it > [end of test] appS
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3582,6 +3593,7 @@ exports[`regression tests > click to select a shape > [end of test] appState 1`]
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -3841,6 +3853,7 @@ exports[`regression tests > click-drag to select a group > [end of test] appStat
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -4154,6 +4167,7 @@ exports[`regression tests > deleting last but one element in editing group shoul
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -4617,6 +4631,7 @@ exports[`regression tests > deselects group of selected elements on pointer down
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -4872,6 +4887,7 @@ exports[`regression tests > deselects group of selected elements on pointer up w
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -5175,6 +5191,7 @@ exports[`regression tests > deselects selected element on pointer down when poin
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -5355,6 +5372,7 @@ exports[`regression tests > deselects selected element, on pointer up, when clic
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -5555,6 +5573,7 @@ exports[`regression tests > double click to edit a group > [end of test] appStat
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -5952,6 +5971,7 @@ exports[`regression tests > drags selected elements from point inside common bou
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -6243,6 +6263,7 @@ exports[`regression tests > draw every type of shape > [end of test] appState 1`
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -7036,6 +7057,7 @@ exports[`regression tests > given a group of selected elements with an element t
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -7370,6 +7392,7 @@ exports[`regression tests > given a selected element A and a not selected elemen
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -7648,6 +7671,7 @@ exports[`regression tests > given selected element A with lower z-index than uns
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -7883,6 +7907,7 @@ exports[`regression tests > given selected element A with lower z-index than uns
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -8121,6 +8146,7 @@ exports[`regression tests > key 2 selects rectangle tool > [end of test] appStat
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -8301,6 +8327,7 @@ exports[`regression tests > key 3 selects diamond tool > [end of test] appState
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -8481,6 +8508,7 @@ exports[`regression tests > key 4 selects ellipse tool > [end of test] appState
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -8691,6 +8719,7 @@ exports[`regression tests > key 5 selects arrow tool > [end of test] appState 1`
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -8923,6 +8952,7 @@ exports[`regression tests > key 6 selects line tool > [end of test] appState 1`]
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -9121,6 +9151,7 @@ exports[`regression tests > key 7 selects freedraw tool > [end of test] appState
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -9345,6 +9376,7 @@ exports[`regression tests > key a selects arrow tool > [end of test] appState 1`
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -9547,6 +9579,7 @@ exports[`regression tests > key d selects diamond tool > [end of test] appState
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -9757,6 +9790,7 @@ exports[`regression tests > key l selects line tool > [end of test] appState 1`]
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -9957,6 +9991,7 @@ exports[`regression tests > key o selects ellipse tool > [end of test] appState
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -10135,6 +10170,7 @@ exports[`regression tests > key p selects freedraw tool > [end of test] appState
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -10329,6 +10365,7 @@ exports[`regression tests > key r selects rectangle tool > [end of test] appStat
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -10517,6 +10554,7 @@ exports[`regression tests > make a group and duplicate it > [end of test] appSta
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -11042,6 +11080,7 @@ exports[`regression tests > noop interaction after undo shouldn't create history
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -11318,6 +11357,7 @@ exports[`regression tests > pinch-to-zoom works > [end of test] appState 1`] = `
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -11443,6 +11483,7 @@ exports[`regression tests > shift click on selected element should deselect it o
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -11647,6 +11688,7 @@ exports[`regression tests > shift-click to multiselect, then drag > [end of test
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -11968,6 +12010,7 @@ exports[`regression tests > should group elements and ungroup them > [end of tes
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -12401,6 +12444,7 @@ exports[`regression tests > single-clicking on a subgroup of a selected group sh
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -13032,6 +13076,7 @@ exports[`regression tests > spacebar + drag scrolls the canvas > [end of test] a
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -13159,6 +13204,7 @@ exports[`regression tests > supports nested groups > [end of test] appState 1`]
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -13819,6 +13865,7 @@ exports[`regression tests > switches from group of selected elements to another
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -14157,6 +14204,7 @@ exports[`regression tests > switches selected element on pointer down > [end of
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -14389,6 +14437,7 @@ exports[`regression tests > two-finger scroll works > [end of test] appState 1`]
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -14514,6 +14563,7 @@ exports[`regression tests > undo/redo drawing an element > [end of test] appStat
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -14876,6 +14926,7 @@ exports[`regression tests > updates fontSize & fontFamily appState > [end of tes
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,
@@ -15002,6 +15053,7 @@ exports[`regression tests > zoom hotkeys > [end of test] appState 1`] = `
   "showHyperlinkPopup": false,
   "showWelcomeScreen": true,
   "snapLines": [],
+  "startBoundElement": null,
   "stats": {
     "open": false,
     "panels": 3,

packages/excalidraw/tests/animation.test.ts

@@ -1,73 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-
-import { AnimationController } from "../renderer/animation";
-
-const FIRST_KEY = "animation-test-first";
-const SECOND_KEY = "animation-test-second";
-
-describe("AnimationController", () => {
-  beforeEach(() => {
-    vi.useFakeTimers();
-    window.EXCALIDRAW_THROTTLE_RENDER = false;
-  });
-
-  afterEach(() => {
-    AnimationController.cancel(FIRST_KEY);
-    AnimationController.cancel(SECOND_KEY);
-    window.EXCALIDRAW_THROTTLE_RENDER = undefined;
-    vi.useRealTimers();
-  });
-
-  it("starts a new animation after the previous last animation was cancelled", async () => {
-    let firstFrames = 0;
-    AnimationController.start(FIRST_KEY, () => {
-      firstFrames++;
-      return { keep: true };
-    });
-
-    expect(firstFrames).toBe(1);
-
-    AnimationController.cancel(FIRST_KEY);
-    await vi.runOnlyPendingTimersAsync();
-
-    let secondFrames = 0;
-    AnimationController.start(SECOND_KEY, () => {
-      secondFrames++;
-      return secondFrames === 1 ? { keep: true } : null;
-    });
-
-    expect(secondFrames).toBe(1);
-
-    await vi.runOnlyPendingTimersAsync();
-
-    expect(secondFrames).toBe(2);
-    expect(AnimationController.running(SECOND_KEY)).toBe(false);
-  });
-
-  it("cancels a frame scheduled during a tick if no animations remain", async () => {
-    let firstFrames = 0;
-    let secondFrames = 0;
-
-    AnimationController.start(FIRST_KEY, ({ state }) => {
-      if (!state) {
-        return { keep: true };
-      }
-
-      firstFrames++;
-
-      AnimationController.start(SECOND_KEY, () => {
-        secondFrames++;
-        return { keep: true };
-      });
-      AnimationController.cancel(SECOND_KEY);
-
-      return null;
-    });
-
-    await vi.runOnlyPendingTimersAsync();
-
-    expect(firstFrames).toBe(1);
-    expect(secondFrames).toBe(1);
-    expect(vi.getTimerCount()).toBe(0);
-  });
-});

packages/excalidraw/tests/clipboard.test.tsx

@@ -305,88 +305,8 @@ describe("pasting & frames", () => {
 
     await waitFor(() => {
       expect(h.elements.length).toBe(2);
-      expect(h.elements[0].type).toBe(rect.type);
-      expect(h.elements[0].frameId).toBe(frame.id);
-      expect(h.elements[1].id).toBe(frame.id);
-      expect(h.elements[0].index! < frame.index!).toBe(true);
-    });
-  });
-
-  it("should layer pasted elements above the highest frame child", async () => {
-    const frame = API.createElement({
-      type: "frame",
-      width: 100,
-      height: 100,
-      x: 0,
-      y: 0,
-    });
-    const frameChild = API.createElement({
-      id: "frameChild",
-      type: "rectangle",
-      x: 10,
-      y: 10,
-      width: 20,
-      height: 20,
-      frameId: frame.id,
-    });
-    const rect = API.createElement({ type: "rectangle" });
-
-    API.setElements([frameChild, frame]);
-
-    const clipboardJSON = await serializeAsClipboardJSON({
-      elements: [rect],
-      files: null,
-    });
-
-    mouse.moveTo(50, 50);
-
-    pasteWithCtrlCmdV(clipboardJSON);
-
-    await waitFor(() => {
-      expect(h.elements.length).toBe(3);
       expect(h.elements[1].type).toBe(rect.type);
       expect(h.elements[1].frameId).toBe(frame.id);
-      expect(h.elements.map((element) => element.id)).toEqual([
-        frameChild.id,
-        h.elements[1].id,
-        frame.id,
-      ]);
-      expect(h.elements[1].index! > frameChild.index!).toBe(true);
-      expect(h.elements[1].index! < frame.index!).toBe(true);
-    });
-  });
-
-  it("should preserve denormalized pasted frame child order", async () => {
-    const frame = API.createElement({
-      type: "frame",
-      width: 100,
-      height: 100,
-      x: 0,
-      y: 0,
-    });
-    const frameChild = API.createElement({
-      type: "rectangle",
-      x: 10,
-      y: 10,
-      width: 20,
-      height: 20,
-      frameId: frame.id,
-    });
-
-    const clipboardJSON = await serializeAsClipboardJSON({
-      elements: [frame, frameChild],
-      files: null,
-    });
-
-    mouse.moveTo(200, 200);
-
-    pasteWithCtrlCmdV(clipboardJSON);
-
-    await waitFor(() => {
-      expect(h.elements.length).toBe(2);
-      expect(h.elements[0].type).toBe(frame.type);
-      expect(h.elements[1].type).toBe(frameChild.type);
-      expect(h.elements[1].frameId).toBe(h.elements[0].id);
     });
   });
 
@@ -459,9 +379,8 @@ describe("pasting & frames", () => {
 
     await waitFor(() => {
       expect(h.elements.length).toBe(3);
-      expect(h.elements[0].type).toBe(rect.type);
+      expect(h.elements[1].type).toBe(rect.type);
-      expect(h.elements[0].frameId).toBe(frame.id);
+      expect(h.elements[1].frameId).toBe(frame.id);
-      expect(h.elements[1].id).toBe(frame.id);
       expect(h.elements[2].type).toBe(rect2.type);
       expect(h.elements[2].frameId).toBe(null);
     });
@@ -503,11 +422,10 @@ describe("pasting & frames", () => {
 
     await waitFor(() => {
       expect(h.elements.length).toBe(3);
-      expect(h.elements[0].type).toBe(rect.type);
+      expect(h.elements[1].type).toBe(rect.type);
-      expect(h.elements[0].frameId).toBe(frame.id);
-      expect(h.elements[1].type).toBe(rect2.type);
       expect(h.elements[1].frameId).toBe(frame.id);
-      expect(h.elements[2].id).toBe(frame.id);
+      expect(h.elements[2].type).toBe(rect2.type);
+      expect(h.elements[2].frameId).toBe(frame.id);
     });
   });
 
@@ -555,9 +473,8 @@ describe("pasting & frames", () => {
 
     await waitFor(() => {
       expect(h.elements.length).toBe(4);
-      expect(h.elements[0].type).toBe(rect.type);
+      expect(h.elements[1].type).toBe(rect.type);
-      expect(h.elements[0].frameId).toBe(frame.id);
+      expect(h.elements[1].frameId).toBe(frame.id);
-      expect(h.elements[1].id).toBe(frame.id);
       expect(h.elements[2].type).toBe(rect2.type);
       expect(h.elements[2].frameId).toBe(h.elements[3].id);
       expect(h.elements[3].type).toBe(frame2.type);

packages/excalidraw/tests/data/restore.test.ts

@@ -160,37 +160,38 @@ describe("restoreElements", () => {
     });
   });
 
-  it("should restore only valid freedraw points and keep pressures aligned", () => {
+  it("should restore fixed freedraw element correctly", () => {
     const freedrawElement = API.createElement({
       type: "freedraw",
-      id: "id-freedraw-invalid-points",
+      id: "id-freedraw02",
+      strokeShape: "fixed",
       points: [pointFrom(0, 0), pointFrom(10, 10)],
     });
 
+    const restoredFreedraw = restore.restoreElements(
+      [freedrawElement],
+      null,
+    )[0] as ExcalidrawFreeDrawElement;
+
+    expect(restoredFreedraw.strokeShape).toBe("fixed");
+  });
+
+  it("should restore legacy stable freedraw element as fixed", () => {
     const restoredFreedraw = restore.restoreElements(
       [
         {
-          ...freedrawElement,
+          ...API.createElement({
-          simulatePressure: false,
+            type: "freedraw",
-          points: [
+            id: "id-freedraw03",
-            pointFrom(0, 0),
+            points: [pointFrom(0, 0), pointFrom(10, 10)],
-            [Infinity, 10],
+          }),
-            null,
+          strokeShape: "stable",
-            pointFrom(20, 20),
-            [NaN, 30],
-            [40, null],
-          ],
-          pressures: [0.1, 0.2, 0.3, 0.4, 0.5, 0.6],
         } as any,
       ],
       null,
     )[0] as ExcalidrawFreeDrawElement;
 
-    expect(restoredFreedraw.points).toEqual([
+    expect(restoredFreedraw.strokeShape).toBe("fixed");
-      pointFrom(0, 0),
-      pointFrom(20, 20),
-    ]);
-    expect(restoredFreedraw.pressures).toEqual([0.1, 0.4]);
   });
 
   it("should restore line and draw elements correctly", () => {
@@ -433,52 +434,6 @@ describe("restoreElements", () => {
     expect(restoredLine.points).toMatchObject(expectedLinePoints);
   });
 
-  it("should restore only valid linear points", () => {
-    const lineElement: any = API.createElement({
-      type: "line",
-      x: 10,
-      y: 20,
-      width: 100,
-      height: 200,
-    });
-    const arrowElement: any = API.createElement({
-      type: "arrow",
-      width: 100,
-      height: 200,
-    });
-
-    lineElement.points = [
-      [2, 3],
-      null,
-      [Infinity, 4],
-      [5, 7],
-      [NaN, 8],
-      [9, null],
-    ];
-    arrowElement.points = [
-      [null, 0],
-      [Infinity, 4],
-    ];
-
-    const restoredElements = restore.restoreElements(
-      [lineElement, arrowElement],
-      null,
-    );
-    const restoredLine = restoredElements[0] as ExcalidrawLinearElement;
-    const restoredArrow = restoredElements[1] as ExcalidrawArrowElement;
-
-    expect(restoredLine.points).toEqual([pointFrom(0, 0), pointFrom(3, 4)]);
-    expect(restoredLine.x).toBe(12);
-    expect(restoredLine.y).toBe(23);
-    expect(restoredLine.width).toBe(3);
-    expect(restoredLine.height).toBe(4);
-
-    expect(restoredArrow.points).toEqual([
-      pointFrom(0, 0),
-      pointFrom(100, 200),
-    ]);
-  });
-
   it("when the number of points of a line is greater or equal 2", () => {
     const lineElement_0 = API.createElement({
       type: "line",
@@ -720,6 +675,26 @@ describe("restoreAppState", () => {
     expect(restoredAppState.name).toBe(stubImportedAppState.name);
   });
 
+  it("should restore fixed freedraw stroke type from app state", () => {
+    const restoredAppState = restore.restoreAppState(
+      { currentItemStrokeShape: "fixed" } as ImportedDataState["appState"],
+      null,
+    );
+
+    expect(restoredAppState.currentItemStrokeShape).toBe("fixed");
+  });
+
+  it("should restore legacy stable freedraw stroke type from app state as fixed", () => {
+    const restoredAppState = restore.restoreAppState(
+      {
+        currentItemStrokeShape: "stable",
+      } as unknown as ImportedDataState["appState"],
+      null,
+    );
+
+    expect(restoredAppState.currentItemStrokeShape).toBe("fixed");
+  });
+
   it("should return local app state when imported data state is null", () => {
     const stubLocalAppState = getDefaultAppState();
     stubLocalAppState.cursorButton = "down";

packages/excalidraw/tests/freedraw.test.tsx

@@ -0,0 +1,78 @@
+import React from "react";
+
+import { Excalidraw } from "../index";
+import { API } from "./helpers/api";
+import { Pointer, UI } from "./helpers/ui";
+import { render } from "./test-utils";
+
+describe("freedraw", () => {
+  beforeEach(async () => {
+    await render(<Excalidraw />);
+  });
+
+  it("rounds stored points and drops duplicates after rounding", () => {
+    const mouse = new Pointer("mouse");
+
+    UI.clickTool("freedraw");
+    mouse.downAt(10, 20);
+    mouse.moveTo(10.1234, 20.5678);
+    mouse.moveTo(10.1249, 20.5681);
+    mouse.upAt(20.9999, 30.0001);
+
+    const freedraw = window.h.elements.at(-1);
+
+    expect(freedraw).toEqual(expect.objectContaining({ type: "freedraw" }));
+    expect((freedraw as any).points).toEqual([
+      [0, 0],
+      [0.12, 0.57],
+      [11, 10],
+    ]);
+  });
+
+  it("does not snap fixed strokes closed when ending near the start point", () => {
+    const mouse = new Pointer("mouse");
+
+    API.setAppState({ currentItemStrokeShape: "fixed" });
+    UI.clickTool("freedraw");
+    mouse.downAt(10, 10);
+    mouse.moveTo(40, 10);
+    mouse.moveTo(30, 30);
+    mouse.upAt(12, 12);
+
+    const freedraw = window.h.elements.at(-1) as any;
+
+    expect(freedraw.points[0]).toEqual([0, 0]);
+    expect(freedraw.points.at(-1)).not.toEqual([0, 0]);
+  });
+
+  it("coalesces nearly straight fixed freedraw points at the tip", () => {
+    const mouse = new Pointer("mouse");
+
+    API.setAppState({ currentItemStrokeShape: "fixed" });
+    UI.clickTool("freedraw");
+    mouse.downAt(10, 10);
+
+    [
+      [10.2, 10.01],
+      [10.4, 10.03],
+      [10.6, 10.02],
+      [10.8, 10.04],
+      [11, 10.03],
+      [11.2, 10.05],
+      [11.4, 10.04],
+      [11.6, 10.06],
+      [11.8, 10.05],
+    ].forEach(([x, y]) => {
+      mouse.moveTo(x, y);
+    });
+    mouse.upAt(12, 10.05);
+
+    const freedraw = window.h.elements.at(-1) as any;
+
+    expect(freedraw.points.length).toBeLessThan(5);
+    expect(freedraw.points).toEqual([
+      [0, 0],
+      [2, 0.05],
+    ]);
+  });
+});

packages/excalidraw/tests/helpers/api.ts

@@ -201,6 +201,9 @@ export class API {
       ? ExcalidrawTextElement["containerId"]
       : never;
     points?: T extends "arrow" | "line" | "freedraw" ? readonly LocalPoint[] : never;
+    strokeShape?: T extends "freedraw"
+      ? ExcalidrawFreeDrawElement["strokeShape"]
+      : never;
     locked?: boolean;
     fileId?: T extends "image" ? string : never;
     scale?: T extends "image" ? ExcalidrawImageElement["scale"] : never;
@@ -318,6 +321,7 @@ export class API {
           type: type as "freedraw",
           simulatePressure: true,
           points: rest.points,
+          strokeShape: rest.strokeShape ?? appState.currentItemStrokeShape,
           ...base,
         });
         break;

packages/excalidraw/tests/helpers/polyfills.ts

@@ -94,42 +94,3 @@ export const testPolyfills = {
   // https://github.com/vitest-dev/vitest/pull/4164#issuecomment-2172729965
   URL,
 };
-
-export const PolyfillLocalStorage = () => {
-  // Node.js 25+ provides a native localStorage global that shadows jsdom's,
-  // and jsdom's own localStorage also uses the native one -- both are broken
-  // (empty objects without Storage methods). On older Node versions, jsdom
-  // provides a working localStorage. This polyfill replaces localStorage on
-  // all supported versions with a standard Storage implementation backed by
-  // a Map, ensuring consistent behavior regardless of the Node.js version.
-  const storage = new Map<string, string>();
-  const storagePolyfill: Storage = {
-    get length() {
-      return storage.size;
-    },
-    clear() {
-      storage.clear();
-    },
-    key(index) {
-      return Array.from(storage.keys())[index] ?? null;
-    },
-    getItem(key) {
-      return storage.get(key) ?? null;
-    },
-    setItem(key, value) {
-      storage.set(key, value);
-    },
-    removeItem(key) {
-      storage.delete(key);
-    },
-    *[Symbol.iterator]() {
-      yield* storage.entries();
-    },
-  };
-
-  Object.defineProperty(window, "localStorage", {
-    value: storagePolyfill,
-    writable: true,
-    configurable: true,
-  });
-};

packages/excalidraw/tests/helpers/ui.ts

@@ -28,6 +28,7 @@ import type { GlobalPoint, LocalPoint, Radians } from "@excalidraw/math";
 import type { TransformHandleType } from "@excalidraw/element";
 import type {
   ExcalidrawElement,
+  ExcalidrawFreeDrawElement,
   ExcalidrawLinearElement,
   ExcalidrawTextElement,
   ExcalidrawArrowElement,
@@ -432,8 +433,10 @@ type DrawingToolName = Exclude<
   "lock" | "selection" | "eraser" | "lasso"
 >;
 
-type Element<T extends DrawingToolName> = T extends "line" | "freedraw"
+type Element<T extends DrawingToolName> = T extends "line"
   ? ExcalidrawLinearElement
+  : T extends "freedraw"
+  ? ExcalidrawFreeDrawElement
   : T extends "arrow"
   ? ExcalidrawArrowElement
   : T extends "text"