fix: Arrow z-index whenunder bound element

Signed-off-by: Mark Tolmacs <mark@lazycat.hu>
2026-02-16 13:13:13 +00:00
128 changed files with 2751 additions and 9237 deletions
@@ -39,26 +39,5 @@
        "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"]
-          }
-        ]
-      }
-    }
-  ]
+  }
 }
@@ -3,14 +3,14 @@
  "version": "1.0.0",
  "private": true,
  "dependencies": {
-    "@excalidraw/excalidraw": "*",
-    "browser-fs-access": "0.38.0",
    "react": "19.0.0",
-    "react-dom": "19.0.0"
+    "react-dom": "19.0.0",
+    "@excalidraw/excalidraw": "*",
+    "browser-fs-access": "0.29.1"
  },
  "devDependencies": {
-    "typescript": "^5",
-    "vite": "5.0.12"
+    "vite": "5.0.12",
+    "typescript": "^5"
  },
  "scripts": {
    "start": "vite",
@@ -4,6 +4,8 @@ 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;
@@ -52,6 +54,40 @@ 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>;
 };

@@ -5,8 +5,6 @@ import {
  CaptureUpdateAction,
  reconcileElements,
  useEditorInterface,
-  ExcalidrawAPIProvider,
-  useExcalidrawAPI,
 } from "@excalidraw/excalidraw";
 import { trackEvent } from "@excalidraw/excalidraw/analytics";
 import { getDefaultAppState } from "@excalidraw/excalidraw/appState";
