fix(test): attempt to fix test flake in collision.test.tsx

Co-authored-by: Jawahar <jawahars_16@live.in>
Co-authored-by: Andrew Aquino <dawneraq@gmail.com>

.eslintrc.json

@@ -39,5 +39,26 @@
         "allowReferrer": true
       }
     ]
-  }
+  },
+  "overrides": [
+    {
+      "files": ["packages/excalidraw/**/*.{ts,tsx}"],
+      "excludedFiles": ["packages/excalidraw/**/*.test.{ts,tsx}", "packages/excalidraw/**/*.test.*.{ts,tsx}"],
+      "rules": {
+        "@typescript-eslint/no-restricted-imports": [
+          "error",
+          {
+            "patterns": [
+              {
+                "group": ["@excalidraw/excalidraw"],
+                "message": "Do not import from the barrel 'index.tsx' files. Use direct relative imports to the specific module instead.",
+                "allowTypeImports": true
+              }
+            ],
+            "paths": [".", "..", "../..", "../../..", "../../../..", "../../../../..", "../index", "../../index", "../../../index", "../../../../index"]
+          }
+        ]
+      }
+    }
+  ]
 }

dev-docs/docs/@excalidraw/excalidraw/api/excalidraw-element-skeleton.mdx

@@ -172,7 +172,7 @@ convertToExcalidrawElements([
     type: "arrow",
     x: 450,
     y: 20,
-    startArrowhead: "dot",
+    startArrowhead: "circle",
     endArrowhead: "triangle",
     strokeColor: "#1971c2",
     strokeWidth: 2,

examples/with-script-in-browser/initialData.tsx

@@ -1,4 +1,4 @@
-import type { ExcalidrawElementSkeleton } from "@excalidraw/excalidraw/data/transform";
+import type { ExcalidrawElementSkeleton } from "@excalidraw/excalidraw/element/transform";
 import type { FileId } from "@excalidraw/excalidraw/element/types";
 
 const elements: ExcalidrawElementSkeleton[] = [

examples/with-script-in-browser/package.json

@@ -3,14 +3,14 @@
   "version": "1.0.0",
   "private": true,
   "dependencies": {
-    "react": "19.0.0",
-    "react-dom": "19.0.0",
     "@excalidraw/excalidraw": "*",
-    "browser-fs-access": "0.29.1"
+    "browser-fs-access": "0.38.0",
+    "react": "19.0.0",
+    "react-dom": "19.0.0"
   },
   "devDependencies": {
-    "vite": "5.0.12",
+    "typescript": "^5",
-    "typescript": "^5"
+    "vite": "5.0.12"
   },
   "scripts": {
     "start": "vite",

examples/with-script-in-browser/utils.ts

@@ -4,8 +4,6 @@ import { unstable_batchedUpdates } from "react-dom";
 
 type FILE_EXTENSION = Exclude<keyof typeof MIME_TYPES, "binary">;
 
-const INPUT_CHANGE_INTERVAL_MS = 500;
-
 export type ResolvablePromise<T> = Promise<T> & {
   resolve: [T] extends [undefined] ? (value?: T) => void : (value: T) => void;
   reject: (error: Error) => void;
@@ -54,40 +52,6 @@ export const fileOpen = <M extends boolean | undefined = false>(opts: {
     extensions,
     mimeTypes,
     multiple: opts.multiple ?? false,
-    legacySetup: (resolve, reject, input) => {
-      const scheduleRejection = debounce(reject, INPUT_CHANGE_INTERVAL_MS);
-      const focusHandler = () => {
-        checkForFile();
-        document.addEventListener("keyup", scheduleRejection);
-        document.addEventListener("pointerup", scheduleRejection);
-        scheduleRejection();
-      };
-      const checkForFile = () => {
-        // this hack might not work when expecting multiple files
-        if (input.files?.length) {
-          const ret = opts.multiple ? [...input.files] : input.files[0];
-          resolve(ret as RetType);
-        }
-      };
-      requestAnimationFrame(() => {
-        window.addEventListener("focus", focusHandler);
-      });
-      const interval = window.setInterval(() => {
-        checkForFile();
-      }, INPUT_CHANGE_INTERVAL_MS);
-      return (rejectPromise) => {
-        clearInterval(interval);
-        scheduleRejection.cancel();
-        window.removeEventListener("focus", focusHandler);
-        document.removeEventListener("keyup", scheduleRejection);
-        document.removeEventListener("pointerup", scheduleRejection);
-        if (rejectPromise) {
-          // so that something is shown in console if we need to debug this
-          console.warn("Opening the file was canceled (legacy-fs).");
-          rejectPromise(new Error("Request Aborted"));
-        }
-      };
-    },
   }) as Promise<RetType>;
 };
 

excalidraw-app/App.tsx

@@ -5,6 +5,8 @@ import {
   CaptureUpdateAction,
   reconcileElements,
   useEditorInterface,
+  ExcalidrawAPIProvider,
+  useExcalidrawAPI,
 } from "@excalidraw/excalidraw";
 import { trackEvent } from "@excalidraw/excalidraw/analytics";
 import { getDefaultAppState } from "@excalidraw/excalidraw/appState";
@@ -34,7 +36,6 @@ import {
 import polyfill from "@excalidraw/excalidraw/polyfill";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { loadFromBlob } from "@excalidraw/excalidraw/data/blob";
-import { useCallbackRefState } from "@excalidraw/excalidraw/hooks/useCallbackRefState";
 import { t } from "@excalidraw/excalidraw/i18n";
 
 import {
@@ -74,6 +75,7 @@ import type {
   BinaryFiles,
   ExcalidrawInitialDataState,
   UIAppState,
+  ExcalidrawProps,
 } from "@excalidraw/excalidraw/types";
 import type { ResolutionType } from "@excalidraw/common/utility-types";
 import type { ResolvablePromise } from "@excalidraw/common/utils";
@@ -114,6 +116,7 @@ import {
 } from "./data";
 
 import { updateStaleImageStatuses } from "./data/FileManager";
+import { FileStatusStore } from "./data/fileStatusStore";
 import {
   importFromLocalStorage,
   importUsernameFromLocalStorage,
@@ -369,6 +372,8 @@ const initializeScene = async (opts: {
 };
 
 const ExcalidrawWrapper = () => {
+  const excalidrawAPI = useExcalidrawAPI();
+
   const [errorMessage, setErrorMessage] = useState("");
   const isCollabDisabled = isRunningInIframe();
 
@@ -399,9 +404,6 @@ const ExcalidrawWrapper = () => {
     }, VERSION_TIMEOUT);
   }, []);
 
-  const [excalidrawAPI, excalidrawRefCallback] =
-    useCallbackRefState<ExcalidrawImperativeAPI>();
-
   const [, setShareDialogState] = useAtom(shareDialogStateAtom);
   const [collabAPI] = useAtom(collabAPIAtom);
   const [isCollaborating] = useAtomWithInitialValue(isCollaboratingAtom, () => {
@@ -433,18 +435,15 @@ const ExcalidrawWrapper = () => {
     }
   }, [excalidrawAPI]);
 
-  useEffect(() => {
+  // ---------------------------------------------------------------------------
-    if (!excalidrawAPI || (!isCollabDisabled && !collabAPI)) {
+  // Hoisted loadImages
-      return;
+  // ---------------------------------------------------------------------------
-    }
+  const loadImages = useCallback(
-
+    (data: ResolutionType<typeof initializeScene>, isInitialLoad = false) => {
-    const loadImages = (
+      if (!data.scene || !excalidrawAPI) {
-      data: ResolutionType<typeof initializeScene>,
-      isInitialLoad = false,
-    ) => {
-      if (!data.scene) {
         return;
       }
+
       if (collabAPI?.isCollaborating()) {
         if (data.scene.elements) {
           collabAPI
@@ -471,6 +470,12 @@ const ExcalidrawWrapper = () => {
           }, [] as FileId[]) || [];
 
         if (data.isExternalScene) {
+          if (fileIds.length) {
+            // Direct Firebase call (not through FileManager), so track manually
+            FileStatusStore.updateStatuses(
+              fileIds.map((id) => [id, "loading"]),
+            );
+          }
           loadFilesFromFirebase(
             `${FIREBASE_STORAGE_PREFIXES.shareLinkFiles}/${data.id}`,
             data.key,
@@ -482,12 +487,18 @@ const ExcalidrawWrapper = () => {
               erroredFiles,
               elements: excalidrawAPI.getSceneElementsIncludingDeleted(),
             });
+            FileStatusStore.updateStatuses([
+              ...loadedFiles.map((f) => [f.id, "loaded"] as [FileId, "loaded"]),
+              ...[...erroredFiles.keys()].map(
+                (id) => [id, "error"] as [FileId, "error"],
+              ),
+            ]);
           });
         } else if (isInitialLoad) {
           if (fileIds.length) {
             LocalData.fileStorage
               .getFiles(fileIds)
-              .then(({ loadedFiles, erroredFiles }) => {
+              .then(async ({ loadedFiles, erroredFiles }) => {
                 if (loadedFiles.length) {
                   excalidrawAPI.addFiles(loadedFiles);
                 }
@@ -500,10 +511,19 @@ const ExcalidrawWrapper = () => {
           }
           // on fresh load, clear unused files from IDB (from previous
           // session)
-          LocalData.fileStorage.clearObsoleteFiles({ currentFileIds: fileIds });
+          LocalData.fileStorage.clearObsoleteFiles({
+            currentFileIds: fileIds,
+          });
         }
       }
-    };
+    },
+    [collabAPI, excalidrawAPI],
+  );
+
+  useEffect(() => {
+    if (!excalidrawAPI || (!isCollabDisabled && !collabAPI)) {
+      return;
+    }
 
     initializeScene({ collabAPI, excalidrawAPI }).then(async (data) => {
       loadImages(data, /* isInitialLoad */ true);
@@ -628,7 +648,7 @@ const ExcalidrawWrapper = () => {
         false,
       );
     };
-  }, [isCollabDisabled, collabAPI, excalidrawAPI, setLangCode]);
+  }, [isCollabDisabled, collabAPI, excalidrawAPI, setLangCode, loadImages]);
 
   useEffect(() => {
     const unloadHandler = (event: BeforeUnloadEvent) => {
@@ -773,6 +793,56 @@ const ExcalidrawWrapper = () => {
     [setShareDialogState],
   );
 
+  // ---------------------------------------------------------------------------
+  // onExport — intercepts file save to wait for pending image loads
+  // ---------------------------------------------------------------------------
+  const onExport: Required<ExcalidrawProps>["onExport"] = useCallback(
+    async function* () {
+      let snapshot = FileStatusStore.getSnapshot();
+      const { pending, total } = FileStatusStore.getPendingCount(
+        snapshot.value,
+      );
+      if (pending === 0) {
+        return;
+      }
+
+      // Yield initial progress
+      yield {
+        type: "progress",
+        progress: (total - pending) / total,
+        message: `Loading images (${total - pending}/${total})...`,
+      };
+
+      // Wait for all pending images to finish
+      while (true) {
+        snapshot = await FileStatusStore.pull(snapshot.version);
+        const { pending: nowPending, total: nowTotal } =
+          FileStatusStore.getPendingCount(snapshot.value);
+
+        yield {
+          type: "progress",
+          progress: (nowTotal - nowPending) / nowTotal,
+          message: `Loading images (${nowTotal - nowPending}/${nowTotal})...`,
+        };
+
+        if (nowPending === 0) {
+          await new Promise((r) => setTimeout(r, 500));
+          yield {
+            type: "progress",
+            message: `Preparing export...`,
+          };
+          return;
+        }
+      }
+    },
+    [],
+  );
+
+  // const onExport = () => {
+  //   return new Promise((r) => setTimeout(r, 2500));
+  //   // console.log("onExport");
+  // };
+
   // browsers generally prevent infinite self-embedding, there are
   // cases where it still happens, and while we disallow self-embedding
   // by not whitelisting our own origin, this serves as an additional guard
@@ -839,8 +909,8 @@ const ExcalidrawWrapper = () => {
       })}
     >
       <Excalidraw
-        excalidrawAPI={excalidrawRefCallback}
         onChange={onChange}
+        onExport={onExport}
         initialData={initialStatePromiseRef.current.promise}
         isCollaborating={isCollaborating}
         onPointerUpdate={collabAPI?.onPointerUpdate}
@@ -1206,7 +1276,9 @@ const ExcalidrawApp = () => {
   return (
     <TopErrorBoundary>
       <Provider store={appJotaiStore}>
-        <ExcalidrawWrapper />
+        <ExcalidrawAPIProvider>
+          <ExcalidrawWrapper />
+        </ExcalidrawAPIProvider>
       </Provider>
     </TopErrorBoundary>
   );

excalidraw-app/collab/Collab.tsx

@@ -72,6 +72,7 @@ import {
   FileManager,
   updateStaleImageStatuses,
 } from "../data/FileManager";
+import { FileStatusStore } from "../data/fileStatusStore";
 import { LocalData } from "../data/LocalData";
 import {
   isSavedToFirebase,
@@ -149,6 +150,7 @@ class Collab extends PureComponent<CollabProps, CollabState> {
     };
     this.portal = new Portal(this);
     this.fileManager = new FileManager({
+      onFileStatusChange: FileStatusStore.updateStatuses.bind(FileStatusStore),
       getFiles: async (fileIds) => {
         const { roomId, roomKey } = this.portal;
         if (!roomId || !roomKey) {

excalidraw-app/components/AppMainMenu.tsx

@@ -62,7 +62,7 @@ export const AppMainMenu: React.FC<{
       {isDevEnv() && (
         <MainMenu.Item
           icon={eyeIcon}
-          onClick={() => {
+          onSelect={() => {
             if (window.visualDebug) {
               delete window.visualDebug;
               saveDebugState({ enabled: false });
@@ -77,6 +77,7 @@ export const AppMainMenu: React.FC<{
         </MainMenu.Item>
       )}
       <MainMenu.Separator />
+      <MainMenu.DefaultItems.Preferences />
       <MainMenu.DefaultItems.ToggleTheme
         allowSystemTheme
         theme={props.theme}

excalidraw-app/components/AppWelcomeScreen.tsx

@@ -33,7 +33,15 @@ export const AppWelcomeScreen: React.FC<{
         return bit;
       });
   } else {
-    headingContent = t("welcomeScreen.app.center_heading");
+    headingContent = (
+      <>
+        {t("welcomeScreen.app.center_heading")}
+        <br />
+        {t("welcomeScreen.app.center_heading_line2")}
+        <br />
+        {t("welcomeScreen.app.center_heading_line3")}
+      </>
+    );
   }
 
   return (

excalidraw-app/components/DebugCanvas.tsx

@@ -414,7 +414,6 @@ export const debugRenderer = throttleRAF(
   ) => {
     _debugRenderer(canvas, appState, elements, scale);
   },
-  { trailing: true },
 );
 
 export const loadSavedDebugState = () => {

excalidraw-app/data/FileManager.ts

@@ -40,10 +40,12 @@ export class FileManager {
 
   private _getFiles;
   private _saveFiles;
+  private _onFileStatusChange;
 
   constructor({
     getFiles,
     saveFiles,
+    onFileStatusChange,
   }: {
     getFiles: (fileIds: FileId[]) => Promise<{
       loadedFiles: BinaryFileData[];
@@ -53,9 +55,13 @@ export class FileManager {
       savedFiles: Map<FileId, BinaryFileData>;
       erroredFiles: Map<FileId, BinaryFileData>;
     }>;
+    onFileStatusChange?: (
+      updates: Array<[FileId, "loading" | "loaded" | "error"]>,
+    ) => void;
   }) {
     this._getFiles = getFiles;
     this._saveFiles = saveFiles;
+    this._onFileStatusChange = onFileStatusChange;
   }
 
   /**
@@ -146,6 +152,8 @@ export class FileManager {
       this.fetchingFiles.set(id, true);
     }
 
+    this._onFileStatusChange?.(ids.map((id) => [id, "loading"]));
+
     try {
       const { loadedFiles, erroredFiles } = await this._getFiles(ids);
 
@@ -156,6 +164,13 @@ export class FileManager {
         this.erroredFiles_fetch.set(fileId, true);
       }
 
+      this._onFileStatusChange?.([
+        ...loadedFiles.map((f) => [f.id, "loaded"] as [FileId, "loaded"]),
+        ...[...erroredFiles.keys()].map(
+          (id) => [id, "error"] as [FileId, "error"],
+        ),
+      ]);
+
       return { loadedFiles, erroredFiles };
     } finally {
       for (const id of ids) {
@@ -195,6 +210,13 @@ export class FileManager {
   };
 
   reset() {
+    if (this._onFileStatusChange && this.fetchingFiles.size) {
+      this._onFileStatusChange(
+        [...this.fetchingFiles.keys()].map(
+          (id) => [id, "error"] as [FileId, "error"],
+        ),
+      );
+    }
     this.fetchingFiles.clear();
     this.savingFiles.clear();
     this.savedFiles.clear();

excalidraw-app/data/LocalData.ts

@@ -42,6 +42,7 @@ import type { MaybePromise } from "@excalidraw/common/utility-types";
 import { SAVE_TO_LOCAL_STORAGE_TIMEOUT, STORAGE_KEYS } from "../app_constants";
 
 import { FileManager } from "./FileManager";
+import { FileStatusStore } from "./fileStatusStore";
 import { Locker } from "./Locker";
 import { updateBrowserStateVersion } from "./tabSync";
 
@@ -166,6 +167,7 @@ export class LocalData {
   // ---------------------------------------------------------------------------
 
   static fileStorage = new LocalFileManager({
+    onFileStatusChange: FileStatusStore.updateStatuses.bind(FileStatusStore),
     getFiles(ids) {
       return getMany(ids, filesStore).then(
         async (filesData: (BinaryFileData | undefined)[]) => {

excalidraw-app/data/fileStatusStore.ts

@@ -0,0 +1,48 @@
+import { VersionedSnapshotStore } from "@excalidraw/common";
+
+import type { FileId } from "@excalidraw/element/types";
+
+export type FileLoadingStatus = "loading" | "loaded" | "error";
+
+export class FileStatusStore {
+  private static store = new VersionedSnapshotStore<
+    Map<FileId, FileLoadingStatus>
+  >(new Map());
+
+  static getSnapshot() {
+    return this.store.getSnapshot();
+  }
+
+  static pull(sinceVersion?: number) {
+    return this.store.pull(sinceVersion);
+  }
+
+  static updateStatuses(updates: Array<[FileId, FileLoadingStatus]>) {
+    if (!updates.length) {
+      return;
+    }
+    this.store.update((prev) => {
+      let changed = false;
+      const next = new Map(prev);
+      for (const [id, status] of updates) {
+        if (next.get(id) !== status) {
+          next.set(id, status);
+          changed = true;
+        }
+      }
+      return changed ? next : prev;
+    });
+  }
+
+  static getPendingCount(statuses: Map<FileId, FileLoadingStatus>) {
+    let pending = 0;
+    let total = 0;
+    for (const status of statuses.values()) {
+      total++;
+      if (status === "loading") {
+        pending++;
+      }
+    }
+    return { pending, total };
+  }
+}

excalidraw-app/tests/__snapshots__/MobileMenu.test.tsx.snap

@@ -50,7 +50,11 @@ exports[`Test MobileMenu > should initialize with welcome screen and hide once u
   <div
     class="welcome-screen-center__heading welcome-screen-decor excalifont"
   >
-    All your data is saved locally in your browser.
+    Your drawings are saved in your browser's storage.
+    <br />
+    Browser storage can be cleared unexpectedly.
+    <br />
+    Save your work to a file regularly to avoid losing it.
   </div>
   <div
     class="welcome-screen-menu"

excalidraw-app/vite.config.mts

@@ -106,6 +106,10 @@ export default defineConfig(({ mode }) => {
             if (id.includes("@excalidraw/mermaid-to-excalidraw")) {
               return "mermaid-to-excalidraw";
             }
+
+            if (id.includes("@codemirror/") || id.includes("@lezer/")) {
+              return "codemirror.chunk";
+            }
           },
         },
       },
@@ -150,6 +154,11 @@ export default defineConfig(({ mode }) => {
             "**/locales/**",
             "service-worker.js",
             "**/*.chunk-*.js",
+            // CodeMirrorEditor can't be assigned a `.chunk` name via
+            // manualChunks because Rollup would hoist shared deps (React)
+            // via a static import from the main bundle, defeating lazy
+            // loading. So we exclude it by name instead.
+            "**/CodeMirrorEditor-*.js",
           ],
           runtimeCaching: [
             {
@@ -189,7 +198,7 @@ export default defineConfig(({ mode }) => {
               },
             },
             {
-              urlPattern: new RegExp(".chunk-.+.js"),
+              urlPattern: new RegExp("(.chunk-.+|CodeMirrorEditor-.+)\\.js"),
               handler: "CacheFirst",
               options: {
                 cacheName: "chunk",

packages/common/debug.ts

@@ -1,9 +1,3 @@
-declare global {
-  interface Window {
-    debug: typeof Debug;
-  }
-}
-
 const lessPrecise = (num: number, precision = 5) =>
   parseFloat(num.toPrecision(precision));
 
@@ -157,6 +151,70 @@ export class Debug {
       return ret;
     };
   };
+
+  private static CHANGED_CACHE: Record<string, Record<string, unknown>> = {};
+
+  public static logChanged(name: string, obj: Record<string, unknown>) {
+    const prev = Debug.CHANGED_CACHE[name];
+
+    Debug.CHANGED_CACHE[name] = obj;
+
+    if (!prev) {
+      return;
+    }
+
+    const allKeys = new Set([...Object.keys(prev), ...Object.keys(obj)]);
+    const changed: Record<string, { prev: unknown; next: unknown }> = {};
+
+    for (const key of allKeys) {
+      const prevVal = prev[key];
+      const nextVal = obj[key];
+      if (!deepEqual(prevVal, nextVal)) {
+        changed[key] = { prev: prevVal, next: nextVal };
+      }
+    }
+
+    if (Object.keys(changed).length > 0) {
+      console.info(`[${name}] changed:`, changed);
+    }
+  }
+}
+
+function deepEqual(a: unknown, b: unknown): boolean {
+  if (Object.is(a, b)) {
+    return true;
+  }
+
+  if (
+    a === null ||
+    b === null ||
+    typeof a !== "object" ||
+    typeof b !== "object"
+  ) {
+    return false;
+  }
+
+  if (Array.isArray(a) !== Array.isArray(b)) {
+    return false;
+  }
+
+  const keysA = Object.keys(a as Record<string, unknown>);
+  const keysB = Object.keys(b as Record<string, unknown>);
+
+  if (keysA.length !== keysB.length) {
+    return false;
+  }
+
+  for (const key of keysA) {
+    if (
+      !deepEqual(
+        (a as Record<string, unknown>)[key],
+        (b as Record<string, unknown>)[key],
+      )
+    ) {
+      return false;
+    }
+  }
+
+  return true;
 }
-//@ts-ignore
-window.debug = Debug;

packages/common/src/appEventBus.test.ts

@@ -0,0 +1,74 @@
+import { AppEventBus } from "./appEventBus";
+
+type TestEvents = {
+  initialize: [api: number];
+  pointerUp: [pointerId: string];
+  viewState: [zoom: number];
+};
+
+const behavior = {
+  initialize: { cardinality: "once", replay: "last" },
+  pointerUp: { cardinality: "many", replay: "none" },
+  viewState: { cardinality: "many", replay: "last" },
+} as const;
+
+const flushMicrotasks = async () => Promise.resolve();
+
+describe("AppEventBus", () => {
+  it("replays once events to late callback and Promise subscribers", async () => {
+    const bus = new AppEventBus<TestEvents, typeof behavior>(behavior);
+    bus.emit("initialize", 42);
+
+    const calls: number[] = [];
+    bus.on("initialize", (value) => {
+      calls.push(value);
+    });
+
+    expect(calls).toEqual([]);
+    await flushMicrotasks();
+    expect(calls).toEqual([42]);
+
+    await expect(bus.on("initialize")).resolves.toBe(42);
+  });
+
+  it("does not replay stream events to late subscribers", async () => {
+    const bus = new AppEventBus<TestEvents, typeof behavior>(behavior);
+    bus.emit("pointerUp", "first");
+
+    const calls: string[] = [];
+    bus.on("pointerUp", (pointerId) => {
+      calls.push(pointerId);
+    });
+
+    await flushMicrotasks();
+    expect(calls).toEqual([]);
+
+    bus.emit("pointerUp", "second");
+    expect(calls).toEqual(["second"]);
+  });
+
+  it("replays replay-last stream events and stays subscribed", async () => {
+    const bus = new AppEventBus<TestEvents, typeof behavior>(behavior);
+    bus.emit("viewState", 1);
+
+    const calls: number[] = [];
+    bus.on("viewState", (zoom) => {
+      calls.push(zoom);
+    });
+
+    await flushMicrotasks();
+    expect(calls).toEqual([1]);
+
+    bus.emit("viewState", 2);
+    expect(calls).toEqual([1, 2]);
+  });
+
+  it("throws when emitting a once event twice", () => {
+    const bus = new AppEventBus<TestEvents, typeof behavior>(behavior);
+    bus.emit("initialize", 1);
+
+    expect(() => {
+      bus.emit("initialize", 2);
+    }).toThrow('Event "initialize" can only be emitted once');
+  });
+});

packages/common/src/appEventBus.ts

@@ -0,0 +1,136 @@
+import type { UnsubscribeCallback } from "@excalidraw/excalidraw/types";
+
+import { Emitter } from "./emitter";
+import { isProdEnv } from "./utils";
+
+export type AppEventPayloadMap = Record<string, unknown[]>;
+
+export type AppEventBehavior = {
+  cardinality: "once" | "many";
+  replay: "none" | "last";
+};
+
+export type AppEventBehaviorMap<Events extends AppEventPayloadMap> = {
+  [K in keyof Events]: AppEventBehavior;
+};
+
+type AwaitableAppEventKeys<
+  Events extends AppEventPayloadMap,
+  Behavior extends AppEventBehaviorMap<Events>,
+> = {
+  [K in keyof Events]: Behavior[K]["cardinality"] extends "once"
+    ? Behavior[K]["replay"] extends "last"
+      ? K
+      : never
+    : never;
+}[keyof Events];
+
+type AppEventPromiseValue<Args extends any[]> = Args extends [infer Only]
+  ? Only
+  : Args;
+
+export class AppEventBus<
+  Events extends AppEventPayloadMap,
+  Behavior extends AppEventBehaviorMap<Events>,
+> {
+  private readonly emitters = new Map<keyof Events, Emitter<any>>();
+  private readonly lastPayload = new Map<keyof Events, any[]>();
+  private readonly emittedOnce = new Set<keyof Events>();
+
+  constructor(private readonly behavior: Behavior) {}
+
+  private getEmitter<K extends keyof Events>(name: K): Emitter<Events[K]> {
+    let emitter = this.emitters.get(name);
+    if (!emitter) {
+      emitter = new Emitter<any>();
+      this.emitters.set(name, emitter);
+    }
+    return emitter as Emitter<Events[K]>;
+  }
+
+  private toPromiseValue<Args extends any[]>(
+    args: Args,
+  ): AppEventPromiseValue<Args> {
+    return (args.length === 1 ? args[0] : args) as AppEventPromiseValue<Args>;
+  }
+
+  public on<K extends keyof Events>(
+    name: K,
+    callback: (...args: Events[K]) => void,
+  ): UnsubscribeCallback;
+  public on<K extends AwaitableAppEventKeys<Events, Behavior>>(
+    name: K,
+  ): Promise<AppEventPromiseValue<Events[K]>>;
+  public on<K extends keyof Events>(
+    name: K,
+    callback?: (...args: Events[K]) => void,
+  ): UnsubscribeCallback | Promise<AppEventPromiseValue<Events[K]>> {
+    const eventBehavior = this.behavior[name];
+    const cachedPayload = this.lastPayload.get(name) as Events[K] | undefined;
+
+    if (callback) {
+      if (eventBehavior.replay === "last" && cachedPayload) {
+        queueMicrotask(() => callback(...cachedPayload));
+
+        if (eventBehavior.cardinality === "once") {
+          return () => {};
+        }
+      }
+
+      return this.getEmitter(name).on(callback);
+    }
+
+    if (
+      eventBehavior.cardinality !== "once" ||
+      eventBehavior.replay !== "last"
+    ) {
+      throw new Error(`Event "${String(name)}" requires a callback`);
+    }
+
+    if (cachedPayload) {
+      return Promise.resolve(this.toPromiseValue(cachedPayload));
+    }
+
+    return new Promise<AppEventPromiseValue<Events[K]>>((resolve) => {
+      this.getEmitter(name).once((...args: Events[K]) => {
+        resolve(this.toPromiseValue(args));
+      });
+    });
+  }
+
+  public emit<K extends keyof Events>(name: K, ...args: Events[K]) {
+    const eventBehavior = this.behavior[name];
+
+    if (!isProdEnv()) {
+      if (eventBehavior.cardinality === "once") {
+        if (this.emittedOnce.has(name)) {
+          throw new Error(`Event "${String(name)}" can only be emitted once`);
+        }
+        this.emittedOnce.add(name);
+      }
+    }
+
+    if (eventBehavior.replay === "last") {
+      this.lastPayload.set(name, args);
+    }
+
+    try {
+      this.getEmitter(name).trigger(...args);
+    } finally {
+      if (eventBehavior.cardinality === "once") {
+        this.getEmitter(name).clear();
+      }
+    }
+  }
+
+  public clear() {
+    this.lastPayload.clear();
+    this.emittedOnce.clear();
+
+    for (const emitter of this.emitters.values()) {
+      emitter.clear();
+    }
+
+    this.emitters.clear();
+  }
+}

packages/common/src/colors.ts

@@ -240,22 +240,21 @@ export const DEFAULT_ELEMENT_BACKGROUND_COLOR_PALETTE = {
 // -----------------------------------------------------------------------------
 
 // !!!MUST BE WITHOUT GRAY, TRANSPARENT AND BLACK!!!
-export const getAllColorsSpecificShade = (index: 0 | 1 | 2 | 3 | 4) =>
+export const getAllColorsSpecificShade = (index: 0 | 1 | 2 | 3 | 4) => [
-  [
+  // 2nd row
-    // 2nd row
+  COLOR_PALETTE.cyan[index],
-    COLOR_PALETTE.cyan[index],
+  COLOR_PALETTE.blue[index],
-    COLOR_PALETTE.blue[index],
+  COLOR_PALETTE.violet[index],
-    COLOR_PALETTE.violet[index],
+  COLOR_PALETTE.grape[index],
-    COLOR_PALETTE.grape[index],
+  COLOR_PALETTE.pink[index],
-    COLOR_PALETTE.pink[index],
 
-    // 3rd row
+  // 3rd row
-    COLOR_PALETTE.green[index],
+  COLOR_PALETTE.green[index],
-    COLOR_PALETTE.teal[index],
+  COLOR_PALETTE.teal[index],
-    COLOR_PALETTE.yellow[index],
+  COLOR_PALETTE.yellow[index],
-    COLOR_PALETTE.orange[index],
+  COLOR_PALETTE.orange[index],
-    COLOR_PALETTE.red[index],
+  COLOR_PALETTE.red[index],
-  ] as const;
+];
 
 // -----------------------------------------------------------------------------
 // other helpers
@@ -346,7 +345,7 @@ export const normalizeInputColor = (color: string): string | null => {
   if (tc.isValid()) {
     // testing for `#` first fixes a bug on Electron (more specfically, an
     // Obsidian popout window), where a hex color without `#` is considered valid
-    if (tc.getFormat() === "hex" && !color.startsWith("#")) {
+    if (["hex", "hex8"].includes(tc.getFormat()) && !color.startsWith("#")) {
       return `#${color}`;
     }
     return color;

packages/common/src/constants.ts

@@ -106,6 +106,7 @@ export const CLASSES = {
   CONVERT_ELEMENT_TYPE_POPUP: "ConvertElementTypePopup",
   SHAPE_ACTIONS_THEME_SCOPE: "shape-actions-theme-scope",
   FRAME_NAME: "frame-name",
+  DROPDOWN_MENU_EVENT_WRAPPER: "dropdown-menu-event-wrapper",
 };
 
 export const FONT_SIZES = {
@@ -251,6 +252,7 @@ export const STRING_MIME_TYPES = {
   json: "application/json",
   // excalidraw data
   excalidraw: "application/vnd.excalidraw+json",
+  excalidrawClipboard: "application/vnd.excalidraw.clipboard+json",
   // LEGACY: fully-qualified library JSON data
   excalidrawlib: "application/vnd.excalidrawlib+json",
   // list of excalidraw library item ids

packages/common/src/index.ts

@@ -11,4 +11,7 @@ export * from "./random";
 export * from "./url";
 export * from "./utils";
 export * from "./emitter";
+export * from "./appEventBus";
 export * from "./editorInterface";
+export * from "./versionedSnapshotStore";
+export { Debug } from "../debug";

packages/common/src/utils.test.ts

@@ -3,6 +3,12 @@ import {
   mapFind,
   reduceToCommonValue,
 } from "@excalidraw/common";
+import { vi } from "vitest";
+
+// Import directly to avoid the @excalidraw/common throttleRAF mock from setupTests.ts.
+import { throttleRAF } from "./utils";
+
+type RafCallback = FrameRequestCallback;
 
 describe("@excalidraw/common/utils", () => {
   describe("isTransparent()", () => {
@@ -79,4 +85,87 @@ describe("@excalidraw/common/utils", () => {
       expect(mapFind([1, 2], () => null)).toBe(undefined);
     });
   });
+
+  describe("throttleRAF()", () => {
+    let frameCallbacks: Map<number, RafCallback>;
+    let nextFrameId: number;
+
+    const runScheduledFrame = (timestamp = 16) => {
+      const callbacks = [...frameCallbacks.values()];
+      frameCallbacks.clear();
+      callbacks.forEach((callback) => callback(timestamp));
+    };
+
+    beforeEach(() => {
+      frameCallbacks = new Map();
+      nextFrameId = 0;
+
+      vi.spyOn(window, "requestAnimationFrame").mockImplementation(
+        (callback) => {
+          const frameId = ++nextFrameId;
+          frameCallbacks.set(frameId, callback);
+          return frameId;
+        },
+      );
+
+      vi.spyOn(window, "cancelAnimationFrame").mockImplementation((frameId) => {
+        frameCallbacks.delete(frameId);
+      });
+    });
+
+    afterEach(() => {
+      vi.restoreAllMocks();
+    });
+
+    it("should invoke the callback with the last args from the same frame", () => {
+      const fn = vi.fn();
+      const throttled = throttleRAF(fn);
+
+      throttled("first", 1);
+      throttled("second", 2);
+      throttled("last", 3);
+
+      expect(fn).not.toHaveBeenCalled();
+      expect(window.requestAnimationFrame).toHaveBeenCalledTimes(1);
+
+      runScheduledFrame();
+
+      expect(fn).toHaveBeenCalledTimes(1);
+      expect(fn).toHaveBeenCalledWith("last", 3);
+    });
+
+    it("should flush the pending callback immediately", () => {
+      const fn = vi.fn();
+      const throttled = throttleRAF(fn);
+
+      throttled("first");
+      throttled("last");
+
+      throttled.flush();
+
+      expect(window.cancelAnimationFrame).toHaveBeenCalledTimes(1);
+      expect(fn).toHaveBeenCalledTimes(1);
+      expect(fn).toHaveBeenCalledWith("last");
+
+      runScheduledFrame();
+
+      expect(fn).toHaveBeenCalledTimes(1);
+    });
+
+    it("should cancel the pending callback", () => {
+      const fn = vi.fn();
+      const throttled = throttleRAF(fn);
+
+      throttled("first");
+      throttled("last");
+
+      throttled.cancel();
+
+      expect(window.cancelAnimationFrame).toHaveBeenCalledTimes(1);
+
+      runScheduledFrame();
+
+      expect(fn).not.toHaveBeenCalled();
+    });
+  });
 });

packages/common/src/utils.ts

@@ -1,5 +1,7 @@
 import { average } from "@excalidraw/math";
 
+import type { GlobalCoord } from "@excalidraw/math";
+
 import type { FontFamilyValues, FontString } from "@excalidraw/element/types";
 
 import type {
@@ -86,7 +88,8 @@ export const isWritableElement = (
     (target.type === "text" ||
       target.type === "number" ||
       target.type === "password" ||
-      target.type === "search"));
+      target.type === "search")) ||
+  (target instanceof HTMLElement && target.closest(".cm-editor") !== null);
 
 export const getFontFamilyString = ({
   fontFamily,
@@ -148,38 +151,27 @@ export const debounce = <T extends any[]>(
   return ret;
 };
 
-// throttle callback to execute once per animation frame
+// throttle callback to execute once per animation frame using the latest args
-export const throttleRAF = <T extends any[]>(
+export const throttleRAF = <T extends any[]>(fn: (...args: T) => void) => {
-  fn: (...args: T) => void,
-  opts?: { trailing?: boolean },
-) => {
   let timerId: number | null = null;
   let lastArgs: T | null = null;
-  let lastArgsTrailing: T | null = null;
 
-  const scheduleFunc = (args: T) => {
+  const scheduleFunc = () => {
     timerId = window.requestAnimationFrame(() => {
       timerId = null;
-      fn(...args);
+      const args = lastArgs;
       lastArgs = null;
-      if (lastArgsTrailing) {
+
-        lastArgs = lastArgsTrailing;
+      if (args) {
-        lastArgsTrailing = null;
+        fn(...args);
-        scheduleFunc(lastArgs);
       }
     });
   };
 
   const ret = (...args: T) => {
-    if (isTestEnv()) {
-      fn(...args);
-      return;
-    }
     lastArgs = args;
     if (timerId === null) {
-      scheduleFunc(lastArgs);
+      scheduleFunc();
-    } else if (opts?.trailing) {
-      lastArgsTrailing = args;
     }
   };
   ret.flush = () => {
@@ -188,12 +180,12 @@ export const throttleRAF = <T extends any[]>(
       timerId = null;
     }
     if (lastArgs) {
-      fn(...(lastArgsTrailing || lastArgs));
+      fn(...lastArgs);
-      lastArgs = lastArgsTrailing = null;
+      lastArgs = null;
     }
   };
   ret.cancel = () => {
-    lastArgs = lastArgsTrailing = null;
+    lastArgs = null;
     if (timerId !== null) {
       cancelAnimationFrame(timerId);
       timerId = null;
@@ -441,7 +433,7 @@ export const viewportCoordsToSceneCoords = (
   const x = (clientX - offsetLeft) / zoom.value - scrollX;
   const y = (clientY - offsetTop) / zoom.value - scrollY;
 
-  return { x, y };
+  return { x, y } as GlobalCoord;
 };
 
 export const sceneCoordsToViewportCoords = (
@@ -1330,3 +1322,10 @@ export const setFeatureFlag = <F extends keyof FEATURE_FLAGS>(
     console.error("unable to set feature flag", e);
   }
 };
+
+export const oneOf = <N extends string | number | symbol | null, H extends N>(
+  needle: N,
+  haystack: readonly H[],
+): needle is H => {
+  return haystack.includes(needle as any);
+};

packages/common/src/versionedSnapshotStore.ts

@@ -0,0 +1,70 @@
+export type VersionedSnapshot<T> = Readonly<{
+  version: number;
+  value: T;
+}>;
+
+export class VersionedSnapshotStore<T> {
+  private version = 0;
+  private value: T;
+  private readonly waiters = new Set<
+    (snapshot: VersionedSnapshot<T>) => void
+  >();
+  private readonly subscribers = new Set<
+    (snapshot: VersionedSnapshot<T>) => void
+  >();
+
+  constructor(
+    initialValue: T,
+    private readonly isEqual: (prev: T, next: T) => boolean = Object.is,
+  ) {
+    this.value = initialValue;
+  }
+
+  public getSnapshot(): VersionedSnapshot<T> {
+    return { version: this.version, value: this.value };
+  }
+
+  public set(nextValue: T): boolean {
+    if (this.isEqual(this.value, nextValue)) {
+      return false;
+    }
+
+    this.value = nextValue;
+    this.version += 1;
+
+    const snapshot = this.getSnapshot();
+
+    for (const subscriber of this.subscribers) {
+      subscriber(snapshot);
+    }
+    for (const waiter of this.waiters) {
+      waiter(snapshot);
+    }
+    this.waiters.clear();
+
+    return true;
+  }
+
+  public update(updater: (prev: T) => T): boolean {
+    return this.set(updater(this.value));
+  }
+
+  public subscribe(
+    subscriber: (snapshot: VersionedSnapshot<T>) => void,
+  ): () => void {
+    this.subscribers.add(subscriber);
+    return () => {
+      this.subscribers.delete(subscriber);
+    };
+  }
+
+  public pull(sinceVersion = -1): Promise<VersionedSnapshot<T>> {
+    if (this.version !== sinceVersion) {
+      return Promise.resolve(this.getSnapshot());
+    }
+
+    return new Promise((resolve) => {
+      this.waiters.add(resolve);
+    });
+  }
+}

packages/element/src/Scene.ts

@@ -438,6 +438,8 @@ export class Scene {
     options: {
       informMutation: boolean;
       isDragging: boolean;
+      isBindingEnabled?: boolean;
+      isMidpointSnappingEnabled?: boolean;
     } = {
       informMutation: true,
       isDragging: false,

packages/element/src/arrowheads.ts

@@ -0,0 +1,32 @@
+import type { Arrowhead, AnyArrowhead } from "./types";
+
+export const normalizeArrowhead = (
+  arrowhead: AnyArrowhead | null | undefined,
+): Arrowhead | null => {
+  switch (arrowhead) {
+    case undefined:
+    case null:
+      return null;
+    case "dot":
+      return "circle";
+    case "crowfoot_one":
+      return "cardinality_one";
+    case "crowfoot_many":
+      return "cardinality_many";
+    case "crowfoot_one_or_many":
+      return "cardinality_one_or_many";
+    default:
+      return arrowhead;
+  }
+};
+
+export const getArrowheadForPicker = (
+  arrowhead: AnyArrowhead | null | undefined,
+): Arrowhead | null => {
+  const normalizedArrowhead = normalizeArrowhead(arrowhead);
+  if (normalizedArrowhead === null) {
+    return null;
+  }
+
+  return normalizedArrowhead;
+};

packages/element/src/arrows/focus.ts

@@ -0,0 +1,558 @@
+import { pointDistance, pointFrom, type GlobalPoint } from "@excalidraw/math";
+import { invariant } from "@excalidraw/common";
+
+import type { AppState, NullableGridSize } from "@excalidraw/excalidraw/types";
+
+import {
+  bindBindingElement,
+  calculateFixedPointForNonElbowArrowBinding,
+  FOCUS_POINT_SIZE,
+  getBindingGap,
+  getGlobalFixedPointForBindableElement,
+  isBindingEnabled,
+  maxBindingDistance_simple,
+  unbindBindingElement,
+  updateBoundPoint,
+} from "../binding";
+import {
+  isBindableElement,
+  isBindingElement,
+  isElbowArrow,
+} from "../typeChecks";
+import { LinearElementEditor } from "../linearElementEditor";
+import { getHoveredElementForFocusPoint, hitElementItself } from "../collision";
+import { moveArrowAboveBindable } from "../zindex";
+
+import type {
+  ElementsMap,
+  ExcalidrawArrowElement,
+  ExcalidrawBindableElement,
+  NonDeletedSceneElementsMap,
+  PointsPositionUpdates,
+} from "../types";
+
+import type { Scene } from "../Scene";
+
+export const isFocusPointVisible = (
+  focusPoint: GlobalPoint,
+  arrow: ExcalidrawArrowElement,
+  bindableElement: ExcalidrawBindableElement,
+  elementsMap: ElementsMap,
+  appState: {
+    isBindingEnabled: AppState["isBindingEnabled"];
+    zoom: AppState["zoom"];
+  },
+  startOrEnd: "start" | "end",
+  ignoreOverlap = false,
+): boolean => {
+  // No focus point management for elbow arrows, because elbow arrows
+  // always have their focus point at the arrow point itself
+  if (
+    isElbowArrow(arrow) ||
+    !isBindingEnabled(appState) ||
+    arrow.points.length !== 2
+  ) {
+    return false;
+  }
+
+  // Avoid showing the focus point indicator if the focus point is essentially
+  // on top of the arrow point it belongs to itself, if not ignoring specifically
+  if (!ignoreOverlap) {
+    const associatedPointIdx =
+      arrow.startBinding?.elementId === bindableElement.id
+        ? 0
+        : arrow.points.length - 1;
+    const associatedArrowPoint =
+      LinearElementEditor.getPointAtIndexGlobalCoordinates(
+        arrow,
+        associatedPointIdx,
+        elementsMap,
+      );
+
+    if (
+      pointDistance(focusPoint, associatedArrowPoint) <
+      (FOCUS_POINT_SIZE * 1.5) / appState.zoom.value
+    ) {
+      return false;
+    }
+  }
+
+  const arrowPoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
+    arrow,
+    startOrEnd === "end" ? arrow.points.length - 1 : 0,
+    elementsMap,
+  );
+
+  // Check if the focus point is within the element's shape bounds
+  // Endpoint dragging takes precedence
+  return (
+    pointDistance(focusPoint, arrowPoint) >=
+      (FOCUS_POINT_SIZE * 1.5) / appState.zoom.value &&
+    hitElementItself({
+      element: bindableElement,
+      elementsMap,
+      point: focusPoint,
+      threshold: getBindingGap(bindableElement, arrow),
+      overrideShouldTestInside: true,
+    })
+  );
+};
+
+// Updates the arrow endpoints in "orbit" configuration
+const focusPointUpdate = (
+  arrow: ExcalidrawArrowElement,
+  bindableElement: ExcalidrawBindableElement | null,
+  isStartBinding: boolean,
+  elementsMap: NonDeletedSceneElementsMap,
+  scene: Scene,
+  appState: AppState,
+  switchToInsideBinding: boolean,
+) => {
+  const pointUpdates = new Map();
+
+  const bindingField = isStartBinding ? "startBinding" : "endBinding";
+  const adjacentBindingField = isStartBinding ? "endBinding" : "startBinding";
+  let currentBinding = arrow[bindingField];
+  let adjacentBinding = arrow[adjacentBindingField];
+
+  // Update the dragged focus point related end
+  if (currentBinding && bindableElement) {
+    // Update the targeted bindings
+    const boundToSameElement =
+      bindableElement &&
+      adjacentBinding &&
+      currentBinding.elementId === adjacentBinding.elementId;
+    if (switchToInsideBinding || boundToSameElement) {
+      currentBinding = {
+        ...currentBinding,
+        mode: "inside",
+      };
+    } else {
+      currentBinding = {
+        ...currentBinding,
+        mode: "orbit",
+      };
+    }
+
+    const pointIndex = isStartBinding ? 0 : arrow.points.length - 1;
+    const newPoint = updateBoundPoint(
+      arrow,
+      bindingField as "startBinding" | "endBinding",
+      currentBinding,
+      bindableElement,
+      elementsMap,
+      true,
+    );
+
+    if (newPoint) {
+      pointUpdates.set(pointIndex, { point: newPoint });
+    }
+  }
+
+  // Also update the adjacent end if it has a binding
+  if (adjacentBinding && adjacentBinding.mode === "orbit") {
+    const adjacentBindableElement = elementsMap.get(
+      adjacentBinding.elementId,
+    ) as ExcalidrawBindableElement;
+
+    if (
+      adjacentBindableElement &&
+      isBindableElement(adjacentBindableElement) &&
+      isBindingEnabled(appState)
+    ) {
+      // Same shape bound on both ends
+      const boundToSameElementAfterUpdate =
+        bindableElement && adjacentBinding.elementId === bindableElement.id;
+      if (switchToInsideBinding || boundToSameElementAfterUpdate) {
+        adjacentBinding = {
+          ...adjacentBinding,
+          mode: "inside",
+        };
+      } else {
+        adjacentBinding = {
+          ...adjacentBinding,
+          mode: "orbit",
+        };
+      }
+
+      const adjacentPointIndex = isStartBinding ? arrow.points.length - 1 : 0;
+      const adjacentNewPoint = updateBoundPoint(
+        arrow,
+        adjacentBindingField,
+        adjacentBinding,
+        adjacentBindableElement,
+        elementsMap,
+      );
+
+      if (adjacentNewPoint) {
+        pointUpdates.set(adjacentPointIndex, {
+          point: adjacentNewPoint,
+        });
+      }
+    }
+  }
+
+  if (pointUpdates.size > 0) {
+    LinearElementEditor.movePoints(arrow, scene, pointUpdates, {
+      [bindingField]: currentBinding,
+      [adjacentBindingField]: adjacentBinding,
+    });
+  }
+};
+
+export const handleFocusPointDrag = (
+  linearElementEditor: LinearElementEditor,
+  elementsMap: NonDeletedSceneElementsMap,
+  pointerCoords: { x: number; y: number },
+  scene: Scene,
+  appState: AppState,
+  gridSize: NullableGridSize,
+  switchToInsideBinding: boolean,
+) => {
+  const arrow = LinearElementEditor.getElement(
+    linearElementEditor.elementId,
+    elementsMap,
+  ) as any;
+
+  // Sanity checks
+  if (
+    !arrow ||
+    !isBindingElement(arrow) ||
+    isElbowArrow(arrow) ||
+    !linearElementEditor.hoveredFocusPointBinding ||
+    !linearElementEditor.draggedFocusPointBinding
+  ) {
+    return;
+  }
+
+  const isStartBinding =
+    linearElementEditor.draggedFocusPointBinding === "start";
+  const binding = isStartBinding ? arrow.startBinding : arrow.endBinding;
+  const { x: offsetX, y: offsetY } = linearElementEditor.pointerOffset;
+  const point = pointFrom<GlobalPoint>(
+    pointerCoords.x - offsetX,
+    pointerCoords.y - offsetY,
+  );
+  const bindingField = isStartBinding ? "startBinding" : "endBinding";
+  const hit = getHoveredElementForFocusPoint(
+    point,
+    arrow,
+    scene.getNonDeletedElements(),
+    elementsMap,
+    maxBindingDistance_simple(appState.zoom),
+  );
+
+  // Hovering a bindable element
+  if (hit && isBindingEnabled(appState)) {
+    // Break existing binding if bound to another shape or if binding is disabled
+    if (arrow[bindingField] && hit.id !== binding?.elementId) {
+      unbindBindingElement(
+        arrow,
+        linearElementEditor.draggedFocusPointBinding,
+        scene,
+      );
+    }
+
+    // Handle binding mode switch
+    const newMode =
+      switchToInsideBinding && arrow[bindingField]?.mode === "orbit"
+        ? "inside"
+        : !switchToInsideBinding && arrow[bindingField]?.mode === "inside"
+        ? "orbit"
+        : null;
+
+    // If no existing binding, create it
+    if (!arrow[bindingField] || newMode) {
+      // Create a new binding if none exists
+      bindBindingElement(
+        arrow,
+        hit,
+        newMode || "orbit",
+        linearElementEditor.draggedFocusPointBinding,
+        scene,
+        point,
+      );
+    }
+
+    // Update the binding's fixed point
+    scene.mutateElement(arrow, {
+      [bindingField]: {
+        ...arrow[bindingField],
+        elementId: hit.id,
+        mode: newMode || arrow[bindingField]?.mode || "orbit",
+        ...calculateFixedPointForNonElbowArrowBinding(
+          arrow,
+          hit,
+          linearElementEditor.draggedFocusPointBinding,
+          elementsMap,
+          point,
+        ),
+      },
+    });
+  } else {
+    // Not hovering any bindable element, move the arrow endpoint
+    const pointUpdates: PointsPositionUpdates = new Map();
+    const pointIndex = isStartBinding ? 0 : arrow.points.length - 1;
+    pointUpdates.set(pointIndex, {
+      point: LinearElementEditor.createPointAt(
+        arrow,
+        elementsMap,
+        point[0],
+        point[1],
+        gridSize,
+      ),
+    });
+    LinearElementEditor.movePoints(arrow, scene, pointUpdates);
+    if (arrow[bindingField]) {
+      unbindBindingElement(arrow, isStartBinding ? "start" : "end", scene);
+    }
+  }
+
+  // Update the arrow endpoints
+  focusPointUpdate(
+    arrow,
+    hit,
+    isStartBinding,
+    elementsMap,
+    scene,
+    appState,
+    switchToInsideBinding,
+  );
+
+  if (hit && isBindingEnabled(appState)) {
+    moveArrowAboveBindable(
+      point,
+      arrow,
+      scene.getElementsIncludingDeleted(),
+      elementsMap,
+      scene,
+      hit,
+    );
+  }
+};
+
+export const handleFocusPointPointerDown = (
+  arrow: ExcalidrawArrowElement,
+  pointerDownState: { origin: { x: number; y: number } },
+  elementsMap: NonDeletedSceneElementsMap,
+  appState: AppState,
+): {
+  hitFocusPoint: "start" | "end" | null;
+  pointerOffset: { x: number; y: number };
+} => {
+  const pointerPos = pointFrom(
+    pointerDownState.origin.x,
+    pointerDownState.origin.y,
+  );
+  const hitThreshold = (FOCUS_POINT_SIZE * 1.5) / appState.zoom.value;
+
+  // Check start binding focus point
+  if (arrow.startBinding?.elementId) {
+    const bindableElement = elementsMap.get(arrow.startBinding.elementId);
+    if (
+      bindableElement &&
+      isBindableElement(bindableElement) &&
+      !bindableElement.isDeleted
+    ) {
+      const focusPoint = getGlobalFixedPointForBindableElement(
+        arrow.startBinding.fixedPoint,
+        bindableElement,
+        elementsMap,
+      );
+      if (
+        isFocusPointVisible(
+          focusPoint,
+          arrow,
+          bindableElement,
+          elementsMap,
+          appState,
+          "start",
+        ) &&
+        pointDistance(pointerPos, focusPoint) <= hitThreshold
+      ) {
+        return {
+          hitFocusPoint: "start",
+          pointerOffset: {
+            x: pointerPos[0] - focusPoint[0],
+            y: pointerPos[1] - focusPoint[1],
+          },
+        };
+      }
+    }
+  }
+
+  // Check end binding focus point (only if start not already hit)
+  if (arrow.endBinding?.elementId) {
+    const bindableElement = elementsMap.get(arrow.endBinding.elementId);
+    if (
+      bindableElement &&
+      isBindableElement(bindableElement) &&
+      !bindableElement.isDeleted
+    ) {
+      const focusPoint = getGlobalFixedPointForBindableElement(
+        arrow.endBinding.fixedPoint,
+        bindableElement,
+        elementsMap,
+      );
+      if (
+        isFocusPointVisible(
+          focusPoint,
+          arrow,
+          bindableElement,
+          elementsMap,
+          appState,
+          "end",
+        ) &&
+        pointDistance(pointerPos, focusPoint) <= hitThreshold
+      ) {
+        return {
+          hitFocusPoint: "end",
+          pointerOffset: {
+            x: pointerPos[0] - focusPoint[0],
+            y: pointerPos[1] - focusPoint[1],
+          },
+        };
+      }
+    }
+  }
+
+  return {
+    hitFocusPoint: null,
+    pointerOffset: { x: 0, y: 0 },
+  };
+};
+
+export const handleFocusPointPointerUp = (
+  linearElementEditor: LinearElementEditor,
+  scene: Scene,
+) => {
+  invariant(
+    linearElementEditor.draggedFocusPointBinding,
+    "Must have a dragged focus point at pointer release",
+  );
+
+  const arrow = LinearElementEditor.getElement<ExcalidrawArrowElement>(
+    linearElementEditor.elementId,
+    scene.getNonDeletedElementsMap(),
+  );
+  invariant(arrow, "Arrow must be in the scene");
+
+  // Clean up
+  const bindingKey =
+    linearElementEditor.draggedFocusPointBinding === "start"
+      ? "startBinding"
+      : "endBinding";
+  const otherBindingKey =
+    linearElementEditor.draggedFocusPointBinding === "start"
+      ? "endBinding"
+      : "startBinding";
+  const boundElementId = arrow[bindingKey]?.elementId;
+  const otherBoundElementId = arrow[otherBindingKey]?.elementId;
+  const oldBoundElement =
+    boundElementId &&
+    scene
+      .getNonDeletedElements()
+      .find(
+        (element) =>
+          element.id !== boundElementId &&
+          element.id !== otherBoundElementId &&
+          isBindableElement(element) &&
+          element.boundElements?.find(({ id }) => id === arrow.id),
+      );
+  if (oldBoundElement) {
+    scene.mutateElement(oldBoundElement, {
+      boundElements: oldBoundElement.boundElements?.filter(
+        ({ id }) => id !== arrow.id,
+      ),
+    });
+  }
+
+  // Record the new bound element
+  const boundElement =
+    boundElementId && scene.getNonDeletedElementsMap().get(boundElementId);
+  if (boundElement) {
+    scene.mutateElement(boundElement, {
+      boundElements: [
+        ...(boundElement.boundElements || [])?.filter(
+          ({ id }) => id !== arrow.id,
+        ),
+        {
+          id: arrow.id,
+          type: "arrow",
+        },
+      ],
+    });
+  }
+};
+
+export const handleFocusPointHover = (
+  arrow: ExcalidrawArrowElement,
+  scenePointerX: number,
+  scenePointerY: number,
+  scene: Scene,
+  appState: AppState,
+): "start" | "end" | null => {
+  const elementsMap = scene.getNonDeletedElementsMap();
+  const pointerPos = pointFrom(scenePointerX, scenePointerY);
+  const hitThreshold = (FOCUS_POINT_SIZE * 1.5) / appState.zoom.value;
+
+  // Check start binding focus point
+  if (arrow.startBinding?.elementId) {
+    const bindableElement = elementsMap.get(arrow.startBinding.elementId);
+    if (
+      bindableElement &&
+      isBindableElement(bindableElement) &&
+      !bindableElement.isDeleted
+    ) {
+      const focusPoint = getGlobalFixedPointForBindableElement(
+        arrow.startBinding.fixedPoint,
+        bindableElement,
+        elementsMap,
+      );
+      if (
+        isFocusPointVisible(
+          focusPoint,
+          arrow,
+          bindableElement,
+          elementsMap,
+          appState,
+          "start",
+        ) &&
+        pointDistance(pointerPos, focusPoint) <= hitThreshold
+      ) {
+        return "start";
+      }
+    }
+  }
+
+  // Check end binding focus point (only if start not already hovered)
+  if (arrow.endBinding?.elementId) {
+    const bindableElement = elementsMap.get(arrow.endBinding.elementId);
+    if (
+      bindableElement &&
+      isBindableElement(bindableElement) &&
+      !bindableElement.isDeleted
+    ) {
+      const focusPoint = getGlobalFixedPointForBindableElement(
+        arrow.endBinding.fixedPoint,
+        bindableElement,
+        elementsMap,
+      );
+      if (
+        isFocusPointVisible(
+          focusPoint,
+          arrow,
+          bindableElement,
+          elementsMap,
+          appState,
+          "end",
+        ) &&
+        pointDistance(pointerPos, focusPoint) <= hitThreshold
+      ) {
+        return "end";
+      }
+    }
+  }
+
+  return null;
+};

packages/element/src/arrows/helpers.ts

@@ -0,0 +1,45 @@
+import type { App } from "@excalidraw/excalidraw/types";
+
+import { LinearElementEditor } from "../linearElementEditor";
+
+import { handleFocusPointDrag } from "./focus";
+
+export const maybeHandleArrowPointlikeDrag = ({
+  app,
+  event,
+}: {
+  app: App;
+  event: KeyboardEvent | React.KeyboardEvent<Element> | PointerEvent;
+}): boolean => {
+  const appState = app.state;
+  if (appState.selectedLinearElement && app.lastPointerMoveCoords) {
+    // Update focus point status if the binding mode is changing
+    if (appState.selectedLinearElement.draggedFocusPointBinding) {
+      handleFocusPointDrag(
+        appState.selectedLinearElement,
+        app.scene.getNonDeletedElementsMap(),
+        app.lastPointerMoveCoords,
+        app.scene,
+        appState,
+        app.getEffectiveGridSize(),
+        event.altKey,
+      );
+      return true;
+    } else if (
+      appState.selectedLinearElement.hoverPointIndex !== null &&
+      app.lastPointerMoveEvent &&
+      appState.selectedLinearElement.initialState.lastClickedPoint >= 0 &&
+      appState.selectedLinearElement.isDragging
+    ) {
+      LinearElementEditor.handlePointDragging(
+        app.lastPointerMoveEvent,
+        app,
+        app.lastPointerMoveCoords.x,
+        app.lastPointerMoveCoords.y,
+        appState.selectedLinearElement,
+      );
+      return true;
+    }
+  }
+  return false;
+};

packages/element/src/binding.ts

@@ -1,5 +1,4 @@
 import {
-  KEYS,
   arrayToMap,
   getFeatureFlag,
   invariant,
@@ -27,14 +26,11 @@ import type { AppState } from "@excalidraw/excalidraw/types";
 import type { MapEntry, Mutable } from "@excalidraw/common/utility-types";
 import type { Bounds } from "@excalidraw/common";
 
-import {
+import { getCenterForBounds } from "./bounds";
-  doBoundsIntersect,
-  getCenterForBounds,
-  getElementBounds,
-} from "./bounds";
 import {
   getAllHoveredElementAtPoint,
   getHoveredElementForBinding,
+  hitElementItself,
   intersectElementWithLineSegment,
   isBindableElementInsideOtherBindable,
   isPointInElement,
@@ -113,8 +109,10 @@ export type BindingStrategy =
  *
  * IMPORTANT: currently must be > 0 (this also applies to the computed gap)
  */
-export const BASE_BINDING_GAP = 10;
+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,
@@ -138,13 +136,9 @@ export const maxBindingDistance_simple = (zoom?: AppState["zoom"]): number => {
   );
 };
 
-export const shouldEnableBindingForPointerEvent = (
+export const isBindingEnabled = (appState: {
-  event: React.PointerEvent<HTMLElement>,
+  isBindingEnabled: AppState["isBindingEnabled"];
-) => {
+}): boolean => {
-  return !event[KEYS.CTRL_OR_CMD];
-};
-
-export const isBindingEnabled = (appState: AppState): boolean => {
   return appState.isBindingEnabled;
 };
 
@@ -176,8 +170,20 @@ export const bindOrUnbindBindingElement = (
     },
   );
 
-  bindOrUnbindBindingElementEdge(arrow, start, "start", scene);
+  bindOrUnbindBindingElementEdge(
-  bindOrUnbindBindingElementEdge(arrow, end, "end", scene);
+    arrow,
+    start,
+    "start",
+    scene,
+    appState.isBindingEnabled,
+  );
+  bindOrUnbindBindingElementEdge(
+    arrow,
+    end,
+    "end",
+    scene,
+    appState.isBindingEnabled,
+  );
   if (start.focusPoint || end.focusPoint) {
     // If the strategy dictates a focus point override, then
     // update the arrow points to point to the focus point.
@@ -220,12 +226,21 @@ const bindOrUnbindBindingElementEdge = (
   { mode, element, focusPoint }: BindingStrategy,
   startOrEnd: "start" | "end",
   scene: Scene,
+  shouldSnapToOutline = true,
 ): void => {
   if (mode === null) {
     // null means break the binding
     unbindBindingElement(arrow, startOrEnd, scene);
   } else if (mode !== undefined) {
-    bindBindingElement(arrow, element, mode, startOrEnd, scene, focusPoint);
+    bindBindingElement(
+      arrow,
+      element,
+      mode,
+      startOrEnd,
+      scene,
+      focusPoint,
+      shouldSnapToOutline,
+    );
   }
 };
 
@@ -258,7 +273,7 @@ const bindingStrategyForElbowArrowEndpointDragging = (
     globalPoint,
     elements,
     elementsMap,
-    (element) => maxBindingDistance_simple(zoom),
+    maxBindingDistance_simple(zoom),
   );
 
   const current = hit
@@ -683,7 +698,7 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
     globalPoint,
     elements,
     elementsMap,
-    (e) => maxBindingDistance_simple(appState.zoom),
+    maxBindingDistance_simple(appState.zoom),
   );
   const pointInElement =
     hit &&
@@ -710,7 +725,13 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
   const otherFocusPointIsInElement =
     otherBindableElement &&
     otherFocusPoint &&
-    isPointInElement(otherFocusPoint, otherBindableElement, elementsMap);
+    hitElementItself({
+      point: otherFocusPoint,
+      element: otherBindableElement,
+      elementsMap,
+      threshold: 0,
+      overrideShouldTestInside: true,
+    });
 
   // Handle outside-outside binding to the same element
   if (otherBinding && otherBinding.elementId === hit?.id) {
@@ -790,6 +811,8 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
               hit,
               startDragged ? "start" : "end",
               elementsMap,
+              appState.zoom,
+              appState.isMidpointSnappingEnabled,
             ) || globalPoint,
         }
     : { mode: null };
@@ -799,11 +822,24 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
     startDragged ? -1 : 0,
     elementsMap,
   );
-
+  const pointIsCloseToOtherElement =
-  const other: BindingStrategy =
+    otherFocusPoint &&
     otherBindableElement &&
-    !otherFocusPointIsInElement &&
+    hitElementItself({
-    appState.selectedLinearElement?.initialState.altFocusPoint
+      point: globalPoint,
+      element: otherBindableElement,
+      elementsMap,
+      threshold: maxBindingDistance_simple(appState.zoom),
+      overrideShouldTestInside: true,
+    });
+  const otherNeverOverride = opts?.newArrow
+    ? appState.selectedLinearElement?.initialState.arrowStartIsInside
+    : otherBinding?.mode === "inside";
+  const other: BindingStrategy = !otherNeverOverride
+    ? otherBindableElement &&
+      !otherFocusPointIsInElement &&
+      !pointIsCloseToOtherElement &&
+      appState.selectedLinearElement?.initialState.altFocusPoint
       ? {
           mode: "orbit",
           element: otherBindableElement,
@@ -820,9 +856,12 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
               otherBindableElement,
               startDragged ? "end" : "start",
               elementsMap,
+              appState.zoom,
+              appState.isMidpointSnappingEnabled,
             ) || otherEndpoint,
         }
-      : { mode: undefined };
+      : { mode: undefined }
+    : { mode: undefined };
 
   return {
     start: startDragged ? current : other,
@@ -982,6 +1021,7 @@ export const bindBindingElement = (
   startOrEnd: "start" | "end",
   scene: Scene,
   focusPoint?: GlobalPoint,
+  shouldSnapToOutline = true,
 ): void => {
   const elementsMap = scene.getNonDeletedElementsMap();
 
@@ -996,6 +1036,7 @@ export const bindBindingElement = (
         hoveredElement,
         startOrEnd,
         elementsMap,
+        shouldSnapToOutline,
       ),
     };
   } else {
@@ -1086,7 +1127,7 @@ export const updateBoundElements = (
     });
   }
 
-  boundElementsVisitor(elementsMap, changedElement, (element) => {
+  const visitor = (element: ExcalidrawElement | undefined) => {
     if (!isArrowElement(element) || element.isDeleted) {
       return;
     }
@@ -1158,7 +1199,71 @@ export const updateBoundElements = (
     if (boundText && !boundText.isDeleted) {
       handleBindTextResize(element, scene, false);
     }
-  });
+  };
+
+  boundElementsVisitor(elementsMap, changedElement, visitor);
+};
+
+const updateArrowBindings = (
+  latestElement: ExcalidrawArrowElement,
+  startOrEnd: "startBinding" | "endBinding",
+  elementsMap: NonDeletedSceneElementsMap,
+  scene: Scene,
+  appState: AppState,
+) => {
+  invariant(
+    !isElbowArrow(latestElement),
+    "Elbow arrows not supported for indirect updates",
+  );
+
+  const binding = latestElement[startOrEnd];
+  const bindableElement =
+    binding &&
+    (elementsMap.get(binding.elementId) as ExcalidrawBindableElement);
+  const point = LinearElementEditor.getPointAtIndexGlobalCoordinates(
+    latestElement,
+    startOrEnd === "startBinding" ? 0 : -1,
+    elementsMap,
+  );
+  const hit =
+    bindableElement &&
+    hitElementItself({
+      element: bindableElement,
+      point,
+      elementsMap,
+      threshold: maxBindingDistance_simple(appState.zoom),
+    });
+  const strategyName = startOrEnd === "startBinding" ? "start" : "end";
+  unbindBindingElement(latestElement, strategyName, scene);
+  if (hit) {
+    const pointIdx =
+      startOrEnd === "startBinding" ? 0 : latestElement.points.length - 1;
+    const localPoint = latestElement.points[pointIdx];
+    const strategy =
+      getBindingStrategyForDraggingBindingElementEndpoints_simple(
+        latestElement,
+        new Map([[pointIdx, { point: localPoint }]]),
+        point[0],
+        point[1],
+        elementsMap,
+        scene.getNonDeletedElements(),
+        appState,
+      );
+    if (
+      strategy[strategyName] &&
+      strategy[strategyName].element?.id === bindableElement.id &&
+      strategy[strategyName].mode
+    ) {
+      bindBindingElement(
+        latestElement,
+        bindableElement,
+        strategy[strategyName].mode,
+        strategyName,
+        scene,
+        strategy[strategyName].focusPoint,
+      );
+    }
+  }
 };
 
 export const updateBindings = (
@@ -1171,14 +1276,27 @@ export const updateBindings = (
   },
 ) => {
   if (isArrowElement(latestElement)) {
-    bindOrUnbindBindingElement(
+    const elementsMap = scene.getNonDeletedElementsMap();
-      latestElement,
+
-      new Map(),
+    if (latestElement.startBinding) {
-      Infinity,
+      updateArrowBindings(
-      Infinity,
+        latestElement,
-      scene,
+        "startBinding",
-      appState,
+        elementsMap,
-    );
+        scene,
+        appState,
+      );
+    }
+
+    if (latestElement.endBinding) {
+      updateArrowBindings(
+        latestElement,
+        "endBinding",
+        elementsMap,
+        scene,
+        appState,
+      );
+    }
   } else {
     updateBoundElements(latestElement, scene, {
       ...options,
@@ -1252,6 +1370,7 @@ export const bindPointToSnapToElementOutline = (
   startOrEnd: "start" | "end",
   elementsMap: ElementsMap,
   customIntersector?: LineSegment<GlobalPoint>,
+  isMidpointSnappingEnabled = true,
 ): GlobalPoint => {
   const elbowed = isElbowArrow(arrowElement);
   const point = LinearElementEditor.getPointAtIndexGlobalCoordinates(
@@ -1291,15 +1410,13 @@ export const bindPointToSnapToElementOutline = (
     const isHorizontal = headingIsHorizontal(
       headingForPointFromElement(bindableElement, aabb, point),
     );
-    const snapPoint = snapToMid(
+    const snapPoint = isMidpointSnappingEnabled
-      arrowElement,
+      ? snapToMid(bindableElement, elementsMap, edgePoint, 0.05, arrowElement)
-      bindableElement,
+      : undefined;
-      elementsMap,
+    const resolved = snapPoint || point;
-      edgePoint,
-    );
     const otherPoint = pointFrom<GlobalPoint>(
-      isHorizontal ? bindableCenter[0] : snapPoint[0],
+      isHorizontal ? bindableCenter[0] : resolved[0],
-      !isHorizontal ? bindableCenter[1] : snapPoint[1],
+      !isHorizontal ? bindableCenter[1] : resolved[1],
     );
     const intersector =
       customIntersector ??
@@ -1307,7 +1424,7 @@ export const bindPointToSnapToElementOutline = (
         otherPoint,
         pointFromVector(
           vectorScale(
-            vectorNormalize(vectorFromPoint(snapPoint, otherPoint)),
+            vectorNormalize(vectorFromPoint(resolved, otherPoint)),
             Math.max(bindableElement.width, bindableElement.height) * 2,
           ),
           otherPoint,
@@ -1322,14 +1439,14 @@ export const bindPointToSnapToElementOutline = (
 
     if (!intersection) {
       const anotherPoint = pointFrom<GlobalPoint>(
-        !isHorizontal ? bindableCenter[0] : snapPoint[0],
+        !isHorizontal ? bindableCenter[0] : resolved[0],
-        isHorizontal ? bindableCenter[1] : snapPoint[1],
+        isHorizontal ? bindableCenter[1] : resolved[1],
       );
       const anotherIntersector = lineSegment(
         anotherPoint,
         pointFromVector(
           vectorScale(
-            vectorNormalize(vectorFromPoint(snapPoint, anotherPoint)),
+            vectorNormalize(vectorFromPoint(resolved, anotherPoint)),
             Math.max(bindableElement.width, bindableElement.height) * 2,
           ),
           anotherPoint,
@@ -1476,18 +1593,18 @@ export const avoidRectangularCorner = (
   return p;
 };
 
-const snapToMid = (
+export const snapToMid = (
-  arrowElement: ExcalidrawArrowElement,
   bindTarget: ExcalidrawBindableElement,
   elementsMap: ElementsMap,
   p: GlobalPoint,
   tolerance: number = 0.05,
-): GlobalPoint => {
+  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 = getBindingGap(bindTarget, arrowElement);
+  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
@@ -1496,7 +1613,7 @@ const snapToMid = (
 
   // Too close to the center makes it hard to resolve direction precisely
   if (pointDistance(center, nonRotated) < bindingGap) {
-    return p;
+    return undefined;
   }
 
   if (
@@ -1505,8 +1622,8 @@ const snapToMid = (
     nonRotated[1] < center[1] + verticalThreshold
   ) {
     // LEFT
-    return pointRotateRads<GlobalPoint>(
+    return pointRotateRads(
-      pointFrom(x - bindingGap, center[1]),
+      pointFrom<GlobalPoint>(x - bindingGap, center[1]),
       center,
       angle,
     );
@@ -1516,7 +1633,11 @@ const snapToMid = (
     nonRotated[0] < center[0] + horizontalThreshold
   ) {
     // TOP
-    return pointRotateRads(pointFrom(center[0], y - bindingGap), center, angle);
+    return pointRotateRads(
+      pointFrom<GlobalPoint>(center[0], y - bindingGap),
+      center,
+      angle,
+    );
   } else if (
     nonRotated[0] >= x + width / 2 &&
     nonRotated[1] > center[1] - verticalThreshold &&
@@ -1524,7 +1645,7 @@ const snapToMid = (
   ) {
     // RIGHT
     return pointRotateRads(
-      pointFrom(x + width + bindingGap, center[1]),
+      pointFrom<GlobalPoint>(x + width + bindingGap, center[1]),
       center,
       angle,
     );
@@ -1535,7 +1656,7 @@ const snapToMid = (
   ) {
     // DOWN
     return pointRotateRads(
-      pointFrom(center[0], y + height + bindingGap),
+      pointFrom<GlobalPoint>(center[0], y + height + bindingGap),
       center,
       angle,
     );
@@ -1584,13 +1705,44 @@ const snapToMid = (
     }
   }
 
-  return p;
+  return undefined;
 };
 
-const compareElementArea = (
+const extractBinding = (
-  a: ExcalidrawBindableElement,
+  arrow: ExcalidrawArrowElement,
-  b: ExcalidrawBindableElement,
+  startOrEnd: "startBinding" | "endBinding",
-) => b.width ** 2 + b.height ** 2 - (a.width ** 2 + a.height ** 2);
+  elementsMap: ElementsMap,
+) => {
+  const binding = arrow[startOrEnd];
+  if (!binding) {
+    return {
+      element: null,
+      fixedPoint: null,
+      focusPoint: null,
+      binding,
+      mode: null,
+    };
+  }
+
+  const element = elementsMap.get(
+    binding.elementId,
+  ) as ExcalidrawBindableElement;
+
+  return {
+    element,
+    fixedPoint: binding.fixedPoint,
+    focusPoint: getGlobalFixedPointForBindableElement(
+      normalizeFixedPoint(binding.fixedPoint),
+      element,
+      elementsMap,
+    ),
+    binding,
+    mode: binding.mode,
+  };
+};
+
+const elementArea = (element: ExcalidrawBindableElement) =>
+  element.width * element.height;
 
 export const updateBoundPoint = (
   arrow: NonDeleted<ExcalidrawArrowElement>,
@@ -1598,7 +1750,7 @@ export const updateBoundPoint = (
   binding: FixedPointBinding | null | undefined,
   bindableElement: ExcalidrawBindableElement,
   elementsMap: ElementsMap,
-  customIntersector?: LineSegment<GlobalPoint>,
+  dragging?: boolean,
 ): LocalPoint | null => {
   if (
     binding == null ||
@@ -1613,152 +1765,139 @@ export const updateBoundPoint = (
     return null;
   }
 
-  const global = getGlobalFixedPointForBindableElement(
+  const focusPoint = getGlobalFixedPointForBindableElement(
     normalizeFixedPoint(binding.fixedPoint),
     bindableElement,
     elementsMap,
   );
-  const pointIndex =
-    startOrEnd === "startBinding" ? 0 : arrow.points.length - 1;
-  const elbowed = isElbowArrow(arrow);
-  const otherBinding =
-    startOrEnd === "startBinding" ? arrow.endBinding : arrow.startBinding;
-  const otherBindableElement =
-    otherBinding &&
-    (elementsMap.get(otherBinding.elementId)! as ExcalidrawBindableElement);
-  const bounds = getElementBounds(bindableElement, elementsMap);
-  const otherBounds =
-    otherBindableElement && getElementBounds(otherBindableElement, elementsMap);
-  const isLargerThanOther =
-    otherBindableElement &&
-    compareElementArea(bindableElement, otherBindableElement) <
-      // if both shapes the same size, pretend the other is larger
-      (startOrEnd === "endBinding" ? 1 : 0);
-  const isOverlapping = otherBounds && doBoundsIntersect(bounds, otherBounds);
 
-  // GOAL: If the arrow becomes too short, we want to jump the arrow endpoints
+  // 0. Short-circuit for inside binding as it doesn't require any
-  // to the exact focus points on the elements.
+  // calculations and is not affected by other bindings
-  // INTUITION: We're not interested in the exacts length of the arrow (which
+  if (binding.mode === "inside") {
-  // will change if we change where we route it), we want to know the length of
+    return LinearElementEditor.createPointAt(
-  // the part which lies outside of both shapes and consider that as a trigger
-  // to change where we point the arrow. Avoids jumping the arrow in and out
-  // at every frame.
-  let arrowTooShort = false;
-  if (
-    !isOverlapping &&
-    !elbowed &&
-    arrow.startBinding &&
-    arrow.endBinding &&
-    otherBindableElement &&
-    arrow.points.length === 2
-  ) {
-    const startFocusPoint = getGlobalFixedPointForBindableElement(
-      arrow.startBinding.fixedPoint,
-      startOrEnd === "startBinding" ? bindableElement : otherBindableElement,
-      elementsMap,
-    );
-    const endFocusPoint = getGlobalFixedPointForBindableElement(
-      arrow.endBinding.fixedPoint,
-      startOrEnd === "endBinding" ? bindableElement : otherBindableElement,
-      elementsMap,
-    );
-    const segment = lineSegment(startFocusPoint, endFocusPoint);
-    const startIntersection = intersectElementWithLineSegment(
-      startOrEnd === "endBinding" ? bindableElement : otherBindableElement,
-      elementsMap,
-      segment,
-      0,
-      true,
-    );
-    const endIntersection = intersectElementWithLineSegment(
-      startOrEnd === "startBinding" ? bindableElement : otherBindableElement,
-      elementsMap,
-      segment,
-      0,
-      true,
-    );
-    if (startIntersection.length > 0 && endIntersection.length > 0) {
-      const len = pointDistance(startIntersection[0], endIntersection[0]);
-      arrowTooShort = len < 40;
-    }
-  }
-
-  const isNested = (arrowTooShort || isOverlapping) && isLargerThanOther;
-
-  let _customIntersector = customIntersector;
-  if (!elbowed && !_customIntersector) {
-    const [x1, y1, x2, y2] = LinearElementEditor.getElementAbsoluteCoords(
       arrow,
       elementsMap,
-    );
+      focusPoint[0],
-    const center = pointFrom<GlobalPoint>((x1 + x2) / 2, (y1 + y2) / 2);
+      focusPoint[1],
-    const edgePoint = isRectanguloidElement(bindableElement)
+      null,
-      ? avoidRectangularCorner(arrow, bindableElement, elementsMap, global)
-      : global;
-    const adjacentPoint = pointRotateRads(
-      pointFrom<GlobalPoint>(
-        arrow.x +
-          arrow.points[pointIndex === 0 ? 1 : arrow.points.length - 2][0],
-        arrow.y +
-          arrow.points[pointIndex === 0 ? 1 : arrow.points.length - 2][1],
-      ),
-      center,
-      arrow.angle as Radians,
-    );
-    const bindingGap = getBindingGap(bindableElement, arrow);
-    const halfVector = vectorScale(
-      vectorNormalize(vectorFromPoint(edgePoint, adjacentPoint)),
-      pointDistance(edgePoint, adjacentPoint) +
-        Math.max(bindableElement.width, bindableElement.height) +
-        bindingGap * 2,
-    );
-    _customIntersector = lineSegment(
-      pointFromVector(halfVector, adjacentPoint),
-      pointFromVector(vectorScale(halfVector, -1), adjacentPoint),
     );
   }
 
-  const maybeOutlineGlobal =
+  const { element: otherBindable, focusPoint: otherFocusPoint } =
-    binding.mode === "orbit" && bindableElement
+    extractBinding(
-      ? isNested
+      arrow,
-        ? global
+      startOrEnd === "startBinding" ? "endBinding" : "startBinding",
-        : bindPointToSnapToElementOutline(
+      elementsMap,
-            {
+    );
-              ...arrow,
+  const otherArrowPoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
-              points: [
+    arrow,
-                pointIndex === 0
+    startOrEnd === "startBinding" ? 1 : -2,
-                  ? LinearElementEditor.createPointAt(
+    elementsMap,
-                      arrow,
+  );
-                      elementsMap,
+  const otherFocusPointOrArrowPoint =
-                      global[0],
+    arrow.points.length === 2
-                      global[1],
+      ? otherFocusPoint || otherArrowPoint
-                      null,
+      : otherArrowPoint;
-                    )
+  const intersector =
-                  : arrow.points[0],
+    otherFocusPointOrArrowPoint &&
-                ...arrow.points.slice(1, -1),
+    lineSegment(focusPoint, otherFocusPointOrArrowPoint);
-                pointIndex === arrow.points.length - 1
+  const otherOutlinePoint =
-                  ? LinearElementEditor.createPointAt(
+    otherBindable &&
-                      arrow,
+    intersector &&
-                      elementsMap,
+    intersectElementWithLineSegment(
-                      global[0],
+      otherBindable,
-                      global[1],
+      elementsMap,
-                      null,
+      intersector,
-                    )
+      getBindingGap(otherBindable, arrow),
-                  : arrow.points[arrow.points.length - 1],
+    ).sort(
-              ],
+      (a, b) => pointDistanceSq(a, focusPoint) - pointDistanceSq(b, focusPoint),
-            },
+    )[0];
-            bindableElement,
+  const outlinePoint =
-            pointIndex === 0 ? "start" : "end",
+    intersector &&
-            elementsMap,
+    intersectElementWithLineSegment(
-            _customIntersector,
+      bindableElement,
-          )
+      elementsMap,
-      : global;
+      intersector,
+      getBindingGap(bindableElement, arrow),
+    ).sort(
+      (a, b) =>
+        pointDistanceSq(a, otherFocusPointOrArrowPoint) -
+        pointDistanceSq(b, otherFocusPointOrArrowPoint),
+    )[0];
+  const startHasArrowhead = arrow.startArrowhead !== null;
+  const endHasArrowhead = arrow.endArrowhead !== null;
+  const resolvedTarget =
+    (!startHasArrowhead && !endHasArrowhead) ||
+    (startOrEnd === "startBinding" && startHasArrowhead) ||
+    (startOrEnd === "endBinding" && endHasArrowhead)
+      ? focusPoint
+      : outlinePoint || focusPoint;
 
+  // 1. Handle case when the outline point (or focus point) is inside
+  // the other shape by short-circuiting to the focus point, otherwise
+  // the arrow would invert
+  if (
+    otherBindable &&
+    outlinePoint &&
+    !dragging &&
+    // Arbitrary threshold to handle wireframing use cases
+    elementArea(otherBindable) < elementArea(bindableElement) * 2 &&
+    hitElementItself({
+      element: otherBindable,
+      point: outlinePoint,
+      elementsMap,
+      threshold: getBindingGap(otherBindable, arrow),
+      overrideShouldTestInside: true,
+    })
+  ) {
+    return LinearElementEditor.createPointAt(
+      arrow,
+      elementsMap,
+      resolvedTarget[0],
+      resolvedTarget[1],
+      null,
+    );
+  }
+
+  const otherTargetPoint = otherBindable
+    ? otherOutlinePoint || otherFocusPoint || otherArrowPoint
+    : otherArrowPoint;
+  const arrowTooShort =
+    pointDistance(otherTargetPoint, outlinePoint || focusPoint) <=
+    BASE_ARROW_MIN_LENGTH;
+
+  // 2. If the arrow is unconnected at the other end, just check arrow size
+  // and short-circuit to the focus point if the arrow is too short to
+  // avoid inversion
+  if (!otherBindable) {
+    return LinearElementEditor.createPointAt(
+      arrow,
+      elementsMap,
+      arrowTooShort ? focusPoint[0] : outlinePoint?.[0] ?? focusPoint[0],
+      arrowTooShort ? focusPoint[1] : outlinePoint?.[1] ?? focusPoint[1],
+      null,
+    );
+  }
+
+  // 3. If the arrow is too short while connected on both ends and
+  // the other arrow endpoint will not be inside the bindable, just
+  // check the arrow size and make a decision based on that
+  if (arrowTooShort) {
+    return LinearElementEditor.createPointAt(
+      arrow,
+      elementsMap,
+      resolvedTarget?.[0] || focusPoint[0],
+      resolvedTarget?.[1] || focusPoint[1],
+      null,
+    );
+  }
+
+  // 4. In the general case, snap to the outline if possible
   return LinearElementEditor.createPointAt(
     arrow,
     elementsMap,
-    maybeOutlineGlobal[0],
+    outlinePoint?.[0] || focusPoint[0],
-    maybeOutlineGlobal[1],
+    outlinePoint?.[1] || focusPoint[1],
     null,
   );
 };
@@ -1768,6 +1907,8 @@ export const calculateFixedPointForElbowArrowBinding = (
   hoveredElement: ExcalidrawBindableElement,
   startOrEnd: "start" | "end",
   elementsMap: ElementsMap,
+  shouldSnapToOutline = true,
+  isMidpointSnappingEnabled = true,
 ): { fixedPoint: FixedPoint } => {
   const bounds = [
     hoveredElement.x,
@@ -1775,12 +1916,20 @@ export const calculateFixedPointForElbowArrowBinding = (
     hoveredElement.x + hoveredElement.width,
     hoveredElement.y + hoveredElement.height,
   ] as Bounds;
-  const snappedPoint = bindPointToSnapToElementOutline(
+  const snappedPoint = shouldSnapToOutline
-    linearElement,
+    ? bindPointToSnapToElementOutline(
-    hoveredElement,
+        linearElement,
-    startOrEnd,
+        hoveredElement,
-    elementsMap,
+        startOrEnd,
-  );
+        elementsMap,
+        undefined,
+        isMidpointSnappingEnabled,
+      )
+    : LinearElementEditor.getPointAtIndexGlobalCoordinates(
+        linearElement,
+        startOrEnd === "start" ? 0 : -1,
+        elementsMap,
+      );
   const globalMidPoint = pointFrom(
     bounds[0] + (bounds[2] - bounds[0]) / 2,
     bounds[1] + (bounds[3] - bounds[1]) / 2,
@@ -1808,7 +1957,7 @@ export const calculateFixedPointForNonElbowArrowBinding = (
   elementsMap: ElementsMap,
   focusPoint?: GlobalPoint,
 ): { fixedPoint: FixedPoint } => {
-  const edgePoint = focusPoint
+  const edgePoint: GlobalPoint = focusPoint
     ? focusPoint
     : LinearElementEditor.getPointAtIndexGlobalCoordinates(
         linearElement,
@@ -1816,11 +1965,7 @@ export const calculateFixedPointForNonElbowArrowBinding = (
         elementsMap,
       );
 
-  // Convert the global point to element-local coordinates
+  const elementCenter = elementCenterPoint(hoveredElement, elementsMap);
-  const elementCenter = pointFrom(
-    hoveredElement.x + hoveredElement.width / 2,
-    hoveredElement.y + hoveredElement.height / 2,
-  );
 
   // Rotate the point to account for element rotation
   const nonRotatedPoint = pointRotateRads(
@@ -2330,21 +2475,37 @@ export const getArrowLocalFixedPoints = (
   ];
 };
 
-export const normalizeFixedPoint = <T extends FixedPoint | null>(
+export const isFixedPoint = (
+  fixedPoint: any,
+): fixedPoint is FixedPointBinding["fixedPoint"] => {
+  return (
+    Array.isArray(fixedPoint) &&
+    fixedPoint.length === 2 &&
+    fixedPoint.every((coord) => Number.isFinite(coord))
+  );
+};
+
+export const normalizeFixedPoint = <T extends FixedPoint>(
   fixedPoint: T,
-): T extends null ? null : FixedPoint => {
+): FixedPoint => {
+  if (!isFixedPoint(fixedPoint)) {
+    return [0.5001, 0.5001];
+  }
+
+  const EPSILON = 0.0001;
+
   // Do not allow a precise 0.5 for fixed point ratio
   // to avoid jumping arrow heading due to floating point imprecision
   if (
-    fixedPoint &&
+    Math.abs(fixedPoint[0] - 0.5) < EPSILON ||
-    (Math.abs(fixedPoint[0] - 0.5) < 0.0001 ||
+    Math.abs(fixedPoint[1] - 0.5) < EPSILON
-      Math.abs(fixedPoint[1] - 0.5) < 0.0001)
   ) {
     return fixedPoint.map((ratio) =>
-      Math.abs(ratio - 0.5) < 0.0001 ? 0.5001 : ratio,
+      Math.abs(ratio - 0.5) < EPSILON ? 0.5001 : ratio,
-    ) as T extends null ? null : FixedPoint;
+    ) as FixedPoint;
   }
-  return fixedPoint as any as T extends null ? null : FixedPoint;
+
+  return fixedPoint;
 };
 
 type Side =

packages/element/src/bounds.ts

@@ -709,6 +709,9 @@ const getFreeDrawElementAbsoluteCoords = (
   return [x1, y1, x2, y2, (x1 + x2) / 2, (y1 + y2) / 2];
 };
 
+const CARDINALITY_MARKER_SIZE = 20;
+const CROWFOOT_ARROWHEAD_SIZE = 15;
+
 /** @returns number in pixels */
 export const getArrowheadSize = (arrowhead: Arrowhead): number => {
   switch (arrowhead) {
@@ -717,10 +720,14 @@ export const getArrowheadSize = (arrowhead: Arrowhead): number => {
     case "diamond":
     case "diamond_outline":
       return 12;
-    case "crowfoot_many":
+    case "cardinality_many":
-    case "crowfoot_one":
+    case "cardinality_one_or_many":
-    case "crowfoot_one_or_many":
+    case "cardinality_zero_or_many":
-      return 20;
+      return CROWFOOT_ARROWHEAD_SIZE;
+    case "cardinality_one":
+    case "cardinality_exactly_one":
+    case "cardinality_zero_or_one":
+      return CARDINALITY_MARKER_SIZE;
     default:
       return 15;
   }
@@ -743,7 +750,12 @@ export const getArrowheadPoints = (
   shape: Drawable[],
   position: "start" | "end",
   arrowhead: Arrowhead,
+  offsetMultiplier = 0,
 ) => {
+  if (arrowhead === null) {
+    return null;
+  }
+
   if (shape.length < 1) {
     return null;
   }
@@ -824,29 +836,30 @@ export const getArrowheadPoints = (
   const lengthMultiplier =
     arrowhead === "diamond" || arrowhead === "diamond_outline" ? 0.25 : 0.5;
   const minSize = Math.min(size, length * lengthMultiplier);
-  const xs = x2 - nx * minSize;
+  const tx = x2 - nx * minSize * offsetMultiplier;
-  const ys = y2 - ny * minSize;
+  const ty = y2 - ny * minSize * offsetMultiplier;
+  const xs = tx - nx * minSize;
+  const ys = ty - ny * minSize;
 
-  if (
+  if (arrowhead === "circle" || arrowhead === "circle_outline") {
-    arrowhead === "dot" ||
+    const diameter = Math.hypot(ys - ty, xs - tx) + element.strokeWidth - 2;
-    arrowhead === "circle" ||
+    return [tx, ty, diameter];
-    arrowhead === "circle_outline"
-  ) {
-    const diameter = Math.hypot(ys - y2, xs - x2) + element.strokeWidth - 2;
-    return [x2, y2, diameter];
   }
 
   const angle = getArrowheadAngle(arrowhead);
 
-  if (arrowhead === "crowfoot_many" || arrowhead === "crowfoot_one_or_many") {
+  if (
+    arrowhead === "cardinality_many" ||
+    arrowhead === "cardinality_one_or_many"
+  ) {
     // swap (xs, ys) with (x2, y2)
     const [x3, y3] = pointRotateRads(
-      pointFrom(x2, y2),
+      pointFrom(tx, ty),
       pointFrom(xs, ys),
       degreesToRadians(-angle as Degrees),
     );
     const [x4, y4] = pointRotateRads(
-      pointFrom(x2, y2),
+      pointFrom(tx, ty),
       pointFrom(xs, ys),
       degreesToRadians(angle),
     );
@@ -856,12 +869,12 @@ export const getArrowheadPoints = (
   // Return points
   const [x3, y3] = pointRotateRads(
     pointFrom(xs, ys),
-    pointFrom(x2, y2),
+    pointFrom(tx, ty),
     ((-angle * Math.PI) / 180) as Radians,
   );
   const [x4, y4] = pointRotateRads(
     pointFrom(xs, ys),
-    pointFrom(x2, y2),
+    pointFrom(tx, ty),
     degreesToRadians(angle),
   );
 
@@ -874,9 +887,9 @@ export const getArrowheadPoints = (
       const [px, py] = element.points.length > 1 ? element.points[1] : [0, 0];
 
       [ox, oy] = pointRotateRads(
-        pointFrom(x2 + minSize * 2, y2),
+        pointFrom(tx + minSize * 2, ty),
-        pointFrom(x2, y2),
+        pointFrom(tx, ty),
-        Math.atan2(py - y2, px - x2) as Radians,
+        Math.atan2(py - ty, px - tx) as Radians,
       );
     } else {
       const [px, py] =
@@ -885,16 +898,16 @@ export const getArrowheadPoints = (
           : [0, 0];
 
       [ox, oy] = pointRotateRads(
-        pointFrom(x2 - minSize * 2, y2),
+        pointFrom(tx - minSize * 2, ty),
-        pointFrom(x2, y2),
+        pointFrom(tx, ty),
-        Math.atan2(y2 - py, x2 - px) as Radians,
+        Math.atan2(ty - py, tx - px) as Radians,
       );
     }
 
-    return [x2, y2, x3, y3, ox, oy, x4, y4];
+    return [tx, ty, x3, y3, ox, oy, x4, y4];
   }
 
-  return [x2, y2, x3, y3, x4, y4];
+  return [tx, ty, x3, y3, x4, y4];
 };
 
 // TODO reuse shape.ts

packages/element/src/collision.ts

@@ -59,8 +59,11 @@ import { LinearElementEditor } from "./linearElementEditor";
 
 import { distanceToElement } from "./distance";
 
+import { getBindingGap } from "./binding";
+
 import type {
   ElementsMap,
+  ExcalidrawArrowElement,
   ExcalidrawBindableElement,
   ExcalidrawDiamondElement,
   ExcalidrawElement,
@@ -290,7 +293,7 @@ export const getAllHoveredElementAtPoint = (
   point: Readonly<GlobalPoint>,
   elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   elementsMap: NonDeletedSceneElementsMap,
-  toleranceFn?: (element: ExcalidrawBindableElement) => number,
+  tolerance?: number,
 ): NonDeleted<ExcalidrawBindableElement>[] => {
   const candidateElements: NonDeleted<ExcalidrawBindableElement>[] = [];
   // We need to to hit testing from front (end of the array) to back (beginning of the array)
@@ -306,7 +309,7 @@ export const getAllHoveredElementAtPoint = (
 
     if (
       isBindableElement(element, false) &&
-      bindingBorderTest(element, point, elementsMap, toleranceFn?.(element))
+      bindingBorderTest(element, point, elementsMap, tolerance)
     ) {
       candidateElements.push(element);
 
@@ -323,13 +326,13 @@ export const getHoveredElementForBinding = (
   point: Readonly<GlobalPoint>,
   elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   elementsMap: NonDeletedSceneElementsMap,
-  toleranceFn?: (element: ExcalidrawBindableElement) => number,
+  tolerance?: number,
 ): NonDeleted<ExcalidrawBindableElement> | null => {
   const candidateElements = getAllHoveredElementAtPoint(
     point,
     elements,
     elementsMap,
-    toleranceFn,
+    tolerance,
   );
 
   if (!candidateElements || candidateElements.length === 0) {
@@ -348,6 +351,56 @@ export const getHoveredElementForBinding = (
     .pop() as NonDeleted<ExcalidrawBindableElement>;
 };
 
+export const getHoveredElementForFocusPoint = (
+  point: GlobalPoint,
+  arrow: ExcalidrawArrowElement,
+  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  elementsMap: NonDeletedSceneElementsMap,
+  tolerance?: number,
+): ExcalidrawBindableElement | null => {
+  const candidateElements: NonDeleted<ExcalidrawBindableElement>[] = [];
+  // We need to to hit testing from front (end of the array) to back (beginning of the array)
+  // because array is ordered from lower z-index to highest and we want element z-index
+  // with higher z-index
+  for (let index = elements.length - 1; index >= 0; --index) {
+    const element = elements[index];
+
+    invariant(
+      !element.isDeleted,
+      "Elements in the function parameter for getAllElementsAtPositionForBinding() should not contain deleted elements",
+    );
+
+    if (
+      isBindableElement(element, false) &&
+      bindingBorderTest(element, point, elementsMap, tolerance)
+    ) {
+      candidateElements.push(element);
+    }
+  }
+
+  if (!candidateElements || candidateElements.length === 0) {
+    return null;
+  }
+
+  if (candidateElements.length === 1) {
+    return candidateElements[0];
+  }
+
+  const distanceFilteredCandidateElements = candidateElements
+    // Resolve by distance
+    .filter(
+      (el) =>
+        distanceToElement(el, elementsMap, point) <= getBindingGap(el, arrow) ||
+        isPointInElement(point, el, elementsMap),
+    );
+
+  if (distanceFilteredCandidateElements.length === 0) {
+    return null;
+  }
+
+  return distanceFilteredCandidateElements[0] as NonDeleted<ExcalidrawBindableElement>;
+};
+
 /**
  * Intersect a line with an element for binding test
  *
@@ -412,7 +465,12 @@ export const intersectElementWithLineSegment = (
     case "line":
     case "freedraw":
     case "arrow":
-      return intersectLinearOrFreeDrawWithLineSegment(element, line, onlyFirst);
+      return intersectLinearOrFreeDrawWithLineSegment(
+        element,
+        line,
+        elementsMap,
+        onlyFirst,
+      );
   }
 };
 
@@ -479,11 +537,15 @@ const lineIntersections = (
 const intersectLinearOrFreeDrawWithLineSegment = (
   element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
   segment: LineSegment<GlobalPoint>,
+  elementsMap: ElementsMap,
   onlyFirst = false,
 ): GlobalPoint[] => {
   // NOTE: This is the only one which return the decomposed elements
   // rotated! This is due to taking advantage of roughjs definitions.
-  const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
+  const [lines, curves] = deconstructLinearOrFreeDrawElement(
+    element,
+    elementsMap,
+  );
   const intersections: GlobalPoint[] = [];
 
   for (const l of lines) {

packages/element/src/distance.ts

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

packages/element/src/elbowArrow.ts

@@ -915,6 +915,8 @@ export const updateElbowArrowPoints = (
   },
   options?: {
     isDragging?: boolean;
+    isBindingEnabled?: boolean;
+    isMidpointSnappingEnabled?: boolean;
   },
 ): ElementUpdate<ExcalidrawElbowArrowElement> => {
   if (arrow.points.length < 2) {
@@ -1202,6 +1204,8 @@ const getElbowArrowData = (
   options?: {
     isDragging?: boolean;
     zoom?: AppState["zoom"];
+    isBindingEnabled?: boolean;
+    isMidpointSnappingEnabled?: boolean;
   },
 ) => {
   const origStartGlobalPoint: GlobalPoint = pointTranslate<
@@ -1215,7 +1219,7 @@ const getElbowArrowData = (
 
   let hoveredStartElement = null;
   let hoveredEndElement = null;
-  if (options?.isDragging) {
+  if (options?.isDragging && options?.isBindingEnabled !== false) {
     const elements = Array.from(elementsMap.values());
     hoveredStartElement =
       getHoveredElement(
@@ -1255,6 +1259,8 @@ const getElbowArrowData = (
     hoveredStartElement,
     elementsMap,
     options?.isDragging,
+    options?.isBindingEnabled,
+    options?.isMidpointSnappingEnabled,
   );
   const endGlobalPoint = getGlobalPoint(
     {
@@ -1270,6 +1276,8 @@ const getElbowArrowData = (
     hoveredEndElement,
     elementsMap,
     options?.isDragging,
+    options?.isBindingEnabled,
+    options?.isMidpointSnappingEnabled,
   );
   const startHeading = getBindPointHeading(
     startGlobalPoint,
@@ -2213,14 +2221,18 @@ const getGlobalPoint = (
   element?: ExcalidrawBindableElement | null,
   elementsMap?: ElementsMap,
   isDragging?: boolean,
+  isBindingEnabled = true,
+  isMidpointSnappingEnabled = true,
 ): GlobalPoint => {
   if (isDragging) {
-    if (element && elementsMap) {
+    if (isBindingEnabled && element && elementsMap) {
       return bindPointToSnapToElementOutline(
         arrow,
         element,
         startOrEnd,
         elementsMap,
+        undefined,
+        isMidpointSnappingEnabled,
       );
     }
 
@@ -2276,7 +2288,7 @@ const getHoveredElement = (
     origPoint,
     elements,
     elementsMap,
-    (element) => maxBindingDistance_simple(zoom),
+    maxBindingDistance_simple(zoom),
   );
 };
 

packages/element/src/embeddable.ts

@@ -56,7 +56,7 @@ const RE_REDDIT =
 const RE_REDDIT_EMBED =
   /^<blockquote[\s\S]*?\shref=["'](https?:\/\/(?:www\.)?reddit\.com\/[^"']*)/i;
 
-const parseYouTubeTimestamp = (url: string): number => {
+const parseYouTubeLikeTimestamp = (url: string): number => {
   let timeParam: string | null | undefined;
 
   try {
@@ -85,11 +85,57 @@ const parseYouTubeTimestamp = (url: string): number => {
   return parseInt(hours) * 3600 + parseInt(minutes) * 60 + parseInt(seconds);
 };
 
+const parseGoogleDriveVideoLink = (
+  url: string,
+): { fileId: string; resourceKey?: string; timestamp?: number } | null => {
+  try {
+    const urlObj = new URL(url.startsWith("http") ? url : `https://${url}`);
+    const hostname = urlObj.hostname.replace(/^www\./, "");
+    if (hostname !== "drive.google.com") {
+      return null;
+    }
+
+    let fileId: string | null = null;
+    const pathMatch = urlObj.pathname.match(/^\/file\/d\/([^/]+)(?:\/|$)/);
+    if (pathMatch?.[1]) {
+      fileId = pathMatch[1];
+    } else if (urlObj.pathname === "/open" || urlObj.pathname === "/uc") {
+      // Shared Drive links can be emitted as:
+      // - /open?id=<fileId> (common "open in Drive" format)
+      // - /uc?...&id=<fileId> (download/export endpoint often seen in copied links)
+      fileId = urlObj.searchParams.get("id");
+    }
+
+    if (!fileId || !/^[a-zA-Z0-9_-]+$/.test(fileId)) {
+      return null;
+    }
+
+    // Some Drive share links include `resourcekey` for access to link-shared
+    // files; preserve it in the preview URL so embeds keep working.
+    const resourceKey = urlObj.searchParams.get("resourcekey");
+    const timestamp = parseYouTubeLikeTimestamp(urlObj.toString());
+
+    return {
+      fileId,
+      resourceKey:
+        resourceKey && /^[a-zA-Z0-9_-]+$/.test(resourceKey)
+          ? resourceKey
+          : undefined,
+      // Drive accepts YouTube-like `t` formats (e.g. `t=90`, `t=1m30s`);
+      // normalize to seconds for a stable preview URL.
+      timestamp: timestamp > 0 ? timestamp : undefined,
+    };
+  } catch (error) {
+    return null;
+  }
+};
+
 const ALLOWED_DOMAINS = new Set([
   "youtube.com",
   "youtu.be",
   "vimeo.com",
   "player.vimeo.com",
+  "drive.google.com",
   "figma.com",
   "link.excalidraw.com",
   "gist.github.com",
@@ -108,6 +154,7 @@ const ALLOW_SAME_ORIGIN = new Set([
   "youtu.be",
   "vimeo.com",
   "player.vimeo.com",
+  "drive.google.com",
   "figma.com",
   "twitter.com",
   "x.com",
@@ -142,7 +189,7 @@ export const getEmbedLink = (
   let aspectRatio = { w: 560, h: 840 };
   const ytLink = link.match(RE_YOUTUBE);
   if (ytLink?.[2]) {
-    const startTime = parseYouTubeTimestamp(originalLink);
+    const startTime = parseYouTubeLikeTimestamp(originalLink);
     const time = startTime > 0 ? `&start=${startTime}` : ``;
     const isPortrait = link.includes("shorts");
     type = "video";
@@ -201,6 +248,36 @@ export const getEmbedLink = (
     };
   }
 
+  const googleDriveVideo = parseGoogleDriveVideoLink(link);
+  if (googleDriveVideo) {
+    type = "video";
+    const searchParams = new URLSearchParams();
+    if (googleDriveVideo.resourceKey) {
+      searchParams.set("resourcekey", googleDriveVideo.resourceKey);
+    }
+    if (googleDriveVideo.timestamp) {
+      searchParams.set("t", `${googleDriveVideo.timestamp}`);
+    }
+
+    const search = searchParams.toString();
+    link = `https://drive.google.com/file/d/${googleDriveVideo.fileId}/preview${
+      search ? `?${search}` : ""
+    }`;
+    aspectRatio = { w: 560, h: 315 };
+    embeddedLinkCache.set(originalLink, {
+      link,
+      intrinsicSize: aspectRatio,
+      type,
+      sandbox: { allowSameOrigin },
+    });
+    return {
+      link,
+      intrinsicSize: aspectRatio,
+      type,
+      sandbox: { allowSameOrigin },
+    };
+  }
+
   const figmaLink = link.match(RE_FIGMA);
   if (figmaLink) {
     type = "generic";

packages/element/src/index.ts

@@ -70,6 +70,7 @@ export * from "./elbowArrow";
 export * from "./elementLink";
 export * from "./embeddable";
 export * from "./flowchart";
+export * from "./arrows/focus";
 export * from "./fractionalIndex";
 export * from "./frame";
 export * from "./groups";
@@ -97,3 +98,5 @@ export * from "./transformHandles";
 export * from "./typeChecks";
 export * from "./utils";
 export * from "./zindex";
+export * from "./arrows/helpers";
+export * from "./arrowheads";

packages/element/src/linearElementEditor.ts

@@ -9,7 +9,6 @@ import {
   vectorFromPoint,
   curveLength,
   curvePointAtLength,
-  lineSegment,
 } from "@excalidraw/math";
 
 import { getCurvePathOps } from "@excalidraw/utils/shape";
@@ -26,6 +25,7 @@ import {
 
 import {
   deconstructLinearOrFreeDrawElement,
+  getSnapOutlineMidPoint,
   isPathALoop,
   moveArrowAboveBindable,
   projectFixedPointOntoDiagonal,
@@ -48,6 +48,7 @@ import {
   calculateFixedPointForNonElbowArrowBinding,
   getBindingStrategyForDraggingBindingElementEndpoints,
   isBindingEnabled,
+  snapToMid,
   updateBoundPoint,
 } from "./binding";
 import {
@@ -149,6 +150,8 @@ export class LinearElementEditor {
   public readonly pointerOffset: Readonly<{ x: number; y: number }>;
   public readonly hoverPointIndex: number;
   public readonly segmentMidPointHoveredCoords: GlobalPoint | null;
+  public readonly hoveredFocusPointBinding: "start" | "end" | null;
+  public readonly draggedFocusPointBinding: "start" | "end" | null;
   public readonly elbowed: boolean;
   public readonly customLineAngle: number | null;
   public readonly isEditing: boolean;
@@ -194,6 +197,8 @@ export class LinearElementEditor {
     };
     this.hoverPointIndex = -1;
     this.segmentMidPointHoveredCoords = null;
+    this.hoveredFocusPointBinding = null;
+    this.draggedFocusPointBinding = null;
     this.elbowed = isElbowArrow(element) && element.elbowed;
     this.customLineAngle = null;
     this.isEditing = isEditing;
@@ -351,13 +356,23 @@ export class LinearElementEditor {
       app,
       shouldRotateWithDiscreteAngle(event),
       event.altKey,
+      linearElementEditor,
     );
 
-    LinearElementEditor.movePoints(element, app.scene, positions, {
+    LinearElementEditor.movePoints(
-      startBinding: updates?.startBinding,
+      element,
-      endBinding: updates?.endBinding,
+      app.scene,
-      moveMidPointsWithElement: updates?.moveMidPointsWithElement,
+      positions,
-    });
+      {
+        startBinding: updates?.startBinding,
+        endBinding: updates?.endBinding,
+        moveMidPointsWithElement: updates?.moveMidPointsWithElement,
+      },
+      {
+        isBindingEnabled: app.state.isBindingEnabled,
+        isMidpointSnappingEnabled: app.state.isMidpointSnappingEnabled,
+      },
+    );
     // Set the suggested binding from the updates if available
     if (isBindingElement(element, false)) {
       if (isBindingEnabled(app.state)) {
@@ -404,13 +419,15 @@ export class LinearElementEditor {
         altFocusPoint:
           !linearElementEditor.initialState.altFocusPoint &&
           startBindingElement &&
-          updates?.suggestedBinding?.id !== startBindingElement.id
+          updates?.suggestedBinding?.element.id !== startBindingElement.id
             ? projectFixedPointOntoDiagonal(
                 element,
                 pointFrom<GlobalPoint>(element.x, element.y),
                 startBindingElement,
                 "start",
                 elementsMap,
+                app.state.zoom,
+                app.state.isMidpointSnappingEnabled,
               )
             : linearElementEditor.initialState.altFocusPoint,
       },
@@ -459,16 +476,22 @@ export class LinearElementEditor {
       });
     }
 
-    invariant(
+    if (
-      lastClickedPoint > -1 &&
+      lastClickedPoint < 0 ||
-        selectedPointsIndices.includes(lastClickedPoint) &&
+      !selectedPointsIndices.includes(lastClickedPoint) ||
-        element.points[lastClickedPoint],
+      !element.points[lastClickedPoint]
-      `There must be a valid lastClickedPoint in order to drag it. selectedPointsIndices(${JSON.stringify(
+    ) {
-        selectedPointsIndices,
+      console.error(
-      )}) points(0..${
+        `There must be a valid lastClickedPoint in order to drag it. selectedPointsIndices(${JSON.stringify(
-        element.points.length - 1
+          selectedPointsIndices,
-      }) lastClickedPoint(${lastClickedPoint})`,
+        )}) points(0..${
-    );
+          element.points.length - 1
+        }) lastClickedPoint(${lastClickedPoint})`,
+      );
+
+      // Fall back to the actual last point as a last resort.
+      lastClickedPoint = element.points.length - 1;
+    }
 
     // point that's being dragged (out of all selected points)
     const draggingPoint = element.points[lastClickedPoint];
@@ -528,13 +551,23 @@ export class LinearElementEditor {
       app,
       shouldRotateWithDiscreteAngle(event) && singlePointDragged,
       event.altKey,
+      linearElementEditor,
     );
 
-    LinearElementEditor.movePoints(element, app.scene, positions, {
+    LinearElementEditor.movePoints(
-      startBinding: updates?.startBinding,
+      element,
-      endBinding: updates?.endBinding,
+      app.scene,
-      moveMidPointsWithElement: updates?.moveMidPointsWithElement,
+      positions,
-    });
+      {
+        startBinding: updates?.startBinding,
+        endBinding: updates?.endBinding,
+        moveMidPointsWithElement: updates?.moveMidPointsWithElement,
+      },
+      {
+        isBindingEnabled: app.state.isBindingEnabled,
+        isMidpointSnappingEnabled: app.state.isMidpointSnappingEnabled,
+      },
+    );
 
     // Set the suggested binding from the updates if available
     if (isBindingElement(element, false)) {
@@ -603,11 +636,11 @@ export class LinearElementEditor {
     const altFocusPointBindableElement =
       endIsSelected && // The "other" end (i.e. "end") is dragged
       startBindingElement &&
-      updates?.suggestedBinding?.id !== startBindingElement.id // The end point is not hovering the start bindable + it's binding gap
+      updates?.suggestedBinding?.element.id !== startBindingElement.id // The end point is not hovering the start bindable + it's binding gap
         ? startBindingElement
         : startIsSelected && // The "other" end (i.e. "start") is dragged
           endBindingElement &&
-          updates?.suggestedBinding?.id !== endBindingElement.id // The start point is not hovering the end bindable + it's binding gap
+          updates?.suggestedBinding?.element.id !== endBindingElement.id // The start point is not hovering the end bindable + it's binding gap
         ? endBindingElement
         : null;
 
@@ -627,6 +660,8 @@ export class LinearElementEditor {
                 altFocusPointBindableElement,
                 "start",
                 elementsMap,
+                app.state.zoom,
+                app.state.isMidpointSnappingEnabled,
               )
             : linearElementEditor.initialState.altFocusPoint,
       },
@@ -765,6 +800,7 @@ export class LinearElementEditor {
           element.points[index + 1],
           index,
           appState.zoom,
+          elementsMap,
         )
       ) {
         midpoints.push(null);
@@ -774,6 +810,7 @@ export class LinearElementEditor {
       const segmentMidPoint = LinearElementEditor.getSegmentMidPoint(
         element,
         index + 1,
+        elementsMap,
       );
       midpoints.push(segmentMidPoint);
       index++;
@@ -861,6 +898,7 @@ export class LinearElementEditor {
     endPoint: P,
     index: number,
     zoom: Zoom,
+    elementsMap: ElementsMap,
   ) {
     if (isElbowArrow(element)) {
       if (index >= 0 && index < element.points.length) {
@@ -875,7 +913,10 @@ export class LinearElementEditor {
 
     let distance = pointDistance(startPoint, endPoint);
     if (element.points.length > 2 && element.roundness) {
-      const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
+      const [lines, curves] = deconstructLinearOrFreeDrawElement(
+        element,
+        elementsMap,
+      );
 
       invariant(
         lines.length === 0 && curves.length > 0,
@@ -895,6 +936,7 @@ export class LinearElementEditor {
   static getSegmentMidPoint(
     element: NonDeleted<ExcalidrawLinearElement>,
     index: number,
+    elementsMap: ElementsMap,
   ): GlobalPoint {
     if (isElbowArrow(element)) {
       invariant(
@@ -907,7 +949,10 @@ export class LinearElementEditor {
       return pointFrom<GlobalPoint>(element.x + p[0], element.y + p[1]);
     }
 
-    const [lines, curves] = deconstructLinearOrFreeDrawElement(element);
+    const [lines, curves] = deconstructLinearOrFreeDrawElement(
+      element,
+      elementsMap,
+    );
 
     invariant(
       (lines.length === 0 && curves.length > 0) ||
@@ -1515,6 +1560,10 @@ export class LinearElementEditor {
       endBinding?: FixedPointBinding | null;
       moveMidPointsWithElement?: boolean | null;
     },
+    options?: {
+      isBindingEnabled?: boolean;
+      isMidpointSnappingEnabled?: boolean;
+    },
   ) {
     const { points } = element;
 
@@ -1583,6 +1632,8 @@ export class LinearElementEditor {
       otherUpdates,
       {
         isDragging: Array.from(pointUpdates.values()).some((t) => t.isDragging),
+        isBindingEnabled: options?.isBindingEnabled,
+        isMidpointSnappingEnabled: options?.isMidpointSnappingEnabled,
       },
     );
   }
@@ -1697,6 +1748,8 @@ export class LinearElementEditor {
       isDragging?: boolean;
       zoom?: AppState["zoom"];
       sceneElementsMap?: NonDeletedSceneElementsMap;
+      isBindingEnabled?: boolean;
+      isMidpointSnappingEnabled?: boolean;
     },
   ) {
     if (isElbowArrow(element)) {
@@ -1717,6 +1770,8 @@ export class LinearElementEditor {
       scene.mutateElement(element, updates, {
         informMutation: true,
         isDragging: options?.isDragging ?? false,
+        isBindingEnabled: options?.isBindingEnabled,
+        isMidpointSnappingEnabled: options?.isMidpointSnappingEnabled,
       });
     } else {
       // TODO do we need to get precise coords here just to calc centers?
@@ -1812,6 +1867,7 @@ export class LinearElementEditor {
       const midSegmentMidpoint = LinearElementEditor.getSegmentMidPoint(
         element,
         index + 1,
+        elementsMap,
       );
 
       x = midSegmentMidpoint[0] - boundTextElement.width / 2;
@@ -2076,6 +2132,7 @@ const pointDraggingUpdates = (
   app: AppClassProperties,
   angleLocked: boolean,
   altKey: boolean,
+  linearElementEditor: LinearElementEditor,
 ): {
   positions: PointsPositionUpdates;
   updates?: PointMoveOtherUpdates;
@@ -2123,18 +2180,91 @@ const pointDraggingUpdates = (
   );
 
   if (isElbowArrow(element)) {
+    const suggestedBindingElement = startIsDragged
+      ? start.element
+      : endIsDragged
+      ? end.element
+      : null;
+
     return {
       positions: naiveDraggingPoints,
       updates: {
-        suggestedBinding: startIsDragged
+        suggestedBinding: suggestedBindingElement
-          ? start.element
+          ? {
-          : endIsDragged
+              element: suggestedBindingElement,
-          ? end.element
+              midPoint: app.state.isMidpointSnappingEnabled
+                ? snapToMid(
+                    suggestedBindingElement,
+                    elementsMap,
+                    pointFrom<GlobalPoint>(
+                      scenePointerX - linearElementEditor.pointerOffset.x,
+                      scenePointerY - linearElementEditor.pointerOffset.y,
+                    ),
+                  )
+                : undefined,
+            }
           : null,
       },
     };
   }
 
+  // Handle the case where neither endpoint is being dragged
+  // but we need to update bound endpoints
+  if (!startIsDragged && !endIsDragged) {
+    const nextArrow = {
+      ...element,
+      points: element.points.map((p, idx) => {
+        return naiveDraggingPoints.get(idx)?.point ?? p;
+      }),
+    };
+    const positions = new Map(naiveDraggingPoints);
+
+    if (element.startBinding) {
+      const startBindable = elementsMap.get(element.startBinding.elementId) as
+        | ExcalidrawBindableElement
+        | undefined;
+      if (startBindable) {
+        const startPoint =
+          updateBoundPoint(
+            nextArrow,
+            "startBinding",
+            element.startBinding,
+            startBindable,
+            elementsMap,
+          ) ?? null;
+        if (startPoint) {
+          positions.set(0, { point: startPoint, isDragging: true });
+        }
+      }
+    }
+
+    if (element.endBinding) {
+      const endBindable = elementsMap.get(element.endBinding.elementId) as
+        | ExcalidrawBindableElement
+        | undefined;
+      if (endBindable) {
+        const endPoint =
+          updateBoundPoint(
+            nextArrow,
+            "endBinding",
+            element.endBinding,
+            endBindable,
+            elementsMap,
+          ) ?? null;
+        if (endPoint) {
+          positions.set(element.points.length - 1, {
+            point: endPoint,
+            isDragging: true,
+          });
+        }
+      }
+    }
+
+    return {
+      positions,
+    };
+  }
+
   if (startIsDragged === endIsDragged) {
     return {
       positions: naiveDraggingPoints,
@@ -2165,7 +2295,20 @@ const pointDraggingUpdates = (
       (updates.startBinding.mode === "orbit" ||
         !getFeatureFlag("COMPLEX_BINDINGS"))
     ) {
-      updates.suggestedBinding = start.element;
+      updates.suggestedBinding = start.element
+        ? {
+            element: start.element,
+            midPoint: getSnapOutlineMidPoint(
+              pointFrom<GlobalPoint>(
+                scenePointerX - linearElementEditor.pointerOffset.x,
+                scenePointerY - linearElementEditor.pointerOffset.y,
+              ),
+              start.element,
+              elementsMap,
+              app.state.zoom,
+            ),
+          }
+        : null;
     }
   } else if (startIsDragged) {
     updates.suggestedBinding = app.state.suggestedBinding;
@@ -2191,7 +2334,20 @@ const pointDraggingUpdates = (
       (updates.endBinding.mode === "orbit" ||
         !getFeatureFlag("COMPLEX_BINDINGS"))
     ) {
-      updates.suggestedBinding = end.element;
+      updates.suggestedBinding = end.element
+        ? {
+            element: end.element,
+            midPoint: getSnapOutlineMidPoint(
+              pointFrom<GlobalPoint>(
+                scenePointerX - linearElementEditor.pointerOffset.x,
+                scenePointerY - linearElementEditor.pointerOffset.y,
+              ),
+              end.element,
+              elementsMap,
+              app.state.zoom,
+            ),
+          }
+        : null;
     }
   } else if (endIsDragged) {
     updates.suggestedBinding = app.state.suggestedBinding;
@@ -2231,19 +2387,6 @@ const pointDraggingUpdates = (
         : updates.endBinding,
   };
 
-  // We need to use a custom intersector to ensure that if there is a big "jump"
-  // in the arrow's position, we can position it with outline avoidance
-  // pixel-perfectly and avoid "dancing" arrows.
-  // NOTE: Direction matters here, so we create two intersectors
-  const startCustomIntersector =
-    start.focusPoint && end.focusPoint
-      ? lineSegment(start.focusPoint, end.focusPoint)
-      : undefined;
-  const endCustomIntersector =
-    start.focusPoint && end.focusPoint
-      ? lineSegment(end.focusPoint, start.focusPoint)
-      : undefined;
-
   // Needed to handle a special case where an existing arrow is dragged over
   // the same element it is bound to on the other side
   const startIsDraggingOverEndElement =
@@ -2274,12 +2417,12 @@ const pointDraggingUpdates = (
     ? nextArrow.points[0]
     : endBindable
     ? updateBoundPoint(
-        element,
+        nextArrow,
         "endBinding",
         nextArrow.endBinding,
         endBindable,
         elementsMap,
-        endCustomIntersector,
+        endIsDragged,
       ) || nextArrow.points[nextArrow.points.length - 1]
     : nextArrow.points[nextArrow.points.length - 1];
 
@@ -2302,23 +2445,26 @@ const pointDraggingUpdates = (
       : startIsDraggingOverEndElement &&
         app.state.bindMode !== "inside" &&
         getFeatureFlag("COMPLEX_BINDINGS")
-      ? nextArrow.points[nextArrow.points.length - 1]
+      ? endLocalPoint
       : startBindable
       ? updateBoundPoint(
-          element,
+          nextArrow,
           "startBinding",
           nextArrow.startBinding,
           startBindable,
           elementsMap,
-          startCustomIntersector,
+          startIsDragged,
         ) || nextArrow.points[0]
       : nextArrow.points[0];
 
   const endChanged =
-    pointDistance(
+    !startIsDraggingOverEndElement &&
-      endLocalPoint,
+    !(
-      nextArrow.points[nextArrow.points.length - 1],
+      endIsDraggingOverStartElement &&
-    ) !== 0;
+      app.state.bindMode !== "inside" &&
+      getFeatureFlag("COMPLEX_BINDINGS")
+    ) &&
+    !!endBindable;
   const startChanged =
     pointDistance(startLocalPoint, nextArrow.points[0]) !== 0;
 
@@ -2332,13 +2478,7 @@ const pointDraggingUpdates = (
   const indices = Array.from(indicesSet);
 
   return {
-    updates:
+    updates,
-      updates.startBinding || updates.suggestedBinding
-        ? {
-            startBinding: updates.startBinding,
-            suggestedBinding: updates.suggestedBinding,
-          }
-        : undefined,
     positions: new Map(
       indices.map((idx) => {
         return [

packages/element/src/mutateElement.ts

@@ -40,6 +40,8 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
   updates: ElementUpdate<TElement>,
   options?: {
     isDragging?: boolean;
+    isBindingEnabled?: boolean;
+    isMidpointSnappingEnabled?: boolean;
   },
 ) => {
   let didChange = false;

packages/element/src/renderElement.ts

@@ -23,6 +23,7 @@ import {
   getVerticalOffset,
   invariant,
   applyDarkModeFilter,
+  isSafari,
 } from "@excalidraw/common";
 
 import type {
@@ -360,8 +361,9 @@ IMAGE_ERROR_PLACEHOLDER_IMG.src = `data:${MIME_TYPES.svg},${encodeURIComponent(
 const drawImagePlaceholder = (
   element: ExcalidrawImageElement,
   context: CanvasRenderingContext2D,
+  theme: StaticCanvasRenderConfig["theme"],
 ) => {
-  context.fillStyle = "#E7E7E7";
+  context.fillStyle = theme === THEME.DARK ? "#2E2E2E" : "#E7E7E7";
   context.fillRect(0, 0, element.width, element.height);
 
   const imageMinWidthOrHeight = Math.min(element.width, element.height);
@@ -443,13 +445,6 @@ const drawElementOnCanvas = (
         ? cacheEntry?.image
         : undefined;
 
-      const shouldInvertImage =
-        renderConfig.theme === THEME.DARK &&
-        cacheEntry?.mimeType === MIME_TYPES.svg;
-
-      if (shouldInvertImage) {
-        context.filter = DARK_THEME_FILTER;
-      }
       if (img != null && !(img instanceof Promise)) {
         if (element.roundness && context.roundRect) {
           context.beginPath();
@@ -472,19 +467,78 @@ const drawElementOnCanvas = (
               height: img.naturalHeight,
             };
 
-        context.drawImage(
+        const shouldInvertImage =
-          img,
+          renderConfig.theme === THEME.DARK &&
-          x,
+          cacheEntry?.mimeType === MIME_TYPES.svg;
-          y,
+
-          width,
+        if (shouldInvertImage && isSafari) {
-          height,
+          const devicePixelRatio = window.devicePixelRatio || 1;
-          0 /* hardcoded for the selection box*/,
+          const tempCanvas = document.createElement("canvas");
-          0,
+          tempCanvas.width = element.width * devicePixelRatio;
-          element.width,
+          tempCanvas.height = element.height * devicePixelRatio;
-          element.height,
+          const tempContext = tempCanvas.getContext("2d");
-        );
+
+          if (tempContext) {
+            tempContext.scale(devicePixelRatio, devicePixelRatio);
+            tempContext.drawImage(
+              img,
+              x,
+              y,
+              width,
+              height,
+              0,
+              0,
+              element.width,
+              element.height,
+            );
+
+            const imageData = tempContext.getImageData(
+              0,
+              0,
+              tempCanvas.width,
+              tempCanvas.height,
+            );
+
+            const data = imageData.data;
+
+            for (let i = 0; i < data.length; i += 4) {
+              data[i] = 255 - data[i];
+              data[i + 1] = 255 - data[i + 1];
+              data[i + 2] = 255 - data[i + 2];
+            }
+
+            tempContext.putImageData(imageData, 0, 0);
+            context.drawImage(
+              tempCanvas,
+              0,
+              0,
+              tempCanvas.width,
+              tempCanvas.height,
+              0,
+              0,
+              element.width,
+              element.height,
+            );
+          }
+        } else {
+          if (shouldInvertImage) {
+            context.filter = DARK_THEME_FILTER;
+          }
+
+          context.drawImage(
+            img,
+            x,
+            y,
+            width,
+            height,
+            0 /* hardcoded for the selection box*/,
+            0,
+            element.width,
+            element.height,
+          );
+        }
       } else {
-        drawImagePlaceholder(element, context);
+        drawImagePlaceholder(element, context, renderConfig.theme);
       }
       context.restore();
       break;

packages/element/src/resizeElements.ts

@@ -318,18 +318,7 @@ export const resizeSingleTextElement = (
 ) => {
   const elementsMap = scene.getNonDeletedElementsMap();
 
-  const isCornerHandle = transformHandleType.length === 2;
+  const metricsWidth = element.width * (nextHeight / element.height);
-  let metricsWidth = element.width * (nextHeight / element.height);
-  let metricsHeight = nextHeight;
-
-  if (isCornerHandle) {
-    const widthRatio = Math.abs(nextWidth) / element.width;
-    const heightRatio = Math.abs(nextHeight) / element.height;
-    const ratio = Math.max(widthRatio, heightRatio);
-    const sign = Math.sign(nextHeight) || 1;
-    metricsWidth = element.width * ratio * sign;
-    metricsHeight = element.height * ratio * sign;
-  }
 
   const metrics = measureFontSizeFromWidth(element, elementsMap, metricsWidth);
   if (metrics === null) {
@@ -344,7 +333,7 @@ export const resizeSingleTextElement = (
       origElement.width,
       origElement.height,
       metricsWidth,
-      metricsHeight,
+      nextHeight,
       origElement.angle,
       transformHandleType,
       false,
@@ -354,7 +343,7 @@ export const resizeSingleTextElement = (
     scene.mutateElement(element, {
       fontSize: metrics.size,
       width: metricsWidth,
-      height: metricsHeight,
+      height: nextHeight,
       x: newOrigin.x,
       y: newOrigin.y,
     });

packages/element/src/selection.ts

@@ -11,6 +11,7 @@ import {
   isBoundToContainer,
   isFrameLikeElement,
   isLinearElement,
+  isTextElement,
 } from "./typeChecks";
 import {
   elementOverlapsWithFrame,
@@ -25,6 +26,7 @@ import type {
   ElementsMap,
   ElementsMapOrArray,
   ExcalidrawElement,
+  NonDeleted,
   NonDeletedExcalidrawElement,
 } from "./types";
 
@@ -288,3 +290,19 @@ export const getSelectionStateForElements = (
     ),
   };
 };
+
+/**
+ * Returns editing or single-selected text element, if any.
+ */
+export const getActiveTextElement = (
+  selectedElements: readonly NonDeleted<ExcalidrawElement>[],
+  appState: Pick<AppState, "editingTextElement">,
+) => {
+  const activeTextElement =
+    appState.editingTextElement ||
+    (selectedElements.length === 1 &&
+      isTextElement(selectedElements[0]) &&
+      selectedElements[0]);
+
+  return activeTextElement || null;
+};

packages/element/src/shape.ts

@@ -57,8 +57,8 @@ import { headingForPointIsHorizontal } from "./heading";
 
 import { canChangeRoundness } from "./comparisons";
 import {
+  elementCenterPoint,
   getArrowheadPoints,
-  getCenterForBounds,
   getDiamondPoints,
   getElementAbsoluteCoords,
 } from "./bounds";
@@ -69,10 +69,10 @@ import type {
   NonDeletedExcalidrawElement,
   ExcalidrawSelectionElement,
   ExcalidrawLinearElement,
-  Arrowhead,
   ExcalidrawFreeDrawElement,
   ElementsMap,
   ExcalidrawLineElement,
+  Arrowhead,
 } from "./types";
 
 import type { Drawable, Options } from "roughjs/bin/core";
@@ -296,6 +296,82 @@ const modifyIframeLikeForRoughOptions = (
   return element;
 };
 
+const generateArrowheadCardinalityOne = (
+  generator: RoughGenerator,
+  arrowheadPoints: number[] | null,
+  lineOptions: Options,
+) => {
+  if (arrowheadPoints === null) {
+    return [];
+  }
+
+  const [, , x3, y3, x4, y4] = arrowheadPoints;
+
+  return [generator.line(x3, y3, x4, y4, lineOptions)];
+};
+
+const generateArrowheadLinesToTip = (
+  generator: RoughGenerator,
+  arrowheadPoints: number[] | null,
+  lineOptions: Options,
+) => {
+  if (arrowheadPoints === null) {
+    return [];
+  }
+
+  const [x2, y2, x3, y3, x4, y4] = arrowheadPoints;
+
+  return [
+    generator.line(x3, y3, x2, y2, lineOptions),
+    generator.line(x4, y4, x2, y2, lineOptions),
+  ];
+};
+
+const getArrowheadLineOptions = (
+  element: ExcalidrawLinearElement,
+  options: Options,
+) => {
+  const lineOptions = { ...options };
+
+  if (element.strokeStyle === "dotted") {
+    // for dotted arrows caps, reduce gap to make it more legible
+    const dash = getDashArrayDotted(element.strokeWidth - 1);
+    lineOptions.strokeLineDash = [dash[0], dash[1] - 1];
+  } else {
+    // for solid/dashed, keep solid arrow cap
+    delete lineOptions.strokeLineDash;
+  }
+  lineOptions.roughness = Math.min(1, lineOptions.roughness || 0);
+
+  return lineOptions;
+};
+
+const generateArrowheadOutlineCircle = (
+  generator: RoughGenerator,
+  options: Options,
+  strokeColor: string,
+  arrowheadPoints: number[] | null,
+  fill: string,
+  diameterScale = 1,
+) => {
+  if (arrowheadPoints === null) {
+    return [];
+  }
+
+  const [x, y, diameter] = arrowheadPoints;
+  const circleOptions = {
+    ...options,
+    fill,
+    fillStyle: "solid" as const,
+    stroke: strokeColor,
+    roughness: Math.min(0.5, options.roughness || 0),
+  };
+
+  delete circleOptions.strokeLineDash;
+
+  return [generator.circle(x, y, diameter * diameterScale, circleOptions)];
+};
+
 const getArrowheadShapes = (
   element: ExcalidrawLinearElement,
   shape: Drawable[],
@@ -306,63 +382,54 @@ const getArrowheadShapes = (
   canvasBackgroundColor: string,
   isDarkMode: boolean,
 ) => {
-  const arrowheadPoints = getArrowheadPoints(
+  if (arrowhead === null) {
-    element,
-    shape,
-    position,
-    arrowhead,
-  );
-
-  if (arrowheadPoints === null) {
     return [];
   }
 
-  const generateCrowfootOne = (
-    arrowheadPoints: number[] | null,
-    options: Options,
-  ) => {
-    if (arrowheadPoints === null) {
-      return [];
-    }
-
-    const [, , x3, y3, x4, y4] = arrowheadPoints;
-
-    return [generator.line(x3, y3, x4, y4, options)];
-  };
-
   const strokeColor = isDarkMode
     ? applyDarkModeFilter(element.strokeColor)
     : element.strokeColor;
+  const backgroundFillColor = isDarkMode
+    ? applyDarkModeFilter(canvasBackgroundColor)
+    : canvasBackgroundColor;
+  const cardinalityOneOrManyOffset = -0.25;
+  const cardinalityZeroCircleScale = 0.8;
 
   switch (arrowhead) {
-    case "dot":
     case "circle":
     case "circle_outline": {
-      const [x, y, diameter] = arrowheadPoints;
+      return generateArrowheadOutlineCircle(
-
+        generator,
-      // always use solid stroke for arrowhead
+        options,
-      delete options.strokeLineDash;
+        strokeColor,
-
+        getArrowheadPoints(element, shape, position, arrowhead),
-      return [
+        arrowhead === "circle_outline" ? backgroundFillColor : strokeColor,
-        generator.circle(x, y, diameter, {
+      );
-          ...options,
-          fill:
-            arrowhead === "circle_outline"
-              ? canvasBackgroundColor
-              : strokeColor,
-
-          fillStyle: "solid",
-          stroke: strokeColor,
-          roughness: Math.min(0.5, options.roughness || 0),
-        }),
-      ];
     }
     case "triangle":
     case "triangle_outline": {
+      const arrowheadPoints = getArrowheadPoints(
+        element,
+        shape,
+        position,
+        arrowhead,
+      );
+
+      if (arrowheadPoints === null) {
+        return [];
+      }
+
       const [x, y, x2, y2, x3, y3] = arrowheadPoints;
+      const triangleOptions = {
+        ...options,
+        fill:
+          arrowhead === "triangle_outline" ? backgroundFillColor : strokeColor,
+        fillStyle: "solid" as const,
+        roughness: Math.min(1, options.roughness || 0),
+      };
 
       // always use solid stroke for arrowhead
-      delete options.strokeLineDash;
+      delete triangleOptions.strokeLineDash;
 
       return [
         generator.polygon(
@@ -372,24 +439,34 @@ const getArrowheadShapes = (
             [x3, y3],
             [x, y],
           ],
-          {
+          triangleOptions,
-            ...options,
-            fill:
-              arrowhead === "triangle_outline"
-                ? canvasBackgroundColor
-                : strokeColor,
-            fillStyle: "solid",
-            roughness: Math.min(1, options.roughness || 0),
-          },
         ),
       ];
     }
     case "diamond":
     case "diamond_outline": {
+      const arrowheadPoints = getArrowheadPoints(
+        element,
+        shape,
+        position,
+        arrowhead,
+      );
+
+      if (arrowheadPoints === null) {
+        return [];
+      }
+
       const [x, y, x2, y2, x3, y3, x4, y4] = arrowheadPoints;
+      const diamondOptions = {
+        ...options,
+        fill:
+          arrowhead === "diamond_outline" ? backgroundFillColor : strokeColor,
+        fillStyle: "solid" as const,
+        roughness: Math.min(1, options.roughness || 0),
+      };
 
       // always use solid stroke for arrowhead
-      delete options.strokeLineDash;
+      delete diamondOptions.strokeLineDash;
 
       return [
         generator.polygon(
@@ -400,53 +477,117 @@ const getArrowheadShapes = (
             [x4, y4],
             [x, y],
           ],
-          {
+          diamondOptions,
-            ...options,
+        ),
-            fill:
+      ];
-              arrowhead === "diamond_outline"
+    }
-                ? canvasBackgroundColor
+    case "cardinality_one":
-                : strokeColor,
+      return generateArrowheadCardinalityOne(
-            fillStyle: "solid",
+        generator,
-            roughness: Math.min(1, options.roughness || 0),
+        getArrowheadPoints(element, shape, position, arrowhead),
-          },
+        getArrowheadLineOptions(element, options),
+      );
+    case "cardinality_many":
+      return generateArrowheadLinesToTip(
+        generator,
+        getArrowheadPoints(element, shape, position, arrowhead),
+        getArrowheadLineOptions(element, options),
+      );
+    case "cardinality_one_or_many": {
+      const lineOptions = getArrowheadLineOptions(element, options);
+
+      return [
+        ...generateArrowheadLinesToTip(
+          generator,
+          getArrowheadPoints(element, shape, position, "cardinality_many"),
+          lineOptions,
+        ),
+        ...generateArrowheadCardinalityOne(
+          generator,
+          getArrowheadPoints(
+            element,
+            shape,
+            position,
+            "cardinality_one",
+            cardinalityOneOrManyOffset,
+          ),
+          lineOptions,
+        ),
+      ];
+    }
+    case "cardinality_exactly_one": {
+      const lineOptions = getArrowheadLineOptions(element, options);
+
+      return [
+        ...generateArrowheadCardinalityOne(
+          generator,
+          getArrowheadPoints(element, shape, position, "cardinality_one", -0.5),
+          lineOptions,
+        ),
+        ...generateArrowheadCardinalityOne(
+          generator,
+          getArrowheadPoints(element, shape, position, "cardinality_one"),
+          lineOptions,
+        ),
+      ];
+    }
+    case "cardinality_zero_or_one": {
+      const lineOptions = getArrowheadLineOptions(element, options);
+
+      return [
+        ...generateArrowheadOutlineCircle(
+          generator,
+          options,
+          strokeColor,
+          getArrowheadPoints(element, shape, position, "circle_outline", 1.5),
+          backgroundFillColor,
+          cardinalityZeroCircleScale,
+        ),
+        ...generateArrowheadCardinalityOne(
+          generator,
+          getArrowheadPoints(element, shape, position, "cardinality_one", -0.5),
+          lineOptions,
+        ),
+      ];
+    }
+    case "cardinality_zero_or_many": {
+      const lineOptions = getArrowheadLineOptions(element, options);
+
+      return [
+        ...generateArrowheadLinesToTip(
+          generator,
+          getArrowheadPoints(element, shape, position, "cardinality_many"),
+          lineOptions,
+        ),
+        ...generateArrowheadOutlineCircle(
+          generator,
+          options,
+          strokeColor,
+          getArrowheadPoints(element, shape, position, "circle_outline", 1.5),
+          backgroundFillColor,
+          cardinalityZeroCircleScale,
         ),
       ];
     }
-    case "crowfoot_one":
-      return generateCrowfootOne(arrowheadPoints, options);
     case "bar":
     case "arrow":
-    case "crowfoot_many":
-    case "crowfoot_one_or_many":
     default: {
-      const [x2, y2, x3, y3, x4, y4] = arrowheadPoints;
+      return generateArrowheadLinesToTip(
-
+        generator,
-      if (element.strokeStyle === "dotted") {
+        getArrowheadPoints(element, shape, position, arrowhead),
-        // for dotted arrows caps, reduce gap to make it more legible
+        getArrowheadLineOptions(element, options),
-        const dash = getDashArrayDotted(element.strokeWidth - 1);
+      );
-        options.strokeLineDash = [dash[0], dash[1] - 1];
-      } else {
-        // for solid/dashed, keep solid arrow cap
-        delete options.strokeLineDash;
-      }
-      options.roughness = Math.min(1, options.roughness || 0);
-      return [
-        generator.line(x3, y3, x2, y2, options),
-        generator.line(x4, y4, x2, y2, options),
-        ...(arrowhead === "crowfoot_one_or_many"
-          ? generateCrowfootOne(
-              getArrowheadPoints(element, shape, position, "crowfoot_one"),
-              options,
-            )
-          : []),
-      ];
     }
   }
 };
 
 export const generateLinearCollisionShape = (
   element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
-) => {
+  elementsMap: ElementsMap,
+): {
+  op: string;
+  data: number[];
+}[] => {
   const generator = new RoughGenerator();
   const options: Options = {
     seed: element.seed,
@@ -455,20 +596,7 @@ export const generateLinearCollisionShape = (
     roughness: 0,
     preserveVertices: true,
   };
-  const center = getCenterForBounds(
+  const center = elementCenterPoint(element, elementsMap);
-    // Need a non-rotated center point
-    element.points.reduce(
-      (acc, point) => {
-        return [
-          Math.min(element.x + point[0], acc[0]),
-          Math.min(element.y + point[1], acc[1]),
-          Math.max(element.x + point[0], acc[2]),
-          Math.max(element.y + point[1], acc[3]),
-        ];
-      },
-      [Infinity, Infinity, -Infinity, -Infinity],
-    ),
-  );
 
   switch (element.type) {
     case "line":

packages/element/src/textElement.ts

@@ -347,6 +347,7 @@ export const getContainerCenter = (
     midSegmentMidpoint = LinearElementEditor.getSegmentMidPoint(
       container,
       index + 1,
+      elementsMap,
     );
   }
   return { x: midSegmentMidpoint[0], y: midSegmentMidpoint[1] };
@@ -441,7 +442,8 @@ const VALID_CONTAINER_TYPES = new Set([
 
 export const isValidTextContainer = (element: {
   type: ExcalidrawElementType;
-}) => VALID_CONTAINER_TYPES.has(element.type);
+}): element is ExcalidrawTextContainer =>
+  VALID_CONTAINER_TYPES.has(element.type);
 
 export const computeContainerDimensionForBoundText = (
   dimension: number,

packages/element/src/textWrapping.ts

@@ -4,6 +4,22 @@ import { charWidth, getLineWidth } from "./textMeasurements";
 
 import type { FontString } from "./types";
 
+/**
+ * This module approximates browser-like soft wrapping for Excalidraw text.
+ *
+ * The flow is:
+ * 1. `parseTokens()` splits a hard line into breakable tokens using a unicode-aware regex.
+ * 2. `getWrappedTextLines()` reflows each hard line into one or more visual lines and
+ *    records where each visual line came from in the source text.
+ * 3. `wrapLine()` assembles tokens into lines, and `wrapWord()` handles a single token
+ *    that is wider than the available width.
+ * 4. `trimLine()` / `trimLineEndAtSoftBreak()` mirror browser behavior around trailing
+ *    whitespace so the rendered text stays consistent with what users see on canvas.
+ *
+ * Mostly, you'll want to use wrapText(). getWrappedTextLines() is for callers
+ * that need metadata such as mapping visual lines back to `originalText`
+ * for caret placement or future editor features.
+ */
 let cachedCjkRegex: RegExp | undefined;
 let cachedLineBreakRegex: RegExp | undefined;
 let cachedEmojiRegex: RegExp | undefined;
@@ -358,6 +374,10 @@ const Break = {
 
 /**
  * Breaks the line into the tokens based on the found line break opporutnities.
+ *
+ * Note: tokenization normalizes to NFC first so decomposed graphemes are treated as
+ * their composed variants for wrapping. Any code that needs exact source offsets should
+ * keep in mind that this assumes the input text is already NFC-normalized.
  */
 export const parseTokens = (line: string) => {
   const breakLineRegex = getLineBreakRegex();
@@ -370,56 +390,120 @@ export const parseTokens = (line: string) => {
 
 /**
  * Wraps the original text into the lines based on the given width.
+ *
+ * This is a convenience adapter over `getWrappedTextLines()` for call sites
+ * that only need the rendered wrapped string and not the source offsets.
  */
 export const wrapText = (
   text: string,
   font: FontString,
   maxWidth: number,
 ): string => {
+  return getWrappedTextLines(text, font, maxWidth)
+    .map((line) => line.text)
+    .join("\n");
+};
+
+/**
+ * A single rendered visual line produced from the original text.
+ *
+ * `start` and `end` are end-exclusive code-unit offsets into the original text, and do
+ * not include synthetic soft line breaks inserted by this module. If trailing whitespace
+ * was trimmed away at a wrap boundary, `end` points to the last rendered character.
+ */
+export type WrappedTextLine = {
+  text: string;
+  start: number;
+  end: number;
+};
+
+/**
+ * Splits only on existing hard line breaks and preserves original offsets.
+ */
+const getHardLineBreaks = (text: string): WrappedTextLine[] => {
+  let offset = 0;
+
+  return text.split("\n").map((line) => {
+    const start = offset;
+    const end = start + line.length;
+
+    offset = end + 1;
+
+    return {
+      text: line,
+      start,
+      end,
+    };
+  });
+};
+
+/**
+ * Returns the rendered visual lines together with their source offsets.
+ *
+ * This is the source-of-truth wrapping pipeline for callers that need more than the
+ * final wrapped string, for example caret placement or future editor/rich-text mapping.
+ */
+export const getWrappedTextLines = (
+  text: string,
+  font: FontString,
+  maxWidth: number,
+): WrappedTextLine[] => {
   // if maxWidth is not finite or NaN which can happen in case of bugs in
   // computation, we need to make sure we don't continue as we'll end up
   // in an infinite loop
   if (!Number.isFinite(maxWidth) || maxWidth < 0) {
-    return text;
+    return getHardLineBreaks(text);
   }
 
-  const lines: Array<string> = [];
+  const lines: WrappedTextLine[] = [];
-  const originalLines = text.split("\n");
+  let offset = 0;
 
-  for (const originalLine of originalLines) {
+  for (const originalLine of text.split("\n")) {
-    const currentLineWidth = getLineWidth(originalLine, font);
+    const originalLineWidth = getLineWidth(originalLine, font);
 
-    if (currentLineWidth <= maxWidth) {
+    if (originalLineWidth <= maxWidth) {
-      lines.push(originalLine);
+      lines.push({
-      continue;
+        text: originalLine,
+        start: offset,
+        end: offset + originalLine.length,
+      });
+    } else {
+      lines.push(...wrapLine(originalLine, font, maxWidth, offset));
     }
 
-    const wrappedLine = wrapLine(originalLine, font, maxWidth);
+    offset += originalLine.length + 1;
-    lines.push(...wrappedLine);
   }
 
-  return lines.join("\n");
+  return lines;
 };
 
 /**
- * Wraps the original line into the lines based on the given width.
+ * Wraps a single hard line into one or more visual lines.
+ *
+ * The line-local offsets are tracked in original-text code units so
+ * we can map the visual line back to the source.
  */
 const wrapLine = (
   line: string,
   font: FontString,
   maxWidth: number,
-): string[] => {
+  lineStart: number,
-  const lines: Array<string> = [];
+): WrappedTextLine[] => {
+  const lines: WrappedTextLine[] = [];
   const tokens = parseTokens(line);
-  const tokenIterator = tokens[Symbol.iterator]();
 
   let currentLine = "";
+  let currentLineStart = lineStart;
+  let currentLineEnd = lineStart;
   let currentLineWidth = 0;
+  // Tracks the next token's code-unit position in the original source string.
+  let tokenOffset = lineStart;
+  let tokenIndex = 0;
 
-  let iterator = tokenIterator.next();
+  while (tokenIndex < tokens.length) {
-
+    const token = tokens[tokenIndex];
-  while (!iterator.done) {
+    const tokenStart = tokenOffset;
-    const token = iterator.value;
+    const tokenEnd = tokenStart + token.length;
     const testLine = currentLine + token;
 
     // cache single codepoint whitespace, CJK or emoji width calc. as kerning should not apply here
@@ -429,37 +513,59 @@ const wrapLine = (
 
     // build up the current line, skipping length check for possibly trailing whitespaces
     if (/\s/.test(token) || testLineWidth <= maxWidth) {
+      if (!currentLine) {
+        currentLineStart = tokenStart;
+      }
       currentLine = testLine;
+      currentLineEnd = tokenEnd;
       currentLineWidth = testLineWidth;
-      iterator = tokenIterator.next();
+      tokenOffset = tokenEnd;
+      tokenIndex++;
       continue;
     }
 
     // current line is empty => just the token (word) is longer than `maxWidth` and needs to be wrapped
     if (!currentLine) {
-      const wrappedWord = wrapWord(token, font, maxWidth);
+      const wrappedWord = wrapWord(token, font, maxWidth, tokenStart);
-      const trailingLine = wrappedWord[wrappedWord.length - 1] ?? "";
+      const trailingLine = wrappedWord[wrappedWord.length - 1] ?? {
+        text: "",
+        start: tokenStart,
+        end: tokenStart,
+      };
       const precedingLines = wrappedWord.slice(0, -1);
 
       lines.push(...precedingLines);
 
       // trailing line of the wrapped word might still be joined with next token/s
-      currentLine = trailingLine;
+      currentLine = trailingLine.text;
-      currentLineWidth = getLineWidth(trailingLine, font);
+      currentLineStart = trailingLine.start;
-      iterator = tokenIterator.next();
+      currentLineEnd = trailingLine.end;
+      currentLineWidth = getLineWidth(trailingLine.text, font);
+      tokenOffset = tokenEnd;
+      tokenIndex++;
     } else {
       // push & reset, but don't iterate on the next token, as we didn't use it yet!
-      lines.push(currentLine.trimEnd());
+      lines.push(
+        trimLineEndAtSoftBreak(currentLine, currentLineStart, currentLineEnd),
+      );
 
       // purposefully not iterating and not setting `currentLine` to `token`, so that we could use a simple !currentLine check above
       currentLine = "";
+      currentLineStart = tokenStart;
+      currentLineEnd = tokenStart;
       currentLineWidth = 0;
     }
   }
 
   // iterator done, push the trailing line if exists
   if (currentLine) {
-    const trailingLine = trimLine(currentLine, font, maxWidth);
+    const trailingLine = trimLine(
+      currentLine,
+      currentLineStart,
+      currentLineEnd,
+      font,
+      maxWidth,
+    );
     lines.push(trailingLine);
   }
 
@@ -467,59 +573,100 @@ const wrapLine = (
 };
 
 /**
- * Wraps the word into the lines based on the given width.
+ * Wraps a single word that could not be placed on an empty line as-is.
  */
 const wrapWord = (
   word: string,
   font: FontString,
   maxWidth: number,
-): Array<string> => {
+  wordStart: number,
+): WrappedTextLine[] => {
   // multi-codepoint emojis are already broken apart and shouldn't be broken further
   if (getEmojiRegex().test(word)) {
-    return [word];
+    return [
+      {
+        text: word,
+        start: wordStart,
+        end: wordStart + word.length,
+      },
+    ];
   }
 
   satisfiesWordInvariant(word);
 
-  const lines: Array<string> = [];
+  const lines: WrappedTextLine[] = [];
   const chars = Array.from(word);
 
   let currentLine = "";
+  let currentLineStart = wordStart;
+  let currentLineEnd = wordStart;
   let currentLineWidth = 0;
+  let offset = wordStart;
 
   for (const char of chars) {
+    const charStart = offset;
+    const charEnd = charStart + char.length;
     const _charWidth = charWidth.calculate(char, font);
     const testLineWidth = currentLineWidth + _charWidth;
 
     if (testLineWidth <= maxWidth) {
+      if (!currentLine) {
+        currentLineStart = charStart;
+      }
       currentLine = currentLine + char;
+      currentLineEnd = charEnd;
       currentLineWidth = testLineWidth;
+      offset = charEnd;
       continue;
     }
 
     if (currentLine) {
-      lines.push(currentLine);
+      lines.push({
+        text: currentLine,
+        start: currentLineStart,
+        end: currentLineEnd,
+      });
     }
 
     currentLine = char;
+    currentLineStart = charStart;
+    currentLineEnd = charEnd;
     currentLineWidth = _charWidth;
+    offset = charEnd;
   }
 
   if (currentLine) {
-    lines.push(currentLine);
+    lines.push({
+      text: currentLine,
+      start: currentLineStart,
+      end: currentLineEnd,
+    });
   }
 
   return lines;
 };
 
 /**
- * Similarly to browsers, does not trim all trailing whitespaces, but only those exceeding the `maxWidth`.
+ * Trims trailing whitespace that is exceeding the `maxWidth`.
+ *
+ * Used for the trailing visual line of a hard line, where some trailing
+ * whitespace may still be visible if it fits into the available width.
  */
-const trimLine = (line: string, font: FontString, maxWidth: number) => {
+const trimLine = (
+  line: string,
+  start: number,
+  end: number,
+  font: FontString,
+  maxWidth: number,
+): WrappedTextLine => {
   const shouldTrimWhitespaces = getLineWidth(line, font) > maxWidth;
 
   if (!shouldTrimWhitespaces) {
-    return line;
+    return {
+      text: line,
+      start,
+      end,
+    };
   }
 
   // defensively default to `trimeEnd` in case the regex does not match
@@ -543,7 +690,30 @@ const trimLine = (line: string, font: FontString, maxWidth: number) => {
     trimmedLineWidth = testLineWidth;
   }
 
-  return trimmedLine;
+  return {
+    text: trimmedLine,
+    start,
+    end: end - (line.length - trimmedLine.length),
+  };
+};
+
+/**
+ * Used for internal soft-wrap boundaries, where trailing whitespace should not
+ * survive into the rendered line even though it still exists in the original
+ * text.
+ */
+const trimLineEndAtSoftBreak = (
+  line: string,
+  start: number,
+  end: number,
+): WrappedTextLine => {
+  const trimmedLine = line.trimEnd();
+
+  return {
+    text: trimmedLine,
+    start,
+    end: end - (line.length - trimmedLine.length),
+  };
 };
 
 /**

packages/element/src/types.ts

@@ -15,7 +15,7 @@ import type {
   ValueOf,
 } from "@excalidraw/common/utility-types";
 
-export type ChartType = "bar" | "line";
+export type ChartType = "bar" | "line" | "radar";
 export type FillStyle = "hachure" | "cross-hatch" | "solid" | "zigzag";
 export type FontFamilyKeys = keyof typeof FONT_FAMILY;
 export type FontFamilyValues = typeof FONT_FAMILY[FontFamilyKeys];
@@ -303,19 +303,32 @@ export type PointsPositionUpdates = Map<
   { point: LocalPoint; isDragging?: boolean }
 >;
 
+export type CardinalityArrowhead =
+  | "cardinality_one"
+  | "cardinality_many"
+  | "cardinality_one_or_many"
+  | "cardinality_exactly_one"
+  | "cardinality_zero_or_one"
+  | "cardinality_zero_or_many";
+
+export type ArrowheadLegacy =
+  | "dot"
+  | "crowfoot_one"
+  | "crowfoot_many"
+  | "crowfoot_one_or_many";
+
 export type Arrowhead =
   | "arrow"
   | "bar"
-  | "dot" // legacy. Do not use for new elements.
   | "circle"
   | "circle_outline"
   | "triangle"
   | "triangle_outline"
   | "diamond"
   | "diamond_outline"
-  | "crowfoot_one"
+  | CardinalityArrowhead;
-  | "crowfoot_many"
+
-  | "crowfoot_one_or_many";
+export type AnyArrowhead = Arrowhead | ArrowheadLegacy;
 
 export type ExcalidrawLinearElement = _ExcalidrawElementBase &
   Readonly<{

packages/element/src/utils.ts

@@ -7,6 +7,7 @@ import {
 } from "@excalidraw/common";
 
 import {
+  bezierEquation,
   curve,
   curveCatmullRomCubicApproxPoints,
   curveOffsetPoints,
@@ -27,19 +28,30 @@ import {
 
 import type { Curve, LineSegment, LocalPoint } from "@excalidraw/math";
 
-import type { NormalizedZoomValue, Zoom } from "@excalidraw/excalidraw/types";
+import type {
+  AppState,
+  NormalizedZoomValue,
+  Zoom,
+} from "@excalidraw/excalidraw/types";
 
 import { elementCenterPoint, getDiamondPoints } from "./bounds";
 
 import { generateLinearCollisionShape } from "./shape";
 
-import { isPointInElement } from "./collision";
+import { hitElementItself, isPointInElement } from "./collision";
 import { LinearElementEditor } from "./linearElementEditor";
 import { isRectangularElement } from "./typeChecks";
+import { maxBindingDistance_simple } from "./binding";
+
+import {
+  getGlobalFixedPointForBindableElement,
+  normalizeFixedPoint,
+} from "./binding";
 
 import type {
   ElementsMap,
   ExcalidrawArrowElement,
+  ExcalidrawBindableElement,
   ExcalidrawDiamondElement,
   ExcalidrawElement,
   ExcalidrawFreeDrawElement,
@@ -112,6 +124,7 @@ const setElementShapesCacheEntry = <T extends ExcalidrawElement>(
  */
 export function deconstructLinearOrFreeDrawElement(
   element: ExcalidrawLinearElement | ExcalidrawFreeDrawElement,
+  elementsMap: ElementsMap,
 ): [LineSegment<GlobalPoint>[], Curve<GlobalPoint>[]] {
   const cachedShape = getElementShapesCacheEntry(element, 0);
 
@@ -119,10 +132,7 @@ export function deconstructLinearOrFreeDrawElement(
     return cachedShape;
   }
 
-  const ops = generateLinearCollisionShape(element) as {
+  const ops = generateLinearCollisionShape(element, elementsMap);
-    op: string;
-    data: number[];
-  }[];
   const lines = [];
   const curves = [];
 
@@ -329,24 +339,10 @@ export function deconstructRectanguloidElement(
   return shape;
 }
 
-/**
+export function getDiamondBaseCorners(
- * Get the **unrotated** building components of a diamond element
- * in the form of line segments and curves as a tuple, in this order.
- *
- * @param element The element to deconstruct
- * @param offset An optional offset
- * @returns Tuple of line **unrotated** segments (0) and curves (1)
- */
-export function deconstructDiamondElement(
   element: ExcalidrawDiamondElement,
   offset: number = 0,
-): [LineSegment<GlobalPoint>[], Curve<GlobalPoint>[]] {
+): Curve<GlobalPoint>[] {
-  const cachedShape = getElementShapesCacheEntry(element, offset);
-
-  if (cachedShape) {
-    return cachedShape;
-  }
-
   const [topX, topY, rightX, rightY, bottomX, bottomY, leftX, leftY] =
     getDiamondPoints(element);
   const verticalRadius = element.roundness
@@ -363,7 +359,7 @@ export function deconstructDiamondElement(
     pointFrom(element.x + leftX, element.y + leftY),
   ];
 
-  const baseCorners = [
+  return [
     curve(
       pointFrom<GlobalPoint>(
         right[0] - verticalRadius,
@@ -413,6 +409,27 @@ export function deconstructDiamondElement(
       ),
     ), // TOP
   ];
+}
+
+/**
+ * Get the **unrotated** building components of a diamond element
+ * in the form of line segments and curves as a tuple, in this order.
+ *
+ * @param element The element to deconstruct
+ * @param offset An optional offset
+ * @returns Tuple of line **unrotated** segments (0) and curves (1)
+ */
+export function deconstructDiamondElement(
+  element: ExcalidrawDiamondElement,
+  offset: number = 0,
+): [LineSegment<GlobalPoint>[], Curve<GlobalPoint>[]] {
+  const cachedShape = getElementShapesCacheEntry(element, offset);
+
+  if (cachedShape) {
+    return cachedShape;
+  }
+
+  const baseCorners = getDiamondBaseCorners(element, offset);
 
   const corners = baseCorners.map(
     (corner) =>
@@ -570,28 +587,131 @@ const getDiagonalsForBindableElement = (
   return [diagonalOne, diagonalTwo];
 };
 
+export const getSnapOutlineMidPoint = (
+  point: GlobalPoint,
+  element: ExcalidrawBindableElement,
+  elementsMap: ElementsMap,
+  zoom: AppState["zoom"],
+) => {
+  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);
+
+          return pointFrom<GlobalPoint>(rotatedPoint[0], rotatedPoint[1]);
+        })
+      : [
+          // RIGHT midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(
+              element.x + element.width,
+              element.y + element.height / 2,
+            ),
+            center,
+            element.angle,
+          ),
+          // BOTTOM midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(
+              element.x + element.width / 2,
+              element.y + element.height,
+            ),
+            center,
+            element.angle,
+          ),
+          // LEFT midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x, element.y + element.height / 2),
+            center,
+            element.angle,
+          ),
+          // TOP midpoint
+          pointRotateRads(
+            pointFrom<GlobalPoint>(element.x + element.width / 2, element.y),
+            center,
+            element.angle,
+          ),
+        ];
+  const candidate = sideMidpoints.find(
+    (midpoint) =>
+      pointDistance(point, midpoint) <=
+        maxBindingDistance_simple(zoom) + element.strokeWidth / 2 &&
+      !hitElementItself({
+        point,
+        element,
+        threshold: 0,
+        elementsMap,
+        overrideShouldTestInside: true,
+      }),
+  );
+
+  return candidate;
+};
+
 export const projectFixedPointOntoDiagonal = (
   arrow: ExcalidrawArrowElement,
   point: GlobalPoint,
-  element: ExcalidrawElement,
+  element: ExcalidrawBindableElement,
   startOrEnd: "start" | "end",
   elementsMap: ElementsMap,
+  zoom: AppState["zoom"],
+  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(
+      point,
+      element,
+      elementsMap,
+      zoom,
+    );
+    if (sideMidPoint) {
+      return sideMidPoint;
+    }
+  }
+
+  // Do the projection onto the diagonals (or center lines
+  // for non-rectangular shapes)
   const [diagonalOne, diagonalTwo] = getDiagonalsForBindableElement(
     element,
     elementsMap,
   );
 
-  const a = LinearElementEditor.getPointAtIndexGlobalCoordinates(
+  // To avoid working with stale arrow state, we use the opposite focus point
+  // of the current endpoint, which will always be unchanged during moving of
+  // the endpoint. This is only needed when the arrow has only two points.
+  let a = LinearElementEditor.getPointAtIndexGlobalCoordinates(
     arrow,
     startOrEnd === "start" ? 1 : arrow.points.length - 2,
     elementsMap,
   );
+  if (arrow.points.length === 2) {
+    const otherBinding =
+      startOrEnd === "start" ? arrow.endBinding : arrow.startBinding;
+    const otherBindable =
+      otherBinding &&
+      (elementsMap.get(otherBinding.elementId) as
+        | ExcalidrawBindableElement
+        | undefined);
+    const otherFocusPoint =
+      otherBinding &&
+      otherBindable &&
+      getGlobalFixedPointForBindableElement(
+        normalizeFixedPoint(otherBinding.fixedPoint),
+        otherBindable,
+        elementsMap,
+      );
+    if (otherFocusPoint) {
+      a = otherFocusPoint;
+    }
+  }
+
   const b = pointFromVector<GlobalPoint>(
     vectorScale(
       vectorFromPoint(point, a),
@@ -603,18 +723,22 @@ export const projectFixedPointOntoDiagonal = (
     ),
     a,
   );
-  const intersector = lineSegment<GlobalPoint>(point, b);
+  const intersector = lineSegment<GlobalPoint>(b, a);
   const p1 = lineSegmentIntersectionPoints(diagonalOne, intersector);
   const p2 = lineSegmentIntersectionPoints(diagonalTwo, intersector);
   const d1 = p1 && pointDistance(a, p1);
   const d2 = p2 && pointDistance(a, p2);
 
-  let p = null;
+  let projection = null;
   if (d1 != null && d2 != null) {
-    p = d1 < d2 ? p1 : p2;
+    projection = d1 < d2 ? p1 : p2;
   } else {
-    p = p1 || p2 || null;
+    projection = p1 || p2 || null;
   }
 
-  return p && isPointInElement(p, element, elementsMap) ? p : null;
+  if (projection && isPointInElement(projection, element, elementsMap)) {
+    return projection;
+  }
+
+  return null;
 };

packages/element/src/zindex.ts

@@ -156,12 +156,11 @@ export const moveArrowAboveBindable = (
   elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   elementsMap: NonDeletedSceneElementsMap,
   scene: Scene,
+  hit?: NonDeletedExcalidrawElement,
 ): readonly OrderedExcalidrawElement[] => {
-  const hoveredElement = getHoveredElementForBinding(
+  const hoveredElement = hit
-    point,
+    ? hit
-    elements,
+    : getHoveredElementForBinding(point, elements, elementsMap);
-    elementsMap,
-  );
 
   if (!hoveredElement) {
     return elements;

packages/element/tests/collision.test.tsx

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

packages/element/tests/embeddable.test.ts

@@ -1,4 +1,4 @@
-import { getEmbedLink } from "../src/embeddable";
+import { embeddableURLValidator, getEmbedLink } from "../src/embeddable";
 
 describe("YouTube timestamp parsing", () => {
   it("should parse YouTube URLs with timestamp in seconds", () => {
@@ -151,3 +151,83 @@ describe("YouTube timestamp parsing", () => {
     }
   });
 });
+
+describe("Google Drive video embedding", () => {
+  it.each([
+    {
+      url: "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/view?usp=sharing",
+      expectedLink:
+        "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/preview",
+    },
+    {
+      url: "https://drive.google.com/open?id=1AbCdEfGhIjKlMnOpQrStUvWxYz123456",
+      expectedLink:
+        "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/preview",
+    },
+    {
+      url: "https://drive.google.com/uc?export=download&id=1AbCdEfGhIjKlMnOpQrStUvWxYz123456",
+      expectedLink:
+        "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/preview",
+    },
+  ])("should normalize Google Drive link: $url", ({ url, expectedLink }) => {
+    const result = getEmbedLink(url);
+
+    expect(result).toBeTruthy();
+    expect(result?.type).toBe("video");
+    if (result?.type === "video" || result?.type === "generic") {
+      expect(result.link).toBe(expectedLink);
+    }
+    expect(result?.intrinsicSize).toEqual({ w: 560, h: 315 });
+  });
+
+  it("should preserve resourcekey when available", () => {
+    const url =
+      "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/view?resourcekey=0-abcdef123456";
+    const result = getEmbedLink(url);
+
+    expect(result).toBeTruthy();
+    expect(result?.type).toBe("video");
+    if (result?.type === "video" || result?.type === "generic") {
+      expect(result.link).toBe(
+        "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/preview?resourcekey=0-abcdef123456",
+      );
+    }
+  });
+
+  it("should preserve timestamp when available", () => {
+    const url =
+      "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/view?t=9";
+    const result = getEmbedLink(url);
+
+    expect(result).toBeTruthy();
+    expect(result?.type).toBe("video");
+    if (result?.type === "video" || result?.type === "generic") {
+      expect(result.link).toBe(
+        "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/preview?t=9",
+      );
+    }
+  });
+
+  it("should preserve resourcekey and timestamp together", () => {
+    const url =
+      "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/view?resourcekey=0-abcdef123456&t=9";
+    const result = getEmbedLink(url);
+
+    expect(result).toBeTruthy();
+    expect(result?.type).toBe("video");
+    if (result?.type === "video" || result?.type === "generic") {
+      expect(result.link).toBe(
+        "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/preview?resourcekey=0-abcdef123456&t=9",
+      );
+    }
+  });
+
+  it("should validate Google Drive domain by default", () => {
+    expect(
+      embeddableURLValidator(
+        "https://drive.google.com/file/d/1AbCdEfGhIjKlMnOpQrStUvWxYz123456/view",
+        undefined,
+      ),
+    ).toBe(true);
+  });
+});

packages/element/tests/linearElementEditor.test.tsx

@@ -378,7 +378,7 @@ describe("Test Linear Elements", () => {
       // drag line from midpoint
       drag(midpoint, pointFrom(midpoint[0] + delta, midpoint[1] + delta));
       expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-        `11`,
+        `12`,
       );
       expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
@@ -419,7 +419,7 @@ describe("Test Linear Elements", () => {
       fireEvent.click(screen.getByTitle("Round"));
 
       expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-        `9`,
+        `10`,
       );
       expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
 
@@ -480,7 +480,7 @@ describe("Test Linear Elements", () => {
       drag(startPoint, endPoint);
 
       expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-        `11`,
+        `12`,
       );
       expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
@@ -548,7 +548,7 @@ describe("Test Linear Elements", () => {
         );
 
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `14`,
+          `15`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`9`);
 
@@ -599,7 +599,7 @@ describe("Test Linear Elements", () => {
         drag(hitCoords, pointFrom(hitCoords[0] - delta, hitCoords[1] - delta));
 
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `11`,
+          `12`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
@@ -640,7 +640,7 @@ describe("Test Linear Elements", () => {
         drag(hitCoords, pointFrom(hitCoords[0] + delta, hitCoords[1] + delta));
 
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `11`,
+          `12`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
@@ -688,7 +688,7 @@ describe("Test Linear Elements", () => {
         deletePoint(points[2]);
         expect(line.points.length).toEqual(3);
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `17`,
+          `18`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`10`);
 
@@ -746,7 +746,7 @@ describe("Test Linear Elements", () => {
           ),
         );
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `14`,
+          `15`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`9`);
         expect(line.points.length).toEqual(5);
@@ -844,7 +844,7 @@ describe("Test Linear Elements", () => {
         drag(hitCoords, pointFrom(hitCoords[0] + delta, hitCoords[1] + delta));
 
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
-          `11`,
+          `12`,
         );
         expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
@@ -1317,7 +1317,7 @@ describe("Test Linear Elements", () => {
       const textElement = h.elements[2] as ExcalidrawTextElementWithContainer;
 
       expect(arrow.endBinding?.elementId).toBe(rect.id);
-      expect(arrow.width).toBeCloseTo(399);
+      expect(arrow.width).toBeCloseTo(404);
       expect(rect.x).toBe(400);
       expect(rect.y).toBe(0);
       expect(
@@ -1336,7 +1336,7 @@ describe("Test Linear Elements", () => {
       mouse.downAt(rect.x, rect.y);
       mouse.moveTo(200, 0);
       mouse.upAt(200, 0);
-      expect(arrow.width).toBeCloseTo(199);
+      expect(arrow.width).toBeCloseTo(204);
       expect(rect.x).toBe(200);
       expect(rect.y).toBe(0);
       expect(handleBindTextResizeSpy).toHaveBeenCalledWith(

packages/element/tests/resize.test.tsx

@@ -563,24 +563,6 @@ describe("text element", () => {
     expect(text.fontSize).toBeCloseTo(fontSize * scale);
   });
 
-  it("resizes proportionally using horizontal delta from corner handles", async () => {
-    const text = UI.createElement("text");
-    await UI.editText(text, "hello\nworld");
-    const { x, y, width, height, fontSize } = text;
-    const deltaX = width;
-    const deltaY = 0;
-    const scale = (width + deltaX) / width;
-
-    UI.resize(text, "se", [deltaX, deltaY]);
-
-    expect(text.x).toBeCloseTo(x);
-    expect(text.y).toBeCloseTo(y);
-    expect(text.width).toBeCloseTo(width * scale);
-    expect(text.height).toBeCloseTo(height * scale);
-    expect(text.angle).toBeCloseTo(0);
-    expect(text.fontSize).toBeCloseTo(fontSize * scale);
-  });
-
   // TODO enable this test after adding single text element flipping
   it.skip("flips while resizing", async () => {
     const text = UI.createElement("text");
@@ -1368,8 +1350,8 @@ describe("multiple selection", () => {
 
     expect(boundArrow.x).toBeCloseTo(380 * scaleX);
     expect(boundArrow.y).toBeCloseTo(240 * scaleY);
-    expect(boundArrow.points[1][0]).toBeCloseTo(59.7979);
+    expect(boundArrow.points[1][0]).toBeCloseTo(63.40354208105561);
-    expect(boundArrow.points[1][1]).toBeCloseTo(-79.7305);
+    expect(boundArrow.points[1][1]).toBeCloseTo(-84.53805610807356);
 
     expect(arrowLabelPos.x + arrowLabel.width / 2).toBeCloseTo(
       boundArrow.x + boundArrow.points[1][0] / 2,

packages/element/tests/textWrapping.test.ts

@@ -1,4 +1,8 @@
-import { wrapText, parseTokens } from "../src/textWrapping";
+import {
+  getWrappedTextLines,
+  parseTokens,
+  wrapText,
+} from "../src/textWrapping";
 
 import type { FontString } from "../src/types";
 
@@ -102,6 +106,71 @@ describe("Test wrapText", () => {
     expect(res2).toBe(`\tA)\none\ntab\n- two\ntabs\n- 8\nspace\ns`);
   });
 
+  it("should retain original text offsets for wrapped lines", () => {
+    expect(getWrappedTextLines("Hello World!", font, 60)).toEqual([
+      {
+        text: "Hello",
+        start: 0,
+        end: 5,
+      },
+      {
+        text: "World!",
+        start: 6,
+        end: 12,
+      },
+    ]);
+  });
+
+  it("should exclude whitespace trimmed away at soft-wrap boundaries from line offsets", () => {
+    expect(getWrappedTextLines("  Hello  World", font, 90)).toEqual([
+      {
+        text: "  Hello",
+        start: 0,
+        end: 7,
+      },
+      {
+        text: "World",
+        start: 9,
+        end: 14,
+      },
+    ]);
+  });
+
+  it("should retain offsets when wrapping a single long token", () => {
+    expect(getWrappedTextLines("Excalidraw", font, 50)).toEqual([
+      {
+        text: "Excal",
+        start: 0,
+        end: 5,
+      },
+      {
+        text: "idraw",
+        start: 5,
+        end: 10,
+      },
+    ]);
+  });
+
+  it("should preserve empty hard lines in metadata", () => {
+    expect(getWrappedTextLines("A\n\nB", font, 100)).toEqual([
+      {
+        text: "A",
+        start: 0,
+        end: 1,
+      },
+      {
+        text: "",
+        start: 2,
+        end: 2,
+      },
+      {
+        text: "B",
+        start: 3,
+        end: 4,
+      },
+    ]);
+  });
+
   describe("When text is CJK", () => {
     it("should break each CJK character when width is very small", () => {
       // "안녕하세요" (Hangul) + "こんにちは世界" (Hiragana, Kanji) + "ｺﾝﾆﾁハ" (Katakana) + "你好" (Han) = "Hello Hello World Hello Hi"

packages/excalidraw/CHANGELOG.md

@@ -11,6 +11,87 @@ The change should be grouped under one of the below section and must contain PR
 Please add the latest change on the top under the correct section.
 -->
 
+## Unreleased
+
+## Excalidraw API
+
+### Breaking changes
+
+- Renamed the `excalidrawAPI` prop to `onExcalidrawAPI`.
+  - `onExcalidrawAPI` is now called on mount (instead of during constructor), and later on unmount (with `null` value). The API may be removed altogether in the future (you can use `onMount` & `onUmount` to manage the `ExcalidrawAPI` object (e.g. to cache it to a global state), already).
+
+### Features
+
+- Added `ExcalidrawAPI.isDestroyed` flag. Set to `true` once the editor unmounts. Calling any `get*` method, `onStateChange`, or `onEvent` on a destroyed API instance will throw in development and `console.error` in production. The `ExcalidrawAPI` will be reset to `null` on umount, but to be extra safe, you should check `ExcalidrawAPI.isDestroyed` before calling these methods to guard against subtle race conditions in your code.
+
+- Added `onMount`, `onInitialize`, and `onUnmount` props. `onMount` receives `{ excalidrawAPI, container }` once the editor root is mounted. `onInitialize` fires once the initial scene has loaded. `onUnmount` fires just before unmounting.
+
+- Same events are also accessible imperatively through `api.onEvent(...)`.
+
+  ```tsx
+  <Excalidraw
+    onExcalidrawAPI={(api) => {
+      api.onEvent("editor:mount", ({ excalidrawAPI, container }) => {
+        console.log(container);
+      });
+
+      api.onEvent("editor:initialize").then((readyApi) => {
+        readyApi.scrollToContent();
+      });
+    }}
+  />
+  ```
+
+  Note that in future releases, most, if not all, `excalidrawAPI.on*` subscriptions will be removed in favor of `excalidrawAPI.onEvent(name)`.
+
+- Also added `"editor:unmount"` lifecycle event, only accessible via `api.onEvent("editor:unmount")`.
+
+- Exported `<ExcalidrawAPIProvider/>`, `useExcalidrawAPI()`, `useAppStateValue(prop | props | selectorFunction)`, and `useOnExcalidrawStateChange(prop | props | selectorFunction, callback)` from the package. The imperative API also now exposes `onStateChange(prop | props | selectorFunction, callback?)`, and `onEvent(name, callback)`.
+
+  ```tsx
+  <ExcalidrawAPIProvider>
+    <Excalidraw />
+    <Logger />
+  </ExcalidrawAPIProvider>;
+
+  function Logger() {
+    // initially null before the ExcalidrawAPIProvider initializes ater
+    // <Excalidraw/> renders
+    // When <Excalidraw/> unmounts, is reset back to null
+    const api = useExcalidrawAPI();
+
+    useAppStateValue("viewModeEnabled", (viewModeEnabled) => {
+      console.log("view mode changed:", viewModeEnabled);
+    });
+
+    React.useEffect(() => {
+      if (api) {
+        console.log("editor instance id:", api.id);
+      }
+    }, [api]);
+
+    return null;
+  }
+  ```
+
+- Added `onExport` so host apps can delay JSON export until async work completes. The handler receives the export data plus an `AbortSignal`, and may return a `Promise` or an async generator that yields progress updates for the built-in toast UI.
+
+  ```tsx
+  <Excalidraw
+    onExport={async function* (_type, { files }, { signal }) {
+      yield { type: "progress", message: "Waiting for images..." };
+
+      await waitForImagesToLoad(files, signal);
+
+      if (signal.aborted) {
+        return;
+      }
+
+      yield { type: "progress", message: "Export ready", progress: 1 };
+    }}
+  />
+  ```
+
 ## Excalidraw Library
 
 ## 0.18.0 (2025-03-11)

packages/excalidraw/README.md

@@ -1,10 +1,10 @@
 # Excalidraw
 
-**Excalidraw** is exported as a component to be directly embedded in your project.
+**Excalidraw** is exported as a React component that you can embed directly in your app.
 
 ## Installation
 
-Use `npm` or `yarn` to install the package.
+Install the package together with its React peer dependencies.
 
 ```bash
 npm install react react-dom @excalidraw/excalidraw
@@ -12,34 +12,131 @@ npm install react react-dom @excalidraw/excalidraw
 yarn add react react-dom @excalidraw/excalidraw
 ```
 
-> **Note**: If you don't want to wait for the next stable release and try out the unreleased changes, use `@excalidraw/excalidraw@next`.
+> **Note**: If you want to try unreleased changes, use `@excalidraw/excalidraw@next`.
 
-#### Self-hosting fonts
+## Quick start
 
-By default, Excalidraw will try to download all the used fonts from the [CDN](https://esm.run/@excalidraw/excalidraw/dist/prod).
+The minimum working setup has two easy-to-miss requirements:
 
-For self-hosting purposes, you'll have to copy the content of the folder `node_modules/@excalidraw/excalidraw/dist/prod/fonts` to the path where your assets should be served from (i.e. `public/` directory in your project). In that case, you should also set `window.EXCALIDRAW_ASSET_PATH` to the very same path, i.e. `/` in case it's in the root:
+1. Import the package CSS:
 
-```js
+```ts
-<script>window.EXCALIDRAW_ASSET_PATH = "/";</script>
+import "@excalidraw/excalidraw/index.css";
 ```
 
-### Dimensions of Excalidraw
+2. Render Excalidraw inside a container with a non-zero height.
 
-Excalidraw takes _100%_ of `width` and `height` of the containing block so make sure the container in which you render Excalidraw has non zero dimensions.
+```tsx
+import { Excalidraw } from "@excalidraw/excalidraw";
+import "@excalidraw/excalidraw/index.css";
+
+export default function App() {
+  return (
+    <div style={{ height: "100vh" }}>
+      <Excalidraw />
+    </div>
+  );
+}
+```
+
+Excalidraw fills `100%` of the width and height of its parent. If the parent has no height, the canvas will not be visible.
+
+## Next.js / SSR frameworks
+
+Excalidraw should be rendered on the client. In SSR frameworks such as Next.js, use a client component and load it dynamically with SSR disabled.
+
+```tsx
+// app/components/ExcalidrawClient.tsx
+"use client";
+
+import { Excalidraw } from "@excalidraw/excalidraw";
+import "@excalidraw/excalidraw/index.css";
+
+export default function ExcalidrawClient() {
+  return (
+    <div style={{ height: "100vh" }}>
+      <Excalidraw />
+    </div>
+  );
+}
+```
+
+```tsx
+// app/page.tsx
+import dynamic from "next/dynamic";
+
+const ExcalidrawClient = dynamic(
+  () => import("./components/ExcalidrawClient"),
+  { ssr: false },
+);
+
+export default function Page() {
+  return <ExcalidrawClient />;
+}
+```
+
+See the local examples for complete setups:
+
+- [examples/with-nextjs](https://github.com/excalidraw/excalidraw/tree/master/examples/with-nextjs)
+- [examples/with-script-in-browser](https://github.com/excalidraw/excalidraw/tree/master/examples/with-script-in-browser)
+
+## LLM / agent tips
+
+If an LLM or coding agent is setting up Excalidraw, these shortcuts usually save more time than re-prompting:
+
+- Start with a plain `<Excalidraw />` in a `100vh` container. Add refs, `initialData`, persistence, or custom UI only after the base embed works.
+- If the canvas is blank, check the CSS import and parent height first. Those are the two most common integration failures.
+- In Next.js or other SSR frameworks, assume client-only rendering first. Use `"use client"` and `dynamic(..., { ssr: false })` before debugging hydration or `window is not defined` errors.
+- If imports or entrypoints are unclear, inspect `node_modules/@excalidraw/excalidraw/package.json`. The installed package exports are the source of truth.
+- Do not set `window.EXCALIDRAW_ASSET_PATH` unless you are intentionally self-hosting fonts/assets.
+- When docs and generated code drift, copy the nearest working example from this repo, especially `examples/with-nextjs` or `examples/with-script-in-browser`.
+
+## Migrating to `@excalidraw/excalidraw@0.18.x`
+
+Version `0.18.x` removes the old `types/`-prefixed deep import paths. If you were importing types from `@excalidraw/excalidraw/types/...`, switch to the new type-only subpaths below.
+
+| Old path | New path |
+| --- | --- |
+| `@excalidraw/excalidraw/types/data/transform.js` | `@excalidraw/excalidraw/element/transform` |
+| `@excalidraw/excalidraw/types/data/types.js` | `@excalidraw/excalidraw/data/types` |
+| `@excalidraw/excalidraw/types/element/types.js` | `@excalidraw/excalidraw/element/types` |
+| `@excalidraw/excalidraw/types/utility-types.js` | `@excalidraw/excalidraw/common/utility-types` |
+| `@excalidraw/excalidraw/types/types.js` | `@excalidraw/excalidraw/types` |
+
+Drop the `.js` extension. The new package `exports` map resolves these paths without it.
+
+These deep subpaths are for `import type` only. Runtime imports should come from the package root, plus `@excalidraw/excalidraw/index.css` for styles.
+
+For example:
+
+```ts
+import { exportToSvg } from "@excalidraw/excalidraw";
+```
+
+## Self-hosting fonts
+
+By default, Excalidraw downloads the fonts it needs from the [CDN](https://esm.run/@excalidraw/excalidraw/dist/prod).
+
+For self-hosting, copy the contents of `node_modules/@excalidraw/excalidraw/dist/prod/fonts` into the path where your app serves static assets, for example `public/`. Then set `window.EXCALIDRAW_ASSET_PATH` to that same path:
+
+```html
+<script>
+  window.EXCALIDRAW_ASSET_PATH = "/";
+</script>
+```
 
 ## Demo
 
-Go to [CodeSandbox](https://codesandbox.io/p/sandbox/github/excalidraw/excalidraw/tree/master/examples/with-script-in-browser) example.
+Try the [CodeSandbox example](https://codesandbox.io/p/sandbox/github/excalidraw/excalidraw/tree/master/examples/with-script-in-browser).
 
 ## Integration
 
-Head over to the [docs](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/integration).
+Read the [integration docs](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/integration).
 
 ## API
 
-Head over to the [docs](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/api).
+Read the [API docs](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/api).
 
 ## Contributing
 
-Head over to the [docs](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/contributing).
+Read the [contributing docs](https://docs.excalidraw.com/docs/@excalidraw/excalidraw/contributing).

packages/excalidraw/actions/actionCanvas.tsx

@@ -118,7 +118,6 @@ export const actionClearCanvas = register({
         gridStep: appState.gridStep,
         gridModeEnabled: appState.gridModeEnabled,
         stats: appState.stats,
-        pasteDialog: appState.pasteDialog,
         activeTool:
           appState.activeTool.type === "image"
             ? {

packages/excalidraw/actions/actionDeleteSelected.tsx

@@ -30,7 +30,7 @@ import { getSelectedElements, isSomeElementSelected } from "../scene";
 import { TrashIcon } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 
-import { useStylesPanelMode } from "..";
+import { useStylesPanelMode } from "../components/App";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionDeselect.ts

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

packages/excalidraw/actions/actionDuplicateSelection.tsx

@@ -27,7 +27,7 @@ import { t } from "../i18n";
 import { isSomeElementSelected } from "../scene";
 import { getShortcutKey } from "../shortcut";
 
-import { useStylesPanelMode } from "..";
+import { useStylesPanelMode } from "../components/App";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionExport.tsx

@@ -9,18 +9,20 @@ import { getNonDeletedElements } from "@excalidraw/element";
 
 import { CaptureUpdateAction } from "@excalidraw/element";
 
-import type { Theme } from "@excalidraw/element/types";
+import type { ExcalidrawElement, Theme } from "@excalidraw/element/types";
 
 import { useEditorInterface } from "../components/App";
 import { CheckboxItem } from "../components/CheckboxItem";
 import { DarkModeToggle } from "../components/DarkModeToggle";
 import { ProjectName } from "../components/ProjectName";
+import { Toast } from "../components/Toast";
 import { ToolButton } from "../components/ToolButton";
 import { Tooltip } from "../components/Tooltip";
 import { ExportIcon, questionCircle, saveAs } from "../components/icons";
 import { loadFromJSON, saveAsJSON } from "../data";
 import { isImageFileHandle } from "../data/blob";
 import { nativeFileSystemSupported } from "../data/filesystem";
+
 import { resaveAsImageWithScene } from "../data/resave";
 
 import { t } from "../i18n";
@@ -31,7 +33,15 @@ import "../components/ToolIcon.scss";
 
 import { register } from "./register";
 
-import type { AppState } from "../types";
+import type { JSONExportData } from "../data/json";
+
+import type {
+  AppClassProperties,
+  AppState,
+  BinaryFiles,
+  ExcalidrawProps,
+  OnExportProgress,
+} from "../types";
 
 export const actionChangeProjectName = register<AppState["name"]>({
   name: "changeProjectName",
@@ -150,6 +160,143 @@ export const actionChangeExportEmbedScene = register<
   ),
 });
 
+// ---------------------------------------------------------------------------
+// onExport interception helpers
+// ---------------------------------------------------------------------------
+
+let onExportInProgress = false;
+
+const onProgressToast = (
+  app: AppClassProperties,
+  progress: {
+    message?: OnExportProgress["message"];
+    progress?: number | null;
+  },
+) => {
+  const message = progress.message ?? t("progressDialog.defaultMessage");
+  app.setAppState({
+    toast: {
+      message:
+        progress.progress != null ? (
+          <>
+            {message}
+            <Toast.ProgressBar progress={progress.progress} />
+          </>
+        ) : (
+          message
+        ),
+      duration: Infinity,
+    },
+  });
+};
+
+/** awaits host app's onExport result, and renders progress to the UI */
+async function handleOnExportResult(
+  onExportResult: ReturnType<NonNullable<ExcalidrawProps["onExport"]>>,
+  opts: {
+    signal: AbortSignal;
+    app: AppClassProperties;
+  },
+): Promise<void> {
+  if (opts.app.state.isLoading) {
+    onProgressToast(opts.app, { progress: null });
+    await opts.app.onStateChange({ predicate: (state) => !state.isLoading });
+  }
+
+  if (
+    onExportResult != null &&
+    typeof onExportResult === "object" &&
+    Symbol.asyncIterator in onExportResult
+  ) {
+    for await (const value of onExportResult) {
+      if (opts.signal.aborted) {
+        onExportResult.return();
+        return;
+      }
+      if (value.type === "progress") {
+        onProgressToast(opts.app, {
+          message: value.message,
+          progress: value.progress ?? null,
+        });
+      } else if (value.type === "done") {
+        return;
+      }
+    }
+
+    // Generator completed without explicit "done" message
+    return;
+  }
+
+  if (onExportResult instanceof Promise) {
+    onProgressToast(opts.app, { progress: null });
+    await onExportResult;
+  }
+}
+
+function prepareDataForJSONExport(
+  elements: readonly ExcalidrawElement[],
+  appState: AppState,
+  files: BinaryFiles,
+  app: AppClassProperties,
+): { abortController: AbortController; data: Promise<JSONExportData> } {
+  const abortController = new AbortController();
+  const signal = abortController.signal;
+
+  const dataPromise = new Promise<JSONExportData>(async (resolve) => {
+    try {
+      if (app.props.onExport) {
+        await handleOnExportResult(
+          app.props.onExport(
+            "json",
+            {
+              elements,
+              appState,
+              files,
+            },
+            {
+              signal,
+            },
+          ),
+          {
+            app,
+            signal,
+          },
+        );
+      }
+    } catch (error: any) {
+      if (error?.name === "AbortError") {
+        // if abort error, assume it's a reaction on the signal being aborted
+        console.warn(
+          `onExport() aborted by host app (signal aborted: ${signal.aborted})`,
+        );
+      } else {
+        // non-abort error
+        //
+        console.error("Error during props.onExport() handling", error);
+      }
+
+      // either way, we currently don't allow host apps to cancel save actions
+      // so we resolve to orig data
+    }
+
+    resolve({
+      elements,
+      appState,
+      // return latest files in case they finished loading during onExport
+      files: app.files,
+    });
+  });
+
+  return {
+    abortController,
+    data: dataPromise,
+  };
+}
+
+// ---------------------------------------------------------------------------
+// Save actions
+// ---------------------------------------------------------------------------
+
 export const actionSaveToActiveFile = register({
   name: "saveToActiveFile",
   label: "buttons.save",
@@ -163,42 +310,62 @@ export const actionSaveToActiveFile = register({
     );
   },
   perform: async (elements, appState, value, app) => {
-    const fileHandleExists = !!appState.fileHandle;
+    if (onExportInProgress) {
+      return false;
+    }
+    onExportInProgress = true;
+
+    const previousFileHandle = appState.fileHandle;
+    const filename = app.getName();
+
+    const { abortController, data: exportedDataPromise } =
+      prepareDataForJSONExport(elements, appState, app.files, app);
 
     try {
-      const { fileHandle } = isImageFileHandle(appState.fileHandle)
+      const { fileHandle } = isImageFileHandle(previousFileHandle)
         ? await resaveAsImageWithScene(
-            elements,
+            exportedDataPromise,
-            appState,
+            previousFileHandle,
-            app.files,
+            filename,
-            app.getName(),
           )
-        : await saveAsJSON(elements, appState, app.files, app.getName());
+        : await saveAsJSON({
+            data: exportedDataPromise,
+            filename,
+            fileHandle: previousFileHandle,
+          });
 
       return {
-        captureUpdate: CaptureUpdateAction.EVENTUALLY,
+        captureUpdate: CaptureUpdateAction.NEVER,
         appState: {
-          ...appState,
           fileHandle,
-          toast: fileHandleExists
+          toast: {
-            ? {
+            message:
-                message: fileHandle?.name
+              previousFileHandle && fileHandle?.name
-                  ? t("toast.fileSavedToFilename").replace(
+                ? t("toast.fileSavedToFilename").replace(
-                      "{filename}",
+                    "{filename}",
-                      `"${fileHandle.name}"`,
+                    `"${fileHandle.name}"`,
-                    )
+                  )
-                  : t("toast.fileSaved"),
+                : t("toast.fileSaved"),
-              }
+            duration: 1500,
-            : null,
+          },
         },
       };
     } catch (error: any) {
+      abortController.abort();
+
       if (error?.name !== "AbortError") {
         console.error(error);
       } else {
         console.warn(error);
       }
-      return { captureUpdate: CaptureUpdateAction.EVENTUALLY };
+      return {
+        captureUpdate: CaptureUpdateAction.NEVER,
+        appState: {
+          toast: null,
+        },
+      };
+    } finally {
+      onExportInProgress = false;
     }
   },
   keyTest: (event) =>
@@ -212,36 +379,50 @@ export const actionSaveFileToDisk = register({
   viewMode: true,
   trackEvent: { category: "export" },
   perform: async (elements, appState, value, app) => {
+    if (onExportInProgress) {
+      return false;
+    }
+    onExportInProgress = true;
+
+    const { abortController, data: exportedDataPromise } =
+      prepareDataForJSONExport(elements, appState, app.files, app);
+
     try {
-      const { fileHandle } = await saveAsJSON(
+      const { fileHandle: savedFileHandle } = await saveAsJSON({
-        elements,
+        data: exportedDataPromise,
-        {
+        filename: app.getName(),
-          ...appState,
+        fileHandle: null,
-          fileHandle: null,
+      });
-        },
+
-        app.files,
-        app.getName(),
-      );
       return {
-        captureUpdate: CaptureUpdateAction.EVENTUALLY,
+        captureUpdate: CaptureUpdateAction.NEVER,
         appState: {
-          ...appState,
           openDialog: null,
-          fileHandle,
+          fileHandle: savedFileHandle,
-          toast: { message: t("toast.fileSaved") },
+          toast: { message: t("toast.fileSaved"), duration: 3000 },
         },
       };
     } catch (error: any) {
+      abortController.abort();
       if (error?.name !== "AbortError") {
         console.error(error);
       } else {
         console.warn(error);
       }
-      return { captureUpdate: CaptureUpdateAction.EVENTUALLY };
+      return {
+        captureUpdate: CaptureUpdateAction.NEVER,
+        appState: {
+          toast: null,
+        },
+      };
+    } finally {
+      onExportInProgress = false;
     }
   },
   keyTest: (event) =>
-    event.key === KEYS.S && event.shiftKey && event[KEYS.CTRL_OR_CMD],
+    event.key.toLowerCase() === KEYS.S &&
+    event.shiftKey &&
+    event[KEYS.CTRL_OR_CMD],
   PanelComponent: ({ updateData }) => (
     <ToolButton
       type="button"
@@ -300,7 +481,8 @@ export const actionExportWithDarkMode = register<
   name: "exportWithDarkMode",
   label: "imageExportDialog.label.darkMode",
   trackEvent: { category: "export", action: "toggleTheme" },
-  perform: (_elements, appState, value) => {
+  perform: (_elements, appState, value, app) => {
+    app.sessionExportThemeOverride = value ? THEME.DARK : THEME.LIGHT;
     return {
       appState: { ...appState, exportWithDarkMode: value },
       captureUpdate: CaptureUpdateAction.EVENTUALLY,

packages/excalidraw/actions/actionFinalize.tsx

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

packages/excalidraw/actions/actionHistory.tsx

@@ -18,7 +18,7 @@ import { HistoryChangedEvent } from "../history";
 import { useEmitter } from "../hooks/useEmitter";
 import { t } from "../i18n";
 
-import { useStylesPanelMode } from "..";
+import { useStylesPanelMode } from "../components/App";
 
 import type { History } from "../history";
 import type { AppClassProperties, AppState } from "../types";

packages/excalidraw/actions/actionProperties.tsx

@@ -36,6 +36,7 @@ import {
 import { LinearElementEditor } from "@excalidraw/element";
 
 import { newElementWith } from "@excalidraw/element";
+import { getArrowheadForPicker } from "@excalidraw/element";
 
 import {
   getBoundTextElement,
@@ -124,9 +125,12 @@ import {
   sharpArrowIcon,
   roundArrowIcon,
   elbowArrowIcon,
-  ArrowheadCrowfootIcon,
+  ArrowheadCardinalityExactlyOneIcon,
-  ArrowheadCrowfootOneIcon,
+  ArrowheadCardinalityManyIcon,
-  ArrowheadCrowfootOneOrManyIcon,
+  ArrowheadCardinalityOneIcon,
+  ArrowheadCardinalityOneOrManyIcon,
+  ArrowheadCardinalityZeroOrManyIcon,
+  ArrowheadCardinalityZeroOrOneIcon,
 } from "../components/icons";
 
 import { Fonts } from "../fonts";
@@ -187,7 +191,7 @@ export const getFormValue = function <T extends Primitive>(
   elements: readonly ExcalidrawElement[],
   app: AppClassProperties,
   getAttribute: (element: ExcalidrawElement) => T,
-  isRelevantElement: true | ((element: ExcalidrawElement) => boolean),
+  elementPredicate: true | ((element: ExcalidrawElement) => boolean),
   defaultValue: T | ((isSomeElementSelected: boolean) => T),
 ): T {
   const editingTextElement = app.state.editingTextElement;
@@ -205,9 +209,9 @@ export const getFormValue = function <T extends Primitive>(
     if (hasSelection) {
       const selectedElements = app.scene.getSelectedElements(app.state);
       const targetElements =
-        isRelevantElement === true
+        elementPredicate === true
           ? selectedElements
-          : selectedElements.filter((el) => isRelevantElement(el));
+          : selectedElements.filter((el) => elementPredicate(el));
 
       ret =
         reduceToCommonValue(targetElements, getAttribute) ??
@@ -726,9 +730,28 @@ export const actionChangeOpacity = register<ExcalidrawElement["opacity"]>({
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
   },
-  PanelComponent: ({ app, updateData }) => (
+  PanelComponent: ({ elements, appState, app, updateData }) => {
-    <Range updateData={updateData} app={app} testId="opacity" />
+    const opacity = getFormValue(
-  ),
+      elements,
+      app,
+      (element) => element.opacity,
+      true,
+      (hasSelection) => (hasSelection ? null : appState.currentItemOpacity),
+    );
+
+    return (
+      <Range
+        label={t("labels.opacity")}
+        value={opacity ?? appState.currentItemOpacity}
+        hasCommonValue={opacity !== null}
+        onChange={updateData}
+        min={0}
+        max={100}
+        step={10}
+        testId="opacity"
+      />
+    );
+  },
 });
 
 export const actionChangeFontSize = register<ExcalidrawTextElement["fontSize"]>(
@@ -1550,80 +1573,117 @@ export const actionChangeRoundness = register<"sharp" | "round">({
 });
 
 const getArrowheadOptions = (flip: boolean) => {
-  return [
+  return {
-    {
+    visibleSections: [
-      value: null,
+      {
-      text: t("labels.arrowhead_none"),
+        name: "default",
-      keyBinding: "q",
+        options: [
-      icon: ArrowheadNoneIcon,
+          {
-    },
+            value: null,
-    {
+            text: t("labels.arrowhead_none"),
-      value: "arrow",
+            keyBinding: "q",
-      text: t("labels.arrowhead_arrow"),
+            icon: <ArrowheadNoneIcon flip={flip} />,
-      keyBinding: "w",
+          },
-      icon: <ArrowheadArrowIcon flip={flip} />,
+          {
-    },
+            value: "arrow",
-    {
+            text: t("labels.arrowhead_arrow"),
-      value: "triangle",
+            keyBinding: "w",
-      text: t("labels.arrowhead_triangle"),
+            icon: <ArrowheadArrowIcon flip={flip} />,
-      icon: <ArrowheadTriangleIcon flip={flip} />,
+          },
-      keyBinding: "e",
+          {
-    },
+            value: "triangle",
-    {
+            text: t("labels.arrowhead_triangle"),
-      value: "triangle_outline",
+            icon: <ArrowheadTriangleIcon flip={flip} />,
-      text: t("labels.arrowhead_triangle_outline"),
+            keyBinding: "e",
-      icon: <ArrowheadTriangleOutlineIcon flip={flip} />,
+          },
-      keyBinding: "r",
+          {
-    },
+            value: "triangle_outline",
-    {
+            text: t("labels.arrowhead_triangle_outline"),
-      value: "circle",
+            icon: <ArrowheadTriangleOutlineIcon flip={flip} />,
-      text: t("labels.arrowhead_circle"),
+            keyBinding: "r",
-      keyBinding: "a",
+          },
-      icon: <ArrowheadCircleIcon flip={flip} />,
+        ],
-    },
+      },
-    {
+    ],
-      value: "circle_outline",
+    hiddenSections: [
-      text: t("labels.arrowhead_circle_outline"),
+      {
-      keyBinding: "s",
+        name: "default",
-      icon: <ArrowheadCircleOutlineIcon flip={flip} />,
+        options: [
-    },
+          {
-    {
+            value: "circle",
-      value: "diamond",
+            text: t("labels.arrowhead_circle"),
-      text: t("labels.arrowhead_diamond"),
+            keyBinding: "a",
-      icon: <ArrowheadDiamondIcon flip={flip} />,
+            icon: <ArrowheadCircleIcon flip={flip} />,
-      keyBinding: "d",
+          },
-    },
+          {
-    {
+            value: "circle_outline",
-      value: "diamond_outline",
+            text: t("labels.arrowhead_circle_outline"),
-      text: t("labels.arrowhead_diamond_outline"),
+            keyBinding: "s",
-      icon: <ArrowheadDiamondOutlineIcon flip={flip} />,
+            icon: <ArrowheadCircleOutlineIcon flip={flip} />,
-      keyBinding: "f",
+          },
-    },
+          {
-    {
+            value: "diamond",
-      value: "bar",
+            text: t("labels.arrowhead_diamond"),
-      text: t("labels.arrowhead_bar"),
+            icon: <ArrowheadDiamondIcon flip={flip} />,
-      keyBinding: "z",
+            keyBinding: "d",
-      icon: <ArrowheadBarIcon flip={flip} />,
+          },
-    },
+          {
-    {
+            value: "diamond_outline",
-      value: "crowfoot_one",
+            text: t("labels.arrowhead_diamond_outline"),
-      text: t("labels.arrowhead_crowfoot_one"),
+            icon: <ArrowheadDiamondOutlineIcon flip={flip} />,
-      icon: <ArrowheadCrowfootOneIcon flip={flip} />,
+            keyBinding: "f",
-      keyBinding: "x",
+          },
-    },
+          {
-    {
+            value: "bar",
-      value: "crowfoot_many",
+            text: t("labels.arrowhead_bar"),
-      text: t("labels.arrowhead_crowfoot_many"),
+            keyBinding: "z",
-      icon: <ArrowheadCrowfootIcon flip={flip} />,
+            icon: <ArrowheadBarIcon flip={flip} />,
-      keyBinding: "c",
+          },
-    },
+        ],
-    {
+      },
-      value: "crowfoot_one_or_many",
+      {
-      text: t("labels.arrowhead_crowfoot_one_or_many"),
+        name: t("labels.cardinality"),
-      icon: <ArrowheadCrowfootOneOrManyIcon flip={flip} />,
+        options: [
-      keyBinding: "v",
+          {
-    },
+            value: "cardinality_one",
-  ] as const;
+            text: t("labels.arrowhead_cardinality_one"),
+            icon: <ArrowheadCardinalityOneIcon flip={flip} />,
+            keyBinding: "x",
+          },
+          {
+            value: "cardinality_many",
+            text: t("labels.arrowhead_cardinality_many"),
+            icon: <ArrowheadCardinalityManyIcon flip={flip} />,
+            keyBinding: "c",
+          },
+          {
+            value: "cardinality_one_or_many",
+            text: t("labels.arrowhead_cardinality_one_or_many"),
+            icon: <ArrowheadCardinalityOneOrManyIcon flip={flip} />,
+            keyBinding: "v",
+          },
+          {
+            value: "cardinality_exactly_one",
+            text: t("labels.arrowhead_cardinality_exactly_one"),
+            icon: <ArrowheadCardinalityExactlyOneIcon flip={flip} />,
+            keyBinding: null,
+          },
+          {
+            value: "cardinality_zero_or_one",
+            text: t("labels.arrowhead_cardinality_zero_or_one"),
+            icon: <ArrowheadCardinalityZeroOrOneIcon flip={flip} />,
+            keyBinding: null,
+          },
+          {
+            value: "cardinality_zero_or_many",
+            text: t("labels.arrowhead_cardinality_zero_or_many"),
+            icon: <ArrowheadCardinalityZeroOrManyIcon flip={flip} />,
+            keyBinding: null,
+          },
+        ],
+      },
+    ],
+  } as const;
 };
 
 export const actionChangeArrowhead = register<{
@@ -1667,43 +1727,52 @@ export const actionChangeArrowhead = register<{
   },
   PanelComponent: ({ elements, appState, updateData, app }) => {
     const isRTL = getLanguage().rtl;
+    const startArrowheadOptions = useMemo(
+      () => getArrowheadOptions(!isRTL),
+      [isRTL],
+    );
+    const endArrowheadOptions = useMemo(
+      () => getArrowheadOptions(!!isRTL),
+      [isRTL],
+    );
 
     return (
       <fieldset>
         <legend>{t("labels.arrowheads")}</legend>
         <div className="iconSelectList buttonList">
           <IconPicker
+            visibleSections={startArrowheadOptions.visibleSections}
+            hiddenSections={startArrowheadOptions.hiddenSections}
             label="arrowhead_start"
-            options={getArrowheadOptions(!isRTL)}
             value={getFormValue<Arrowhead | null>(
               elements,
               app,
               (element) =>
                 isLinearElement(element) && canHaveArrowheads(element.type)
-                  ? element.startArrowhead
+                  ? getArrowheadForPicker(element.startArrowhead)
                   : appState.currentItemStartArrowhead,
               true,
-              appState.currentItemStartArrowhead,
+              (hasSelection) =>
+                hasSelection ? null : appState.currentItemStartArrowhead,
             )}
             onChange={(value) => updateData({ position: "start", type: value })}
-            numberOfOptionsToAlwaysShow={4}
           />
           <IconPicker
+            visibleSections={endArrowheadOptions.visibleSections}
+            hiddenSections={endArrowheadOptions.hiddenSections}
             label="arrowhead_end"
-            group="arrowheads"
-            options={getArrowheadOptions(!!isRTL)}
             value={getFormValue<Arrowhead | null>(
               elements,
               app,
               (element) =>
                 isLinearElement(element) && canHaveArrowheads(element.type)
-                  ? element.endArrowhead
+                  ? getArrowheadForPicker(element.endArrowhead)
                   : appState.currentItemEndArrowhead,
               true,
-              appState.currentItemEndArrowhead,
+              (hasSelection) =>
+                hasSelection ? null : appState.currentItemEndArrowhead,
             )}
             onChange={(value) => updateData({ position: "end", type: value })}
-            numberOfOptionsToAlwaysShow={4}
           />
         </div>
       </fieldset>
@@ -1828,6 +1897,7 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
                   startElement,
                   "start",
                   elementsMap,
+                  appState.isBindingEnabled,
                 ),
               }
             : null;
@@ -1841,6 +1911,7 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
                   endElement,
                   "end",
                   elementsMap,
+                  appState.isBindingEnabled,
                 ),
               }
             : null;

packages/excalidraw/actions/actionTextAutoResize.ts

@@ -1,24 +1,24 @@
 import { getFontString } from "@excalidraw/common";
 
-import { newElementWith } from "@excalidraw/element";
+import { isExcalidrawElement, newElementWith } from "@excalidraw/element";
 import { measureText } from "@excalidraw/element";
 
 import { isTextElement } from "@excalidraw/element";
 
 import { CaptureUpdateAction } from "@excalidraw/element";
 
+import type { ExcalidrawElement } from "@excalidraw/element/types";
+
 import { getSelectedElements } from "../scene";
 
 import { register } from "./register";
 
-import type { AppClassProperties } from "../types";
-
 export const actionTextAutoResize = register({
   name: "autoResize",
   label: "labels.autoResize",
   icon: null,
   trackEvent: { category: "element" },
-  predicate: (elements, appState, _: unknown, app: AppClassProperties) => {
+  predicate: (elements, appState, _: unknown) => {
     const selectedElements = getSelectedElements(elements, appState);
     return (
       selectedElements.length === 1 &&
@@ -26,13 +26,18 @@ export const actionTextAutoResize = register({
       !selectedElements[0].autoResize
     );
   },
-  perform: (elements, appState, _, app) => {
+  perform: (elements, appState, targetElement) => {
     const selectedElements = getSelectedElements(elements, appState);
 
+    const targetTextElement =
+      isExcalidrawElement(targetElement) && isTextElement(targetElement)
+        ? targetElement
+        : (selectedElements[0] as ExcalidrawElement | undefined);
+
     return {
       appState,
       elements: elements.map((element) => {
-        if (element.id === selectedElements[0].id && isTextElement(element)) {
+        if (element.id === targetTextElement?.id && isTextElement(element)) {
           const metrics = measureText(
             element.originalText,
             getFontString(element),

packages/excalidraw/actions/actionToggleArrowBinding.tsx

@@ -0,0 +1,26 @@
+import { CaptureUpdateAction } from "@excalidraw/element";
+
+import { register } from "./register";
+
+export const actionToggleArrowBinding = register({
+  name: "arrowBinding",
+  label: "labels.arrowBinding",
+  viewMode: false,
+  trackEvent: {
+    category: "canvas",
+    predicate: (appState) => appState.bindingPreference === "disabled",
+  },
+  perform(elements, appState) {
+    const newPreference =
+      appState.bindingPreference === "enabled" ? "disabled" : "enabled";
+    return {
+      appState: {
+        ...appState,
+        bindingPreference: newPreference,
+        isBindingEnabled: newPreference === "enabled",
+      },
+      captureUpdate: CaptureUpdateAction.NEVER,
+    };
+  },
+  checked: (appState) => appState.bindingPreference === "enabled",
+});

packages/excalidraw/actions/actionToggleMidpointSnapping.tsx

@@ -0,0 +1,23 @@
+import { CaptureUpdateAction } from "@excalidraw/element";
+
+import { register } from "./register";
+
+export const actionToggleMidpointSnapping = register({
+  name: "midpointSnapping",
+  label: "labels.midpointSnapping",
+  viewMode: false,
+  trackEvent: {
+    category: "canvas",
+    predicate: (appState) => !appState.isMidpointSnappingEnabled,
+  },
+  perform(elements, appState) {
+    return {
+      appState: {
+        ...appState,
+        isMidpointSnappingEnabled: !this.checked!(appState),
+      },
+      captureUpdate: CaptureUpdateAction.NEVER,
+    };
+  },
+  checked: (appState) => appState.isMidpointSnappingEnabled,
+});

packages/excalidraw/actions/index.ts

@@ -34,6 +34,7 @@ export {
 export { actionSetEmbeddableAsActiveTool } from "./actionEmbeddable";
 
 export { actionFinalize } from "./actionFinalize";
+export { actionDeselect } from "./actionDeselect";
 
 export {
   actionChangeProjectName,
@@ -79,6 +80,8 @@ export {
 export { actionToggleGridMode } from "./actionToggleGridMode";
 export { actionToggleZenMode } from "./actionToggleZenMode";
 export { actionToggleObjectsSnapMode } from "./actionToggleObjectsSnapMode";
+export { actionToggleArrowBinding } from "./actionToggleArrowBinding";
+export { actionToggleMidpointSnapping } from "./actionToggleMidpointSnapping";
 
 export { actionToggleStats } from "./actionToggleStats";
 export { actionUnbindText, actionBindText } from "./actionBoundText";

packages/excalidraw/actions/shortcuts.ts

@@ -55,7 +55,8 @@ export type ShortcutName =
   | "saveScene"
   | "imageExport"
   | "commandPalette"
-  | "searchMenu";
+  | "searchMenu"
+  | "toolLock";
 
 const shortcutMap: Record<ShortcutName, string[]> = {
   toggleTheme: [getShortcutKey("Shift+Alt+D")],
@@ -117,6 +118,7 @@ const shortcutMap: Record<ShortcutName, string[]> = {
   toggleShortcuts: [getShortcutKey("?")],
   searchMenu: [getShortcutKey("CtrlOrCmd+F")],
   wrapSelectionInFrame: [],
+  toolLock: [getShortcutKey("Q")],
 };
 
 export const getShortcutFromShortcutName = (name: ShortcutName, idx = 0) => {

packages/excalidraw/actions/types.ts

@@ -59,6 +59,8 @@ export type ActionName =
   | "gridMode"
   | "zenMode"
   | "objectsSnapMode"
+  | "arrowBinding"
+  | "midpointSnapping"
   | "stats"
   | "changeStrokeColor"
   | "changeBackgroundColor"
@@ -112,6 +114,7 @@ export type ActionName =
   | "distributeVertically"
   | "flipHorizontal"
   | "flipVertical"
+  | "deselect"
   | "viewMode"
   | "exportWithDarkMode"
   | "toggleTheme"

packages/excalidraw/appState.ts

@@ -27,7 +27,6 @@ export const getDefaultAppState = (): Omit<
     showWelcomeScreen: false,
     theme: THEME.LIGHT,
     collaborators: new Map(),
-    currentChartType: "bar",
     currentItemBackgroundColor: DEFAULT_ELEMENT_PROPS.backgroundColor,
     currentItemEndArrowhead: "arrow",
     currentItemFillStyle: DEFAULT_ELEMENT_PROPS.fillStyle,
@@ -71,6 +70,8 @@ export const getDefaultAppState = (): Omit<
     gridStep: DEFAULT_GRID_STEP,
     gridModeEnabled: false,
     isBindingEnabled: true,
+    bindingPreference: "enabled",
+    isMidpointSnappingEnabled: true,
     defaultSidebarDockedPreference: false,
     isLoading: false,
     isResizing: false,
@@ -83,7 +84,6 @@ export const getDefaultAppState = (): Omit<
     openPopup: null,
     openSidebar: null,
     openDialog: null,
-    pasteDialog: { shown: false, data: null },
     previousSelectedElementIds: {},
     resizingElement: null,
     scrolledOutside: false,
@@ -150,7 +150,6 @@ const APP_STATE_STORAGE_CONF = (<
   showWelcomeScreen: { browser: true, export: false, server: false },
   theme: { browser: true, export: false, server: false },
   collaborators: { browser: false, export: false, server: false },
-  currentChartType: { browser: true, export: false, server: false },
   currentItemBackgroundColor: { browser: true, export: false, server: false },
   currentItemEndArrowhead: { browser: true, export: false, server: false },
   currentItemFillStyle: { browser: true, export: false, server: false },
@@ -193,7 +192,9 @@ const APP_STATE_STORAGE_CONF = (<
   gridStep: { browser: true, export: true, server: true },
   gridModeEnabled: { browser: true, export: true, server: true },
   height: { browser: false, export: false, server: false },
-  isBindingEnabled: { browser: false, export: false, server: false },
+  isBindingEnabled: { browser: true, export: false, server: false },
+  bindingPreference: { browser: true, export: false, server: false },
+  isMidpointSnappingEnabled: { browser: true, export: false, server: false },
   defaultSidebarDockedPreference: {
     browser: true,
     export: false,
@@ -212,7 +213,6 @@ const APP_STATE_STORAGE_CONF = (<
   openPopup: { browser: false, export: false, server: false },
   openSidebar: { browser: true, export: false, server: false },
   openDialog: { browser: false, export: false, server: false },
-  pasteDialog: { browser: false, export: false, server: false },
   previousSelectedElementIds: { browser: true, export: false, server: false },
   resizingElement: { browser: false, export: false, server: false },
   scrolledOutside: { browser: true, export: false, server: false },

packages/excalidraw/charts.ts

@@ -1,481 +0,0 @@
-import { pointFrom } from "@excalidraw/math";
-
-import {
-  COLOR_PALETTE,
-  DEFAULT_CHART_COLOR_INDEX,
-  getAllColorsSpecificShade,
-  DEFAULT_FONT_FAMILY,
-  DEFAULT_FONT_SIZE,
-  VERTICAL_ALIGN,
-  randomId,
-  isDevEnv,
-  FONT_SIZES,
-} from "@excalidraw/common";
-
-import {
-  newTextElement,
-  newLinearElement,
-  newElement,
-} from "@excalidraw/element";
-
-import type { Radians } from "@excalidraw/math";
-
-import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
-
-export type ChartElements = readonly NonDeletedExcalidrawElement[];
-
-const BAR_WIDTH = 32;
-const BAR_GAP = 12;
-const BAR_HEIGHT = 256;
-const GRID_OPACITY = 50;
-
-export interface Spreadsheet {
-  title: string | null;
-  labels: string[] | null;
-  values: number[];
-}
-
-export const NOT_SPREADSHEET = "NOT_SPREADSHEET";
-export const VALID_SPREADSHEET = "VALID_SPREADSHEET";
-
-type ParseSpreadsheetResult =
-  | { type: typeof NOT_SPREADSHEET; reason: string }
-  | { type: typeof VALID_SPREADSHEET; spreadsheet: Spreadsheet };
-
-/**
- * @private exported for testing
- */
-export const tryParseNumber = (s: string): number | null => {
-  const match = /^([-+]?)[$€£¥₩]?([-+]?)([\d.,]+)[%]?$/.exec(s);
-  if (!match) {
-    return null;
-  }
-  return parseFloat(`${(match[1] || match[2]) + match[3]}`.replace(/,/g, ""));
-};
-
-const isNumericColumn = (lines: string[][], columnIndex: number) =>
-  lines.slice(1).every((line) => tryParseNumber(line[columnIndex]) !== null);
-
-/**
- * @private exported for testing
- */
-export const tryParseCells = (cells: string[][]): ParseSpreadsheetResult => {
-  const numCols = cells[0].length;
-
-  if (numCols > 2) {
-    return { type: NOT_SPREADSHEET, reason: "More than 2 columns" };
-  }
-
-  if (numCols === 1) {
-    if (!isNumericColumn(cells, 0)) {
-      return { type: NOT_SPREADSHEET, reason: "Value is not numeric" };
-    }
-
-    const hasHeader = tryParseNumber(cells[0][0]) === null;
-    const values = (hasHeader ? cells.slice(1) : cells).map((line) =>
-      tryParseNumber(line[0]),
-    );
-
-    if (values.length < 2) {
-      return { type: NOT_SPREADSHEET, reason: "Less than two rows" };
-    }
-
-    return {
-      type: VALID_SPREADSHEET,
-      spreadsheet: {
-        title: hasHeader ? cells[0][0] : null,
-        labels: null,
-        values: values as number[],
-      },
-    };
-  }
-
-  const labelColumnNumeric = isNumericColumn(cells, 0);
-  const valueColumnNumeric = isNumericColumn(cells, 1);
-
-  if (!labelColumnNumeric && !valueColumnNumeric) {
-    return { type: NOT_SPREADSHEET, reason: "Value is not numeric" };
-  }
-
-  const [labelColumnIndex, valueColumnIndex] = valueColumnNumeric
-    ? [0, 1]
-    : [1, 0];
-  const hasHeader = tryParseNumber(cells[0][valueColumnIndex]) === null;
-  const rows = hasHeader ? cells.slice(1) : cells;
-
-  if (rows.length < 2) {
-    return { type: NOT_SPREADSHEET, reason: "Less than 2 rows" };
-  }
-
-  return {
-    type: VALID_SPREADSHEET,
-    spreadsheet: {
-      title: hasHeader ? cells[0][valueColumnIndex] : null,
-      labels: rows.map((row) => row[labelColumnIndex]),
-      values: rows.map((row) => tryParseNumber(row[valueColumnIndex])!),
-    },
-  };
-};
-
-const transposeCells = (cells: string[][]) => {
-  const nextCells: string[][] = [];
-  for (let col = 0; col < cells[0].length; col++) {
-    const nextCellRow: string[] = [];
-    for (let row = 0; row < cells.length; row++) {
-      nextCellRow.push(cells[row][col]);
-    }
-    nextCells.push(nextCellRow);
-  }
-  return nextCells;
-};
-
-export const tryParseSpreadsheet = (text: string): ParseSpreadsheetResult => {
-  // Copy/paste from excel, spreadsheets, tsv, csv.
-  // For now we only accept 2 columns with an optional header
-
-  // Check for tab separated values
-  let lines = text
-    .trim()
-    .split("\n")
-    .map((line) => line.trim().split("\t"));
-
-  // Check for comma separated files
-  if (lines.length && lines[0].length !== 2) {
-    lines = text
-      .trim()
-      .split("\n")
-      .map((line) => line.trim().split(","));
-  }
-
-  if (lines.length === 0) {
-    return { type: NOT_SPREADSHEET, reason: "No values" };
-  }
-
-  const numColsFirstLine = lines[0].length;
-  const isSpreadsheet = lines.every((line) => line.length === numColsFirstLine);
-
-  if (!isSpreadsheet) {
-    return {
-      type: NOT_SPREADSHEET,
-      reason: "All rows don't have same number of columns",
-    };
-  }
-
-  const result = tryParseCells(lines);
-  if (result.type !== VALID_SPREADSHEET) {
-    const transposedResults = tryParseCells(transposeCells(lines));
-    if (transposedResults.type === VALID_SPREADSHEET) {
-      return transposedResults;
-    }
-  }
-  return result;
-};
-
-const bgColors = getAllColorsSpecificShade(DEFAULT_CHART_COLOR_INDEX);
-
-// Put all the common properties here so when the whole chart is selected
-// the properties dialog shows the correct selected values
-const commonProps = {
-  fillStyle: "hachure",
-  fontFamily: DEFAULT_FONT_FAMILY,
-  fontSize: DEFAULT_FONT_SIZE,
-  opacity: 100,
-  roughness: 1,
-  strokeColor: COLOR_PALETTE.black,
-  roundness: null,
-  strokeStyle: "solid",
-  strokeWidth: 1,
-  verticalAlign: VERTICAL_ALIGN.MIDDLE,
-  locked: false,
-} as const;
-
-const getChartDimensions = (spreadsheet: Spreadsheet) => {
-  const chartWidth =
-    (BAR_WIDTH + BAR_GAP) * spreadsheet.values.length + BAR_GAP;
-  const chartHeight = BAR_HEIGHT + BAR_GAP * 2;
-  return { chartWidth, chartHeight };
-};
-
-const chartXLabels = (
-  spreadsheet: Spreadsheet,
-  x: number,
-  y: number,
-  groupId: string,
-  backgroundColor: string,
-): ChartElements => {
-  return (
-    spreadsheet.labels?.map((label, index) => {
-      return newTextElement({
-        groupIds: [groupId],
-        backgroundColor,
-        ...commonProps,
-        text: label.length > 8 ? `${label.slice(0, 5)}...` : label,
-        x: x + index * (BAR_WIDTH + BAR_GAP) + BAR_GAP * 2,
-        y: y + BAR_GAP / 2,
-        width: BAR_WIDTH,
-        angle: 5.87 as Radians,
-        fontSize: FONT_SIZES.sm,
-        textAlign: "center",
-        verticalAlign: "top",
-      });
-    }) || []
-  );
-};
-
-const chartYLabels = (
-  spreadsheet: Spreadsheet,
-  x: number,
-  y: number,
-  groupId: string,
-  backgroundColor: string,
-): ChartElements => {
-  const minYLabel = newTextElement({
-    groupIds: [groupId],
-    backgroundColor,
-    ...commonProps,
-    x: x - BAR_GAP,
-    y: y - BAR_GAP,
-    text: "0",
-    textAlign: "right",
-  });
-
-  const maxYLabel = newTextElement({
-    groupIds: [groupId],
-    backgroundColor,
-    ...commonProps,
-    x: x - BAR_GAP,
-    y: y - BAR_HEIGHT - minYLabel.height / 2,
-    text: Math.max(...spreadsheet.values).toLocaleString(),
-    textAlign: "right",
-  });
-
-  return [minYLabel, maxYLabel];
-};
-
-const chartLines = (
-  spreadsheet: Spreadsheet,
-  x: number,
-  y: number,
-  groupId: string,
-  backgroundColor: string,
-): ChartElements => {
-  const { chartWidth, chartHeight } = getChartDimensions(spreadsheet);
-  const xLine = newLinearElement({
-    backgroundColor,
-    groupIds: [groupId],
-    ...commonProps,
-    type: "line",
-    x,
-    y,
-    width: chartWidth,
-    points: [pointFrom(0, 0), pointFrom(chartWidth, 0)],
-  });
-
-  const yLine = newLinearElement({
-    backgroundColor,
-    groupIds: [groupId],
-    ...commonProps,
-    type: "line",
-    x,
-    y,
-    height: chartHeight,
-    points: [pointFrom(0, 0), pointFrom(0, -chartHeight)],
-  });
-
-  const maxLine = newLinearElement({
-    backgroundColor,
-    groupIds: [groupId],
-    ...commonProps,
-    type: "line",
-    x,
-    y: y - BAR_HEIGHT - BAR_GAP,
-    strokeStyle: "dotted",
-    width: chartWidth,
-    opacity: GRID_OPACITY,
-    points: [pointFrom(0, 0), pointFrom(chartWidth, 0)],
-  });
-
-  return [xLine, yLine, maxLine];
-};
-
-// For the maths behind it https://excalidraw.com/#json=6320864370884608,O_5xfD-Agh32tytHpRJx1g
-const chartBaseElements = (
-  spreadsheet: Spreadsheet,
-  x: number,
-  y: number,
-  groupId: string,
-  backgroundColor: string,
-  debug?: boolean,
-): ChartElements => {
-  const { chartWidth, chartHeight } = getChartDimensions(spreadsheet);
-
-  const title = spreadsheet.title
-    ? newTextElement({
-        backgroundColor,
-        groupIds: [groupId],
-        ...commonProps,
-        text: spreadsheet.title,
-        x: x + chartWidth / 2,
-        y: y - BAR_HEIGHT - BAR_GAP * 2 - DEFAULT_FONT_SIZE,
-        roundness: null,
-        textAlign: "center",
-      })
-    : null;
-
-  const debugRect = debug
-    ? newElement({
-        backgroundColor,
-        groupIds: [groupId],
-        ...commonProps,
-        type: "rectangle",
-        x,
-        y: y - chartHeight,
-        width: chartWidth,
-        height: chartHeight,
-        strokeColor: COLOR_PALETTE.black,
-        fillStyle: "solid",
-        opacity: 6,
-      })
-    : null;
-
-  return [
-    ...(debugRect ? [debugRect] : []),
-    ...(title ? [title] : []),
-    ...chartXLabels(spreadsheet, x, y, groupId, backgroundColor),
-    ...chartYLabels(spreadsheet, x, y, groupId, backgroundColor),
-    ...chartLines(spreadsheet, x, y, groupId, backgroundColor),
-  ];
-};
-
-const chartTypeBar = (
-  spreadsheet: Spreadsheet,
-  x: number,
-  y: number,
-): ChartElements => {
-  const max = Math.max(...spreadsheet.values);
-  const groupId = randomId();
-  const backgroundColor = bgColors[Math.floor(Math.random() * bgColors.length)];
-
-  const bars = spreadsheet.values.map((value, index) => {
-    const barHeight = (value / max) * BAR_HEIGHT;
-    return newElement({
-      backgroundColor,
-      groupIds: [groupId],
-      ...commonProps,
-      type: "rectangle",
-      x: x + index * (BAR_WIDTH + BAR_GAP) + BAR_GAP,
-      y: y - barHeight - BAR_GAP,
-      width: BAR_WIDTH,
-      height: barHeight,
-    });
-  });
-
-  return [
-    ...bars,
-    ...chartBaseElements(
-      spreadsheet,
-      x,
-      y,
-      groupId,
-      backgroundColor,
-      isDevEnv(),
-    ),
-  ];
-};
-
-const chartTypeLine = (
-  spreadsheet: Spreadsheet,
-  x: number,
-  y: number,
-): ChartElements => {
-  const max = Math.max(...spreadsheet.values);
-  const groupId = randomId();
-  const backgroundColor = bgColors[Math.floor(Math.random() * bgColors.length)];
-
-  let index = 0;
-  const points = [];
-  for (const value of spreadsheet.values) {
-    const cx = index * (BAR_WIDTH + BAR_GAP);
-    const cy = -(value / max) * BAR_HEIGHT;
-    points.push([cx, cy]);
-    index++;
-  }
-
-  const maxX = Math.max(...points.map((element) => element[0]));
-  const maxY = Math.max(...points.map((element) => element[1]));
-  const minX = Math.min(...points.map((element) => element[0]));
-  const minY = Math.min(...points.map((element) => element[1]));
-
-  const line = newLinearElement({
-    backgroundColor,
-    groupIds: [groupId],
-    ...commonProps,
-    type: "line",
-    x: x + BAR_GAP + BAR_WIDTH / 2,
-    y: y - BAR_GAP,
-    height: maxY - minY,
-    width: maxX - minX,
-    strokeWidth: 2,
-    points: points as any,
-  });
-
-  const dots = spreadsheet.values.map((value, index) => {
-    const cx = index * (BAR_WIDTH + BAR_GAP) + BAR_GAP / 2;
-    const cy = -(value / max) * BAR_HEIGHT + BAR_GAP / 2;
-    return newElement({
-      backgroundColor,
-      groupIds: [groupId],
-      ...commonProps,
-      fillStyle: "solid",
-      strokeWidth: 2,
-      type: "ellipse",
-      x: x + cx + BAR_WIDTH / 2,
-      y: y + cy - BAR_GAP * 2,
-      width: BAR_GAP,
-      height: BAR_GAP,
-    });
-  });
-
-  const lines = spreadsheet.values.map((value, index) => {
-    const cx = index * (BAR_WIDTH + BAR_GAP) + BAR_GAP / 2;
-    const cy = (value / max) * BAR_HEIGHT + BAR_GAP / 2 + BAR_GAP;
-    return newLinearElement({
-      backgroundColor,
-      groupIds: [groupId],
-      ...commonProps,
-      type: "line",
-      x: x + cx + BAR_WIDTH / 2 + BAR_GAP / 2,
-      y: y - cy,
-      height: cy,
-      strokeStyle: "dotted",
-      opacity: GRID_OPACITY,
-      points: [pointFrom(0, 0), pointFrom(0, cy)],
-    });
-  });
-
-  return [
-    ...chartBaseElements(
-      spreadsheet,
-      x,
-      y,
-      groupId,
-      backgroundColor,
-      isDevEnv(),
-    ),
-    line,
-    ...lines,
-    ...dots,
-  ];
-};
-
-export const renderSpreadsheet = (
-  chartType: string,
-  spreadsheet: Spreadsheet,
-  x: number,
-  y: number,
-): ChartElements => {
-  if (chartType === "line") {
-    return chartTypeLine(spreadsheet, x, y);
-  }
-  return chartTypeBar(spreadsheet, x, y);
-};

packages/excalidraw/charts/charts.bar.ts

@@ -0,0 +1,103 @@
+import { isDevEnv } from "@excalidraw/common";
+
+import { newElement } from "@excalidraw/element";
+
+import { commonProps } from "./charts.constants";
+import {
+  chartBaseElements,
+  chartXLabels,
+  createSeriesLegend,
+  getBackgroundColor,
+  getCartesianChartLayout,
+  getChartDimensions,
+  getColorOffset,
+  getRotatedTextElementBottom,
+  getSeriesColors,
+} from "./charts.helpers";
+
+import type { ChartElements, Spreadsheet } from "./charts.types";
+
+export const renderBarChart = (
+  spreadsheet: Spreadsheet,
+  x: number,
+  y: number,
+  colorSeed?: number,
+): ChartElements => {
+  const series = spreadsheet.series;
+  const layout = getCartesianChartLayout("bar", series.length);
+  const max = Math.max(
+    1,
+    ...series.flatMap((seriesData) =>
+      seriesData.values.map((value) => Math.max(0, value)),
+    ),
+  );
+  const colorOffset = getColorOffset(colorSeed);
+  const backgroundColor = getBackgroundColor(colorOffset);
+  const seriesColors = getSeriesColors(series.length, colorOffset);
+  const interBarGap =
+    series.length > 1
+      ? Math.max(1, Math.floor(layout.gap / (series.length + 1)))
+      : 0;
+  const barWidth =
+    series.length > 1
+      ? Math.max(
+          2,
+          (layout.slotWidth - interBarGap * (series.length - 1)) /
+            series.length,
+        )
+      : layout.slotWidth;
+  const clusterWidth =
+    series.length * barWidth + interBarGap * (series.length - 1);
+  const clusterOffset = (layout.slotWidth - clusterWidth) / 2;
+
+  const bars = series[0].values.flatMap((_, categoryIndex) =>
+    series.map((seriesData, seriesIndex) => {
+      const value = Math.max(0, seriesData.values[categoryIndex] ?? 0);
+      const barHeight = (value / max) * layout.chartHeight;
+      const barColor =
+        series.length > 1 ? seriesColors[seriesIndex] : backgroundColor;
+      return newElement({
+        backgroundColor: barColor,
+        ...commonProps,
+        type: "rectangle",
+        fillStyle: series.length > 1 ? "solid" : commonProps.fillStyle,
+        strokeColor: series.length > 1 ? barColor : commonProps.strokeColor,
+        x:
+          x +
+          categoryIndex * (layout.slotWidth + layout.gap) +
+          layout.gap +
+          clusterOffset +
+          seriesIndex * (barWidth + interBarGap),
+        y: y - barHeight - layout.gap,
+        width: barWidth,
+        height: barHeight,
+      });
+    }),
+  );
+
+  const baseElements = chartBaseElements(
+    spreadsheet,
+    x,
+    y,
+    backgroundColor,
+    layout,
+    max,
+    isDevEnv(),
+  );
+  const xLabels = chartXLabels(spreadsheet, x, y, backgroundColor, layout);
+  const xLabelsBottomY = Math.max(
+    y + layout.gap / 2,
+    ...xLabels.map((label) => getRotatedTextElementBottom(label)),
+  );
+  const { chartWidth } = getChartDimensions(spreadsheet, layout);
+  const seriesLegend = createSeriesLegend(
+    series,
+    seriesColors,
+    x + chartWidth / 2,
+    xLabelsBottomY,
+    y + layout.gap * 5,
+    backgroundColor,
+  );
+
+  return [...baseElements, ...bars, ...seriesLegend];
+};

packages/excalidraw/charts/charts.constants.ts

@@ -0,0 +1,63 @@
+import {
+  COLOR_PALETTE,
+  DEFAULT_FONT_FAMILY,
+  DEFAULT_FONT_SIZE,
+  VERTICAL_ALIGN,
+} from "@excalidraw/common";
+
+import type { Radians } from "@excalidraw/math";
+
+export const CARTESIAN_BASE_SLOT_WIDTH = 44;
+export const CARTESIAN_BAR_SLOT_EXTRA_PER_SERIES = 22;
+export const CARTESIAN_BAR_SLOT_EXTRA_MAX = 66;
+export const CARTESIAN_LINE_SLOT_WIDTH = 48;
+export const CARTESIAN_GAP = 14;
+export const CARTESIAN_BAR_HEIGHT = 304;
+export const CARTESIAN_LINE_HEIGHT = 320;
+export const CARTESIAN_LABEL_ROTATION = 5.87 as Radians;
+export const CARTESIAN_LABEL_MIN_WIDTH = 28;
+export const CARTESIAN_LABEL_SLOT_PADDING = 4;
+export const CARTESIAN_LABEL_AXIS_CLEARANCE = 2;
+export const CARTESIAN_LABEL_MAX_WIDTH_BUFFER = 10;
+export const CARTESIAN_LABEL_ROTATED_WIDTH_BUFFER = 10;
+export const CARTESIAN_LABEL_OVERFLOW_PREFERENCE_BUFFER = 8;
+
+export const BAR_GAP = 12;
+export const BAR_HEIGHT = 256;
+export const GRID_OPACITY = 10;
+
+export const RADAR_GRID_LEVELS = 4;
+export const RADAR_LABEL_OFFSET = BAR_GAP * 2;
+export const RADAR_PADDING = BAR_GAP * 2;
+export const RADAR_SINGLE_SERIES_LOG_SCALE_THRESHOLD = 100;
+export const RADAR_AXIS_LABEL_MAX_WIDTH = 140;
+export const RADAR_AXIS_LABEL_ALIGNMENT_THRESHOLD = 0.35;
+export const RADAR_AXIS_LABEL_CLEARANCE = BAR_GAP / 2;
+export const RADAR_LEGEND_SWATCH_SIZE = 20;
+export const RADAR_LEGEND_ITEM_GAP = BAR_GAP * 2;
+export const RADAR_LEGEND_TEXT_GAP = BAR_GAP;
+
+// Put all common chart element properties here so properties dialog
+// shows stable values when selecting chart groups.
+export const commonProps = {
+  fillStyle: "hachure",
+  fontFamily: DEFAULT_FONT_FAMILY,
+  fontSize: DEFAULT_FONT_SIZE,
+  opacity: 100,
+  roughness: 1,
+  strokeColor: COLOR_PALETTE.black,
+  roundness: null,
+  strokeStyle: "solid",
+  strokeWidth: 1,
+  verticalAlign: VERTICAL_ALIGN.MIDDLE,
+  locked: false,
+} as const;
+
+export type CartesianChartType = "bar" | "line";
+
+export type CartesianChartLayout = {
+  slotWidth: number;
+  gap: number;
+  chartHeight: number;
+  xLabelMaxWidth: number;
+};

packages/excalidraw/charts/charts.helpers.ts

@@ -0,0 +1,865 @@
+import { pointFrom } from "@excalidraw/math";
+
+import {
+  COLOR_PALETTE,
+  DEFAULT_CHART_COLOR_INDEX,
+  FONT_FAMILY,
+  FONT_SIZES,
+  ROUNDNESS,
+  DEFAULT_FONT_SIZE,
+  getAllColorsSpecificShade,
+  getFontString,
+  getLineHeight,
+  ROUGHNESS,
+} from "@excalidraw/common";
+
+import {
+  getApproxMinLineWidth,
+  measureText,
+  newElement,
+  newLinearElement,
+  newTextElement,
+  wrapText,
+} from "@excalidraw/element";
+
+import type {
+  ChartType,
+  ExcalidrawTextElement,
+} from "@excalidraw/element/types";
+import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
+
+import {
+  BAR_GAP,
+  CARTESIAN_BAR_HEIGHT,
+  CARTESIAN_BASE_SLOT_WIDTH,
+  CARTESIAN_BAR_SLOT_EXTRA_MAX,
+  CARTESIAN_BAR_SLOT_EXTRA_PER_SERIES,
+  CARTESIAN_GAP,
+  CARTESIAN_LABEL_AXIS_CLEARANCE,
+  CARTESIAN_LABEL_MAX_WIDTH_BUFFER,
+  CARTESIAN_LABEL_MIN_WIDTH,
+  CARTESIAN_LABEL_OVERFLOW_PREFERENCE_BUFFER,
+  CARTESIAN_LABEL_ROTATED_WIDTH_BUFFER,
+  CARTESIAN_LABEL_ROTATION,
+  CARTESIAN_LABEL_SLOT_PADDING,
+  CARTESIAN_LINE_HEIGHT,
+  CARTESIAN_LINE_SLOT_WIDTH,
+  GRID_OPACITY,
+  RADAR_AXIS_LABEL_ALIGNMENT_THRESHOLD,
+  RADAR_AXIS_LABEL_CLEARANCE,
+  RADAR_AXIS_LABEL_MAX_WIDTH,
+  RADAR_LABEL_OFFSET,
+  RADAR_LEGEND_ITEM_GAP,
+  RADAR_LEGEND_SWATCH_SIZE,
+  RADAR_LEGEND_TEXT_GAP,
+  RADAR_PADDING,
+  RADAR_SINGLE_SERIES_LOG_SCALE_THRESHOLD,
+  BAR_HEIGHT,
+  commonProps,
+  type CartesianChartLayout,
+  type CartesianChartType,
+} from "./charts.constants";
+
+import type {
+  ChartElements,
+  Spreadsheet,
+  SpreadsheetSeries,
+} from "./charts.types";
+
+const bgColors = getAllColorsSpecificShade(DEFAULT_CHART_COLOR_INDEX);
+
+const getSpreadsheetDimensionCount = (spreadsheet: Spreadsheet) =>
+  spreadsheet.labels?.length ?? spreadsheet.series[0]?.values.length ?? 0;
+
+export const isSpreadsheetValidForChartType = (
+  spreadsheet: Spreadsheet | null,
+  chartType: ChartType,
+) => {
+  if (!spreadsheet) {
+    return false;
+  }
+
+  const dimensionCount = getSpreadsheetDimensionCount(spreadsheet);
+  if (dimensionCount < 2) {
+    return false;
+  }
+
+  if (chartType === "radar") {
+    return dimensionCount >= 3;
+  }
+
+  return true;
+};
+
+const getSeriesAwareSlotWidth = (
+  baseSlotWidth: number,
+  seriesCount: number,
+) => {
+  const extraSlotWidth =
+    seriesCount <= 1
+      ? 0
+      : Math.min(
+          CARTESIAN_BAR_SLOT_EXTRA_MAX,
+          (seriesCount - 1) * CARTESIAN_BAR_SLOT_EXTRA_PER_SERIES,
+        );
+  return baseSlotWidth + extraSlotWidth;
+};
+
+export const getCartesianChartLayout = (
+  chartType: CartesianChartType,
+  seriesCount: number,
+): CartesianChartLayout => {
+  if (chartType === "line") {
+    const slotWidth = getSeriesAwareSlotWidth(
+      CARTESIAN_LINE_SLOT_WIDTH,
+      seriesCount,
+    );
+    return {
+      slotWidth,
+      gap: CARTESIAN_GAP,
+      chartHeight: CARTESIAN_LINE_HEIGHT,
+      xLabelMaxWidth:
+        slotWidth + CARTESIAN_GAP * 3 + CARTESIAN_LABEL_MAX_WIDTH_BUFFER,
+    };
+  }
+
+  const slotWidth = getSeriesAwareSlotWidth(
+    CARTESIAN_BASE_SLOT_WIDTH,
+    seriesCount,
+  );
+  return {
+    slotWidth,
+    gap: CARTESIAN_GAP,
+    chartHeight: CARTESIAN_BAR_HEIGHT,
+    xLabelMaxWidth:
+      slotWidth + CARTESIAN_GAP * 3 + CARTESIAN_LABEL_MAX_WIDTH_BUFFER,
+  };
+};
+
+export const getChartDimensions = (
+  spreadsheet: Spreadsheet,
+  layout: CartesianChartLayout,
+) => {
+  const chartWidth =
+    (layout.slotWidth + layout.gap) * spreadsheet.series[0].values.length +
+    layout.gap;
+  const chartHeight = layout.chartHeight + layout.gap * 2;
+  return { chartWidth, chartHeight };
+};
+
+export const getRadarDimensions = () => {
+  const chartWidth = BAR_HEIGHT + RADAR_PADDING * 2;
+  const chartHeight = BAR_HEIGHT + RADAR_PADDING * 2;
+  return { chartWidth, chartHeight };
+};
+
+const getCircularDistance = (
+  firstIndex: number,
+  secondIndex: number,
+  paletteSize: number,
+) => {
+  const absoluteDistance = Math.abs(firstIndex - secondIndex);
+  return Math.min(absoluteDistance, paletteSize - absoluteDistance);
+};
+
+export const getSeriesColors = (
+  seriesCount: number,
+  colorOffset: number,
+): readonly string[] => {
+  if (seriesCount <= 0 || bgColors.length === 0) {
+    return [];
+  }
+
+  const paletteSize = bgColors.length;
+  const startIndex = ((colorOffset % paletteSize) + paletteSize) % paletteSize;
+  const selectedIndices = [startIndex];
+  const maxUniqueColors = Math.min(seriesCount, paletteSize);
+  const availableIndices = new Set(
+    Array.from({ length: paletteSize }, (_, index) => index).filter(
+      (index) => index !== startIndex,
+    ),
+  );
+
+  while (selectedIndices.length < maxUniqueColors) {
+    let bestIndex = -1;
+    let bestMinDistance = -1;
+    let bestAverageDistance = -1;
+
+    for (const candidateIndex of availableIndices) {
+      const distances = selectedIndices.map((selectedIndex) =>
+        getCircularDistance(candidateIndex, selectedIndex, paletteSize),
+      );
+      const minDistance = Math.min(...distances);
+      const averageDistance =
+        distances.reduce((total, distance) => total + distance, 0) /
+        distances.length;
+
+      if (
+        minDistance > bestMinDistance ||
+        (minDistance === bestMinDistance &&
+          averageDistance > bestAverageDistance)
+      ) {
+        bestIndex = candidateIndex;
+        bestMinDistance = minDistance;
+        bestAverageDistance = averageDistance;
+      }
+    }
+
+    selectedIndices.push(bestIndex);
+    availableIndices.delete(bestIndex);
+  }
+
+  return Array.from(
+    { length: seriesCount },
+    (_, index) => bgColors[selectedIndices[index % selectedIndices.length]],
+  );
+};
+
+export const getColorOffset = (colorSeed?: number) => {
+  if (bgColors.length === 0) {
+    return 0;
+  }
+
+  if (typeof colorSeed !== "number" || !Number.isFinite(colorSeed)) {
+    return Math.floor(Math.random() * bgColors.length);
+  }
+
+  const seedText = colorSeed.toString();
+  let hash = 0;
+  for (let index = 0; index < seedText.length; index++) {
+    hash = (hash * 31 + seedText.charCodeAt(index)) | 0;
+  }
+  return Math.abs(hash) % bgColors.length;
+};
+
+export const getBackgroundColor = (colorOffset: number) =>
+  bgColors[colorOffset];
+
+export const getRadarValueScale = (
+  series: SpreadsheetSeries[],
+  _labelsLength: number,
+) => {
+  const allValues = series.flatMap((s) =>
+    s.values.map((value) => Math.max(0, value)),
+  );
+  const positiveValues = allValues.filter((value) => value > 0);
+  const max = Math.max(1, ...allValues);
+  const minPositive =
+    positiveValues.length > 0 ? Math.min(...positiveValues) : 1;
+  const useLogScale =
+    series.length === 1 &&
+    minPositive > 0 &&
+    max / minPositive >= RADAR_SINGLE_SERIES_LOG_SCALE_THRESHOLD;
+
+  return {
+    renderSteps: false,
+    normalize: (value: number, _axisIndex: number) => {
+      const safeValue = Math.max(0, value);
+      return useLogScale
+        ? Math.log10(safeValue + 1) / Math.log10(max + 1)
+        : safeValue / max;
+    },
+  };
+};
+
+const shouldWrapRadarText = (text: string) => /\s/.test(text.trim());
+
+export const getRadarDisplayText = (
+  text: string,
+  fontString: ReturnType<typeof getFontString>,
+  maxWidth: number,
+) => {
+  return shouldWrapRadarText(text)
+    ? wrapText(text, fontString, maxWidth)
+    : text;
+};
+
+export const createRadarAxisLabels = (
+  labels: readonly string[],
+  angles: readonly number[],
+  centerX: number,
+  centerY: number,
+  radius: number,
+  backgroundColor: string,
+): {
+  axisLabels: ChartElements;
+  axisLabelTopY: number;
+  axisLabelBottomY: number;
+} => {
+  const fontFamily = FONT_FAMILY.Excalifont;
+  const fontSize = FONT_SIZES.sm;
+  const lineHeight = getLineHeight(fontFamily);
+  const fontString = getFontString({ fontFamily, fontSize });
+  const baseLabelWidth = Math.min(
+    RADAR_AXIS_LABEL_MAX_WIDTH,
+    radius * (labels.length > 8 ? 0.56 : 0.72),
+  );
+  const minLabelWidth = getApproxMinLineWidth(fontString, lineHeight);
+
+  const axisLabels = labels.map((label, index) => {
+    const angle = angles[index];
+    const longestWordWidth = Math.max(
+      0,
+      ...label
+        .trim()
+        .split(/\s+/)
+        .filter(Boolean)
+        .map((word) => measureText(word, fontString, lineHeight).width),
+    );
+    const maxLabelWidth = Math.max(
+      minLabelWidth,
+      baseLabelWidth,
+      longestWordWidth,
+    );
+    const displayLabel = getRadarDisplayText(label, fontString, maxLabelWidth);
+    const metrics = measureText(displayLabel, fontString, lineHeight);
+    const cos = Math.cos(angle);
+    const sin = Math.sin(angle);
+
+    const textAlign: "left" | "center" | "right" =
+      cos > RADAR_AXIS_LABEL_ALIGNMENT_THRESHOLD
+        ? "left"
+        : cos < -RADAR_AXIS_LABEL_ALIGNMENT_THRESHOLD
+        ? "right"
+        : "center";
+
+    // Keep labels outside the radar ring by projecting text extents
+    // onto the axis direction.
+    const centerAlignedXExtent = textAlign === "center" ? metrics.width / 2 : 0;
+    const projectedExtent =
+      Math.abs(cos) * centerAlignedXExtent +
+      Math.abs(sin) * (metrics.height / 2);
+    const radialOffset =
+      RADAR_LABEL_OFFSET + projectedExtent + RADAR_AXIS_LABEL_CLEARANCE;
+    const anchorX = centerX + cos * (radius + radialOffset);
+    const anchorY = centerY + sin * (radius + radialOffset);
+
+    const yNudge =
+      sin > RADAR_AXIS_LABEL_ALIGNMENT_THRESHOLD
+        ? BAR_GAP / 3
+        : sin < -RADAR_AXIS_LABEL_ALIGNMENT_THRESHOLD
+        ? -BAR_GAP / 3
+        : 0;
+
+    return newTextElement({
+      backgroundColor,
+      ...commonProps,
+      text: displayLabel,
+      originalText: label,
+      x: anchorX,
+      y: anchorY + yNudge,
+      fontFamily,
+      fontSize,
+      lineHeight,
+      textAlign,
+      verticalAlign: "middle",
+    });
+  });
+
+  const axisLabelTopY = Math.min(...axisLabels.map((axisLabel) => axisLabel.y));
+  const axisLabelBottomY = Math.max(
+    ...axisLabels.map((axisLabel) => axisLabel.y + axisLabel.height),
+  );
+  return { axisLabels, axisLabelTopY, axisLabelBottomY };
+};
+
+export const createSeriesLegend = (
+  series: SpreadsheetSeries[],
+  seriesColors: readonly string[],
+  centerX: number,
+  minLegendTopY: number,
+  fallbackLegendY: number,
+  backgroundColor: string,
+): ChartElements => {
+  if (series.length <= 1) {
+    return [];
+  }
+
+  const fontFamily = FONT_FAMILY["Lilita One"];
+  const fontSize = FONT_SIZES.lg;
+  const lineHeight = getLineHeight(fontFamily);
+  const fontString = getFontString({ fontFamily, fontSize });
+  const legendItems = series.map((seriesItem, index) => {
+    const label = seriesItem.title?.trim() || `Series ${index + 1}`;
+    const displayLabel = getRadarDisplayText(label, fontString, BAR_HEIGHT);
+    const metrics = measureText(displayLabel, fontString, lineHeight);
+    const itemWidth =
+      RADAR_LEGEND_SWATCH_SIZE + RADAR_LEGEND_TEXT_GAP + metrics.width;
+    return {
+      label,
+      displayLabel,
+      color: seriesColors[index],
+      width: itemWidth,
+      height: metrics.height,
+    };
+  });
+  const maxLegendHalfHeight = Math.max(
+    RADAR_LEGEND_SWATCH_SIZE / 2,
+    ...legendItems.map((item) => item.height / 2),
+  );
+  const legendY = Math.max(
+    fallbackLegendY,
+    minLegendTopY + maxLegendHalfHeight + RADAR_LABEL_OFFSET,
+  );
+
+  const pillPaddingX = RADAR_LEGEND_ITEM_GAP;
+  const pillPaddingY = RADAR_LEGEND_SWATCH_SIZE * 0.6;
+  const totalLegendWidth =
+    legendItems.reduce((total, item) => total + item.width, 0) +
+    RADAR_LEGEND_ITEM_GAP * Math.max(0, legendItems.length - 1);
+  const pillWidth = totalLegendWidth + pillPaddingX * 2;
+  const pillHeight = maxLegendHalfHeight * 2 + pillPaddingY * 2;
+
+  const legendElements: NonDeletedExcalidrawElement[] = [];
+
+  // rounded pill background
+  legendElements.push(
+    newElement({
+      ...commonProps,
+      backgroundColor: "transparent",
+      type: "rectangle",
+      fillStyle: "solid",
+      strokeColor: COLOR_PALETTE.black,
+      x: centerX - pillWidth / 2,
+      y: legendY - pillHeight / 2,
+      width: pillWidth,
+      height: pillHeight,
+      roughness: ROUGHNESS.architect,
+      roundness: { type: ROUNDNESS.PROPORTIONAL_RADIUS },
+    }),
+  );
+
+  let cursorX = centerX - totalLegendWidth / 2;
+
+  legendItems.forEach((item) => {
+    // solid filled swatch
+    legendElements.push(
+      newElement({
+        ...commonProps,
+        backgroundColor: item.color,
+        type: "rectangle",
+        x: cursorX,
+        y: legendY - RADAR_LEGEND_SWATCH_SIZE / 2,
+        width: RADAR_LEGEND_SWATCH_SIZE,
+        height: RADAR_LEGEND_SWATCH_SIZE,
+        fillStyle: "solid",
+        strokeColor: item.color,
+        roughness: ROUGHNESS.architect,
+        roundness: { type: ROUNDNESS.PROPORTIONAL_RADIUS },
+      }),
+    );
+
+    // label in default (black) color
+    legendElements.push(
+      newTextElement({
+        ...commonProps,
+        text: item.displayLabel,
+        originalText: item.label,
+        autoResize: false,
+        x: cursorX + RADAR_LEGEND_SWATCH_SIZE + RADAR_LEGEND_TEXT_GAP,
+        y: legendY,
+        fontFamily,
+        fontSize,
+        lineHeight,
+        textAlign: "left",
+        verticalAlign: "middle",
+      }),
+    );
+
+    cursorX += item.width + RADAR_LEGEND_ITEM_GAP;
+  });
+
+  return legendElements;
+};
+
+const ellipsifyTextToWidth = (
+  text: string,
+  maxWidth: number,
+  fontString: ReturnType<typeof getFontString>,
+  lineHeight: ExcalidrawTextElement["lineHeight"],
+) => {
+  if (measureText(text, fontString, lineHeight).width <= maxWidth) {
+    return text;
+  }
+
+  let end = text.length;
+  while (end > 1) {
+    const candidate = `${text.slice(0, end)}...`;
+    if (measureText(candidate, fontString, lineHeight).width <= maxWidth) {
+      return candidate;
+    }
+    end--;
+  }
+
+  return text[0] ? `${text[0]}...` : text;
+};
+
+const wrapOrEllipsifyTextToWidth = (
+  text: string,
+  maxWidth: number,
+  fontString: ReturnType<typeof getFontString>,
+  lineHeight: ExcalidrawTextElement["lineHeight"],
+) => {
+  if (measureText(text, fontString, lineHeight).width <= maxWidth) {
+    return { wrapped: false, text };
+  }
+
+  const words = text.trim().split(/\s+/).filter(Boolean);
+  if (words.length > 1) {
+    const hasLongWord = words.some((word) => {
+      return measureText(word, fontString, lineHeight).width > maxWidth;
+    });
+    if (
+      !hasLongWord &&
+      maxWidth >= getApproxMinLineWidth(fontString, lineHeight)
+    ) {
+      return { wrapped: true, text: wrapText(text, fontString, maxWidth) };
+    }
+  }
+
+  return {
+    wrapped: false,
+    text: ellipsifyTextToWidth(text, maxWidth, fontString, lineHeight),
+  };
+};
+
+const getRotatedBoundingBox = (
+  width: number,
+  height: number,
+  angle: number,
+) => {
+  const cos = Math.abs(Math.cos(angle));
+  const sin = Math.abs(Math.sin(angle));
+  return {
+    width: width * cos + height * sin,
+    height: width * sin + height * cos,
+  };
+};
+
+type CartesianAxisLabelSpec = {
+  originalText: string;
+  text: string;
+  wrapped: boolean;
+  metrics: ReturnType<typeof measureText>;
+  rotatedWidth: number;
+  rotatedHeight: number;
+};
+
+const isEllipsifiedLabel = (text: string) => text.includes("...");
+
+const getCartesianAxisLabelSpec = (
+  label: string,
+  maxLabelWidth: number,
+  maxRotatedWidth: number,
+  fontString: ReturnType<typeof getFontString>,
+  lineHeight: ExcalidrawTextElement["lineHeight"],
+): CartesianAxisLabelSpec => {
+  const minWidth = Math.max(
+    CARTESIAN_LABEL_MIN_WIDTH,
+    Math.ceil(getApproxMinLineWidth(fontString, lineHeight)),
+  );
+  const maxWidth = Math.max(minWidth, Math.floor(maxLabelWidth));
+  const candidateWidths: number[] = [];
+  for (let width = maxWidth; width >= minWidth; width -= 4) {
+    candidateWidths.push(width);
+  }
+  if (candidateWidths[candidateWidths.length - 1] !== minWidth) {
+    candidateWidths.push(minWidth);
+  }
+
+  const getRank = (spec: CartesianAxisLabelSpec) => {
+    const ellipsified = isEllipsifiedLabel(spec.text);
+    const visibleChars = spec.text
+      .replace(/\.\.\./g, "")
+      .replace(/\n/g, "").length;
+    const lineCount = spec.text.split("\n").length;
+    return {
+      ellipsified,
+      visibleChars,
+      lineCount,
+    };
+  };
+
+  const shouldPrefer = (
+    candidate: CartesianAxisLabelSpec,
+    current: CartesianAxisLabelSpec,
+  ) => {
+    const candidateRank = getRank(candidate);
+    const currentRank = getRank(current);
+    if (candidateRank.ellipsified !== currentRank.ellipsified) {
+      return !candidateRank.ellipsified;
+    }
+    if (candidateRank.visibleChars !== currentRank.visibleChars) {
+      return candidateRank.visibleChars > currentRank.visibleChars;
+    }
+    if (candidateRank.lineCount !== currentRank.lineCount) {
+      return candidateRank.lineCount < currentRank.lineCount;
+    }
+    return candidate.rotatedHeight < current.rotatedHeight;
+  };
+
+  let bestFit: CartesianAxisLabelSpec | null = null;
+  let bestOverflowAny: {
+    overflow: number;
+    spec: CartesianAxisLabelSpec;
+  } | null = null;
+  let bestOverflowNonEllipsified: {
+    overflow: number;
+    spec: CartesianAxisLabelSpec;
+  } | null = null;
+
+  for (const width of candidateWidths) {
+    const { wrapped, text } = wrapOrEllipsifyTextToWidth(
+      label,
+      width,
+      fontString,
+      lineHeight,
+    );
+    const metrics = measureText(text, fontString, lineHeight);
+    const rotated = getRotatedBoundingBox(
+      metrics.width,
+      metrics.height,
+      CARTESIAN_LABEL_ROTATION,
+    );
+    const spec = {
+      originalText: label,
+      text,
+      metrics,
+      rotatedWidth: rotated.width,
+      rotatedHeight: rotated.height,
+      wrapped,
+    };
+    const overflow = rotated.width - maxRotatedWidth;
+    if (overflow <= 0) {
+      if (!bestFit || shouldPrefer(spec, bestFit)) {
+        bestFit = spec;
+      }
+      continue;
+    }
+    if (
+      !bestOverflowAny ||
+      overflow < bestOverflowAny.overflow ||
+      (overflow === bestOverflowAny.overflow &&
+        shouldPrefer(spec, bestOverflowAny.spec))
+    ) {
+      bestOverflowAny = { overflow, spec };
+    }
+    if (
+      !isEllipsifiedLabel(spec.text) &&
+      (!bestOverflowNonEllipsified ||
+        overflow < bestOverflowNonEllipsified.overflow ||
+        (overflow === bestOverflowNonEllipsified.overflow &&
+          shouldPrefer(spec, bestOverflowNonEllipsified.spec)))
+    ) {
+      bestOverflowNonEllipsified = { overflow, spec };
+    }
+  }
+
+  if (bestFit) {
+    return bestFit;
+  }
+
+  if (
+    bestOverflowNonEllipsified &&
+    bestOverflowAny &&
+    bestOverflowNonEllipsified.overflow <=
+      bestOverflowAny.overflow + CARTESIAN_LABEL_OVERFLOW_PREFERENCE_BUFFER
+  ) {
+    return bestOverflowNonEllipsified.spec;
+  }
+
+  return bestOverflowAny!.spec;
+};
+
+export const getRotatedTextElementBottom = (
+  element: NonDeletedExcalidrawElement,
+) => {
+  if (element.type !== "text") {
+    return element.y + element.height;
+  }
+  const rotated = getRotatedBoundingBox(
+    element.width,
+    element.height,
+    element.angle,
+  );
+  return element.y + element.height / 2 + rotated.height / 2;
+};
+
+export const chartXLabels = (
+  spreadsheet: Spreadsheet,
+  x: number,
+  y: number,
+  backgroundColor: string,
+  layout: CartesianChartLayout,
+): ChartElements => {
+  const fontFamily = commonProps.fontFamily;
+  const fontSize = FONT_SIZES.sm;
+  const lineHeight = getLineHeight(fontFamily);
+  const fontString = getFontString({ fontFamily, fontSize });
+  const maxRotatedWidth = Math.max(
+    1,
+    layout.slotWidth +
+      layout.gap -
+      CARTESIAN_LABEL_SLOT_PADDING * 2 +
+      CARTESIAN_LABEL_ROTATED_WIDTH_BUFFER,
+  );
+  const axisY = y;
+
+  return (
+    spreadsheet.labels?.map((label, index) => {
+      const labelSpec = getCartesianAxisLabelSpec(
+        label,
+        layout.xLabelMaxWidth,
+        maxRotatedWidth,
+        fontString,
+        lineHeight,
+      );
+      const centerX =
+        x +
+        index * (layout.slotWidth + layout.gap) +
+        layout.gap +
+        layout.slotWidth / 2;
+      const labelY =
+        axisY +
+        CARTESIAN_LABEL_AXIS_CLEARANCE +
+        (labelSpec.rotatedHeight - labelSpec.metrics.height) / 2;
+
+      return newTextElement({
+        backgroundColor,
+        ...commonProps,
+        text: labelSpec.text,
+        originalText: labelSpec.wrapped ? label : labelSpec.text,
+        autoResize: !labelSpec.wrapped,
+        x: centerX,
+        y: labelY,
+        angle: CARTESIAN_LABEL_ROTATION,
+        fontSize,
+        lineHeight,
+        textAlign: "center",
+        verticalAlign: "top",
+      });
+    }) || []
+  );
+};
+
+const chartYLabels = (
+  spreadsheet: Spreadsheet,
+  x: number,
+  y: number,
+  backgroundColor: string,
+  layout: CartesianChartLayout,
+  maxValue = Math.max(...spreadsheet.series[0].values),
+): ChartElements => {
+  const minYLabel = newTextElement({
+    backgroundColor,
+    ...commonProps,
+    x: x - layout.gap,
+    y: y - layout.gap,
+    text: "0",
+    textAlign: "right",
+  });
+
+  const maxYLabel = newTextElement({
+    backgroundColor,
+    ...commonProps,
+    x: x - layout.gap,
+    y: y - layout.chartHeight - minYLabel.height / 2,
+    text: maxValue.toLocaleString(),
+    textAlign: "right",
+  });
+
+  return [minYLabel, maxYLabel];
+};
+
+const chartLines = (
+  spreadsheet: Spreadsheet,
+  x: number,
+  y: number,
+  backgroundColor: string,
+  layout: CartesianChartLayout,
+): ChartElements => {
+  const { chartWidth, chartHeight } = getChartDimensions(spreadsheet, layout);
+  const xLine = newLinearElement({
+    backgroundColor,
+    ...commonProps,
+    type: "line",
+    x,
+    y,
+    width: chartWidth,
+    points: [pointFrom(0, 0), pointFrom(chartWidth, 0)],
+  });
+
+  const yLine = newLinearElement({
+    backgroundColor,
+    ...commonProps,
+    type: "line",
+    x,
+    y,
+    height: chartHeight,
+    points: [pointFrom(0, 0), pointFrom(0, -chartHeight)],
+  });
+
+  const maxLine = newLinearElement({
+    backgroundColor,
+    ...commonProps,
+    type: "line",
+    x,
+    y: y - layout.chartHeight - layout.gap,
+    strokeStyle: "dotted",
+    width: chartWidth,
+    opacity: GRID_OPACITY,
+    points: [pointFrom(0, 0), pointFrom(chartWidth, 0)],
+  });
+
+  return [xLine, yLine, maxLine];
+};
+
+// For the maths behind it https://excalidraw.com/#json=6320864370884608,O_5xfD-Agh32tytHpRJx1g
+export const chartBaseElements = (
+  spreadsheet: Spreadsheet,
+  x: number,
+  y: number,
+  backgroundColor: string,
+  layout: CartesianChartLayout,
+  maxValue = Math.max(...spreadsheet.series[0].values),
+  debug?: boolean,
+): ChartElements => {
+  const { chartWidth, chartHeight } = getChartDimensions(spreadsheet, layout);
+
+  const title = spreadsheet.title
+    ? newTextElement({
+        backgroundColor,
+        ...commonProps,
+        text: spreadsheet.title,
+        x: x + chartWidth / 2,
+        y: y - layout.chartHeight - layout.gap * 2 - DEFAULT_FONT_SIZE,
+        roundness: null,
+        textAlign: "center",
+        fontSize: FONT_SIZES.xl,
+        fontFamily: FONT_FAMILY["Lilita One"],
+      })
+    : null;
+
+  const debugRect = debug
+    ? newElement({
+        backgroundColor,
+        ...commonProps,
+        type: "rectangle",
+        x,
+        y: y - chartHeight,
+        width: chartWidth,
+        height: chartHeight,
+        strokeColor: COLOR_PALETTE.black,
+        fillStyle: "solid",
+        opacity: 6,
+      })
+    : null;
+
+  return [
+    ...(debugRect ? [debugRect] : []),
+    ...(title ? [title] : []),
+    ...chartXLabels(spreadsheet, x, y, backgroundColor, layout),
+    ...chartYLabels(spreadsheet, x, y, backgroundColor, layout, maxValue),
+    ...chartLines(spreadsheet, x, y, backgroundColor, layout),
+  ];
+};

packages/excalidraw/charts/charts.line.ts

@@ -0,0 +1,130 @@
+import { pointFrom } from "@excalidraw/math";
+
+import { isDevEnv } from "@excalidraw/common";
+
+import { newElement, newLinearElement } from "@excalidraw/element";
+
+import type { LocalPoint } from "@excalidraw/math";
+
+import { GRID_OPACITY, commonProps } from "./charts.constants";
+import {
+  chartBaseElements,
+  chartXLabels,
+  createSeriesLegend,
+  getBackgroundColor,
+  getCartesianChartLayout,
+  getChartDimensions,
+  getColorOffset,
+  getRotatedTextElementBottom,
+  getSeriesColors,
+} from "./charts.helpers";
+
+import type { ChartElements, Spreadsheet } from "./charts.types";
+
+export const renderLineChart = (
+  spreadsheet: Spreadsheet,
+  x: number,
+  y: number,
+  colorSeed?: number,
+): ChartElements => {
+  const series = spreadsheet.series;
+  const layout = getCartesianChartLayout("line", series.length);
+  const max = Math.max(1, ...series.flatMap((seriesData) => seriesData.values));
+  const colorOffset = getColorOffset(colorSeed);
+  const backgroundColor = getBackgroundColor(colorOffset);
+  const seriesColors = getSeriesColors(series.length, colorOffset);
+
+  const lines = series.map((seriesData, seriesIndex) => {
+    const points = seriesData.values.map((value, valueIndex) =>
+      pointFrom<LocalPoint>(
+        valueIndex * (layout.slotWidth + layout.gap),
+        -(value / max) * layout.chartHeight,
+      ),
+    );
+
+    const maxX = Math.max(...points.map((point) => point[0]));
+    const maxY = Math.max(...points.map((point) => point[1]));
+    const minX = Math.min(...points.map((point) => point[0]));
+    const minY = Math.min(...points.map((point) => point[1]));
+
+    return newLinearElement({
+      backgroundColor: "transparent",
+      ...commonProps,
+      type: "line",
+      x: x + layout.gap + layout.slotWidth / 2,
+      y: y - layout.gap,
+      height: maxY - minY,
+      width: maxX - minX,
+      strokeColor: seriesColors[seriesIndex],
+      strokeWidth: 2,
+      points,
+    });
+  });
+
+  const dots = series.flatMap((seriesData, seriesIndex) =>
+    seriesData.values.map((value, valueIndex) => {
+      const cx = valueIndex * (layout.slotWidth + layout.gap) + layout.gap / 2;
+      const cy = -(value / max) * layout.chartHeight + layout.gap / 2;
+      return newElement({
+        backgroundColor: seriesColors[seriesIndex],
+        ...commonProps,
+        fillStyle: "solid",
+        strokeColor: seriesColors[seriesIndex],
+        strokeWidth: 2,
+        type: "ellipse",
+        x: x + cx + layout.slotWidth / 2,
+        y: y + cy - layout.gap * 2,
+        width: layout.gap,
+        height: layout.gap,
+      });
+    }),
+  );
+
+  const guideValues = series[0].values.map((_, valueIndex) =>
+    Math.max(
+      0,
+      ...series.map((seriesData) => seriesData.values[valueIndex] ?? 0),
+    ),
+  );
+  const guides = guideValues.map((value, valueIndex) => {
+    const cx = valueIndex * (layout.slotWidth + layout.gap) + layout.gap / 2;
+    const cy = (value / max) * layout.chartHeight + layout.gap / 2 + layout.gap;
+    return newLinearElement({
+      backgroundColor,
+      ...commonProps,
+      type: "line",
+      x: x + cx + layout.slotWidth / 2 + layout.gap / 2,
+      y: y - cy,
+      height: cy,
+      strokeStyle: "dotted",
+      opacity: GRID_OPACITY,
+      points: [pointFrom(0, 0), pointFrom(0, cy)],
+    });
+  });
+
+  const baseElements = chartBaseElements(
+    spreadsheet,
+    x,
+    y,
+    backgroundColor,
+    layout,
+    max,
+    isDevEnv(),
+  );
+  const xLabels = chartXLabels(spreadsheet, x, y, backgroundColor, layout);
+  const xLabelsBottomY = Math.max(
+    y + layout.gap / 2,
+    ...xLabels.map((label) => getRotatedTextElementBottom(label)),
+  );
+  const { chartWidth } = getChartDimensions(spreadsheet, layout);
+  const seriesLegend = createSeriesLegend(
+    series,
+    seriesColors,
+    x + chartWidth / 2,
+    xLabelsBottomY,
+    y + layout.gap * 5,
+    backgroundColor,
+  );
+
+  return [...baseElements, ...lines, ...guides, ...dots, ...seriesLegend];
+};

packages/excalidraw/charts/charts.parse.ts

@@ -0,0 +1,174 @@
+import { type ParseSpreadsheetResult } from "./charts.types";
+
+/**
+ * @private exported for testing
+ */
+export const tryParseNumber = (s: string): number | null => {
+  const match =
+    /^([-+]?)[$\u20AC\u00A3\u00A5\u20A9]?([-+]?)([\d.,]+)[%]?$/.exec(s);
+  if (!match) {
+    return null;
+  }
+  return parseFloat(`${(match[1] || match[2]) + match[3]}`.replace(/,/g, ""));
+};
+
+const isNumericColumn = (lines: string[][], columnIndex: number) =>
+  lines.slice(1).every((line) => tryParseNumber(line[columnIndex]) !== null);
+
+/**
+ * @private exported for testing
+ */
+export const tryParseCells = (cells: string[][]): ParseSpreadsheetResult => {
+  const numCols = cells[0].length;
+
+  if (numCols > 2) {
+    const hasHeader = cells[0].every((cell) => tryParseNumber(cell) === null);
+    const rows = hasHeader ? cells.slice(1) : cells;
+
+    if (rows.length < 1) {
+      return { ok: false, reason: "No data rows" };
+    }
+
+    const invalidNumericColumn = rows.some((row) =>
+      row.slice(1).some((value) => tryParseNumber(value) === null),
+    );
+    if (invalidNumericColumn) {
+      return { ok: false, reason: "Value is not numeric" };
+    }
+
+    // When there are more value columns than data rows, the data is in
+    // "wide" format — transpose so columns become labels (dimensions)
+    // and rows become series. This enables e.g. radar charts for wide data.
+    const numValueCols = numCols - 1;
+    if (numValueCols > rows.length) {
+      const labels = hasHeader ? cells[0].slice(1).map((h) => h.trim()) : null;
+      const series = rows.map((row) => ({
+        title: row[0]?.trim() || null,
+        values: row.slice(1).map((v) => tryParseNumber(v)!),
+      }));
+      const title =
+        series.length === 1
+          ? series[0].title
+          : hasHeader
+          ? cells[0][0].trim() || null
+          : null;
+      return {
+        ok: true,
+        data: { title, labels, series },
+      };
+    }
+
+    const series = cells[0].slice(1).map((seriesTitle, index) => {
+      const valueColumnIndex = index + 1;
+      const fallbackTitle = `Series ${valueColumnIndex}`;
+      return {
+        title: hasHeader ? seriesTitle.trim() || fallbackTitle : fallbackTitle,
+        values: rows.map((row) => tryParseNumber(row[valueColumnIndex])!),
+      };
+    });
+
+    return {
+      ok: true,
+      data: {
+        title: hasHeader ? cells[0][0].trim() || null : null,
+        labels: rows.map((row) => row[0]),
+        series,
+      },
+    };
+  }
+
+  if (numCols === 1) {
+    if (!isNumericColumn(cells, 0)) {
+      return { ok: false, reason: "Value is not numeric" };
+    }
+
+    const hasHeader = tryParseNumber(cells[0][0]) === null;
+    const title = hasHeader ? cells[0][0] : null;
+    const values = (hasHeader ? cells.slice(1) : cells).map((line) =>
+      tryParseNumber(line[0]),
+    );
+
+    if (values.length < 2) {
+      return { ok: false, reason: "Less than two rows" };
+    }
+
+    return {
+      ok: true,
+      data: {
+        title,
+        labels: null,
+        series: [{ title, values: values as number[] }],
+      },
+    };
+  }
+
+  const hasHeader = tryParseNumber(cells[0][1]) === null;
+  const rows = hasHeader ? cells.slice(1) : cells;
+
+  if (rows.length < 2) {
+    return { ok: false, reason: "Less than 2 rows" };
+  }
+
+  const invalidNumericColumn = rows.some(
+    (row) => tryParseNumber(row[1]) === null,
+  );
+  if (invalidNumericColumn) {
+    return { ok: false, reason: "Value is not numeric" };
+  }
+
+  const title = hasHeader ? cells[0][1] : null;
+
+  return {
+    ok: true,
+    data: {
+      title,
+      labels: rows.map((row) => row[0]),
+      series: [{ title, values: rows.map((row) => tryParseNumber(row[1])!) }],
+    },
+  };
+};
+
+export const tryParseSpreadsheet = (text: string): ParseSpreadsheetResult => {
+  // Copy/paste from excel, spreadsheets, TSV, CSV, semicolon-separated.
+  const parseDelimitedLines = (delimiter: "\t" | "," | ";") =>
+    text
+      .replace(/\r\n?/g, "\n")
+      .split("\n")
+      .filter((line) => line.trim().length > 0)
+      .map((line) => line.split(delimiter).map((cell) => cell.trim()));
+
+  // Score each delimiter: prefer consistent column counts with the most columns.
+  // A delimiter that produces all single-column rows likely isn't the right one.
+  const candidates = (["\t", ",", ";"] as const).map((delimiter) => {
+    const parsed = parseDelimitedLines(delimiter);
+    const numCols = parsed[0]?.length ?? 0;
+    const isConsistent =
+      parsed.length > 0 && parsed.every((line) => line.length === numCols);
+    return { delimiter, parsed, numCols, isConsistent };
+  });
+
+  // Prefer: consistent + most columns. Among ties, tab > comma > semicolon
+  // (the array order already encodes this priority).
+  const best =
+    candidates.find((c) => c.isConsistent && c.numCols > 1) ??
+    candidates.find((c) => c.isConsistent) ??
+    candidates[0];
+
+  const lines = best.parsed;
+
+  if (lines.length === 0) {
+    return { ok: false, reason: "No values" };
+  }
+
+  const numColsFirstLine = lines[0].length;
+  const isSpreadsheet = lines.every((line) => line.length === numColsFirstLine);
+
+  if (!isSpreadsheet) {
+    return {
+      ok: false,
+      reason: "All rows don't have same number of columns",
+    };
+  }
+
+  return tryParseCells(lines);
+};

packages/excalidraw/charts/charts.radar.ts

@@ -0,0 +1,199 @@
+import { pointFrom } from "@excalidraw/math";
+
+import {
+  FONT_FAMILY,
+  FONT_SIZES,
+  getFontString,
+  getLineHeight,
+  ROUGHNESS,
+} from "@excalidraw/common";
+
+import {
+  measureText,
+  newLinearElement,
+  newTextElement,
+} from "@excalidraw/element";
+
+import type { LocalPoint } from "@excalidraw/math";
+
+import {
+  BAR_GAP,
+  BAR_HEIGHT,
+  GRID_OPACITY,
+  RADAR_GRID_LEVELS,
+  RADAR_LABEL_OFFSET,
+  commonProps,
+} from "./charts.constants";
+import {
+  createRadarAxisLabels,
+  createSeriesLegend,
+  getBackgroundColor,
+  getColorOffset,
+  getRadarDimensions,
+  getRadarDisplayText,
+  getRadarValueScale,
+  getSeriesColors,
+  isSpreadsheetValidForChartType,
+} from "./charts.helpers";
+
+import type { ChartElements, Spreadsheet } from "./charts.types";
+
+export const renderRadarChart = (
+  spreadsheet: Spreadsheet,
+  x: number,
+  y: number,
+  colorSeed?: number,
+): ChartElements | null => {
+  if (!isSpreadsheetValidForChartType(spreadsheet, "radar")) {
+    return null;
+  }
+
+  const labels =
+    spreadsheet.labels ??
+    spreadsheet.series[0].values.map((_, index) => `Value ${index + 1}`);
+
+  const series = spreadsheet.series;
+  const { normalize, renderSteps } = getRadarValueScale(series, labels.length);
+  const colorOffset = getColorOffset(colorSeed);
+  const backgroundColor = getBackgroundColor(colorOffset);
+  const seriesColors = getSeriesColors(series.length, colorOffset);
+  const { chartWidth, chartHeight } = getRadarDimensions();
+  const centerX = x + chartWidth / 2;
+  const centerY = y - chartHeight / 2;
+  const radius = BAR_HEIGHT / 2;
+  const angles = labels.map(
+    (_, index) => -Math.PI / 2 + (Math.PI * 2 * index) / labels.length,
+  );
+
+  const { axisLabels, axisLabelTopY, axisLabelBottomY } = createRadarAxisLabels(
+    labels,
+    angles,
+    centerX,
+    centerY,
+    radius,
+    backgroundColor,
+  );
+
+  const titleFontFamily = FONT_FAMILY["Lilita One"];
+  const titleFontSize = FONT_SIZES.xl;
+  const titleLineHeight = getLineHeight(titleFontFamily);
+  const titleFontString = getFontString({
+    fontFamily: titleFontFamily,
+    fontSize: titleFontSize,
+  });
+  const titleText = spreadsheet.title
+    ? getRadarDisplayText(
+        spreadsheet.title,
+        titleFontString,
+        chartWidth + RADAR_LABEL_OFFSET * 2,
+      )
+    : null;
+  const titleTextMetrics = titleText
+    ? measureText(titleText, titleFontString, titleLineHeight)
+    : null;
+  const title = titleText
+    ? newTextElement({
+        backgroundColor,
+        ...commonProps,
+        text: titleText,
+        originalText: spreadsheet.title ?? titleText,
+        x: x + chartWidth / 2,
+        y: axisLabelTopY - RADAR_LABEL_OFFSET - titleTextMetrics!.height / 2,
+        fontFamily: titleFontFamily,
+        fontSize: titleFontSize,
+        lineHeight: titleLineHeight,
+        textAlign: "center",
+      })
+    : null;
+
+  const radarGridLines = renderSteps
+    ? Array.from({ length: RADAR_GRID_LEVELS }, (_, levelIndex) => {
+        const levelRatio = (levelIndex + 1) / RADAR_GRID_LEVELS;
+        const levelRadius = radius * levelRatio;
+        const points = angles.map((angle) =>
+          pointFrom<LocalPoint>(
+            Math.cos(angle) * levelRadius,
+            Math.sin(angle) * levelRadius,
+          ),
+        );
+        points.push(pointFrom(points[0][0], points[0][1]));
+
+        return newLinearElement({
+          backgroundColor: "transparent",
+          ...commonProps,
+          type: "line",
+          x: centerX,
+          y: centerY,
+          width: levelRadius * 2,
+          height: levelRadius * 2,
+          strokeStyle: "solid",
+          roughness: ROUGHNESS.architect,
+          opacity: GRID_OPACITY,
+          polygon: true,
+          points,
+        });
+      })
+    : [];
+
+  const spokes = angles.map((angle) => {
+    const px = Math.cos(angle) * radius;
+    const py = Math.sin(angle) * radius;
+    return newLinearElement({
+      backgroundColor: "transparent",
+      ...commonProps,
+      type: "line",
+      x: centerX,
+      y: centerY,
+      width: Math.abs(px),
+      height: Math.abs(py),
+      strokeStyle: "solid",
+      roughness: ROUGHNESS.architect,
+      opacity: GRID_OPACITY,
+      points: [pointFrom(0, 0), pointFrom(px, py)],
+    });
+  });
+
+  const seriesPolygons = series.map((seriesData, index) => {
+    const points = angles.map((angle, axisIndex) => {
+      const value = seriesData.values[axisIndex] ?? 0;
+      const pointRadius = normalize(value, axisIndex) * radius;
+      return pointFrom<LocalPoint>(
+        Math.cos(angle) * pointRadius,
+        Math.sin(angle) * pointRadius,
+      );
+    });
+    points.push(pointFrom(points[0][0], points[0][1]));
+
+    return newLinearElement({
+      backgroundColor: "transparent",
+      ...commonProps,
+      type: "line",
+      x: centerX,
+      y: centerY,
+      width: radius * 2,
+      height: radius * 2,
+      strokeColor: seriesColors[index],
+      strokeWidth: 2,
+      polygon: true,
+      points,
+    });
+  });
+
+  const seriesLegend = createSeriesLegend(
+    series,
+    seriesColors,
+    centerX,
+    axisLabelBottomY,
+    y + BAR_GAP * 5,
+    backgroundColor,
+  );
+
+  return [
+    ...(title ? [title] : []),
+    ...axisLabels,
+    ...radarGridLines,
+    ...spokes,
+    ...seriesPolygons,
+    ...seriesLegend,
+  ];
+};

packages/excalidraw/charts/charts.types.ts

@@ -0,0 +1,18 @@
+import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
+
+export type ChartElements = readonly NonDeletedExcalidrawElement[];
+
+export interface Spreadsheet {
+  title: string | null;
+  labels: string[] | null;
+  series: SpreadsheetSeries[];
+}
+
+export interface SpreadsheetSeries {
+  title: string | null;
+  values: number[];
+}
+
+export type ParseSpreadsheetResult =
+  | { ok: false; reason: string }
+  | { ok: true; data: Spreadsheet };

packages/excalidraw/charts/index.ts

@@ -0,0 +1,38 @@
+import type { ChartType } from "@excalidraw/element/types";
+
+import { renderBarChart } from "./charts.bar";
+import { renderLineChart } from "./charts.line";
+import {
+  tryParseCells,
+  tryParseNumber,
+  tryParseSpreadsheet,
+} from "./charts.parse";
+import { renderRadarChart } from "./charts.radar";
+
+import type { ChartElements, Spreadsheet } from "./charts.types";
+
+export {
+  type ParseSpreadsheetResult,
+  type Spreadsheet,
+  type SpreadsheetSeries,
+  type ChartElements,
+} from "./charts.types";
+
+export { isSpreadsheetValidForChartType } from "./charts.helpers";
+export { tryParseCells, tryParseNumber, tryParseSpreadsheet };
+
+export const renderSpreadsheet = (
+  chartType: ChartType,
+  spreadsheet: Spreadsheet,
+  x: number,
+  y: number,
+  colorSeed?: number,
+): ChartElements | null => {
+  if (chartType === "line") {
+    return renderLineChart(spreadsheet, x, y, colorSeed);
+  }
+  if (chartType === "radar") {
+    return renderRadarChart(spreadsheet, x, y, colorSeed);
+  }
+  return renderBarChart(spreadsheet, x, y, colorSeed);
+};

packages/excalidraw/clipboard.test.ts

@@ -155,67 +155,4 @@ describe("parseClipboard()", () => {
       },
     ]);
   });
-
-  it("should parse spreadsheet from either text/plain and text/html", async () => {
-    let clipboardData;
-    // -------------------------------------------------------------------------
-    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/plain": `a	b
-            1	2
-            4	5
-            7	10`,
-          },
-        }),
-      ),
-    );
-    expect(clipboardData.spreadsheet).toEqual({
-      title: "b",
-      labels: ["1", "4", "7"],
-      values: [2, 5, 10],
-    });
-    // -------------------------------------------------------------------------
-    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/html": `a	b
-            1	2
-            4	5
-            7	10`,
-          },
-        }),
-      ),
-    );
-    expect(clipboardData.spreadsheet).toEqual({
-      title: "b",
-      labels: ["1", "4", "7"],
-      values: [2, 5, 10],
-    });
-    // -------------------------------------------------------------------------
-    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/html": `<html>
-            <body>
-            <!--StartFragment--><google-sheets-html-origin><style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style><table xmlns="http://www.w3.org/1999/xhtml" cellspacing="0" cellpadding="0" dir="ltr" border="1" style="table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none"><colgroup><col width="100"/><col width="100"/></colgroup><tbody><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;a&quot;}">a</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;b&quot;}">b</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:1}">1</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:2}">2</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:4}">4</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:5}">5</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:7}">7</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:10}">10</td></tr></tbody></table><!--EndFragment-->
-            </body>
-            </html>`,
-            "text/plain": `a	b
-            1	2
-            4	5
-            7	10`,
-          },
-        }),
-      ),
-    );
-    expect(clipboardData.spreadsheet).toEqual({
-      title: "b",
-      labels: ["1", "4", "7"],
-      values: [2, 5, 10],
-    });
-  });
 });

packages/excalidraw/clipboard.ts

@@ -33,12 +33,6 @@ import {
   normalizeFile,
 } from "./data/blob";
 
-import { tryParseSpreadsheet, VALID_SPREADSHEET } from "./charts";
-
-import type { FileSystemHandle } from "./data/filesystem";
-
-import type { Spreadsheet } from "./charts";
-
 import type { BinaryFiles } from "./types";
 
 type ElementsClipboard = {
@@ -50,7 +44,6 @@ type ElementsClipboard = {
 export type PastedMixedContent = { type: "text" | "imageUrl"; value: string }[];
 
 export interface ClipboardData {
-  spreadsheet?: Spreadsheet;
   elements?: readonly ExcalidrawElement[];
   files?: BinaryFiles;
   text?: string;
@@ -204,22 +197,17 @@ export const copyToClipboard = async (
   /** supply if available to make the operation more certain to succeed */
   clipboardEvent?: ClipboardEvent | null,
 ) => {
+  const json = serializeAsClipboardJSON({ elements, files });
+
   await copyTextToSystemClipboard(
-    serializeAsClipboardJSON({ elements, files }),
+    {
+      [MIME_TYPES.excalidrawClipboard]: json,
+      [MIME_TYPES.text]: json,
+    },
     clipboardEvent,
   );
 };
 
-const parsePotentialSpreadsheet = (
-  text: string,
-): { spreadsheet: Spreadsheet } | { errorMessage: string } | null => {
-  const result = tryParseSpreadsheet(text);
-  if (result.type === VALID_SPREADSHEET) {
-    return { spreadsheet: result.spreadsheet };
-  }
-  return null;
-};
-
 /** internal, specific to parsing paste events. Do not reuse. */
 function parseHTMLTree(el: ChildNode) {
   let result: PastedMixedContent = [];
@@ -379,7 +367,7 @@ type AllowedParsedDataTransferItem =
       type: ValueOf<typeof IMAGE_MIME_TYPES>;
       kind: "file";
       file: File;
-      fileHandle: FileSystemHandle | null;
+      fileHandle: FileSystemFileHandle | null;
     }
   | { type: ValueOf<typeof STRING_MIME_TYPES>; kind: "string"; value: string };
 
@@ -388,7 +376,7 @@ type ParsedDataTransferItem =
       type: string;
       kind: "file";
       file: File;
-      fileHandle: FileSystemHandle | null;
+      fileHandle: FileSystemFileHandle | null;
     }
   | { type: string; kind: "string"; value: string };
 
@@ -401,7 +389,7 @@ export type ParsedDataTransferFile = Extract<
   { kind: "file" }
 >;
 
-type ParsedDataTranferList = ParsedDataTransferItem[] & {
+export type ParsedDataTranferList = ParsedDataTransferItem[] & {
   /**
    * Only allows filtering by known `string` data types, since `file`
    * types can have multiple items of the same type (e.g. multiple image files)
@@ -452,6 +440,29 @@ const getDataTransferFiles = function (
   );
 };
 
+/** @returns list of MIME types, synchronously */
+export const parseDataTransferEventMimeTypes = (
+  event: ClipboardEvent | DragEvent | React.DragEvent<HTMLDivElement>,
+): Set<string> => {
+  let items: DataTransferItemList | undefined = undefined;
+
+  if (isClipboardEvent(event)) {
+    items = event.clipboardData?.items;
+  } else {
+    items = event.dataTransfer?.items;
+  }
+
+  const types: Set<string> = new Set();
+
+  for (const item of Array.from(items || [])) {
+    if (!types.has(item.type)) {
+      types.add(item.type);
+    }
+  }
+
+  return types;
+};
+
 export const parseDataTransferEvent = async (
   event: ClipboardEvent | DragEvent | React.DragEvent<HTMLDivElement>,
 ): Promise<ParsedDataTranferList> => {
@@ -460,8 +471,7 @@ export const parseDataTransferEvent = async (
   if (isClipboardEvent(event)) {
     items = event.clipboardData?.items;
   } else {
-    const dragEvent = event;
+    items = event.dataTransfer?.items;
-    items = dragEvent.dataTransfer?.items;
   }
 
   const dataItems = (
@@ -524,19 +534,6 @@ export const parseClipboard = async (
     };
   }
 
-  try {
-    // if system clipboard contains spreadsheet, use it even though it's
-    // technically possible it's staler than in-app clipboard
-    const spreadsheetResult =
-      !isPlainPaste && parsePotentialSpreadsheet(parsedEventData.value);
-
-    if (spreadsheetResult) {
-      return spreadsheetResult;
-    }
-  } catch (error: any) {
-    console.error(error);
-  }
-
   try {
     const systemClipboardData = JSON.parse(parsedEventData.value);
     const programmaticAPI =
@@ -567,7 +564,7 @@ export const copyBlobToClipboardAsPng = async (blob: Blob | Promise<Blob>) => {
     // ClipboardItem constructor, but throws on an unrelated MIME type error.
     // So we need to await this and fallback to awaiting the blob if applicable.
     await navigator.clipboard.write([
-      new window.ClipboardItem({
+      new ClipboardItem({
         [MIME_TYPES.png]: blob,
       }),
     ]);
@@ -576,7 +573,7 @@ export const copyBlobToClipboardAsPng = async (blob: Blob | Promise<Blob>) => {
     // with resolution value instead
     if (isPromiseLike(blob)) {
       await navigator.clipboard.write([
-        new window.ClipboardItem({
+        new ClipboardItem({
           [MIME_TYPES.png]: await blob,
         }),
       ]);
@@ -586,28 +583,27 @@ export const copyBlobToClipboardAsPng = async (blob: Blob | Promise<Blob>) => {
   }
 };
 
-export const copyTextToSystemClipboard = async (
+export const copyTextToSystemClipboard = async <
-  text: string | null,
+  MimeType extends ValueOf<typeof STRING_MIME_TYPES>,
+>(
+  text: string | { [K in MimeType]: string } | null,
   clipboardEvent?: ClipboardEvent | null,
 ) => {
-  // (1) first try using Async Clipboard API
+  text = text || "";
-  if (probablySupportsClipboardWriteText) {
-    try {
-      // NOTE: doesn't work on FF on non-HTTPS domains, or when document
-      // not focused
-      await navigator.clipboard.writeText(text || "");
-      return;
-    } catch (error: any) {
-      console.error(error);
-    }
-  }
 
-  // (2) if fails and we have access to ClipboardEvent, use plain old setData()
+  const entries = Object.entries(
+    typeof text === "string" ? { [MIME_TYPES.text]: text } : text,
+  );
+
+  // (1) if we have clipboardEvent, try using it first as it's the most
+  // versatile
   try {
     if (clipboardEvent) {
-      clipboardEvent.clipboardData?.setData(MIME_TYPES.text, text || "");
+      for (const [mimeType, value] of entries) {
-      if (clipboardEvent.clipboardData?.getData(MIME_TYPES.text) !== text) {
+        clipboardEvent.clipboardData?.setData(mimeType, value);
-        throw new Error("Failed to setData on clipboardEvent");
+        if (clipboardEvent.clipboardData?.getData(mimeType) !== value) {
+          throw new Error("Failed to setData on clipboardEvent");
+        }
       }
       return;
     }
@@ -615,8 +611,26 @@ export const copyTextToSystemClipboard = async (
     console.error(error);
   }
 
-  // (3) if that fails, use document.execCommand
+  const plainTextEntry = entries.find(
-  if (!copyTextViaExecCommand(text)) {
+    ([mimeType]) => mimeType === MIME_TYPES.text,
+  );
+
+  // (2) if we don't have access to clipboardEvent, or that fails,
+  // at least try setting text/plain via navigator.clipboard.writeText
+  // (navigator.clipboard.write doesn't work with non-standard mime types)
+  if (probablySupportsClipboardWriteText && plainTextEntry) {
+    try {
+      // NOTE: doesn't work on FF on non-HTTPS domains, or when document
+      // not focused
+      await navigator.clipboard.writeText(plainTextEntry[1]);
+      return;
+    } catch (error: any) {
+      console.error(error);
+    }
+  }
+
+  // (3) if previous fails, use document.execCommand
+  if (plainTextEntry && !copyTextViaExecCommand(plainTextEntry[1])) {
     throw new Error("Error copying to clipboard.");
   }
 };

packages/excalidraw/components/Actions.tsx

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 import { useRef, useState } from "react";
-import * as Popover from "@radix-ui/react-popover";
+import { Popover } from "radix-ui";
 
 import {
   CLASSES,
@@ -226,7 +226,7 @@ export const SelectedShapeActions = ({
       {(appState.activeTool.type === "text" ||
         targetElements.some(isTextElement)) && (
         <>
-          {renderAction("changeFontFamily")}
+          <fieldset>{renderAction("changeFontFamily")}</fieldset>
           {renderAction("changeFontSize")}
           {(appState.activeTool.type === "text" ||
             suppportsHorizontalAlign(targetElements, elementsMap)) &&
@@ -1081,8 +1081,9 @@ export const ShapesSwitcher = ({
   return (
     <>
       {getToolbarTools(app).map(
-        ({ value, icon, key, numericKey, fillable }, index) => {
+        ({ value, icon, key, numericKey, fillable, toolbar }) => {
           if (
+            toolbar === false ||
             UIOptions.tools?.[
               value as Extract<
                 typeof value,
@@ -1099,6 +1100,9 @@ export const ShapesSwitcher = ({
           const shortcut = letter
             ? `${letter} ${t("helpDialog.or")} ${numericKey}`
             : `${numericKey}`;
+          const keybindingLabel =
+            value === "hand" ? undefined : numericKey || letter;
+
           // when in compact styles panel mode (tablet)
           // use a ToolPopover for selection/lasso toggle as well
           if (
@@ -1143,7 +1147,7 @@ export const ShapesSwitcher = ({
               checked={activeTool.type === value}
               name="editor-current-shape"
               title={`${capitalizeString(label)} — ${shortcut}`}
-              keyBindingLabel={numericKey || letter}
+              keyBindingLabel={keybindingLabel}
               aria-label={capitalizeString(label)}
               aria-keyshortcuts={shortcut}
               data-testid={`toolbar-${value}`}

packages/excalidraw/components/AppStateObserver.ts

@@ -0,0 +1,208 @@
+import type { AppState, UnsubscribeCallback } from "../types";
+
+type StateChangeSelector =
+  | keyof AppState
+  | (keyof AppState)[]
+  | ((appState: AppState) => unknown);
+
+type StateChangePredicateOptions = {
+  predicate: (appState: AppState) => boolean;
+  callback?: (appState: AppState) => void;
+  once?: boolean;
+};
+
+type StateChangeArg = StateChangeSelector | StateChangePredicateOptions;
+
+type StateChangeListener = {
+  predicate: (appState: AppState, prevState: AppState) => boolean;
+  getValue: (appState: AppState) => unknown;
+  callback: (value: any, appState: AppState) => void;
+  once: boolean;
+};
+
+type NormalizedStateChange = {
+  predicate: StateChangeListener["predicate"];
+  getValue: StateChangeListener["getValue"];
+  callback?: StateChangeListener["callback"];
+  once: boolean;
+  matchesImmediately: boolean;
+};
+
+export type OnStateChange = {
+  <K extends keyof AppState>(
+    prop: K,
+    callback: (value: AppState[K], appState: AppState) => void,
+    opts?: { once: boolean },
+  ): UnsubscribeCallback;
+  <K extends keyof AppState>(prop: K): Promise<AppState[K]>;
+  (
+    prop: (keyof AppState)[],
+    callback: (appState: AppState, appState2: AppState) => void,
+    opts?: { once: boolean },
+  ): UnsubscribeCallback;
+  (prop: (keyof AppState)[]): Promise<AppState>;
+  <T>(
+    prop: (appState: AppState) => T,
+    callback: (value: T, appState: AppState) => void,
+    opts?: { once: boolean },
+  ): UnsubscribeCallback;
+  <T>(prop: (appState: AppState) => T): Promise<T>;
+  (opts: {
+    predicate: (appState: AppState) => boolean;
+    callback: (appState: AppState) => void;
+    once?: boolean;
+  }): UnsubscribeCallback;
+  (opts: { predicate: (appState: AppState) => boolean }): Promise<AppState>;
+  (
+    selector: StateChangeSelector,
+    callback: (value: any, appState: AppState) => void,
+  ): any;
+};
+
+export class AppStateObserver {
+  private listeners: StateChangeListener[] = [];
+
+  constructor(private readonly getState: () => AppState) {}
+
+  private isStateChangePredicateOptions(
+    propOrOpts: StateChangeArg,
+  ): propOrOpts is StateChangePredicateOptions {
+    return (
+      typeof propOrOpts === "object" &&
+      !Array.isArray(propOrOpts) &&
+      "predicate" in propOrOpts
+    );
+  }
+
+  private subscribe(listener: StateChangeListener): UnsubscribeCallback {
+    this.listeners.push(listener);
+    return () => {
+      this.listeners = this.listeners.filter(
+        (existingListener) => existingListener !== listener,
+      );
+    };
+  }
+
+  private normalize(
+    propOrOpts: StateChangeArg,
+    callback?: (value: any, appState: AppState) => void,
+    opts?: { once: boolean },
+  ): NormalizedStateChange {
+    let predicate: StateChangeListener["predicate"];
+    let getValue: StateChangeListener["getValue"];
+    let normalizedCallback = callback;
+    let once = opts?.once ?? false;
+    let matchesImmediately = false;
+
+    if (this.isStateChangePredicateOptions(propOrOpts)) {
+      const {
+        predicate: predicateFn,
+        callback: callbackFromOpts,
+        once: onceFromOpts,
+      } = propOrOpts;
+
+      predicate = predicateFn;
+      getValue = (appState: AppState) => appState;
+      normalizedCallback = callbackFromOpts
+        ? (_value: AppState, appState: AppState) => callbackFromOpts(appState)
+        : undefined;
+      once = onceFromOpts ?? false;
+      matchesImmediately = predicateFn(this.getState());
+    } else if (typeof propOrOpts === "function") {
+      const selector = propOrOpts;
+      predicate = (appState: AppState, prevState: AppState) =>
+        selector(appState) !== selector(prevState);
+      getValue = (appState: AppState) => selector(appState);
+    } else if (Array.isArray(propOrOpts)) {
+      const keys = propOrOpts;
+      predicate = (appState: AppState, prevState: AppState) =>
+        keys.some((key) => appState[key] !== prevState[key]);
+      getValue = (appState: AppState) => appState;
+    } else {
+      const key = propOrOpts;
+      predicate = (appState: AppState, prevState: AppState) =>
+        appState[key] !== prevState[key];
+      getValue = (appState: AppState) => appState[key];
+    }
+
+    return {
+      predicate,
+      getValue,
+      callback: normalizedCallback,
+      once,
+      matchesImmediately,
+    };
+  }
+
+  public onStateChange: OnStateChange = ((
+    propOrOpts: StateChangeArg,
+    callback?: any,
+    opts?: { once: boolean },
+  ) => {
+    const {
+      predicate,
+      getValue,
+      callback: stateChangeCallback,
+      once,
+      matchesImmediately,
+    } = this.normalize(propOrOpts, callback, opts);
+
+    if (stateChangeCallback) {
+      if (matchesImmediately) {
+        queueMicrotask(() => {
+          const state = this.getState();
+          stateChangeCallback(getValue(state), state);
+        });
+        if (once) {
+          return () => {};
+        }
+      }
+
+      return this.subscribe({
+        predicate,
+        getValue,
+        callback: stateChangeCallback,
+        once,
+      });
+    }
+
+    if (matchesImmediately) {
+      return Promise.resolve(getValue(this.getState()));
+    }
+
+    return new Promise<any>((resolve) => {
+      this.subscribe({
+        predicate,
+        getValue,
+        callback: (value) => resolve(value),
+        once: true,
+      });
+    });
+  }) as OnStateChange;
+
+  public flush(prevState: AppState) {
+    if (!this.listeners.length) {
+      return;
+    }
+
+    const state = this.getState();
+    const listenersToKeep: StateChangeListener[] = [];
+
+    for (const listener of this.listeners) {
+      if (listener.predicate(state, prevState)) {
+        listener.callback(listener.getValue(state), state);
+        if (!listener.once) {
+          listenersToKeep.push(listener);
+        }
+      } else {
+        listenersToKeep.push(listener);
+      }
+    }
+
+    this.listeners = listenersToKeep;
+  }
+
+  public clear() {
+    this.listeners = [];
+  }
+}

packages/excalidraw/components/ColorPicker/ColorPicker.tsx

@@ -1,4 +1,4 @@
-import * as Popover from "@radix-ui/react-popover";
+import { Popover } from "radix-ui";
 import clsx from "clsx";
 import { useRef, useEffect } from "react";
 

packages/excalidraw/components/CommandPalette/CommandPalette.tsx

@@ -10,12 +10,11 @@ import {
   isWritableElement,
 } from "@excalidraw/common";
 
-import { actionToggleShapeSwitch } from "@excalidraw/excalidraw/actions/actionToggleShapeSwitch";
-
-import { getShortcutKey } from "@excalidraw/excalidraw/shortcut";
-
 import type { MarkRequired } from "@excalidraw/common/utility-types";
 
+import { actionToggleShapeSwitch } from "../../actions/actionToggleShapeSwitch";
+import { getShortcutKey } from "../../shortcut";
+
 import {
   actionClearCanvas,
   actionLink,

packages/excalidraw/components/CommandPalette/types.ts

@@ -15,7 +15,7 @@ export type CommandPaletteItem = {
   category: string;
   order?: number;
   predicate?: boolean | Action["predicate"];
-  shortcut?: string;
+  shortcut?: string | null;
   /** if false, command will not show while in view mode */
   viewMode?: boolean;
   perform: (data: {

packages/excalidraw/components/ConvertElementTypePopup.tsx

@@ -1,7 +1,9 @@
 import { type ReactNode, useEffect, useMemo, useRef, useState } from "react";
 
 import {
+  bumpVersion,
   getLinearElementSubType,
+  mutateElement,
   updateElbowArrowPoints,
 } from "@excalidraw/element";
 
@@ -37,6 +39,8 @@ import {
   isProdEnv,
   mapFind,
   reduceToCommonValue,
+  ROUNDNESS,
+  sceneCoordsToViewportCoords,
   updateActiveTool,
 } from "@excalidraw/common";
 
@@ -71,12 +75,6 @@ import type {
 
 import type { Scene } from "@excalidraw/element";
 
-import {
-  bumpVersion,
-  mutateElement,
-  ROUNDNESS,
-  sceneCoordsToViewportCoords,
-} from "..";
 import { trackEvent } from "../analytics";
 import { atom } from "../editor-jotai";
 

packages/excalidraw/components/FilledButton.scss

@@ -53,6 +53,7 @@
     &.ExcButton--status-loading,
     &.ExcButton--status-success {
       pointer-events: none;
+      background-color: var(--color-success);
 
       .ExcButton__contents {
         visibility: hidden;

packages/excalidraw/components/FontPicker/FontPicker.test.tsx

@@ -0,0 +1,31 @@
+import { KEYS } from "@excalidraw/common";
+
+import { Excalidraw } from "../..";
+import { Keyboard } from "../../tests/helpers/ui";
+import { act, render } from "../../tests/test-utils";
+
+describe("FontPicker", () => {
+  it("should be able to open font picker", async () => {
+    (global as any).ResizeObserver =
+      (global as any).ResizeObserver ||
+      class ResizeObserver {
+        observe() {}
+        unobserve() {}
+        disconnect() {}
+      };
+
+    const { queryByTestId } = await render(
+      <Excalidraw handleKeyboardGlobally={true} />,
+    );
+
+    Keyboard.keyPress(KEYS.T);
+
+    const fontPickerTrigger = queryByTestId("font-family-show-fonts");
+
+    expect(fontPickerTrigger).not.toBeNull();
+
+    act(() => {
+      fontPickerTrigger!.click();
+    });
+  });
+});

packages/excalidraw/components/FontPicker/FontPicker.tsx

@@ -1,4 +1,4 @@
-import * as Popover from "@radix-ui/react-popover";
+import { Popover } from "radix-ui";
 import clsx from "clsx";
 import React, { useCallback, useMemo } from "react";
 

packages/excalidraw/components/FontPicker/FontPickerList.tsx

@@ -30,10 +30,12 @@ import { PropertiesPopover } from "../PropertiesPopover";
 import { QuickSearch } from "../QuickSearch";
 import { ScrollableList } from "../ScrollableList";
 import DropdownMenuGroup from "../dropdownMenu/DropdownMenuGroup";
-import DropdownMenuItem, {
+import {
   DropDownMenuItemBadgeType,
   DropDownMenuItemBadge,
 } from "../dropdownMenu/DropdownMenuItem";
+import MenuItemContent from "../dropdownMenu/DropdownMenuItemContent";
+import { getDropdownMenuItemClassName } from "../dropdownMenu/common";
 import {
   FontFamilyCodeIcon,
   FontFamilyHeadingIcon,
@@ -44,6 +46,7 @@ import {
 import { fontPickerKeyHandler } from "./keyboardNavHandlers";
 
 import type { JSX } from "react";
+import type { ExcalidrawFontFace } from "../../fonts/ExcalidrawFontFace";
 
 export interface FontDescriptor {
   value: number;
@@ -84,6 +87,15 @@ const getFontFamilyIcon = (fontFamily: FontFamilyValues): JSX.Element => {
   }
 };
 
+const getFontFamilyLabel = (
+  fontFamily: FontFamilyValues,
+  fontFaces: ExcalidrawFontFace[],
+) =>
+  // prefer our config as the browser resolved names may be wrapped in quotes and such
+  Object.entries(FONT_FAMILY).find(([, id]) => id === fontFamily)?.[0] ??
+  fontFaces[0]?.fontFace?.family ??
+  "Unknown";
+
 export const FontPickerList = React.memo(
   ({
     selectedFontFamily,
@@ -112,7 +124,7 @@ export const FontPickerList = React.memo(
             const fontDescriptor = {
               value: familyId,
               icon: getFontFamilyIcon(familyId),
-              text: fontFaces[0]?.fontFace?.family ?? "Unknown",
+              text: getFontFamilyLabel(familyId, fontFaces),
             };
 
             if (metadata.deprecated) {
@@ -269,45 +281,74 @@ export const FontPickerList = React.memo(
       [filteredFonts, sceneFamilies],
     );
 
-    const renderFont = (font: FontDescriptor, index: number) => (
+    const FontPickerListItem = ({
-      <DropdownMenuItem
+      font,
-        key={font.value}
+      order,
-        icon={font.icon}
+    }: {
-        value={font.value}
+      font: FontDescriptor;
-        order={index}
+      order: number;
-        textStyle={{
+    }) => {
-          fontFamily: getFontFamilyString({ fontFamily: font.value }),
+      const ref = useRef<HTMLButtonElement>(null);
-        }}
+      const isHovered = font.value === hoveredFont?.value;
-        hovered={font.value === hoveredFont?.value}
+      const isSelected = font.value === selectedFontFamily;
-        selected={font.value === selectedFontFamily}
+
-        // allow to tab between search and selected font
+      useEffect(() => {
-        tabIndex={font.value === selectedFontFamily ? 0 : -1}
+        if (!isHovered) {
-        onClick={(e) => {
+          return;
-          wrappedOnSelect(Number(e.currentTarget.value));
-        }}
-        onMouseMove={() => {
-          if (hoveredFont?.value !== font.value) {
-            onHover(font.value);
-          }
-        }}
-        badge={
-          font.badge && (
-            <DropDownMenuItemBadge type={font.badge.type}>
-              {font.badge.placeholder}
-            </DropDownMenuItemBadge>
-          )
         }
-      >
+        if (order === 0) {
-        {font.text}
+          // scroll into the first item differently, so it's visible what is above (i.e. group title)
-      </DropdownMenuItem>
+          ref.current?.scrollIntoView?.({ block: "end" });
-    );
+        } else {
+          ref.current?.scrollIntoView?.({ block: "nearest" });
+        }
+      }, [isHovered, order]);
+
+      return (
+        <button
+          ref={ref}
+          type="button"
+          value={font.value}
+          className={getDropdownMenuItemClassName("", isSelected, isHovered)}
+          title={font.text}
+          // allow to tab between search and selected font
+          tabIndex={isSelected ? 0 : -1}
+          onClick={(e) => {
+            wrappedOnSelect(Number(e.currentTarget.value));
+          }}
+          onMouseMove={() => {
+            if (hoveredFont?.value !== font.value) {
+              onHover(font.value);
+            }
+          }}
+        >
+          <MenuItemContent
+            icon={font.icon}
+            badge={
+              font.badge && (
+                <DropDownMenuItemBadge type={font.badge.type}>
+                  {font.badge.placeholder}
+                </DropDownMenuItemBadge>
+              )
+            }
+            textStyle={{
+              fontFamily: getFontFamilyString({ fontFamily: font.value }),
+            }}
+          >
+            {font.text}
+          </MenuItemContent>
+        </button>
+      );
+    };
 
     const groups = [];
 
     if (sceneFilteredFonts.length) {
       groups.push(
         <DropdownMenuGroup title={t("fontList.sceneFonts")} key="group_1">
-          {sceneFilteredFonts.map(renderFont)}
+          {sceneFilteredFonts.map((font, index) => (
+            <FontPickerListItem key={font.value} font={font} order={index} />
+          ))}
         </DropdownMenuGroup>,
       );
     }
@@ -315,9 +356,13 @@ export const FontPickerList = React.memo(
     if (availableFilteredFonts.length) {
       groups.push(
         <DropdownMenuGroup title={t("fontList.availableFonts")} key="group_2">
-          {availableFilteredFonts.map((font, index) =>
+          {availableFilteredFonts.map((font, index) => (
-            renderFont(font, index + sceneFilteredFonts.length),
+            <FontPickerListItem
-          )}
+              key={font.value}
+              font={font}
+              order={index + sceneFilteredFonts.length}
+            />
+          ))}
         </DropdownMenuGroup>,
       );
     }

packages/excalidraw/components/FontPicker/FontPickerTrigger.tsx

@@ -1,4 +1,4 @@
-import * as Popover from "@radix-ui/react-popover";
+import { Popover } from "radix-ui";
 
 import { MOBILE_ACTION_BUTTON_BG } from "@excalidraw/common";
 

packages/excalidraw/components/IconPicker.scss

@@ -6,14 +6,20 @@
     padding: 0.5rem;
     background: var(--popup-bg-color);
     border: 0 solid color.adjust(#fff, $alpha: -0.75);
-    box-shadow: var(--shadow-island);
+    box-shadow: var(--shadow-island-stronger);
     border-radius: 4px;
-    position: absolute;
     :root[dir="rtl"] & {
       padding: 0.4rem;
     }
   }
 
+  .picker-sections,
+  .picker-section {
+    display: flex;
+    flex-direction: column;
+    gap: 0.5rem;
+  }
+
   .picker-container button,
   .picker button {
     position: relative;
@@ -62,7 +68,13 @@
 
   .picker-collapsible {
     font-size: 0.75rem;
-    padding: 0.5rem 0;
+    padding: 0;
+    color: var(--text-primary-color);
+  }
+
+  .picker-section-label {
+    font-size: 0.75rem;
+    color: var(--text-primary-color);
   }
 
   .picker-keybinding {

packages/excalidraw/components/IconPicker.tsx

@@ -1,6 +1,6 @@
-import * as Popover from "@radix-ui/react-popover";
+import { Popover } from "radix-ui";
 import clsx from "clsx";
-import React, { useEffect } from "react";
+import React, { useEffect, useMemo } from "react";
 
 import { isArrowKey, KEYS } from "@excalidraw/common";
 
@@ -8,13 +8,15 @@ import { atom, useAtom } from "../editor-jotai";
 import { getLanguage, t } from "../i18n";
 
 import Collapsible from "./Stats/Collapsible";
-import { useEditorInterface, useExcalidrawContainer } from "./App";
+import { useExcalidrawContainer } from "./App";
 
 import "./IconPicker.scss";
 
 import type { JSX } from "react";
 
 const moreOptionsAtom = atom(false);
+const PICKER_COLUMNS = 4;
+const DEFAULT_SECTION_NAME = "default";
 
 type Option<T> = {
   value: T;
@@ -23,28 +25,73 @@ type Option<T> = {
   keyBinding: string | null;
 };
 
+type PickerSection<T> = {
+  name: string;
+  options: readonly Option<T>[];
+};
+
+const flattenOptions = <T,>(sections: readonly PickerSection<T>[]) =>
+  sections.flatMap((section) => section.options);
+
+const findOption = <T,>(
+  sections: readonly PickerSection<T>[],
+  predicate: (option: Option<T>) => boolean,
+) => {
+  for (const section of sections) {
+    const option = section.options.find(predicate);
+    if (option) {
+      return option;
+    }
+  }
+
+  return null;
+};
+
+const hasOption = <T,>(
+  sections: readonly PickerSection<T>[],
+  predicate: (option: Option<T>) => boolean,
+) => sections.some((section) => section.options.some(predicate));
+
+const getNavigationRows = <T,>(sections: readonly PickerSection<T>[]) =>
+  sections.flatMap((section) =>
+    Array.from(
+      { length: Math.ceil(section.options.length / PICKER_COLUMNS) },
+      (_, index) =>
+        section.options.slice(
+          index * PICKER_COLUMNS,
+          index * PICKER_COLUMNS + PICKER_COLUMNS,
+        ),
+    ),
+  );
+
 function Picker<T>({
-  options,
+  visibleSections,
+  hiddenSections = [],
   value,
   label,
   onChange,
   onClose,
-  numberOfOptionsToAlwaysShow = options.length,
 }: {
   label: string;
   value: T;
-  options: readonly Option<T>[];
+  visibleSections: readonly PickerSection<T>[];
+  hiddenSections?: readonly PickerSection<T>[];
   onChange: (value: T) => void;
   onClose: () => void;
-  numberOfOptionsToAlwaysShow?: number;
 }) {
-  const editorInterface = useEditorInterface();
   const { container } = useExcalidrawContainer();
+  const [showMoreOptions, setShowMoreOptions] = useAtom(moreOptionsAtom);
+  const allSections = [...visibleSections, ...hiddenSections];
+  const allOptions = flattenOptions(allSections);
+  const navigationRows = getNavigationRows([
+    ...visibleSections,
+    ...(showMoreOptions ? hiddenSections : []),
+  ]);
 
   const handleKeyDown = (event: React.KeyboardEvent) => {
-    const pressedOption = options.find(
+    const pressedOption = allOptions.find(
       (option) => option.keyBinding === event.key.toLowerCase(),
-    )!;
+    );
 
     if (!(event.metaKey || event.altKey || event.ctrlKey) && pressedOption) {
       // Keybinding navigation
@@ -52,17 +99,17 @@ function Picker<T>({
 
       event.preventDefault();
     } else if (event.key === KEYS.TAB) {
-      const index = options.findIndex((option) => option.value === value);
+      const index = allOptions.findIndex((option) => option.value === value);
       const nextIndex = event.shiftKey
-        ? (options.length + index - 1) % options.length
+        ? (allOptions.length + index - 1) % allOptions.length
-        : (index + 1) % options.length;
+        : (index + 1) % allOptions.length;
-      onChange(options[nextIndex].value);
+      onChange(allOptions[nextIndex].value);
     } else if (isArrowKey(event.key)) {
       // Arrow navigation
       const isRTL = getLanguage().rtl;
-      const index = options.findIndex((option) => option.value === value);
+      const index = allOptions.findIndex((option) => option.value === value);
       if (index !== -1) {
-        const length = options.length;
+        const length = allOptions.length;
         let nextIndex = index;
 
         switch (event.key) {
@@ -76,18 +123,60 @@ function Picker<T>({
             break;
           // Go the next row
           case KEYS.ARROW_DOWN: {
-            nextIndex = (index + (numberOfOptionsToAlwaysShow ?? 1)) % length;
+            const currentRowIndex = navigationRows.findIndex((row) =>
+              row.some((option) => option.value === value),
+            );
+            const currentRow = navigationRows[currentRowIndex];
+
+            if (currentRowIndex !== -1 && currentRow) {
+              const column = currentRow.findIndex(
+                (option) => option.value === value,
+              );
+              const nextRow =
+                navigationRows[(currentRowIndex + 1) % navigationRows.length];
+              const nextOption =
+                nextRow[Math.min(column, nextRow.length - 1)] ??
+                allOptions[index];
+
+              onChange(nextOption.value);
+              event.preventDefault();
+              event.nativeEvent.stopImmediatePropagation();
+              event.stopPropagation();
+              return;
+            }
             break;
           }
           // Go the previous row
           case KEYS.ARROW_UP: {
-            nextIndex =
+            const currentRowIndex = navigationRows.findIndex((row) =>
-              (length + index - (numberOfOptionsToAlwaysShow ?? 1)) % length;
+              row.some((option) => option.value === value),
+            );
+            const currentRow = navigationRows[currentRowIndex];
+
+            if (currentRowIndex !== -1 && currentRow) {
+              const column = currentRow.findIndex(
+                (option) => option.value === value,
+              );
+              const previousRow =
+                navigationRows[
+                  (navigationRows.length + currentRowIndex - 1) %
+                    navigationRows.length
+                ];
+              const previousOption =
+                previousRow[Math.min(column, previousRow.length - 1)] ??
+                allOptions[index];
+
+              onChange(previousOption.value);
+              event.preventDefault();
+              event.nativeEvent.stopImmediatePropagation();
+              event.stopPropagation();
+              return;
+            }
             break;
           }
         }
 
-        onChange(options[nextIndex].value);
+        onChange(allOptions[nextIndex].value);
       }
       event.preventDefault();
     } else if (event.key === KEYS.ESCAPE || event.key === KEYS.ENTER) {
@@ -99,38 +188,29 @@ function Picker<T>({
     event.stopPropagation();
   };
 
-  const [showMoreOptions, setShowMoreOptions] = useAtom(moreOptionsAtom);
-
-  const alwaysVisibleOptions = React.useMemo(
-    () => options.slice(0, numberOfOptionsToAlwaysShow),
-    [options, numberOfOptionsToAlwaysShow],
-  );
-  const moreOptions = React.useMemo(
-    () => options.slice(numberOfOptionsToAlwaysShow),
-    [options, numberOfOptionsToAlwaysShow],
-  );
-
   useEffect(() => {
-    if (!alwaysVisibleOptions.some((option) => option.value === value)) {
+    if (hasOption(hiddenSections, (option) => option.value === value)) {
       setShowMoreOptions(true);
     }
-  }, [value, alwaysVisibleOptions, setShowMoreOptions]);
+  }, [value, hiddenSections, setShowMoreOptions]);
 
-  const renderOptions = (options: Option<T>[]) => {
+  const renderOptions = (options: readonly Option<T>[]) => {
     return (
       <div className="picker-content">
-        {options.map((option, i) => (
+        {options.map((option) => (
           <button
             type="button"
             className={clsx("picker-option", {
               active: value === option.value,
             })}
-            onClick={(event) => {
+            onClick={() => {
               onChange(option.value);
             }}
-            title={`${option.text} ${
+            title={
-              option.keyBinding && `— ${option.keyBinding.toUpperCase()}`
+              option.keyBinding
-            }`}
+                ? `${option.text} — ${option.keyBinding.toUpperCase()}`
+                : option.text
+            }
             aria-label={option.text || "none"}
             aria-keyshortcuts={option.keyBinding || undefined}
             key={option.text}
@@ -153,26 +233,38 @@ function Picker<T>({
     );
   };
 
-  const isMobile = editorInterface.formFactor === "phone";
+  const renderSections = (sections: readonly PickerSection<T>[]) =>
+    sections.map((section, index) =>
+      section.name === DEFAULT_SECTION_NAME ? (
+        <React.Fragment key={`${section.name}-${index}`}>
+          {renderOptions(section.options)}
+        </React.Fragment>
+      ) : (
+        <div className="picker-section" key={`${section.name}-${index}`}>
+          <div className="picker-section-label">{section.name}</div>
+          {renderOptions(section.options)}
+        </div>
+      ),
+    );
 
   return (
     <Popover.Content
-      side={isMobile ? "right" : "bottom"}
+      className="picker"
+      role="dialog"
+      aria-modal="true"
+      aria-label={label}
+      side={"bottom"}
       align="start"
-      sideOffset={isMobile ? 8 : 12}
+      sideOffset={12}
+      alignOffset={12}
       style={{ zIndex: "var(--zIndex-ui-styles-popup)" }}
       onKeyDown={handleKeyDown}
       collisionBoundary={container ?? undefined}
     >
-      <div
+      <div className="picker-sections">
-        className={`picker`}
+        {renderSections(visibleSections)}
-        role="dialog"
-        aria-modal="true"
-        aria-label={label}
-      >
-        {renderOptions(alwaysVisibleOptions)}
 
-        {moreOptions.length > 0 && (
+        {hiddenSections.length > 0 && (
           <Collapsible
             label={t("labels.more_options")}
             open={showMoreOptions}
@@ -181,7 +273,9 @@ function Picker<T>({
             }}
             className="picker-collapsible"
           >
-            {renderOptions(moreOptions)}
+            <div className="picker-sections">
+              {renderSections(hiddenSections)}
+            </div>
           </Collapsible>
         )}
       </div>
@@ -192,49 +286,45 @@ function Picker<T>({
 export function IconPicker<T>({
   value,
   label,
-  options,
+  visibleSections,
+  hiddenSections,
   onChange,
-  group = "",
-  numberOfOptionsToAlwaysShow,
 }: {
   label: string;
   value: T;
-  options: readonly {
+  visibleSections: readonly PickerSection<T>[];
-    value: T;
+  hiddenSections?: readonly PickerSection<T>[];
-    text: string;
-    icon: JSX.Element;
-    keyBinding: string | null;
-  }[];
   onChange: (value: T) => void;
-  numberOfOptionsToAlwaysShow?: number;
-  group?: string;
 }) {
   const [isActive, setActive] = React.useState(false);
-  const rPickerButton = React.useRef<any>(null);
+  const selectedOption = useMemo(
+    () =>
+      findOption(visibleSections, (option) => option.value === value) ??
+      findOption(hiddenSections ?? [], (option) => option.value === value),
+    [visibleSections, hiddenSections, value],
+  );
 
   return (
     <div>
       <Popover.Root open={isActive} onOpenChange={(open) => setActive(open)}>
         <Popover.Trigger
-          name={group}
           type="button"
           aria-label={label}
           onClick={() => setActive(!isActive)}
-          ref={rPickerButton}
           className={isActive ? "active" : ""}
         >
-          {options.find((option) => option.value === value)?.icon}
+          {selectedOption?.icon}
         </Popover.Trigger>
         {isActive && (
           <Picker
-            options={options}
+            visibleSections={visibleSections}
+            hiddenSections={hiddenSections}
             value={value}
             label={label}
             onChange={onChange}
             onClose={() => {
               setActive(false);
             }}
-            numberOfOptionsToAlwaysShow={numberOfOptionsToAlwaysShow}
           />
         )}
       </Popover.Root>

packages/excalidraw/components/ImageExportDialog.tsx

@@ -59,6 +59,7 @@ type ImageExportModalProps = {
   actionManager: ActionManager;
   onExportImage: AppClassProperties["onExportImage"];
   name: string;
+  exportWithDarkMode: boolean;
 };
 
 const ImageExportModal = ({
@@ -68,6 +69,7 @@ const ImageExportModal = ({
   actionManager,
   onExportImage,
   name,
+  exportWithDarkMode,
 }: ImageExportModalProps) => {
   const hasSelection = isSomeElementSelected(
     elementsSnapshot,
@@ -79,15 +81,13 @@ const ImageExportModal = ({
   const [exportWithBackground, setExportWithBackground] = useState(
     appStateSnapshot.exportBackground,
   );
-  const [exportDarkMode, setExportDarkMode] = useState(
-    appStateSnapshot.exportWithDarkMode,
-  );
   const [embedScene, setEmbedScene] = useState(
     appStateSnapshot.exportEmbedScene,
   );
   const [exportScale, setExportScale] = useState(appStateSnapshot.exportScale);
 
   const previewRef = useRef<HTMLDivElement>(null);
+  const previewRenderRequestIdRef = useRef(0);
   const [renderError, setRenderError] = useState<Error | null>(null);
 
   const { onCopy, copyStatus, resetCopyStatus } = useCopyStatus();
@@ -99,7 +99,7 @@ const ImageExportModal = ({
   }, [
     projectName,
     exportWithBackground,
-    exportDarkMode,
+    exportWithDarkMode,
     exportScale,
     embedScene,
     resetCopyStatus,
@@ -122,13 +122,18 @@ const ImageExportModal = ({
       return;
     }
 
+    const requestId = ++previewRenderRequestIdRef.current;
+    const isStaleRequest = () => {
+      return requestId !== previewRenderRequestIdRef.current;
+    };
+
     exportToCanvas({
       elements: exportedElements,
       appState: {
         ...appStateSnapshot,
         name: projectName,
         exportBackground: exportWithBackground,
-        exportWithDarkMode: exportDarkMode,
+        exportWithDarkMode,
         exportScale,
         exportEmbedScene: embedScene,
       },
@@ -137,25 +142,41 @@ const ImageExportModal = ({
       maxWidthOrHeight: Math.max(maxWidth, maxHeight),
       exportingFrame,
     })
-      .then((canvas) => {
+      .then(async (canvas) => {
+        if (isStaleRequest()) {
+          return;
+        }
+
+        // If converting to blob fails, there's some problem that will likely
+        // prevent preview and export (e.g. canvas too big).
+        try {
+          await canvasToBlob(canvas);
+        } catch (error: any) {
+          if (error.name === "CANVAS_POSSIBLY_TOO_BIG") {
+            throw new Error(t("canvasError.canvasTooBig"));
+          }
+          throw error;
+        }
+
+        if (isStaleRequest()) {
+          return;
+        }
+
         setRenderError(null);
-        // if converting to blob fails, there's some problem that will
+        previewNode.replaceChildren(canvas);
-        // likely prevent preview and export (e.g. canvas too big)
-        return canvasToBlob(canvas)
-          .then(() => {
-            previewNode.replaceChildren(canvas);
-          })
-          .catch((e) => {
-            if (e.name === "CANVAS_POSSIBLY_TOO_BIG") {
-              throw new Error(t("canvasError.canvasTooBig"));
-            }
-            throw e;
-          });
       })
       .catch((error) => {
+        if (isStaleRequest()) {
+          return;
+        }
+
         console.error(error);
         setRenderError(error);
       });
+
+    return () => {
+      previewRenderRequestIdRef.current += 1;
+    };
   }, [
     appStateSnapshot,
     files,
@@ -163,7 +184,7 @@ const ImageExportModal = ({
     exportingFrame,
     projectName,
     exportWithBackground,
-    exportDarkMode,
+    exportWithDarkMode,
     exportScale,
     embedScene,
   ]);
@@ -233,9 +254,8 @@ const ImageExportModal = ({
         >
           <Switch
             name="exportDarkModeSwitch"
-            checked={exportDarkMode}
+            checked={exportWithDarkMode}
             onChange={(checked) => {
-              setExportDarkMode(checked);
               actionManager.executeAction(
                 actionExportWithDarkMode,
                 "ui",
@@ -399,6 +419,7 @@ export const ImageExportDialog = ({
         actionManager={actionManager}
         onExportImage={onExportImage}
         name={name}
+        exportWithDarkMode={appState.exportWithDarkMode}
       />
     </Dialog>
   );

packages/excalidraw/components/LayerUI.tsx

@@ -20,7 +20,6 @@ import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
 
 import { actionToggleStats } from "../actions";
 import { trackEvent } from "../analytics";
-import { isHandToolActive } from "../appState";
 import { TunnelsContext, useInitializeTunnels } from "../context/tunnels";
 import { UIAppStateContext } from "../context/ui-appState";
 import { useAtom, useAtomValue } from "../editor-jotai";
@@ -55,13 +54,13 @@ import ElementLinkDialog from "./ElementLinkDialog";
 import { ErrorDialog } from "./ErrorDialog";
 import { EyeDropper, activeEyeDropperAtom } from "./EyeDropper";
 import { FixedSideContainer } from "./FixedSideContainer";
-import { HandButton } from "./HandButton";
 import { HelpDialog } from "./HelpDialog";
 import { HintViewer } from "./HintViewer";
 import { ImageExportDialog } from "./ImageExportDialog";
 import { Island } from "./Island";
 import { JSONExportDialog } from "./JSONExportDialog";
 import { LaserPointerButton } from "./LaserPointerButton";
+import { Toast } from "./Toast";
 
 import "./LayerUI.scss";
 import "./Toolbar.scss";
@@ -359,13 +358,6 @@ const LayerUI = ({
 
                             <div className="App-toolbar__divider" />
 
-                            <HandButton
-                              checked={isHandToolActive(appState)}
-                              onChange={() => onHandToolToggle()}
-                              title={t("toolBar.hand")}
-                              isMobile
-                            />
-
                             <ShapesSwitcher
                               setAppState={setAppState}
                               activeTool={appState.activeTool}
@@ -565,13 +557,13 @@ const LayerUI = ({
       <tunnels.OverwriteConfirmDialogTunnel.Out />
       {renderImageExportDialog()}
       {renderJSONExportDialog()}
-      {appState.pasteDialog.shown && (
+      {appState.openDialog?.name === "charts" && (
         <PasteChartDialog
-          setAppState={setAppState}
+          data={appState.openDialog.data}
-          appState={appState}
+          rawText={appState.openDialog.rawText}
           onClose={() =>
             setAppState({
-              pasteDialog: { shown: false, data: null },
+              openDialog: null,
             })
           }
         />
@@ -614,18 +606,30 @@ const LayerUI = ({
               showExitZenModeBtn={showExitZenModeBtn}
               renderWelcomeScreen={renderWelcomeScreen}
             />
-            {appState.scrolledOutside && (
+            {(appState.toast || appState.scrolledOutside) && (
-              <button
+              <div className="floating-status-stack">
-                type="button"
+                {appState.toast && (
-                className="scroll-back-to-content"
+                  <Toast
-                onClick={() => {
+                    message={appState.toast.message}
-                  setAppState((appState) => ({
+                    onClose={() => setAppState({ toast: null })}
-                    ...calculateScrollCenter(elements, appState),
+                    duration={appState.toast.duration}
-                  }));
+                    closable={appState.toast.closable}
-                }}
+                  />
-              >
+                )}
-                {t("buttons.scrollBackToContent")}
+                {!appState.toast && appState.scrolledOutside && (
-              </button>
+                  <button
+                    type="button"
+                    className="scroll-back-to-content"
+                    onClick={() => {
+                      setAppState((appState) => ({
+                        ...calculateScrollCenter(elements, appState),
+                      }));
+                    }}
+                  >
+                    {t("buttons.scrollBackToContent")}
+                  </button>
+                )}
+              </div>
             )}
           </div>
           {renderSidebars()}

packages/excalidraw/components/LibraryMenu.scss

@@ -126,9 +126,10 @@
 
     .dropdown-menu-container {
       width: 196px;
-      box-shadow: var(--library-dropdown-shadow);
       border-radius: var(--border-radius-lg);
       padding: 0.25rem 0.5rem;
+
+      --box-shadow: var(--library-dropdown-shadow);
     }
   }
 

packages/excalidraw/components/MobileToolBar.tsx

@@ -375,7 +375,7 @@ export const MobileToolBar = ({
       )}
 
       {/* Other Shapes */}
-      <DropdownMenu open={isOtherShapesMenuOpen} placement="top">
+      <DropdownMenu open={isOtherShapesMenuOpen}>
         <DropdownMenu.Trigger
           className={clsx(
             "App-toolbar__extra-tools-trigger App-toolbar__extra-tools-trigger--mobile",
@@ -403,6 +403,7 @@ export const MobileToolBar = ({
           onClickOutside={() => setIsOtherShapesMenuOpen(false)}
           onSelect={() => setIsOtherShapesMenuOpen(false)}
           className="App-toolbar__extra-tools-dropdown"
+          align="start"
         >
           {!showTextToolOutside && (
             <DropdownMenu.Item
@@ -471,9 +472,9 @@ export const MobileToolBar = ({
                 onSelect={() => app.onMagicframeToolSelect()}
                 icon={MagicIcon}
                 data-testid="toolbar-magicframe"
+                badge={<DropdownMenu.Item.Badge>AI</DropdownMenu.Item.Badge>}
               >
                 {t("toolBar.magicframe")}
-                <DropdownMenu.Item.Badge>AI</DropdownMenu.Item.Badge>
               </DropdownMenu.Item>
             </>
           )}

packages/excalidraw/components/PasteChartDialog.scss

@@ -2,6 +2,40 @@
 
 .excalidraw {
   .PasteChartDialog {
+    .PasteChartDialog__title {
+      display: flex;
+      align-items: center;
+      gap: 0.5rem;
+    }
+
+    .PasteChartDialog__titleText {
+      min-width: 0;
+    }
+
+    .PasteChartDialog__reshuffleBtn {
+      margin-left: auto;
+      flex: 0 0 auto;
+      width: 1rem;
+      height: 1rem;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      border-radius: 4px;
+      cursor: pointer;
+      color: var(--text-primary-color);
+      transition: transform 120ms ease, background-color 120ms ease,
+        color 120ms ease;
+      user-select: none;
+
+      &:hover {
+        color: $color-blue-6;
+      }
+
+      &:active {
+        transform: scale(0.94);
+      }
+    }
+
     @include isMobile {
       .Island {
         display: flex;
@@ -11,35 +45,61 @@
     .container {
       display: flex;
       align-items: center;
-      justify-content: space-around;
+      justify-content: center;
       flex-wrap: wrap;
+      gap: 1rem;
       @include isMobile {
         flex-direction: column;
         justify-content: center;
+        align-items: stretch;
       }
     }
     .ChartPreview {
-      margin: 8px;
+      width: 260px;
-      text-align: center;
+      min-height: 190px;
-      width: 192px;
+      border-radius: 8px;
-      height: 128px;
+      padding: 10px;
-      border-radius: 2px;
-      padding: 1px;
       border: 1px solid $color-gray-4;
       display: flex;
-      align-items: center;
+      flex-direction: column;
-      justify-content: center;
+      align-items: stretch;
+      justify-content: flex-start;
+      gap: 10px;
       background: transparent;
-      div {
+      .ChartPreview__canvas {
-        display: inline-block;
+        display: flex;
+        flex: 1;
+        align-items: center;
+        justify-content: center;
+        overflow: hidden;
+      }
+      .ChartPreview__label {
+        font-size: 0.875rem;
+        font-weight: 600;
+        line-height: 1;
+        text-align: center;
+        color: var(--text-primary-color);
       }
       svg {
-        max-height: 120px;
+        max-height: 144px;
-        max-width: 186px;
+        max-width: 100%;
       }
       &:hover {
-        padding: 0;
+        border-color: $color-blue-5;
-        border: 2px solid $color-blue-5;
+      }
+      &:active {
+        border-color: $color-blue-5;
+        box-shadow: 0 0 0 1px $color-blue-5;
+        transform: scale(0.98);
+      }
+      &:focus-visible {
+        border-color: $color-blue-5;
+        box-shadow: 0 0 0 1px $color-blue-5;
+      }
+
+      @include isMobile {
+        width: 100%;
+        min-height: 200px;
       }
     }
   }

packages/excalidraw/components/PasteChartDialog.tsx

@@ -1,35 +1,57 @@
 import React, { useLayoutEffect, useRef, useState } from "react";
 
+import { newTextElement } from "@excalidraw/element";
+
 import type { ChartType } from "@excalidraw/element/types";
 
 import { trackEvent } from "../analytics";
-import { renderSpreadsheet } from "../charts";
+import { isSpreadsheetValidForChartType, renderSpreadsheet } from "../charts";
 import { t } from "../i18n";
 import { exportToSvg } from "../scene/export";
 
+import { useUIAppState } from "../context/ui-appState";
+
 import { useApp } from "./App";
 import { Dialog } from "./Dialog";
 
 import "./PasteChartDialog.scss";
 
+import { bucketFillIcon } from "./icons";
+
 import type { ChartElements, Spreadsheet } from "../charts";
-import type { UIAppState } from "../types";
+
+type OnPlainTextPaste = (rawText: string) => void;
 
 type OnInsertChart = (chartType: ChartType, elements: ChartElements) => void;
 
+const getChartTypeLabel = (chartType: ChartType) => {
+  switch (chartType) {
+    case "bar":
+      return t("labels.chartType_bar");
+    case "line":
+      return t("labels.chartType_line");
+    case "radar":
+      return t("labels.chartType_radar");
+    default:
+      return chartType;
+  }
+};
+
 const ChartPreviewBtn = (props: {
   spreadsheet: Spreadsheet | null;
   chartType: ChartType;
-  selected: boolean;
+  colorSeed: number;
   onClick: OnInsertChart;
 }) => {
   const previewRef = useRef<HTMLDivElement | null>(null);
   const [chartElements, setChartElements] = useState<ChartElements | null>(
     null,
   );
+  const { theme } = useUIAppState();
 
   useLayoutEffect(() => {
     if (!props.spreadsheet) {
+      setChartElements(null);
       return;
     }
 
@@ -38,7 +60,13 @@ const ChartPreviewBtn = (props: {
       props.spreadsheet,
       0,
       0,
+      props.colorSeed,
     );
+    if (!elements) {
+      setChartElements(null);
+      previewRef.current?.replaceChildren();
+      return;
+    }
     setChartElements(elements);
     let svg: SVGSVGElement;
     const previewNode = previewRef.current!;
@@ -49,6 +77,7 @@ const ChartPreviewBtn = (props: {
         {
           exportBackground: false,
           viewBackgroundColor: "#fff",
+          exportWithDarkMode: theme === "dark",
         },
         null, // files
         {
@@ -58,42 +87,108 @@ const ChartPreviewBtn = (props: {
       svg.querySelector(".style-fonts")?.remove();
       previewNode.replaceChildren();
       previewNode.appendChild(svg);
-
-      if (props.selected) {
-        (previewNode.parentNode as HTMLDivElement).focus();
-      }
     })();
 
     return () => {
       previewNode.replaceChildren();
     };
-  }, [props.spreadsheet, props.chartType, props.selected]);
+  }, [props.spreadsheet, props.chartType, props.colorSeed, theme]);
+
+  const chartTypeLabel = getChartTypeLabel(props.chartType);
 
   return (
     <button
       type="button"
       className="ChartPreview"
+      aria-label={chartTypeLabel}
       onClick={() => {
         if (chartElements) {
           props.onClick(props.chartType, chartElements);
         }
       }}
     >
-      <div ref={previewRef} />
+      <div className="ChartPreview__canvas" ref={previewRef} />
+      <div className="ChartPreview__label">{chartTypeLabel}</div>
+    </button>
+  );
+};
+
+const PlainTextPreviewBtn = (props: {
+  rawText: string;
+  onClick: OnPlainTextPaste;
+}) => {
+  const previewRef = useRef<HTMLDivElement | null>(null);
+  const { theme } = useUIAppState();
+
+  useLayoutEffect(() => {
+    if (!props.rawText) {
+      return;
+    }
+
+    const textElement = newTextElement({
+      text: props.rawText,
+      x: 0,
+      y: 0,
+    });
+
+    const previewNode = previewRef.current!;
+
+    (async () => {
+      const svg = await exportToSvg(
+        [textElement],
+        {
+          exportBackground: false,
+          viewBackgroundColor: "#fff",
+          exportWithDarkMode: theme === "dark",
+        },
+        null,
+        {
+          skipInliningFonts: true,
+        },
+      );
+      svg.querySelector(".style-fonts")?.remove();
+      previewNode.replaceChildren();
+      previewNode.appendChild(svg);
+    })();
+
+    return () => {
+      previewNode.replaceChildren();
+    };
+  }, [props.rawText, theme]);
+
+  return (
+    <button
+      type="button"
+      className="ChartPreview"
+      aria-label={t("labels.chartType_plaintext")}
+      onClick={() => {
+        props.onClick(props.rawText);
+      }}
+    >
+      <div className="ChartPreview__canvas" ref={previewRef} />
+      <div className="ChartPreview__label">
+        {t("labels.chartType_plaintext")}
+      </div>
     </button>
   );
 };
 
 export const PasteChartDialog = ({
-  setAppState,
+  data,
-  appState,
+  rawText,
   onClose,
 }: {
-  appState: UIAppState;
+  data: Spreadsheet;
+  rawText: string;
   onClose: () => void;
-  setAppState: React.Component<any, UIAppState>["setState"];
 }) => {
-  const { onInsertElements } = useApp();
+  const { onInsertElements, focusContainer } = useApp();
+  const [colorSeed, setColorSeed] = useState(Math.random());
+
+  const handleReshuffleColors = React.useCallback(() => {
+    setColorSeed(Math.random());
+  }, []);
+
   const handleClose = React.useCallback(() => {
     if (onClose) {
       onClose();
@@ -103,36 +198,72 @@ export const PasteChartDialog = ({
   const handleChartClick = (chartType: ChartType, elements: ChartElements) => {
     onInsertElements(elements);
     trackEvent("paste", "chart", chartType);
-    setAppState({
+    onClose();
-      currentChartType: chartType,
+    focusContainer();
-      pasteDialog: {
+  };
-        shown: false,
+
-        data: null,
+  const handlePlainTextClick = (rawText: string) => {
-      },
+    const textElement = newTextElement({
+      text: rawText,
+      x: 0,
+      y: 0,
     });
+    onInsertElements([textElement]);
+    trackEvent("paste", "chart", "plaintext");
+    onClose();
+    focusContainer();
   };
 
   return (
     <Dialog
-      size="small"
+      size="regular"
       onCloseRequest={handleClose}
-      title={t("labels.pasteCharts")}
+      title={
+        <div className="PasteChartDialog__title">
+          <div className="PasteChartDialog__titleText">
+            {t("labels.pasteCharts")}
+          </div>
+          <div
+            className="PasteChartDialog__reshuffleBtn"
+            onClick={handleReshuffleColors}
+            role="button"
+            tabIndex={0}
+            onKeyDown={(event) => {
+              if (event.key === "Enter" || event.key === " ") {
+                event.preventDefault();
+                handleReshuffleColors();
+              }
+            }}
+          >
+            {bucketFillIcon}
+          </div>
+        </div>
+      }
       className={"PasteChartDialog"}
       autofocus={false}
     >
       <div className={"container"}>
-        <ChartPreviewBtn
+        {(["bar", "line", "radar"] as const).map((chartType) => {
-          chartType="bar"
+          if (!isSpreadsheetValidForChartType(data, chartType)) {
-          spreadsheet={appState.pasteDialog.data}
+            return null;
-          selected={appState.currentChartType === "bar"}
+          }
-          onClick={handleChartClick}
+
-        />
+          return (
-        <ChartPreviewBtn
+            <ChartPreviewBtn
-          chartType="line"
+              key={chartType}
-          spreadsheet={appState.pasteDialog.data}
+              chartType={chartType}
-          selected={appState.currentChartType === "line"}
+              spreadsheet={data}
-          onClick={handleChartClick}
+              colorSeed={colorSeed}
-        />
+              onClick={handleChartClick}
+            />
+          );
+        })}
+        {rawText && (
+          <PlainTextPreviewBtn
+            rawText={rawText}
+            onClick={handlePlainTextClick}
+          />
+        )}
       </div>
     </Dialog>
   );