fix: text corner resizing only takes delta y

excalidraw-app/App.tsx

@@ -266,7 +266,7 @@ const initializeScene = async (opts: {
               repairBindings: true,
               deleteInvisibleElements: true,
             }),
-            scene.elements,
+            localDataState?.elements,
           ),
           appState: restoreAppState(
             imported.appState,
@@ -551,11 +551,7 @@ const ExcalidrawWrapper = () => {
           const username = importUsernameFromLocalStorage();
           setLangCode(getPreferredLanguage());
           excalidrawAPI.updateScene({
-            elements: restoreElements(localDataState?.elements, null, {
-              repairBindings: true,
-              deleteInvisibleElements: true,
-            }),
-            appState: restoreAppState(localDataState?.appState, null),
+            ...localDataState,
             captureUpdate: CaptureUpdateAction.NEVER,
           });
           LibraryIndexedDBAdapter.load().then((data) => {

excalidraw-app/components/AppMainMenu.tsx

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

excalidraw-app/components/AppWelcomeScreen.tsx

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

excalidraw-app/data/LocalData.ts

@@ -86,11 +86,9 @@ const saveDataStateToLocalStorage = (
       _appState.openSidebar = null;
     }
 
-    const persistedElements = getNonDeletedElements(elements);
-
     localStorage.setItem(
       STORAGE_KEYS.LOCAL_STORAGE_ELEMENTS,
-      JSON.stringify(persistedElements),
+      JSON.stringify(getNonDeletedElements(elements)),
     );
     localStorage.setItem(
       STORAGE_KEYS.LOCAL_STORAGE_APP_STATE,

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

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

excalidraw-app/tests/collab.test.tsx

@@ -69,114 +69,6 @@ vi.mock("socket.io-client", () => {
  * i.e. multiplayer history tests could be a good first candidate, as we could test both history stacks simultaneously.
  */
 describe("collaboration", () => {
-  it("should preserve future element fields across collab reconciliation", async () => {
-    await render(<ExcalidrawApp />);
-
-    const frame = API.createElement({
-      type: "frame",
-      id: "A",
-      width: 100,
-      height: 100,
-      x: 0,
-      y: 0,
-      backgroundColor: "#ff0000",
-    });
-
-    const frameWithFutureFields = {
-      ...frame,
-      schemaState: {
-        tracks: {
-          ...frame.schemaState.tracks,
-          "host.myapp.frame": 1,
-        },
-      },
-      futureField: "keep-me",
-    } as typeof frame & {
-      schemaState: { tracks: Record<string, number> };
-      futureField: string;
-    };
-
-    API.updateScene({
-      elements: [frameWithFutureFields],
-      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
-    });
-
-    await waitFor(() => {
-      expect((h.elements[0] as any).futureField).toBe("keep-me");
-      expect((h.elements[0] as any).schemaState).toEqual(
-        frameWithFutureFields.schemaState,
-      );
-      expect(h.elements[0].backgroundColor).toBe("#ff0000");
-    });
-
-    const remoteMovedFrame = newElementWith(h.elements[0] as any, {
-      x: 120,
-      y: 80,
-    });
-
-    const reconciled = (window.collab as any)._reconcileElements([
-      remoteMovedFrame,
-    ]);
-
-    expect(reconciled[0]).toEqual(
-      expect.objectContaining({
-        x: 120,
-        y: 80,
-        backgroundColor: "#ff0000",
-      }),
-    );
-    expect((reconciled[0] as any).futureField).toBe("keep-me");
-    expect((reconciled[0] as any).schemaState).toEqual(
-      frameWithFutureFields.schemaState,
-    );
-  });
-
-  it("should preserve future element fields on local edits before broadcast", async () => {
-    await render(<ExcalidrawApp />);
-
-    const rect = API.createElement({
-      type: "rectangle",
-      id: "A",
-      width: 100,
-      height: 100,
-      x: 0,
-      y: 0,
-    });
-
-    const rectWithFutureFields = {
-      ...rect,
-      schemaState: {
-        tracks: {
-          ...rect.schemaState.tracks,
-          "host.myapp.rect": 1,
-        },
-      },
-      futureField: { value: "keep-me" },
-    } as typeof rect & {
-      schemaState: { tracks: Record<string, number> };
-      futureField: { value: string };
-    };
-
-    API.updateScene({
-      elements: [rectWithFutureFields],
-      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
-    });
-
-    const locallyEdited = newElementWith(h.elements[0] as any, { x: 200 });
-    API.updateScene({
-      elements: [locallyEdited],
-      captureUpdate: CaptureUpdateAction.NEVER,
-    });
-
-    await waitFor(() => {
-      expect((h.elements[0] as any).futureField).toEqual({ value: "keep-me" });
-      expect((h.elements[0] as any).schemaState).toEqual(
-        rectWithFutureFields.schemaState,
-      );
-      expect(h.elements[0]).toEqual(expect.objectContaining({ x: 200 }));
-    });
-  });
-
   it("should emit two ephemeral increments even though updates get batched", async () => {
     const durableIncrements: DurableIncrement[] = [];
     const ephemeralIncrements: EphemeralIncrement[] = [];
@@ -191,18 +83,14 @@ describe("collaboration", () => {
       }
     });
 
-    // Ensure this test starts from a deterministic scene regardless of previous
-    // test state restored from persistence.
-    API.updateScene({
-      elements: [],
-      captureUpdate: CaptureUpdateAction.NEVER,
-    });
-
-    const durableBaseline = durableIncrements.length;
-    const ephemeralBaseline = ephemeralIncrements.length;
+    // eslint-disable-next-line dot-notation
+    expect(h.store["scheduledMicroActions"].length).toBe(0);
+    expect(durableIncrements.length).toBe(0);
+    expect(ephemeralIncrements.length).toBe(0);
 
     const rectProps = {
       type: "rectangle",
+      id: "A",
       height: 200,
       width: 100,
       x: 0,
@@ -217,7 +105,8 @@ describe("collaboration", () => {
     });
 
     await waitFor(() => {
-      expect(durableIncrements.length).toBe(durableBaseline + 1);
+      // expect(commitSpy).toHaveBeenCalledTimes(1);
+      expect(durableIncrements.length).toBe(1);
     });
 
     // simulate two batched remote updates
@@ -241,13 +130,13 @@ describe("collaboration", () => {
       // altough the updates get batched,
       // we expect two ephemeral increments for each update,
       // and each such update should have the expected change
-      expect(ephemeralIncrements.length).toBe(ephemeralBaseline + 2);
-      expect(
-        ephemeralIncrements[ephemeralBaseline].change.elements[rect.id],
-      ).toEqual(expect.objectContaining({ x: 100 }));
-      expect(
-        ephemeralIncrements[ephemeralBaseline + 1].change.elements[rect.id],
-      ).toEqual(expect.objectContaining({ x: 200 }));
+      expect(ephemeralIncrements.length).toBe(2);
+      expect(ephemeralIncrements[0].change.elements.A).toEqual(
+        expect.objectContaining({ x: 100 }),
+      );
+      expect(ephemeralIncrements[1].change.elements.A).toEqual(
+        expect.objectContaining({ x: 200 }),
+      );
       // eslint-disable-next-line dot-notation
       expect(h.store["scheduledMicroActions"].length).toBe(0);
     });

packages/common/src/colors.ts

@@ -346,7 +346,7 @@ export const normalizeInputColor = (color: string): string | null => {
   if (tc.isValid()) {
     // testing for `#` first fixes a bug on Electron (more specfically, an
     // Obsidian popout window), where a hex color without `#` is considered valid
-    if (["hex", "hex8"].includes(tc.getFormat()) && !color.startsWith("#")) {
+    if (tc.getFormat() === "hex" && !color.startsWith("#")) {
       return `#${color}`;
     }
     return color;

packages/common/src/constants.ts

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

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

@@ -27,9 +27,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#66a80f",
   "strokeStyle": "solid",
@@ -67,9 +64,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#9c36b5",
   "strokeStyle": "solid",
@@ -122,9 +116,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": {
@@ -186,9 +177,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": {
@@ -235,9 +223,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing s
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -281,9 +266,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
   "originalText": "HEYYYYY",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#c2255c",
   "strokeStyle": "solid",
@@ -330,9 +312,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
   "originalText": "Whats up ?",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -393,9 +372,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": {
@@ -443,9 +419,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to existing t
   "originalText": "HELLO WORLD!!",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -506,9 +479,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to shapes whe
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": {
@@ -556,9 +526,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to shapes whe
   "originalText": "HELLO WORLD!!",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -599,9 +566,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to shapes whe
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -639,9 +603,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to shapes whe
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -699,9 +660,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to text when
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": {
@@ -749,9 +707,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to text when
   "originalText": "HELLO WORLD!!",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -798,9 +753,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to text when
   "originalText": "HEYYYYY",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -847,9 +799,6 @@ exports[`Test Transform > Test arrow bindings > should bind arrows to text when
   "originalText": "WHATS UP ?",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -885,9 +834,6 @@ exports[`Test Transform > should not allow duplicate ids 1`] = `
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -933,9 +879,6 @@ exports[`Test Transform > should transform linear elements 1`] = `
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": null,
@@ -983,9 +926,6 @@ exports[`Test Transform > should transform linear elements 2`] = `
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": "dot",
   "startBinding": null,
@@ -1033,9 +973,6 @@ exports[`Test Transform > should transform linear elements 3`] = `
   "polygon": false,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": null,
@@ -1083,9 +1020,6 @@ exports[`Test Transform > should transform linear elements 4`] = `
   "polygon": false,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": null,
@@ -1120,9 +1054,6 @@ exports[`Test Transform > should transform regular shapes 1`] = `
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1155,9 +1086,6 @@ exports[`Test Transform > should transform regular shapes 2`] = `
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1190,9 +1118,6 @@ exports[`Test Transform > should transform regular shapes 3`] = `
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1225,9 +1150,6 @@ exports[`Test Transform > should transform regular shapes 4`] = `
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1260,9 +1182,6 @@ exports[`Test Transform > should transform regular shapes 5`] = `
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "dotted",
@@ -1295,9 +1214,6 @@ exports[`Test Transform > should transform regular shapes 6`] = `
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1971c2",
   "strokeStyle": "dashed",
@@ -1336,9 +1252,6 @@ exports[`Test Transform > should transform text element 1`] = `
   "originalText": "HELLO WORLD!",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1380,9 +1293,6 @@ exports[`Test Transform > should transform text element 2`] = `
   "originalText": "STYLED HELLO WORLD!",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#5f3dc4",
   "strokeStyle": "solid",
@@ -1429,9 +1339,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1471,9 +1378,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1517,9 +1421,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1567,9 +1468,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1629,9 +1527,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "roundness": {
     "type": 2,
   },
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": {
@@ -1696,9 +1591,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "roundness": {
     "type": 2,
   },
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": {
@@ -1748,9 +1640,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "originalText": "B",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1794,9 +1683,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "originalText": "A",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1840,9 +1726,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "originalText": "Alice",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1886,9 +1769,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "originalText": "Bob",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1930,9 +1810,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "originalText": "How are you?",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -1974,9 +1851,6 @@ exports[`Test Transform > should transform the elements correctly when linear el
   "originalText": "Friendship",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -2030,9 +1904,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": null,
@@ -2085,9 +1956,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": null,
@@ -2140,9 +2008,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": null,
@@ -2195,9 +2060,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   ],
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "startArrowhead": null,
   "startBinding": null,
@@ -2238,9 +2100,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   "originalText": "LABELED ARROW",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -2282,9 +2141,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   "originalText": "STYLED LABELED ARROW",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#099268",
   "strokeStyle": "solid",
@@ -2326,9 +2182,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   "originalText": "ANOTHER STYLED LABELLED ARROW",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1098ad",
   "strokeStyle": "solid",
@@ -2371,9 +2224,6 @@ exports[`Test Transform > should transform to labelled arrows when label provide
   "originalText": "ANOTHER STYLED LABELLED ARROW",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#099268",
   "strokeStyle": "solid",
@@ -2415,9 +2265,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -2455,9 +2302,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -2495,9 +2339,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -2535,9 +2376,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -2575,9 +2413,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#c2255c",
   "strokeStyle": "solid",
@@ -2615,9 +2450,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "opacity": 100,
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#f08c00",
   "strokeStyle": "solid",
@@ -2656,9 +2488,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "originalText": "RECTANGLE TEXT CONTAINER",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -2700,9 +2529,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "originalText": "ELLIPSE TEXT CONTAINER",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -2746,9 +2572,6 @@ exports[`Test Transform > should transform to text containers when label provide
 TEXT CONTAINER",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#1e1e1e",
   "strokeStyle": "solid",
@@ -2792,9 +2615,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "originalText": "STYLED DIAMOND TEXT CONTAINER",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#099268",
   "strokeStyle": "solid",
@@ -2837,9 +2657,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "originalText": "TOP LEFT ALIGNED RECTANGLE TEXT CONTAINER",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#c2255c",
   "strokeStyle": "solid",
@@ -2883,9 +2700,6 @@ exports[`Test Transform > should transform to text containers when label provide
   "originalText": "STYLED ELLIPSE TEXT CONTAINER",
   "roughness": 1,
   "roundness": null,
-  "schemaState": {
-    "tracks": {},
-  },
   "seed": Any<Number>,
   "strokeColor": "#c2255c",
   "strokeStyle": "solid",

packages/element/src/arrows/focus.ts

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

packages/element/src/arrows/helpers.ts

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

packages/element/src/binding.ts

@@ -27,11 +27,14 @@ 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,
-  hitElementItself,
   intersectElementWithLineSegment,
   isBindableElementInsideOtherBindable,
   isPointInElement,
@@ -110,10 +113,8 @@ export type BindingStrategy =
  *
  * IMPORTANT: currently must be > 0 (this also applies to the computed gap)
  */
-export const BASE_BINDING_GAP = 5;
+export const BASE_BINDING_GAP = 10;
 export const BASE_BINDING_GAP_ELBOW = 5;
-export const BASE_ARROW_MIN_LENGTH = 10;
-export const FOCUS_POINT_SIZE = 10 / 1.5;
 
 export const getBindingGap = (
   bindTarget: ExcalidrawBindableElement,
@@ -143,9 +144,7 @@ export const shouldEnableBindingForPointerEvent = (
   return !event[KEYS.CTRL_OR_CMD];
 };
 
-export const isBindingEnabled = (appState: {
-  isBindingEnabled: AppState["isBindingEnabled"];
-}): boolean => {
+export const isBindingEnabled = (appState: AppState): boolean => {
   return appState.isBindingEnabled;
 };
 
@@ -259,7 +258,7 @@ const bindingStrategyForElbowArrowEndpointDragging = (
     globalPoint,
     elements,
     elementsMap,
-    maxBindingDistance_simple(zoom),
+    (element) => maxBindingDistance_simple(zoom),
   );
 
   const current = hit
@@ -684,7 +683,7 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
     globalPoint,
     elements,
     elementsMap,
-    maxBindingDistance_simple(appState.zoom),
+    (e) => maxBindingDistance_simple(appState.zoom),
   );
   const pointInElement =
     hit &&
@@ -711,13 +710,7 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
   const otherFocusPointIsInElement =
     otherBindableElement &&
     otherFocusPoint &&
-    hitElementItself({
-      point: otherFocusPoint,
-      element: otherBindableElement,
-      elementsMap,
-      threshold: 0,
-      overrideShouldTestInside: true,
-    });
+    isPointInElement(otherFocusPoint, otherBindableElement, elementsMap);
 
   // Handle outside-outside binding to the same element
   if (otherBinding && otherBinding.elementId === hit?.id) {
@@ -797,7 +790,6 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
               hit,
               startDragged ? "start" : "end",
               elementsMap,
-              appState.zoom,
             ) || globalPoint,
         }
     : { mode: null };
@@ -807,24 +799,11 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
     startDragged ? -1 : 0,
     elementsMap,
   );
-  const pointIsCloseToOtherElement =
-    otherFocusPoint &&
+
+  const other: BindingStrategy =
     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
+    !otherFocusPointIsInElement &&
+    appState.selectedLinearElement?.initialState.altFocusPoint
       ? {
           mode: "orbit",
           element: otherBindableElement,
@@ -841,11 +820,9 @@ const getBindingStrategyForDraggingBindingElementEndpoints_simple = (
               otherBindableElement,
               startDragged ? "end" : "start",
               elementsMap,
-              appState.zoom,
             ) || otherEndpoint,
         }
-      : { mode: undefined }
-    : { mode: undefined };
+      : { mode: undefined };
 
   return {
     start: startDragged ? current : other,
@@ -1109,7 +1086,7 @@ export const updateBoundElements = (
     });
   }
 
-  const visitor = (element: ExcalidrawElement | undefined) => {
+  boundElementsVisitor(elementsMap, changedElement, (element) => {
     if (!isArrowElement(element) || element.isDeleted) {
       return;
     }
@@ -1181,71 +1158,7 @@ export const updateBoundElements = (
     if (boundText && !boundText.isDeleted) {
       handleBindTextResize(element, scene, false);
     }
-  };
-
-  boundElementsVisitor(elementsMap, changedElement, visitor);
-};
-
-const updateArrowBindings = (
-  latestElement: ExcalidrawArrowElement,
-  startOrEnd: "startBinding" | "endBinding",
-  elementsMap: NonDeletedSceneElementsMap,
-  scene: Scene,
-  appState: AppState,
-) => {
-  invariant(
-    !isElbowArrow(latestElement),
-    "Elbow arrows not supported for indirect updates",
-  );
-
-  const binding = latestElement[startOrEnd];
-  const bindableElement =
-    binding &&
-    (elementsMap.get(binding.elementId) as ExcalidrawBindableElement);
-  const point = LinearElementEditor.getPointAtIndexGlobalCoordinates(
-    latestElement,
-    startOrEnd === "startBinding" ? 0 : -1,
-    elementsMap,
-  );
-  const hit =
-    bindableElement &&
-    hitElementItself({
-      element: bindableElement,
-      point,
-      elementsMap,
-      threshold: maxBindingDistance_simple(appState.zoom),
-    });
-  const strategyName = startOrEnd === "startBinding" ? "start" : "end";
-  unbindBindingElement(latestElement, strategyName, scene);
-  if (hit) {
-    const pointIdx =
-      startOrEnd === "startBinding" ? 0 : latestElement.points.length - 1;
-    const localPoint = latestElement.points[pointIdx];
-    const strategy =
-      getBindingStrategyForDraggingBindingElementEndpoints_simple(
-        latestElement,
-        new Map([[pointIdx, { point: localPoint }]]),
-        point[0],
-        point[1],
-        elementsMap,
-        scene.getNonDeletedElements(),
-        appState,
-      );
-    if (
-      strategy[strategyName] &&
-      strategy[strategyName].element?.id === bindableElement.id &&
-      strategy[strategyName].mode
-    ) {
-      bindBindingElement(
-        latestElement,
-        bindableElement,
-        strategy[strategyName].mode,
-        strategyName,
-        scene,
-        strategy[strategyName].focusPoint,
-      );
-    }
-  }
+  });
 };
 
 export const updateBindings = (
@@ -1258,27 +1171,14 @@ export const updateBindings = (
   },
 ) => {
   if (isArrowElement(latestElement)) {
-    const elementsMap = scene.getNonDeletedElementsMap();
-
-    if (latestElement.startBinding) {
-      updateArrowBindings(
-        latestElement,
-        "startBinding",
-        elementsMap,
-        scene,
-        appState,
-      );
-    }
-
-    if (latestElement.endBinding) {
-      updateArrowBindings(
-        latestElement,
-        "endBinding",
-        elementsMap,
-        scene,
-        appState,
-      );
-    }
+    bindOrUnbindBindingElement(
+      latestElement,
+      new Map(),
+      Infinity,
+      Infinity,
+      scene,
+      appState,
+    );
   } else {
     updateBoundElements(latestElement, scene, {
       ...options,
@@ -1392,16 +1292,14 @@ export const bindPointToSnapToElementOutline = (
       headingForPointFromElement(bindableElement, aabb, point),
     );
     const snapPoint = snapToMid(
+      arrowElement,
       bindableElement,
       elementsMap,
       edgePoint,
-      0.05,
-      arrowElement,
     );
-    const resolved = snapPoint || point;
     const otherPoint = pointFrom<GlobalPoint>(
-      isHorizontal ? bindableCenter[0] : resolved[0],
-      !isHorizontal ? bindableCenter[1] : resolved[1],
+      isHorizontal ? bindableCenter[0] : snapPoint[0],
+      !isHorizontal ? bindableCenter[1] : snapPoint[1],
     );
     const intersector =
       customIntersector ??
@@ -1409,7 +1307,7 @@ export const bindPointToSnapToElementOutline = (
         otherPoint,
         pointFromVector(
           vectorScale(
-            vectorNormalize(vectorFromPoint(resolved, otherPoint)),
+            vectorNormalize(vectorFromPoint(snapPoint, otherPoint)),
             Math.max(bindableElement.width, bindableElement.height) * 2,
           ),
           otherPoint,
@@ -1424,14 +1322,14 @@ export const bindPointToSnapToElementOutline = (
 
     if (!intersection) {
       const anotherPoint = pointFrom<GlobalPoint>(
-        !isHorizontal ? bindableCenter[0] : resolved[0],
-        isHorizontal ? bindableCenter[1] : resolved[1],
+        !isHorizontal ? bindableCenter[0] : snapPoint[0],
+        isHorizontal ? bindableCenter[1] : snapPoint[1],
       );
       const anotherIntersector = lineSegment(
         anotherPoint,
         pointFromVector(
           vectorScale(
-            vectorNormalize(vectorFromPoint(resolved, anotherPoint)),
+            vectorNormalize(vectorFromPoint(snapPoint, anotherPoint)),
             Math.max(bindableElement.width, bindableElement.height) * 2,
           ),
           anotherPoint,
@@ -1578,18 +1476,18 @@ export const avoidRectangularCorner = (
   return p;
 };
 
-export const snapToMid = (
+const snapToMid = (
+  arrowElement: ExcalidrawArrowElement,
   bindTarget: ExcalidrawBindableElement,
   elementsMap: ElementsMap,
   p: GlobalPoint,
   tolerance: number = 0.05,
-  arrowElement?: ExcalidrawArrowElement,
-): GlobalPoint | undefined => {
+): GlobalPoint => {
   const { x, y, width, height, angle } = bindTarget;
   const center = elementCenterPoint(bindTarget, elementsMap, -0.1, -0.1);
   const nonRotated = pointRotateRads(p, center, -angle as Radians);
 
-  const bindingGap = arrowElement ? getBindingGap(bindTarget, arrowElement) : 0;
+  const bindingGap = getBindingGap(bindTarget, arrowElement);
 
   // snap-to-center point is adaptive to element size, but we don't want to go
   // above and below certain px distance
@@ -1598,7 +1496,7 @@ export const snapToMid = (
 
   // Too close to the center makes it hard to resolve direction precisely
   if (pointDistance(center, nonRotated) < bindingGap) {
-    return undefined;
+    return p;
   }
 
   if (
@@ -1607,8 +1505,8 @@ export const snapToMid = (
     nonRotated[1] < center[1] + verticalThreshold
   ) {
     // LEFT
-    return pointRotateRads(
-      pointFrom<GlobalPoint>(x - bindingGap, center[1]),
+    return pointRotateRads<GlobalPoint>(
+      pointFrom(x - bindingGap, center[1]),
       center,
       angle,
     );
@@ -1618,11 +1516,7 @@ export const snapToMid = (
     nonRotated[0] < center[0] + horizontalThreshold
   ) {
     // TOP
-    return pointRotateRads(
-      pointFrom<GlobalPoint>(center[0], y - bindingGap),
-      center,
-      angle,
-    );
+    return pointRotateRads(pointFrom(center[0], y - bindingGap), center, angle);
   } else if (
     nonRotated[0] >= x + width / 2 &&
     nonRotated[1] > center[1] - verticalThreshold &&
@@ -1630,7 +1524,7 @@ export const snapToMid = (
   ) {
     // RIGHT
     return pointRotateRads(
-      pointFrom<GlobalPoint>(x + width + bindingGap, center[1]),
+      pointFrom(x + width + bindingGap, center[1]),
       center,
       angle,
     );
@@ -1641,7 +1535,7 @@ export const snapToMid = (
   ) {
     // DOWN
     return pointRotateRads(
-      pointFrom<GlobalPoint>(center[0], y + height + bindingGap),
+      pointFrom(center[0], y + height + bindingGap),
       center,
       angle,
     );
@@ -1690,44 +1584,13 @@ export const snapToMid = (
     }
   }
 
-  return undefined;
+  return p;
 };
 
-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>,
@@ -1735,7 +1598,7 @@ export const updateBoundPoint = (
   binding: FixedPointBinding | null | undefined,
   bindableElement: ExcalidrawBindableElement,
   elementsMap: ElementsMap,
-  dragging?: boolean,
+  customIntersector?: LineSegment<GlobalPoint>,
 ): LocalPoint | null => {
   if (
     binding == null ||
@@ -1750,136 +1613,152 @@ 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 : 0,
-    elementsMap,
-  );
-  const otherFocusPointOrArrowPoint = otherFocusPoint || 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 = 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 = isRectanguloidElement(bindableElement)
+      ? avoidRectangularCorner(arrow, bindableElement, elementsMap, global)
+      : global;
+    const adjacentPoint = pointRotateRads(
+      pointFrom<GlobalPoint>(
+        arrow.x +
+          arrow.points[pointIndex === 0 ? 1 : arrow.points.length - 2][0],
+        arrow.y +
+          arrow.points[pointIndex === 0 ? 1 : arrow.points.length - 2][1],
+      ),
+      center,
+      arrow.angle as Radians,
+    );
+    const bindingGap = getBindingGap(bindableElement, arrow);
+    const halfVector = vectorScale(
+      vectorNormalize(vectorFromPoint(edgePoint, adjacentPoint)),
+      pointDistance(edgePoint, adjacentPoint) +
+        Math.max(bindableElement.width, bindableElement.height) +
+        bindingGap * 2,
+    );
+    _customIntersector = lineSegment(
+      pointFromVector(halfVector, adjacentPoint),
+      pointFromVector(vectorScale(halfVector, -1), adjacentPoint),
     );
   }
 
-  const 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,
   );
 };
@@ -1929,7 +1808,7 @@ export const calculateFixedPointForNonElbowArrowBinding = (
   elementsMap: ElementsMap,
   focusPoint?: GlobalPoint,
 ): { fixedPoint: FixedPoint } => {
-  const edgePoint: GlobalPoint = focusPoint
+  const edgePoint = focusPoint
     ? focusPoint
     : LinearElementEditor.getPointAtIndexGlobalCoordinates(
         linearElement,
@@ -1937,7 +1816,11 @@ export const calculateFixedPointForNonElbowArrowBinding = (
         elementsMap,
       );
 
-  const elementCenter = elementCenterPoint(hoveredElement, elementsMap);
+  // Convert the global point to element-local coordinates
+  const elementCenter = pointFrom(
+    hoveredElement.x + hoveredElement.width / 2,
+    hoveredElement.y + hoveredElement.height / 2,
+  );
 
   // Rotate the point to account for element rotation
   const nonRotatedPoint = pointRotateRads(

packages/element/src/collision.ts

@@ -59,11 +59,8 @@ import { LinearElementEditor } from "./linearElementEditor";
 
 import { distanceToElement } from "./distance";
 
-import { getBindingGap } from "./binding";
-
 import type {
   ElementsMap,
-  ExcalidrawArrowElement,
   ExcalidrawBindableElement,
   ExcalidrawDiamondElement,
   ExcalidrawElement,
@@ -78,12 +75,7 @@ import type {
 } from "./types";
 
 export const shouldTestInside = (element: ExcalidrawElement) => {
-  if (
-    element.type === "arrow" ||
-    // frame elements should ignore inside hit test even if background is not
-    // transparent, so we can select children easily
-    isFrameLikeElement(element)
-  ) {
+  if (element.type === "arrow") {
     return false;
   }
 
@@ -298,7 +290,7 @@ export const getAllHoveredElementAtPoint = (
   point: Readonly<GlobalPoint>,
   elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   elementsMap: NonDeletedSceneElementsMap,
-  tolerance?: number,
+  toleranceFn?: (element: ExcalidrawBindableElement) => number,
 ): NonDeleted<ExcalidrawBindableElement>[] => {
   const candidateElements: NonDeleted<ExcalidrawBindableElement>[] = [];
   // We need to to hit testing from front (end of the array) to back (beginning of the array)
@@ -314,7 +306,7 @@ export const getAllHoveredElementAtPoint = (
 
     if (
       isBindableElement(element, false) &&
-      bindingBorderTest(element, point, elementsMap, tolerance)
+      bindingBorderTest(element, point, elementsMap, toleranceFn?.(element))
     ) {
       candidateElements.push(element);
 
@@ -331,13 +323,13 @@ export const getHoveredElementForBinding = (
   point: Readonly<GlobalPoint>,
   elements: readonly Ordered<NonDeletedExcalidrawElement>[],
   elementsMap: NonDeletedSceneElementsMap,
-  tolerance?: number,
+  toleranceFn?: (element: ExcalidrawBindableElement) => number,
 ): NonDeleted<ExcalidrawBindableElement> | null => {
   const candidateElements = getAllHoveredElementAtPoint(
     point,
     elements,
     elementsMap,
-    tolerance,
+    toleranceFn,
   );
 
   if (!candidateElements || candidateElements.length === 0) {
@@ -356,56 +348,6 @@ export const getHoveredElementForBinding = (
     .pop() as NonDeleted<ExcalidrawBindableElement>;
 };
 
-export const getHoveredElementForFocusPoint = (
-  point: GlobalPoint,
-  arrow: ExcalidrawArrowElement,
-  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
-  elementsMap: NonDeletedSceneElementsMap,
-  tolerance?: number,
-): ExcalidrawBindableElement | null => {
-  const candidateElements: NonDeleted<ExcalidrawBindableElement>[] = [];
-  // We need to to hit testing from front (end of the array) to back (beginning of the array)
-  // because array is ordered from lower z-index to highest and we want element z-index
-  // with higher z-index
-  for (let index = elements.length - 1; index >= 0; --index) {
-    const element = elements[index];
-
-    invariant(
-      !element.isDeleted,
-      "Elements in the function parameter for getAllElementsAtPositionForBinding() should not contain deleted elements",
-    );
-
-    if (
-      isBindableElement(element, false) &&
-      bindingBorderTest(element, point, elementsMap, tolerance)
-    ) {
-      candidateElements.push(element);
-    }
-  }
-
-  if (!candidateElements || candidateElements.length === 0) {
-    return null;
-  }
-
-  if (candidateElements.length === 1) {
-    return candidateElements[0];
-  }
-
-  const distanceFilteredCandidateElements = candidateElements
-    // Resolve by distance
-    .filter(
-      (el) =>
-        distanceToElement(el, elementsMap, point) <= getBindingGap(el, arrow) ||
-        isPointInElement(point, el, elementsMap),
-    );
-
-  if (distanceFilteredCandidateElements.length === 0) {
-    return null;
-  }
-
-  return distanceFilteredCandidateElements[0] as NonDeleted<ExcalidrawBindableElement>;
-};
-
 /**
  * Intersect a line with an element for binding test
  *

packages/element/src/elbowArrow.ts

@@ -2276,7 +2276,7 @@ const getHoveredElement = (
     origPoint,
     elements,
     elementsMap,
-    maxBindingDistance_simple(zoom),
+    (element) => maxBindingDistance_simple(zoom),
   );
 };
 

packages/element/src/embeddable.ts

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

packages/element/src/index.ts

@@ -70,7 +70,6 @@ export * from "./elbowArrow";
 export * from "./elementLink";
 export * from "./embeddable";
 export * from "./flowchart";
-export * from "./arrows/focus";
 export * from "./fractionalIndex";
 export * from "./frame";
 export * from "./groups";
@@ -83,7 +82,6 @@ export * from "./positionElementsOnGrid";
 export * from "./renderElement";
 export * from "./resizeElements";
 export * from "./resizeTest";
-export * from "./schema";
 export * from "./Scene";
 export * from "./selection";
 export * from "./shape";
@@ -99,4 +97,3 @@ export * from "./transformHandles";
 export * from "./typeChecks";
 export * from "./utils";
 export * from "./zindex";
-export * from "./arrows/helpers";

packages/element/src/linearElementEditor.ts

@@ -9,6 +9,7 @@ import {
   vectorFromPoint,
   curveLength,
   curvePointAtLength,
+  lineSegment,
 } from "@excalidraw/math";
 
 import { getCurvePathOps } from "@excalidraw/utils/shape";
@@ -25,7 +26,6 @@ import {
 
 import {
   deconstructLinearOrFreeDrawElement,
-  getSnapOutlineMidPoint,
   isPathALoop,
   moveArrowAboveBindable,
   projectFixedPointOntoDiagonal,
@@ -48,7 +48,6 @@ import {
   calculateFixedPointForNonElbowArrowBinding,
   getBindingStrategyForDraggingBindingElementEndpoints,
   isBindingEnabled,
-  snapToMid,
   updateBoundPoint,
 } from "./binding";
 import {
@@ -150,8 +149,6 @@ export class LinearElementEditor {
   public readonly pointerOffset: Readonly<{ x: number; y: number }>;
   public readonly hoverPointIndex: number;
   public readonly segmentMidPointHoveredCoords: GlobalPoint | null;
-  public readonly hoveredFocusPointBinding: "start" | "end" | null;
-  public readonly draggedFocusPointBinding: "start" | "end" | null;
   public readonly elbowed: boolean;
   public readonly customLineAngle: number | null;
   public readonly isEditing: boolean;
@@ -197,8 +194,6 @@ export class LinearElementEditor {
     };
     this.hoverPointIndex = -1;
     this.segmentMidPointHoveredCoords = null;
-    this.hoveredFocusPointBinding = null;
-    this.draggedFocusPointBinding = null;
     this.elbowed = isElbowArrow(element) && element.elbowed;
     this.customLineAngle = null;
     this.isEditing = isEditing;
@@ -356,7 +351,6 @@ export class LinearElementEditor {
       app,
       shouldRotateWithDiscreteAngle(event),
       event.altKey,
-      linearElementEditor,
     );
 
     LinearElementEditor.movePoints(element, app.scene, positions, {
@@ -410,14 +404,13 @@ export class LinearElementEditor {
         altFocusPoint:
           !linearElementEditor.initialState.altFocusPoint &&
           startBindingElement &&
-          updates?.suggestedBinding?.element.id !== startBindingElement.id
+          updates?.suggestedBinding?.id !== startBindingElement.id
             ? projectFixedPointOntoDiagonal(
                 element,
                 pointFrom<GlobalPoint>(element.x, element.y),
                 startBindingElement,
                 "start",
                 elementsMap,
-                app.state.zoom,
               )
             : linearElementEditor.initialState.altFocusPoint,
       },
@@ -535,7 +528,6 @@ export class LinearElementEditor {
       app,
       shouldRotateWithDiscreteAngle(event) && singlePointDragged,
       event.altKey,
-      linearElementEditor,
     );
 
     LinearElementEditor.movePoints(element, app.scene, positions, {
@@ -611,11 +603,11 @@ export class LinearElementEditor {
     const altFocusPointBindableElement =
       endIsSelected && // The "other" end (i.e. "end") is dragged
       startBindingElement &&
-      updates?.suggestedBinding?.element.id !== startBindingElement.id // The end point is not hovering the start bindable + it's binding gap
+      updates?.suggestedBinding?.id !== startBindingElement.id // The end point is not hovering the start bindable + it's binding gap
         ? startBindingElement
         : startIsSelected && // The "other" end (i.e. "start") is dragged
           endBindingElement &&
-          updates?.suggestedBinding?.element.id !== endBindingElement.id // The start point is not hovering the end bindable + it's binding gap
+          updates?.suggestedBinding?.id !== endBindingElement.id // The start point is not hovering the end bindable + it's binding gap
         ? endBindingElement
         : null;
 
@@ -635,7 +627,6 @@ export class LinearElementEditor {
                 altFocusPointBindableElement,
                 "start",
                 elementsMap,
-                app.state.zoom,
               )
             : linearElementEditor.initialState.altFocusPoint,
       },
@@ -2085,7 +2076,6 @@ const pointDraggingUpdates = (
   app: AppClassProperties,
   angleLocked: boolean,
   altKey: boolean,
-  linearElementEditor: LinearElementEditor,
 ): {
   positions: PointsPositionUpdates;
   updates?: PointMoveOtherUpdates;
@@ -2133,89 +2123,18 @@ const pointDraggingUpdates = (
   );
 
   if (isElbowArrow(element)) {
-    const suggestedBindingElement = startIsDragged
-      ? start.element
-      : endIsDragged
-      ? end.element
-      : null;
-
     return {
       positions: naiveDraggingPoints,
       updates: {
-        suggestedBinding: suggestedBindingElement
-          ? {
-              element: suggestedBindingElement,
-              midPoint: snapToMid(
-                suggestedBindingElement,
-                elementsMap,
-                pointFrom<GlobalPoint>(
-                  scenePointerX - linearElementEditor.pointerOffset.x,
-                  scenePointerY - linearElementEditor.pointerOffset.y,
-                ),
-              ),
-            }
+        suggestedBinding: startIsDragged
+          ? start.element
+          : endIsDragged
+          ? end.element
           : null,
       },
     };
   }
 
-  // Handle the case where neither endpoint is being dragged
-  // but we need to update bound endpoints
-  if (!startIsDragged && !endIsDragged) {
-    const nextArrow = {
-      ...element,
-      points: element.points.map((p, idx) => {
-        return naiveDraggingPoints.get(idx)?.point ?? p;
-      }),
-    };
-    const positions = new Map(naiveDraggingPoints);
-
-    if (element.startBinding) {
-      const startBindable = elementsMap.get(element.startBinding.elementId) as
-        | ExcalidrawBindableElement
-        | undefined;
-      if (startBindable) {
-        const startPoint =
-          updateBoundPoint(
-            nextArrow,
-            "startBinding",
-            element.startBinding,
-            startBindable,
-            elementsMap,
-          ) ?? null;
-        if (startPoint) {
-          positions.set(0, { point: startPoint, isDragging: true });
-        }
-      }
-    }
-
-    if (element.endBinding) {
-      const endBindable = elementsMap.get(element.endBinding.elementId) as
-        | ExcalidrawBindableElement
-        | undefined;
-      if (endBindable) {
-        const endPoint =
-          updateBoundPoint(
-            nextArrow,
-            "endBinding",
-            element.endBinding,
-            endBindable,
-            elementsMap,
-          ) ?? null;
-        if (endPoint) {
-          positions.set(element.points.length - 1, {
-            point: endPoint,
-            isDragging: true,
-          });
-        }
-      }
-    }
-
-    return {
-      positions,
-    };
-  }
-
   if (startIsDragged === endIsDragged) {
     return {
       positions: naiveDraggingPoints,
@@ -2246,20 +2165,7 @@ const pointDraggingUpdates = (
       (updates.startBinding.mode === "orbit" ||
         !getFeatureFlag("COMPLEX_BINDINGS"))
     ) {
-      updates.suggestedBinding = start.element
-        ? {
-            element: start.element,
-            midPoint: getSnapOutlineMidPoint(
-              pointFrom<GlobalPoint>(
-                scenePointerX - linearElementEditor.pointerOffset.x,
-                scenePointerY - linearElementEditor.pointerOffset.y,
-              ),
-              start.element,
-              elementsMap,
-              app.state.zoom,
-            ),
-          }
-        : null;
+      updates.suggestedBinding = start.element;
     }
   } else if (startIsDragged) {
     updates.suggestedBinding = app.state.suggestedBinding;
@@ -2285,20 +2191,7 @@ const pointDraggingUpdates = (
       (updates.endBinding.mode === "orbit" ||
         !getFeatureFlag("COMPLEX_BINDINGS"))
     ) {
-      updates.suggestedBinding = end.element
-        ? {
-            element: end.element,
-            midPoint: getSnapOutlineMidPoint(
-              pointFrom<GlobalPoint>(
-                scenePointerX - linearElementEditor.pointerOffset.x,
-                scenePointerY - linearElementEditor.pointerOffset.y,
-              ),
-              end.element,
-              elementsMap,
-              app.state.zoom,
-            ),
-          }
-        : null;
+      updates.suggestedBinding = end.element;
     }
   } else if (endIsDragged) {
     updates.suggestedBinding = app.state.suggestedBinding;
@@ -2338,6 +2231,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 =
@@ -2373,7 +2279,7 @@ const pointDraggingUpdates = (
         nextArrow.endBinding,
         endBindable,
         elementsMap,
-        endIsDragged,
+        endCustomIntersector,
       ) || nextArrow.points[nextArrow.points.length - 1]
     : nextArrow.points[nextArrow.points.length - 1];
 
@@ -2396,7 +2302,7 @@ const pointDraggingUpdates = (
       : startIsDraggingOverEndElement &&
         app.state.bindMode !== "inside" &&
         getFeatureFlag("COMPLEX_BINDINGS")
-      ? endLocalPoint
+      ? nextArrow.points[nextArrow.points.length - 1]
       : startBindable
       ? updateBoundPoint(
           element,
@@ -2404,18 +2310,15 @@ const pointDraggingUpdates = (
           nextArrow.startBinding,
           startBindable,
           elementsMap,
-          startIsDragged,
+          startCustomIntersector,
         ) || nextArrow.points[0]
       : nextArrow.points[0];
 
   const endChanged =
-    !startIsDraggingOverEndElement &&
-    !(
-      endIsDraggingOverStartElement &&
-      app.state.bindMode !== "inside" &&
-      getFeatureFlag("COMPLEX_BINDINGS")
-    ) &&
-    !!endBindable;
+    pointDistance(
+      endLocalPoint,
+      nextArrow.points[nextArrow.points.length - 1],
+    ) !== 0;
   const startChanged =
     pointDistance(startLocalPoint, nextArrow.points[0]) !== 0;
 
@@ -2429,7 +2332,13 @@ const pointDraggingUpdates = (
   const indices = Array.from(indicesSet);
 
   return {
-    updates,
+    updates:
+      updates.startBinding || updates.suggestedBinding
+        ? {
+            startBinding: updates.startBinding,
+            suggestedBinding: updates.suggestedBinding,
+          }
+        : undefined,
     positions: new Map(
       indices.map((idx) => {
         return [

packages/element/src/mutateElement.ts

@@ -11,7 +11,6 @@ import type { Mutable } from "@excalidraw/common/utility-types";
 import { ShapeCache } from "./shape";
 
 import { updateElbowArrowPoints } from "./elbowArrow";
-import { ensureSchemaStateForElementType } from "./schema";
 
 import { isElbowArrow } from "./typeChecks";
 
@@ -138,10 +137,6 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
   element.version = updates.version ?? element.version + 1;
   element.versionNonce = updates.versionNonce ?? randomInteger();
   element.updated = getUpdatedTimestamp();
-  element.schemaState = ensureSchemaStateForElementType(
-    element.schemaState,
-    element.type,
-  ) as TElement["schemaState"];
 
   return element;
 };
@@ -171,21 +166,13 @@ export const newElementWith = <TElement extends ExcalidrawElement>(
     return element;
   }
 
-  const updatedElement = {
+  return {
     ...element,
     ...updates,
     version: updates.version ?? element.version + 1,
     versionNonce: updates.versionNonce ?? randomInteger(),
     updated: getUpdatedTimestamp(),
   };
-
-  return {
-    ...updatedElement,
-    schemaState: ensureSchemaStateForElementType(
-      updatedElement.schemaState,
-      updatedElement.type,
-    ),
-  };
 };
 
 /**

packages/element/src/newElement.ts

@@ -20,7 +20,6 @@ import {
   getElementAbsoluteCoords,
   getResizedElementAbsoluteCoords,
 } from "./bounds";
-import { ensureSchemaStateForElementType } from "./schema";
 import { newElementWith } from "./mutateElement";
 import { getBoundTextMaxWidth } from "./textElement";
 import { normalizeText, measureText } from "./textMeasurements";
@@ -71,7 +70,6 @@ export type ElementConstructorOpts = MarkOptional<
   | "roughness"
   | "strokeWidth"
   | "roundness"
-  | "schemaState"
   | "locked"
   | "opacity"
   | "customData"
@@ -146,7 +144,6 @@ const _newElementBase = <T extends ExcalidrawElement>(
     roundness,
     seed: rest.seed ?? randomInteger(),
     version: rest.version || 1,
-    schemaState: ensureSchemaStateForElementType(rest.schemaState, type),
     versionNonce: rest.versionNonce ?? 0,
     isDeleted: false as false,
     boundElements,

packages/element/src/renderElement.ts

@@ -22,9 +22,7 @@ import {
   isRTL,
   getVerticalOffset,
   invariant,
-  isTransparent,
   applyDarkModeFilter,
-  isSafari,
 } from "@excalidraw/common";
 
 import type {
@@ -79,7 +77,6 @@ import type {
   ExcalidrawFrameLikeElement,
   NonDeletedSceneElementsMap,
   ElementsMap,
-  ExcalidrawFrameElement,
 } from "./types";
 
 import type { RoughCanvas } from "roughjs/bin/canvas";
@@ -363,9 +360,8 @@ IMAGE_ERROR_PLACEHOLDER_IMG.src = `data:${MIME_TYPES.svg},${encodeURIComponent(
 const drawImagePlaceholder = (
   element: ExcalidrawImageElement,
   context: CanvasRenderingContext2D,
-  theme: StaticCanvasRenderConfig["theme"],
 ) => {
-  context.fillStyle = theme === THEME.DARK ? "#2E2E2E" : "#E7E7E7";
+  context.fillStyle = "#E7E7E7";
   context.fillRect(0, 0, element.width, element.height);
 
   const imageMinWidthOrHeight = Math.min(element.width, element.height);
@@ -447,6 +443,13 @@ const drawElementOnCanvas = (
         ? cacheEntry?.image
         : undefined;
 
+      const shouldInvertImage =
+        renderConfig.theme === THEME.DARK &&
+        cacheEntry?.mimeType === MIME_TYPES.svg;
+
+      if (shouldInvertImage) {
+        context.filter = DARK_THEME_FILTER;
+      }
       if (img != null && !(img instanceof Promise)) {
         if (element.roundness && context.roundRect) {
           context.beginPath();
@@ -469,78 +472,19 @@ const drawElementOnCanvas = (
               height: img.naturalHeight,
             };
 
-        const shouldInvertImage =
-          renderConfig.theme === THEME.DARK &&
-          cacheEntry?.mimeType === MIME_TYPES.svg;
-
-        if (shouldInvertImage && isSafari) {
-          const devicePixelRatio = window.devicePixelRatio || 1;
-          const tempCanvas = document.createElement("canvas");
-          tempCanvas.width = element.width * devicePixelRatio;
-          tempCanvas.height = element.height * devicePixelRatio;
-          const tempContext = tempCanvas.getContext("2d");
-
-          if (tempContext) {
-            tempContext.scale(devicePixelRatio, devicePixelRatio);
-            tempContext.drawImage(
-              img,
-              x,
-              y,
-              width,
-              height,
-              0,
-              0,
-              element.width,
-              element.height,
-            );
-
-            const imageData = tempContext.getImageData(
-              0,
-              0,
-              tempCanvas.width,
-              tempCanvas.height,
-            );
-
-            const data = imageData.data;
-
-            for (let i = 0; i < data.length; i += 4) {
-              data[i] = 255 - data[i];
-              data[i + 1] = 255 - data[i + 1];
-              data[i + 2] = 255 - data[i + 2];
-            }
-
-            tempContext.putImageData(imageData, 0, 0);
-            context.drawImage(
-              tempCanvas,
-              0,
-              0,
-              tempCanvas.width,
-              tempCanvas.height,
-              0,
-              0,
-              element.width,
-              element.height,
-            );
-          }
-        } else {
-          if (shouldInvertImage) {
-            context.filter = DARK_THEME_FILTER;
-          }
-
-          context.drawImage(
-            img,
-            x,
-            y,
-            width,
-            height,
-            0 /* hardcoded for the selection box*/,
-            0,
-            element.width,
-            element.height,
-          );
-        }
+        context.drawImage(
+          img,
+          x,
+          y,
+          width,
+          height,
+          0 /* hardcoded for the selection box*/,
+          0,
+          element.width,
+          element.height,
+        );
       } else {
-        drawImagePlaceholder(element, context, renderConfig.theme);
+        drawImagePlaceholder(element, context);
       }
       context.restore();
       break;
@@ -779,45 +723,6 @@ export const renderSelectionElement = (
   context.restore();
 };
 
-export const renderFrameBackground = (
-  frame: ExcalidrawFrameElement,
-  context: CanvasRenderingContext2D,
-  appState: StaticCanvasAppState | InteractiveCanvasAppState,
-  opts?: {
-    roundCorners?: boolean;
-  },
-) => {
-  if (isTransparent(frame.backgroundColor)) {
-    return;
-  }
-
-  context.save();
-  context.translate(frame.x + appState.scrollX, frame.y + appState.scrollY);
-  context.fillStyle =
-    appState.theme === THEME.DARK
-      ? applyDarkModeFilter(frame.backgroundColor)
-      : frame.backgroundColor;
-
-  const shouldRoundCorners = opts?.roundCorners ?? true;
-
-  if (shouldRoundCorners && FRAME_STYLE.radius && context.roundRect) {
-    context.beginPath();
-    context.roundRect(
-      0,
-      0,
-      frame.width,
-      frame.height,
-      FRAME_STYLE.radius / appState.zoom.value,
-    );
-    context.fill();
-    context.closePath();
-  } else {
-    context.fillRect(0, 0, frame.width, frame.height);
-  }
-
-  context.restore();
-};
-
 export const renderElement = (
   element: NonDeletedExcalidrawElement,
   elementsMap: RenderableElementsMap,
@@ -849,6 +754,7 @@ export const renderElement = (
           element.x + appState.scrollX,
           element.y + appState.scrollY,
         );
+        context.fillStyle = "rgba(0, 0, 200, 0.04)";
 
         context.lineWidth = FRAME_STYLE.strokeWidth / appState.zoom.value;
         context.strokeStyle =

packages/element/src/resizeElements.ts

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

packages/element/src/schema.ts

@@ -1,91 +0,0 @@
-/**
- * Shared schema primitives used by element types and higher-level migrations.
- */
-export const SCHEMA_INITIAL_TRACK_VERSION = 1 as const;
-
-/** Core namespace reserved for built-in Excalidraw migrations. */
-export const SCHEMA_CORE_NAMESPACE = "core" as const;
-export type SchemaNamespace = typeof SCHEMA_CORE_NAMESPACE | `host.${string}`;
-
-/**
- * A schema track is an independent version line:
- * - core tracks: "excalidraw.*"
- * - host tracks: "host.<appId>.<track>"
- */
-export type SchemaTrack = `excalidraw.${string}` | `host.${string}.${string}`;
-export type ElementSchemaState = Readonly<{
-  tracks: Readonly<Record<string, number>>;
-}>;
-
-/** Core frame track id used by the frame background migration. */
-export const CORE_FRAME_SCHEMA_TRACK = "excalidraw.shape.frame" as const;
-
-/** Latest core track versions supported by this build. */
-export const CORE_SUPPORTED_TRACKS = {
-  [CORE_FRAME_SCHEMA_TRACK]: 2,
-} as const;
-
-const getRequiredCoreTracksForElementType = (type: string) => {
-  if (type === "frame") {
-    return {
-      [CORE_FRAME_SCHEMA_TRACK]: CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK],
-    } as const;
-  }
-
-  return {} as const;
-};
-
-const isValidTrackVersion = (version: unknown): version is number =>
-  typeof version === "number" &&
-  Number.isInteger(version) &&
-  version >= SCHEMA_INITIAL_TRACK_VERSION;
-
-/**
- * Ensures an element schema state is normalized and satisfies type defaults.
- * Required core tracks are only ever bumped forward (never downgraded).
- */
-export const ensureSchemaStateForElementType = (
-  schemaState: ElementSchemaState | undefined,
-  type: string,
-): ElementSchemaState => {
-  const requiredTracks = getRequiredCoreTracksForElementType(type);
-  const currentTracks = schemaState?.tracks || {};
-  const nextTracks: Record<string, number> = {};
-  let didChange = !schemaState;
-
-  for (const [track, version] of Object.entries(
-    currentTracks as Record<string, unknown>,
-  )) {
-    if (isValidTrackVersion(version)) {
-      nextTracks[track] = version;
-      continue;
-    }
-    nextTracks[track] = SCHEMA_INITIAL_TRACK_VERSION;
-    didChange = true;
-  }
-
-  for (const [track, requiredVersion] of Object.entries(requiredTracks)) {
-    const currentVersion = nextTracks[track];
-    if (
-      !isValidTrackVersion(currentVersion) ||
-      currentVersion < requiredVersion
-    ) {
-      nextTracks[track] = requiredVersion;
-      didChange = true;
-    }
-  }
-
-  if (!didChange) {
-    return schemaState!;
-  }
-
-  return { tracks: nextTracks };
-};
-
-/**
- * Default schema state for newly created elements.
- * New frames are created at the latest supported frame track version.
- */
-export const getDefaultSchemaStateForElementType = (
-  type: string,
-): ElementSchemaState => ensureSchemaStateForElementType(undefined, type);

packages/element/src/types.ts

@@ -15,8 +15,6 @@ import type {
   ValueOf,
 } from "@excalidraw/common/utility-types";
 
-import type { ElementSchemaState } from "./schema";
-
 export type ChartType = "bar" | "line";
 export type FillStyle = "hachure" | "cross-hatch" | "solid" | "zigzag";
 export type FontFamilyKeys = keyof typeof FONT_FAMILY;
@@ -60,8 +58,6 @@ type _ExcalidrawElementBase = Readonly<{
   /** Integer that is sequentially incremented on each change. Used to reconcile
       elements during collaboration or when saving to server. */
   version: number;
-  /** Per-track schema state used by migrations during restore. */
-  schemaState: ElementSchemaState;
   /** Random integer that is regenerated on each change.
       Used for deterministic reconciliation of updates during collaboration,
       in case the versions (see above) are identical. */

packages/element/src/utils.ts

@@ -7,7 +7,6 @@ import {
 } from "@excalidraw/common";
 
 import {
-  bezierEquation,
   curve,
   curveCatmullRomCubicApproxPoints,
   curveOffsetPoints,
@@ -28,30 +27,19 @@ import {
 
 import type { Curve, LineSegment, LocalPoint } from "@excalidraw/math";
 
-import type {
-  AppState,
-  NormalizedZoomValue,
-  Zoom,
-} from "@excalidraw/excalidraw/types";
+import type { NormalizedZoomValue, Zoom } from "@excalidraw/excalidraw/types";
 
 import { elementCenterPoint, getDiamondPoints } from "./bounds";
 
 import { generateLinearCollisionShape } from "./shape";
 
-import { hitElementItself, isPointInElement } from "./collision";
+import { isPointInElement } from "./collision";
 import { LinearElementEditor } from "./linearElementEditor";
 import { isRectangularElement } from "./typeChecks";
-import { maxBindingDistance_simple } from "./binding";
-
-import {
-  getGlobalFixedPointForBindableElement,
-  normalizeFixedPoint,
-} from "./binding";
 
 import type {
   ElementsMap,
   ExcalidrawArrowElement,
-  ExcalidrawBindableElement,
   ExcalidrawDiamondElement,
   ExcalidrawElement,
   ExcalidrawFreeDrawElement,
@@ -341,10 +329,24 @@ export function deconstructRectanguloidElement(
   return shape;
 }
 
-export function getDiamondBaseCorners(
+/**
+ * Get the **unrotated** building components of a diamond element
+ * in the form of line segments and curves as a tuple, in this order.
+ *
+ * @param element The element to deconstruct
+ * @param offset An optional offset
+ * @returns Tuple of line **unrotated** segments (0) and curves (1)
+ */
+export function deconstructDiamondElement(
   element: ExcalidrawDiamondElement,
   offset: number = 0,
-): Curve<GlobalPoint>[] {
+): [LineSegment<GlobalPoint>[], Curve<GlobalPoint>[]] {
+  const cachedShape = getElementShapesCacheEntry(element, offset);
+
+  if (cachedShape) {
+    return cachedShape;
+  }
+
   const [topX, topY, rightX, rightY, bottomX, bottomY, leftX, leftY] =
     getDiamondPoints(element);
   const verticalRadius = element.roundness
@@ -361,7 +363,7 @@ export function getDiamondBaseCorners(
     pointFrom(element.x + leftX, element.y + leftY),
   ];
 
-  return [
+  const baseCorners = [
     curve(
       pointFrom<GlobalPoint>(
         right[0] - verticalRadius,
@@ -411,27 +413,6 @@ export function getDiamondBaseCorners(
       ),
     ), // TOP
   ];
-}
-
-/**
- * Get the **unrotated** building components of a diamond element
- * in the form of line segments and curves as a tuple, in this order.
- *
- * @param element The element to deconstruct
- * @param offset An optional offset
- * @returns Tuple of line **unrotated** segments (0) and curves (1)
- */
-export function deconstructDiamondElement(
-  element: ExcalidrawDiamondElement,
-  offset: number = 0,
-): [LineSegment<GlobalPoint>[], Curve<GlobalPoint>[]] {
-  const cachedShape = getElementShapesCacheEntry(element, offset);
-
-  if (cachedShape) {
-    return cachedShape;
-  }
-
-  const baseCorners = getDiamondBaseCorners(element, offset);
 
   const corners = baseCorners.map(
     (corner) =>
@@ -589,128 +570,28 @@ const getDiagonalsForBindableElement = (
   return [diagonalOne, diagonalTwo];
 };
 
-export const getSnapOutlineMidPoint = (
-  point: GlobalPoint,
-  element: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
-  zoom: AppState["zoom"],
-) => {
-  const center = elementCenterPoint(element, elementsMap);
-  const sideMidpoints =
-    element.type === "diamond"
-      ? getDiamondBaseCorners(element).map((curve) => {
-          const point = bezierEquation(curve, 0.5);
-          const rotatedPoint = pointRotateRads(point, center, element.angle);
-
-          return pointFrom<GlobalPoint>(rotatedPoint[0], rotatedPoint[1]);
-        })
-      : [
-          // RIGHT midpoint
-          pointRotateRads(
-            pointFrom<GlobalPoint>(
-              element.x + element.width,
-              element.y + element.height / 2,
-            ),
-            center,
-            element.angle,
-          ),
-          // BOTTOM midpoint
-          pointRotateRads(
-            pointFrom<GlobalPoint>(
-              element.x + element.width / 2,
-              element.y + element.height,
-            ),
-            center,
-            element.angle,
-          ),
-          // LEFT midpoint
-          pointRotateRads(
-            pointFrom<GlobalPoint>(element.x, element.y + element.height / 2),
-            center,
-            element.angle,
-          ),
-          // TOP midpoint
-          pointRotateRads(
-            pointFrom<GlobalPoint>(element.x + element.width / 2, element.y),
-            center,
-            element.angle,
-          ),
-        ];
-  const candidate = sideMidpoints.find(
-    (midpoint) =>
-      pointDistance(point, midpoint) <=
-        maxBindingDistance_simple(zoom) + element.strokeWidth / 2 &&
-      !hitElementItself({
-        point,
-        element,
-        threshold: 0,
-        elementsMap,
-        overrideShouldTestInside: true,
-      }),
-  );
-
-  return candidate;
-};
-
 export const projectFixedPointOntoDiagonal = (
   arrow: ExcalidrawArrowElement,
   point: GlobalPoint,
-  element: ExcalidrawBindableElement,
+  element: ExcalidrawElement,
   startOrEnd: "start" | "end",
   elementsMap: ElementsMap,
-  zoom: AppState["zoom"],
 ): GlobalPoint | null => {
   invariant(arrow.points.length >= 2, "Arrow must have at least two points");
   if (arrow.width < 3 && arrow.height < 3) {
     return null;
   }
 
-  const sideMidPoint = getSnapOutlineMidPoint(
-    point,
-    element,
-    elementsMap,
-    zoom,
-  );
-  if (sideMidPoint) {
-    return sideMidPoint;
-  }
-
-  // Do the projection onto the diagonals (or center lines
-  // for non-rectangular shapes)
   const [diagonalOne, diagonalTwo] = getDiagonalsForBindableElement(
     element,
     elementsMap,
   );
 
-  // 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),
@@ -722,22 +603,18 @@ export const projectFixedPointOntoDiagonal = (
     ),
     a,
   );
-  const intersector = lineSegment<GlobalPoint>(b, a);
+  const intersector = lineSegment<GlobalPoint>(point, b);
   const p1 = lineSegmentIntersectionPoints(diagonalOne, intersector);
   const p2 = lineSegmentIntersectionPoints(diagonalTwo, intersector);
   const d1 = p1 && pointDistance(a, p1);
   const d2 = p2 && pointDistance(a, p2);
 
-  let projection = null;
+  let p = null;
   if (d1 != null && d2 != null) {
-    projection = d1 < d2 ? p1 : p2;
+    p = d1 < d2 ? p1 : p2;
   } else {
-    projection = p1 || p2 || null;
+    p = p1 || p2 || null;
   }
 
-  if (projection && isPointInElement(projection, element, elementsMap)) {
-    return projection;
-  }
-
-  return null;
+  return p && isPointInElement(p, element, elementsMap) ? p : null;
 };

packages/element/src/zindex.ts

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

packages/element/tests/collision.test.tsx

@@ -38,53 +38,6 @@ describe("check rotated elements can be hit:", () => {
   });
 });
 
-describe("frame hit testing", () => {
-  it.each(["transparent", "#ffffff"])(
-    "does not hit frame inside regardless of background color (%s)",
-    (backgroundColor) => {
-      const element = API.createElement({
-        type: "frame",
-        x: 0,
-        y: 0,
-        width: 100,
-        height: 100,
-        backgroundColor,
-      });
-      const elementsMap = arrayToMap([element]);
-
-      expect(
-        hitElementItself({
-          point: pointFrom<GlobalPoint>(50, 50),
-          element,
-          threshold: 10,
-          elementsMap,
-        }),
-      ).toBe(false);
-    },
-  );
-
-  it("hits frame outline", () => {
-    const element = API.createElement({
-      type: "frame",
-      x: 0,
-      y: 0,
-      width: 100,
-      height: 100,
-      backgroundColor: "#ffffff",
-    });
-    const elementsMap = arrayToMap([element]);
-
-    expect(
-      hitElementItself({
-        point: pointFrom<GlobalPoint>(0, 50),
-        element,
-        threshold: 1,
-        elementsMap,
-      }),
-    ).toBe(true);
-  });
-});
-
 describe("hitElementItself cache", () => {
   beforeEach(async () => {
     // reset cache

packages/element/tests/embeddable.test.ts

@@ -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);
-  });
-});

packages/element/tests/linearElementEditor.test.tsx

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

packages/element/tests/resize.test.tsx

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

packages/excalidraw/actions/actionExport.tsx

@@ -271,11 +271,7 @@ export const actionLoadScene = register({
         elements: loadedElements,
         appState: loadedAppState,
         files,
-      } = await loadFromJSON(
-        appState,
-        elements,
-        app.getSchemaMigrationRegistry(),
-      );
+      } = await loadFromJSON(appState, elements);
       return {
         elements: loadedElements,
         appState: loadedAppState,

packages/excalidraw/actions/actionFinalize.tsx

@@ -108,6 +108,7 @@ export const actionFinalize = register<FormData>({
 
             return map;
           }, new Map()) ?? new Map();
+
         bindOrUnbindBindingElement(
           element,
           draggedPoints,

packages/excalidraw/actions/actionProperties.test.tsx

@@ -6,23 +6,11 @@ import {
   FONT_FAMILY,
   STROKE_WIDTH,
 } from "@excalidraw/common";
-import {
-  CORE_FRAME_SCHEMA_TRACK,
-  CORE_SUPPORTED_TRACKS,
-} from "@excalidraw/element";
 
 import { Excalidraw } from "../index";
 import { API } from "../tests/helpers/api";
 import { UI } from "../tests/helpers/ui";
-import { act, render } from "../tests/test-utils";
-
-import {
-  actionChangeBackgroundColor,
-  actionChangeRoundness,
-  actionChangeStrokeWidth,
-} from "./actionProperties";
-
-const { h } = window;
+import { render } from "../tests/test-utils";
 
 describe("element locking", () => {
   beforeEach(async () => {
@@ -121,21 +109,6 @@ describe("element locking", () => {
       expect(crossHatchButton).toBe(null);
     });
 
-    it("should show background color picker for selected frame", () => {
-      const frame = API.createElement({
-        type: "frame",
-      });
-      API.setElements([frame]);
-      API.setSelectedElements([frame]);
-
-      expect(
-        queryByTestId(
-          document.body,
-          `color-top-pick-${DEFAULT_ELEMENT_BACKGROUND_PICKS[0]}`,
-        ),
-      ).not.toBe(null);
-    });
-
     it("should highlight common stroke width of selected elements", () => {
       const rect1 = API.createElement({
         type: "rectangle",
@@ -196,77 +169,5 @@ describe("element locking", () => {
         "active",
       );
     });
-
-    it("should not update text background when changing background in mixed frame selection", () => {
-      const frame = API.createElement({
-        type: "frame",
-        schemaState: { tracks: {} },
-      });
-      const text = API.createElement({
-        type: "text",
-        backgroundColor: COLOR_PALETTE.transparent,
-      });
-      API.setElements([text, frame]);
-      API.setSelectedElements([text, frame]);
-
-      act(() => {
-        h.app.actionManager.executeAction(actionChangeBackgroundColor, "ui", {
-          viewBackgroundColor: h.state.viewBackgroundColor,
-          currentItemBackgroundColor: "#ffc9c9",
-        });
-      });
-
-      expect(API.getElement(frame).backgroundColor).toBe("#ffc9c9");
-      expect(API.getElement(text).backgroundColor).toBe(
-        COLOR_PALETTE.transparent,
-      );
-      expect(
-        API.getElement(frame).schemaState.tracks[CORE_FRAME_SCHEMA_TRACK],
-      ).toBe(CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK]);
-    });
-
-    it("should not update frame stroke width when changing stroke width in mixed selection", () => {
-      const frame = API.createElement({
-        type: "frame",
-      });
-      const rect = API.createElement({
-        type: "rectangle",
-        strokeWidth: STROKE_WIDTH.thin,
-      });
-      API.setElements([rect, frame]);
-      API.setSelectedElements([rect, frame]);
-
-      const originalFrameStrokeWidth = API.getElement(frame).strokeWidth;
-
-      act(() => {
-        h.app.actionManager.executeAction(
-          actionChangeStrokeWidth,
-          "ui",
-          STROKE_WIDTH.extraBold,
-        );
-      });
-
-      expect(API.getElement(rect).strokeWidth).toBe(STROKE_WIDTH.extraBold);
-      expect(API.getElement(frame).strokeWidth).toBe(originalFrameStrokeWidth);
-    });
-
-    it("should not update frame roundness when changing roundness in mixed selection", () => {
-      const frame = API.createElement({
-        type: "frame",
-      });
-      const rect = API.createElement({
-        type: "rectangle",
-        roundness: null,
-      });
-      API.setElements([rect, frame]);
-      API.setSelectedElements([rect, frame]);
-
-      act(() => {
-        h.app.actionManager.executeAction(actionChangeRoundness, "ui", "round");
-      });
-
-      expect(API.getElement(rect).roundness).not.toBe(null);
-      expect(API.getElement(frame).roundness).toBe(null);
-    });
   });
 });

packages/excalidraw/actions/actionProperties.tsx

@@ -45,7 +45,6 @@ import {
 import {
   isArrowElement,
   isBoundToContainer,
-  isFrameElement,
   isElbowArrow,
   isLinearElement,
   isLineElement,
@@ -53,13 +52,7 @@ import {
   isUsingAdaptiveRadius,
 } from "@excalidraw/element";
 
-import {
-  canChangeRoundness,
-  hasBackground,
-  hasStrokeColor,
-  hasStrokeStyle,
-  hasStrokeWidth,
-} from "@excalidraw/element";
+import { hasStrokeColor } from "@excalidraw/element";
 
 import {
   updateElbowArrowPoints,
@@ -416,18 +409,11 @@ export const actionChangeBackgroundColor = register<
         return el;
       });
     } else {
-      nextElements = changeProperty(elements, appState, (el) => {
-        if (isFrameElement(el)) {
-          return newElementWith(el, {
-            backgroundColor: value.currentItemBackgroundColor,
-          });
-        }
-        return hasBackground(el.type)
-          ? newElementWith(el, {
-              backgroundColor: value.currentItemBackgroundColor,
-            })
-          : el;
-      });
+      nextElements = changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          backgroundColor: value.currentItemBackgroundColor,
+        }),
+      );
     }
 
     return {
@@ -458,12 +444,7 @@ export const actionChangeBackgroundColor = register<
             (element) => element.backgroundColor,
             true,
             (hasSelection) =>
-              !hasSelection
-                ? appState.activeTool.type === "frame"
-                  ? // background default shouldn't apply to new frames
-                    "transparent"
-                  : appState.currentItemBackgroundColor
-                : null,
+              !hasSelection ? appState.currentItemBackgroundColor : null,
           )}
           onChange={(color) =>
             updateData({ currentItemBackgroundColor: color })
@@ -490,13 +471,11 @@ export const actionChangeFillStyle = register<ExcalidrawElement["fillStyle"]>({
       })`,
     );
     return {
-      elements: changeProperty(elements, appState, (el) => {
-        return hasBackground(el.type)
-          ? newElementWith(el, {
-              fillStyle: value,
-            })
-          : el;
-      }),
+      elements: changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          fillStyle: value,
+        }),
+      ),
       appState: { ...appState, currentItemFillStyle: value },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
@@ -569,13 +548,11 @@ export const actionChangeStrokeWidth = register<
   trackEvent: false,
   perform: (elements, appState, value) => {
     return {
-      elements: changeProperty(elements, appState, (el) => {
-        return hasStrokeWidth(el.type)
-          ? newElementWith(el, {
-              strokeWidth: value,
-            })
-          : el;
-      }),
+      elements: changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          strokeWidth: value,
+        }),
+      ),
       appState: { ...appState, currentItemStrokeWidth: value },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
@@ -627,14 +604,12 @@ export const actionChangeSloppiness = register<ExcalidrawElement["roughness"]>({
   trackEvent: false,
   perform: (elements, appState, value) => {
     return {
-      elements: changeProperty(elements, appState, (el) => {
-        return hasStrokeStyle(el.type)
-          ? newElementWith(el, {
-              seed: randomInteger(),
-              roughness: value,
-            })
-          : el;
-      }),
+      elements: changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          seed: randomInteger(),
+          roughness: value,
+        }),
+      ),
       appState: { ...appState, currentItemRoughness: value },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
@@ -685,13 +660,11 @@ export const actionChangeStrokeStyle = register<
   trackEvent: false,
   perform: (elements, appState, value) => {
     return {
-      elements: changeProperty(elements, appState, (el) => {
-        return hasStrokeStyle(el.type)
-          ? newElementWith(el, {
-              strokeStyle: value,
-            })
-          : el;
-      }),
+      elements: changeProperty(elements, appState, (el) =>
+        newElementWith(el, {
+          strokeStyle: value,
+        }),
+      ),
       appState: { ...appState, currentItemStrokeStyle: value },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
@@ -1503,7 +1476,7 @@ export const actionChangeRoundness = register<"sharp" | "round">({
   perform: (elements, appState, value) => {
     return {
       elements: changeProperty(elements, appState, (el) => {
-        if (isElbowArrow(el) || !canChangeRoundness(el.type)) {
+        if (isElbowArrow(el)) {
           return el;
         }
 
@@ -1582,7 +1555,7 @@ const getArrowheadOptions = (flip: boolean) => {
       value: null,
       text: t("labels.arrowhead_none"),
       keyBinding: "q",
-      icon: <ArrowheadNoneIcon flip={flip} />,
+      icon: ArrowheadNoneIcon,
     },
     {
       value: "arrow",
@@ -1710,8 +1683,7 @@ export const actionChangeArrowhead = register<{
                   ? element.startArrowhead
                   : appState.currentItemStartArrowhead,
               true,
-              (hasSelection) =>
-                hasSelection ? null : appState.currentItemStartArrowhead,
+              appState.currentItemStartArrowhead,
             )}
             onChange={(value) => updateData({ position: "start", type: value })}
             numberOfOptionsToAlwaysShow={4}
@@ -1728,8 +1700,7 @@ export const actionChangeArrowhead = register<{
                   ? element.endArrowhead
                   : appState.currentItemEndArrowhead,
               true,
-              (hasSelection) =>
-                hasSelection ? null : appState.currentItemEndArrowhead,
+              appState.currentItemEndArrowhead,
             )}
             onChange={(value) => updateData({ position: "end", type: value })}
             numberOfOptionsToAlwaysShow={4}

packages/excalidraw/actions/shortcuts.ts

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

packages/excalidraw/clipboard.test.ts

@@ -54,13 +54,7 @@ describe("parseClipboard()", () => {
         }),
       ),
     );
-    expect(clipboardData.elements).toEqual([
-      expect.objectContaining({
-        id: rect.id,
-        type: rect.type,
-        schemaState: rect.schemaState,
-      }),
-    ]);
+    expect(clipboardData.elements).toEqual([rect]);
   });
 
   it("should parse valid excalidraw JSON if inside text/html", async () => {
@@ -79,13 +73,7 @@ describe("parseClipboard()", () => {
         }),
       ),
     );
-    expect(clipboardData.elements).toEqual([
-      expect.objectContaining({
-        id: rect.id,
-        type: rect.type,
-        schemaState: rect.schemaState,
-      }),
-    ]);
+    expect(clipboardData.elements).toEqual([rect]);
     // -------------------------------------------------------------------------
     json = serializeAsClipboardJSON({ elements: [rect], files: null });
     clipboardData = await parseClipboard(
@@ -97,66 +85,10 @@ describe("parseClipboard()", () => {
         }),
       ),
     );
-    expect(clipboardData.elements).toEqual([
-      expect.objectContaining({
-        id: rect.id,
-        type: rect.type,
-        schemaState: rect.schemaState,
-      }),
-    ]);
+    expect(clipboardData.elements).toEqual([rect]);
     // -------------------------------------------------------------------------
   });
 
-  it("should preserve per-element schema on clipboard payload", async () => {
-    const rect = API.createElement({ type: "rectangle" });
-    const clipboardPayload = JSON.parse(
-      serializeAsClipboardJSON({ elements: [rect], files: null }),
-    );
-
-    const clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/plain": JSON.stringify(clipboardPayload),
-          },
-        }),
-      ),
-    );
-
-    expect(clipboardData.elements?.[0]).toEqual(
-      expect.objectContaining({
-        id: rect.id,
-        schemaState: rect.schemaState,
-      }),
-    );
-  });
-
-  it("should not upcast legacy elements to latest schema on clipboard serialize", async () => {
-    const rect = API.createElement({ type: "rectangle" });
-    const legacyRect = { ...(rect as any) };
-    delete legacyRect.schemaState;
-
-    const clipboardPayload = JSON.parse(
-      serializeAsClipboardJSON({
-        elements: [legacyRect as typeof rect],
-        files: null,
-      }),
-    );
-    expect(clipboardPayload.elements[0]).not.toHaveProperty("schemaState");
-
-    const clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/plain": JSON.stringify(clipboardPayload),
-          },
-        }),
-      ),
-    );
-
-    expect(clipboardData.elements?.[0]).not.toHaveProperty("schemaState");
-  });
-
   it("should parse <image> `src` urls out of text/html", async () => {
     let clipboardData;
     // -------------------------------------------------------------------------

packages/excalidraw/clipboard.ts

@@ -79,10 +79,7 @@ export const probablySupportsClipboardBlob =
 
 const clipboardContainsElements = (
   contents: any,
-): contents is {
-  elements: ExcalidrawElement[];
-  files?: BinaryFiles;
-} => {
+): contents is { elements: ExcalidrawElement[]; files?: BinaryFiles } => {
   if (
     [
       EXPORT_DATA_TYPES.excalidraw,
@@ -207,13 +204,8 @@ export const copyToClipboard = async (
   /** supply if available to make the operation more certain to succeed */
   clipboardEvent?: ClipboardEvent | null,
 ) => {
-  const json = serializeAsClipboardJSON({ elements, files });
-
   await copyTextToSystemClipboard(
-    {
-      [MIME_TYPES.excalidrawClipboard]: json,
-      [MIME_TYPES.text]: json,
-    },
+    serializeAsClipboardJSON({ elements, files }),
     clipboardEvent,
   );
 };
@@ -409,7 +401,7 @@ export type ParsedDataTransferFile = Extract<
   { kind: "file" }
 >;
 
-export type ParsedDataTranferList = ParsedDataTransferItem[] & {
+type ParsedDataTranferList = ParsedDataTransferItem[] & {
   /**
    * Only allows filtering by known `string` data types, since `file`
    * types can have multiple items of the same type (e.g. multiple image files)
@@ -460,29 +452,6 @@ const getDataTransferFiles = function (
   );
 };
 
-/** @returns list of MIME types, synchronously */
-export const parseDataTransferEventMimeTypes = (
-  event: ClipboardEvent | DragEvent | React.DragEvent<HTMLDivElement>,
-): Set<string> => {
-  let items: DataTransferItemList | undefined = undefined;
-
-  if (isClipboardEvent(event)) {
-    items = event.clipboardData?.items;
-  } else {
-    items = event.dataTransfer?.items;
-  }
-
-  const types: Set<string> = new Set();
-
-  for (const item of Array.from(items || [])) {
-    if (!types.has(item.type)) {
-      types.add(item.type);
-    }
-  }
-
-  return types;
-};
-
 export const parseDataTransferEvent = async (
   event: ClipboardEvent | DragEvent | React.DragEvent<HTMLDivElement>,
 ): Promise<ParsedDataTranferList> => {
@@ -491,7 +460,8 @@ export const parseDataTransferEvent = async (
   if (isClipboardEvent(event)) {
     items = event.clipboardData?.items;
   } else {
-    items = event.dataTransfer?.items;
+    const dragEvent = event;
+    items = dragEvent.dataTransfer?.items;
   }
 
   const dataItems = (
@@ -597,7 +567,7 @@ export const copyBlobToClipboardAsPng = async (blob: Blob | Promise<Blob>) => {
     // ClipboardItem constructor, but throws on an unrelated MIME type error.
     // So we need to await this and fallback to awaiting the blob if applicable.
     await navigator.clipboard.write([
-      new ClipboardItem({
+      new window.ClipboardItem({
         [MIME_TYPES.png]: blob,
       }),
     ]);
@@ -606,7 +576,7 @@ export const copyBlobToClipboardAsPng = async (blob: Blob | Promise<Blob>) => {
     // with resolution value instead
     if (isPromiseLike(blob)) {
       await navigator.clipboard.write([
-        new ClipboardItem({
+        new window.ClipboardItem({
           [MIME_TYPES.png]: await blob,
         }),
       ]);
@@ -616,27 +586,28 @@ export const copyBlobToClipboardAsPng = async (blob: Blob | Promise<Blob>) => {
   }
 };
 
-export const copyTextToSystemClipboard = async <
-  MimeType extends ValueOf<typeof STRING_MIME_TYPES>,
->(
-  text: string | { [K in MimeType]: string } | null,
+export const copyTextToSystemClipboard = async (
+  text: string | null,
   clipboardEvent?: ClipboardEvent | null,
 ) => {
-  text = text || "";
+  // (1) first try using Async Clipboard API
+  if (probablySupportsClipboardWriteText) {
+    try {
+      // NOTE: doesn't work on FF on non-HTTPS domains, or when document
+      // not focused
+      await navigator.clipboard.writeText(text || "");
+      return;
+    } catch (error: any) {
+      console.error(error);
+    }
+  }
 
-  const entries = Object.entries(
-    typeof text === "string" ? { [MIME_TYPES.text]: text } : text,
-  );
-
-  // (1) if we have clipboardEvent, try using it first as it's the most
-  // versatile
+  // (2) if fails and we have access to ClipboardEvent, use plain old setData()
   try {
     if (clipboardEvent) {
-      for (const [mimeType, value] of entries) {
-        clipboardEvent.clipboardData?.setData(mimeType, value);
-        if (clipboardEvent.clipboardData?.getData(mimeType) !== value) {
-          throw new Error("Failed to setData on clipboardEvent");
-        }
+      clipboardEvent.clipboardData?.setData(MIME_TYPES.text, text || "");
+      if (clipboardEvent.clipboardData?.getData(MIME_TYPES.text) !== text) {
+        throw new Error("Failed to setData on clipboardEvent");
       }
       return;
     }
@@ -644,26 +615,8 @@ export const copyTextToSystemClipboard = async <
     console.error(error);
   }
 
-  const plainTextEntry = entries.find(
-    ([mimeType]) => mimeType === MIME_TYPES.text,
-  );
-
-  // (2) if we don't have access to clipboardEvent, or that fails,
-  // at least try setting text/plain via navigator.clipboard.writeText
-  // (navigator.clipboard.write doesn't work with non-standard mime types)
-  if (probablySupportsClipboardWriteText && plainTextEntry) {
-    try {
-      // NOTE: doesn't work on FF on non-HTTPS domains, or when document
-      // not focused
-      await navigator.clipboard.writeText(plainTextEntry[1]);
-      return;
-    } catch (error: any) {
-      console.error(error);
-    }
-  }
-
-  // (3) if previous fails, use document.execCommand
-  if (plainTextEntry && !copyTextViaExecCommand(plainTextEntry[1])) {
+  // (3) if that fails, use document.execCommand
+  if (!copyTextViaExecCommand(text)) {
     throw new Error("Error copying to clipboard.");
   }
 };

packages/excalidraw/components/Actions.tsx

@@ -1,6 +1,6 @@
 import clsx from "clsx";
 import { useRef, useState } from "react";
-import { Popover } from "radix-ui";
+import * as Popover from "@radix-ui/react-popover";
 
 import {
   CLASSES,
@@ -20,7 +20,6 @@ import {
   isArrowElement,
   hasStrokeColor,
   toolIsArrow,
-  isFrameElement,
 } from "@excalidraw/element";
 
 import type {
@@ -130,11 +129,8 @@ export const canChangeBackgroundColor = (
   targetElements: ExcalidrawElement[],
 ) => {
   return (
-    // frame tool shouldn't allow to set background until frame is created
     hasBackground(appState.activeTool.type) ||
-    targetElements.some(
-      (element) => hasBackground(element.type) || isFrameElement(element),
-    )
+    targetElements.some((element) => hasBackground(element.type))
   );
 };
 

packages/excalidraw/components/App.tsx

@@ -11,6 +11,7 @@ import {
   pointDistance,
   vector,
   pointRotateRads,
+  vectorScale,
   vectorFromPoint,
   vectorSubtract,
   vectorDot,
@@ -249,14 +250,6 @@ import {
   maxBindingDistance_simple,
   convertToExcalidrawElements,
   type ExcalidrawElementSkeleton,
-  getSnapOutlineMidPoint,
-  handleFocusPointDrag,
-  handleFocusPointHover,
-  handleFocusPointPointerDown,
-  handleFocusPointPointerUp,
-  maybeHandleArrowPointlikeDrag,
-  getUncroppedWidthAndHeight,
-  isFrameElement,
 } from "@excalidraw/element";
 
 import type { GlobalPoint, LocalPoint, Radians } from "@excalidraw/math";
@@ -354,7 +347,6 @@ import {
 import { exportCanvas, loadFromBlob } from "../data";
 import Library, { distributeLibraryItemsOnSquareGrid } from "../data/library";
 import { restoreAppState, restoreElements } from "../data/restore";
-import { createSchemaMigrationRegistry } from "../data/schema";
 import { getCenter, getDistance } from "../gesture";
 import { History } from "../history";
 import { defaultLang, getLanguage, languages, setLanguage, t } from "../i18n";
@@ -444,7 +436,10 @@ import { searchItemInFocusAtom } from "./SearchMenu";
 import { isSidebarDockedAtom } from "./Sidebar/Sidebar";
 import { StaticCanvas, InteractiveCanvas } from "./canvases";
 import NewElementCanvas from "./canvases/NewElementCanvas";
-import { isPointHittingLink } from "./hyperlink/helpers";
+import {
+  isPointHittingLink,
+  isPointHittingLinkIcon,
+} from "./hyperlink/helpers";
 import { MagicIcon, copyIcon, fullscreenIcon } from "./icons";
 import { Toast } from "./Toast";
 
@@ -461,7 +456,6 @@ import type {
 
 import type { ClipboardData, PastedMixedContent } from "../clipboard";
 import type { ExportedElements } from "../data";
-import type { SchemaMigrationRegistry } from "../data/schema";
 import type { ContextMenuItems } from "./ContextMenu";
 import type { FileSystemHandle } from "../data/filesystem";
 
@@ -608,7 +602,6 @@ class App extends React.Component<AppProps, AppState> {
   public fonts: Fonts;
   public renderer: Renderer;
   public visibleElements: readonly NonDeletedExcalidrawElement[];
-  private schemaMigrationRegistry: SchemaMigrationRegistry;
   private resizeObserver: ResizeObserver | undefined;
   public library: AppClassProperties["library"];
   public libraryItemsFromStorage: LibraryItems | undefined;
@@ -650,10 +643,7 @@ class App extends React.Component<AppProps, AppState> {
   lastPointerUpEvent: React.PointerEvent<HTMLElement> | PointerEvent | null =
     null;
   lastPointerMoveEvent: PointerEvent | null = null;
-  /** current frame pointer cords */
   lastPointerMoveCoords: { x: number; y: number } | null = null;
-  /** previous frame pointer coords */
-  previousPointerMoveCoords: { x: number; y: number } | null = null;
   lastViewportPosition = { x: 0, y: 0 };
 
   animationFrameHandler = new AnimationFrameHandler();
@@ -725,9 +715,6 @@ class App extends React.Component<AppProps, AppState> {
     this.stylesPanelMode = deriveStylesPanelMode(this.editorInterface);
 
     this.id = nanoid();
-    this.schemaMigrationRegistry = createSchemaMigrationRegistry(
-      props.schemaPlugins,
-    );
     this.library = new Library(this);
     this.actionManager = new ActionManager(
       this.syncActionResult,
@@ -774,7 +761,6 @@ class App extends React.Component<AppProps, AppState> {
         setCursor: this.setCursor,
         resetCursor: this.resetCursor,
         getEditorInterface: () => this.editorInterface,
-        getSchemaMigrationRegistry: this.getSchemaMigrationRegistry,
         updateFrameRendering: this.updateFrameRendering,
         toggleSidebar: this.toggleSidebar,
         onChange: (cb) => this.onChangeEmitter.on(cb),
@@ -1215,99 +1201,12 @@ class App extends React.Component<AppProps, AppState> {
     return this.iFrameRefs.get(element.id);
   }
 
-  private handleIframeLikeElementHover = ({
-    hitElement,
-    scenePointer,
-    moveEvent,
-  }: {
-    hitElement: NonDeleted<ExcalidrawElement> | null;
-    scenePointer: { x: number; y: number };
-    moveEvent: React.PointerEvent<HTMLCanvasElement>;
-  }): boolean => {
+  private handleEmbeddableCenterClick(element: ExcalidrawIframeLikeElement) {
     if (
-      hitElement &&
-      isIframeLikeElement(hitElement) &&
-      this.isIframeLikeElementCenter(
-        hitElement,
-        moveEvent,
-        scenePointer.x,
-        scenePointer.y,
-      )
-    ) {
-      setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER);
-      this.setState({
-        activeEmbeddable: { element: hitElement, state: "hover" },
-      });
-      return true;
-    } else if (this.state.activeEmbeddable?.state === "hover") {
-      this.setState({ activeEmbeddable: null });
-    }
-    return false;
-  };
-
-  /** @returns true if iframe-like element click handled */
-  private handleIframeLikeCenterClick(): boolean {
-    if (!this.lastPointerDownEvent || !this.lastPointerUpEvent) {
-      return false;
-    }
-
-    const scenePointerStart = viewportCoordsToSceneCoords(
-      {
-        clientX: this.lastPointerDownEvent.clientX,
-        clientY: this.lastPointerDownEvent.clientY,
-      },
-      this.state,
-    );
-    const scenePointerEnd = viewportCoordsToSceneCoords(
-      {
-        clientX: this.lastPointerUpEvent.clientX,
-        clientY: this.lastPointerUpEvent.clientY,
-      },
-      this.state,
-    );
-
-    const hitElementStart = this.getElementAtPosition(
-      scenePointerStart.x,
-      scenePointerStart.y,
-    );
-
-    const hitElementEnd = this.getElementAtPosition(
-      scenePointerEnd.x,
-      scenePointerEnd.y,
-    );
-
-    if (
-      !hitElementStart ||
-      !hitElementEnd ||
-      hitElementStart !== hitElementEnd ||
-      this.lastPointerUpEvent.timeStamp - this.lastPointerDownEvent.timeStamp >
-        300 ||
-      gesture.pointers.size > 1 ||
-      !isIframeLikeElement(hitElementStart) ||
-      !isIframeLikeElement(hitElementEnd) ||
-      !this.isIframeLikeElementCenter(
-        hitElementStart,
-        this.lastPointerUpEvent,
-        scenePointerStart.x,
-        scenePointerStart.y,
-      ) ||
-      !this.isIframeLikeElementCenter(
-        hitElementEnd,
-        this.lastPointerUpEvent,
-        scenePointerEnd.x,
-        scenePointerEnd.y,
-      )
-    ) {
-      return false;
-    }
-
-    const iframeLikeElement = hitElementEnd;
-
-    if (
-      this.state.activeEmbeddable?.element === iframeLikeElement &&
+      this.state.activeEmbeddable?.element === element &&
       this.state.activeEmbeddable?.state === "active"
     ) {
-      return true;
+      return;
     }
 
     // The delay serves two purposes
@@ -1318,34 +1217,31 @@ class App extends React.Component<AppProps, AppState> {
     //    in fullscreen mode
     setTimeout(() => {
       this.setState({
-        activeEmbeddable: { element: iframeLikeElement, state: "active" },
-        selectedElementIds: { [iframeLikeElement.id]: true },
+        activeEmbeddable: { element, state: "active" },
+        selectedElementIds: { [element.id]: true },
         newElement: null,
         selectionElement: null,
       });
     }, 100);
 
-    if (isIframeElement(iframeLikeElement)) {
-      return true;
+    if (isIframeElement(element)) {
+      return;
     }
 
-    const iframe = this.getHTMLIFrameElement(iframeLikeElement);
+    const iframe = this.getHTMLIFrameElement(element);
 
     if (!iframe?.contentWindow) {
-      return true;
+      return;
     }
 
     if (iframe.src.includes("youtube")) {
-      const state = YOUTUBE_VIDEO_STATES.get(iframeLikeElement.id);
+      const state = YOUTUBE_VIDEO_STATES.get(element.id);
       if (!state) {
-        YOUTUBE_VIDEO_STATES.set(
-          iframeLikeElement.id,
-          YOUTUBE_STATES.UNSTARTED,
-        );
+        YOUTUBE_VIDEO_STATES.set(element.id, YOUTUBE_STATES.UNSTARTED);
         iframe.contentWindow.postMessage(
           JSON.stringify({
             event: "listening",
-            id: iframeLikeElement.id,
+            id: element.id,
           }),
           "*",
         );
@@ -1382,8 +1278,6 @@ class App extends React.Component<AppProps, AppState> {
         "*",
       );
     }
-
-    return true;
   }
 
   private isIframeLikeElementCenter(
@@ -2327,10 +2221,6 @@ class App extends React.Component<AppProps, AppState> {
     return this.scene.getNonDeletedElements();
   };
 
-  public getSchemaMigrationRegistry = () => {
-    return this.schemaMigrationRegistry;
-  };
-
   public onInsertElements = (elements: readonly ExcalidrawElement[]) => {
     this.addElementsFromPasteOrLibrary({
       elements,
@@ -2819,7 +2709,6 @@ class App extends React.Component<AppProps, AppState> {
     const restoredElements = restoreElements(initialData?.elements, null, {
       repairBindings: true,
       deleteInvisibleElements: true,
-      schemaMigrationRegistry: this.schemaMigrationRegistry,
     });
     let restoredAppState = restoreAppState(initialData?.appState, null);
     const activeTool = restoredAppState.activeTool;
@@ -3231,12 +3120,6 @@ class App extends React.Component<AppProps, AppState> {
   }
 
   componentDidUpdate(prevProps: AppProps, prevState: AppState) {
-    if (prevProps.schemaPlugins !== this.props.schemaPlugins) {
-      this.schemaMigrationRegistry = createSchemaMigrationRegistry(
-        this.props.schemaPlugins,
-      );
-    }
-
     this.updateEmbeddables();
     const elements = this.scene.getElementsIncludingDeleted();
     const elementsMap = this.scene.getElementsMapIncludingDeleted();
@@ -3740,7 +3623,6 @@ class App extends React.Component<AppProps, AppState> {
   }) => {
     const elements = restoreElements(opts.elements, null, {
       deleteInvisibleElements: true,
-      schemaMigrationRegistry: this.schemaMigrationRegistry,
     });
     const [minX, minY, maxX, maxY] = getCommonBounds(elements);
 
@@ -4852,12 +4734,8 @@ class App extends React.Component<AppProps, AppState> {
       }
 
       // Handle Alt key for bind mode
-      if (event.key === KEYS.ALT) {
-        if (getFeatureFlag("COMPLEX_BINDINGS")) {
-          this.handleSkipBindMode();
-        } else {
-          maybeHandleArrowPointlikeDrag({ app: this, event });
-        }
+      if (event.key === KEYS.ALT && getFeatureFlag("COMPLEX_BINDINGS")) {
+        this.handleSkipBindMode();
       }
 
       if (this.actionManager.handleKeyDown(event)) {
@@ -4873,11 +4751,7 @@ class App extends React.Component<AppProps, AppState> {
           this.resetDelayedBindMode();
         }
 
-        flushSync(() => {
-          this.setState({ isBindingEnabled: false });
-        });
-
-        maybeHandleArrowPointlikeDrag({ app: this, event });
+        this.setState({ isBindingEnabled: false });
       }
 
       if (isArrowKey(event.key)) {
@@ -5057,8 +4931,6 @@ class App extends React.Component<AppProps, AppState> {
         if (
           event.key === KEYS.G &&
           (hasBackground(this.state.activeTool.type) ||
-            this.state.activeTool.type === "frame" ||
-            selectedElements.some((element) => isFrameElement(element)) ||
             selectedElements.some((element) => hasBackground(element.type)))
         ) {
           this.setState({ openPopup: "elementBackground" });
@@ -5152,11 +5024,6 @@ class App extends React.Component<AppProps, AppState> {
       }
       isHoldingSpace = false;
     }
-
-    if (event.key === KEYS.ALT) {
-      maybeHandleArrowPointlikeDrag({ app: this, event });
-    }
-
     if (
       (event.key === KEYS.ALT && this.state.bindMode === "skip") ||
       (!event[KEYS.CTRL_OR_CMD] && !isBindingEnabled(this.state))
@@ -5167,7 +5034,7 @@ class App extends React.Component<AppProps, AppState> {
       });
 
       // Restart the timer if we're creating/editing a linear element and hovering over an element
-      if (this.lastPointerMoveEvent && getFeatureFlag("COMPLEX_BINDINGS")) {
+      if (this.lastPointerMoveEvent) {
         const scenePointer = viewportCoordsToSceneCoords(
           {
             clientX: this.lastPointerMoveEvent.clientX,
@@ -5188,18 +5055,14 @@ class App extends React.Component<AppProps, AppState> {
             this.scene.getNonDeletedElementsMap(),
           );
 
-          if (isBindingElement(element)) {
+          if (isBindingElement(element) && getFeatureFlag("COMPLEX_BINDINGS")) {
             this.handleDelayedBindModeChange(element, hoveredElement);
           }
         }
       }
     }
     if (!event[KEYS.CTRL_OR_CMD] && !this.state.isBindingEnabled) {
-      flushSync(() => {
-        this.setState({ isBindingEnabled: true });
-      });
-
-      maybeHandleArrowPointlikeDrag({ app: this, event });
+      this.setState({ isBindingEnabled: true });
     }
     if (isArrowKey(event.key)) {
       bindOrUnbindBindingElements(
@@ -6512,28 +6375,15 @@ class App extends React.Component<AppProps, AppState> {
       // and point
       const { newElement } = this.state;
       if (!newElement && isBindingEnabled(this.state)) {
-        const globalPoint = pointFrom<GlobalPoint>(
-          scenePointerX,
-          scenePointerY,
-        );
-        const elementsMap = this.scene.getNonDeletedElementsMap();
         const hoveredElement = getHoveredElementForBinding(
-          globalPoint,
+          pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
           this.scene.getNonDeletedElements(),
-          elementsMap,
-          maxBindingDistance_simple(this.state.zoom),
+          this.scene.getNonDeletedElementsMap(),
+          (el) => maxBindingDistance_simple(this.state.zoom),
         );
         if (hoveredElement) {
           this.setState({
-            suggestedBinding: {
-              element: hoveredElement,
-              midPoint: getSnapOutlineMidPoint(
-                globalPoint,
-                hoveredElement,
-                elementsMap,
-                this.state.zoom,
-              ),
-            },
+            suggestedBinding: hoveredElement,
           });
         } else if (this.state.suggestedBinding) {
           this.setState({
@@ -6560,7 +6410,7 @@ class App extends React.Component<AppProps, AppState> {
             pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
             this.scene.getNonDeletedElements(),
             this.scene.getNonDeletedElementsMap(),
-            maxBindingDistance_simple(this.state.zoom),
+            (el) => maxBindingDistance_simple(this.state.zoom),
           );
         if (hoveredElement) {
           this.actionManager.executeAction(actionFinalize, "ui", {
@@ -6714,33 +6564,26 @@ class App extends React.Component<AppProps, AppState> {
         pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
         this.scene.getNonDeletedElements(),
         this.scene.getNonDeletedElementsMap(),
-        maxBindingDistance_simple(this.state.zoom),
+        (el) => maxBindingDistance_simple(this.state.zoom),
       );
-      const scenePointer = pointFrom<GlobalPoint>(scenePointerX, scenePointerY);
-      const elementsMap = this.scene.getNonDeletedElementsMap();
-      if (hit && !isPointInElement(scenePointer, hit, elementsMap)) {
+      if (
+        hit &&
+        !isPointInElement(
+          pointFrom<GlobalPoint>(scenePointerX, scenePointerY),
+          hit,
+          this.scene.getNonDeletedElementsMap(),
+        )
+      ) {
         this.setState({
-          suggestedBinding: {
-            element: hit,
-            midPoint: getSnapOutlineMidPoint(
-              scenePointer,
-              hit,
-              elementsMap,
-              this.state.zoom,
-            ),
-          },
+          suggestedBinding: hit,
         });
       }
     }
 
-    const isPressingAnyButton = Boolean(event.buttons);
-    const isLaserTool = this.state.activeTool.type === "laser";
+    const hasDeselectedButton = Boolean(event.buttons);
     if (
-      isPressingAnyButton ||
-      // checking against laser so that if you mouseover with a laser tool
-      // over a link/embeddable, we change the cursor
-      (!isLaserTool &&
-        this.state.activeTool.type !== "selection" &&
+      hasDeselectedButton ||
+      (this.state.activeTool.type !== "selection" &&
         this.state.activeTool.type !== "lasso" &&
         this.state.activeTool.type !== "text" &&
         this.state.activeTool.type !== "eraser")
@@ -6860,14 +6703,6 @@ class App extends React.Component<AppProps, AppState> {
       );
     } else {
       hideHyperlinkToolip();
-      if (isLaserTool) {
-        this.handleIframeLikeElementHover({
-          hitElement,
-          scenePointer,
-          moveEvent: event,
-        });
-        return;
-      }
       if (
         hitElement &&
         (hitElement.link || isEmbeddableElement(hitElement)) &&
@@ -6900,15 +6735,24 @@ class App extends React.Component<AppProps, AppState> {
           !hitElement?.locked
         ) {
           if (
-            !this.handleIframeLikeElementHover({
+            hitElement &&
+            isIframeLikeElement(hitElement) &&
+            this.isIframeLikeElementCenter(
               hitElement,
-              scenePointer,
-              moveEvent: event,
-            }) &&
-            (!hitElement ||
-              // Elbow arrows can only be moved when unconnected
-              !isElbowArrow(hitElement) ||
-              !(hitElement.startBinding || hitElement.endBinding))
+              event,
+              scenePointerX,
+              scenePointerY,
+            )
+          ) {
+            setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER);
+            this.setState({
+              activeEmbeddable: { element: hitElement, state: "hover" },
+            });
+          } else if (
+            !hitElement ||
+            // Elbow arrows can only be moved when unconnected
+            !isElbowArrow(hitElement) ||
+            !(hitElement.startBinding || hitElement.endBinding)
           ) {
             if (
               this.state.activeTool.type !== "lasso" ||
@@ -6916,6 +6760,9 @@ class App extends React.Component<AppProps, AppState> {
             ) {
               setCursor(this.interactiveCanvas, CURSOR_TYPE.MOVE);
             }
+            if (this.state.activeEmbeddable?.state === "hover") {
+              this.setState({ activeEmbeddable: null });
+            }
           }
         }
       } else {
@@ -7076,37 +6923,6 @@ class App extends React.Component<AppProps, AppState> {
           },
         });
       }
-
-      // Check for focus point hover
-      let hoveredFocusPointBinding: "start" | "end" | null = null;
-      const arrow = element as any;
-      if (arrow.startBinding || arrow.endBinding) {
-        hoveredFocusPointBinding = handleFocusPointHover(
-          element as ExcalidrawArrowElement,
-          scenePointerX,
-          scenePointerY,
-          this.scene,
-          this.state,
-        );
-      }
-
-      if (
-        this.state.selectedLinearElement.hoveredFocusPointBinding !==
-        hoveredFocusPointBinding
-      ) {
-        this.setState({
-          selectedLinearElement: {
-            ...this.state.selectedLinearElement,
-            isDragging: false,
-            hoveredFocusPointBinding,
-          },
-        });
-      }
-
-      // Set cursor to pointer when hovering over a focus point
-      if (hoveredFocusPointBinding) {
-        setCursor(this.interactiveCanvas, CURSOR_TYPE.POINTER);
-      }
     } else {
       setCursor(this.interactiveCanvas, CURSOR_TYPE.AUTO);
     }
@@ -7567,9 +7383,26 @@ class App extends React.Component<AppProps, AppState> {
       x: scenePointerX,
       y: scenePointerY,
     };
+    const clicklength =
+      event.timeStamp - (this.lastPointerDownEvent?.timeStamp ?? 0);
 
-    if (this.handleIframeLikeCenterClick()) {
-      return;
+    if (this.editorInterface.formFactor === "phone" && clicklength < 300) {
+      const hitElement = this.getElementAtPosition(
+        scenePointer.x,
+        scenePointer.y,
+      );
+      if (
+        isIframeLikeElement(hitElement) &&
+        this.isIframeLikeElementCenter(
+          hitElement,
+          event,
+          scenePointer.x,
+          scenePointer.y,
+        )
+      ) {
+        this.handleEmbeddableCenterClick(hitElement);
+        return;
+      }
     }
 
     if (this.editorInterface.isTouchScreen) {
@@ -7590,7 +7423,20 @@ class App extends React.Component<AppProps, AppState> {
       this.hitLinkElement &&
       !this.state.selectedElementIds[this.hitLinkElement.id]
     ) {
-      this.redirectToLink(event, this.editorInterface.isTouchScreen);
+      if (
+        clicklength < 300 &&
+        isIframeLikeElement(this.hitLinkElement) &&
+        !isPointHittingLinkIcon(
+          this.hitLinkElement,
+          this.scene.getNonDeletedElementsMap(),
+          this.state,
+          pointFrom(scenePointer.x, scenePointer.y),
+        )
+      ) {
+        this.handleEmbeddableCenterClick(this.hitLinkElement);
+      } else {
+        this.redirectToLink(event, this.editorInterface.isTouchScreen);
+      }
     } else if (this.state.viewModeEnabled) {
       this.setState({
         activeEmbeddable: null,
@@ -7998,37 +7844,6 @@ class App extends React.Component<AppProps, AppState> {
           if (ret.didAddPoint) {
             return true;
           }
-
-          // Also check at current pointer position if focus point is being hovered
-          // (in case we're clicking directly without a prior move event)
-          const elementsMap = this.scene.getNonDeletedElementsMap();
-          const arrow = LinearElementEditor.getElement(
-            linearElementEditor.elementId,
-            elementsMap,
-          ) as any;
-
-          if (arrow && isBindingElement(arrow)) {
-            const { hitFocusPoint, pointerOffset } =
-              handleFocusPointPointerDown(
-                arrow,
-                pointerDownState,
-                elementsMap,
-                this.state,
-              );
-
-            // If focus point is hit, update state and prevent element selection
-            if (hitFocusPoint) {
-              this.setState({
-                selectedLinearElement: {
-                  ...linearElementEditor,
-                  hoveredFocusPointBinding: hitFocusPoint,
-                  draggedFocusPointBinding: hitFocusPoint,
-                  pointerOffset,
-                },
-              });
-              return false;
-            }
-          }
         }
 
         const allHitElements = this.getElementsAtPosition(
@@ -8841,7 +8656,6 @@ class App extends React.Component<AppProps, AppState> {
               selectedPointsIndices: [endIdx],
               initialState: {
                 ...linearElementEditor.initialState,
-                arrowStartIsInside: event.altKey,
                 lastClickedPoint: endIdx,
                 origin: pointFrom<GlobalPoint>(
                   pointerDownState.origin.x,
@@ -8860,18 +8674,7 @@ class App extends React.Component<AppProps, AppState> {
             bindMode: "orbit",
             newElement: element,
             startBoundElement: boundElement,
-            suggestedBinding:
-              boundElement && isBindingElement(element)
-                ? {
-                    element: boundElement,
-                    midPoint: getSnapOutlineMidPoint(
-                      point,
-                      boundElement,
-                      elementsMap,
-                      this.state.zoom,
-                    ),
-                  }
-                : null,
+            suggestedBinding: boundElement || null,
             selectedElementIds: nextSelectedElementIds,
             selectedLinearElement: linearElementEditor,
           };
@@ -9133,8 +8936,8 @@ class App extends React.Component<AppProps, AppState> {
       }
 
       const lastPointerCoords =
-        this.previousPointerMoveCoords ?? pointerDownState.origin;
-      this.previousPointerMoveCoords = pointerCoords;
+        this.lastPointerMoveCoords ?? pointerDownState.origin;
+      this.lastPointerMoveCoords = pointerCoords;
 
       // We need to initialize dragOffsetXY only after we've updated
       // `state.selectedElementIds` on pointerDown. Doing it here in pointerMove
@@ -9188,31 +8991,6 @@ class App extends React.Component<AppProps, AppState> {
       if (this.state.selectedLinearElement) {
         const linearElementEditor = this.state.selectedLinearElement;
 
-        // Handle focus point dragging if needed
-        if (linearElementEditor.draggedFocusPointBinding) {
-          handleFocusPointDrag(
-            linearElementEditor,
-            elementsMap,
-            pointerCoords,
-            this.scene,
-            this.state,
-            this.getEffectiveGridSize(),
-            event.altKey,
-          );
-          this.setState({
-            selectedLinearElement: {
-              ...linearElementEditor,
-              isDragging: false,
-              selectedPointsIndices: [],
-              initialState: {
-                ...linearElementEditor.initialState,
-                lastClickedPoint: -1,
-              },
-            },
-          });
-          return;
-        }
-
         if (
           LinearElementEditor.shouldAddMidpoint(
             this.state.selectedLinearElement,
@@ -9451,21 +9229,14 @@ class App extends React.Component<AppProps, AppState> {
                 this.imageCache.get(croppingElement.fileId)?.image;
 
               if (image && !(image instanceof Promise)) {
-                const uncroppedSize =
-                  getUncroppedWidthAndHeight(croppingElement);
-                const instantDragOffset = vector(
-                  pointerCoords.x - lastPointerCoords.x,
-                  pointerCoords.y - lastPointerCoords.y,
+                const instantDragOffset = vectorScale(
+                  vector(
+                    pointerCoords.x - lastPointerCoords.x,
+                    pointerCoords.y - lastPointerCoords.y,
+                  ),
+                  Math.max(this.state.zoom.value, 2),
                 );
 
-                // to reduce cursor:image drift, we need to take into account
-                // the canvas image element scaling so we can accurately
-                // track the pixels on movement
-                instantDragOffset[0] *=
-                  image.naturalWidth / uncroppedSize.width;
-                instantDragOffset[1] *=
-                  image.naturalHeight / uncroppedSize.height;
-
                 const [x1, y1, x2, y2, cx, cy] = getElementAbsoluteCoords(
                   croppingElement,
                   elementsMap,
@@ -9508,13 +9279,13 @@ class App extends React.Component<AppProps, AppState> {
                 const nextCrop = {
                   ...crop,
                   x: clamp(
-                    crop.x -
+                    crop.x +
                       offsetVector[0] * Math.sign(croppingElement.scale[0]),
                     0,
                     image.naturalWidth - crop.width,
                   ),
                   y: clamp(
-                    crop.y -
+                    crop.y +
                       offsetVector[1] * Math.sign(croppingElement.scale[1]),
                     0,
                     image.naturalHeight - crop.height,
@@ -10007,7 +9778,6 @@ class App extends React.Component<AppProps, AppState> {
 
       // just in case, tool changes mid drag, always clean up
       this.lassoTrail.endPath();
-      this.previousPointerMoveCoords = null;
 
       SnapCache.setReferenceSnapPoints(null);
       SnapCache.setVisibleGaps(null);
@@ -10089,14 +9859,12 @@ class App extends React.Component<AppProps, AppState> {
       // and sets binding element
       if (
         this.state.selectedLinearElement?.isEditing &&
-        !this.state.newElement &&
-        this.state.selectedLinearElement.draggedFocusPointBinding === null
+        !this.state.newElement
       ) {
         if (
           !pointerDownState.boxSelection.hasOccurred &&
           pointerDownState.hit?.element?.id !==
-            this.state.selectedLinearElement.elementId &&
-          this.state.selectedLinearElement.draggedFocusPointBinding === null
+            this.state.selectedLinearElement.elementId
         ) {
           this.actionManager.executeAction(actionFinalize);
         } else {
@@ -10132,18 +9900,7 @@ class App extends React.Component<AppProps, AppState> {
           }
         }
 
-        if (this.state.selectedLinearElement.draggedFocusPointBinding) {
-          handleFocusPointPointerUp(
-            this.state.selectedLinearElement,
-            this.scene,
-          );
-          this.setState({
-            selectedLinearElement: {
-              ...this.state.selectedLinearElement,
-              draggedFocusPointBinding: null,
-            },
-          });
-        } else if (
+        if (
           pointerDownState.hit?.element?.id !==
           this.state.selectedLinearElement.elementId
         ) {
@@ -10153,12 +9910,6 @@ class App extends React.Component<AppProps, AppState> {
             this.setState({ selectedLinearElement: null });
           }
         } else if (this.state.selectedLinearElement.isDragging) {
-          this.setState({
-            selectedLinearElement: {
-              ...this.state.selectedLinearElement,
-              isDragging: false,
-            },
-          });
           this.actionManager.executeAction(actionFinalize, "ui", {
             event: childEvent,
             sceneCoords,
@@ -10933,6 +10684,25 @@ class App extends React.Component<AppProps, AppState> {
           suggestedBinding: null,
         });
       }
+
+      if (
+        hitElement &&
+        this.lastPointerUpEvent &&
+        this.lastPointerDownEvent &&
+        this.lastPointerUpEvent.timeStamp -
+          this.lastPointerDownEvent.timeStamp <
+          300 &&
+        gesture.pointers.size <= 1 &&
+        isIframeLikeElement(hitElement) &&
+        this.isIframeLikeElementCenter(
+          hitElement,
+          this.lastPointerUpEvent,
+          pointerDownState.origin.x,
+          pointerDownState.origin.y,
+        )
+      ) {
+        this.handleEmbeddableCenterClick(hitElement);
+      }
     });
   }
 
@@ -11447,7 +11217,6 @@ class App extends React.Component<AppProps, AppState> {
             this.state,
             this.scene.getElementsIncludingDeleted(),
             fileHandle,
-            this.schemaMigrationRegistry,
           );
           this.syncActionResult({
             ...scene,
@@ -11494,11 +11263,7 @@ class App extends React.Component<AppProps, AppState> {
           );
           // legacy library dataTransfer format
         } else if (excalidrawLibrary_data) {
-          libraryItems = parseLibraryJSON(
-            excalidrawLibrary_data,
-            "unpublished",
-            this.schemaMigrationRegistry,
-          );
+          libraryItems = parseLibraryJSON(excalidrawLibrary_data);
         }
         if (libraryItems?.length) {
           libraryItems = libraryItems.map((item) => ({
@@ -11568,7 +11333,6 @@ class App extends React.Component<AppProps, AppState> {
           this.state,
           elements,
           fileHandle,
-          this.schemaMigrationRegistry,
         );
       } catch (error: any) {
         const imageSceneDataError = error instanceof ImageSceneDataError;

packages/excalidraw/components/ColorPicker/ColorPicker.tsx

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

packages/excalidraw/components/FilledButton.scss

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

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

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

packages/excalidraw/components/FontPicker/FontPicker.tsx

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

packages/excalidraw/components/FontPicker/FontPickerList.tsx

@@ -30,12 +30,10 @@ import { PropertiesPopover } from "../PropertiesPopover";
 import { QuickSearch } from "../QuickSearch";
 import { ScrollableList } from "../ScrollableList";
 import DropdownMenuGroup from "../dropdownMenu/DropdownMenuGroup";
-import {
+import DropdownMenuItem, {
   DropDownMenuItemBadgeType,
   DropDownMenuItemBadge,
 } from "../dropdownMenu/DropdownMenuItem";
-import MenuItemContent from "../dropdownMenu/DropdownMenuItemContent";
-import { getDropdownMenuItemClassName } from "../dropdownMenu/common";
 import {
   FontFamilyCodeIcon,
   FontFamilyHeadingIcon,
@@ -271,74 +269,45 @@ export const FontPickerList = React.memo(
       [filteredFonts, sceneFamilies],
     );
 
-    const FontPickerListItem = ({
-      font,
-      order,
-    }: {
-      font: FontDescriptor;
-      order: number;
-    }) => {
-      const ref = useRef<HTMLButtonElement>(null);
-      const isHovered = font.value === hoveredFont?.value;
-      const isSelected = font.value === selectedFontFamily;
-
-      useEffect(() => {
-        if (!isHovered) {
-          return;
+    const renderFont = (font: FontDescriptor, index: number) => (
+      <DropdownMenuItem
+        key={font.value}
+        icon={font.icon}
+        value={font.value}
+        order={index}
+        textStyle={{
+          fontFamily: getFontFamilyString({ fontFamily: font.value }),
+        }}
+        hovered={font.value === hoveredFont?.value}
+        selected={font.value === selectedFontFamily}
+        // allow to tab between search and selected font
+        tabIndex={font.value === selectedFontFamily ? 0 : -1}
+        onClick={(e) => {
+          wrappedOnSelect(Number(e.currentTarget.value));
+        }}
+        onMouseMove={() => {
+          if (hoveredFont?.value !== font.value) {
+            onHover(font.value);
+          }
+        }}
+        badge={
+          font.badge && (
+            <DropDownMenuItemBadge type={font.badge.type}>
+              {font.badge.placeholder}
+            </DropDownMenuItemBadge>
+          )
         }
-        if (order === 0) {
-          // scroll into the first item differently, so it's visible what is above (i.e. group title)
-          ref.current?.scrollIntoView?.({ block: "end" });
-        } else {
-          ref.current?.scrollIntoView?.({ block: "nearest" });
-        }
-      }, [isHovered, order]);
-
-      return (
-        <button
-          ref={ref}
-          type="button"
-          value={font.value}
-          className={getDropdownMenuItemClassName("", isSelected, isHovered)}
-          title={font.text}
-          // allow to tab between search and selected font
-          tabIndex={isSelected ? 0 : -1}
-          onClick={(e) => {
-            wrappedOnSelect(Number(e.currentTarget.value));
-          }}
-          onMouseMove={() => {
-            if (hoveredFont?.value !== font.value) {
-              onHover(font.value);
-            }
-          }}
-        >
-          <MenuItemContent
-            icon={font.icon}
-            badge={
-              font.badge && (
-                <DropDownMenuItemBadge type={font.badge.type}>
-                  {font.badge.placeholder}
-                </DropDownMenuItemBadge>
-              )
-            }
-            textStyle={{
-              fontFamily: getFontFamilyString({ fontFamily: font.value }),
-            }}
-          >
-            {font.text}
-          </MenuItemContent>
-        </button>
-      );
-    };
+      >
+        {font.text}
+      </DropdownMenuItem>
+    );
 
     const groups = [];
 
     if (sceneFilteredFonts.length) {
       groups.push(
         <DropdownMenuGroup title={t("fontList.sceneFonts")} key="group_1">
-          {sceneFilteredFonts.map((font, index) => (
-            <FontPickerListItem key={font.value} font={font} order={index} />
-          ))}
+          {sceneFilteredFonts.map(renderFont)}
         </DropdownMenuGroup>,
       );
     }
@@ -346,13 +315,9 @@ export const FontPickerList = React.memo(
     if (availableFilteredFonts.length) {
       groups.push(
         <DropdownMenuGroup title={t("fontList.availableFonts")} key="group_2">
-          {availableFilteredFonts.map((font, index) => (
-            <FontPickerListItem
-              key={font.value}
-              font={font}
-              order={index + sceneFilteredFonts.length}
-            />
-          ))}
+          {availableFilteredFonts.map((font, index) =>
+            renderFont(font, index + sceneFilteredFonts.length),
+          )}
         </DropdownMenuGroup>,
       );
     }

packages/excalidraw/components/FontPicker/FontPickerTrigger.tsx

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

packages/excalidraw/components/IconPicker.tsx

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

packages/excalidraw/components/LibraryMenu.scss

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

packages/excalidraw/components/MobileToolBar.tsx

@@ -375,7 +375,7 @@ export const MobileToolBar = ({
       )}
 
       {/* Other Shapes */}
-      <DropdownMenu open={isOtherShapesMenuOpen}>
+      <DropdownMenu open={isOtherShapesMenuOpen} placement="top">
         <DropdownMenu.Trigger
           className={clsx(
             "App-toolbar__extra-tools-trigger App-toolbar__extra-tools-trigger--mobile",
@@ -403,7 +403,6 @@ export const MobileToolBar = ({
           onClickOutside={() => setIsOtherShapesMenuOpen(false)}
           onSelect={() => setIsOtherShapesMenuOpen(false)}
           className="App-toolbar__extra-tools-dropdown"
-          align="start"
         >
           {!showTextToolOutside && (
             <DropdownMenu.Item

packages/excalidraw/components/PropertiesPopover.tsx

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

packages/excalidraw/components/Sidebar/SidebarTab.tsx

@@ -1,4 +1,4 @@
-import { Tabs as RadixTabs } from "radix-ui";
+import * as RadixTabs from "@radix-ui/react-tabs";
 
 import type { SidebarTabName } from "../../types";
 

packages/excalidraw/components/Sidebar/SidebarTabTrigger.tsx

@@ -1,4 +1,4 @@
-import { Tabs as RadixTabs } from "radix-ui";
+import * as RadixTabs from "@radix-ui/react-tabs";
 
 import type { SidebarTabName } from "../../types";
 

packages/excalidraw/components/Sidebar/SidebarTabTriggers.tsx

@@ -1,4 +1,4 @@
-import { Tabs as RadixTabs } from "radix-ui";
+import * as RadixTabs from "@radix-ui/react-tabs";
 
 export const SidebarTabTriggers = ({
   children,

packages/excalidraw/components/Sidebar/SidebarTabs.tsx

@@ -1,4 +1,4 @@
-import { Tabs as RadixTabs } from "radix-ui";
+import * as RadixTabs from "@radix-ui/react-tabs";
 
 import { useUIAppState } from "../../context/ui-appState";
 import { useExcalidrawSetAppState } from "../App";

packages/excalidraw/components/Stats/stats.test.tsx

@@ -135,7 +135,7 @@ describe("binding with linear elements", () => {
     ) as HTMLInputElement;
     expect(linear.startBinding).not.toBe(null);
     expect(inputX).not.toBeNull();
-    UI.updateInput(inputX, String("184"));
+    UI.updateInput(inputX, String("186"));
     expect(linear.startBinding).not.toBe(null);
   });
 

packages/excalidraw/components/TTDDialog/Chat/Chat.scss

@@ -1,4 +1,4 @@
-@use "../../../css/variables.module.scss" as *;
+@import "../../../css/variables.module.scss";
 
 $verticalBreakpoint: 861px;
 
@@ -48,14 +48,14 @@ $verticalBreakpoint: 861px;
       }
     }
 
-    &__welcome-screen {
+    &__empty-state {
       display: flex;
       align-items: center;
       justify-content: center;
       height: 100%;
       min-height: 200px;
 
-      &__welcome-message {
+      &-content {
         text-align: center;
 
         h3 {

packages/excalidraw/components/TTDDialog/Chat/ChatHistoryMenu.tsx

@@ -52,7 +52,11 @@ export const ChatHistoryMenu = ({
             >
               {historyIcon}
             </DropdownMenu.Trigger>
-            <DropdownMenu.Content onClickOutside={onClose} onSelect={onClose}>
+            <DropdownMenu.Content
+              onClickOutside={onClose}
+              onSelect={onClose}
+              placement="bottom"
+            >
               <>
                 {savedChats.map((chat) => (
                   <DropdownMenu.ItemCustom

packages/excalidraw/components/TTDDialog/Chat/ChatInterface.tsx

@@ -6,8 +6,6 @@ import { InlineIcon } from "../../InlineIcon";
 
 import { t } from "../../../i18n";
 
-import { TTDWelcomeMessage } from "../TTDWelcomeMessage";
-
 import { ChatMessage } from "./ChatMessage";
 
 import type { TChat, TTTDDialog } from "../types";
@@ -22,13 +20,13 @@ export const ChatInterface = ({
   onGenerate,
   isGenerating,
   rateLimits,
+  placeholder,
   onAbort,
   onMermaidTabClick,
   onAiRepairClick,
   onDeleteMessage,
   onInsertMessage,
   onRetry,
-  renderWelcomeScreen,
   renderWarning,
 }: {
   chatId: string;
@@ -43,13 +41,17 @@ export const ChatInterface = ({
   } | null;
   onViewAsMermaid?: () => void;
   generatedResponse?: string | null;
+  placeholder: {
+    title: string;
+    description: string;
+    hint: string;
+  };
   onAbort?: () => void;
   onMermaidTabClick?: (message: TChat.ChatMessage) => void;
   onAiRepairClick?: (message: TChat.ChatMessage) => void;
   onDeleteMessage?: (messageId: string) => void;
   onInsertMessage?: (message: TChat.ChatMessage) => void;
   onRetry?: (message: TChat.ChatMessage) => void;
-  renderWelcomeScreen?: TTTDDialog.renderWelcomeScreen;
   renderWarning?: TTTDDialog.renderWarning;
 }) => {
   const messagesEndRef = useRef<HTMLDivElement>(null);
@@ -111,12 +113,12 @@ export const ChatInterface = ({
     <div className="chat-interface">
       <div className="chat-interface__messages">
         {messages.length === 0 ? (
-          <div className="chat-interface__welcome-screen">
-            {renderWelcomeScreen ? (
-              renderWelcomeScreen({ rateLimits: rateLimits ?? null })
-            ) : (
-              <TTDWelcomeMessage />
-            )}
+          <div className="chat-interface__empty-state">
+            <div className="chat-interface__empty-state-content">
+              <h3>{placeholder.title}</h3>
+              <p>{placeholder.description}</p>
+              <p>{placeholder.hint}</p>
+            </div>
           </div>
         ) : (
           messages.map((message, index) => (

packages/excalidraw/components/TTDDialog/Chat/TTDChatPanel.tsx

@@ -40,7 +40,6 @@ export const TTDChatPanel = ({
   onInsertMessage,
   onRetry,
   onViewAsMermaid,
-  renderWelcomeScreen,
   renderWarning,
 }: {
   chatId: string;
@@ -69,7 +68,6 @@ export const TTDChatPanel = ({
 
   onViewAsMermaid: () => void;
 
-  renderWelcomeScreen?: TTTDDialog.renderWelcomeScreen;
   renderWarning?: TTTDDialog.renderWarning;
 }) => {
   const [rateLimits] = useAtom(rateLimitsAtom);
@@ -153,7 +151,11 @@ export const TTDChatPanel = ({
         onInsertMessage={onInsertMessage}
         onRetry={onRetry}
         rateLimits={rateLimits}
-        renderWelcomeScreen={renderWelcomeScreen}
+        placeholder={{
+          title: t("chat.placeholder.title"),
+          description: t("chat.placeholder.description"),
+          hint: t("chat.placeholder.hint"),
+        }}
         renderWarning={renderWarning}
       />
     </TTDDialogPanel>

packages/excalidraw/components/TTDDialog/TTDDialog.tsx

@@ -15,8 +15,6 @@ import { TTDDialogTab } from "./TTDDialogTab";
 
 import "./TTDDialog.scss";
 
-import { TTDWelcomeMessage } from "./TTDWelcomeMessage";
-
 import type {
   MermaidToExcalidrawLibProps,
   TTDPersistenceAdapter,
@@ -27,7 +25,6 @@ export const TTDDialog = (
   props:
     | {
         onTextSubmit: TTTDDialog.onTextSubmit;
-        renderWelcomeScreen?: TTTDDialog.renderWelcomeScreen;
         renderWarning?: TTTDDialog.renderWarning;
         persistenceAdapter: TTDPersistenceAdapter;
       }
@@ -42,8 +39,6 @@ export const TTDDialog = (
   return <TTDDialogBase {...props} tab={appState.openDialog.tab} />;
 };
 
-TTDDialog.WelcomeMessage = TTDWelcomeMessage;
-
 /**
  * Text to diagram (TTD) dialog
  */
@@ -59,7 +54,6 @@ const TTDDialogBase = withInternalFallback(
         onTextSubmit(
           props: TTTDDialog.OnTextSubmitProps,
         ): Promise<TTTDDialog.OnTextSubmitRetValue>;
-        renderWelcomeScreen?: TTTDDialog.renderWelcomeScreen;
         renderWarning?: TTTDDialog.renderWarning;
         persistenceAdapter: TTDPersistenceAdapter;
       }
@@ -116,7 +110,6 @@ const TTDDialogBase = withInternalFallback(
               <TextToDiagram
                 mermaidToExcalidrawLib={mermaidToExcalidrawLib}
                 onTextSubmit={rest.onTextSubmit}
-                renderWelcomeScreen={rest.renderWelcomeScreen}
                 renderWarning={rest.renderWarning}
                 persistenceAdapter={rest.persistenceAdapter}
               />

packages/excalidraw/components/TTDDialog/TTDDialogTab.tsx

@@ -1,4 +1,4 @@
-import { Tabs as RadixTabs } from "radix-ui";
+import * as RadixTabs from "@radix-ui/react-tabs";
 
 export const TTDDialogTab = ({
   tab,

packages/excalidraw/components/TTDDialog/TTDDialogTabTrigger.tsx

@@ -1,4 +1,4 @@
-import { Tabs as RadixTabs } from "radix-ui";
+import * as RadixTabs from "@radix-ui/react-tabs";
 
 export const TTDDialogTabTrigger = ({
   children,

packages/excalidraw/components/TTDDialog/TTDDialogTabTriggers.tsx

@@ -1,4 +1,4 @@
-import { Tabs as RadixTabs } from "radix-ui";
+import * as RadixTabs from "@radix-ui/react-tabs";
 
 export const TTDDialogTabTriggers = ({
   children,

packages/excalidraw/components/TTDDialog/TTDDialogTabs.tsx

@@ -1,4 +1,4 @@
-import { Tabs as RadixTabs } from "radix-ui";
+import * as RadixTabs from "@radix-ui/react-tabs";
 import { useRef } from "react";
 
 import { isMemberOf } from "@excalidraw/common";

packages/excalidraw/components/TTDDialog/TTDWelcomeMessage.tsx

@@ -1,11 +0,0 @@
-import { t } from "../../i18n";
-
-export const TTDWelcomeMessage = () => {
-  return (
-    <div className="chat-interface__welcome-screen__welcome-message">
-      <h3>{t("chat.placeholder.title")}</h3>
-      <p>{t("chat.placeholder.description")}</p>
-      <p>{t("chat.placeholder.hint")}</p>
-    </div>
-  );
-};

packages/excalidraw/components/TTDDialog/TextToDiagram.tsx

@@ -35,7 +35,6 @@ import type {
 const TextToDiagramContent = ({
   mermaidToExcalidrawLib,
   onTextSubmit,
-  renderWelcomeScreen,
   renderWarning,
   persistenceAdapter,
 }: {
@@ -43,7 +42,6 @@ const TextToDiagramContent = ({
   onTextSubmit: (
     props: TTTDDialog.OnTextSubmitProps,
   ) => Promise<TTTDDialog.OnTextSubmitRetValue>;
-  renderWelcomeScreen?: TTTDDialog.renderWelcomeScreen;
   renderWarning?: TTTDDialog.renderWarning;
   persistenceAdapter: TTDPersistenceAdapter;
 }) => {
@@ -222,7 +220,6 @@ const TextToDiagramContent = ({
         onRetry={handleRetry}
         onViewAsMermaid={onViewAsMermaid}
         renderWarning={renderWarning}
-        renderWelcomeScreen={renderWelcomeScreen}
       />
       {showPreview && (
         <TTDPreviewPanel
@@ -240,7 +237,6 @@ const TextToDiagramContent = ({
 export const TextToDiagram = ({
   mermaidToExcalidrawLib,
   onTextSubmit,
-  renderWelcomeScreen,
   renderWarning,
   persistenceAdapter,
 }: {
@@ -248,7 +244,6 @@ export const TextToDiagram = ({
   onTextSubmit(
     props: TTTDDialog.OnTextSubmitProps,
   ): Promise<TTTDDialog.OnTextSubmitRetValue>;
-  renderWelcomeScreen?: TTTDDialog.renderWelcomeScreen;
   renderWarning?: TTTDDialog.renderWarning;
   persistenceAdapter: TTDPersistenceAdapter;
 }) => {
@@ -256,7 +251,6 @@ export const TextToDiagram = ({
     <TextToDiagramContent
       mermaidToExcalidrawLib={mermaidToExcalidrawLib}
       onTextSubmit={onTextSubmit}
-      renderWelcomeScreen={renderWelcomeScreen}
       renderWarning={renderWarning}
       persistenceAdapter={persistenceAdapter}
     />

packages/excalidraw/components/TTDDialog/types.ts

@@ -116,9 +116,4 @@ export namespace TTTDDialog {
   export type renderWarning = (
     chatMessage: TChat.ChatMessage,
   ) => React.ReactNode | undefined;
-
-  export type renderWelcomeScreen = (props: {
-    /** null if not rate limit data currently available */
-    rateLimits: RateLimits | null;
-  }) => React.ReactNode | undefined;
 }

packages/excalidraw/components/ToolPopover.tsx

@@ -3,7 +3,7 @@ import clsx from "clsx";
 
 import { capitalizeString } from "@excalidraw/common";
 
-import { Popover } from "radix-ui";
+import * as Popover from "@radix-ui/react-popover";
 
 import { trackEvent } from "../analytics";
 

packages/excalidraw/components/UserList.tsx

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

packages/excalidraw/components/dropdownMenu/DropdownMenu.scss

@@ -2,35 +2,24 @@
 
 .excalidraw {
   .dropdown-menu {
+    position: absolute;
+    top: 2.5rem;
+    margin-top: 0.5rem;
     max-width: 16rem;
-    z-index: 1;
 
     &--placement-top {
+      top: auto;
+      bottom: 100%;
+      margin-top: 0;
       margin-bottom: 0.5rem;
     }
 
-    &__submenu-trigger {
-      &[aria-expanded="true"] {
-        .dropdown-menu-item {
-          background-color: var(--button-hover-bg);
-        }
-      }
-    }
-
-    &__submenu-trigger-icon {
-      margin-left: auto;
-      opacity: 0.5;
-      svg g {
-        stroke-width: 2;
-      }
-    }
-
     &--mobile {
       width: 100%;
       row-gap: 0.75rem;
 
       // When main menu is in the top toolbar, position relative to trigger
-      &.main-menu {
+      &.main-menu-dropdown {
         min-width: 232px;
         margin-top: 0;
         margin-bottom: 0;
@@ -43,6 +32,10 @@
       .dropdown-menu-container {
         padding: 8px 8px;
         box-sizing: border-box;
+        max-height: calc(
+          100svh - var(--editor-container-padding) * 2 - 2.25rem
+        );
+        box-shadow: var(--shadow-island);
         border-radius: var(--border-radius-lg);
         position: relative;
         transition: box-shadow 0.5s ease-in-out;
@@ -58,25 +51,14 @@
 
     .dropdown-menu-container {
       background-color: var(--island-bg-color);
+
       overflow-y: auto;
-      display: flex;
-      flex-direction: column;
-      gap: 1px;
-
-      box-shadow: var(--box-shadow, var(--shadow-island));
-
-      max-height: calc(100svh - var(--editor-container-padding) * 2 - 2.25rem);
-
-      @at-root .excalidraw.theme--dark#{&} {
-        box-shadow: var(--box-shadow, var(--shadow-island)),
-          0 0 0 1px rgba(0, 0, 0, 0.15);
-      }
+      --gap: 2;
     }
 
     .dropdown-menu-item-base {
       display: flex;
       column-gap: 0.625rem;
-      padding: 0 0.5rem;
       font-size: 0.875rem;
       color: var(--color-on-surface);
       width: 100%;
@@ -133,9 +115,11 @@
 
     .dropdown-menu-item {
       height: 2rem;
+      margin: 1px;
       padding: 0 0.5rem;
+      width: calc(100% - 2px);
       background-color: transparent;
-      border: none;
+      border: 1px solid transparent;
       align-items: center;
       cursor: pointer;
       border-radius: var(--border-radius-md);
@@ -178,7 +162,7 @@
 
       &:active {
         background-color: var(--button-hover-bg);
-        box-shadow: 0 0 0 1px var(--color-brand-active);
+        border-color: var(--color-brand-active);
       }
 
       svg {
@@ -239,7 +223,7 @@
     }
 
     &:active {
-      box-shadow: 0 0 0 1px var(--color-primary);
+      border-color: var(--color-primary);
     }
 
     &[disabled] {
@@ -251,7 +235,7 @@
       }
 
       &:active {
-        box-shadow: none;
+        border-color: transparent;
       }
 
       @at-root .excalidraw.theme--dark#{&} {

packages/excalidraw/components/dropdownMenu/DropdownMenu.tsx

@@ -1,18 +1,12 @@
 import React from "react";
 
-import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
-
-import { CLASSES } from "@excalidraw/common";
-
 import DropdownMenuContent from "./DropdownMenuContent";
 import DropdownMenuGroup from "./DropdownMenuGroup";
 import DropdownMenuItem from "./DropdownMenuItem";
 import DropdownMenuItemCustom from "./DropdownMenuItemCustom";
 import DropdownMenuItemLink from "./DropdownMenuItemLink";
 import MenuSeparator from "./DropdownMenuSeparator";
-import DropdownMenuSub from "./DropdownMenuSub";
 import DropdownMenuTrigger from "./DropdownMenuTrigger";
-import DropdownMenuItemCheckbox from "./DropdownMenuItemCheckbox";
 import {
   getMenuContentComponent,
   getMenuTriggerComponent,
@@ -23,47 +17,44 @@ import "./DropdownMenu.scss";
 const DropdownMenu = ({
   children,
   open,
+  placement,
 }: {
   children?: React.ReactNode;
   open: boolean;
+  placement?: "top" | "bottom";
 }) => {
   const MenuTriggerComp = getMenuTriggerComponent(children);
   const MenuContentComp = getMenuContentComponent(children);
-  const MenuContentWithState =
+
+  // clone the MenuContentComp to pass the placement prop
+  const MenuContentCompWithPlacement =
     MenuContentComp && React.isValidElement(MenuContentComp)
-      ? React.cloneElement(
-          MenuContentComp as React.ReactElement<
-            React.ComponentProps<typeof DropdownMenuContent>
-          >,
-          { open },
-        )
+      ? React.cloneElement(MenuContentComp as React.ReactElement<any>, {
+          placement,
+        })
       : MenuContentComp;
 
   return (
-    <DropdownMenuPrimitive.Root open={open} modal={false}>
-      <div
-        className={CLASSES.DROPDOWN_MENU_EVENT_WRAPPER}
-        style={{
-          // remove this div from box layout
-          display: "contents",
-        }}
-      >
-        {MenuTriggerComp}
-        {MenuContentWithState}
-      </div>
-    </DropdownMenuPrimitive.Root>
+    <div
+      className="dropdown-menu-container"
+      style={{
+        // remove this div from box layout
+        display: "contents",
+      }}
+    >
+      {MenuTriggerComp}
+      {open && MenuContentCompWithPlacement}
+    </div>
   );
 };
 
 DropdownMenu.Trigger = DropdownMenuTrigger;
 DropdownMenu.Content = DropdownMenuContent;
 DropdownMenu.Item = DropdownMenuItem;
-DropdownMenu.ItemCheckbox = DropdownMenuItemCheckbox;
 DropdownMenu.ItemLink = DropdownMenuItemLink;
 DropdownMenu.ItemCustom = DropdownMenuItemCustom;
 DropdownMenu.Group = DropdownMenuGroup;
 DropdownMenu.Separator = MenuSeparator;
-DropdownMenu.Sub = DropdownMenuSub;
 
 export default DropdownMenu;
 

packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx

@@ -1,9 +1,7 @@
 import clsx from "clsx";
-import React, { useCallback, useEffect, useRef } from "react";
+import React, { useEffect, useRef } from "react";
 
-import { CLASSES, EVENT, KEYS } from "@excalidraw/common";
-
-import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
+import { EVENT, KEYS } from "@excalidraw/common";
 
 import { useOutsideClick } from "../../hooks/useOutsideClick";
 import { useStable } from "../../hooks/useStable";
@@ -18,9 +16,8 @@ const MenuContent = ({
   onClickOutside,
   className = "",
   onSelect,
-  open = true,
-  align = "end",
   style,
+  placement = "bottom",
 }: {
   children?: React.ReactNode;
   onClickOutside?: () => void;
@@ -29,36 +26,26 @@ const MenuContent = ({
    * Called when any menu item is selected (clicked on).
    */
   onSelect?: (event: Event) => void;
-  open?: boolean;
   style?: React.CSSProperties;
-  align?: "start" | "center" | "end";
+  placement?: "top" | "bottom";
 }) => {
   const editorInterface = useEditorInterface();
   const menuRef = useRef<HTMLDivElement>(null);
 
   const callbacksRef = useStable({ onClickOutside });
 
-  useOutsideClick(
-    menuRef,
-    useCallback(
-      (event) => {
-        // prevents closing if clicking on the trigger button
-        if (
-          !menuRef.current
-            ?.closest(`.${CLASSES.DROPDOWN_MENU_EVENT_WRAPPER}`)
-            ?.contains(event.target)
-        ) {
-          callbacksRef.onClickOutside?.();
-        }
-      },
-      [callbacksRef],
-    ),
-  );
+  useOutsideClick(menuRef, (event) => {
+    // prevents closing if clicking on the trigger button
+    if (
+      !menuRef.current
+        ?.closest(".dropdown-menu-container")
+        ?.contains(event.target)
+    ) {
+      callbacksRef.onClickOutside?.();
+    }
+  });
 
   useEffect(() => {
-    if (!open) {
-      return;
-    }
     const onKeyDown = (event: KeyboardEvent) => {
       if (event.key === KEYS.ESCAPE) {
         event.stopImmediatePropagation();
@@ -76,33 +63,35 @@ const MenuContent = ({
     return () => {
       document.removeEventListener(EVENT.KEYDOWN, onKeyDown, option);
     };
-  }, [callbacksRef, open]);
+  }, [callbacksRef]);
 
   const classNames = clsx(`dropdown-menu ${className}`, {
     "dropdown-menu--mobile": editorInterface.formFactor === "phone",
+    "dropdown-menu--placement-top": placement === "top",
   }).trim();
 
   return (
     <DropdownMenuContentPropsContext.Provider value={{ onSelect }}>
-      <DropdownMenuPrimitive.Content
+      <div
         ref={menuRef}
         className={classNames}
         style={style}
         data-testid="dropdown-menu"
-        align={align}
-        sideOffset={8}
-        onCloseAutoFocus={(event: Event) => event.preventDefault()}
       >
         {/* the zIndex ensures this menu has higher stacking order,
     see https://github.com/excalidraw/excalidraw/pull/1445 */}
         {editorInterface.formFactor === "phone" ? (
           <Stack.Col className="dropdown-menu-container">{children}</Stack.Col>
         ) : (
-          <Island className="dropdown-menu-container" padding={2}>
+          <Island
+            className="dropdown-menu-container"
+            padding={2}
+            style={{ zIndex: 2 }}
+          >
             {children}
           </Island>
         )}
-      </DropdownMenuPrimitive.Content>
+      </div>
     </DropdownMenuContentPropsContext.Provider>
   );
 };

packages/excalidraw/components/dropdownMenu/DropdownMenuItem.tsx

@@ -1,62 +1,78 @@
-import React from "react";
+import React, { useEffect, useRef } from "react";
 
 import { THEME } from "@excalidraw/common";
 
-import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
-
 import type { ValueOf } from "@excalidraw/common/utility-types";
 
 import { useExcalidrawAppState } from "../App";
 
+import MenuItemContent from "./DropdownMenuItemContent";
 import {
   getDropdownMenuItemClassName,
-  useHandleDropdownMenuItemSelect,
+  useHandleDropdownMenuItemClick,
 } from "./common";
-import MenuItemContent from "./DropdownMenuItemContent";
 
 import type { JSX } from "react";
 
-export type DropdownMenuItemProps = {
-  icon?: JSX.Element;
-  badge?: React.ReactNode;
-  value?: string | number | undefined;
-  onSelect?: (event: Event) => void;
-  children: React.ReactNode;
-  shortcut?: string;
-  selected?: boolean;
-  className?: string;
-} & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, "onSelect">;
-
 const DropdownMenuItem = ({
   icon,
-  badge,
   value,
+  order,
   children,
   shortcut,
   className,
+  hovered,
   selected,
+  textStyle,
   onSelect,
+  onClick,
+  badge,
   ...rest
-}: DropdownMenuItemProps) => {
-  const handleSelect = useHandleDropdownMenuItemSelect(onSelect);
+}: {
+  icon?: JSX.Element;
+  value?: string | number | undefined;
+  order?: number;
+  onSelect?: (event: Event) => void;
+  children: React.ReactNode;
+  shortcut?: string;
+  hovered?: boolean;
+  selected?: boolean;
+  textStyle?: React.CSSProperties;
+  className?: string;
+  badge?: React.ReactNode;
+} & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, "onSelect">) => {
+  const handleClick = useHandleDropdownMenuItemClick(onClick, onSelect);
+  const ref = useRef<HTMLButtonElement>(null);
+
+  useEffect(() => {
+    if (hovered) {
+      if (order === 0) {
+        // scroll into the first item differently, so it's visible what is above (i.e. group title)
+        ref.current?.scrollIntoView({ block: "end" });
+      } else {
+        ref.current?.scrollIntoView({ block: "nearest" });
+      }
+    }
+  }, [hovered, order]);
 
   return (
-    <DropdownMenuPrimitive.Item
-      className="radix-menu-item"
-      onSelect={handleSelect}
-      asChild
+    <button
+      {...rest}
+      ref={ref}
+      value={value}
+      onClick={handleClick}
+      className={getDropdownMenuItemClassName(className, selected, hovered)}
+      title={rest.title ?? rest["aria-label"]}
     >
-      <button
-        {...rest}
-        value={value}
-        className={getDropdownMenuItemClassName(className, selected)}
-        title={rest.title ?? rest["aria-label"]}
+      <MenuItemContent
+        textStyle={textStyle}
+        icon={icon}
+        shortcut={shortcut}
+        badge={badge}
       >
-        <MenuItemContent icon={icon} shortcut={shortcut} badge={badge}>
-          {children}
-        </MenuItemContent>
-      </button>
-    </DropdownMenuPrimitive.Item>
+        {children}
+      </MenuItemContent>
+    </button>
   );
 };
 DropdownMenuItem.displayName = "DropdownMenuItem";

packages/excalidraw/components/dropdownMenu/DropdownMenuItemCheckbox.tsx

@@ -1,15 +0,0 @@
-import { checkIcon, emptyIcon } from "../icons";
-
-import DropdownMenuItem from "./DropdownMenuItem";
-
-import type { DropdownMenuItemProps } from "./DropdownMenuItem";
-
-const DropdownMenuItemCheckbox = (
-  props: Omit<DropdownMenuItemProps, "icon"> & { checked: boolean },
-) => {
-  return (
-    <DropdownMenuItem {...props} icon={props.checked ? checkIcon : emptyIcon} />
-  );
-};
-
-export default DropdownMenuItemCheckbox;

packages/excalidraw/components/dropdownMenu/DropdownMenuItemContentRadio.tsx

@@ -27,7 +27,9 @@ const DropdownMenuItemContentRadio = <T,>({
   return (
     <>
       <div className="dropdown-menu-item-base dropdown-menu-item-bare">
-        <label className="dropdown-menu-item__text">{children}</label>
+        <label className="dropdown-menu-item__text" htmlFor={name}>
+          {children}
+        </label>
         <RadioGroup
           name={name}
           value={value}

packages/excalidraw/components/dropdownMenu/DropdownMenuItemLink.tsx

@@ -1,11 +1,9 @@
 import React from "react";
 
-import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
-
 import MenuItemContent from "./DropdownMenuItemContent";
 import {
   getDropdownMenuItemClassName,
-  useHandleDropdownMenuItemSelect,
+  useHandleDropdownMenuItemClick,
 } from "./common";
 
 import type { JSX } from "react";
@@ -30,28 +28,23 @@ const DropdownMenuItemLink = ({
   onSelect?: (event: Event) => void;
   rel?: string;
 } & React.AnchorHTMLAttributes<HTMLAnchorElement>) => {
-  const handleSelect = useHandleDropdownMenuItemSelect(onSelect);
+  const handleClick = useHandleDropdownMenuItemClick(rest.onClick, onSelect);
 
   return (
     // eslint-disable-next-line react/jsx-no-target-blank
-    <DropdownMenuPrimitive.Item
-      className="radix-menu-item"
-      onSelect={handleSelect}
-      asChild
+    <a
+      {...rest}
+      href={href}
+      target="_blank"
+      rel={rel || "noopener"}
+      className={getDropdownMenuItemClassName(className, selected)}
+      title={rest.title ?? rest["aria-label"]}
+      onClick={handleClick}
     >
-      <a
-        {...rest}
-        href={href}
-        target="_blank"
-        rel={`noopener ${rel}`}
-        className={getDropdownMenuItemClassName(className, selected)}
-        title={rest.title ?? rest["aria-label"]}
-      >
-        <MenuItemContent icon={icon} shortcut={shortcut}>
-          {children}
-        </MenuItemContent>
-      </a>
-    </DropdownMenuPrimitive.Item>
+      <MenuItemContent icon={icon} shortcut={shortcut}>
+        {children}
+      </MenuItemContent>
+    </a>
   );
 };
 

packages/excalidraw/components/dropdownMenu/DropdownMenuSeparator.tsx

@@ -5,7 +5,7 @@ const MenuSeparator = () => (
     style={{
       height: "1px",
       backgroundColor: "var(--default-border-color)",
-      margin: "6px 0",
+      margin: ".5rem 0",
       flex: "0 0 auto",
     }}
   />

packages/excalidraw/components/dropdownMenu/DropdownMenuSub.tsx

@@ -1,26 +0,0 @@
-import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
-
-import DropdownMenuSubContent from "./DropdownMenuSubContent";
-import DropdownMenuSubTrigger from "./DropdownMenuSubTrigger";
-import {
-  getSubMenuContentComponent,
-  getSubMenuTriggerComponent,
-} from "./dropdownMenuUtils";
-
-const DropdownMenuSub = ({ children }: { children?: React.ReactNode }) => {
-  const MenuTriggerComp = getSubMenuTriggerComponent(children);
-  const MenuContentComp = getSubMenuContentComponent(children);
-  return (
-    <DropdownMenuPrimitive.Sub>
-      {MenuTriggerComp}
-      {MenuContentComp}
-    </DropdownMenuPrimitive.Sub>
-  );
-};
-
-DropdownMenuSub.Trigger = DropdownMenuSubTrigger;
-DropdownMenuSub.Content = DropdownMenuSubContent;
-
-DropdownMenuSub.displayName = "DropdownMenuSub";
-
-export default DropdownMenuSub;

packages/excalidraw/components/dropdownMenu/DropdownMenuSubContent.tsx

@@ -1,71 +0,0 @@
-import clsx from "clsx";
-
-import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
-
-import { useCallback, useState } from "react";
-
-import { useEditorInterface } from "../App";
-import { Island } from "../Island";
-import Stack from "../Stack";
-
-const BASE_ALIGN_OFFSET = -4;
-const BASE_SIDE_OFFSET = 4;
-
-const DropdownMenuSubContent = ({
-  children,
-  className,
-}: {
-  children?: React.ReactNode;
-  className?: string;
-}) => {
-  const editorInterface = useEditorInterface();
-
-  const classNames = clsx(`dropdown-menu dropdown-submenu ${className}`, {
-    "dropdown-menu--mobile": editorInterface.formFactor === "phone",
-  }).trim();
-
-  const callbacksRef = useCallback((node: HTMLDivElement | null) => {
-    if (node) {
-      const parentContainer = node.closest(".dropdown-menu-container");
-      const parentRect = parentContainer?.getBoundingClientRect();
-      if (parentRect) {
-        const menuWidth = node.getBoundingClientRect().width;
-
-        const viewportWidth = window.innerWidth;
-        const spaceRemaining = viewportWidth - parentRect.right;
-        if (spaceRemaining < menuWidth + 20) {
-          setSideOffset(spaceRemaining - menuWidth + BASE_ALIGN_OFFSET);
-          setAlignOffset(BASE_ALIGN_OFFSET + 8);
-        }
-      }
-    }
-  }, []);
-
-  const [sideOffset, setSideOffset] = useState(BASE_SIDE_OFFSET);
-  const [alignOffset, setAlignOffset] = useState(BASE_ALIGN_OFFSET);
-
-  return (
-    <DropdownMenuPrimitive.SubContent
-      className={classNames}
-      sideOffset={sideOffset}
-      alignOffset={alignOffset}
-      collisionPadding={8}
-      ref={callbacksRef}
-    >
-      {editorInterface.formFactor === "phone" ? (
-        <Stack.Col className="dropdown-menu-container">{children}</Stack.Col>
-      ) : (
-        <Island
-          className="dropdown-menu-container"
-          padding={2}
-          style={{ zIndex: 1 }}
-        >
-          {children}
-        </Island>
-      )}
-    </DropdownMenuPrimitive.SubContent>
-  );
-};
-
-export default DropdownMenuSubContent;
-DropdownMenuSubContent.displayName = "DropdownMenuSubContent";

packages/excalidraw/components/dropdownMenu/DropdownMenuSubTrigger.tsx

@@ -1,38 +0,0 @@
-import React from "react";
-
-import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
-
-import { chevronRight } from "../icons";
-
-import { getDropdownMenuItemClassName } from "./common";
-import MenuItemContent from "./DropdownMenuItemContent";
-
-import type { JSX } from "react";
-
-const DropdownMenuSubTrigger = ({
-  children,
-  icon,
-  shortcut,
-  className,
-}: {
-  children: React.ReactNode;
-  icon?: JSX.Element;
-  shortcut?: string;
-  className?: string;
-}) => {
-  return (
-    <DropdownMenuPrimitive.SubTrigger
-      className={`${getDropdownMenuItemClassName(
-        className,
-      )} dropdown-menu__submenu-trigger`}
-    >
-      <MenuItemContent icon={icon} shortcut={shortcut}>
-        {children}
-      </MenuItemContent>
-      <div className="dropdown-menu__submenu-trigger-icon">{chevronRight}</div>
-    </DropdownMenuPrimitive.SubTrigger>
-  );
-};
-
-export default DropdownMenuSubTrigger;
-DropdownMenuSubTrigger.displayName = "DropdownMenuSubTrigger";

packages/excalidraw/components/dropdownMenu/DropdownMenuTrigger.tsx

@@ -1,7 +1,5 @@
 import clsx from "clsx";
 
-import { DropdownMenu as DropdownMenuPrimitive } from "radix-ui";
-
 import { useEditorInterface } from "../App";
 
 const MenuTrigger = ({
@@ -25,7 +23,7 @@ const MenuTrigger = ({
     },
   ).trim();
   return (
-    <DropdownMenuPrimitive.Trigger
+    <button
       className={classNames}
       onClick={onToggle}
       type="button"
@@ -34,7 +32,7 @@ const MenuTrigger = ({
       {...rest}
     >
       {children}
-    </DropdownMenuPrimitive.Trigger>
+    </button>
   );
 };
 

packages/excalidraw/components/dropdownMenu/common.ts

@@ -1,6 +1,6 @@
 import React, { useContext } from "react";
 
-import { composeEventHandlers } from "@excalidraw/common";
+import { EVENT, composeEventHandlers } from "@excalidraw/common";
 
 export const DropdownMenuContentPropsContext = React.createContext<{
   onSelect?: (event: Event) => void;
@@ -11,17 +11,28 @@ export const getDropdownMenuItemClassName = (
   selected = false,
   hovered = false,
 ) => {
-  return `dropdown-menu-item dropdown-menu-item-base ${className} ${
-    selected ? "dropdown-menu-item--selected" : ""
-  } ${hovered ? "dropdown-menu-item--hovered" : ""}`.trim();
+  return `dropdown-menu-item dropdown-menu-item-base ${className}
+  ${selected ? "dropdown-menu-item--selected" : ""} ${
+    hovered ? "dropdown-menu-item--hovered" : ""
+  }`.trim();
 };
 
-export const useHandleDropdownMenuItemSelect = (
+export const useHandleDropdownMenuItemClick = (
+  origOnClick:
+    | React.MouseEventHandler<HTMLAnchorElement | HTMLButtonElement>
+    | undefined,
   onSelect: ((event: Event) => void) | undefined,
 ) => {
   const DropdownMenuContentProps = useContext(DropdownMenuContentPropsContext);
 
-  return composeEventHandlers(onSelect, (event) => {
-    DropdownMenuContentProps.onSelect?.(event);
+  return composeEventHandlers(origOnClick, (event) => {
+    const itemSelectEvent = new CustomEvent(EVENT.MENU_ITEM_SELECT, {
+      bubbles: true,
+      cancelable: true,
+    });
+    onSelect?.(itemSelectEvent);
+    if (!itemSelectEvent.defaultPrevented) {
+      DropdownMenuContentProps.onSelect?.(itemSelectEvent);
+    }
   });
 };

packages/excalidraw/components/dropdownMenu/dropdownMenuUtils.ts

@@ -1,6 +1,6 @@
 import React from "react";
 
-const getMenuComponent = (component: string) => (children: React.ReactNode) => {
+export const getMenuTriggerComponent = (children: React.ReactNode) => {
   const comp = React.Children.toArray(children).find(
     (child) =>
       React.isValidElement(child) &&
@@ -8,7 +8,7 @@ const getMenuComponent = (component: string) => (children: React.ReactNode) => {
       //@ts-ignore
       child?.type.displayName &&
       //@ts-ignore
-      child.type.displayName === component,
+      child.type.displayName === "DropdownMenuTrigger",
   );
   if (!comp) {
     return null;
@@ -17,11 +17,19 @@ const getMenuComponent = (component: string) => (children: React.ReactNode) => {
   return comp;
 };
 
-export const getMenuTriggerComponent = getMenuComponent("DropdownMenuTrigger");
-export const getMenuContentComponent = getMenuComponent("DropdownMenuContent");
-export const getSubMenuTriggerComponent = getMenuComponent(
-  "DropdownMenuSubTrigger",
-);
-export const getSubMenuContentComponent = getMenuComponent(
-  "DropdownMenuSubContent",
-);
+export const getMenuContentComponent = (children: React.ReactNode) => {
+  const comp = React.Children.toArray(children).find(
+    (child) =>
+      React.isValidElement(child) &&
+      typeof child.type !== "string" &&
+      //@ts-ignore
+      child?.type.displayName &&
+      //@ts-ignore
+      child.type.displayName === "DropdownMenuContent",
+  );
+  if (!comp) {
+    return null;
+  }
+  //@ts-ignore
+  return comp;
+};

packages/excalidraw/components/icons.tsx

@@ -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(
@@ -2404,32 +2396,3 @@ export const presentationIcon = createIcon(
   </g>,
   tablerIconProps,
 );
-
-// empty placeholder icon (used for alignment in menus)
-export const emptyIcon = <div style={{ width: "1rem", height: "1rem" }} />;
-
-//tabler-icons: chevron-right
-export const chevronRight = createIcon(
-  <g strokeWidth="1.5">
-    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-    <polyline points="9 6 15 12 9 18" />
-  </g>,
-  tablerIconProps,
-);
-
-// tabler-icons: adjustments-horizontal
-export const settingsIcon = createIcon(
-  <g strokeWidth={1.25}>
-    <path stroke="none" d="M0 0h24v24H0z" fill="none" />
-    <path d="M14 6m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" />
-    <path d="M4 6l8 0" />
-    <path d="M16 6l4 0" />
-    <path d="M8 12m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" />
-    <path d="M4 12l2 0" />
-    <path d="M10 12l10 0" />
-    <path d="M17 18m-2 0a2 2 0 1 0 4 0a2 2 0 1 0 -4 0" />
-    <path d="M4 18l11 0" />
-    <path d="M19 18l1 0" />
-  </g>,
-  tablerIconProps,
-);

packages/excalidraw/components/main-menu/DefaultItems.tsx

@@ -9,14 +9,9 @@ import {
   actionLoadScene,
   actionSaveToActiveFile,
   actionShortcuts,
-  actionToggleGridMode,
-  actionToggleObjectsSnapMode,
   actionToggleSearchMenu,
-  actionToggleStats,
   actionToggleTheme,
-  actionToggleZenMode,
 } from "../../actions";
-import { actionToggleViewMode } from "../../actions/actionToggleViewMode";
 import { getShortcutFromShortcutName } from "../../actions/shortcuts";
 import { trackEvent } from "../../analytics";
 import { useUIAppState } from "../../context/ui-appState";
@@ -28,16 +23,13 @@ import {
   useExcalidrawActionManager,
   useExcalidrawElements,
   useAppProps,
-  useApp,
 } from "../App";
 import { openConfirmModal } from "../OverwriteConfirm/OverwriteConfirmState";
 import Trans from "../Trans";
 import DropdownMenuItem from "../dropdownMenu/DropdownMenuItem";
-import DropdownMenuItemCheckbox from "../dropdownMenu/DropdownMenuItemCheckbox";
 import DropdownMenuItemContentRadio from "../dropdownMenu/DropdownMenuItemContentRadio";
 import DropdownMenuItemLink from "../dropdownMenu/DropdownMenuItemLink";
-import DropdownMenuSub from "../dropdownMenu/DropdownMenuSub";
-import { GithubIcon, DiscordIcon, XBrandIcon, settingsIcon } from "../icons";
+import { GithubIcon, DiscordIcon, XBrandIcon } from "../icons";
 import {
   boltIcon,
   DeviceDesktopIcon,
@@ -314,14 +306,10 @@ export const ChangeCanvasBackground = () => {
     return null;
   }
   return (
-    <div style={{ marginTop: "0.75rem" }}>
+    <div style={{ marginTop: "0.5rem" }}>
       <div
         data-testid="canvas-background-label"
-        style={{
-          fontSize: "0.875rem",
-          marginBottom: "0.25rem",
-          marginLeft: "0.5rem",
-        }}
+        style={{ fontSize: ".75rem", marginBottom: ".5rem" }}
       >
         {t("labels.canvasBackground")}
       </div>
@@ -405,152 +393,3 @@ export const LiveCollaborationTrigger = ({
 };
 
 LiveCollaborationTrigger.displayName = "LiveCollaborationTrigger";
-
-const PreferencesToggleToolLockItem = () => {
-  const { t } = useI18n();
-  const app = useApp();
-  const appState = useUIAppState();
-
-  return (
-    <DropdownMenuItemCheckbox
-      checked={appState.activeTool.locked}
-      shortcut={getShortcutFromShortcutName("toolLock")}
-      onSelect={(event) => {
-        app.toggleLock();
-        event.preventDefault();
-      }}
-    >
-      {t("labels.preferences_toolLock")}
-    </DropdownMenuItemCheckbox>
-  );
-};
-
-const PreferencesToggleSnapModeItem = () => {
-  const { t } = useI18n();
-  const actionManager = useExcalidrawActionManager();
-  const appState = useUIAppState();
-  return (
-    <DropdownMenuItemCheckbox
-      checked={appState.objectsSnapModeEnabled}
-      shortcut={getShortcutFromShortcutName("objectsSnapMode")}
-      onSelect={(event) => {
-        actionManager.executeAction(actionToggleObjectsSnapMode);
-        event.preventDefault();
-      }}
-    >
-      {t("buttons.objectsSnapMode")}
-    </DropdownMenuItemCheckbox>
-  );
-};
-
-export const PreferencesToggleGridModeItem = () => {
-  const { t } = useI18n();
-  const actionManager = useExcalidrawActionManager();
-  const appState = useUIAppState();
-
-  return (
-    <DropdownMenuItemCheckbox
-      checked={appState.gridModeEnabled}
-      shortcut={getShortcutFromShortcutName("gridMode")}
-      onSelect={(event) => {
-        actionManager.executeAction(actionToggleGridMode);
-        event.preventDefault();
-      }}
-    >
-      {t("labels.toggleGrid")}
-    </DropdownMenuItemCheckbox>
-  );
-};
-
-export const PreferencesToggleZenModeItem = () => {
-  const { t } = useI18n();
-  const actionManager = useExcalidrawActionManager();
-  const appState = useUIAppState();
-  return (
-    <DropdownMenuItemCheckbox
-      checked={appState.zenModeEnabled}
-      shortcut={getShortcutFromShortcutName("zenMode")}
-      onSelect={(event) => {
-        actionManager.executeAction(actionToggleZenMode);
-        event.preventDefault();
-      }}
-    >
-      {t("buttons.zenMode")}
-    </DropdownMenuItemCheckbox>
-  );
-};
-
-const PreferencesToggleViewModeItem = () => {
-  const { t } = useI18n();
-  const actionManager = useExcalidrawActionManager();
-  const appState = useUIAppState();
-  return (
-    <DropdownMenuItemCheckbox
-      checked={appState.viewModeEnabled}
-      shortcut={getShortcutFromShortcutName("viewMode")}
-      onSelect={(event) => {
-        actionManager.executeAction(actionToggleViewMode);
-        event.preventDefault();
-      }}
-    >
-      {t("labels.viewMode")}
-    </DropdownMenuItemCheckbox>
-  );
-};
-
-const PreferencesToggleElementPropertiesItem = () => {
-  const { t } = useI18n();
-  const actionManager = useExcalidrawActionManager();
-  const appState = useUIAppState();
-  return (
-    <DropdownMenuItemCheckbox
-      checked={appState.stats.open}
-      shortcut={getShortcutFromShortcutName("stats")}
-      onSelect={(event) => {
-        actionManager.executeAction(actionToggleStats);
-        event.preventDefault();
-      }}
-    >
-      {t("stats.fullTitle")}
-    </DropdownMenuItemCheckbox>
-  );
-};
-
-export const Preferences = ({
-  children,
-  additionalItems,
-}: {
-  children?: React.ReactNode;
-  additionalItems?: React.ReactNode;
-}) => {
-  const { t } = useI18n();
-  return (
-    <DropdownMenuSub>
-      <DropdownMenuSub.Trigger icon={settingsIcon}>
-        {t("labels.preferences")}
-      </DropdownMenuSub.Trigger>
-      <DropdownMenuSub.Content className="excalidraw-main-menu-preferences-submenu">
-        {children || (
-          <>
-            <PreferencesToggleToolLockItem />
-            <PreferencesToggleSnapModeItem />
-            <PreferencesToggleGridModeItem />
-            <PreferencesToggleZenModeItem />
-            <PreferencesToggleViewModeItem />
-            <PreferencesToggleElementPropertiesItem />
-          </>
-        )}
-        {additionalItems}
-      </DropdownMenuSub.Content>
-    </DropdownMenuSub>
-  );
-};
-
-Preferences.ToggleToolLock = PreferencesToggleToolLockItem;
-Preferences.ToggleSnapMode = PreferencesToggleSnapModeItem;
-Preferences.ToggleGridMode = PreferencesToggleGridModeItem;
-Preferences.ToggleZenMode = PreferencesToggleZenModeItem;
-Preferences.ToggleViewMode = PreferencesToggleViewModeItem;
-Preferences.ToggleElementProperties = PreferencesToggleElementPropertiesItem;
-
-Preferences.displayName = "Preferences";

packages/excalidraw/components/main-menu/MainMenu.tsx

@@ -8,7 +8,6 @@ import { t } from "../../i18n";
 import { useEditorInterface, useExcalidrawSetAppState } from "../App";
 import { UserList } from "../UserList";
 import DropdownMenu from "../dropdownMenu/DropdownMenu";
-import DropdownMenuSub from "../dropdownMenu/DropdownMenuSub";
 import { withInternalFallback } from "../hoc/withInternalFallback";
 import { HamburgerMenuIcon } from "../icons";
 
@@ -53,8 +52,12 @@ const MainMenu = Object.assign(
               onSelect={composeEventHandlers(onSelect, () => {
                 setAppState({ openMenu: null });
               })}
-              className="main-menu"
-              align="start"
+              placement="bottom"
+              className={
+                editorInterface.formFactor === "phone"
+                  ? "main-menu-dropdown"
+                  : ""
+              }
             >
               {children}
               {editorInterface.formFactor === "phone" &&
@@ -81,7 +84,6 @@ const MainMenu = Object.assign(
     ItemCustom: DropdownMenu.ItemCustom,
     Group: DropdownMenu.Group,
     Separator: DropdownMenu.Separator,
-    Sub: DropdownMenuSub,
     DefaultItems,
   },
 );

packages/excalidraw/components/welcome-screen/WelcomeScreen.scss

@@ -29,7 +29,7 @@
   // ---------------------------------------------------------------------------
 
   .welcome-screen-decor-hint {
-    @media (max-height: 780px) {
+    @media (max-height: 599px) {
       display: none !important;
     }
 
@@ -148,7 +148,6 @@
   .welcome-screen-center__heading {
     font-size: 1.125rem;
     text-align: center;
-    line-height: 1.35rem;
   }
 
   .welcome-screen-menu {

packages/excalidraw/css/styles.scss

@@ -16,7 +16,6 @@
   --zIndex-ui-context-menu: 90;
   --zIndex-ui-styles-popup: 100;
   --zIndex-ui-top: 100;
-  --zIndex-ui-main-menu: 110;
   --zIndex-ui-library: 120;
 
   --zIndex-modal: 1000;
@@ -224,18 +223,6 @@ body.excalidraw-cursor-resize * {
     box-shadow: 0 0 0 1px var(--color-brand-hover);
   }
 
-  // radix doesn't allow differntiating between hover and keyboard active
-  // states (it's forcing :focus on both).
-  //
-  // proper handling would be to disable :focus-visible by default, and enable
-  // on keyboard arrows (it'd then have to be disabled again, e.g. on keydown
-  // or container focus)
-  //
-  // alas, that is left for another day
-  [data-radix-collection-item]:focus-visible {
-    box-shadow: none !important;
-  }
-
   .buttonList {
     .ToolIcon__icon {
       all: unset !important;
@@ -683,9 +670,6 @@ body.excalidraw-cursor-resize * {
     }
   }
 
-  .main-menu {
-    z-index: var(--zIndex-ui-main-menu);
-  }
   .main-menu-trigger {
     @include filledButtonOnCanvas;
   }

packages/excalidraw/data/blob.ts

@@ -28,7 +28,6 @@ import {
 import type { AppState, DataURL, LibraryItem } from "../types";
 
 import type { FileSystemHandle } from "browser-fs-access";
-import type { SchemaMigrationRegistry } from "./schema";
 import type { ImportedLibraryData } from "./types";
 
 const parseFileContents = async (blob: Blob | File): Promise<string> => {
@@ -142,7 +141,6 @@ export const loadSceneOrLibraryFromBlob = async (
   localElements: readonly ExcalidrawElement[] | null,
   /** FileSystemHandle. Defaults to `blob.handle` if defined, otherwise null. */
   fileHandle?: FileSystemHandle | null,
-  schemaMigrationRegistry?: SchemaMigrationRegistry,
 ) => {
   const contents = await parseFileContents(blob);
   let data;
@@ -165,7 +163,6 @@ export const loadSceneOrLibraryFromBlob = async (
           elements: restoreElements(data.elements, localElements, {
             repairBindings: true,
             deleteInvisibleElements: true,
-            schemaMigrationRegistry,
           }),
           appState: restoreAppState(
             {
@@ -203,14 +200,12 @@ export const loadFromBlob = async (
   localElements: readonly ExcalidrawElement[] | null,
   /** FileSystemHandle. Defaults to `blob.handle` if defined, otherwise null. */
   fileHandle?: FileSystemHandle | null,
-  schemaMigrationRegistry?: SchemaMigrationRegistry,
 ) => {
   const ret = await loadSceneOrLibraryFromBlob(
     blob,
     localAppState,
     localElements,
     fileHandle,
-    schemaMigrationRegistry,
   );
   if (ret.type !== MIME_TYPES.excalidraw) {
     throw new Error("Error: invalid file");
@@ -221,28 +216,20 @@ export const loadFromBlob = async (
 export const parseLibraryJSON = (
   json: string,
   defaultStatus: LibraryItem["status"] = "unpublished",
-  schemaMigrationRegistry?: SchemaMigrationRegistry,
 ) => {
   const data: ImportedLibraryData | undefined = JSON.parse(json);
   if (!isValidLibrary(data)) {
     throw new Error("Invalid library");
   }
   const libraryItems = data.libraryItems || data.library;
-  return restoreLibraryItems(libraryItems, defaultStatus, {
-    schemaMigrationRegistry,
-  });
+  return restoreLibraryItems(libraryItems, defaultStatus);
 };
 
 export const loadLibraryFromBlob = async (
   blob: Blob,
   defaultStatus: LibraryItem["status"] = "unpublished",
-  schemaMigrationRegistry?: SchemaMigrationRegistry,
 ) => {
-  return parseLibraryJSON(
-    await parseFileContents(blob),
-    defaultStatus,
-    schemaMigrationRegistry,
-  );
+  return parseLibraryJSON(await parseFileContents(blob), defaultStatus);
 };
 
 export const canvasToBlob = async (

packages/excalidraw/data/json.ts

@@ -14,7 +14,6 @@ import { isImageFileHandle, loadFromBlob } from "./blob";
 import { fileOpen, fileSave } from "./filesystem";
 
 import type { AppState, BinaryFiles, LibraryItems } from "../types";
-import type { SchemaMigrationRegistry } from "./schema";
 import type {
   ExportedDataState,
   ImportedDataState,
@@ -94,7 +93,6 @@ export const saveAsJSON = async (
 export const loadFromJSON = async (
   localAppState: AppState,
   localElements: readonly ExcalidrawElement[] | null,
-  schemaMigrationRegistry?: SchemaMigrationRegistry,
 ) => {
   const file = await fileOpen({
     description: "Excalidraw files",
@@ -102,13 +100,7 @@ export const loadFromJSON = async (
     // gets resolved. Else, iOS users cannot open `.excalidraw` files.
     // extensions: ["json", "excalidraw", "png", "svg"],
   });
-  return loadFromBlob(
-    file,
-    localAppState,
-    localElements,
-    file.handle,
-    schemaMigrationRegistry,
-  );
+  return loadFromBlob(file, localAppState, localElements, file.handle);
 };
 
 export const isValidExcalidrawData = (data?: {

packages/excalidraw/data/library.ts

@@ -35,7 +35,6 @@ import { loadLibraryFromBlob } from "./blob";
 import { restoreLibraryItems } from "./restore";
 
 import type App from "../components/App";
-import type { SchemaMigrationRegistry } from "./schema";
 
 import type {
   LibraryItems,
@@ -66,9 +65,9 @@ type LibraryUpdate = {
   updatedItems: Map<LibraryItem["id"], LibraryItem>;
 };
 
-export type LibraryPersistedData = {
-  libraryItems: LibraryItems;
-};
+// an object so that we can later add more properties to it without breaking,
+// such as schema version
+export type LibraryPersistedData = { libraryItems: LibraryItems };
 
 const onLibraryUpdateEmitter = new Emitter<
   [update: LibraryUpdate, libraryItems: LibraryItems]
@@ -100,9 +99,7 @@ export interface LibraryMigrationAdapter {
    * loads data from legacy data source. Returns `null` if no data is
    * to be migrated.
    */
-  load(): MaybePromise<{
-    libraryItems: LibraryItems_anyVersion;
-  } | null>;
+  load(): MaybePromise<{ libraryItems: LibraryItems_anyVersion } | null>;
 
   /** clears entire storage afterwards */
   clear(): MaybePromise<void>;
@@ -317,15 +314,9 @@ class Library {
           let nextItems;
 
           if (source instanceof Blob) {
-            nextItems = await loadLibraryFromBlob(
-              source,
-              defaultStatus,
-              this.app.getSchemaMigrationRegistry(),
-            );
+            nextItems = await loadLibraryFromBlob(source, defaultStatus);
           } else {
-            nextItems = restoreLibraryItems(source, defaultStatus, {
-              schemaMigrationRegistry: this.app.getSchemaMigrationRegistry(),
-            });
+            nextItems = restoreLibraryItems(source, defaultStatus);
           }
           if (
             !prompt ||
@@ -558,17 +549,12 @@ class AdapterTransaction {
     adapter: LibraryPersistenceAdapter,
     source: LibraryAdatapterSource,
     _queue = true,
-    schemaMigrationRegistry?: SchemaMigrationRegistry,
   ): Promise<LibraryItems> {
     const task = () =>
       new Promise<LibraryItems>(async (resolve, reject) => {
         try {
           const data = await adapter.load({ source });
-          resolve(
-            restoreLibraryItems(data?.libraryItems || [], "published", {
-              schemaMigrationRegistry,
-            }),
-          );
+          resolve(restoreLibraryItems(data?.libraryItems || [], "published"));
         } catch (error: any) {
           reject(error);
         }
@@ -583,36 +569,22 @@ class AdapterTransaction {
 
   static run = async <T>(
     adapter: LibraryPersistenceAdapter,
-    schemaMigrationRegistry: SchemaMigrationRegistry | undefined,
     fn: (transaction: AdapterTransaction) => Promise<T>,
   ) => {
-    const transaction = new AdapterTransaction(
-      adapter,
-      schemaMigrationRegistry,
-    );
+    const transaction = new AdapterTransaction(adapter);
     return AdapterTransaction.queue.push(() => fn(transaction));
   };
 
   // ------------------
 
   private adapter: LibraryPersistenceAdapter;
-  private schemaMigrationRegistry: SchemaMigrationRegistry | undefined;
 
-  constructor(
-    adapter: LibraryPersistenceAdapter,
-    schemaMigrationRegistry: SchemaMigrationRegistry | undefined,
-  ) {
+  constructor(adapter: LibraryPersistenceAdapter) {
     this.adapter = adapter;
-    this.schemaMigrationRegistry = schemaMigrationRegistry;
   }
 
   getLibraryItems(source: LibraryAdatapterSource) {
-    return AdapterTransaction.getLibraryItems(
-      this.adapter,
-      source,
-      false,
-      this.schemaMigrationRegistry,
-    );
+    return AdapterTransaction.getLibraryItems(this.adapter, source, false);
   }
 }
 
@@ -635,73 +607,68 @@ export const getLibraryItemsHash = (items: LibraryItems) => {
 const persistLibraryUpdate = async (
   adapter: LibraryPersistenceAdapter,
   update: LibraryUpdate,
-  schemaMigrationRegistry: SchemaMigrationRegistry | undefined,
 ): Promise<LibraryItems> => {
   try {
     librarySaveCounter++;
 
-    return await AdapterTransaction.run(
-      adapter,
-      schemaMigrationRegistry,
-      async (transaction) => {
-        const nextLibraryItemsMap = arrayToMap(
-          await transaction.getLibraryItems("save"),
-        );
+    return await AdapterTransaction.run(adapter, async (transaction) => {
+      const nextLibraryItemsMap = arrayToMap(
+        await transaction.getLibraryItems("save"),
+      );
 
-        for (const [id] of update.deletedItems) {
-          nextLibraryItemsMap.delete(id);
+      for (const [id] of update.deletedItems) {
+        nextLibraryItemsMap.delete(id);
+      }
+
+      const addedItems: LibraryItem[] = [];
+
+      // we want to merge current library items with the ones stored in the
+      // DB so that we don't lose any elements that for some reason aren't
+      // in the current editor library, which could happen when:
+      //
+      // 1. we haven't received an update deleting some elements
+      //    (in which case it's still better to keep them in the DB lest
+      //     it was due to a different reason)
+      // 2. we keep a single DB for all active editors, but the editors'
+      //    libraries aren't synced or there's a race conditions during
+      //    syncing
+      // 3. some other race condition, e.g. during init where emit updates
+      //    for partial updates (e.g. you install a 3rd party library and
+      //    init from DB only after — we emit events for both updates)
+      for (const [id, item] of update.addedItems) {
+        if (nextLibraryItemsMap.has(id)) {
+          // replace item with latest version
+          // TODO we could prefer the newer item instead
+          nextLibraryItemsMap.set(id, item);
+        } else {
+          // we want to prepend the new items with the ones that are already
+          // in DB to preserve the ordering we do in editor (newly added
+          // items are added to the beginning)
+          addedItems.push(item);
         }
+      }
 
-        const addedItems: LibraryItem[] = [];
-
-        // we want to merge current library items with the ones stored in the
-        // DB so that we don't lose any elements that for some reason aren't
-        // in the current editor library, which could happen when:
-        //
-        // 1. we haven't received an update deleting some elements
-        //    (in which case it's still better to keep them in the DB lest
-        //     it was due to a different reason)
-        // 2. we keep a single DB for all active editors, but the editors'
-        //    libraries aren't synced or there's a race conditions during
-        //    syncing
-        // 3. some other race condition, e.g. during init where emit updates
-        //    for partial updates (e.g. you install a 3rd party library and
-        //    init from DB only after — we emit events for both updates)
-        for (const [id, item] of update.addedItems) {
-          if (nextLibraryItemsMap.has(id)) {
-            // replace item with latest version
-            // TODO we could prefer the newer item instead
-            nextLibraryItemsMap.set(id, item);
-          } else {
-            // we want to prepend the new items with the ones that are already
-            // in DB to preserve the ordering we do in editor (newly added
-            // items are added to the beginning)
-            addedItems.push(item);
-          }
+      // replace existing items with their updated versions
+      if (update.updatedItems) {
+        for (const [id, item] of update.updatedItems) {
+          nextLibraryItemsMap.set(id, item);
         }
+      }
 
-        // replace existing items with their updated versions
-        if (update.updatedItems) {
-          for (const [id, item] of update.updatedItems) {
-            nextLibraryItemsMap.set(id, item);
-          }
-        }
+      const nextLibraryItems = addedItems.concat(
+        Array.from(nextLibraryItemsMap.values()),
+      );
 
-        const nextLibraryItems = addedItems.concat(
-          Array.from(nextLibraryItemsMap.values()),
-        );
+      const version = getLibraryItemsHash(nextLibraryItems);
 
-        const version = getLibraryItemsHash(nextLibraryItems);
+      if (version !== lastSavedLibraryItemsHash) {
+        await adapter.save({ libraryItems: nextLibraryItems });
+      }
 
-        if (version !== lastSavedLibraryItemsHash) {
-          await adapter.save({ libraryItems: nextLibraryItems });
-        }
+      lastSavedLibraryItemsHash = version;
 
-        lastSavedLibraryItemsHash = version;
-
-        return nextLibraryItems;
-      },
-    );
+      return nextLibraryItems;
+    });
   } finally {
     librarySaveCounter--;
   }
@@ -885,24 +852,16 @@ export const useHandleLibrary = (
             .then(async (libraryData) => {
               let restoredData: LibraryItems | null = null;
               try {
-                const schemaMigrationRegistry =
-                  optsRef.current.excalidrawAPI?.getSchemaMigrationRegistry();
                 // if no library data to migrate, assume no migration needed
                 // and skip persisting to new data store, as well as well
                 // clearing the old store via `migrationAdapter.clear()`
                 if (!libraryData) {
-                  return AdapterTransaction.getLibraryItems(
-                    adapter,
-                    "load",
-                    true,
-                    schemaMigrationRegistry,
-                  );
+                  return AdapterTransaction.getLibraryItems(adapter, "load");
                 }
 
                 restoredData = restoreLibraryItems(
                   libraryData.libraryItems || [],
                   "published",
-                  { schemaMigrationRegistry },
                 );
 
                 // we don't queue this operation because it's running inside
@@ -910,7 +869,6 @@ export const useHandleLibrary = (
                 const nextItems = await persistLibraryUpdate(
                   adapter,
                   createLibraryUpdate([], restoredData),
-                  schemaMigrationRegistry,
                 );
                 try {
                   await migrationAdapter.clear();
@@ -933,23 +891,12 @@ export const useHandleLibrary = (
             .catch((error: any) => {
               console.error(`error during library migration: ${error.message}`);
               // as a default, load latest library from current data source
-              return AdapterTransaction.getLibraryItems(
-                adapter,
-                "load",
-                true,
-                optsRef.current.excalidrawAPI?.getSchemaMigrationRegistry(),
-              );
+              return AdapterTransaction.getLibraryItems(adapter, "load");
             }),
         );
       } else {
         initDataPromise.resolve(
-          promiseTry(
-            AdapterTransaction.getLibraryItems,
-            adapter,
-            "load",
-            true,
-            optsRef.current.excalidrawAPI?.getSchemaMigrationRegistry(),
-          ),
+          promiseTry(AdapterTransaction.getLibraryItems, adapter, "load"),
         );
       }
 
@@ -1011,11 +958,7 @@ export const useHandleLibrary = (
                 lastSavedLibraryItemsHash !==
                 getLibraryItemsHash(nextLibraryItems)
               ) {
-                await persistLibraryUpdate(
-                  adapter,
-                  update,
-                  optsRef.current.excalidrawAPI?.getSchemaMigrationRegistry(),
-                );
+                await persistLibraryUpdate(adapter, update);
               }
             }
           } catch (error: any) {

packages/excalidraw/data/restore.ts

@@ -82,16 +82,7 @@ import {
   getNormalizedZoom,
 } from "../scene";
 
-import { migrateElements } from "./schema";
-
-import type { SchemaMigrationRegistry } from "./schema";
-
-import type {
-  AppState,
-  BinaryFiles,
-  LibraryItem,
-  NormalizedZoomValue,
-} from "../types";
+import type { AppState, BinaryFiles, LibraryItem } from "../types";
 import type { ImportedDataState, LegacyAppState } from "./types";
 
 type RestoredAppState = Omit<
@@ -221,7 +212,6 @@ const repairBinding = <T extends ExcalidrawArrowElement>(
               boundElement,
               startOrEnd,
               elementsMap,
-              { value: 1 as NormalizedZoomValue },
             ) || p;
       const { fixedPoint } = calculateFixedPointForNonElbowArrowBinding(
         element,
@@ -247,7 +237,7 @@ const repairBinding = <T extends ExcalidrawArrowElement>(
 };
 
 const restoreElementWithProperties = <
-  T extends Omit<ExcalidrawElement, "customData"> & {
+  T extends Required<Omit<ExcalidrawElement, "customData">> & {
     customData?: ExcalidrawElement["customData"];
     /** @deprecated */
     boundElementIds?: readonly ExcalidrawElement["id"][];
@@ -289,10 +279,6 @@ const restoreElementWithProperties = <
     width: element.width || 0,
     height: element.height || 0,
     seed: element.seed ?? 1,
-    schemaState:
-      element.schemaState && typeof element.schemaState === "object"
-        ? element.schemaState
-        : { tracks: {} },
     groupIds: element.groupIds ?? [],
     frameId: element.frameId ?? null,
     roundness: element.roundness
@@ -513,9 +499,6 @@ export const restoreElement = (
     case "embeddable":
       return restoreElementWithProperties(element, {});
     case "magicframe":
-      return restoreElementWithProperties(element, {
-        name: element.name ?? null,
-      });
     case "frame":
       return restoreElementWithProperties(element, {
         name: element.name ?? null,
@@ -644,25 +627,17 @@ export const restoreElements = <T extends ExcalidrawElement>(
         refreshDimensions?: boolean;
         repairBindings?: boolean;
         deleteInvisibleElements?: boolean;
-        schemaMigrationRegistry?: SchemaMigrationRegistry;
       }
     | undefined,
 ): CombineBrandsIfNeeded<T, OrderedExcalidrawElement> => {
-  const migratedTargetElements = migrateElements(
-    targetElements as readonly ExcalidrawElement[] | undefined | null,
-    {
-      schemaMigrationRegistry: opts?.schemaMigrationRegistry,
-    },
-  ) as readonly T[] | undefined | null;
-
   // used to detect duplicate top-level element ids
   const existingIds = new Set<string>();
-  const targetElementsMap = arrayToMap(migratedTargetElements || []);
+  const targetElementsMap = arrayToMap(targetElements || []);
   const existingElementsMap = existingElements
     ? arrayToMap(existingElements)
     : null;
   const restoredElements = syncInvalidIndices(
-    (migratedTargetElements || []).reduce((elements, element) => {
+    (targetElements || []).reduce((elements, element) => {
       // filtering out selection, which is legacy, no longer kept in elements,
       // and causing issues if retained
       if (element.type === "selection") {
@@ -972,14 +947,10 @@ export const restoreAppState = (
   };
 };
 
-const restoreLibraryItem = (
-  libraryItem: LibraryItem,
-  opts?: { schemaMigrationRegistry?: SchemaMigrationRegistry },
-) => {
+const restoreLibraryItem = (libraryItem: LibraryItem) => {
   const elements = restoreElements(
     getNonDeletedElements(libraryItem.elements),
     null,
-    { schemaMigrationRegistry: opts?.schemaMigrationRegistry },
   );
   return elements.length ? { ...libraryItem, elements } : null;
 };
@@ -987,21 +958,17 @@ const restoreLibraryItem = (
 export const restoreLibraryItems = (
   libraryItems: ImportedDataState["libraryItems"] = [],
   defaultStatus: LibraryItem["status"],
-  opts?: { schemaMigrationRegistry?: SchemaMigrationRegistry },
 ) => {
   const restoredItems: LibraryItem[] = [];
   for (const item of libraryItems) {
     // migrate older libraries
     if (Array.isArray(item)) {
-      const restoredItem = restoreLibraryItem(
-        {
-          status: defaultStatus,
-          elements: item,
-          id: randomId(),
-          created: Date.now(),
-        },
-        opts,
-      );
+      const restoredItem = restoreLibraryItem({
+        status: defaultStatus,
+        elements: item,
+        id: randomId(),
+        created: Date.now(),
+      });
       if (restoredItem) {
         restoredItems.push(restoredItem);
       }
@@ -1010,15 +977,12 @@ export const restoreLibraryItems = (
         LibraryItem,
         "id" | "status" | "created"
       >;
-      const restoredItem = restoreLibraryItem(
-        {
-          ..._item,
-          id: _item.id || randomId(),
-          status: _item.status || defaultStatus,
-          created: _item.created || Date.now(),
-        },
-        opts,
-      );
+      const restoredItem = restoreLibraryItem({
+        ..._item,
+        id: _item.id || randomId(),
+        status: _item.status || defaultStatus,
+        created: _item.created || Date.now(),
+      });
       if (restoredItem) {
         restoredItems.push(restoredItem);
       }

packages/excalidraw/data/schema.test.ts

@@ -1,408 +0,0 @@
-import { DEFAULT_ELEMENT_PROPS } from "@excalidraw/common";
-
-import { API } from "../tests/helpers/api";
-
-import {
-  CORE_FRAME_SCHEMA_TRACK,
-  createSchemaMigrationRegistry,
-  type SchemaPlugin,
-  type SchemaMigration,
-  CORE_SUPPORTED_TRACKS,
-  migrateElements,
-  resolveTrackVersion,
-  SCHEMA_INITIAL_TRACK_VERSION,
-  SCHEMA_MIGRATIONS,
-  validateSchemaMigrations,
-  validateSchemaPlugins,
-} from "./schema";
-
-describe("schema migration", () => {
-  it("should migrate legacy frame backgrounds to transparent", () => {
-    const frame = {
-      ...API.createElement({
-        type: "frame",
-        backgroundColor: "#ffc9c9",
-      }),
-      schemaState: { tracks: {} },
-    };
-
-    const migrated = migrateElements([frame])!;
-
-    expect(migrated[0].backgroundColor).toBe(
-      DEFAULT_ELEMENT_PROPS.backgroundColor,
-    );
-    expect(migrated[0].schemaState.tracks[CORE_FRAME_SCHEMA_TRACK]).toBe(
-      CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK],
-    );
-  });
-
-  it("should handle elements without schemaState", () => {
-    const frameWithoutSchemaState = {
-      ...API.createElement({
-        type: "frame",
-        backgroundColor: "#ffc9c9",
-      }),
-      schemaState: undefined,
-    } as any;
-
-    const textWithoutSchemaState = {
-      ...API.createElement({
-        type: "text",
-        text: "",
-      }),
-      schemaState: undefined,
-    } as any;
-
-    const migrated = migrateElements([
-      frameWithoutSchemaState,
-      textWithoutSchemaState,
-    ])!;
-
-    expect(migrated[0].backgroundColor).toBe(
-      DEFAULT_ELEMENT_PROPS.backgroundColor,
-    );
-    expect(migrated[0].schemaState.tracks[CORE_FRAME_SCHEMA_TRACK]).toBe(
-      CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK],
-    );
-    expect(migrated[1].schemaState).toEqual({ tracks: {} });
-  });
-
-  it("should keep latest-track frame backgrounds unchanged", () => {
-    const frame = {
-      ...API.createElement({
-        type: "frame",
-        backgroundColor: "#ffc9c9",
-      }),
-      schemaState: {
-        tracks: {
-          [CORE_FRAME_SCHEMA_TRACK]:
-            CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK],
-        },
-      },
-    };
-
-    const migrated = migrateElements([frame])!;
-
-    expect(migrated[0].backgroundColor).toBe("#ffc9c9");
-    expect(migrated[0].schemaState.tracks[CORE_FRAME_SCHEMA_TRACK]).toBe(
-      CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK],
-    );
-  });
-
-  it("should normalize legacy frame backgrounds", () => {
-    const frame = {
-      ...API.createElement({
-        type: "frame",
-        backgroundColor: "#a5d8ff",
-      }),
-      schemaState: {
-        tracks: {
-          [CORE_FRAME_SCHEMA_TRACK]: SCHEMA_INITIAL_TRACK_VERSION,
-        },
-      },
-    };
-
-    const migrated = migrateElements([frame])!;
-    expect(migrated[0].backgroundColor).toBe(
-      DEFAULT_ELEMENT_PROPS.backgroundColor,
-    );
-  });
-
-  it("should resolve invalid track versions to initial", () => {
-    expect(resolveTrackVersion(undefined)).toBe(SCHEMA_INITIAL_TRACK_VERSION);
-    expect(resolveTrackVersion(0)).toBe(SCHEMA_INITIAL_TRACK_VERSION);
-    expect(resolveTrackVersion(2)).toBe(2);
-  });
-
-  it("should have a valid migration registry configuration", () => {
-    expect(validateSchemaMigrations(SCHEMA_MIGRATIONS)).toEqual([]);
-  });
-
-  it("should reject invalid migration metadata", () => {
-    const invalidMigrations: SchemaMigration[] = [
-      {
-        id: "",
-        namespace: "core",
-        track: CORE_FRAME_SCHEMA_TRACK,
-        toVersion: 2.1,
-        title: "",
-        description: " ",
-        targetTypes: [],
-        apply: (element) => element,
-      },
-      {
-        id: "dup",
-        namespace: "core",
-        track: CORE_FRAME_SCHEMA_TRACK,
-        toVersion: 2.1,
-        title: "duplicate",
-        description: "duplicate version",
-        targetTypes: ["frame"],
-        apply: (element) => element,
-      },
-      {
-        id: "dup",
-        namespace: "core",
-        track: CORE_FRAME_SCHEMA_TRACK,
-        toVersion: 3,
-        title: "duplicate id",
-        description: "duplicate id",
-        targetTypes: ["frame"],
-        apply: (element) => element,
-      },
-    ];
-
-    const errors = validateSchemaMigrations(invalidMigrations);
-
-    expect(errors.length).toBeGreaterThan(0);
-    expect(errors.join("\n")).toContain("integer version");
-    expect(errors.join("\n")).toContain("title must be non-empty");
-    expect(errors.join("\n")).toContain("non-empty description");
-    expect(errors.join("\n")).toContain("Duplicate schema migration id");
-    expect(errors.join("\n")).toContain("at least one target type");
-  });
-
-  it("should reject versions at or below initial", () => {
-    const errors = validateSchemaMigrations([
-      {
-        id: "invalid-start",
-        namespace: "core",
-        track: CORE_FRAME_SCHEMA_TRACK,
-        toVersion: SCHEMA_INITIAL_TRACK_VERSION,
-        title: "invalid start",
-        description: "bad version",
-        targetTypes: ["frame"],
-        apply: (element) => element,
-      },
-    ]);
-
-    expect(errors.join("\n")).toContain("must be greater than 1");
-  });
-
-  it("should reject core track/version mismatch", () => {
-    const errors = validateSchemaMigrations([
-      {
-        id: "frame-v3",
-        namespace: "core",
-        track: CORE_FRAME_SCHEMA_TRACK,
-        toVersion: CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK] + 1,
-        title: "future migration",
-        description: "future migration for test",
-        targetTypes: ["frame"],
-        apply: (element) => element,
-      },
-    ]);
-
-    expect(errors.join("\n")).toContain(
-      `Core supported track "${CORE_FRAME_SCHEMA_TRACK}" (${CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK]}) must match last migration version`,
-    );
-  });
-
-  it("should reject undeclared core tracks", () => {
-    const errors = validateSchemaMigrations([
-      {
-        id: "unknown-core-track",
-        namespace: "core",
-        track: "excalidraw.shape.unknown",
-        toVersion: 2,
-        title: "unknown core track",
-        description: "should require supported-track declaration",
-        targetTypes: ["rectangle"],
-        apply: (element) => element,
-      },
-    ]);
-
-    expect(errors.join("\n")).toContain(
-      "must be declared in CORE_SUPPORTED_TRACKS",
-    );
-  });
-
-  it("should reject invalid plugin metadata", () => {
-    const errors = validateSchemaPlugins([
-      {
-        id: "",
-        migrations: [],
-      },
-      {
-        id: "dup",
-        migrations: [],
-      },
-      {
-        id: "dup",
-        migrations: [],
-      },
-      {
-        id: "core-overwrite",
-        migrations: [
-          {
-            id: "bad.core.migration",
-            namespace: "core",
-            track: CORE_FRAME_SCHEMA_TRACK,
-            toVersion: 2,
-            title: "bad",
-            description: "bad",
-            targetTypes: ["frame"],
-            apply: (element) => element,
-          },
-        ],
-      },
-    ]);
-
-    expect(errors.join("\n")).toContain("Schema plugin id must be non-empty");
-    expect(errors.join("\n")).toContain("Duplicate schema plugin id found");
-    expect(errors.join("\n")).toContain("cannot declare core migrations");
-  });
-
-  it("should not depend on temporary fields during migration", () => {
-    const frame = {
-      ...API.createElement({
-        type: "frame",
-        backgroundColor: "#a5d8ff",
-      }),
-      schemaState: { tracks: {} },
-    };
-    const withTempField = {
-      ...frame,
-      backgroundEnabled: false,
-    } as typeof frame & { backgroundEnabled: boolean };
-
-    const migratedBase = migrateElements([frame])!;
-    const migratedWithTempField = migrateElements([withTempField])!;
-
-    expect(migratedBase[0].backgroundColor).toBe(
-      DEFAULT_ELEMENT_PROPS.backgroundColor,
-    );
-    expect(migratedWithTempField[0].backgroundColor).toBe(
-      DEFAULT_ELEMENT_PROPS.backgroundColor,
-    );
-  });
-
-  it("should use per-element track hints", () => {
-    const frame = API.createElement({
-      type: "frame",
-      backgroundColor: "#ff0000",
-    });
-    const frameFromModernSource = {
-      ...frame,
-      schemaState: {
-        tracks: {
-          [CORE_FRAME_SCHEMA_TRACK]:
-            CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK],
-        },
-      },
-    };
-
-    const migrated = migrateElements([frameFromModernSource])!;
-
-    expect(migrated[0].backgroundColor).toBe("#ff0000");
-  });
-
-  it("should migrate mixed-hint elements individually", () => {
-    const legacyFrame = {
-      ...API.createElement({
-        type: "frame",
-        backgroundColor: "#ff0000",
-      }),
-      schemaState: { tracks: {} },
-    };
-    const modernFrame = API.createElement({
-      type: "frame",
-      backgroundColor: "#00ff00",
-    });
-    const modernFrameWithTrack = {
-      ...modernFrame,
-      schemaState: {
-        tracks: {
-          [CORE_FRAME_SCHEMA_TRACK]:
-            CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK],
-        },
-      },
-    };
-
-    const migrated = migrateElements([legacyFrame, modernFrameWithTrack])!;
-
-    expect(migrated[0].backgroundColor).toBe(
-      DEFAULT_ELEMENT_PROPS.backgroundColor,
-    );
-    expect(migrated[1].backgroundColor).toBe("#00ff00");
-  });
-
-  it("should preserve higher-than-supported track versions", () => {
-    const frame = API.createElement({
-      type: "frame",
-      backgroundColor: "#ff0000",
-    });
-    const futureFrame = {
-      ...frame,
-      schemaState: {
-        tracks: {
-          [CORE_FRAME_SCHEMA_TRACK]:
-            CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK] + 1,
-        },
-      },
-    };
-
-    const migrated = migrateElements([futureFrame])!;
-    expect(migrated[0].schemaState.tracks[CORE_FRAME_SCHEMA_TRACK]).toBe(
-      CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK] + 1,
-    );
-    expect(migrated[0].backgroundColor).toBe("#ff0000");
-  });
-
-  it("should normalize invalid schema state and preserve unknown tracks", () => {
-    const rect = {
-      ...API.createElement({ type: "rectangle" }),
-      schemaState: {
-        tracks: {
-          "host.myapp.card": 4,
-          [CORE_FRAME_SCHEMA_TRACK]: 0,
-        },
-      },
-    };
-
-    const migrated = migrateElements([rect])!;
-    expect(migrated[0].schemaState.tracks[CORE_FRAME_SCHEMA_TRACK]).toBe(
-      SCHEMA_INITIAL_TRACK_VERSION,
-    );
-    expect(migrated[0].schemaState.tracks["host.myapp.card"]).toBe(4);
-  });
-
-  it("should not run plugin migrations unless plugins are provided", () => {
-    const rect = API.createElement({
-      type: "rectangle",
-      backgroundColor: "#ffd8a8",
-    });
-    const plugin: SchemaPlugin = {
-      id: "myapp",
-      migrations: [
-        {
-          id: "host.myapp.rect.normalize.v2",
-          namespace: "host.myapp",
-          track: "host.myapp.rectangle",
-          toVersion: 2,
-          title: "normalize rect background",
-          description: "plugin migration for testing",
-          targetTypes: ["rectangle"],
-          apply: (element) =>
-            element.type === "rectangle"
-              ? { ...element, backgroundColor: "#12b886" }
-              : element,
-        },
-      ],
-    };
-
-    const migratedWithoutPlugin = migrateElements([rect])!;
-    const migratedWithPlugin = migrateElements([rect], {
-      schemaMigrationRegistry: createSchemaMigrationRegistry([plugin]),
-    })!;
-
-    expect(migratedWithoutPlugin[0].backgroundColor).toBe("#ffd8a8");
-    expect(
-      migratedWithoutPlugin[0].schemaState.tracks["host.myapp.rectangle"],
-    ).toBe(undefined);
-    expect(migratedWithPlugin[0].backgroundColor).toBe("#12b886");
-    expect(
-      migratedWithPlugin[0].schemaState.tracks["host.myapp.rectangle"],
-    ).toBe(2);
-  });
-});

packages/excalidraw/data/schema.ts

@@ -1,443 +0,0 @@
-import {
-  CORE_FRAME_SCHEMA_TRACK,
-  SCHEMA_CORE_NAMESPACE,
-  SCHEMA_INITIAL_TRACK_VERSION,
-  CORE_SUPPORTED_TRACKS,
-} from "@excalidraw/element/schema";
-
-import type { SchemaNamespace, SchemaTrack } from "@excalidraw/element/schema";
-import type { ExcalidrawElement } from "@excalidraw/element/types";
-
-export {
-  CORE_FRAME_SCHEMA_TRACK,
-  CORE_SUPPORTED_TRACKS,
-  SCHEMA_CORE_NAMESPACE,
-  SCHEMA_INITIAL_TRACK_VERSION,
-};
-export type { SchemaNamespace, SchemaTrack };
-
-/**
- * Schema migration flow:
- * 0) Compile schema config from core migrations + optional host plugins.
- *    - validate plugin metadata
- *    - validate migration ordering/metadata
- *    - derive per-track supported versions for this registry
- * 1) Normalize element.schemaState.tracks (invalid/missing -> initial track version).
- * 2) Iterate compiled migrations in declaration order.
- * 3) For matching element types, apply only forward migrations that are
- *    supported by the current registry config (never re-run, never downgrade).
- * 4) Stamp migrated track versions back onto each element.
- */
-/** One migration step for a single track version bump. */
-export type SchemaMigration = {
-  /** Stable unique id for validation and debugging. */
-  id: string;
-  /** Owner of the migration: core or a host namespace. */
-  namespace: SchemaNamespace;
-  /** Version line this migration belongs to. */
-  track: SchemaTrack;
-  /** Target version reached after applying this migration. */
-  toVersion: number;
-  /** Human-readable metadata for maintainers/reviewers. */
-  title: string;
-  description: string;
-  /** Which element types this migration may transform ("*" = all). */
-  targetTypes: readonly ExcalidrawElement["type"][] | "*";
-  /** Pure transform for a single element. */
-  apply: (element: ExcalidrawElement) => ExcalidrawElement;
-};
-
-/**
- * Optional host-provided migration bundle.
- * Plugins are additive and may only declare host namespace migrations.
- */
-export type SchemaPlugin = {
-  /** Stable plugin id for diagnostics. */
-  id: string;
-  /** Host migration steps merged with core migrations into one registry. */
-  migrations: readonly SchemaMigration[];
-};
-
-/** Default plugin registry (intentionally empty in core). */
-export const SCHEMA_PLUGINS: readonly SchemaPlugin[] = [];
-
-export type SchemaMigrationRegistry = Readonly<{
-  /** Fully validated core + host migrations used for this run. */
-  migrations: readonly SchemaMigration[];
-  /** Latest supported version for each known track in this run. */
-  supportedTrackVersions: Readonly<Record<string, number>>;
-}>;
-
-export const SCHEMA_MIGRATIONS: readonly SchemaMigration[] = [
-  {
-    id: "core.frame.background.normalize.v2",
-    namespace: SCHEMA_CORE_NAMESPACE,
-    track: CORE_FRAME_SCHEMA_TRACK,
-    toVersion: CORE_SUPPORTED_TRACKS[CORE_FRAME_SCHEMA_TRACK],
-    title: "Normalize legacy frame backgrounds",
-    description:
-      "Frames saved before frame track v2 must render without visible fill, so normalize backgroundColor to transparent on restore.",
-    targetTypes: ["frame"],
-    apply: (element) => {
-      if (element.type !== "frame") {
-        return element;
-      }
-      return {
-        ...element,
-        backgroundColor: "transparent",
-      };
-    },
-  },
-];
-
-export const resolveTrackVersion = (trackVersion: unknown) => {
-  if (
-    Number.isInteger(trackVersion) &&
-    (trackVersion as number) >= SCHEMA_INITIAL_TRACK_VERSION
-  ) {
-    return trackVersion as number;
-  }
-  return SCHEMA_INITIAL_TRACK_VERSION;
-};
-
-const normalizeSchemaTracks = (tracks: unknown) => {
-  if (!tracks || typeof tracks !== "object") {
-    return {} as Record<string, number>;
-  }
-
-  return Object.entries(tracks as Record<string, unknown>).reduce<
-    Record<string, number>
-  >((acc, [track, version]) => {
-    const normalizedVersion = resolveTrackVersion(version);
-    if (normalizedVersion >= SCHEMA_INITIAL_TRACK_VERSION) {
-      acc[track] = normalizedVersion;
-    }
-    return acc;
-  }, {});
-};
-
-const normalizeElementSchemaState = (
-  element: ExcalidrawElement,
-): ExcalidrawElement["schemaState"] => {
-  const tracks = normalizeSchemaTracks(
-    (
-      element as ExcalidrawElement & {
-        schemaState?: ExcalidrawElement["schemaState"];
-      }
-    ).schemaState?.tracks,
-  );
-
-  return {
-    tracks,
-  };
-};
-
-const ensureElementSchemaState = (element: ExcalidrawElement) => {
-  const normalizedSchemaState = normalizeElementSchemaState(element);
-
-  // Fast path: avoid reallocating when element already has normalized state.
-  if (element.schemaState === normalizedSchemaState) {
-    return element;
-  }
-
-  if (
-    element.schemaState &&
-    Object.keys(element.schemaState?.tracks || {}).length ===
-      Object.keys(normalizedSchemaState.tracks).length &&
-    Object.entries(normalizedSchemaState.tracks).every(
-      ([track, version]) => element.schemaState?.tracks?.[track] === version,
-    )
-  ) {
-    return element;
-  }
-
-  return {
-    ...element,
-    schemaState: normalizedSchemaState,
-  };
-};
-
-const getTrackVersion = (element: ExcalidrawElement, track: SchemaTrack) => {
-  return resolveTrackVersion(element.schemaState.tracks[track]);
-};
-
-const withTrackVersion = (
-  element: ExcalidrawElement,
-  track: SchemaTrack,
-  version: number,
-) => {
-  if (element.schemaState.tracks[track] === version) {
-    return element;
-  }
-
-  return {
-    ...element,
-    schemaState: {
-      ...element.schemaState,
-      tracks: {
-        ...element.schemaState.tracks,
-        [track]: version,
-      },
-    },
-  };
-};
-
-const migrationMatchesElementType = (
-  migration: SchemaMigration,
-  element: ExcalidrawElement,
-) => {
-  return (
-    migration.targetTypes === "*" ||
-    migration.targetTypes.includes(element.type)
-  );
-};
-
-export const validateSchemaMigrations = (
-  migrations: readonly SchemaMigration[],
-) => {
-  const errors: string[] = [];
-  const seenIds = new Set<string>();
-  const previousVersionByTrack = new Map<string, number>();
-
-  for (const migration of migrations) {
-    if (!migration.id.trim()) {
-      errors.push("Migration id must be non-empty.");
-    }
-    if (seenIds.has(migration.id)) {
-      errors.push(`Duplicate schema migration id found: ${migration.id}.`);
-    }
-    seenIds.add(migration.id);
-
-    if (!migration.title.trim()) {
-      errors.push(`Migration "${migration.id}" title must be non-empty.`);
-    }
-    if (!migration.description.trim()) {
-      errors.push(
-        `Migration "${migration.id}" must include a non-empty description.`,
-      );
-    }
-
-    if (!Number.isInteger(migration.toVersion)) {
-      errors.push(`Migration "${migration.id}" must use an integer version.`);
-    }
-    if (migration.toVersion <= SCHEMA_INITIAL_TRACK_VERSION) {
-      errors.push(
-        `Migration "${migration.id}" version must be greater than ${SCHEMA_INITIAL_TRACK_VERSION}.`,
-      );
-    }
-
-    if (
-      migration.targetTypes !== "*" &&
-      (!migration.targetTypes.length ||
-        migration.targetTypes.some((type) => !type))
-    ) {
-      errors.push(
-        `Migration "${migration.id}" must declare at least one target type.`,
-      );
-    }
-
-    const trackKey = `${migration.namespace}|${migration.track}`;
-    const previousVersion =
-      previousVersionByTrack.get(trackKey) ?? SCHEMA_INITIAL_TRACK_VERSION;
-    if (migration.toVersion <= previousVersion) {
-      errors.push(
-        `Migration "${migration.id}" must be ordered by increasing version within ${trackKey}.`,
-      );
-    }
-    previousVersionByTrack.set(trackKey, migration.toVersion);
-
-    if (
-      migration.namespace === SCHEMA_CORE_NAMESPACE &&
-      !migration.track.startsWith("excalidraw.")
-    ) {
-      errors.push(
-        `Core migration "${migration.id}" must use an excalidraw.* track.`,
-      );
-    }
-
-    if (
-      migration.namespace === SCHEMA_CORE_NAMESPACE &&
-      !(migration.track in CORE_SUPPORTED_TRACKS)
-    ) {
-      errors.push(
-        `Core migration "${migration.id}" track "${migration.track}" must be declared in CORE_SUPPORTED_TRACKS.`,
-      );
-    }
-
-    if (
-      migration.namespace !== SCHEMA_CORE_NAMESPACE &&
-      !migration.track.startsWith(`${migration.namespace}.`)
-    ) {
-      errors.push(
-        `Host migration "${migration.id}" track must use namespace prefix ${migration.namespace}.`,
-      );
-    }
-  }
-
-  for (const [track, supportedVersion] of Object.entries(
-    CORE_SUPPORTED_TRACKS,
-  )) {
-    const migrationTrackKey = `${SCHEMA_CORE_NAMESPACE}|${track}`;
-    const lastDeclaredVersion =
-      previousVersionByTrack.get(migrationTrackKey) ??
-      SCHEMA_INITIAL_TRACK_VERSION;
-
-    if (lastDeclaredVersion !== supportedVersion) {
-      errors.push(
-        `Core supported track "${track}" (${supportedVersion}) must match last migration version (${lastDeclaredVersion}).`,
-      );
-    }
-  }
-
-  return errors;
-};
-
-export const validateSchemaPlugins = (plugins: readonly SchemaPlugin[]) => {
-  const errors: string[] = [];
-  const seenIds = new Set<string>();
-
-  for (const plugin of plugins) {
-    if (!plugin.id.trim()) {
-      errors.push("Schema plugin id must be non-empty.");
-    }
-    if (seenIds.has(plugin.id)) {
-      errors.push(`Duplicate schema plugin id found: ${plugin.id}.`);
-    }
-    seenIds.add(plugin.id);
-
-    for (const migration of plugin.migrations) {
-      if (migration.namespace === SCHEMA_CORE_NAMESPACE) {
-        errors.push(
-          `Schema plugin "${plugin.id}" cannot declare core migrations ("${migration.id}").`,
-        );
-      }
-    }
-  }
-
-  return errors;
-};
-
-const collectPluginMigrations = (plugins: readonly SchemaPlugin[]) =>
-  plugins.flatMap((plugin) => plugin.migrations);
-
-/**
- * Builds the registry "latest version" map:
- * - core tracks come from CORE_SUPPORTED_TRACKS
- * - host tracks are inferred from provided plugin migrations
- */
-const getSupportedTrackVersions = (
-  migrations: readonly SchemaMigration[],
-): Readonly<Record<string, number>> => {
-  const supportedTrackVersions: Record<string, number> = {
-    ...CORE_SUPPORTED_TRACKS,
-  };
-
-  for (const migration of migrations) {
-    if (migration.namespace === SCHEMA_CORE_NAMESPACE) {
-      continue;
-    }
-
-    const currentSupportedVersion =
-      supportedTrackVersions[migration.track] ?? SCHEMA_INITIAL_TRACK_VERSION;
-    if (migration.toVersion > currentSupportedVersion) {
-      supportedTrackVersions[migration.track] = migration.toVersion;
-    }
-  }
-
-  return supportedTrackVersions;
-};
-
-export const createSchemaMigrationRegistry = (
-  plugins: readonly SchemaPlugin[] = SCHEMA_PLUGINS,
-): SchemaMigrationRegistry => {
-  const pluginErrors = validateSchemaPlugins(plugins);
-  if (pluginErrors.length) {
-    throw new Error(
-      `Invalid schema plugin configuration:\n${pluginErrors.join("\n")}`,
-    );
-  }
-
-  const migrations = [
-    ...SCHEMA_MIGRATIONS,
-    ...collectPluginMigrations(plugins),
-  ] as const;
-
-  const migrationErrors = validateSchemaMigrations(migrations);
-  if (migrationErrors.length) {
-    throw new Error(
-      `Invalid schema migration configuration:\n${migrationErrors.join("\n")}`,
-    );
-  }
-
-  return {
-    migrations,
-    supportedTrackVersions: getSupportedTrackVersions(migrations),
-  };
-};
-
-const CORE_SCHEMA_MIGRATION_REGISTRY = createSchemaMigrationRegistry();
-
-/** Uses cached core config by default, recompiles when plugins are provided. */
-const resolveSchemaMigrationRegistry = (
-  schemaMigrationRegistry: SchemaMigrationRegistry | undefined,
-) => schemaMigrationRegistry || CORE_SCHEMA_MIGRATION_REGISTRY;
-
-const migrateElement = (
-  element: ExcalidrawElement,
-  schemaMigrationRegistry: SchemaMigrationRegistry,
-) => {
-  // Always migrate from a normalized per-element schema state.
-  let migratedElement = ensureElementSchemaState(element);
-
-  for (const migration of schemaMigrationRegistry.migrations) {
-    if (!migrationMatchesElementType(migration, migratedElement)) {
-      continue;
-    }
-
-    const currentTrackVersion = getTrackVersion(
-      migratedElement,
-      migration.track,
-    );
-    const supportedTrackVersion =
-      schemaMigrationRegistry.supportedTrackVersions[migration.track] ??
-      currentTrackVersion;
-
-    // Never re-run or downgrade.
-    if (currentTrackVersion >= migration.toVersion) {
-      continue;
-    }
-
-    // Preserve future data: ignore migrations newer than what this app supports.
-    if (migration.toVersion > supportedTrackVersion) {
-      continue;
-    }
-
-    // Apply transform, then stamp the element's track version.
-    migratedElement = withTrackVersion(
-      migration.apply(migratedElement),
-      migration.track,
-      migration.toVersion,
-    );
-  }
-
-  return migratedElement;
-};
-
-export const migrateElements = (
-  elements: readonly ExcalidrawElement[] | null | undefined,
-  opts?: {
-    schemaMigrationRegistry?: SchemaMigrationRegistry;
-  },
-) => {
-  if (!elements) {
-    return elements;
-  }
-
-  const schemaMigrationRegistry = resolveSchemaMigrationRegistry(
-    opts?.schemaMigrationRegistry,
-  );
-
-  return elements.map((element) =>
-    migrateElement(element, schemaMigrationRegistry),
-  );
-};

packages/excalidraw/history.ts

@@ -30,7 +30,7 @@ export class HistoryDelta extends StoreDelta {
       // as we always need to end up with a new version due to collaboration,
       // approaching each undo / redo as a new user action
       {
-        excludedProperties: new Set(["version", "versionNonce", "schemaState"]),
+        excludedProperties: new Set(["version", "versionNonce"]),
       },
     );
 

packages/excalidraw/index.tsx

@@ -56,7 +56,6 @@ const ExcalidrawBase = (props: ExcalidrawProps) => {
     aiEnabled,
     showDeprecatedFonts,
     renderScrollbars,
-    schemaPlugins,
   } = props;
 
   const canvasActions = props.UIOptions?.canvasActions;
@@ -150,7 +149,6 @@ const ExcalidrawBase = (props: ExcalidrawProps) => {
           aiEnabled={aiEnabled !== false}
           showDeprecatedFonts={showDeprecatedFonts}
           renderScrollbars={renderScrollbars}
-          schemaPlugins={schemaPlugins}
         >
           {children}
         </App>
@@ -319,5 +317,3 @@ export { getDataURL } from "./data/blob";
 export { isElementLink } from "@excalidraw/element";
 
 export { setCustomTextMetricsProvider } from "@excalidraw/element";
-
-export { CommandPalette } from "./components/CommandPalette/CommandPalette";

packages/excalidraw/locales/ar-SA.json

@@ -557,9 +557,7 @@
   },
   "welcomeScreen": {
     "app": {
-      "center_heading": "",
-      "center_heading_line2": "",
-      "center_heading_line3": "",
+      "center_heading": "جميع بياناتك محفوظة محليًا في المتصفح الخاص بك.",
       "center_heading_plus": "هل تريد الانتقال إلى Excalidraw+ بدلاً من ذلك؟",
       "menuHint": "التصدير، التفضيلات، اللغات..."
     },
@@ -614,55 +612,7 @@
     "button": "إدراج",
     "description": "حاليًا، يتم دعم <flowchartLink>مخططات التدفق</flowchartLink>، <sequenceLink>التسلسلات</sequenceLink>، و<classLink>الفئات</classLink> فقط. سيتم عرض الأنواع الأخرى كصورة في Excalidraw.",
     "syntax": "صيغة Mermaid",
-    "preview": "معاينة",
-    "label": "",
-    "inputPlaceholder": ""
-  },
-  "ttd": {
-    "error": ""
-  },
-  "chat": {
-    "inputPlaceholder": "",
-    "inputPlaceholderWithMessages": "",
-    "generating": "",
-    "rateLimitRemaining": "",
-    "role": {
-      "user": "",
-      "assistant": "",
-      "system": ""
-    },
-    "aiBeta": "",
-    "label": "",
-    "menu": "",
-    "newChat": "",
-    "deleteChat": "",
-    "deleteMessage": "",
-    "viewAsMermaid": "",
-    "placeholder": {
-      "title": "",
-      "description": "",
-      "hint": ""
-    },
-    "preview": "",
-    "insert": "",
-    "retry": "",
-    "errors": {
-      "promptTooShort": "",
-      "promptTooLong": "",
-      "generationFailed": "",
-      "invalidDiagram": "",
-      "fixInMermaid": "",
-      "aiRepair": "",
-      "requestAborted": "",
-      "requestFailed": "",
-      "mermaidParseError": ""
-    },
-    "rateLimit": {
-      "messageLimit": "",
-      "generalRateLimit": "",
-      "messageLimitInputPlaceholder": ""
-    },
-    "upsellBtnLabel": ""
+    "preview": "معاينة"
   },
   "quickSearch": {
     "placeholder": "بحث سريع"

packages/excalidraw/locales/az-AZ.json

@@ -558,8 +558,6 @@
   "welcomeScreen": {
     "app": {
       "center_heading": "",
-      "center_heading_line2": "",
-      "center_heading_line3": "",
       "center_heading_plus": "",
       "menuHint": ""
     },
@@ -614,55 +612,7 @@
     "button": "",
     "description": "",
     "syntax": "",
-    "preview": "",
-    "label": "",
-    "inputPlaceholder": ""
-  },
-  "ttd": {
-    "error": ""
-  },
-  "chat": {
-    "inputPlaceholder": "",
-    "inputPlaceholderWithMessages": "",
-    "generating": "",
-    "rateLimitRemaining": "",
-    "role": {
-      "user": "",
-      "assistant": "",
-      "system": ""
-    },
-    "aiBeta": "",
-    "label": "",
-    "menu": "",
-    "newChat": "",
-    "deleteChat": "",
-    "deleteMessage": "",
-    "viewAsMermaid": "",
-    "placeholder": {
-      "title": "",
-      "description": "",
-      "hint": ""
-    },
-    "preview": "",
-    "insert": "",
-    "retry": "",
-    "errors": {
-      "promptTooShort": "",
-      "promptTooLong": "",
-      "generationFailed": "",
-      "invalidDiagram": "",
-      "fixInMermaid": "",
-      "aiRepair": "",
-      "requestAborted": "",
-      "requestFailed": "",
-      "mermaidParseError": ""
-    },
-    "rateLimit": {
-      "messageLimit": "",
-      "generalRateLimit": "",
-      "messageLimitInputPlaceholder": ""
-    },
-    "upsellBtnLabel": ""
+    "preview": ""
   },
   "quickSearch": {
     "placeholder": ""

packages/excalidraw/locales/bg-BG.json

@@ -557,9 +557,7 @@
   },
   "welcomeScreen": {
     "app": {
-      "center_heading": "",
-      "center_heading_line2": "",
-      "center_heading_line3": "",
+      "center_heading": "Всичките Ви данни са запазени локално в браузъра Ви.",
       "center_heading_plus": "",
       "menuHint": "Експорт, предпочитания, езици, ..."
     },
@@ -614,55 +612,7 @@
     "button": "Вмъкни",
     "description": "",
     "syntax": "Mermaid Синтаксис",
-    "preview": "Преглед",
-    "label": "",
-    "inputPlaceholder": ""
-  },
-  "ttd": {
-    "error": ""
-  },
-  "chat": {
-    "inputPlaceholder": "",
-    "inputPlaceholderWithMessages": "",
-    "generating": "",
-    "rateLimitRemaining": "",
-    "role": {
-      "user": "",
-      "assistant": "",
-      "system": ""
-    },
-    "aiBeta": "",
-    "label": "",
-    "menu": "",
-    "newChat": "",
-    "deleteChat": "",
-    "deleteMessage": "",
-    "viewAsMermaid": "",
-    "placeholder": {
-      "title": "",
-      "description": "",
-      "hint": ""
-    },
-    "preview": "",
-    "insert": "",
-    "retry": "",
-    "errors": {
-      "promptTooShort": "",
-      "promptTooLong": "",
-      "generationFailed": "",
-      "invalidDiagram": "",
-      "fixInMermaid": "",
-      "aiRepair": "",
-      "requestAborted": "",
-      "requestFailed": "",
-      "mermaidParseError": ""
-    },
-    "rateLimit": {
-      "messageLimit": "",
-      "generalRateLimit": "",
-      "messageLimitInputPlaceholder": ""
-    },
-    "upsellBtnLabel": ""
+    "preview": "Преглед"
   },
   "quickSearch": {
     "placeholder": ""

packages/excalidraw/locales/bn-BD.json

@@ -558,8 +558,6 @@
   "welcomeScreen": {
     "app": {
       "center_heading": "",
-      "center_heading_line2": "",
-      "center_heading_line3": "",
       "center_heading_plus": "",
       "menuHint": ""
     },
@@ -614,55 +612,7 @@
     "button": "",
     "description": "",
     "syntax": "",
-    "preview": "",
-    "label": "",
-    "inputPlaceholder": ""
-  },
-  "ttd": {
-    "error": ""
-  },
-  "chat": {
-    "inputPlaceholder": "",
-    "inputPlaceholderWithMessages": "",
-    "generating": "",
-    "rateLimitRemaining": "",
-    "role": {
-      "user": "",
-      "assistant": "",
-      "system": ""
-    },
-    "aiBeta": "",
-    "label": "",
-    "menu": "",
-    "newChat": "",
-    "deleteChat": "",
-    "deleteMessage": "",
-    "viewAsMermaid": "",
-    "placeholder": {
-      "title": "",
-      "description": "",
-      "hint": ""
-    },
-    "preview": "",
-    "insert": "",
-    "retry": "",
-    "errors": {
-      "promptTooShort": "",
-      "promptTooLong": "",
-      "generationFailed": "",
-      "invalidDiagram": "",
-      "fixInMermaid": "",
-      "aiRepair": "",
-      "requestAborted": "",
-      "requestFailed": "",
-      "mermaidParseError": ""
-    },
-    "rateLimit": {
-      "messageLimit": "",
-      "generalRateLimit": "",
-      "messageLimitInputPlaceholder": ""
-    },
-    "upsellBtnLabel": ""
+    "preview": ""
   },
   "quickSearch": {
     "placeholder": ""

packages/excalidraw/locales/bn-IN.json

@@ -558,8 +558,6 @@
   "welcomeScreen": {
     "app": {
       "center_heading": "",
-      "center_heading_line2": "",
-      "center_heading_line3": "",
       "center_heading_plus": "",
       "menuHint": ""
     },
@@ -614,55 +612,7 @@
     "button": "",
     "description": "",
     "syntax": "",
-    "preview": "",
-    "label": "",
-    "inputPlaceholder": ""
-  },
-  "ttd": {
-    "error": ""
-  },
-  "chat": {
-    "inputPlaceholder": "",
-    "inputPlaceholderWithMessages": "",
-    "generating": "",
-    "rateLimitRemaining": "",
-    "role": {
-      "user": "",
-      "assistant": "",
-      "system": ""
-    },
-    "aiBeta": "",
-    "label": "",
-    "menu": "",
-    "newChat": "",
-    "deleteChat": "",
-    "deleteMessage": "",
-    "viewAsMermaid": "",
-    "placeholder": {
-      "title": "",
-      "description": "",
-      "hint": ""
-    },
-    "preview": "",
-    "insert": "",
-    "retry": "",
-    "errors": {
-      "promptTooShort": "",
-      "promptTooLong": "",
-      "generationFailed": "",
-      "invalidDiagram": "",
-      "fixInMermaid": "",
-      "aiRepair": "",
-      "requestAborted": "",
-      "requestFailed": "",
-      "mermaidParseError": ""
-    },
-    "rateLimit": {
-      "messageLimit": "",
-      "generalRateLimit": "",
-      "messageLimitInputPlaceholder": ""
-    },
-    "upsellBtnLabel": ""
+    "preview": ""
   },
   "quickSearch": {
     "placeholder": ""

packages/excalidraw/locales/ca-ES.json

@@ -557,9 +557,7 @@
   },
   "welcomeScreen": {
     "app": {
-      "center_heading": "",
-      "center_heading_line2": "",
-      "center_heading_line3": "",
+      "center_heading": "Totes les vostres dades es guarden localment al vostre navegador.",
       "center_heading_plus": "Vols anar a Excalidraw+ en comptes?",
       "menuHint": "Exportar, preferències, llenguatges..."
     },
@@ -614,55 +612,7 @@
     "button": "Inseriu",
     "description": "Actualment només s'admeten els diagrames <flowchartLink>Flowchart</flowchartLink>, <sequenceLink> Sequence, </sequenceLink> i <classLink> Class </classLink>. Els altres tipus es representaran com a imatge a Excalidraw.",
     "syntax": "Sintaxi de Mermaid",
-    "preview": "Previsualització",
-    "label": "",
-    "inputPlaceholder": ""
-  },
-  "ttd": {
-    "error": ""
-  },
-  "chat": {
-    "inputPlaceholder": "",
-    "inputPlaceholderWithMessages": "",
-    "generating": "",
-    "rateLimitRemaining": "",
-    "role": {
-      "user": "",
-      "assistant": "",
-      "system": ""
-    },
-    "aiBeta": "",
-    "label": "",
-    "menu": "",
-    "newChat": "",
-    "deleteChat": "",
-    "deleteMessage": "",
-    "viewAsMermaid": "",
-    "placeholder": {
-      "title": "",
-      "description": "",
-      "hint": ""
-    },
-    "preview": "",
-    "insert": "",
-    "retry": "",
-    "errors": {
-      "promptTooShort": "",
-      "promptTooLong": "",
-      "generationFailed": "",
-      "invalidDiagram": "",
-      "fixInMermaid": "",
-      "aiRepair": "",
-      "requestAborted": "",
-      "requestFailed": "",
-      "mermaidParseError": ""
-    },
-    "rateLimit": {
-      "messageLimit": "",
-      "generalRateLimit": "",
-      "messageLimitInputPlaceholder": ""
-    },
-    "upsellBtnLabel": ""
+    "preview": "Previsualització"
   },
   "quickSearch": {
     "placeholder": "Cerca ràpida"