@@ -36,6 +34,7 @@ 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 {
@@ -75,7 +74,6 @@ 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";
@@ -116,7 +114,6 @@ import {
 } from "./data";

 import { updateStaleImageStatuses } from "./data/FileManager";
-import { FileStatusStore } from "./data/fileStatusStore";
 import {
  importFromLocalStorage,
  importUsernameFromLocalStorage,
@@ -372,8 +369,6 @@ const initializeScene = async (opts: {
 };

 const ExcalidrawWrapper = () => {
-  const excalidrawAPI = useExcalidrawAPI();
-
  const [errorMessage, setErrorMessage] = useState("");
  const isCollabDisabled = isRunningInIframe();

@@ -404,6 +399,9 @@ const ExcalidrawWrapper = () => {
    }, VERSION_TIMEOUT);
  }, []);

+  const [excalidrawAPI, excalidrawRefCallback] =
+    useCallbackRefState<ExcalidrawImperativeAPI>();
+
  const [, setShareDialogState] = useAtom(shareDialogStateAtom);
  const [collabAPI] = useAtom(collabAPIAtom);
  const [isCollaborating] = useAtomWithInitialValue(isCollaboratingAtom, () => {
@@ -435,15 +433,18 @@ const ExcalidrawWrapper = () => {
    }
  }, [excalidrawAPI]);

-  // ---------------------------------------------------------------------------
-  // Hoisted loadImages
-  // ---------------------------------------------------------------------------
-  const loadImages = useCallback(
-    (data: ResolutionType<typeof initializeScene>, isInitialLoad = false) => {
-      if (!data.scene || !excalidrawAPI) {
+  useEffect(() => {
+    if (!excalidrawAPI || (!isCollabDisabled && !collabAPI)) {
+      return;
+    }
+
+    const loadImages = (
+      data: ResolutionType<typeof initializeScene>,
+      isInitialLoad = false,
+    ) => {
+      if (!data.scene) {
        return;
      }
-
      if (collabAPI?.isCollaborating()) {
        if (data.scene.elements) {
          collabAPI
@@ -470,12 +471,6 @@ 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,
@@ -487,18 +482,12 @@ 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(async ({ loadedFiles, erroredFiles }) => {
+              .then(({ loadedFiles, erroredFiles }) => {
                if (loadedFiles.length) {
                  excalidrawAPI.addFiles(loadedFiles);
                }
@@ -511,19 +500,10 @@ 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);
@@ -648,7 +628,7 @@ const ExcalidrawWrapper = () => {
        false,
      );
    };
-  }, [isCollabDisabled, collabAPI, excalidrawAPI, setLangCode, loadImages]);
+  }, [isCollabDisabled, collabAPI, excalidrawAPI, setLangCode]);

  useEffect(() => {
    const unloadHandler = (event: BeforeUnloadEvent) => {
@@ -793,56 +773,6 @@ 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
@@ -909,8 +839,8 @@ const ExcalidrawWrapper = () => {
      })}
    >
      <Excalidraw
+        excalidrawAPI={excalidrawRefCallback}
        onChange={onChange}
-        onExport={onExport}
        initialData={initialStatePromiseRef.current.promise}
        isCollaborating={isCollaborating}
        onPointerUpdate={collabAPI?.onPointerUpdate}
@@ -1276,9 +1206,7 @@ const ExcalidrawApp = () => {
  return (
    <TopErrorBoundary>
      <Provider store={appJotaiStore}>
-        <ExcalidrawAPIProvider>
-          <ExcalidrawWrapper />
-        </ExcalidrawAPIProvider>
+        <ExcalidrawWrapper />
      </Provider>
    </TopErrorBoundary>
  );
@@ -72,7 +72,6 @@ import {
  FileManager,
  updateStaleImageStatuses,
 } from "../data/FileManager";
-import { FileStatusStore } from "../data/fileStatusStore";
 import { LocalData } from "../data/LocalData";
 import {
  isSavedToFirebase,
@@ -150,7 +149,6 @@ 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) {
@@ -414,6 +414,7 @@ export const debugRenderer = throttleRAF(
  ) => {
    _debugRenderer(canvas, appState, elements, scale);
  },
+  { trailing: true },
 );

 export const loadSavedDebugState = () => {
@@ -40,12 +40,10 @@ export class FileManager {

  private _getFiles;
  private _saveFiles;
-  private _onFileStatusChange;

  constructor({
    getFiles,
    saveFiles,
-    onFileStatusChange,
  }: {
    getFiles: (fileIds: FileId[]) => Promise<{
      loadedFiles: BinaryFileData[];
@@ -55,13 +53,9 @@ 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;
  }

  /**
@@ -152,8 +146,6 @@ export class FileManager {
      this.fetchingFiles.set(id, true);
    }

-    this._onFileStatusChange?.(ids.map((id) => [id, "loading"]));
-
    try {
      const { loadedFiles, erroredFiles } = await this._getFiles(ids);

@@ -164,13 +156,6 @@ 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) {
@@ -210,13 +195,6 @@ 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();
@@ -42,7 +42,6 @@ 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";

@@ -167,7 +166,6 @@ export class LocalData {
  // ---------------------------------------------------------------------------

  static fileStorage = new LocalFileManager({
-    onFileStatusChange: FileStatusStore.updateStatuses.bind(FileStatusStore),
    getFiles(ids) {
      return getMany(ids, filesStore).then(
        async (filesData: (BinaryFileData | undefined)[]) => {
@@ -1,48 +0,0 @@
-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 };
-  }
-}
@@ -1,3 +1,9 @@
+declare global {
+  interface Window {
+    debug: typeof Debug;
+  }
+}
+
 const lessPrecise = (num: number, precision = 5) =>
  parseFloat(num.toPrecision(precision));

@@ -151,70 +157,6 @@ 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;
@@ -106,10 +106,6 @@ 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";
-            }
          },
        },
      },
@@ -154,11 +150,6 @@ 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: [
            {
@@ -198,7 +189,7 @@ export default defineConfig(({ mode }) => {
              },
            },
            {
-              urlPattern: new RegExp("(.chunk-.+|CodeMirrorEditor-.+)\\.js"),
+              urlPattern: new RegExp(".chunk-.+.js"),
              handler: "CacheFirst",
              options: {
                cacheName: "chunk",
@@ -1,74 +0,0 @@
-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');
-  });
-});
@@ -1,136 +0,0 @@
-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();
-  }
-}
@@ -240,21 +240,22 @@ export const DEFAULT_ELEMENT_BACKGROUND_COLOR_PALETTE = {
 // -----------------------------------------------------------------------------

 // !!!MUST BE WITHOUT GRAY, TRANSPARENT AND BLACK!!!
-export const getAllColorsSpecificShade = (index: 0 | 1 | 2 | 3 | 4) => [
-  // 2nd row
-  COLOR_PALETTE.cyan[index],
-  COLOR_PALETTE.blue[index],
-  COLOR_PALETTE.violet[index],
-  COLOR_PALETTE.grape[index],
-  COLOR_PALETTE.pink[index],
+export const getAllColorsSpecificShade = (index: 0 | 1 | 2 | 3 | 4) =>
+  [
+    // 2nd row
+    COLOR_PALETTE.cyan[index],
+    COLOR_PALETTE.blue[index],
+    COLOR_PALETTE.violet[index],
+    COLOR_PALETTE.grape[index],
+    COLOR_PALETTE.pink[index],

-  // 3rd row
-  COLOR_PALETTE.green[index],
-  COLOR_PALETTE.teal[index],
-  COLOR_PALETTE.yellow[index],
-  COLOR_PALETTE.orange[index],
-  COLOR_PALETTE.red[index],
-];
+    // 3rd row
+    COLOR_PALETTE.green[index],
+    COLOR_PALETTE.teal[index],
+    COLOR_PALETTE.yellow[index],
+    COLOR_PALETTE.orange[index],
+    COLOR_PALETTE.red[index],
+  ] as const;

 // -----------------------------------------------------------------------------
 // other helpers
@@ -11,7 +11,4 @@ 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";
@@ -3,12 +3,6 @@ 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()", () => {
@@ -85,87 +79,4 @@ 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();
-    });
-  });
 });
@@ -1,7 +1,5 @@
 import { average } from "@excalidraw/math";

-import type { GlobalCoord } from "@excalidraw/math";
-
 import type { FontFamilyValues, FontString } from "@excalidraw/element/types";

 import type {
@@ -88,8 +86,7 @@ export const isWritableElement = (
    (target.type === "text" ||
      target.type === "number" ||
      target.type === "password" ||
-      target.type === "search")) ||
-  (target instanceof HTMLElement && target.closest(".cm-editor") !== null);
+      target.type === "search"));

 export const getFontFamilyString = ({
  fontFamily,
@@ -151,27 +148,38 @@ export const debounce = <T extends any[]>(
  return ret;
 };

-// throttle callback to execute once per animation frame using the latest args
-export const throttleRAF = <T extends any[]>(fn: (...args: T) => void) => {
+// throttle callback to execute once per animation frame
+export const throttleRAF = <T extends any[]>(
+  fn: (...args: T) => void,
+  opts?: { trailing?: boolean },
+) => {
  let timerId: number | null = null;
  let lastArgs: T | null = null;
+  let lastArgsTrailing: T | null = null;

-  const scheduleFunc = () => {
+  const scheduleFunc = (args: T) => {
    timerId = window.requestAnimationFrame(() => {
      timerId = null;
-      const args = lastArgs;
+      fn(...args);
      lastArgs = null;
-
-      if (args) {
-        fn(...args);
+      if (lastArgsTrailing) {
+        lastArgs = lastArgsTrailing;
+        lastArgsTrailing = null;
+        scheduleFunc(lastArgs);
      }
    });
  };

  const ret = (...args: T) => {
+    if (isTestEnv()) {
+      fn(...args);
+      return;
+    }
    lastArgs = args;
    if (timerId === null) {
-      scheduleFunc();
+      scheduleFunc(lastArgs);
+    } else if (opts?.trailing) {
+      lastArgsTrailing = args;
    }
  };
  ret.flush = () => {
@@ -180,12 +188,12 @@ export const throttleRAF = <T extends any[]>(fn: (...args: T) => void) => {
      timerId = null;
    }
    if (lastArgs) {
-      fn(...lastArgs);
-      lastArgs = null;
+      fn(...(lastArgsTrailing || lastArgs));
+      lastArgs = lastArgsTrailing = null;
    }
  };
  ret.cancel = () => {
-    lastArgs = null;
+    lastArgs = lastArgsTrailing = null;
    if (timerId !== null) {
      cancelAnimationFrame(timerId);
      timerId = null;
@@ -433,7 +441,7 @@ export const viewportCoordsToSceneCoords = (
  const x = (clientX - offsetLeft) / zoom.value - scrollX;
  const y = (clientY - offsetTop) / zoom.value - scrollY;

-  return { x, y } as GlobalCoord;
+  return { x, y };
 };

 export const sceneCoordsToViewportCoords = (
@@ -1322,10 +1330,3 @@ 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);
-};
@@ -1,70 +0,0 @@
-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);
-    });
-  }
-}
@@ -438,8 +438,6 @@ export class Scene {
    options: {
      informMutation: boolean;
      isDragging: boolean;
-      isBindingEnabled?: boolean;
-      isMidpointSnappingEnabled?: boolean;
    } = {
      informMutation: true,
      isDragging: false,
@@ -43,6 +43,7 @@ export const alignElements = (
      // update bound elements
      updateBoundElements(element, scene, {
        simultaneouslyUpdated: group,
+        indirectArrowUpdate: true,
      });
      return updatedEle;
    });
@@ -42,7 +42,6 @@ export const isFocusPointVisible = (
    isBindingEnabled: AppState["isBindingEnabled"];
    zoom: AppState["zoom"];
  },
-  startOrEnd: "start" | "end",
  ignoreOverlap = false,
 ): boolean => {
  // No focus point management for elbow arrows, because elbow arrows
@@ -77,25 +76,14 @@ export const isFocusPointVisible = (
    }
  }

-  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,
-    })
-  );
+  return hitElementItself({
+    element: bindableElement,
+    elementsMap,
+    point: focusPoint,
+    threshold: getBindingGap(bindableElement, arrow),
+    overrideShouldTestInside: true,
+  });
 };

 // Updates the arrow endpoints in "orbit" configuration
@@ -141,7 +129,6 @@ const focusPointUpdate = (
      currentBinding,
      bindableElement,
      elementsMap,
-      true,
    );

    if (newPoint) {
@@ -366,7 +353,6 @@ export const handleFocusPointPointerDown = (
          bindableElement,
          elementsMap,
          appState,
-          "start",
        ) &&
        pointDistance(pointerPos, focusPoint) <= hitThreshold
      ) {
@@ -401,7 +387,6 @@ export const handleFocusPointPointerDown = (
          bindableElement,
          elementsMap,
          appState,
-          "end",
        ) &&
        pointDistance(pointerPos, focusPoint) <= hitThreshold
      ) {
@@ -516,7 +501,6 @@ export const handleFocusPointHover = (
          bindableElement,
          elementsMap,
          appState,
-          "start",
        ) &&
        pointDistance(pointerPos, focusPoint) <= hitThreshold
      ) {
@@ -545,7 +529,6 @@ export const handleFocusPointHover = (
          bindableElement,
          elementsMap,
          appState,
-          "end",
        ) &&
        pointDistance(pointerPos, focusPoint) <= hitThreshold
      ) {
@@ -1,4 +1,5 @@
 import {
+  KEYS,
  arrayToMap,
  getFeatureFlag,
  invariant,
@@ -26,7 +27,11 @@ import type { AppState } from "@excalidraw/excalidraw/types";
 import type { MapEntry, Mutable } from "@excalidraw/common/utility-types";
 import type { Bounds } from "@excalidraw/common";

-import { getCenterForBounds } from "./bounds";
+import {
+  doBoundsIntersect,
+  getCenterForBounds,
+  getElementBounds,
+} from "./bounds";
 import {
  getAllHoveredElementAtPoint,
  getHoveredElementForBinding,
@@ -62,6 +67,7 @@ import {
  deconstructRectanguloidElement,
  projectFixedPointOntoDiagonal,
 } from "./utils";
+import { moveArrowAboveBindable } from "./zindex";

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

@@ -111,7 +117,6 @@ export type BindingStrategy =
 */
 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 = (
@@ -136,6 +141,12 @@ export const maxBindingDistance_simple = (zoom?: AppState["zoom"]): number => {
  );
 };

+export const shouldEnableBindingForPointerEvent = (
+  event: React.PointerEvent<HTMLElement>,
+) => {
+  return !event[KEYS.CTRL_OR_CMD];
+};
+
 export const isBindingEnabled = (appState: {
  isBindingEnabled: AppState["isBindingEnabled"];
 }): boolean => {
@@ -170,20 +181,8 @@ export const bindOrUnbindBindingElement = (
    },
  );

-  bindOrUnbindBindingElementEdge(
-    arrow,
-    start,
-    "start",
-    scene,
-    appState.isBindingEnabled,
-  );
-  bindOrUnbindBindingElementEdge(
-    arrow,
-    end,
-    "end",
-    scene,
-    appState.isBindingEnabled,
-  );
+  bindOrUnbindBindingElementEdge(arrow, start, "start", scene);
+  bindOrUnbindBindingElementEdge(arrow, end, "end", scene);
  if (start.focusPoint || end.focusPoint) {
    // If the strategy dictates a focus point override, then
    // update the arrow points to point to the focus point.
@@ -226,21 +225,12 @@ 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,
-      shouldSnapToOutline,
-    );
+    bindBindingElement(arrow, element, mode, startOrEnd, scene, focusPoint);
  }
 };

@@ -812,7 +802,6 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
              startDragged ? "start" : "end",
              elementsMap,
              appState.zoom,
-              appState.isMidpointSnappingEnabled,
            ) || globalPoint,
        }
    : { mode: null };
@@ -822,23 +811,13 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
    startDragged ? -1 : 0,
    elementsMap,
  );
-  const pointIsCloseToOtherElement =
-    otherFocusPoint &&
-    otherBindableElement &&
-    hitElementItself({
-      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",
@@ -857,7 +836,6 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
              startDragged ? "end" : "start",
              elementsMap,
              appState.zoom,
-              appState.isMidpointSnappingEnabled,
            ) || otherEndpoint,
        }
      : { mode: undefined }
@@ -1021,7 +999,6 @@ export const bindBindingElement = (
  startOrEnd: "start" | "end",
  scene: Scene,
  focusPoint?: GlobalPoint,
-  shouldSnapToOutline = true,
 ): void => {
  const elementsMap = scene.getNonDeletedElementsMap();

@@ -1036,7 +1013,6 @@ export const bindBindingElement = (
        hoveredElement,
        startOrEnd,
        elementsMap,
-        shouldSnapToOutline,
      ),
    };
  } else {
@@ -1108,6 +1084,8 @@ export const updateBoundElements = (
  options?: {
    simultaneouslyUpdated?: readonly ExcalidrawElement[];
    changedElements?: Map<string, ExcalidrawElement>;
+    indirectArrowUpdate?: boolean;
+    skipArrowZindexUpdate?: boolean;
  },
 ) => {
  if (!isBindableElement(changedElement)) {
@@ -1176,6 +1154,21 @@ export const updateBoundElements = (
          );

          if (point) {
+            if (!options?.skipArrowZindexUpdate) {
+              moveArrowAboveBindable(
+                LinearElementEditor.getPointGlobalCoordinates(
+                  element,
+                  point,
+                  elementsMap,
+                ),
+                element,
+                scene.getNonDeletedElements(),
+                scene.getNonDeletedElementsMap(),
+                scene,
+                changedElement,
+              );
+            }
+
            return [
              bindingProp === "startBinding" ? 0 : element.points.length - 1,
              { point },
@@ -1202,6 +1195,11 @@ export const updateBoundElements = (
  };

  boundElementsVisitor(elementsMap, changedElement, visitor);
+
+  if (options?.indirectArrowUpdate) {
+    boundElementsVisitor(elementsMap, changedElement, visitor);
+    boundElementsVisitor(elementsMap, changedElement, visitor);
+  }
 };

 const updateArrowBindings = (
@@ -1370,7 +1368,6 @@ export const bindPointToSnapToElementOutline = (
  startOrEnd: "start" | "end",
  elementsMap: ElementsMap,
  customIntersector?: LineSegment<GlobalPoint>,
-  isMidpointSnappingEnabled = true,
 ): GlobalPoint => {
  const elbowed = isElbowArrow(arrowElement);
  const point = LinearElementEditor.getPointAtIndexGlobalCoordinates(
@@ -1410,9 +1407,13 @@ export const bindPointToSnapToElementOutline = (
    const isHorizontal = headingIsHorizontal(
      headingForPointFromElement(bindableElement, aabb, point),
    );
-    const snapPoint = isMidpointSnappingEnabled
-      ? snapToMid(bindableElement, elementsMap, edgePoint, 0.05, arrowElement)
-      : undefined;
+    const snapPoint = snapToMid(
+      bindableElement,
+      elementsMap,
+      edgePoint,
+      0.05,
+      arrowElement,
+    );
    const resolved = snapPoint || point;
    const otherPoint = pointFrom<GlobalPoint>(
      isHorizontal ? bindableCenter[0] : resolved[0],
@@ -1708,41 +1709,10 @@ export const snapToMid = (
  return undefined;
 };

-const extractBinding = (
-  arrow: ExcalidrawArrowElement,
-  startOrEnd: "startBinding" | "endBinding",
-  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;
+const compareElementArea = (
+  a: ExcalidrawBindableElement,
+  b: ExcalidrawBindableElement,
+) => b.width ** 2 + b.height ** 2 - (a.width ** 2 + a.height ** 2);

 export const updateBoundPoint = (
  arrow: NonDeleted<ExcalidrawArrowElement>,
@@ -1750,7 +1720,9 @@ export const updateBoundPoint = (
  binding: FixedPointBinding | null | undefined,
  bindableElement: ExcalidrawBindableElement,
  elementsMap: ElementsMap,
-  dragging?: boolean,
+  opts?: {
+    customIntersector?: LineSegment<GlobalPoint>;
+  },
 ): LocalPoint | null => {
  if (
    binding == null ||
@@ -1765,139 +1737,150 @@ export const updateBoundPoint = (
    return null;
  }

-  const focusPoint = getGlobalFixedPointForBindableElement(
+  const global = 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);

-  // 0. Short-circuit for inside binding as it doesn't require any
-  // calculations and is not affected by other bindings
-  if (binding.mode === "inside") {
-    return LinearElementEditor.createPointAt(
-      arrow,
-      elementsMap,
-      focusPoint[0],
-      focusPoint[1],
-      null,
-    );
-  }
-
-  const { element: otherBindable, focusPoint: otherFocusPoint } =
-    extractBinding(
-      arrow,
-      startOrEnd === "startBinding" ? "endBinding" : "startBinding",
-      elementsMap,
-    );
-  const otherArrowPoint = LinearElementEditor.getPointAtIndexGlobalCoordinates(
-    arrow,
-    startOrEnd === "startBinding" ? 1 : -2,
-    elementsMap,
-  );
-  const otherFocusPointOrArrowPoint =
-    arrow.points.length === 2
-      ? otherFocusPoint || otherArrowPoint
-      : otherArrowPoint;
-  const intersector =
-    otherFocusPointOrArrowPoint &&
-    lineSegment(focusPoint, otherFocusPointOrArrowPoint);
-  const otherOutlinePoint =
-    otherBindable &&
-    intersector &&
-    intersectElementWithLineSegment(
-      otherBindable,
-      elementsMap,
-      intersector,
-      getBindingGap(otherBindable, arrow),
-    ).sort(
-      (a, b) => pointDistanceSq(a, focusPoint) - pointDistanceSq(b, focusPoint),
-    )[0];
-  const outlinePoint =
-    intersector &&
-    intersectElementWithLineSegment(
-      bindableElement,
-      elementsMap,
-      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
+  // GOAL: If the arrow becomes too short, we want to jump the arrow endpoints
+  // to the exact focus points on the elements.
+  // INTUITION: We're not interested in the exacts length of the arrow (which
+  // will change if we change where we route it), we want to know the length of
+  // 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 (
-    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,
-    })
+    !isOverlapping &&
+    !elbowed &&
+    arrow.startBinding &&
+    arrow.endBinding &&
+    otherBindableElement &&
+    arrow.points.length === 2
  ) {
-    return LinearElementEditor.createPointAt(
+    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 = opts?.customIntersector;
+  if (!elbowed && !_customIntersector) {
+    const [x1, y1, x2, y2] = LinearElementEditor.getElementAbsoluteCoords(
      arrow,
      elementsMap,
-      resolvedTarget[0],
-      resolvedTarget[1],
-      null,
+    );
+    const center = pointFrom<GlobalPoint>((x1 + x2) / 2, (y1 + y2) / 2);
+    const edgePoint = 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 otherTargetPoint = otherBindable
-    ? otherOutlinePoint || otherFocusPoint || otherArrowPoint
-    : otherArrowPoint;
-  const arrowTooShort =
-    pointDistance(otherTargetPoint, outlinePoint || focusPoint) <=
-    BASE_ARROW_MIN_LENGTH;
+  const maybeOutlineGlobal =
+    binding.mode === "orbit" && bindableElement
+      ? isNested
+        ? global
+        : bindPointToSnapToElementOutline(
+            {
+              ...arrow,
+              points: [
+                pointIndex === 0
+                  ? LinearElementEditor.createPointAt(
+                      arrow,
+                      elementsMap,
+                      global[0],
+                      global[1],
+                      null,
+                    )
+                  : arrow.points[0],
+                ...arrow.points.slice(1, -1),
+                pointIndex === arrow.points.length - 1
+                  ? LinearElementEditor.createPointAt(
+                      arrow,
+                      elementsMap,
+                      global[0],
+                      global[1],
+                      null,
+                    )
+                  : arrow.points[arrow.points.length - 1],
+              ],
+            },
+            bindableElement,
+            pointIndex === 0 ? "start" : "end",
+            elementsMap,
+            _customIntersector,
+          )
+      : global;

-  // 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,
-    outlinePoint?.[0] || focusPoint[0],
-    outlinePoint?.[1] || focusPoint[1],
+    maybeOutlineGlobal[0],
+    maybeOutlineGlobal[1],
    null,
  );
 };
@@ -1907,8 +1890,6 @@ export const calculateFixedPointForElbowArrowBinding = (
  hoveredElement: ExcalidrawBindableElement,
  startOrEnd: "start" | "end",
  elementsMap: ElementsMap,
-  shouldSnapToOutline = true,
-  isMidpointSnappingEnabled = true,
 ): { fixedPoint: FixedPoint } => {
  const bounds = [
    hoveredElement.x,
@@ -1916,20 +1897,12 @@ export const calculateFixedPointForElbowArrowBinding = (
    hoveredElement.x + hoveredElement.width,
    hoveredElement.y + hoveredElement.height,
  ] as Bounds;
-  const snappedPoint = shouldSnapToOutline
-    ? bindPointToSnapToElementOutline(
-        linearElement,
-        hoveredElement,
-        startOrEnd,
-        elementsMap,
-        undefined,
-        isMidpointSnappingEnabled,
-      )
-    : LinearElementEditor.getPointAtIndexGlobalCoordinates(
-        linearElement,
-        startOrEnd === "start" ? 0 : -1,
-        elementsMap,
-      );
+  const snappedPoint = bindPointToSnapToElementOutline(
+    linearElement,
+    hoveredElement,
+    startOrEnd,
+    elementsMap,
+  );
  const globalMidPoint = pointFrom(
    bounds[0] + (bounds[2] - bounds[0]) / 2,
    bounds[1] + (bounds[3] - bounds[1]) / 2,
@@ -2475,37 +2448,21 @@ export const getArrowLocalFixedPoints = (
  ];
 };

-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>(
+export const normalizeFixedPoint = <T extends FixedPoint | null>(
  fixedPoint: T,
-): FixedPoint => {
-  if (!isFixedPoint(fixedPoint)) {
-    return [0.5001, 0.5001];
-  }
-
-  const EPSILON = 0.0001;
-
+): T extends null ? null : FixedPoint => {
  // Do not allow a precise 0.5 for fixed point ratio
  // to avoid jumping arrow heading due to floating point imprecision
  if (
-    Math.abs(fixedPoint[0] - 0.5) < EPSILON ||
-    Math.abs(fixedPoint[1] - 0.5) < EPSILON
+    fixedPoint &&
+    (Math.abs(fixedPoint[0] - 0.5) < 0.0001 ||
+      Math.abs(fixedPoint[1] - 0.5) < 0.0001)
  ) {
    return fixedPoint.map((ratio) =>
-      Math.abs(ratio - 0.5) < EPSILON ? 0.5001 : ratio,
-    ) as FixedPoint;
+      Math.abs(ratio - 0.5) < 0.0001 ? 0.5001 : ratio,
+    ) as T extends null ? null : FixedPoint;
  }
-
-  return fixedPoint;
+  return fixedPoint as any as T extends null ? null : FixedPoint;
 };

 type Side =
@@ -1970,6 +1970,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
        // TODO: with precise bindings this is quite expensive, so consider optimisation so it's only triggered when the arrow does not intersect (imprecise) element bounds
        updateBoundElements(element, scene, {
          changedElements: changed,
+          skipArrowZindexUpdate: true,
        });
      }
    }
@@ -915,8 +915,6 @@ export const updateElbowArrowPoints = (
  },
  options?: {
    isDragging?: boolean;
-    isBindingEnabled?: boolean;
-    isMidpointSnappingEnabled?: boolean;
  },
 ): ElementUpdate<ExcalidrawElbowArrowElement> => {
  if (arrow.points.length < 2) {
@@ -1204,8 +1202,6 @@ const getElbowArrowData = (
  options?: {
    isDragging?: boolean;
    zoom?: AppState["zoom"];
-    isBindingEnabled?: boolean;
-    isMidpointSnappingEnabled?: boolean;
  },
 ) => {
  const origStartGlobalPoint: GlobalPoint = pointTranslate<
@@ -1219,7 +1215,7 @@ const getElbowArrowData = (

  let hoveredStartElement = null;
  let hoveredEndElement = null;
-  if (options?.isDragging && options?.isBindingEnabled !== false) {
+  if (options?.isDragging) {
    const elements = Array.from(elementsMap.values());
    hoveredStartElement =
      getHoveredElement(
@@ -1259,8 +1255,6 @@ const getElbowArrowData = (
    hoveredStartElement,
    elementsMap,
    options?.isDragging,
-    options?.isBindingEnabled,
-    options?.isMidpointSnappingEnabled,
  );
  const endGlobalPoint = getGlobalPoint(
    {
@@ -1276,8 +1270,6 @@ const getElbowArrowData = (
    hoveredEndElement,
    elementsMap,
    options?.isDragging,
-    options?.isBindingEnabled,
-    options?.isMidpointSnappingEnabled,
  );
  const startHeading = getBindPointHeading(
    startGlobalPoint,
@@ -2221,18 +2213,14 @@ const getGlobalPoint = (
  element?: ExcalidrawBindableElement | null,
  elementsMap?: ElementsMap,
  isDragging?: boolean,
-  isBindingEnabled = true,
-  isMidpointSnappingEnabled = true,
 ): GlobalPoint => {
  if (isDragging) {
-    if (isBindingEnabled && element && elementsMap) {
+    if (element && elementsMap) {
      return bindPointToSnapToElementOutline(
        arrow,
        element,
        startOrEnd,
        elementsMap,
-        undefined,
-        isMidpointSnappingEnabled,
      );
    }

@@ -56,7 +56,7 @@ const RE_REDDIT =
 const RE_REDDIT_EMBED =
  /^<blockquote[\s\S]*?\shref=["'](https?:\/\/(?:www\.)?reddit\.com\/[^"']*)/i;

-const parseYouTubeLikeTimestamp = (url: string): number => {
+const parseYouTubeTimestamp = (url: string): number => {
  let timeParam: string | null | undefined;

  try {
@@ -85,57 +85,11 @@ const parseYouTubeLikeTimestamp = (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",
@@ -154,7 +108,6 @@ const ALLOW_SAME_ORIGIN = new Set([
  "youtu.be",
  "vimeo.com",
  "player.vimeo.com",
-  "drive.google.com",
  "figma.com",
  "twitter.com",
  "x.com",
@@ -189,7 +142,7 @@ export const getEmbedLink = (
  let aspectRatio = { w: 560, h: 840 };
  const ytLink = link.match(RE_YOUTUBE);
  if (ytLink?.[2]) {
-    const startTime = parseYouTubeLikeTimestamp(originalLink);
+    const startTime = parseYouTubeTimestamp(originalLink);
    const time = startTime > 0 ? `&start=${startTime}` : ``;
    const isPortrait = link.includes("shorts");
    type = "video";
@@ -248,36 +201,6 @@ 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";
@@ -9,6 +9,7 @@ import {
  vectorFromPoint,
  curveLength,
  curvePointAtLength,
+  lineSegment,
 } from "@excalidraw/math";

 import { getCurvePathOps } from "@excalidraw/utils/shape";
@@ -359,20 +360,11 @@ export class LinearElementEditor {
      linearElementEditor,
    );

-    LinearElementEditor.movePoints(
-      element,
-      app.scene,
-      positions,
-      {
-        startBinding: updates?.startBinding,
-        endBinding: updates?.endBinding,
-        moveMidPointsWithElement: updates?.moveMidPointsWithElement,
-      },
-      {
-        isBindingEnabled: app.state.isBindingEnabled,
-        isMidpointSnappingEnabled: app.state.isMidpointSnappingEnabled,
-      },
-    );
+    LinearElementEditor.movePoints(element, app.scene, positions, {
+      startBinding: updates?.startBinding,
+      endBinding: updates?.endBinding,
+      moveMidPointsWithElement: updates?.moveMidPointsWithElement,
+    });
    // Set the suggested binding from the updates if available
    if (isBindingElement(element, false)) {
      if (isBindingEnabled(app.state)) {
@@ -427,7 +419,6 @@ export class LinearElementEditor {
                "start",
                elementsMap,
                app.state.zoom,
-                app.state.isMidpointSnappingEnabled,
              )
            : linearElementEditor.initialState.altFocusPoint,
      },
@@ -548,20 +539,11 @@ export class LinearElementEditor {
      linearElementEditor,
    );

-    LinearElementEditor.movePoints(
-      element,
-      app.scene,
-      positions,
-      {
-        startBinding: updates?.startBinding,
-        endBinding: updates?.endBinding,
-        moveMidPointsWithElement: updates?.moveMidPointsWithElement,
-      },
-      {
-        isBindingEnabled: app.state.isBindingEnabled,
-        isMidpointSnappingEnabled: app.state.isMidpointSnappingEnabled,
-      },
-    );
+    LinearElementEditor.movePoints(element, app.scene, positions, {
+      startBinding: updates?.startBinding,
+      endBinding: updates?.endBinding,
+      moveMidPointsWithElement: updates?.moveMidPointsWithElement,
+    });

    // Set the suggested binding from the updates if available
    if (isBindingElement(element, false)) {
@@ -655,7 +637,6 @@ export class LinearElementEditor {
                "start",
                elementsMap,
                app.state.zoom,
-                app.state.isMidpointSnappingEnabled,
              )
            : linearElementEditor.initialState.altFocusPoint,
      },
@@ -1544,10 +1525,6 @@ export class LinearElementEditor {
      endBinding?: FixedPointBinding | null;
      moveMidPointsWithElement?: boolean | null;
    },
-    options?: {
-      isBindingEnabled?: boolean;
-      isMidpointSnappingEnabled?: boolean;
-    },
  ) {
    const { points } = element;

@@ -1616,8 +1593,6 @@ export class LinearElementEditor {
      otherUpdates,
      {
        isDragging: Array.from(pointUpdates.values()).some((t) => t.isDragging),
-        isBindingEnabled: options?.isBindingEnabled,
-        isMidpointSnappingEnabled: options?.isMidpointSnappingEnabled,
      },
    );
  }
@@ -1732,8 +1707,6 @@ export class LinearElementEditor {
      isDragging?: boolean;
      zoom?: AppState["zoom"];
      sceneElementsMap?: NonDeletedSceneElementsMap;
-      isBindingEnabled?: boolean;
-      isMidpointSnappingEnabled?: boolean;
    },
  ) {
    if (isElbowArrow(element)) {
@@ -1754,8 +1727,6 @@ 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?
@@ -2175,16 +2146,14 @@ const pointDraggingUpdates = (
        suggestedBinding: suggestedBindingElement
          ? {
              element: suggestedBindingElement,
-              midPoint: app.state.isMidpointSnappingEnabled
-                ? snapToMid(
-                    suggestedBindingElement,
-                    elementsMap,
-                    pointFrom<GlobalPoint>(
-                      scenePointerX - linearElementEditor.pointerOffset.x,
-                      scenePointerY - linearElementEditor.pointerOffset.y,
-                    ),
-                  )
-                : undefined,
+              midPoint: snapToMid(
+                suggestedBindingElement,
+                elementsMap,
+                pointFrom<GlobalPoint>(
+                  scenePointerX - linearElementEditor.pointerOffset.x,
+                  scenePointerY - linearElementEditor.pointerOffset.y,
+                ),
+              ),
            }
          : null,
      },
@@ -2370,6 +2339,19 @@ 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 =
@@ -2405,7 +2387,9 @@ const pointDraggingUpdates = (
        nextArrow.endBinding,
        endBindable,
        elementsMap,
-        endIsDragged,
+        {
+          customIntersector: endCustomIntersector,
+        },
      ) || nextArrow.points[nextArrow.points.length - 1]
    : nextArrow.points[nextArrow.points.length - 1];

@@ -2436,7 +2420,7 @@ const pointDraggingUpdates = (
          nextArrow.startBinding,
          startBindable,
          elementsMap,
-          startIsDragged,
+          { customIntersector: startCustomIntersector },
        ) || nextArrow.points[0]
      : nextArrow.points[0];

@@ -40,8 +40,6 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
  updates: ElementUpdate<TElement>,
  options?: {
    isDragging?: boolean;
-    isBindingEnabled?: boolean;
-    isMidpointSnappingEnabled?: boolean;
  },
 ) => {
  let didChange = false;
@@ -15,7 +15,7 @@ import type {
  ValueOf,
 } from "@excalidraw/common/utility-types";

-export type ChartType = "bar" | "line" | "radar";
+export type ChartType = "bar" | "line";
 export type FillStyle = "hachure" | "cross-hatch" | "solid" | "zigzag";
 export type FontFamilyKeys = keyof typeof FONT_FAMILY;
 export type FontFamilyValues = typeof FONT_FAMILY[FontFamilyKeys];
@@ -43,11 +43,6 @@ import { LinearElementEditor } from "./linearElementEditor";
 import { isRectangularElement } from "./typeChecks";
 import { maxBindingDistance_simple } from "./binding";

-import {
-  getGlobalFixedPointForBindableElement,
-  normalizeFixedPoint,
-} from "./binding";
-
 import type {
  ElementsMap,
  ExcalidrawArrowElement,
@@ -659,23 +654,20 @@ export const projectFixedPointOntoDiagonal = (
  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;
-    }
+  const sideMidPoint = getSnapOutlineMidPoint(
+    point,
+    element,
+    elementsMap,
+    zoom,
+  );
+  if (sideMidPoint) {
+    return sideMidPoint;
  }

  // Do the projection onto the diagonals (or center lines
@@ -685,35 +677,11 @@ export const projectFixedPointOntoDiagonal = (
    elementsMap,
  );

-  // 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(
+  const 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),
@@ -18,7 +18,6 @@ import type {
  NonDeletedExcalidrawElement,
  NonDeletedSceneElementsMap,
  Ordered,
-  OrderedExcalidrawElement,
 } from "./types";

 const isOfTargetFrame = (element: ExcalidrawElement, frameId: string) => {
@@ -157,7 +156,7 @@ export const moveArrowAboveBindable = (
  elementsMap: NonDeletedSceneElementsMap,
  scene: Scene,
  hit?: NonDeletedExcalidrawElement,
-): readonly OrderedExcalidrawElement[] => {
+) => {
  const hoveredElement = hit
    ? hit
    : getHoveredElementForBinding(point, elements, elementsMap);
@@ -1,4 +1,4 @@
-import { embeddableURLValidator, getEmbedLink } from "../src/embeddable";
+import { getEmbedLink } from "../src/embeddable";

 describe("YouTube timestamp parsing", () => {
  it("should parse YouTube URLs with timestamp in seconds", () => {
@@ -151,83 +151,3 @@ 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);
-  });
-});
@@ -11,92 +11,6 @@ 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`.
-
-### Features
-
- Added `onMount` and `onInitialize` props. `onMount` receives `{ excalidrawAPI, container }` once the editor root is mounted, and `onInitialize` fires once the initial scene has loaded.
-
-  ```tsx
-  <Excalidraw
-    onMount={({ excalidrawAPI, container }) => {
-      console.log(container);
-      excalidrawAPI.scrollToContent();
-    }}
-    onInitialize={(api) => {
-      api.refresh();
-    }}
-  />
-  ```
-
- Same events are also accessible imperatively through `api.onEvent(...)`.
-
-  ```tsx
-  <Excalidraw
-    onExcalidrawAPI={(api) => {
-      api.onEvent("editor:mount", ({ excalidrawAPI, container }) => {
-        excalidrawAPI.scrollToContent();
-        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)`.
-
- Exported `ExcalidrawAPIProvider`, `useExcalidrawAPI`, and `useAppStateValue` from the package entrypoint. The imperative API also now exposes `onStateChange`.
-
-  ```tsx
-  <ExcalidrawAPIProvider>
-    <Excalidraw />
-    <Logger />
-  </ExcalidrawAPIProvider>;
-
-  function Logger() {
-    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)
@@ -118,6 +118,7 @@ export const actionClearCanvas = register({
        gridStep: appState.gridStep,
        gridModeEnabled: appState.gridModeEnabled,
        stats: appState.stats,
+        pasteDialog: appState.pasteDialog,
        activeTool:
          appState.activeTool.type === "image"
            ? {
@@ -30,7 +30,7 @@ import { getSelectedElements, isSomeElementSelected } from "../scene";
 import { TrashIcon } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";

-import { useStylesPanelMode } from "../components/App";
+import { useStylesPanelMode } from "..";

 import { register } from "./register";

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

-import { useStylesPanelMode } from "../components/App";
+import { useStylesPanelMode } from "..";

 import { register } from "./register";

@@ -9,20 +9,18 @@ import { getNonDeletedElements } from "@excalidraw/element";

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

-import type { ExcalidrawElement, Theme } from "@excalidraw/element/types";
+import type { 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";
@@ -33,15 +31,7 @@ import "../components/ToolIcon.scss";

 import { register } from "./register";

-import type { JSONExportData } from "../data/json";
-
-import type {
-  AppClassProperties,
-  AppState,
-  BinaryFiles,
-  ExcalidrawProps,
-  OnExportProgress,
-} from "../types";
+import type { AppState } from "../types";

 export const actionChangeProjectName = register<AppState["name"]>({
  name: "changeProjectName",
@@ -160,143 +150,6 @@ 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",
@@ -310,62 +163,42 @@ export const actionSaveToActiveFile = register({
    );
  },
  perform: async (elements, appState, value, app) => {
-    if (onExportInProgress) {
-      return false;
-    }
-    onExportInProgress = true;
-
-    const previousFileHandle = appState.fileHandle;
-    const filename = app.getName();
-
-    const { abortController, data: exportedDataPromise } =
-      prepareDataForJSONExport(elements, appState, app.files, app);
+    const fileHandleExists = !!appState.fileHandle;

    try {
-      const { fileHandle } = isImageFileHandle(previousFileHandle)
+      const { fileHandle } = isImageFileHandle(appState.fileHandle)
        ? await resaveAsImageWithScene(
-            exportedDataPromise,
-            previousFileHandle,
-            filename,
+            elements,
+            appState,
+            app.files,
+            app.getName(),
          )
-        : await saveAsJSON({
-            data: exportedDataPromise,
-            filename,
-            fileHandle: previousFileHandle,
-          });
+        : await saveAsJSON(elements, appState, app.files, app.getName());

      return {
-        captureUpdate: CaptureUpdateAction.NEVER,
+        captureUpdate: CaptureUpdateAction.EVENTUALLY,
        appState: {
+          ...appState,
          fileHandle,
-          toast: {
-            message:
-              previousFileHandle && fileHandle?.name
-                ? t("toast.fileSavedToFilename").replace(
-                    "{filename}",
-                    `"${fileHandle.name}"`,
-                  )
-                : t("toast.fileSaved"),
-            duration: 1500,
-          },
+          toast: fileHandleExists
+            ? {
+                message: fileHandle?.name
+                  ? t("toast.fileSavedToFilename").replace(
+                      "{filename}",
+                      `"${fileHandle.name}"`,
+                    )
+                  : t("toast.fileSaved"),
+              }
+            : null,
        },
      };
    } catch (error: any) {
-      abortController.abort();
-
      if (error?.name !== "AbortError") {
        console.error(error);
      } else {
        console.warn(error);
      }
-      return {
-        captureUpdate: CaptureUpdateAction.NEVER,
-        appState: {
-          toast: null,
-        },
-      };
-    } finally {
-      onExportInProgress = false;
+      return { captureUpdate: CaptureUpdateAction.EVENTUALLY };
    }
  },
  keyTest: (event) =>
@@ -379,50 +212,36 @@ 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: savedFileHandle } = await saveAsJSON({
-        data: exportedDataPromise,
-        filename: app.getName(),
-        fileHandle: null,
-      });
-
+      const { fileHandle } = await saveAsJSON(
+        elements,
+        {
+          ...appState,
+          fileHandle: null,
+        },
+        app.files,
+        app.getName(),
+      );
      return {
-        captureUpdate: CaptureUpdateAction.NEVER,
+        captureUpdate: CaptureUpdateAction.EVENTUALLY,
        appState: {
+          ...appState,
          openDialog: null,
-          fileHandle: savedFileHandle,
+          fileHandle,
          toast: { message: t("toast.fileSaved") },
        },
      };
    } catch (error: any) {
-      abortController.abort();
      if (error?.name !== "AbortError") {
        console.error(error);
      } else {
        console.warn(error);
      }
-      return {
-        captureUpdate: CaptureUpdateAction.NEVER,
-        appState: {
-          toast: null,
-        },
-      };
-    } finally {
-      onExportInProgress = false;
+      return { captureUpdate: CaptureUpdateAction.EVENTUALLY };
    }
  },
  keyTest: (event) =>
-    event.key.toLowerCase() === KEYS.S &&
-    event.shiftKey &&
-    event[KEYS.CTRL_OR_CMD],
+    event.key === KEYS.S && event.shiftKey && event[KEYS.CTRL_OR_CMD],
  PanelComponent: ({ updateData }) => (
    <ToolButton
      type="button"
@@ -481,8 +300,7 @@ export const actionExportWithDarkMode = register<
  name: "exportWithDarkMode",
  label: "imageExportDialog.label.darkMode",
  trackEvent: { category: "export", action: "toggleTheme" },
-  perform: (_elements, appState, value, app) => {
-    app.sessionExportThemeOverride = value ? THEME.DARK : THEME.LIGHT;
+  perform: (_elements, appState, value) => {
    return {
      appState: { ...appState, exportWithDarkMode: value },
      captureUpdate: CaptureUpdateAction.EVENTUALLY,
@@ -18,7 +18,7 @@ import { HistoryChangedEvent } from "../history";
 import { useEmitter } from "../hooks/useEmitter";
 import { t } from "../i18n";

-import { useStylesPanelMode } from "../components/App";
+import { useStylesPanelMode } from "..";

 import type { History } from "../history";
 import type { AppClassProperties, AppState } from "../types";
@@ -1555,7 +1555,7 @@ const getArrowheadOptions = (flip: boolean) => {
      value: null,
      text: t("labels.arrowhead_none"),
      keyBinding: "q",
-      icon: <ArrowheadNoneIcon flip={flip} />,
+      icon: ArrowheadNoneIcon,
    },
    {
      value: "arrow",
@@ -1830,7 +1830,6 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
                  startElement,
                  "start",
                  elementsMap,
-                  appState.isBindingEnabled,
                ),
              }
            : null;
@@ -1844,7 +1843,6 @@ export const actionChangeArrowType = register<keyof typeof ARROW_TYPE>({
                  endElement,
                  "end",
                  elementsMap,
-                  appState.isBindingEnabled,
                ),
              }
            : null;
@@ -1,26 +0,0 @@
-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",
-});
@@ -1,23 +0,0 @@
-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,
-});
@@ -79,8 +79,6 @@ 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";
@@ -59,8 +59,6 @@ export type ActionName =
  | "gridMode"
  | "zenMode"
  | "objectsSnapMode"
-  | "arrowBinding"
-  | "midpointSnapping"
  | "stats"
  | "changeStrokeColor"
  | "changeBackgroundColor"
@@ -27,6 +27,7 @@ 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,
@@ -70,8 +71,6 @@ export const getDefaultAppState = (): Omit<
    gridStep: DEFAULT_GRID_STEP,
    gridModeEnabled: false,
    isBindingEnabled: true,
-    bindingPreference: "enabled",
-    isMidpointSnappingEnabled: true,
    defaultSidebarDockedPreference: false,
    isLoading: false,
    isResizing: false,
@@ -84,6 +83,7 @@ export const getDefaultAppState = (): Omit<
    openPopup: null,
    openSidebar: null,
    openDialog: null,
+    pasteDialog: { shown: false, data: null },
    previousSelectedElementIds: {},
    resizingElement: null,
    scrolledOutside: false,
@@ -150,6 +150,7 @@ 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 },
@@ -192,9 +193,7 @@ 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: true, export: false, server: false },
-  bindingPreference: { browser: true, export: false, server: false },
-  isMidpointSnappingEnabled: { browser: true, export: false, server: false },
+  isBindingEnabled: { browser: false, export: false, server: false },
  defaultSidebarDockedPreference: {
    browser: true,
    export: false,
@@ -213,6 +212,7 @@ 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 },
@@ -0,0 +1,481 @@
+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);
+};
@@ -1,103 +0,0 @@
-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];
-};
@@ -1,63 +0,0 @@
-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;
-};
@@ -1,865 +0,0 @@
-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),
-  ];
-};
@@ -1,130 +0,0 @@
-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];
-};
@@ -1,174 +0,0 @@
-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);
-};
@@ -1,199 +0,0 @@
-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,
-  ];
-};
@@ -1,18 +0,0 @@
-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 };
@@ -1,38 +0,0 @@
-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);
-};
@@ -155,4 +155,67 @@ 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],
+    });
+  });
 });
@@ -33,6 +33,12 @@ 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 = {
@@ -44,6 +50,7 @@ type ElementsClipboard = {
 export type PastedMixedContent = { type: "text" | "imageUrl"; value: string }[];

 export interface ClipboardData {
+  spreadsheet?: Spreadsheet;
  elements?: readonly ExcalidrawElement[];
  files?: BinaryFiles;
  text?: string;
@@ -208,6 +215,16 @@ export const copyToClipboard = async (
  );
 };

+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 = [];
@@ -367,7 +384,7 @@ type AllowedParsedDataTransferItem =
      type: ValueOf<typeof IMAGE_MIME_TYPES>;
      kind: "file";
      file: File;
-      fileHandle: FileSystemFileHandle | null;
+      fileHandle: FileSystemHandle | null;
    }
  | { type: ValueOf<typeof STRING_MIME_TYPES>; kind: "string"; value: string };

@@ -376,7 +393,7 @@ type ParsedDataTransferItem =
      type: string;
      kind: "file";
      file: File;
-      fileHandle: FileSystemFileHandle | null;
+      fileHandle: FileSystemHandle | null;
    }
  | { type: string; kind: "string"; value: string };

@@ -534,6 +551,19 @@ 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 =
@@ -226,7 +226,7 @@ export const SelectedShapeActions = ({
      {(appState.activeTool.type === "text" ||
        targetElements.some(isTextElement)) && (
        <>
-          <fieldset>{renderAction("changeFontFamily")}</fieldset>
+          {renderAction("changeFontFamily")}
          {renderAction("changeFontSize")}
          {(appState.activeTool.type === "text" ||
            suppportsHorizontalAlign(targetElements, elementsMap)) &&
@@ -1081,9 +1081,8 @@ export const ShapesSwitcher = ({
  return (
    <>
      {getToolbarTools(app).map(
-        ({ value, icon, key, numericKey, fillable, toolbar }) => {
+        ({ value, icon, key, numericKey, fillable }, index) => {
          if (
-            toolbar === false ||
            UIOptions.tools?.[
              value as Extract<
                typeof value,
@@ -1100,9 +1099,6 @@ 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 (
@@ -1147,7 +1143,7 @@ export const ShapesSwitcher = ({
              checked={activeTool.type === value}
              name="editor-current-shape"
              title={`${capitalizeString(label)} — ${shortcut}`}
-              keyBindingLabel={keybindingLabel}
+              keyBindingLabel={numericKey || letter}
              aria-label={capitalizeString(label)}
              aria-keyshortcuts={shortcut}
              data-testid={`toolbar-${value}`}
@@ -1,208 +0,0 @@
-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 = [];
-  }
-}
@@ -10,10 +10,11 @@ import {
  isWritableElement,
 } from "@excalidraw/common";

-import type { MarkRequired } from "@excalidraw/common/utility-types";
+import { actionToggleShapeSwitch } from "@excalidraw/excalidraw/actions/actionToggleShapeSwitch";

-import { actionToggleShapeSwitch } from "../../actions/actionToggleShapeSwitch";
-import { getShortcutKey } from "../../shortcut";
+import { getShortcutKey } from "@excalidraw/excalidraw/shortcut";
+
+import type { MarkRequired } from "@excalidraw/common/utility-types";

 import {
  actionClearCanvas,
@@ -15,7 +15,7 @@ export type CommandPaletteItem = {
  category: string;
  order?: number;
  predicate?: boolean | Action["predicate"];
-  shortcut?: string | null;
+  shortcut?: string;
  /** if false, command will not show while in view mode */
  viewMode?: boolean;
  perform: (data: {
@@ -1,9 +1,7 @@
 import { type ReactNode, useEffect, useMemo, useRef, useState } from "react";

 import {
-  bumpVersion,
  getLinearElementSubType,
-  mutateElement,
  updateElbowArrowPoints,
 } from "@excalidraw/element";

@@ -39,8 +37,6 @@ import {
  isProdEnv,
  mapFind,
  reduceToCommonValue,
-  ROUNDNESS,
-  sceneCoordsToViewportCoords,
  updateActiveTool,
 } from "@excalidraw/common";

@@ -75,6 +71,12 @@ import type {

 import type { Scene } from "@excalidraw/element";

+import {
+  bumpVersion,
+  mutateElement,
+  ROUNDNESS,
+  sceneCoordsToViewportCoords,
+} from "..";
 import { trackEvent } from "../analytics";
 import { atom } from "../editor-jotai";

@@ -59,7 +59,6 @@ type ImageExportModalProps = {
  actionManager: ActionManager;
  onExportImage: AppClassProperties["onExportImage"];
  name: string;
-  exportWithDarkMode: boolean;
 };

 const ImageExportModal = ({
@@ -69,7 +68,6 @@ const ImageExportModal = ({
  actionManager,
  onExportImage,
  name,
-  exportWithDarkMode,
 }: ImageExportModalProps) => {
  const hasSelection = isSomeElementSelected(
    elementsSnapshot,
@@ -81,13 +79,15 @@ 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,
-    exportWithDarkMode,
+    exportDarkMode,
    exportScale,
    embedScene,
    resetCopyStatus,
@@ -122,18 +122,13 @@ const ImageExportModal = ({
      return;
    }

-    const requestId = ++previewRenderRequestIdRef.current;
-    const isStaleRequest = () => {
-      return requestId !== previewRenderRequestIdRef.current;
-    };
-
    exportToCanvas({
      elements: exportedElements,
      appState: {
        ...appStateSnapshot,
        name: projectName,
        exportBackground: exportWithBackground,
-        exportWithDarkMode,
+        exportWithDarkMode: exportDarkMode,
        exportScale,
        exportEmbedScene: embedScene,
      },
@@ -142,41 +137,25 @@ const ImageExportModal = ({
      maxWidthOrHeight: Math.max(maxWidth, maxHeight),
      exportingFrame,
    })
-      .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;
-        }
-
+      .then((canvas) => {
        setRenderError(null);
-        previewNode.replaceChildren(canvas);
+        // if converting to blob fails, there's some problem that will
+        // 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,
@@ -184,7 +163,7 @@ const ImageExportModal = ({
    exportingFrame,
    projectName,
    exportWithBackground,
-    exportWithDarkMode,
+    exportDarkMode,
    exportScale,
    embedScene,
  ]);
@@ -254,8 +233,9 @@ const ImageExportModal = ({
        >
          <Switch
            name="exportDarkModeSwitch"
-            checked={exportWithDarkMode}
+            checked={exportDarkMode}
            onChange={(checked) => {
+              setExportDarkMode(checked);
              actionManager.executeAction(
                actionExportWithDarkMode,
                "ui",
@@ -419,7 +399,6 @@ export const ImageExportDialog = ({
        actionManager={actionManager}
        onExportImage={onExportImage}
        name={name}
-        exportWithDarkMode={appState.exportWithDarkMode}
      />
    </Dialog>
  );
@@ -20,6 +20,7 @@ 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";
@@ -54,13 +55,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";
@@ -358,6 +359,13 @@ const LayerUI = ({

                            <div className="App-toolbar__divider" />

+                            <HandButton
+                              checked={isHandToolActive(appState)}
+                              onChange={() => onHandToolToggle()}
+                              title={t("toolBar.hand")}
+                              isMobile
+                            />
+
                            <ShapesSwitcher
                              setAppState={setAppState}
                              activeTool={appState.activeTool}
@@ -557,13 +565,13 @@ const LayerUI = ({
      <tunnels.OverwriteConfirmDialogTunnel.Out />
      {renderImageExportDialog()}
      {renderJSONExportDialog()}
-      {appState.openDialog?.name === "charts" && (
+      {appState.pasteDialog.shown && (
        <PasteChartDialog
-          data={appState.openDialog.data}
-          rawText={appState.openDialog.rawText}
+          setAppState={setAppState}
+          appState={appState}
          onClose={() =>
            setAppState({
-              openDialog: null,
+              pasteDialog: { shown: false, data: null },
            })
          }
        />
@@ -606,30 +614,18 @@ const LayerUI = ({
              showExitZenModeBtn={showExitZenModeBtn}
              renderWelcomeScreen={renderWelcomeScreen}
            />
-            {(appState.toast || appState.scrolledOutside) && (
-              <div className="floating-status-stack">
-                {appState.toast && (
-                  <Toast
-                    message={appState.toast.message}
-                    onClose={() => setAppState({ toast: null })}
-                    duration={appState.toast.duration}
-                    closable={appState.toast.closable}
-                  />
-                )}
-                {!appState.toast && appState.scrolledOutside && (
-                  <button
-                    type="button"
-                    className="scroll-back-to-content"
-                    onClick={() => {
-                      setAppState((appState) => ({
-                        ...calculateScrollCenter(elements, appState),
-                      }));
-                    }}
-                  >
-                    {t("buttons.scrollBackToContent")}
-                  </button>
-                )}
-              </div>
+            {appState.scrolledOutside && (
+              <button
+                type="button"
+                className="scroll-back-to-content"
+                onClick={() => {
+                  setAppState((appState) => ({
+                    ...calculateScrollCenter(elements, appState),
+                  }));
+                }}
+              >
+                {t("buttons.scrollBackToContent")}
+              </button>
            )}
          </div>
          {renderSidebars()}
@@ -472,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>
            </>
          )}
@@ -2,40 +2,6 @@

 .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;
@@ -45,61 +11,35 @@
    .container {
      display: flex;
      align-items: center;
-      justify-content: center;
+      justify-content: space-around;
      flex-wrap: wrap;
-      gap: 1rem;
      @include isMobile {
        flex-direction: column;
        justify-content: center;
-        align-items: stretch;
      }
    }
    .ChartPreview {
-      width: 260px;
-      min-height: 190px;
-      border-radius: 8px;
-      padding: 10px;
+      margin: 8px;
+      text-align: center;
+      width: 192px;
+      height: 128px;
+      border-radius: 2px;
+      padding: 1px;
      border: 1px solid $color-gray-4;
      display: flex;
-      flex-direction: column;
-      align-items: stretch;
-      justify-content: flex-start;
-      gap: 10px;
+      align-items: center;
+      justify-content: center;
      background: transparent;
-      .ChartPreview__canvas {
-        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);
+      div {
+        display: inline-block;
      }
      svg {
-        max-height: 144px;
-        max-width: 100%;
+        max-height: 120px;
+        max-width: 186px;
      }
      &:hover {
-        border-color: $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;
+        padding: 0;
+        border: 2px solid $color-blue-5;
      }
    }
  }
@@ -1,57 +1,35 @@
 import React, { useLayoutEffect, useRef, useState } from "react";

-import { newTextElement } from "@excalidraw/element";
-
 import type { ChartType } from "@excalidraw/element/types";

 import { trackEvent } from "../analytics";
-import { isSpreadsheetValidForChartType, renderSpreadsheet } from "../charts";
+import { 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";
-
-type OnPlainTextPaste = (rawText: string) => void;
+import type { UIAppState } from "../types";

 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;
-  colorSeed: number;
+  selected: boolean;
  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;
    }

@@ -60,13 +38,7 @@ 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!;
@@ -77,7 +49,6 @@ const ChartPreviewBtn = (props: {
        {
          exportBackground: false,
          viewBackgroundColor: "#fff",
-          exportWithDarkMode: theme === "dark",
        },
        null, // files
        {
@@ -87,108 +58,42 @@ 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.colorSeed, theme]);
-
-  const chartTypeLabel = getChartTypeLabel(props.chartType);
+  }, [props.spreadsheet, props.chartType, props.selected]);

  return (
    <button
      type="button"
      className="ChartPreview"
-      aria-label={chartTypeLabel}
      onClick={() => {
        if (chartElements) {
          props.onClick(props.chartType, chartElements);
        }
      }}
    >
-      <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>
+      <div ref={previewRef} />
    </button>
  );
 };

 export const PasteChartDialog = ({
-  data,
-  rawText,
+  setAppState,
+  appState,
  onClose,
 }: {
-  data: Spreadsheet;
-  rawText: string;
+  appState: UIAppState;
  onClose: () => void;
+  setAppState: React.Component<any, UIAppState>["setState"];
 }) => {
-  const { onInsertElements, focusContainer } = useApp();
-  const [colorSeed, setColorSeed] = useState(Math.random());
-
-  const handleReshuffleColors = React.useCallback(() => {
-    setColorSeed(Math.random());
-  }, []);
-
+  const { onInsertElements } = useApp();
  const handleClose = React.useCallback(() => {
    if (onClose) {
      onClose();
@@ -198,72 +103,36 @@ export const PasteChartDialog = ({
  const handleChartClick = (chartType: ChartType, elements: ChartElements) => {
    onInsertElements(elements);
    trackEvent("paste", "chart", chartType);
-    onClose();
-    focusContainer();
-  };
-
-  const handlePlainTextClick = (rawText: string) => {
-    const textElement = newTextElement({
-      text: rawText,
-      x: 0,
-      y: 0,
+    setAppState({
+      currentChartType: chartType,
+      pasteDialog: {
+        shown: false,
+        data: null,
+      },
    });
-    onInsertElements([textElement]);
-    trackEvent("paste", "chart", "plaintext");
-    onClose();
-    focusContainer();
  };

  return (
    <Dialog
-      size="regular"
+      size="small"
      onCloseRequest={handleClose}
-      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>
-      }
+      title={t("labels.pasteCharts")}
      className={"PasteChartDialog"}
      autofocus={false}
    >
      <div className={"container"}>
-        {(["bar", "line", "radar"] as const).map((chartType) => {
-          if (!isSpreadsheetValidForChartType(data, chartType)) {
-            return null;
-          }
-
-          return (
-            <ChartPreviewBtn
-              key={chartType}
-              chartType={chartType}
-              spreadsheet={data}
-              colorSeed={colorSeed}
-              onClick={handleChartClick}
-            />
-          );
-        })}
-        {rawText && (
-          <PlainTextPreviewBtn
-            rawText={rawText}
-            onClick={handlePlainTextClick}
-          />
-        )}
+        <ChartPreviewBtn
+          chartType="bar"
+          spreadsheet={appState.pasteDialog.data}
+          selected={appState.currentChartType === "bar"}
+          onClick={handleChartClick}
+        />
+        <ChartPreviewBtn
+          chartType="line"
+          spreadsheet={appState.pasteDialog.data}
+          selected={appState.currentChartType === "line"}
+          onClick={handleChartClick}
+        />
      </div>
    </Dialog>
  );
@@ -11,7 +11,7 @@ import { rateLimitsAtom } from "../TTDContext";

 import { ChatHistoryMenu } from "./ChatHistoryMenu";

-import { ChatInterface } from "./ChatInterface";
+import { ChatInterface } from ".";

 import type { TTDPanelAction } from "../TTDDialogPanel";

@@ -1,239 +0,0 @@
-import { useEffect, useRef } from "react";
-import {
-  Decoration,
-  EditorView,
-  keymap,
-  lineNumbers,
-  placeholder as cmPlaceholder,
-  drawSelection,
-} from "@codemirror/view";
-import { Compartment, EditorState, type Extension } from "@codemirror/state";
-import {
-  defaultKeymap,
-  history,
-  historyKeymap,
-  redo,
-} from "@codemirror/commands";
-import { syntaxHighlighting, HighlightStyle } from "@codemirror/language";
-import { tags } from "@lezer/highlight";
-
-import type { Theme } from "@excalidraw/element/types";
-
-import { mermaidLite } from "./mermaid-lang-lite";
-
-export interface CodeMirrorEditorProps {
-  value: string;
-  onChange: (value: string) => void;
-  onKeyboardSubmit?: () => void;
-  placeholder?: string;
-  theme: Theme;
-  errorLine?: number | null;
-}
-
-// ---- Dark theme ----
-
-const darkTheme = EditorView.theme(
-  {
-    "&": {
-      backgroundColor: "#1e1e1e",
-      color: "#d4d4d4",
-    },
-    ".cm-content": { caretColor: "#fff" },
-    ".cm-cursor": { borderLeftColor: "#fff" },
-    ".cm-gutters": {
-      backgroundColor: "#1e1e1e",
-      color: "#858585",
-      border: "none",
-    },
-    ".cm-activeLineGutter": { backgroundColor: "#2a2a2a" },
-    ".cm-activeLine": { backgroundColor: "#2a2a2a" },
-    ".cm-errorLine": { backgroundColor: "rgba(255, 0, 0, 0.15)" },
-  },
-  { dark: true },
-);
-
-const darkHighlight = HighlightStyle.define([
-  { tag: tags.keyword, color: "#569cd6" },
-  { tag: tags.string, color: "#ce9178" },
-  { tag: tags.comment, color: "#6a9955" },
-  { tag: tags.number, color: "#b5cea8" },
-  { tag: tags.operator, color: "#d4d4d4" },
-  { tag: tags.punctuation, color: "#d4d4d4" },
-  { tag: tags.variableName, color: "#9cdcfe" },
-  { tag: tags.bracket, color: "#ffd700" },
-]);
-
-// ---- Light theme ----
-
-const lightTheme = EditorView.theme({
-  "&": {
-    backgroundColor: "#ffffff",
-    color: "#1e1e1e",
-  },
-  ".cm-content": { caretColor: "#000" },
-  ".cm-cursor": { borderLeftColor: "#000" },
-  ".cm-gutters": {
-    backgroundColor: "#fff",
-    color: "#999",
-    border: "none",
-  },
-  ".cm-activeLineGutter": { backgroundColor: "#e8e8e8" },
-  ".cm-activeLine": { backgroundColor: "#e8e8e8" },
-  ".cm-errorLine": { backgroundColor: "rgba(255, 0, 0, 0.1)" },
-});
-
-const lightHighlight = HighlightStyle.define([
-  { tag: tags.keyword, color: "#0000ff" },
-  { tag: tags.string, color: "#a31515" },
-  { tag: tags.comment, color: "#008000" },
-  { tag: tags.number, color: "#098658" },
-  { tag: tags.operator, color: "#1e1e1e" },
-  { tag: tags.punctuation, color: "#1e1e1e" },
-  { tag: tags.variableName, color: "#001080" },
-  { tag: tags.bracket, color: "#af00db" },
-]);
-
-// ---- Error line decoration ----
-
-const errorLineDeco = Decoration.line({ class: "cm-errorLine" });
-
-const getErrorLineExtension = (
-  errorLine: number | null | undefined,
-  doc: { line(n: number): { from: number }; lines: number },
-): Extension => {
-  if (!errorLine || errorLine < 1 || errorLine > doc.lines) {
-    return EditorView.decorations.of(Decoration.none);
-  }
-  const line = doc.line(errorLine);
-  return EditorView.decorations.of(
-    Decoration.set([errorLineDeco.range(line.from)]),
-  );
-};
-
-// ---- Helpers ----
-
-const getThemeExtensions = (theme: Theme) => {
-  if (theme === "dark") {
-    return [darkTheme, syntaxHighlighting(darkHighlight)];
-  }
-  return [lightTheme, syntaxHighlighting(lightHighlight)];
-};
-
-const CodeMirrorEditor = ({
-  value,
-  onChange,
-  onKeyboardSubmit,
-  placeholder,
-  theme,
-  errorLine,
-}: CodeMirrorEditorProps) => {
-  const containerRef = useRef<HTMLDivElement>(null);
-  const viewRef = useRef<EditorView | null>(null);
-  const onChangeRef = useRef(onChange);
-  const onKeyboardSubmitRef = useRef(onKeyboardSubmit);
-  const themeCompartmentRef = useRef(new Compartment());
-  const errorLineCompartmentRef = useRef(new Compartment());
-
-  onChangeRef.current = onChange;
-  onKeyboardSubmitRef.current = onKeyboardSubmit;
-
-  useEffect(() => {
-    if (!containerRef.current) {
-      return;
-    }
-
-    const themeCompartment = themeCompartmentRef.current;
-
-    const view = new EditorView({
-      state: EditorState.create({
-        doc: value,
-        extensions: [
-          keymap.of([
-            {
-              key: "Mod-Enter",
-              run: () => {
-                onKeyboardSubmitRef.current?.();
-                return true;
-              },
-            },
-            // historyKeymap binds Mod-Shift-z only on Mac; add it for all platforms
-            { key: "Mod-Shift-z", run: redo, preventDefault: true },
-          ]),
-          EditorView.updateListener.of((update) => {
-            if (update.docChanged) {
-              onChangeRef.current(update.state.doc.toString());
-            }
-          }),
-          history(),
-          keymap.of([...defaultKeymap, ...historyKeymap]),
-          lineNumbers(),
-          EditorView.lineWrapping,
-          themeCompartment.of(getThemeExtensions(theme)),
-          errorLineCompartmentRef.current.of([]),
-          mermaidLite(),
-          drawSelection({ drawRangeCursor: true }),
-          ...(placeholder ? [cmPlaceholder(placeholder)] : []),
-        ],
-      }),
-      parent: containerRef.current,
-    });
-
-    viewRef.current = view;
-    view.focus();
-
-    return () => {
-      view.destroy();
-      viewRef.current = null;
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  // Swap theme dynamically via compartment
-  useEffect(() => {
-    const view = viewRef.current;
-    if (!view) {
-      return;
-    }
-    view.dispatch({
-      effects: themeCompartmentRef.current.reconfigure(
-        getThemeExtensions(theme),
-      ),
-    });
-  }, [theme]);
-
-  // Update error line highlight
-  useEffect(() => {
-    const view = viewRef.current;
-    if (!view) {
-      return;
-    }
-    view.dispatch({
-      effects: errorLineCompartmentRef.current.reconfigure(
-        getErrorLineExtension(errorLine, view.state.doc),
-      ),
-    });
-  }, [errorLine]);
-
-  // Sync external value changes into EditorView
-  useEffect(() => {
-    const view = viewRef.current;
-    if (!view) {
-      return;
-    }
-    const currentDoc = view.state.doc.toString();
-    if (value !== currentDoc) {
-      view.dispatch({
-        changes: { from: 0, to: currentDoc.length, insert: value },
-      });
-    }
-  }, [value]);
-
-  return (
-    <div
-      ref={containerRef}
-      className="ttd-dialog-input ttd-dialog-input--codemirror"
-    />
-  );
-};
-
-export default CodeMirrorEditor;
@@ -17,11 +17,6 @@ import { TTDDialogOutput } from "./TTDDialogOutput";
 import { TTDDialogPanel } from "./TTDDialogPanel";
 import { TTDDialogPanels } from "./TTDDialogPanels";
 import { TTDDialogSubmitShortcut } from "./TTDDialogSubmitShortcut";
-import {
-  getMermaidErrorLineNumber,
-  isMermaidAutoFixableError,
-} from "./utils/mermaidError";
-import { getMermaidAutoFixCandidates } from "./utils/mermaidAutoFix";
 import {
  convertMermaidToExcalidraw,
  insertToEditor,
@@ -38,27 +33,6 @@ const MERMAID_EXAMPLE =
  "flowchart TD\n A[Christmas] -->|Get money| B(Go shopping)\n B --> C{Let me think}\n C -->|One| D[Laptop]\n C -->|Two| E[iPhone]\n C -->|Three| F[Car]";

 const debouncedSaveMermaidDefinition = debounce(saveMermaidDataToStorage, 300);
-const AUTO_FIX_DEBOUNCE_MS = 500;
-const AUTO_FIX_MAX_DEPTH = 4;
-const AUTO_FIX_MAX_CANDIDATES = 30;
-
-const getErrorMessage = (error: unknown): string => {
-  if (error instanceof Error) {
-    return error.message;
-  }
-  if (typeof error === "string") {
-    return error;
-  }
-  if (
-    error &&
-    typeof error === "object" &&
-    "message" in error &&
-    typeof (error as { message?: unknown }).message === "string"
-  ) {
-    return (error as { message: string }).message;
-  }
-  return "";
-};

 const MermaidToExcalidraw = ({
  mermaidToExcalidrawLib,
@@ -72,16 +46,8 @@ const MermaidToExcalidraw = ({
      EditorLocalStorage.get<string>(EDITOR_LS_KEYS.MERMAID_TO_EXCALIDRAW) ||
      MERMAID_EXAMPLE,
  );
-  const deferredText = useDeferredValue(text);
+  const deferredText = useDeferredValue(text.trim());
  const [error, setError] = useState<Error | null>(null);
-  const [autoFixCandidate, setAutoFixCandidate] = useState<string | null>(null);
-
-  const errorLine = (() => {
-    if (!error?.message) {
-      return null;
-    }
-    return getMermaidErrorLineNumber(error.message, deferredText);
-  })();

  const canvasRef = useRef<HTMLDivElement>(null);
  const data = useRef<{
@@ -95,7 +61,7 @@ const MermaidToExcalidraw = ({
  useEffect(() => {
    const doRender = async () => {
      try {
-        if (!deferredText.trim()) {
+        if (!deferredText) {
          resetPreview({ canvasRef, setError });
          return;
        }
@@ -132,88 +98,6 @@ const MermaidToExcalidraw = ({
    [],
  );

-  useEffect(() => {
-    const errorMessage = error?.message ?? "";
-    const sourceText = deferredText;
-    const shouldTryAutoFix =
-      isActive &&
-      isMermaidAutoFixableError(errorMessage) &&
-      !!sourceText.trim() &&
-      mermaidToExcalidrawLib.loaded;
-
-    if (!shouldTryAutoFix) {
-      setAutoFixCandidate(null);
-      return;
-    }
-
-    const candidates = getMermaidAutoFixCandidates(sourceText, errorMessage);
-    if (!candidates.length) {
-      setAutoFixCandidate(null);
-      return;
-    }
-
-    let cancelled = false;
-    const timer = setTimeout(async () => {
-      try {
-        const api = await mermaidToExcalidrawLib.api;
-        const seen = new Set<string>([sourceText]);
-        const queue = candidates.map((candidate) => ({
-          text: candidate,
-          depth: 1,
-        }));
-
-        let triedCandidates = 0;
-
-        while (queue.length > 0 && triedCandidates < AUTO_FIX_MAX_CANDIDATES) {
-          const current = queue.shift();
-          if (!current || seen.has(current.text)) {
-            continue;
-          }
-          seen.add(current.text);
-          triedCandidates += 1;
-
-          try {
-            await api.parseMermaidToExcalidraw(current.text);
-            if (!cancelled) {
-              setAutoFixCandidate(current.text);
-            }
-            return;
-          } catch (candidateError) {
-            if (current.depth >= AUTO_FIX_MAX_DEPTH) {
-              continue;
-            }
-            const nextErrorMessage = getErrorMessage(candidateError);
-            if (!nextErrorMessage) {
-              continue;
-            }
-            const nextCandidates = getMermaidAutoFixCandidates(
-              current.text,
-              nextErrorMessage,
-            );
-            for (const nextCandidate of nextCandidates) {
-              if (!seen.has(nextCandidate)) {
-                queue.push({
-                  text: nextCandidate,
-                  depth: current.depth + 1,
-                });
-              }
-            }
-          }
-        }
-      } catch {
-        // ignore auto-fix probe errors
-      }
-      if (!cancelled) {
-        setAutoFixCandidate(null);
-      }
-    }, AUTO_FIX_DEBOUNCE_MS);
-
-    return () => {
-      cancelled = true;
-      clearTimeout(timer);
-    };
-  }, [deferredText, error?.message, isActive, mermaidToExcalidrawLib]);
-
  const onInsertToEditor = () => {
    insertToEditor({
      app,
@@ -223,13 +107,6 @@ const MermaidToExcalidraw = ({
    });
  };

-  const onApplyAutoFix = () => {
-    if (!autoFixCandidate) {
-      return;
-    }
-    setText(autoFixCandidate);
-  };
-
  return (
    <>
      <div className="ttd-dialog-desc">
@@ -253,8 +130,7 @@ const MermaidToExcalidraw = ({
          <TTDDialogInput
            input={text}
            placeholder={t("mermaid.inputPlaceholder")}
-            onChange={(value) => setText(value)}
-            errorLine={errorLine}
+            onChange={(event) => setText(event.target.value)}
            onKeyboardSubmit={() => {
              onInsertToEditor();
            }}
@@ -277,9 +153,6 @@ const MermaidToExcalidraw = ({
            canvasRef={canvasRef}
            loaded={mermaidToExcalidrawLib.loaded}
            error={error}
-            sourceText={text}
-            autoFixAvailable={!!autoFixCandidate}
-            onApplyAutoFix={onApplyAutoFix}
          />
        </TTDDialogPanel>
      </TTDDialogPanels>
@@ -219,49 +219,6 @@ $fullScreenModalBreakpoint: 600px;
    }
  }

-  .ttd-dialog-input--loading {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-  }
-
-  .ttd-dialog-input--codemirror {
-    padding: 0;
-    overflow: hidden;
-    // Override height:100% from .ttd-dialog-input — use flex sizing
-    // so the editor fills remaining space without overflowing the panel
-    height: 0;
-    flex: 1 1 0;
-    min-height: 0;
-
-    .cm-editor {
-      height: 100%;
-      font-family: monospace;
-
-      &.cm-focused {
-        outline: none;
-      }
-    }
-
-    .cm-scroller {
-      padding: 0.85rem 0;
-      overflow: auto;
-    }
-
-    .cm-gutters {
-      padding-left: 0.25rem;
-    }
-
-    .cm-content {
-      padding: 0;
-    }
-
-    .cm-placeholder {
-      color: var(--color-gray-40);
-      font-style: italic;
-    }
-  }
-
  .ttd-dialog-output-wrapper {
    display: flex;
    flex-direction: column;
@@ -374,55 +331,14 @@ $fullScreenModalBreakpoint: 600px;
      margin-top: 0.25rem;
    }

-    .ttd-dialog-output-error-summary {
-      width: 100%;
-      max-width: 640px;
-      color: var(--color-gray-50);
-      font-size: 0.9rem;
-      text-align: left;
-
-      &__headline {
-        font-weight: 600;
-        color: var(--color-gray-60);
-      }
-
-      &__label {
-        margin-top: 0.35rem;
-        font-weight: 500;
-      }
-
-      &__causes {
-        margin: 0.35rem 0 0;
-        padding-left: 2rem;
-      }
-    }
-
    .ttd-dialog-output-error-message {
      text-align: left;
      font-weight: 400;
      color: var(--color-gray-50);
      word-break: break-word;
      white-space: pre-wrap;
-      max-width: 640px;
-      width: 100%;
+      max-width: 100%;
      font-family: monospace;
-
-      &__caret {
-        color: var(--color-danger);
-      }
-    }
-
-    .ttd-dialog-output-error-autofix-slot {
-      align-self: flex-start;
-      margin-top: 0.35rem;
-      min-height: 2.5rem;
-      display: flex;
-      align-items: flex-start;
-    }
-
-    .ttd-dialog-output-error-autofix {
-      margin-top: 0;
-      white-space: nowrap;
    }
  }

@@ -1,84 +1,28 @@
-import { useEffect, useRef, useState } from "react";
+import { useEffect, useRef } from "react";

 import { EVENT, KEYS } from "@excalidraw/common";

-import Spinner from "../Spinner";
-
-import { useUIAppState } from "../../context/ui-appState";
-
-import type { ComponentType } from "react";
-import type { CodeMirrorEditorProps } from "./CodeMirrorEditor";
+import type { ChangeEventHandler } from "react";

 interface TTDDialogInputProps {
  input: string;
  placeholder: string;
-  onChange: (value: string) => void;
+  onChange: ChangeEventHandler<HTMLTextAreaElement>;
  onKeyboardSubmit?: () => void;
-  errorLine?: number | null;
 }

-type EditorState =
-  | { type: "loading" }
-  | { type: "ready"; component: ComponentType<CodeMirrorEditorProps> }
-  | { type: "fallback" };
-
-const SPINNER_DELAY_MS = 300;
-
 export const TTDDialogInput = ({
  input,
  placeholder,
  onChange,
  onKeyboardSubmit,
-  errorLine,
 }: TTDDialogInputProps) => {
  const ref = useRef<HTMLTextAreaElement>(null);

  const callbackRef = useRef(onKeyboardSubmit);
  callbackRef.current = onKeyboardSubmit;

-  const [editorState, setEditorState] = useState<EditorState>({
-    type: "loading",
-  });
-  const [showSpinner, setShowSpinner] = useState(false);
-
-  const { theme } = useUIAppState();
-
-  // Lazy-load CodeMirror editor
  useEffect(() => {
-    let cancelled = false;
-
-    const spinnerTimer = setTimeout(() => {
-      if (!cancelled) {
-        setShowSpinner(true);
-      }
-    }, SPINNER_DELAY_MS);
-
-    import("./CodeMirrorEditor")
-      .then((mod) => {
-        if (!cancelled) {
-          setEditorState({ type: "ready", component: mod.default });
-        }
-      })
-      .catch(() => {
-        if (!cancelled) {
-          setEditorState({ type: "fallback" });
-        }
-      })
-      .finally(() => {
-        clearTimeout(spinnerTimer);
-      });
-
-    return () => {
-      cancelled = true;
-      clearTimeout(spinnerTimer);
-    };
-  }, []);
-
-  // Keyboard shortcut + focus for textarea fallback
-  useEffect(() => {
-    if (editorState.type !== "fallback") {
-      return;
-    }
    if (!callbackRef.current) {
      return;
    }
@@ -96,42 +40,15 @@ export const TTDDialogInput = ({
        textarea.removeEventListener(EVENT.KEYDOWN, handleKeyDown);
      };
    }
-  }, [editorState.type]);
+  }, []);

-  if (editorState.type === "ready") {
-    const CodeMirrorEditor = editorState.component;
-    return (
-      <CodeMirrorEditor
-        value={input}
-        onChange={onChange}
-        onKeyboardSubmit={onKeyboardSubmit}
-        placeholder={placeholder}
-        theme={theme}
-        errorLine={errorLine}
-      />
-    );
-  }
-
-  if (editorState.type === "fallback") {
-    return (
-      <textarea
-        className="ttd-dialog-input"
-        onChange={(e) => onChange(e.target.value)}
-        value={input}
-        placeholder={placeholder}
-        ref={ref}
-      />
-    );
-  }
-
-  // Loading state
-  if (showSpinner) {
-    return (
-      <div className="ttd-dialog-input ttd-dialog-input--loading">
-        <Spinner />
-      </div>
-    );
-  }
-
-  return null;
+  return (
+    <textarea
+      className="ttd-dialog-input"
+      onChange={onChange}
+      value={input}
+      placeholder={placeholder}
+      ref={ref}
+    />
+  );
 };
@@ -1,24 +1,14 @@
 import clsx from "clsx";

-import { Button } from "../Button";
 import Spinner from "../Spinner";
 import { t } from "../../i18n";
 import { alertTriangleIcon } from "../icons";

-import {
-  formatMermaidParseErrorMessage,
-  getMermaidSyntaxErrorGuidance,
-  isMermaidCaretLine,
-} from "./utils/mermaidError";
-
 interface TTDDialogOutputProps {
  error: Error | null;
  canvasRef: React.RefObject<HTMLDivElement | null>;
  loaded: boolean;
  hideErrorDetails?: boolean;
-  sourceText?: string;
-  autoFixAvailable?: boolean;
-  onApplyAutoFix?: () => void;
 }

 export const TTDDialogOutput = ({
@@ -26,24 +16,7 @@ export const TTDDialogOutput = ({
  canvasRef,
  loaded,
  hideErrorDetails,
-  sourceText,
-  autoFixAvailable,
-  onApplyAutoFix,
 }: TTDDialogOutputProps) => {
-  const errorMessage = error
-    ? hideErrorDetails
-      ? t("chat.errors.mermaidParseError")
-      : formatMermaidParseErrorMessage(error.message)
-    : null;
-  const syntaxGuidance =
-    error && !hideErrorDetails
-      ? getMermaidSyntaxErrorGuidance(error.message, sourceText)
-      : null;
-  const showAutoFixButton =
-    !!autoFixAvailable && !!onApplyAutoFix && !hideErrorDetails;
-
-  const errorMessageLines = errorMessage?.split(/\r?\n/) ?? [];
-
  return (
    <div
      className={`ttd-dialog-output-wrapper ${
@@ -60,48 +33,14 @@ export const TTDDialogOutput = ({
            <div className="ttd-dialog-output-error-icon">
              {alertTriangleIcon}
            </div>
-            {syntaxGuidance && (
-              <div className="ttd-dialog-output-error-summary">
-                <div className="ttd-dialog-output-error-summary__headline">
-                  {syntaxGuidance.summary}
-                </div>
-                <div className="ttd-dialog-output-error-summary__label">
-                  Likely causes:
-                </div>
-                <ul className="ttd-dialog-output-error-summary__causes">
-                  {syntaxGuidance.likelyCauses.map((cause) => (
-                    <li key={cause}>{cause}</li>
-                  ))}
-                </ul>
-              </div>
-            )}
-            <div className="ttd-dialog-output-error-message">
-              {errorMessageLines.map((line, index) => (
-                <span
-                  key={`error-line-${index}`}
-                  className={
-                    isMermaidCaretLine(line)
-                      ? "ttd-dialog-output-error-message__caret"
-                      : undefined
-                  }
-                >
-                  {line}
-                  {index < errorMessageLines.length - 1 ? "\n" : ""}
-                </span>
-              ))}
+            <div className="ttd-dialog-output-error-title">
+              {t("ttd.error")}
+            </div>
+            <div className="ttd-dialog-output-error-message">
+              {hideErrorDetails
+                ? t("chat.errors.mermaidParseError")
+                : error.message}
            </div>
-            {!hideErrorDetails && (
-              <div className="ttd-dialog-output-error-autofix-slot">
-                {showAutoFixButton ? (
-                  <Button
-                    className="ttd-dialog-panel-button ttd-dialog-output-error-autofix"
-                    onSelect={onApplyAutoFix}
-                  >
-                    {t("mermaid.autoFixAvailable")}
-                  </Button>
-                ) : null}
-              </div>
-            )}
          </div>
        </div>
      )}
@@ -1,4 +1,4 @@
-import { getShortcutKey } from "../../shortcut";
+import { getShortcutKey } from "@excalidraw/excalidraw/shortcut";

 export const TTDDialogSubmitShortcut = () => {
  return (
@@ -1,89 +0,0 @@
-import { describe, expect, it, vi } from "vitest";
-
-import { convertMermaidToExcalidraw } from "./common";
-
-type ConvertMermaidArgs = Parameters<typeof convertMermaidToExcalidraw>[0];
-type ParseMermaidToExcalidraw = Awaited<
-  ConvertMermaidArgs["mermaidToExcalidrawLib"]["api"]
->["parseMermaidToExcalidraw"];
-
-const createConvertArgs = (
-  mermaidDefinition: string,
-  parseMermaidToExcalidraw: ParseMermaidToExcalidraw,
-): ConvertMermaidArgs => {
-  const parent = document.createElement("div");
-  const canvas = document.createElement("div");
-  parent.appendChild(canvas);
-
-  return {
-    canvasRef: { current: canvas },
-    mermaidToExcalidrawLib: {
-      loaded: true,
-      api: Promise.resolve({ parseMermaidToExcalidraw }),
-    },
-    mermaidDefinition,
-    setError: vi.fn(),
-    data: {
-      current: {
-        elements: [],
-        files: null,
-      },
-    },
-    theme: "light",
-  };
-};
-
-describe("convertMermaidToExcalidraw", () => {
-  it("returns the original parse error when quote-normalized fallback also fails", async () => {
-    const originalError = new Error("Parse error on line 9: ...");
-    const fallbackError = new Error("Parse error on line 6: ...");
-
-    const parseMermaidToExcalidraw = vi
-      .fn<ParseMermaidToExcalidraw>()
-      .mockRejectedValueOnce(originalError)
-      .mockRejectedValueOnce(fallbackError);
-
-    const mermaidDefinition =
-      'graph TD\nA["One"]\nB["Two"]x\nC["Three"]\nD["Four"]';
-
-    const result = await convertMermaidToExcalidraw(
-      createConvertArgs(mermaidDefinition, parseMermaidToExcalidraw),
-    );
-
-    expect(parseMermaidToExcalidraw).toHaveBeenCalledTimes(2);
-    expect(parseMermaidToExcalidraw).toHaveBeenNthCalledWith(
-      1,
-      mermaidDefinition,
-    );
-    expect(parseMermaidToExcalidraw).toHaveBeenNthCalledWith(
-      2,
-      mermaidDefinition.replace(/"/g, "'"),
-    );
-
-    expect(result.success).toBe(false);
-    if (!result.success) {
-      expect(result.error).toBe(originalError);
-    }
-  });
-
-  it("does not retry quote normalization when the input has no double quotes", async () => {
-    const originalError = new Error("Parse error on line 9: ...");
-    const parseMermaidToExcalidraw = vi
-      .fn<ParseMermaidToExcalidraw>()
-      .mockRejectedValueOnce(originalError);
-
-    const mermaidDefinition = "graph TD\nA[One]\nB[Two]x";
-
-    const result = await convertMermaidToExcalidraw(
-      createConvertArgs(mermaidDefinition, parseMermaidToExcalidraw),
-    );
-
-    expect(parseMermaidToExcalidraw).toHaveBeenCalledTimes(1);
-    expect(parseMermaidToExcalidraw).toHaveBeenCalledWith(mermaidDefinition);
-
-    expect(result.success).toBe(false);
-    if (!result.success) {
-      expect(result.error).toBe(originalError);
-    }
-  });
-});
@@ -1,12 +1,4 @@
-import {
-  DEFAULT_EXPORT_PADDING,
-  EDITOR_LS_KEYS,
-  THEME,
-} from "@excalidraw/common";
-
-import { convertToExcalidrawElements } from "@excalidraw/element";
-
-import { exportToCanvas } from "@excalidraw/utils";
+import { DEFAULT_EXPORT_PADDING, EDITOR_LS_KEYS } from "@excalidraw/common";

 import type {
  NonDeletedExcalidrawElement,
@@ -14,6 +6,11 @@ import type {
 } from "@excalidraw/element/types";

 import { EditorLocalStorage } from "../../data/EditorLocalStorage";
+import {
+  convertToExcalidrawElements,
+  exportToCanvas,
+  THEME,
+} from "../../index";

 import type { MermaidToExcalidrawLibProps } from "./types";

@@ -75,23 +72,15 @@ export const convertMermaidToExcalidraw = async ({
    const api = await mermaidToExcalidrawLib.api;

    try {
-      ret = await api.parseMermaidToExcalidraw(mermaidDefinition);
-    } catch (err: unknown) {
-      const originalParseError = err as Error;
-
-      if (!mermaidDefinition.includes('"')) {
-        return { success: false, error: originalParseError };
-      }
-
      try {
+        ret = await api.parseMermaidToExcalidraw(mermaidDefinition);
+      } catch (err: unknown) {
        ret = await api.parseMermaidToExcalidraw(
          mermaidDefinition.replace(/"/g, "'"),
        );
-      } catch {
-        // Keep the original error so line/column references stay aligned with
-        // the user's unmodified input.
-        return { success: false, error: originalParseError };
      }
+    } catch (err: unknown) {
+      return { success: false, error: err as Error };
    }

    const { elements, files } = ret;
@@ -1,82 +0,0 @@
-import { StreamLanguage } from "@codemirror/language";
-
-const mermaidStreamParser = StreamLanguage.define({
-  token(stream) {
-    // Comments: %%...
-    if (stream.match(/^%%.*$/)) {
-      return "comment";
-    }
-
-    // Strings
-    if (stream.match(/^"(?:[^"\\]|\\.)*"/)) {
-      return "string";
-    }
-
-    // Diagram type keywords (at start of line or after whitespace)
-    if (
-      stream.match(
-        /^(flowchart|graph|sequenceDiagram|classDiagram|stateDiagram|erDiagram|gantt|pie|mindmap|journey|gitGraph|timeline|quadrantChart|sankey|xychart)\b/i,
-      )
-    ) {
-      return "keyword";
-    }
-
-    // Direction keywords
-    if (stream.match(/^(TB|TD|BT|RL|LR)\b/)) {
-      return "keyword";
-    }
-
-    // Keywords
-    if (
-      stream.match(
-        /^(subgraph|end|participant|actor|loop|alt|else|opt|par|critical|break|rect|note|over|activate|deactivate|title|section|class|style|linkStyle|classDef|click)\b/i,
-      )
-    ) {
-      return "keyword";
-    }
-
-    // Arrows: -->, ---, -.->, ===>, etc.
-    if (stream.match(/^[-.=<>|ox]+>/)) {
-      return "operator";
-    }
-    if (stream.match(/^<[-.=<>|ox]+/)) {
-      return "operator";
-    }
-    if (stream.match(/^--+|\.\.+|==+/)) {
-      return "operator";
-    }
-
-    // Labels in brackets/parens: [text], (text), {text}, ((text)), etc.
-    if (stream.match(/^[[\](){}|<>]/)) {
-      return "bracket";
-    }
-
-    // Node IDs (alphanumeric)
-    if (stream.match(/^[A-Za-z_][A-Za-z0-9_]*/)) {
-      return "variableName";
-    }
-
-    // Numbers
-    if (stream.match(/^\d+(\.\d+)?/)) {
-      return "number";
-    }
-
-    // Punctuation
-    if (stream.match(/^[,:;]/)) {
-      return "punctuation";
-    }
-
-    // Skip whitespace
-    if (stream.eatSpace()) {
-      return null;
-    }
-
-    // Skip any other character
-    stream.next();
-    return null;
-  },
-});
-
-export function mermaidLite() {
-  return mermaidStreamParser;
-}
@@ -1,6 +1,9 @@
-import { RequestError } from "../../../errors";
+import { RequestError } from "@excalidraw/excalidraw/errors";

-import type { LLMMessage, TTTDDialog } from "../types";
+import type {
+  LLMMessage,
+  TTTDDialog,
+} from "@excalidraw/excalidraw/components/TTDDialog/types";

 interface RateLimitInfo {
  rateLimit?: number;
@@ -1,116 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import { getMermaidAutoFixCandidates } from "./mermaidAutoFix";
-
-describe("getMermaidAutoFixCandidates", () => {
-  it("suggests removing trailing token after a closed label shape", () => {
-    const sourceText = `graph TD
-  L3_TCP["TCP (Transmission Control Protocol)"]x
-  L3_UDP["UDP (User Datagram Protocol)"]`;
-
-    const errorMessage = `Parse error on line 2:
-...ission Control Protocol)"]x
-----------------------------^
-Expecting 'SEMI', got 'NODE_STRING'`;
-
-    const candidates = getMermaidAutoFixCandidates(sourceText, errorMessage);
-
-    expect(candidates).toContain(`graph TD
-  L3_TCP["TCP (Transmission Control Protocol)"]
-  L3_UDP["UDP (User Datagram Protocol)"]`);
-  });
-
-  it("suggests appending missing end statements", () => {
-    const sourceText = `graph TD
-subgraph A
-  A1[Start]`;
-
-    const errorMessage = `Parse error on line 3:
-... A1[Start]
-------------^
-Expecting 'end'`;
-
-    const candidates = getMermaidAutoFixCandidates(sourceText, errorMessage);
-
-    expect(candidates).toContain(`graph TD
-subgraph A
-  A1[Start]
-end`);
-  });
-
-  it("returns empty list for non-parse errors", () => {
-    expect(
-      getMermaidAutoFixCandidates("graph TD\nA-->B", "Network error"),
-    ).toEqual([]);
-  });
-
-  it("extracts line index from lexical error format too", () => {
-    const sourceText = `graph TD
-  subgraph Layers["X"]x
-  direction TB`;
-
-    const errorMessage = `Lexical error on line 2. Unrecognized text.
-...  subgraph Layers["X"]x        direction
-----------------------^`;
-
-    const candidates = getMermaidAutoFixCandidates(sourceText, errorMessage);
-
-    expect(candidates).toContain(`graph TD
-  subgraph Layers["X"]
-  direction TB`);
-  });
-
-  it("removes extra > after edge label", () => {
-    const sourceText = `flowchart TD
-  A["User Input"] -->|text|> B["Tokenization"]
-  A["User Input"] -->|text|> B["Tokenization"]`;
-
-    const errorMessage = `Parse error on line 2:
-...A["User Input"] -->|text|> B["Tokenization"]
---------------------------^
-Expecting 'NODE_STRING', got 'GT'`;
-
-    const candidates = getMermaidAutoFixCandidates(sourceText, errorMessage);
-
-    expect(candidates).toContain(`flowchart TD
-  A["User Input"] -->|text| B["Tokenization"]
-  A["User Input"] -->|text| B["Tokenization"]`);
-  });
-
-  it("suggests removing the last invalid deactivate for participant errors", () => {
-    const sourceText = `sequenceDiagram
-  participant QAEngineer as QA
-  activate QA
-  QA->>QA: Verifies Fix
-  deactivate QA
-  QA->>QA: Verifies Again
-  deactivate QA`;
-
-    const errorMessage = "Trying to inactivate an inactive participant (QA)";
-
-    const candidates = getMermaidAutoFixCandidates(sourceText, errorMessage);
-
-    expect(candidates).toContain(`sequenceDiagram
-  participant QAEngineer as QA
-  activate QA
-  QA->>QA: Verifies Fix
-  deactivate QA
-  QA->>QA: Verifies Again`);
-  });
-
-  it("adds a fallback candidate that removes all invalid deactivations", () => {
-    const sourceText = `sequenceDiagram
-  participant QAEngineer as QA
-  deactivate QA
-  QA->>QA: Verifies Fix
-  deactivate QA`;
-
-    const errorMessage = "Trying to inactivate an inactive participant (QA)";
-
-    const candidates = getMermaidAutoFixCandidates(sourceText, errorMessage);
-
-    expect(candidates).toContain(`sequenceDiagram
-  participant QAEngineer as QA
-  QA->>QA: Verifies Fix`);
-  });
-});
@@ -1,175 +0,0 @@
-import {
-  getMermaidErrorLineNumber,
-  getMermaidInactiveParticipant,
-  isMermaidAutoFixableError,
-  isMermaidParseSyntaxError,
-} from "./mermaidError";
-
-const getErrorLineIndex = (message: string, sourceText: string) => {
-  const lineNumber = getMermaidErrorLineNumber(message, sourceText);
-  if (lineNumber == null) {
-    return null;
-  }
-  return lineNumber - 1;
-};
-
-const replaceLineAt = (
-  lines: string[],
-  index: number,
-  transform: (line: string) => string,
-) => {
-  if (index < 0 || index >= lines.length) {
-    return null;
-  }
-  const nextLine = transform(lines[index]);
-  if (nextLine === lines[index]) {
-    return null;
-  }
-  const nextLines = [...lines];
-  nextLines[index] = nextLine;
-  return nextLines.join("\n");
-};
-
-const stripTrailingTokenAfterShape = (line: string) => {
-  const alphaTailMatch = line.match(
-    /^(.*(?:\[[^\]]*]|\([^)]*\)|\{[^}]*}|"(?:[^"]*)"|'(?:[^']*)'))([A-Za-z]+)\s*$/,
-  );
-  if (alphaTailMatch) {
-    return alphaTailMatch[1];
-  }
-
-  const punctuationTailMatch = line.match(
-    /^(.*(?:\[[^\]]*]|\([^)]*\)|\{[^}]*}|"(?:[^"]*)"|'(?:[^']*)'))([,;:])\s*$/,
-  );
-  if (punctuationTailMatch) {
-    return punctuationTailMatch[1];
-  }
-
-  return line;
-};
-
-const removeExtraArrowheadAfterEdgeLabel = (line: string) => {
-  // Common typo in generated Mermaid: `-->|label|> Target` (extra `>`).
-  // Convert it to `-->|label| Target`.
-  return line.replace(/(\|[^|\n]+\|)\s*>\s*(?=[A-Za-z0-9_("[{'`])/g, "$1 ");
-};
-
-const escapeRegExp = (value: string) =>
-  value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-
-const removeLastDeactivateForParticipant = (
-  sourceText: string,
-  participant: string,
-) => {
-  const pattern = new RegExp(
-    `^\\s*deactivate\\s+${escapeRegExp(participant)}(?:\\s+%%.*)?\\s*$`,
-  );
-  const lines = sourceText.split(/\r?\n/);
-
-  for (let index = lines.length - 1; index >= 0; index--) {
-    if (pattern.test(lines[index])) {
-      return lines.filter((_, lineIndex) => lineIndex !== index).join("\n");
-    }
-  }
-
-  return null;
-};
-
-const removeAllDeactivateForParticipant = (
-  sourceText: string,
-  participant: string,
-) => {
-  const pattern = new RegExp(
-    `^\\s*deactivate\\s+${escapeRegExp(participant)}(?:\\s+%%.*)?\\s*$`,
-  );
-  const lines = sourceText.split(/\r?\n/);
-  let removedAny = false;
-  const remainingLines = lines.filter((line) => {
-    if (!pattern.test(line)) {
-      return true;
-    }
-    removedAny = true;
-    return false;
-  });
-
-  return removedAny ? remainingLines.join("\n") : null;
-};
-
-const appendMissingEnds = (sourceText: string) => {
-  const subgraphCount = (sourceText.match(/^\s*subgraph\b/gm) || []).length;
-  const endCount = (sourceText.match(/^\s*end\s*$/gm) || []).length;
-  const missingCount = subgraphCount - endCount;
-
-  if (missingCount <= 0) {
-    return null;
-  }
-
-  const endings = Array.from({ length: missingCount }, () => "end").join("\n");
-  return `${sourceText.trimEnd()}\n${endings}`;
-};
-
-const normalizeSmartQuotes = (sourceText: string) =>
-  sourceText.replace(/[“”]/g, '"').replace(/[‘’]/g, "'");
-
-export const getMermaidAutoFixCandidates = (
-  sourceText: string,
-  errorMessage: string,
-) => {
-  if (!isMermaidAutoFixableError(errorMessage) || !sourceText.trim()) {
-    return [];
-  }
-
-  const candidates: string[] = [];
-  const seen = new Set<string>();
-  const addCandidate = (candidate: string | null) => {
-    if (!candidate || candidate === sourceText || seen.has(candidate)) {
-      return;
-    }
-    seen.add(candidate);
-    candidates.push(candidate);
-  };
-
-  const inactiveParticipant = getMermaidInactiveParticipant(errorMessage);
-  if (inactiveParticipant) {
-    addCandidate(
-      removeLastDeactivateForParticipant(sourceText, inactiveParticipant),
-    );
-    // Fallback for repeated invalid inactivations in one diagram.
-    addCandidate(
-      removeAllDeactivateForParticipant(sourceText, inactiveParticipant),
-    );
-  }
-
-  if (isMermaidParseSyntaxError(errorMessage)) {
-    const lines = sourceText.split(/\r?\n/);
-    const errorLineIndex = getErrorLineIndex(errorMessage, sourceText);
-    const lineIndexesToTry =
-      errorLineIndex == null
-        ? []
-        : [errorLineIndex, errorLineIndex - 1, errorLineIndex + 1];
-
-    for (const lineIndex of lineIndexesToTry) {
-      addCandidate(
-        replaceLineAt(lines, lineIndex, (line) =>
-          stripTrailingTokenAfterShape(line),
-        ),
-      );
-      addCandidate(
-        replaceLineAt(lines, lineIndex, (line) =>
-          removeExtraArrowheadAfterEdgeLabel(line),
-        ),
-      );
-    }
-
-    // Also try full-text replacement so repeated occurrences on other lines
-    // are fixed together in a single candidate.
-    addCandidate(removeExtraArrowheadAfterEdgeLabel(sourceText));
-
-    addCandidate(appendMissingEnds(sourceText));
-
-    const normalizedQuotes = normalizeSmartQuotes(sourceText);
-    addCandidate(normalizedQuotes === sourceText ? null : normalizedQuotes);
-  }
-
-  return candidates;
-};
@@ -1,155 +0,0 @@
-import { describe, expect, it } from "vitest";
-
-import {
-  formatMermaidParseErrorMessage,
-  getMermaidErrorLineNumber,
-  getMermaidInactiveParticipant,
-  getMermaidSyntaxErrorGuidance,
-  isMermaidAutoFixableError,
-  isMermaidParseSyntaxError,
-  isMermaidCaretLine,
-} from "./mermaidError";
-
-describe("formatMermaidParseErrorMessage", () => {
-  it("strips the noisy Expecting clause from Mermaid parse errors", () => {
-    const message = `Parse error on line 6:
-... Control Protocol)"]x          L3_UDP
----------------------^
-Expecting 'SEMI', 'NEWLINE', 'SPACE', got 'NODE_STRING'`;
-
-    expect(formatMermaidParseErrorMessage(message)).toBe(`Parse error on line 6:
-... Control Protocol)"]x          L3_UDP
----------------------^`);
-  });
-
-  it("keeps Mermaid parse errors unchanged when no Expecting clause exists", () => {
-    const message = `Parse error on line 3:
-... some snippet
----^`;
-
-    expect(formatMermaidParseErrorMessage(message)).toBe(message);
-  });
-
-  it("does not modify non-Mermaid parse messages", () => {
-    const message =
-      "Unexpected token while parsing JSON. Expecting value at position 10.";
-
-    expect(formatMermaidParseErrorMessage(message)).toBe(message);
-  });
-});
-
-describe("isMermaidCaretLine", () => {
-  it("returns true for Mermaid caret lines", () => {
-    expect(isMermaidCaretLine("-----------------------^")).toBe(true);
-  });
-
-  it("returns false for regular lines", () => {
-    expect(isMermaidCaretLine(`... Control Protocol)"]x`)).toBe(false);
-  });
-});
-
-describe("isMermaidParseSyntaxError", () => {
-  it("returns true for Mermaid parser syntax errors", () => {
-    expect(isMermaidParseSyntaxError("Parse error on line 6: ...")).toBe(true);
-  });
-
-  it("returns true for Mermaid lexical syntax errors", () => {
-    expect(
-      isMermaidParseSyntaxError("Lexical error on line 2. Unrecognized text."),
-    ).toBe(true);
-  });
-
-  it("returns false for non-parse errors", () => {
-    expect(isMermaidParseSyntaxError("Network error")).toBe(false);
-  });
-});
-
-describe("isMermaidAutoFixableError", () => {
-  it("returns true for Mermaid parser syntax errors", () => {
-    expect(isMermaidAutoFixableError("Parse error on line 6: ...")).toBe(true);
-  });
-
-  it("returns true for inactive participant runtime errors", () => {
-    expect(
-      isMermaidAutoFixableError(
-        "Trying to inactivate an inactive participant (QA)",
-      ),
-    ).toBe(true);
-  });
-
-  it("returns false for non-fixable errors", () => {
-    expect(isMermaidAutoFixableError("Network error")).toBe(false);
-  });
-});
-
-describe("getMermaidInactiveParticipant", () => {
-  it("extracts the participant id from inactive participant errors", () => {
-    expect(
-      getMermaidInactiveParticipant(
-        "Trying to inactivate an inactive participant (QA)",
-      ),
-    ).toBe("QA");
-  });
-
-  it("returns null for unrelated errors", () => {
-    expect(
-      getMermaidInactiveParticipant("Parse error on line 3: ..."),
-    ).toBeNull();
-  });
-});
-
-describe("getMermaidErrorLineNumber", () => {
-  it("extracts line number from parse error format", () => {
-    expect(getMermaidErrorLineNumber("Parse error on line 6: ...")).toBe(6);
-  });
-
-  it("extracts line number from lexical error format", () => {
-    expect(
-      getMermaidErrorLineNumber("Lexical error on line 2. Unrecognized text."),
-    ).toBe(2);
-  });
-
-  it("returns null for messages without Mermaid line details", () => {
-    expect(getMermaidErrorLineNumber("Network error")).toBeNull();
-  });
-
-  it("infers line from inactive participant errors when source text is provided", () => {
-    const sourceText = `sequenceDiagram
-  participant QA
-  deactivate QA
-  QA->>QA: Verifies Fix
-  deactivate QA`;
-
-    expect(
-      getMermaidErrorLineNumber(
-        "Trying to inactivate an inactive participant (QA)",
-        sourceText,
-      ),
-    ).toBe(5);
-  });
-});
-
-describe("getMermaidSyntaxErrorGuidance", () => {
-  it("returns summary and likely causes for Mermaid parse errors", () => {
-    const message = `Parse error on line 6:
-... Control Protocol)"]x
----------------------^`;
-
-    const source = `graph TD
-subgraph Layers["X"]
-  L3_TCP["TCP (Transmission Control Protocol)"]x`;
-
-    expect(getMermaidSyntaxErrorGuidance(message, source)).toEqual({
-      summary: "Syntax error near line 6.",
-      likelyCauses: expect.arrayContaining([
-        "A block is missing an `end` statement.",
-      ]),
-    });
-  });
-
-  it("returns null for non-parse errors", () => {
-    expect(
-      getMermaidSyntaxErrorGuidance("Network error", "graph TD"),
-    ).toBeNull();
-  });
-});
@@ -1,133 +0,0 @@
-const MERMAID_SYNTAX_ERROR_LINE = /(?:Parse|Lexical) error on line (\d+)[.:]/i;
-const MERMAID_INACTIVE_PARTICIPANT_ERROR =
-  /Trying to inactivate an inactive participant \((.+)\)/i;
-const MERMAID_CARET_LINE = /^\s*-+\^\s*$/;
-
-export const isMermaidParseSyntaxError = (message: string) =>
-  MERMAID_SYNTAX_ERROR_LINE.test(message);
-
-export const isMermaidAutoFixableError = (message: string) =>
-  isMermaidParseSyntaxError(message) ||
-  MERMAID_INACTIVE_PARTICIPANT_ERROR.test(message);
-
-export const isMermaidCaretLine = (line: string) =>
-  MERMAID_CARET_LINE.test(line);
-
-export const getMermaidInactiveParticipant = (
-  message: string,
-): string | null => {
-  const match = message.match(MERMAID_INACTIVE_PARTICIPANT_ERROR);
-  if (!match?.[1]) {
-    return null;
-  }
-  return match[1].trim();
-};
-
-const escapeRegExp = (value: string) =>
-  value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-
-const getInactiveParticipantLineNumber = (
-  message: string,
-  sourceText: string,
-): number | null => {
-  const participant = getMermaidInactiveParticipant(message);
-  if (!participant) {
-    return null;
-  }
-
-  const deactivatePattern = new RegExp(
-    `^\\s*deactivate\\s+${escapeRegExp(participant)}(?:\\s+%%.*)?\\s*$`,
-  );
-  const lines = sourceText.split(/\r?\n/);
-  for (let index = lines.length - 1; index >= 0; index--) {
-    if (deactivatePattern.test(lines[index])) {
-      return index + 1;
-    }
-  }
-  return null;
-};
-
-export const getMermaidErrorLineNumber = (
-  message: string,
-  sourceText?: string,
-): number | null => {
-  const match = message.match(MERMAID_SYNTAX_ERROR_LINE);
-  if (!match) {
-    if (!sourceText) {
-      return null;
-    }
-    return getInactiveParticipantLineNumber(message, sourceText);
-  }
-  return Number.parseInt(match[1], 10);
-};
-
-const countMatches = (text: string, re: RegExp) =>
-  (text.match(re) || []).length;
-
-export const getMermaidSyntaxErrorGuidance = (
-  message: string,
-  sourceText?: string,
-): { summary: string; likelyCauses: string[] } | null => {
-  if (!isMermaidParseSyntaxError(message)) {
-    return null;
-  }
-
-  const errorLine = getMermaidErrorLineNumber(message, sourceText);
-  const summary = errorLine
-    ? `Syntax error near line ${errorLine}.`
-    : "Syntax error in Mermaid diagram.";
-
-  const likelyCauses: string[] = [];
-
-  if (sourceText) {
-    const openBrackets = countMatches(sourceText, /\[/g);
-    const closeBrackets = countMatches(sourceText, /\]/g);
-    if (openBrackets !== closeBrackets) {
-      likelyCauses.push("Unbalanced square brackets in a node label.");
-    }
-
-    const openParens = countMatches(sourceText, /\(/g);
-    const closeParens = countMatches(sourceText, /\)/g);
-    if (openParens !== closeParens) {
-      likelyCauses.push("Unbalanced parentheses in a node shape.");
-    }
-
-    const openBraces = countMatches(sourceText, /\{/g);
-    const closeBraces = countMatches(sourceText, /\}/g);
-    if (openBraces !== closeBraces) {
-      likelyCauses.push("Unbalanced braces in a decision node.");
-    }
-
-    const subgraphCount = countMatches(sourceText, /^\s*subgraph\b/gm);
-    const endCount = countMatches(sourceText, /^\s*end\s*$/gm);
-    if (subgraphCount > endCount) {
-      likelyCauses.push("A block is missing an `end` statement.");
-    }
-  }
-
-  if (/got 'NODE_STRING'/.test(message) || /got 'PS'/.test(message)) {
-    likelyCauses.push(
-      "An extra character/token may appear after a node or label definition.",
-    );
-  }
-
-  if (likelyCauses.length === 0) {
-    likelyCauses.push(
-      "A node or edge line is malformed (missing/extra delimiters).",
-    );
-    likelyCauses.push("A block (`subgraph`, `class`, etc.) may be incomplete.");
-  }
-
-  return {
-    summary,
-    likelyCauses: [...new Set(likelyCauses)],
-  };
-};
-
-export const formatMermaidParseErrorMessage = (message: string) => {
-  if (!isMermaidParseSyntaxError(message)) {
-    return message;
-  }
-
-  return message.replace(/\n\s*Expecting[\s\S]*$/, "").trimEnd();
-};
@@ -1,51 +1,35 @@
+@use "../css/variables.module" as *;
+
 .excalidraw {
  .Toast {
    $closeButtonSize: 1.2rem;
    $closeButtonPadding: 0.4rem;

-    animation: Toast-fade-in 0.5s;
-    min-width: 220px;
-    max-width: min(360px, calc(100vw - 32px));
-    border-radius: var(--border-radius-lg);
-    border: 1px solid var(--default-border-color);
-    background-color: var(--island-bg-color);
-    color: var(--text-primary-color);
-    padding: 0.5rem 0.75rem;
-    box-shadow: 0 0 0 1px var(--color-surface-lowest);
+    animation: fade-in 0.5s;
+    background-color: var(--button-gray-1);
+    border-radius: 4px;
+    bottom: 10px;
    box-sizing: border-box;
    cursor: default;
-    pointer-events: none;
+    left: 50%;
+    margin-left: -150px;
+    padding: 4px 0;
+    position: absolute;
+    text-align: center;
+    width: 300px;
+    z-index: 999999;

    .Toast__message {
-      font-family: var(--ui-font);
-      font-size: 0.75rem;
-      line-height: 1.25rem;
-      text-align: center;
      padding: 0 $closeButtonSize + ($closeButtonPadding);
+      color: var(--popup-text-color);
      white-space: pre-wrap;
    }

-    .Toast__progress-bar {
-      margin-top: 0.35rem;
-      width: 100%;
-      height: 4px;
-      border-radius: 999px;
-      background-color: var(--button-gray-2);
-      overflow: hidden;
-    }
-
-    .Toast__progress-bar-fill {
-      height: 100%;
-      border-radius: inherit;
-      background-color: var(--color-primary);
-    }
-
    .close {
      position: absolute;
      top: 0;
      right: 0;
      padding: $closeButtonPadding;
-      pointer-events: auto;

      .ToolIcon__icon {
        width: $closeButtonSize;
@@ -54,7 +38,7 @@
    }
  }

-  @keyframes Toast-fade-in {
+  @keyframes fade-in {
    from {
      opacity: 0;
    }
@@ -5,22 +5,11 @@ import { ToolButton } from "./ToolButton";

 import "./Toast.scss";

-import type { CSSProperties, ReactNode } from "react";
+import type { CSSProperties } from "react";

 const DEFAULT_TOAST_TIMEOUT = 5000;

-const ProgressBar = ({ progress }: { progress: number }) => (
-  <div className="Toast__progress-bar">
-    <div
-      className="Toast__progress-bar-fill"
-      style={{
-        width: `${Math.min(5, Math.round(progress * 100))}%`,
-      }}
-    />
-  </div>
-);
-
-const ToastComponent = ({
+export const Toast = ({
  message,
  onClose,
  closable = false,
@@ -28,7 +17,7 @@ const ToastComponent = ({
  duration = DEFAULT_TOAST_TIMEOUT,
  style,
 }: {
-  message: ReactNode;
+  message: string;
  onClose: () => void;
  closable?: boolean;
  duration?: number;
@@ -58,12 +47,11 @@ const ToastComponent = ({
  return (
    <div
      className="Toast"
-      role="status"
      onMouseEnter={onMouseEnter}
      onMouseLeave={onMouseLeave}
      style={style}
    >
-      <div className="Toast__message">{message}</div>
+      <p className="Toast__message">{message}</p>
      {closable && (
        <ToolButton
          icon={CloseIcon}
@@ -76,5 +64,3 @@ const ToastComponent = ({
    </div>
  );
 };
-
-export const Toast = Object.assign(ToastComponent, { ProgressBar });
@@ -6,6 +6,7 @@ import {
  sceneCoordsToViewportCoords,
  type EditorInterface,
 } from "@excalidraw/common";
+import { AnimationController } from "@excalidraw/excalidraw/renderer/animation";

 import type {
  InteractiveCanvasRenderConfig,
@@ -23,8 +24,6 @@ import type {
 import { t } from "../../i18n";
 import { renderInteractiveScene } from "../../renderer/interactiveScene";

-import { AnimationController } from "../../renderer/animation";
-
 import type {
  AppClassProperties,
  AppState,
@@ -203,11 +202,9 @@ const InteractiveCanvas = (props: InteractiveCanvasProps) => {
      style={{
        width: props.appState.width,
        height: props.appState.height,
-        cursor:
-          props.appState.viewModeEnabled &&
-          props.appState.activeTool.type !== "laser"
-            ? CURSOR_TYPE.GRAB
-            : CURSOR_TYPE.AUTO,
+        cursor: props.appState.viewModeEnabled
+          ? CURSOR_TYPE.GRAB
+          : CURSOR_TYPE.AUTO,
      }}
      width={props.appState.width * props.scale}
      height={props.appState.height * props.scale}
@@ -236,7 +233,6 @@ const getRelevantAppStateProps = (
  width: appState.width,
  height: appState.height,
  viewModeEnabled: appState.viewModeEnabled,
-  activeTool: appState.activeTool,
  openDialog: appState.openDialog,
  editingGroupId: appState.editingGroupId,
  selectedElementIds: appState.selectedElementIds,
@@ -250,7 +246,6 @@ const getRelevantAppStateProps = (
  multiElement: appState.multiElement,
  newElement: appState.newElement,
  isBindingEnabled: appState.isBindingEnabled,
-  isMidpointSnappingEnabled: appState.isMidpointSnappingEnabled,
  suggestedBinding: appState.suggestedBinding,
  isRotating: appState.isRotating,
  elementsToHighlight: appState.elementsToHighlight,
@@ -267,7 +262,6 @@ const getRelevantAppStateProps = (
  frameRendering: appState.frameRendering,
  shouldCacheIgnoreZoom: appState.shouldCacheIgnoreZoom,
  exportScale: appState.exportScale,
-  currentItemArrowType: appState.currentItemArrowType,
 });

 const areEqual = (
@@ -181,21 +181,6 @@
        box-shadow: 0 0 0 1px var(--color-brand-active);
      }

-      &[disabled] {
-        cursor: not-allowed;
-        opacity: 0.5;
-        pointer-events: none;
-
-        &:hover {
-          background-color: transparent;
-        }
-
-        &:active {
-          background-color: transparent;
-          box-shadow: none;
-        }
-      }
-
      svg {
        width: 1rem;
        height: 1rem;
@@ -1287,21 +1287,13 @@ export const EdgeRoundIcon = createIcon(
  tablerIconProps,
 );

-export const ArrowheadNoneIcon = React.memo(
-  ({ flip = false }: { flip?: boolean }) =>
-    createIcon(
-      <g
-        transform={flip ? "translate(24, 0) scale(-1, 1)" : ""}
-        stroke="currentColor"
-        opacity={0.3}
-        strokeWidth={2}
-      >
-        <path d="M12 12l-9 0" />
-        <path d="M21 9l-6 6" />
-        <path d="M21 15l-6 -6" />
-      </g>,
-      tablerIconProps,
-    ),
+export const ArrowheadNoneIcon = createIcon(
+  <g stroke="currentColor" opacity={0.3} strokeWidth={2}>
+    <path d="M12 12l9 0" />
+    <path d="M3 9l6 6" />
+    <path d="M3 15l6 -6" />
+  </g>,
+  tablerIconProps,
 );

 export const ArrowheadArrowIcon = React.memo(
@@ -9,9 +9,7 @@ import {
  actionLoadScene,
  actionSaveToActiveFile,
  actionShortcuts,
-  actionToggleArrowBinding,
  actionToggleGridMode,
-  actionToggleMidpointSnapping,
  actionToggleObjectsSnapMode,
  actionToggleSearchMenu,
  actionToggleStats,
@@ -445,40 +443,6 @@ const PreferencesToggleSnapModeItem = () => {
  );
 };

-const PreferencesToggleArrowBindingItem = () => {
-  const { t } = useI18n();
-  const actionManager = useExcalidrawActionManager();
-  const appState = useUIAppState();
-  return (
-    <DropdownMenuItemCheckbox
-      checked={appState.bindingPreference === "enabled"}
-      onSelect={(event) => {
-        actionManager.executeAction(actionToggleArrowBinding);
-        event.preventDefault();
-      }}
-    >
-      {t("labels.arrowBinding")}
-    </DropdownMenuItemCheckbox>
-  );
-};
-
-const PreferencesToggleMidpointSnappingItem = () => {
-  const { t } = useI18n();
-  const actionManager = useExcalidrawActionManager();
-  const appState = useUIAppState();
-  return (
-    <DropdownMenuItemCheckbox
-      checked={appState.isMidpointSnappingEnabled}
-      onSelect={(event) => {
-        actionManager.executeAction(actionToggleMidpointSnapping);
-        event.preventDefault();
-      }}
-    >
-      {t("labels.midpointSnapping")}
-    </DropdownMenuItemCheckbox>
-  );
-};
-
 export const PreferencesToggleGridModeItem = () => {
  const { t } = useI18n();
  const actionManager = useExcalidrawActionManager();
@@ -574,8 +538,6 @@ export const Preferences = ({
            <PreferencesToggleZenModeItem />
            <PreferencesToggleViewModeItem />
            <PreferencesToggleElementPropertiesItem />
-            <PreferencesToggleArrowBindingItem />
-            <PreferencesToggleMidpointSnappingItem />
          </>
        )}
        {additionalItems}
@@ -586,8 +548,6 @@ export const Preferences = ({

 Preferences.ToggleToolLock = PreferencesToggleToolLockItem;
 Preferences.ToggleSnapMode = PreferencesToggleSnapModeItem;
-Preferences.ToggleArrowBinding = PreferencesToggleArrowBindingItem;
-Preferences.ToggleMidpointSnapping = PreferencesToggleMidpointSnappingItem;
 Preferences.ToggleGridMode = PreferencesToggleGridModeItem;
 Preferences.ToggleZenMode = PreferencesToggleZenModeItem;
 Preferences.ToggleViewMode = PreferencesToggleViewModeItem;
@@ -11,28 +11,17 @@ import {
  TextIcon,
  ImageIcon,
  EraserIcon,
-  laserPointerToolIcon,
-  handIcon,
 } from "./icons";

 import type { AppClassProperties } from "../types";

 export const SHAPES = [
-  {
-    icon: handIcon,
-    value: "hand",
-    key: KEYS.H,
-    numericKey: null,
-    fillable: false,
-    toolbar: true,
-  },
  {
    icon: SelectionIcon,
    value: "selection",
    key: KEYS.V,
    numericKey: KEYS["1"],
    fillable: true,
-    toolbar: true,
  },
  {
    icon: RectangleIcon,
@@ -40,7 +29,6 @@ export const SHAPES = [
    key: KEYS.R,
    numericKey: KEYS["2"],
    fillable: true,
-    toolbar: true,
  },
  {
    icon: DiamondIcon,
@@ -48,7 +36,6 @@ export const SHAPES = [
    key: KEYS.D,
    numericKey: KEYS["3"],
    fillable: true,
-    toolbar: true,
  },
  {
    icon: EllipseIcon,
@@ -56,7 +43,6 @@ export const SHAPES = [
    key: KEYS.O,
    numericKey: KEYS["4"],
    fillable: true,
-    toolbar: true,
  },
  {
    icon: ArrowIcon,
@@ -64,7 +50,6 @@ export const SHAPES = [
    key: KEYS.A,
    numericKey: KEYS["5"],
    fillable: true,
-    toolbar: true,
  },
  {
    icon: LineIcon,
@@ -72,7 +57,6 @@ export const SHAPES = [
    key: KEYS.L,
    numericKey: KEYS["6"],
    fillable: true,
-    toolbar: true,
  },
  {
    icon: FreedrawIcon,
@@ -80,7 +64,6 @@ export const SHAPES = [
    key: [KEYS.P, KEYS.X],
    numericKey: KEYS["7"],
    fillable: false,
-    toolbar: true,
  },
  {
    icon: TextIcon,
@@ -88,7 +71,6 @@ export const SHAPES = [
    key: KEYS.T,
    numericKey: KEYS["8"],
    fillable: false,
-    toolbar: true,
  },
  {
    icon: ImageIcon,
@@ -96,7 +78,6 @@ export const SHAPES = [
    key: null,
    numericKey: KEYS["9"],
    fillable: false,
-    toolbar: true,
  },
  {
    icon: EraserIcon,
@@ -104,15 +85,6 @@ export const SHAPES = [
    key: KEYS.E,
    numericKey: KEYS["0"],
    fillable: false,
-    toolbar: true,
-  },
-  {
-    icon: laserPointerToolIcon,
-    value: "laser",
-    key: KEYS.K,
-    numericKey: null,
-    fillable: false,
-    toolbar: false,
  },
 ] as const;

@@ -125,7 +97,6 @@ export const getToolbarTools = (app: AppClassProperties) => {
          key: KEYS.V,
          numericKey: KEYS["1"],
          fillable: true,
-          toolbar: true,
        },
        ...SHAPES.slice(1),
      ] as const)
@@ -500,26 +500,6 @@ body.excalidraw-cursor-resize * {
    }
  }

-  .floating-status-stack {
-    position: absolute;
-    left: 50%;
-    bottom: 30px;
-    transform: translateX(-50%);
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    gap: 0.5rem;
-    pointer-events: none;
-
-    .scroll-back-to-content {
-      position: static;
-      left: auto;
-      bottom: auto;
-      transform: none;
-      pointer-events: var(--ui-pointerEvents);
-    }
-  }
-
  .help-icon {
    @include outlineButtonStyles;
    @include filledButtonOnCanvas;
@@ -27,6 +27,7 @@ import {

 import type { AppState, DataURL, LibraryItem } from "../types";

+import type { FileSystemHandle } from "browser-fs-access";
 import type { ImportedLibraryData } from "./types";

 const parseFileContents = async (blob: Blob | File): Promise<string> => {
@@ -103,7 +104,7 @@ export const getMimeType = (blob: Blob | string): string => {
  return "";
 };

-export const getFileHandleType = (handle: FileSystemFileHandle | null) => {
+export const getFileHandleType = (handle: FileSystemHandle | null) => {
  if (!handle) {
    return null;
  }
@@ -117,9 +118,7 @@ export const isImageFileHandleType = (
  return type === "png" || type === "svg";
 };

-export const isImageFileHandle = (
-  handle: FileSystemFileHandle | null,
-): handle is FileSystemFileHandle => {
+export const isImageFileHandle = (handle: FileSystemHandle | null) => {
  const type = getFileHandleType(handle);
  return type === "png" || type === "svg";
 };
@@ -140,8 +139,8 @@ export const loadSceneOrLibraryFromBlob = async (
  /** @see restore.localAppState */
  localAppState: AppState | null,
  localElements: readonly ExcalidrawElement[] | null,
-  /** FileSystemFileHandle. Defaults to `blob.handle` if defined, otherwise null. */
-  fileHandle?: FileSystemFileHandle | null,
+  /** FileSystemHandle. Defaults to `blob.handle` if defined, otherwise null. */
+  fileHandle?: FileSystemHandle | null,
 ) => {
  const contents = await parseFileContents(blob);
  let data;
@@ -199,8 +198,8 @@ export const loadFromBlob = async (
  /** @see restore.localAppState */
  localAppState: AppState | null,
  localElements: readonly ExcalidrawElement[] | null,
-  /** FileSystemFileHandle. Defaults to `blob.handle` if defined, otherwise null. */
-  fileHandle?: FileSystemFileHandle | null,
+  /** FileSystemHandle. Defaults to `blob.handle` if defined, otherwise null. */
+  fileHandle?: FileSystemHandle | null,
 ) => {
  const ret = await loadSceneOrLibraryFromBlob(
    blob,
@@ -393,7 +392,7 @@ export const ImageURLToFile = async (

 export const getFileHandle = async (
  event: DragEvent | React.DragEvent | DataTransferItem,
-): Promise<FileSystemFileHandle | null> => {
+): Promise<FileSystemHandle | null> => {
  if (nativeFileSystemSupported) {
    try {
      const dataTransferItem =
@@ -401,7 +400,7 @@ export const getFileHandle = async (
          ? event
          : (event as DragEvent).dataTransfer?.items?.[0];

-      const handle: FileSystemFileHandle | null =
+      const handle: FileSystemHandle | null =
        (await (dataTransferItem as any).getAsFileSystemHandle()) || null;

      return handle;
@@ -4,12 +4,18 @@ import {
  supported as nativeFileSystemSupported,
 } from "browser-fs-access";

-import { MIME_TYPES } from "@excalidraw/common";
+import { EVENT, MIME_TYPES, debounce } from "@excalidraw/common";
+
+import { AbortError } from "../errors";

 import { normalizeFile } from "./blob";

+import type { FileSystemHandle } from "browser-fs-access";
+
 type FILE_EXTENSION = Exclude<keyof typeof MIME_TYPES, "binary">;

+const INPUT_CHANGE_INTERVAL_MS = 5000;
+
 export const fileOpen = async <M extends boolean | undefined = false>(opts: {
  extensions?: FILE_EXTENSION[];
  description: string;
@@ -36,6 +42,40 @@ export const fileOpen = async <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(EVENT.KEYUP, scheduleRejection);
+        document.addEventListener(EVENT.POINTER_UP, 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(EVENT.FOCUS, focusHandler);
+      });
+      const interval = window.setInterval(() => {
+        checkForFile();
+      }, INPUT_CHANGE_INTERVAL_MS);
+      return (rejectPromise) => {
+        clearInterval(interval);
+        scheduleRejection.cancel();
+        window.removeEventListener(EVENT.FOCUS, focusHandler);
+        document.removeEventListener(EVENT.KEYUP, scheduleRejection);
+        document.removeEventListener(EVENT.POINTER_UP, 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 AbortError());
+        }
+      };
+    },
  });

  if (Array.isArray(files)) {
@@ -55,8 +95,8 @@ export const fileSave = (
    extension: FILE_EXTENSION;
    mimeTypes?: string[];
    description: string;
-    /** existing FileSystemFileHandle */
-    fileHandle?: FileSystemFileHandle | null;
+    /** existing FileSystemHandle */
+    fileHandle?: FileSystemHandle | null;
  },
 ) => {
  return _fileSave(
@@ -68,8 +108,8 @@ export const fileSave = (
      mimeTypes: opts.mimeTypes,
    },
    opts.fileHandle,
-    false,
  );
 };

 export { nativeFileSystemSupported };
+export type { FileSystemHandle };
@@ -33,6 +33,8 @@ import { canvasToBlob } from "./blob";
 import { fileSave } from "./filesystem";
 import { serializeAsJSON } from "./json";

+import type { FileSystemHandle } from "./filesystem";
+
 import type { ExportType } from "../scene/types";
 import type { AppState, BinaryFiles } from "../types";

@@ -108,7 +110,7 @@ export const exportCanvas = async (
    viewBackgroundColor: string;
    /** filename, if applicable */
    name?: string;
-    fileHandle?: FileSystemFileHandle | null;
+    fileHandle?: FileSystemHandle | null;
    exportingFrame: ExcalidrawFrameLikeElement | null;
  },
 ) => {
@@ -1,13 +1,12 @@
 import {
+  DEFAULT_FILENAME,
  EXPORT_DATA_TYPES,
  getExportSource,
  MIME_TYPES,
  VERSIONS,
 } from "@excalidraw/common";

-import type { ExcalidrawElement, NonDeleted } from "@excalidraw/element/types";
-
-import type { MaybePromise } from "@excalidraw/common/utility-types";
+import type { ExcalidrawElement } from "@excalidraw/element/types";

 import { cleanAppStateForExport, clearAppStateForDatabase } from "../appState";

@@ -22,12 +21,6 @@ import type {
  ImportedLibraryData,
 } from "./types";

-export type JSONExportData = {
-  elements: readonly NonDeleted<ExcalidrawElement>[];
-  appState: AppState;
-  files: BinaryFiles;
-};
-
 /**
 * Strips out files which are only referenced by deleted elements
 */
@@ -74,29 +67,27 @@ export const serializeAsJSON = (
  return JSON.stringify(data, null, 2);
 };

-export const saveAsJSON = async ({
-  data,
-  filename,
-  fileHandle,
-}: {
-  data: MaybePromise<JSONExportData>;
-  filename: string;
-  fileHandle: AppState["fileHandle"];
-}) => {
-  const blob = Promise.resolve(data).then(({ elements, appState, files }) => {
-    const serialized = serializeAsJSON(elements, appState, files, "local");
-    return new Blob([serialized], {
-      type: MIME_TYPES.excalidraw,
-    });
+export const saveAsJSON = async (
+  elements: readonly ExcalidrawElement[],
+  appState: AppState,
+  files: BinaryFiles,
+  /** filename */
+  name: string = appState.name || DEFAULT_FILENAME,
+) => {
+  const serialized = serializeAsJSON(elements, appState, files, "local");
+  const blob = new Blob([serialized], {
+    type: MIME_TYPES.excalidraw,
  });

-  const savedFileHandle = await fileSave(blob, {
-    name: filename,
+  const fileHandle = await fileSave(blob, {
+    name,
    extension: "excalidraw",
    description: "Excalidraw file",
-    fileHandle: isImageFileHandle(fileHandle) ? null : fileHandle,
+    fileHandle: isImageFileHandle(appState.fileHandle)
+      ? null
+      : appState.fileHandle,
  });
-  return { fileHandle: savedFileHandle };
+  return { fileHandle };
 };

 export const loadFromJSON = async (
@@ -1,39 +1,26 @@
-import type { MaybePromise } from "@excalidraw/common/utility-types";
-
 import type { ExcalidrawElement } from "@excalidraw/element/types";

 import { getFileHandleType, isImageFileHandleType } from "./blob";

-// eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { exportCanvas, prepareElementsForExport } from ".";

 import type { AppState, BinaryFiles } from "../types";

 export const resaveAsImageWithScene = async (
-  data: MaybePromise<{
-    elements: readonly ExcalidrawElement[];
-    appState: AppState;
-    files: BinaryFiles;
-  }>,
-  fileHandle: FileSystemFileHandle,
-  filename: string,
+  elements: readonly ExcalidrawElement[],
+  appState: AppState,
+  files: BinaryFiles,
+  name: string,
 ) => {
+  const { exportBackground, viewBackgroundColor, fileHandle } = appState;
+
  const fileHandleType = getFileHandleType(fileHandle);

-  if (Math.random() < 1) {
-    throw new Error("OLALALALA");
-  }
-
-  if (!isImageFileHandleType(fileHandleType)) {
+  if (!fileHandle || !isImageFileHandleType(fileHandleType)) {
    throw new Error(
      "fileHandle should exist and should be of type svg or png when resaving",
    );
  }
-
-  let { elements, appState, files } = await data;
-
-  const { exportBackground, viewBackgroundColor } = appState;
-
  appState = {
    ...appState,
    exportEmbedScene: true,
@@ -48,7 +35,7 @@ export const resaveAsImageWithScene = async (
  await exportCanvas(fileHandleType, exportedElements, appState, files, {
    exportBackground,
    viewBackgroundColor,
-    name: filename,
+    name,
    fileHandle,
    exportingFrame,
  });
@@ -155,7 +155,7 @@ const repairBinding = <T extends ExcalidrawArrowElement>(
        | ExcalidrawElbowArrowElement["startBinding"]
        | ExcalidrawElbowArrowElement["endBinding"] = {
        ...binding,
-        fixedPoint: normalizeFixedPoint(binding.fixedPoint),
+        fixedPoint: normalizeFixedPoint(binding.fixedPoint ?? [0, 0]),
        mode: binding.mode || "orbit",
      };

@@ -176,7 +176,7 @@ const repairBinding = <T extends ExcalidrawArrowElement>(
        return {
          elementId: binding.elementId,
          mode: binding.mode,
-          fixedPoint: normalizeFixedPoint(binding.fixedPoint),
+          fixedPoint: normalizeFixedPoint(binding.fixedPoint || [0.5, 0.5]),
        } as FixedPointBinding | null;
      }
      return null;
@@ -185,14 +185,15 @@ const repairBinding = <T extends ExcalidrawArrowElement>(
    // binding schema v1 (legacy) -> attempt to migrate to v2
    // ---------------------------------------------------------------------------

-    const targetBoundElement = targetElementsMap.get(binding.elementId) as
-      | ExcalidrawBindableElement
-      | undefined;
+    const targetBoundElement =
+      (targetElementsMap.get(binding.elementId) as ExcalidrawBindableElement) ||
+      undefined;
    const boundElement =
      targetBoundElement ||
-      (existingElementsMap?.get(binding.elementId) as
-        | ExcalidrawBindableElement
-        | undefined);
+      (existingElementsMap?.get(
+        binding.elementId,
+      ) as ExcalidrawBindableElement) ||
+      undefined;
    const elementsMap = targetBoundElement
      ? targetElementsMap
      : existingElementsMap;
@@ -207,28 +208,11 @@ const repairBinding = <T extends ExcalidrawArrowElement>(
      const mode = isPointInElement(p, boundElement, elementsMap)
        ? "inside"
        : "orbit";
-      const safeElement = {
-        ...element,
-        startBinding: element.startBinding?.elementId
-          ? {
-              ...element.startBinding,
-              mode,
-              fixedPoint: normalizeFixedPoint(element.startBinding.fixedPoint),
-            }
-          : null,
-        endBinding: element.endBinding?.elementId
-          ? {
-              ...element.endBinding,
-              mode,
-              fixedPoint: normalizeFixedPoint(element.endBinding.fixedPoint),
-            }
-          : null,
-      };
      const focusPoint =
        mode === "inside"
          ? p
          : projectFixedPointOntoDiagonal(
-              safeElement,
+              element,
              p,
              boundElement,
              startOrEnd,
@@ -236,7 +220,7 @@ const repairBinding = <T extends ExcalidrawArrowElement>(
              { value: 1 as NormalizedZoomValue },
            ) || p;
      const { fixedPoint } = calculateFixedPointForNonElbowArrowBinding(
-        safeElement,
+        element,
        boundElement,
        startOrEnd,
        elementsMap,
@@ -52,7 +52,7 @@ declare module "png-chunks-extract" {
 // -----------------------------------------------------------------------------

 interface Blob {
-  handle?: FileSystemFileHandle;
+  handle?: import("browser-fs-acces").FileSystemHandle;
  name?: string;
 }

@@ -1,110 +0,0 @@
-import { useEffect, useRef, useState } from "react";
-
-import { useExcalidrawAPI } from "../components/App";
-
-import { getDefaultAppState } from "../appState";
-
-import type { AppState } from "../types";
-
-/**
- * Subscribes to specific appState changes. The component re-renders
- * only when the specified prop(s) change — not on every appState update.
- *
- * Works both inside and outside the <Excalidraw> tree, as long as
- * ExcalidrawAPIContext.Provider is an ancestor (automatically provided
- * inside <Excalidraw>, or manually by the host app).
- *
- * Returns the narrowed value depending on prop form:
- *  - `keyof AppState` → `AppState[K]`
- *  - `(keyof AppState)[]` → whole `AppState`
- *  - selector function → selector's return type `T`
- *
- * Calls the optional callback with the latest value on every change (not called
- * on initial render).
- *
- * If excalidrawAPI is not ready yet (host apps), hook is rerendered with latest
- * value once available.
- */
-export function useAppStateValue<K extends keyof AppState>(
-  prop: K,
-  callback?: (value: AppState[K], appState: AppState) => void,
-  _internal?: boolean,
-): AppState[K];
-export function useAppStateValue(
-  props: (keyof AppState)[],
-  callback?: (props: AppState, appState: AppState) => void,
-  _internal?: boolean,
-): AppState;
-export function useAppStateValue<T>(
-  selector: (appState: AppState) => T,
-  callback?: (value: T, appState: AppState) => void,
-  _internal?: boolean,
-): T;
-export function useAppStateValue(
-  selector:
-    | keyof AppState
-    | (keyof AppState)[]
-    | ((appState: AppState) => unknown),
-  callback?: (value: any, appState: AppState) => void,
-  _internal: boolean = true,
-): unknown {
-  const api = useExcalidrawAPI();
-
-  const getLatestValue = () => {
-    let appState = api?.getAppState();
-    if (!appState) {
-      if (!_internal) {
-        return undefined;
-      }
-      console.warn(
-        "useAppStateValue: excalidrawAPI not defined yet for internal component in which case it should always be defined. Are you sure you're rendering inside of <Excalidraw/> component tree?",
-      );
-      // fall back in case there's a bug so we don't break the app
-      // (internal components using this internal useAppStateValue expect
-      //  non-undefined values on init)
-      appState = Object.assign(
-        { width: 0, height: 0, offsetLeft: 0, offsetTop: 0 },
-        getDefaultAppState(),
-      );
-    }
-    if (typeof selector === "function") {
-      return selector(appState);
-    }
-    if (Array.isArray(selector)) {
-      return appState;
-    }
-    return appState[selector];
-  };
-
-  const [value, setValue] = useState<unknown>(getLatestValue);
-
-  const stateRef = useRef({
-    selector,
-    callback,
-    isInitialized: !!api,
-    latestValue: value,
-  });
-  stateRef.current.selector = selector;
-  stateRef.current.callback = callback;
-  if (!stateRef.current.isInitialized && api) {
-    stateRef.current.isInitialized = true;
-    stateRef.current.latestValue = getLatestValue();
-  }
-
-  useEffect(() => {
-    if (!api) {
-      return;
-    }
-
-    return api.onStateChange(
-      stateRef.current.selector,
-      (newValue: any, state: AppState) => {
-        stateRef.current.latestValue = newValue;
-        stateRef.current.callback?.(newValue, state);
-        setValue(newValue);
-      },
-    );
-  }, [api]);
-
-  return stateRef.current.latestValue;
-}
@@ -1,18 +1,14 @@
-import React, { useCallback, useContext, useEffect, useState } from "react";
+import React, { useEffect } from "react";

 import { DEFAULT_UI_OPTIONS, isShallowEqual } from "@excalidraw/common";

-import App, {
-  ExcalidrawAPIContext,
-  ExcalidrawAPISetContext,
-} from "./components/App";
+import App from "./components/App";
 import { InitializeApp } from "./components/InitializeApp";
 import Footer from "./components/footer/FooterCenter";
 import LiveCollaborationTrigger from "./components/live-collaboration/LiveCollaborationTrigger";
 import MainMenu from "./components/main-menu/MainMenu";
 import WelcomeScreen from "./components/welcome-screen/WelcomeScreen";
 import { defaultLang } from "./i18n";
-import { useAppStateValue as _useAppStateValue } from "./hooks/useAppStateValue";
 import { EditorJotaiProvider, editorJotaiStore } from "./editor-jotai";
 import polyfill from "./polyfill";

@@ -20,44 +16,16 @@ import "./css/app.scss";
 import "./css/styles.scss";
 import "./fonts/fonts.css";

-import type {
-  AppProps,
-  AppState,
-  ExcalidrawImperativeAPI,
-  ExcalidrawProps,
-} from "./types";
+import type { AppProps, ExcalidrawProps } from "./types";

 polyfill();

-/**
- * Stateless provider that allows `useExcalidrawAPI()` (and hooks built
- * on it, such as `useAppStateValue()`) to work outside the <Excalidraw>
- * component tree.
- */
-export const ExcalidrawAPIProvider = ({
-  children,
-}: {
-  children: React.ReactNode;
-}) => {
-  const [api, setApi] = useState<ExcalidrawImperativeAPI | null>(null);
-  return (
-    <ExcalidrawAPIContext.Provider value={api}>
-      <ExcalidrawAPISetContext.Provider value={setApi}>
-        {children}
-      </ExcalidrawAPISetContext.Provider>
-    </ExcalidrawAPIContext.Provider>
-  );
-};
-
 const ExcalidrawBase = (props: ExcalidrawProps) => {
  const {
-    onExport,
    onChange,
    onIncrement,
    initialData,
-    onExcalidrawAPI,
-    onMount,
-    onInitialize,
+    excalidrawAPI,
    isCollaborating = false,
    onPointerUpdate,
    renderTopLeftUI,
@@ -118,15 +86,6 @@ const ExcalidrawBase = (props: ExcalidrawProps) => {
    UIOptions.canvasActions.toggleTheme = true;
  }

-  const setExcalidrawAPI = useContext(ExcalidrawAPISetContext);
-  const handleExcalidrawAPI = useCallback(
-    (api: ExcalidrawImperativeAPI) => {
-      setExcalidrawAPI?.(api);
-      onExcalidrawAPI?.(api);
-    },
-    [onExcalidrawAPI, setExcalidrawAPI],
-  );
-
  useEffect(() => {
    const importPolyfill = async () => {
      //@ts-ignore
@@ -156,13 +115,10 @@ const ExcalidrawBase = (props: ExcalidrawProps) => {
    <EditorJotaiProvider store={editorJotaiStore}>
      <InitializeApp langCode={langCode} theme={theme}>
        <App
-          onExport={onExport}
          onChange={onChange}
          onIncrement={onIncrement}
          initialData={initialData}
-          onExcalidrawAPI={handleExcalidrawAPI}
-          onMount={onMount}
-          onInitialize={onInitialize}
+          excalidrawAPI={excalidrawAPI}
          isCollaborating={isCollaborating}
          onPointerUpdate={onPointerUpdate}
          renderTopLeftUI={renderTopLeftUI}
@@ -311,7 +267,6 @@ export {
  sceneCoordsToViewportCoords,
  viewportCoordsToSceneCoords,
  getFormFactor,
-  throttleRAF,
 } from "@excalidraw/common";

 export {
@@ -329,13 +284,7 @@ export { Button } from "./components/Button";
 export { Footer };
 export { MainMenu };
 export { Ellipsify } from "./components/Ellipsify";
-export {
-  useEditorInterface,
-  useStylesPanelMode,
-  useExcalidrawAPI,
-  ExcalidrawAPIContext,
-} from "./components/App";
-
+export { useEditorInterface, useStylesPanelMode } from "./components/App";
 export { WelcomeScreen };
 export { LiveCollaborationTrigger };
 export { Stats } from "./components/Stats";
@@ -370,43 +319,3 @@ export { isElementLink } from "@excalidraw/element";
 export { setCustomTextMetricsProvider } from "@excalidraw/element";

 export { CommandPalette } from "./components/CommandPalette/CommandPalette";
-
-export {
-  renderSpreadsheet,
-  tryParseSpreadsheet,
-  isSpreadsheetValidForChartType,
-} from "./charts";
-
-// -----------------------------------------------------------------------------
-// useAppStateValue() wrapper for host apps for the return type to reflect the
-// the potentially `undefined` value for initial render before the excalidrawAPI
-// is ready.
-//
-/**
- * hook that subscribes to specific appState prop(s)
- *
- * @param prop - appState prop(s) to subscribe to, or a selector function.
- * NOTE `prop/selector` is memoized and will not change after initial render
- */
-export function useAppStateValue<K extends keyof AppState>(
-  prop: K,
-  callback?: (value: AppState[K], appState: AppState) => void,
-): AppState[K] | undefined;
-export function useAppStateValue<T extends keyof AppState>(
-  props: T[],
-  callback?: (values: AppState, appState: AppState) => void,
-): AppState | undefined;
-export function useAppStateValue<T>(
-  selector: (appState: AppState) => T,
-  callback?: (value: T, appState: AppState) => void,
-): T | undefined;
-export function useAppStateValue(
-  selector:
-    | keyof AppState
-    | (keyof AppState)[]
-    | ((appState: AppState) => unknown),
-  callback?: (value: any, appState: AppState) => void,
-) {
-  return _useAppStateValue(selector as any, callback, false);
-}
-// -----------------------------------------------------------------------------
@@ -3,10 +3,6 @@
    "paste": "Paste",
    "pasteAsPlaintext": "Paste as plaintext",
    "pasteCharts": "Paste charts",
-    "chartType_bar": "Bar chart",
-    "chartType_line": "Line chart",
-    "chartType_radar": "Radar chart",
-    "chartType_plaintext": "Plain text",
    "selectAll": "Select all",
    "multiSelect": "Add element to selection",
    "moveCanvas": "Move canvas",
@@ -177,9 +173,7 @@
    "tab": "Tab",
    "shapeSwitch": "Switch shape",
    "preferences": "Preferences",
-    "preferences_toolLock": "Tool lock",
-    "arrowBinding": "Arrow binding",
-    "midpointSnapping": "Snap to midpoints"
+    "preferences_toolLock": "Tool lock"
  },
  "elementLink": {
    "title": "Link to object",
@@ -403,10 +397,6 @@
  "errorDialog": {
    "title": "Error"
  },
-  "progressDialog": {
-    "title": "Saving",
-    "defaultMessage": "Preparing to save..."
-  },
  "exportDialog": {
    "disk_title": "Save to disk",
    "disk_details": "Export the scene data to a file from which you can import later.",
@@ -628,8 +618,7 @@
    "syntax": "Mermaid Syntax",
    "preview": "Preview",
    "label": "Mermaid",
-    "inputPlaceholder": "Write Mermaid diagram defintion here...",
-    "autoFixAvailable": "Auto-fix is available"
+    "inputPlaceholder": "Write Mermaid diagram defintion here..."
  },
  "ttd": {
    "error": "Error!"
@@ -79,18 +79,14 @@
  },
  "dependencies": {
    "@braintree/sanitize-url": "6.0.2",
-    "@codemirror/commands": "^6.0.0",
-    "@codemirror/language": "^6.0.0",
-    "@codemirror/state": "^6.0.0",
-    "@codemirror/view": "^6.0.0",
-    "@lezer/highlight": "^1.0.0",
    "@excalidraw/common": "0.18.0",
    "@excalidraw/element": "0.18.0",
    "@excalidraw/laser-pointer": "1.3.1",
    "@excalidraw/math": "0.18.0",
-    "@excalidraw/mermaid-to-excalidraw": "2.0.0-rc4",
+    "@excalidraw/mermaid-to-excalidraw": "2.0.0-rfc3",
    "@excalidraw/random-username": "1.1.0",
-    "browser-fs-access": "0.38.0",
+    "radix-ui": "1.4.3",
+    "browser-fs-access": "0.29.1",
    "canvas-roundrect-polyfill": "0.0.1",
    "clsx": "1.1.1",
    "cross-env": "7.0.3",
@@ -111,7 +107,6 @@
    "png-chunks-extract": "1.0.0",
    "points-on-curve": "1.0.1",
    "pwacompat": "2.0.17",
-    "radix-ui": "1.4.3",
    "roughjs": "4.6.4",
    "sass": "1.51.0",
    "tunnel-rat": "0.1.2"
--- a/Show More
+++ b/Show More