add stats menu to preferences

# Conflicts:
#	package.json
#	packages/excalidraw/.size-limit.json
#	packages/excalidraw/components/dropdownMenu/DropdownMenuSub.tsx
#	packages/excalidraw/components/dropdownMenu/DropdownMenuSubContent.tsx
#	packages/excalidraw/components/dropdownMenu/DropdownMenuSubItem.tsx
#	packages/excalidraw/components/dropdownMenu/DropdownMenuSubTrigger.tsx
#	packages/excalidraw/components/main-menu/MainMenu.tsx
#	packages/excalidraw/tests/excalidraw.test.tsx
#	packages/excalidraw/tests/library.test.tsx
#	src/components/Actions.tsx
#	src/components/dropdownMenu/DropdownMenu.scss
#	src/components/dropdownMenu/DropdownMenuItem.tsx
#	yarn.lock

examples/with-script-in-browser/components/ExampleApp.tsx

@@ -615,6 +615,52 @@ export default function ExampleApp({
   const renderMenu = () => {
     return (
       <MainMenu>
+        <MainMenu.Sub>
+          <MainMenu.Sub.Trigger
+            title="Custom trigger"
+            icon={
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+                strokeWidth={1.5}
+                stroke="currentColor"
+                className="w-6 h-6"
+              >
+                <path
+                  strokeLinecap="round"
+                  strokeLinejoin="round"
+                  d="M15.042 21.672L13.684 16.6m0 0l-2.51 2.225.569-9.47 5.227 7.917-3.286-.672zm-7.518-.267A8.25 8.25 0 1120.25 10.5M8.288 14.212A5.25 5.25 0 1117.25 10.5"
+                />
+              </svg>
+            }
+          >
+            Submenu trigger
+          </MainMenu.Sub.Trigger>
+          <MainMenu.Sub.Content>
+            <MainMenu.Sub.Item
+              icon={
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  fill="none"
+                  viewBox="0 0 24 24"
+                  strokeWidth={1.5}
+                  stroke="currentColor"
+                  className="w-6 h-6"
+                >
+                  <path
+                    strokeLinecap="round"
+                    strokeLinejoin="round"
+                    d="M12 7.5h1.5m-1.5 3h1.5m-7.5 3h7.5m-7.5 3h7.5m3-9h3.375c.621 0 1.125.504 1.125 1.125V18a2.25 2.25 0 01-2.25 2.25M16.5 7.5V18a2.25 2.25 0 002.25 2.25M16.5 7.5V4.875c0-.621-.504-1.125-1.125-1.125H4.125C3.504 3.75 3 4.254 3 4.875V18a2.25 2.25 0 002.25 2.25h13.5M6 7.5h3v3H6v-3z"
+                  />
+                </svg>
+              }
+              onSelect={() => window.alert("You clicked on sub item")}
+            >
+              Sub item
+            </MainMenu.Sub.Item>
+          </MainMenu.Sub.Content>
+        </MainMenu.Sub>
         <MainMenu.DefaultItems.SaveAsImage />
         <MainMenu.DefaultItems.Export />
         <MainMenu.Separator />
@@ -622,10 +668,57 @@ export default function ExampleApp({
           isCollaborating={isCollaborating}
           onSelect={() => window.alert("You clicked on collab button")}
         />
+        <MainMenu.Sub>
+          <MainMenu.Sub.Trigger>Trigger</MainMenu.Sub.Trigger>
+          <MainMenu.Sub.Content>
+            <MainMenu.Sub.Item
+              onSelect={() => window.alert("You clicked on sub item")}
+            >
+              Sub item
+            </MainMenu.Sub.Item>
+          </MainMenu.Sub.Content>
+        </MainMenu.Sub>
         <MainMenu.Group title="Excalidraw links">
           <MainMenu.DefaultItems.Socials />
         </MainMenu.Group>
-        <MainMenu.Separator />
+        {/* <MainMenu.Separator /> */}
+        <MainMenu.Sub>
+          <MainMenu.Sub.Trigger className="custom-classname">
+            Another submenu trigger
+          </MainMenu.Sub.Trigger>
+          <MainMenu.Sub.Content className="custom-classname-for-content">
+            <MainMenu.Sub.Item
+              title="Sub item"
+              onSelect={() => window.alert("You clicked on sub item")}
+            >
+              Sub item
+            </MainMenu.Sub.Item>
+          </MainMenu.Sub.Content>
+        </MainMenu.Sub>
+        <MainMenu.Sub>
+          <MainMenu.Sub.Trigger>Trigger me</MainMenu.Sub.Trigger>
+          <MainMenu.Sub.Content>
+            <MainMenu.Sub>
+              <MainMenu.Sub.Trigger>Trigger me inside</MainMenu.Sub.Trigger>
+              <MainMenu.Sub.Content>
+                <MainMenu.Sub.Item
+                  onSelect={() => {
+                    alert("wow, nested submenus!");
+                  }}
+                >
+                  Item wow
+                </MainMenu.Sub.Item>
+              </MainMenu.Sub.Content>
+            </MainMenu.Sub>
+            <MainMenu.Sub.Item
+              onSelect={() => {
+                alert("wow, nested submenus! very cool");
+              }}
+            >
+              Another one
+            </MainMenu.Sub.Item>
+          </MainMenu.Sub.Content>
+        </MainMenu.Sub>
         <MainMenu.ItemCustom>
           <button
             style={{ height: "2rem" }}

excalidraw-app/App.tsx

@@ -20,7 +20,6 @@ import {
   APP_NAME,
   EVENT,
   THEME,
-  TITLE_TIMEOUT,
   VERSION_TIMEOUT,
   debounce,
   getVersion,
@@ -499,11 +498,6 @@ const ExcalidrawWrapper = () => {
       }
     };
 
-    const titleTimeout = setTimeout(
-      () => (document.title = APP_NAME),
-      TITLE_TIMEOUT,
-    );
-
     const syncData = debounce(() => {
       if (isTestEnv()) {
         return;
@@ -594,7 +588,6 @@ const ExcalidrawWrapper = () => {
         visibilityChange,
         false,
       );
-      clearTimeout(titleTimeout);
     };
   }, [isCollabDisabled, collabAPI, excalidrawAPI, setLangCode]);
 

excalidraw-app/components/AppMainMenu.tsx

@@ -39,6 +39,7 @@ export const AppMainMenu: React.FC<{
       <MainMenu.DefaultItems.SearchMenu />
       <MainMenu.DefaultItems.Help />
       <MainMenu.DefaultItems.ClearCanvas />
+      <MainMenu.DefaultItems.Preferences />
       <MainMenu.Separator />
       <MainMenu.ItemLink
         icon={ExcalLogo}

excalidraw-app/index.html

@@ -2,9 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>
+    <title>Excalidraw Whiteboard</title>
-      Free, collaborative whiteboard • Hand-drawn look & feel | Excalidraw
-    </title>
     <meta
       name="viewport"
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover, shrink-to-fit=no"

packages/common/src/constants.ts

@@ -28,11 +28,9 @@ export const isBrave = () =>
 export const isMobile =
   isIOS ||
   /android|webos|ipod|blackberry|iemobile|opera mini/i.test(
-    navigator.userAgent.toLowerCase(),
+    navigator.userAgent,
   ) ||
-  /android|ios|ipod|blackberry|windows phone/i.test(
+  /android|ios|ipod|blackberry|windows phone/i.test(navigator.platform);
-    navigator.platform.toLowerCase(),
-  );
 
 export const supportsResizeObserver =
   typeof window !== "undefined" && "ResizeObserver" in window;
@@ -524,3 +522,5 @@ export enum UserIdleState {
  * the start and end points)
  */
 export const LINE_POLYGON_POINT_MERGE_DISTANCE = 20;
+
+export const DOUBLE_TAP_POSITION_THRESHOLD = 35;

packages/element/src/delta.ts

@@ -1111,16 +1111,16 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
     inserted,
   }: Delta<ElementPartial>) =>
     !!(
-      deleted.version &&
-      inserted.version &&
       // versions are required integers
-      Number.isInteger(deleted.version) &&
+      (
-      Number.isInteger(inserted.version) &&
+        Number.isInteger(deleted.version) &&
-      // versions should be positive, zero included
+        Number.isInteger(inserted.version) &&
-      deleted.version >= 0 &&
+        // versions should be positive, zero included
-      inserted.version >= 0 &&
+        deleted.version! >= 0 &&
-      // versions should never be the same
+        inserted.version! >= 0 &&
-      deleted.version !== inserted.version
+        // versions should never be the same
+        deleted.version !== inserted.version
+      )
     );
 
   private static satisfiesUniqueInvariants = (
@@ -1191,9 +1191,10 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
           ElementsDelta.stripIrrelevantProps,
         );
 
-        // ignore updates which would "delete" already deleted element
         if (!prevElement.isDeleted) {
           removed[prevElement.id] = delta;
+        } else {
+          updated[prevElement.id] = delta;
         }
       }
     }
@@ -1221,6 +1222,8 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
         // ignore updates which would "delete" already deleted element
         if (!nextElement.isDeleted) {
           added[nextElement.id] = delta;
+        } else {
+          updated[nextElement.id] = delta;
         }
 
         continue;
@@ -1250,15 +1253,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
           continue;
         }
 
-        const strippedDeleted = ElementsDelta.stripVersionProps(delta.deleted);
+        updated[nextElement.id] = delta;
-        const strippedInserted = ElementsDelta.stripVersionProps(
-          delta.inserted,
-        );
-
-        // making sure there are at least some changes and only changed version & versionNonce does not count!
-        if (Delta.isInnerDifferent(strippedDeleted, strippedInserted, true)) {
-          updated[nextElement.id] = delta;
-        }
       }
     }
 
@@ -1372,15 +1367,8 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
           latestDelta = delta;
         }
 
-        const strippedDeleted = ElementsDelta.stripVersionProps(
-          latestDelta.deleted,
-        );
-        const strippedInserted = ElementsDelta.stripVersionProps(
-          latestDelta.inserted,
-        );
-
         // it might happen that after applying latest changes the delta itself does not contain any changes
-        if (Delta.isInnerDifferent(strippedDeleted, strippedInserted)) {
+        if (Delta.isInnerDifferent(latestDelta.deleted, latestDelta.inserted)) {
           modifiedDeltas[id] = latestDelta;
         }
       }
@@ -2075,12 +2063,4 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
 
     return strippedPartial;
   }
-
-  private static stripVersionProps(
-    partial: Partial<OrderedExcalidrawElement>,
-  ): ElementPartial {
-    const { version, versionNonce, ...strippedPartial } = partial;
-
-    return strippedPartial;
-  }
 }

packages/element/src/elbowArrow.ts

@@ -359,6 +359,12 @@ const handleSegmentRelease = (
     null,
   );
 
+  if (!restoredPoints || restoredPoints.length < 2) {
+    throw new Error(
+      "Property 'points' is required in the update returned by normalizeArrowElementUpdate()",
+    );
+  }
+
   const nextPoints: GlobalPoint[] = [];
 
   // First part of the arrow are the old points
@@ -706,7 +712,7 @@ const handleEndpointDrag = (
   endGlobalPoint: GlobalPoint,
   hoveredStartElement: ExcalidrawBindableElement | null,
   hoveredEndElement: ExcalidrawBindableElement | null,
-) => {
+): ElementUpdate<ExcalidrawElbowArrowElement> => {
   let startIsSpecial = arrow.startIsSpecial ?? null;
   let endIsSpecial = arrow.endIsSpecial ?? null;
   const globalUpdatedPoints = updatedPoints.map((p, i) =>
@@ -741,8 +747,15 @@ const handleEndpointDrag = (
 
   // Calculate the moving second point connection and add the start point
   {
-    const secondPoint = globalUpdatedPoints[startIsSpecial ? 2 : 1];
+    const secondPoint = globalUpdatedPoints.at(startIsSpecial ? 2 : 1);
-    const thirdPoint = globalUpdatedPoints[startIsSpecial ? 3 : 2];
+    const thirdPoint = globalUpdatedPoints.at(startIsSpecial ? 3 : 2);
+
+    if (!secondPoint || !thirdPoint) {
+      throw new Error(
+        `Second and third points must exist when handling endpoint drag (${startIsSpecial})`,
+      );
+    }
+
     const startIsHorizontal = headingIsHorizontal(startHeading);
     const secondIsHorizontal = headingIsHorizontal(
       vectorToHeading(vectorFromPoint(secondPoint, thirdPoint)),
@@ -801,10 +814,19 @@ const handleEndpointDrag = (
 
   // Calculate the moving second to last point connection
   {
-    const secondToLastPoint =
+    const secondToLastPoint = globalUpdatedPoints.at(
-      globalUpdatedPoints[globalUpdatedPoints.length - (endIsSpecial ? 3 : 2)];
+      globalUpdatedPoints.length - (endIsSpecial ? 3 : 2),
-    const thirdToLastPoint =
+    );
-      globalUpdatedPoints[globalUpdatedPoints.length - (endIsSpecial ? 4 : 3)];
+    const thirdToLastPoint = globalUpdatedPoints.at(
+      globalUpdatedPoints.length - (endIsSpecial ? 4 : 3),
+    );
+
+    if (!secondToLastPoint || !thirdToLastPoint) {
+      throw new Error(
+        `Second and third to last points must exist when handling endpoint drag (${endIsSpecial})`,
+      );
+    }
+
     const endIsHorizontal = headingIsHorizontal(endHeading);
     const secondIsHorizontal = headingForPointIsHorizontal(
       thirdToLastPoint,
@@ -2071,16 +2093,7 @@ const normalizeArrowElementUpdate = (
   nextFixedSegments: readonly FixedSegment[] | null,
   startIsSpecial?: ExcalidrawElbowArrowElement["startIsSpecial"],
   endIsSpecial?: ExcalidrawElbowArrowElement["startIsSpecial"],
-): {
+): ElementUpdate<ExcalidrawElbowArrowElement> => {
-  points: LocalPoint[];
-  x: number;
-  y: number;
-  width: number;
-  height: number;
-  fixedSegments: readonly FixedSegment[] | null;
-  startIsSpecial?: ExcalidrawElbowArrowElement["startIsSpecial"];
-  endIsSpecial?: ExcalidrawElbowArrowElement["startIsSpecial"];
-} => {
   const offsetX = global[0][0];
   const offsetY = global[0][1];
   let points = global.map((p) =>

packages/element/src/resizeElements.ts

@@ -35,6 +35,7 @@ import {
   getContainerElement,
   handleBindTextResize,
   getBoundTextMaxWidth,
+  computeBoundTextPosition,
 } from "./textElement";
 import {
   getMinTextElementWidth,
@@ -225,7 +226,16 @@ const rotateSingleElement = (
       scene.getElement<ExcalidrawTextElementWithContainer>(boundTextElementId);
 
     if (textElement && !isArrowElement(element)) {
-      scene.mutateElement(textElement, { angle });
+      const { x, y } = computeBoundTextPosition(
+        element,
+        textElement,
+        scene.getNonDeletedElementsMap(),
+      );
+      scene.mutateElement(textElement, {
+        angle,
+        x,
+        y,
+      });
     }
   }
 };
@@ -416,9 +426,15 @@ const rotateMultipleElements = (
 
       const boundText = getBoundTextElement(element, elementsMap);
       if (boundText && !isArrowElement(element)) {
+        const { x, y } = computeBoundTextPosition(
+          element,
+          boundText,
+          elementsMap,
+        );
+
         scene.mutateElement(boundText, {
-          x: boundText.x + (rotatedCX - cx),
+          x,
-          y: boundText.y + (rotatedCY - cy),
+          y,
           angle: normalizeRadians((centerAngle + origAngle) as Radians),
         });
       }

packages/element/src/textElement.ts

@@ -10,12 +10,12 @@ import {
   invariant,
 } from "@excalidraw/common";
 
+import { pointFrom, pointRotateRads, type Radians } from "@excalidraw/math";
+
 import type { AppState } from "@excalidraw/excalidraw/types";
 
 import type { ExtractSetType } from "@excalidraw/common/utility-types";
 
-import type { Radians } from "@excalidraw/math";
-
 import {
   resetOriginalContainerCache,
   updateOriginalContainerCache,
@@ -254,6 +254,26 @@ export const computeBoundTextPosition = (
     x =
       containerCoords.x + (maxContainerWidth / 2 - boundTextElement.width / 2);
   }
+  const angle = (container.angle ?? 0) as Radians;
+
+  if (angle !== 0) {
+    const contentCenter = pointFrom(
+      containerCoords.x + maxContainerWidth / 2,
+      containerCoords.y + maxContainerHeight / 2,
+    );
+    const textCenter = pointFrom(
+      x + boundTextElement.width / 2,
+      y + boundTextElement.height / 2,
+    );
+
+    const [rx, ry] = pointRotateRads(textCenter, contentCenter, angle);
+
+    return {
+      x: rx - boundTextElement.width / 2,
+      y: ry - boundTextElement.height / 2,
+    };
+  }
+
   return { x, y };
 };
 

packages/element/tests/delta.test.tsx

@@ -8,7 +8,7 @@ import { AppStateDelta, Delta, ElementsDelta } from "../src/delta";
 
 describe("ElementsDelta", () => {
   describe("elements delta calculation", () => {
-    it("should not create removed delta when element gets removed but was already deleted", () => {
+    it("should not throw when element gets removed but was already deleted", () => {
       const element = API.createElement({
         type: "rectangle",
         x: 100,
@@ -19,12 +19,12 @@ describe("ElementsDelta", () => {
       const prevElements = new Map([[element.id, element]]);
       const nextElements = new Map();
 
-      const delta = ElementsDelta.calculate(prevElements, nextElements);
+      expect(() =>
-
+        ElementsDelta.calculate(prevElements, nextElements),
-      expect(delta.isEmpty()).toBeTruthy();
+      ).not.toThrow();
     });
 
-    it("should not create added delta when adding element as already deleted", () => {
+    it("should not throw when adding element as already deleted", () => {
       const element = API.createElement({
         type: "rectangle",
         x: 100,
@@ -35,12 +35,12 @@ describe("ElementsDelta", () => {
       const prevElements = new Map();
       const nextElements = new Map([[element.id, element]]);
 
-      const delta = ElementsDelta.calculate(prevElements, nextElements);
+      expect(() =>
-
+        ElementsDelta.calculate(prevElements, nextElements),
-      expect(delta.isEmpty()).toBeTruthy();
+      ).not.toThrow();
     });
 
-    it("should not create updated delta when there is only version and versionNonce change", () => {
+    it("should create updated delta even when there is only version and versionNonce change", () => {
       const baseElement = API.createElement({
         type: "rectangle",
         x: 100,
@@ -65,7 +65,24 @@ describe("ElementsDelta", () => {
         nextElements as SceneElementsMap,
       );
 
-      expect(delta.isEmpty()).toBeTruthy();
+      expect(delta).toEqual(
+        ElementsDelta.create(
+          {},
+          {},
+          {
+            [baseElement.id]: Delta.create(
+              {
+                version: baseElement.version,
+                versionNonce: baseElement.versionNonce,
+              },
+              {
+                version: baseElement.version + 1,
+                versionNonce: baseElement.versionNonce + 1,
+              },
+            ),
+          },
+        ),
+      );
     });
   });
 

packages/element/tests/textElement.test.ts

@@ -1,13 +1,14 @@
 import { getLineHeight } from "@excalidraw/common";
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 
-import { FONT_FAMILY } from "@excalidraw/common";
+import { FONT_FAMILY, TEXT_ALIGN, VERTICAL_ALIGN } from "@excalidraw/common";
 
 import {
   computeContainerDimensionForBoundText,
   getContainerCoords,
   getBoundTextMaxWidth,
   getBoundTextMaxHeight,
+  computeBoundTextPosition,
 } from "../src/textElement";
 import { detectLineHeight, getLineHeightInPx } from "../src/textMeasurements";
 
@@ -207,3 +208,172 @@ describe("Test getDefaultLineHeight", () => {
     expect(getLineHeight(FONT_FAMILY.Cascadia)).toBe(1.2);
   });
 });
+
+describe("Test computeBoundTextPosition", () => {
+  const createMockElementsMap = () => new Map();
+
+  // Helper function to create rectangle test case with 90-degree rotation
+  const createRotatedRectangleTestCase = (
+    textAlign: string,
+    verticalAlign: string,
+  ) => {
+    const container = API.createElement({
+      type: "rectangle",
+      x: 100,
+      y: 100,
+      width: 200,
+      height: 100,
+      angle: (Math.PI / 2) as any, // 90 degrees
+    });
+
+    const boundTextElement = API.createElement({
+      type: "text",
+      width: 80,
+      height: 40,
+      text: "hello darkness my old friend",
+      textAlign: textAlign as any,
+      verticalAlign: verticalAlign as any,
+      containerId: container.id,
+    }) as ExcalidrawTextElementWithContainer;
+
+    const elementsMap = createMockElementsMap();
+
+    return { container, boundTextElement, elementsMap };
+  };
+
+  describe("90-degree rotation with all alignment combinations", () => {
+    // Test all 9 combinations of horizontal (left, center, right) and vertical (top, middle, bottom) alignment
+
+    it("should position text with LEFT + TOP alignment at 90-degree rotation", () => {
+      const { container, boundTextElement, elementsMap } =
+        createRotatedRectangleTestCase(TEXT_ALIGN.LEFT, VERTICAL_ALIGN.TOP);
+
+      const result = computeBoundTextPosition(
+        container,
+        boundTextElement,
+        elementsMap,
+      );
+
+      expect(result.x).toBeCloseTo(185, 1);
+      expect(result.y).toBeCloseTo(75, 1);
+    });
+
+    it("should position text with LEFT + MIDDLE alignment at 90-degree rotation", () => {
+      const { container, boundTextElement, elementsMap } =
+        createRotatedRectangleTestCase(TEXT_ALIGN.LEFT, VERTICAL_ALIGN.MIDDLE);
+
+      const result = computeBoundTextPosition(
+        container,
+        boundTextElement,
+        elementsMap,
+      );
+
+      expect(result.x).toBeCloseTo(160, 1);
+      expect(result.y).toBeCloseTo(75, 1);
+    });
+
+    it("should position text with LEFT + BOTTOM alignment at 90-degree rotation", () => {
+      const { container, boundTextElement, elementsMap } =
+        createRotatedRectangleTestCase(TEXT_ALIGN.LEFT, VERTICAL_ALIGN.BOTTOM);
+
+      const result = computeBoundTextPosition(
+        container,
+        boundTextElement,
+        elementsMap,
+      );
+
+      expect(result.x).toBeCloseTo(135, 1);
+      expect(result.y).toBeCloseTo(75, 1);
+    });
+
+    it("should position text with CENTER + TOP alignment at 90-degree rotation", () => {
+      const { container, boundTextElement, elementsMap } =
+        createRotatedRectangleTestCase(TEXT_ALIGN.CENTER, VERTICAL_ALIGN.TOP);
+
+      const result = computeBoundTextPosition(
+        container,
+        boundTextElement,
+        elementsMap,
+      );
+
+      expect(result.x).toBeCloseTo(185, 1);
+      expect(result.y).toBeCloseTo(130, 1);
+    });
+
+    it("should position text with CENTER + MIDDLE alignment at 90-degree rotation", () => {
+      const { container, boundTextElement, elementsMap } =
+        createRotatedRectangleTestCase(
+          TEXT_ALIGN.CENTER,
+          VERTICAL_ALIGN.MIDDLE,
+        );
+
+      const result = computeBoundTextPosition(
+        container,
+        boundTextElement,
+        elementsMap,
+      );
+
+      expect(result.x).toBeCloseTo(160, 1);
+      expect(result.y).toBeCloseTo(130, 1);
+    });
+
+    it("should position text with CENTER + BOTTOM alignment at 90-degree rotation", () => {
+      const { container, boundTextElement, elementsMap } =
+        createRotatedRectangleTestCase(
+          TEXT_ALIGN.CENTER,
+          VERTICAL_ALIGN.BOTTOM,
+        );
+
+      const result = computeBoundTextPosition(
+        container,
+        boundTextElement,
+        elementsMap,
+      );
+
+      expect(result.x).toBeCloseTo(135, 1);
+      expect(result.y).toBeCloseTo(130, 1);
+    });
+
+    it("should position text with RIGHT + TOP alignment at 90-degree rotation", () => {
+      const { container, boundTextElement, elementsMap } =
+        createRotatedRectangleTestCase(TEXT_ALIGN.RIGHT, VERTICAL_ALIGN.TOP);
+
+      const result = computeBoundTextPosition(
+        container,
+        boundTextElement,
+        elementsMap,
+      );
+
+      expect(result.x).toBeCloseTo(185, 1);
+      expect(result.y).toBeCloseTo(185, 1);
+    });
+
+    it("should position text with RIGHT + MIDDLE alignment at 90-degree rotation", () => {
+      const { container, boundTextElement, elementsMap } =
+        createRotatedRectangleTestCase(TEXT_ALIGN.RIGHT, VERTICAL_ALIGN.MIDDLE);
+
+      const result = computeBoundTextPosition(
+        container,
+        boundTextElement,
+        elementsMap,
+      );
+
+      expect(result.x).toBeCloseTo(160, 1);
+      expect(result.y).toBeCloseTo(185, 1);
+    });
+
+    it("should position text with RIGHT + BOTTOM alignment at 90-degree rotation", () => {
+      const { container, boundTextElement, elementsMap } =
+        createRotatedRectangleTestCase(TEXT_ALIGN.RIGHT, VERTICAL_ALIGN.BOTTOM);
+
+      const result = computeBoundTextPosition(
+        container,
+        boundTextElement,
+        elementsMap,
+      );
+
+      expect(result.x).toBeCloseTo(135, 1);
+      expect(result.y).toBeCloseTo(185, 1);
+    });
+  });
+});

packages/excalidraw/actions/shortcuts.ts

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

packages/excalidraw/components/Actions.tsx

@@ -397,6 +397,7 @@ export const ShapesSwitcher = ({
           onClickOutside={() => setIsExtraToolsMenuOpen(false)}
           onSelect={() => setIsExtraToolsMenuOpen(false)}
           className="App-toolbar__extra-tools-dropdown"
+          align="end"
         >
           <DropdownMenu.Item
             onSelect={() => app.setActiveTool({ type: "frame" })}
@@ -450,10 +451,10 @@ export const ShapesSwitcher = ({
               <DropdownMenu.Item
                 onSelect={() => app.onMagicframeToolSelect()}
                 icon={MagicIcon}
+                badge={<DropdownMenu.Item.Badge>AI</DropdownMenu.Item.Badge>}
                 data-testid="toolbar-magicframe"
               >
                 {t("toolBar.magicframe")}
-                <DropdownMenu.Item.Badge>AI</DropdownMenu.Item.Badge>
               </DropdownMenu.Item>
             </>
           )}

packages/excalidraw/components/App.tsx

@@ -102,6 +102,7 @@ import {
   Emitter,
   isMobile,
   MINIMUM_ARROW_SIZE,
+  DOUBLE_TAP_POSITION_THRESHOLD,
 } from "@excalidraw/common";
 
 import {
@@ -531,6 +532,7 @@ export const useExcalidrawActionManager = () =>
 
 let didTapTwice: boolean = false;
 let tappedTwiceTimer = 0;
+let firstTapPosition: { x: number; y: number } | null = null;
 let isHoldingSpace: boolean = false;
 let isPanning: boolean = false;
 let isDraggingScrollBar: boolean = false;
@@ -2989,6 +2991,7 @@ class App extends React.Component<AppProps, AppState> {
 
   private static resetTapTwice() {
     didTapTwice = false;
+    firstTapPosition = null;
   }
 
   private onTouchStart = (event: TouchEvent) => {
@@ -2999,6 +3002,13 @@ class App extends React.Component<AppProps, AppState> {
 
     if (!didTapTwice) {
       didTapTwice = true;
+
+      if (event.touches.length === 1) {
+        firstTapPosition = {
+          x: event.touches[0].clientX,
+          y: event.touches[0].clientY,
+        };
+      }
       clearTimeout(tappedTwiceTimer);
       tappedTwiceTimer = window.setTimeout(
         App.resetTapTwice,
@@ -3006,15 +3016,29 @@ class App extends React.Component<AppProps, AppState> {
       );
       return;
     }
-    // insert text only if we tapped twice with a single finger
+
+    // insert text only if we tapped twice with a single finger at approximately the same position
     // event.touches.length === 1 will also prevent inserting text when user's zooming
-    if (didTapTwice && event.touches.length === 1) {
+    if (didTapTwice && event.touches.length === 1 && firstTapPosition) {
       const touch = event.touches[0];
-      // @ts-ignore
+      const distance = pointDistance(
-      this.handleCanvasDoubleClick({
+        pointFrom(touch.clientX, touch.clientY),
-        clientX: touch.clientX,
+        pointFrom(firstTapPosition.x, firstTapPosition.y),
-        clientY: touch.clientY,
+      );
-      });
+
+      // only create text if the second tap is within the threshold of the first tap
+      // this prevents accidental text creation during dragging/selection
+      if (distance <= DOUBLE_TAP_POSITION_THRESHOLD) {
+        // end lasso trail and deselect elements just in case
+        this.lassoTrail.endPath();
+        this.deselectElements();
+
+        // @ts-ignore
+        this.handleCanvasDoubleClick({
+          clientX: touch.clientX,
+          clientY: touch.clientY,
+        });
+      }
       didTapTwice = false;
       clearTimeout(tappedTwiceTimer);
     }

packages/excalidraw/components/Button.tsx

@@ -11,7 +11,7 @@ interface ButtonProps
     HTMLButtonElement
   > {
   type?: "button" | "submit" | "reset";
-  onSelect: () => any;
+  onSelect: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => any;
   /** whether button is in active state */
   selected?: boolean;
   children: React.ReactNode;
@@ -34,7 +34,7 @@ export const Button = ({
   return (
     <button
       onClick={composeEventHandlers(rest.onClick, (event) => {
-        onSelect();
+        onSelect(event);
       })}
       type={type}
       className={clsx("excalidraw-button", className, { selected })}

packages/excalidraw/components/ColorPicker/ColorPicker.scss

@@ -30,6 +30,18 @@
     align-items: center;
   }
 
+  #canvas-bg-color-picker-container {
+    .color-picker__top-picks {
+      gap: 0.5rem;
+    }
+
+    .color-picker-container {
+      @include isMobile {
+        max-width: none;
+      }
+    }
+  }
+
   .color-picker__button {
     --radius: 4px;
     --size: 1.375rem;

packages/excalidraw/components/FontPicker/FontPickerList.tsx

@@ -25,10 +25,6 @@ import { PropertiesPopover } from "../PropertiesPopover";
 import { QuickSearch } from "../QuickSearch";
 import { ScrollableList } from "../ScrollableList";
 import DropdownMenuGroup from "../dropdownMenu/DropdownMenuGroup";
-import DropdownMenuItem, {
-  DropDownMenuItemBadgeType,
-  DropDownMenuItemBadge,
-} from "../dropdownMenu/DropdownMenuItem";
 import {
   FontFamilyCodeIcon,
   FontFamilyHeadingIcon,
@@ -36,8 +32,15 @@ import {
   FreedrawIcon,
 } from "../icons";
 
+import { Ellipsify } from "../Ellipsify";
+
 import { fontPickerKeyHandler } from "./keyboardNavHandlers";
 
+import {
+  FontPickerListItem,
+  FontPickerListItemBadgeType,
+} from "./FontPickerListItem";
+
 import type { JSX } from "react";
 
 export interface FontDescriptor {
@@ -46,7 +49,7 @@ export interface FontDescriptor {
   text: string;
   deprecated?: true;
   badge?: {
-    type: ValueOf<typeof DropDownMenuItemBadgeType>;
+    type: ValueOf<typeof FontPickerListItemBadgeType>;
     placeholder: string;
   };
 }
@@ -112,7 +115,7 @@ export const FontPickerList = React.memo(
               Object.assign(fontDescriptor, {
                 deprecated: metadata.deprecated,
                 badge: {
-                  type: DropDownMenuItemBadgeType.RED,
+                  type: FontPickerListItemBadgeType.RED,
                   placeholder: t("fontList.badge.old"),
                 },
               });
@@ -227,7 +230,7 @@ export const FontPickerList = React.memo(
     );
 
     const renderFont = (font: FontDescriptor, index: number) => (
-      <DropdownMenuItem
+      <FontPickerListItem
         key={font.value}
         icon={font.icon}
         value={font.value}
@@ -239,8 +242,8 @@ export const FontPickerList = React.memo(
         selected={font.value === selectedFontFamily}
         // allow to tab between search and selected font
         tabIndex={font.value === selectedFontFamily ? 0 : -1}
-        onClick={(e) => {
+        onSelect={() => {
-          onSelect(Number(e.currentTarget.value));
+          onSelect(font.value);
         }}
         onMouseMove={() => {
           if (hoveredFont?.value !== font.value) {
@@ -248,13 +251,13 @@ export const FontPickerList = React.memo(
           }
         }}
       >
-        {font.text}
+        <Ellipsify>{font.text}</Ellipsify>
         {font.badge && (
-          <DropDownMenuItemBadge type={font.badge.type}>
+          <FontPickerListItem.Badge type={font.badge.type}>
             {font.badge.placeholder}
-          </DropDownMenuItemBadge>
+          </FontPickerListItem.Badge>
         )}
-      </DropdownMenuItem>
+      </FontPickerListItem>
     );
 
     const groups = [];

packages/excalidraw/components/FontPicker/FontPickerListItem.tsx

@@ -0,0 +1,151 @@
+import React, { useEffect, useRef } from "react";
+
+import { THEME } from "@excalidraw/common";
+
+import type { ValueOf } from "@excalidraw/common/utility-types";
+
+import { Button } from "../Button";
+
+import { useExcalidrawAppState } from "../App";
+
+import { useDevice } from "../App";
+
+import { getDropdownMenuItemClassName } from "../dropdownMenu/common";
+
+import type { JSX } from "react";
+
+const MenuItemContent = ({
+  textStyle,
+  icon,
+  shortcut,
+  children,
+}: {
+  icon?: React.ReactNode;
+  shortcut?: string;
+  textStyle?: React.CSSProperties;
+  children: React.ReactNode;
+}) => {
+  const device = useDevice();
+  return (
+    <>
+      {icon && <div className="dropdown-menu-item__icon">{icon}</div>}
+      <div style={textStyle} className="dropdown-menu-item__text">
+        {children}
+      </div>
+      {shortcut && !device.editor.isMobile && (
+        <div className="dropdown-menu-item__shortcut">{shortcut}</div>
+      )}
+    </>
+  );
+};
+
+export const FontPickerListItem = ({
+  icon,
+  value,
+  order,
+  children,
+  shortcut,
+  className,
+  hovered,
+  selected,
+  textStyle,
+  onSelect,
+  onClick,
+  ...rest
+}: {
+  icon?: JSX.Element;
+  value?: string | number | undefined;
+  order?: number;
+  onSelect: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
+  children: React.ReactNode;
+  shortcut?: string;
+  hovered?: boolean;
+  selected?: boolean;
+  textStyle?: React.CSSProperties;
+  className?: string;
+} & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, "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 (
+    <div className="radix-menu-item">
+      <Button
+        {...rest}
+        ref={ref}
+        onSelect={onSelect}
+        className={getDropdownMenuItemClassName(className, selected, hovered)}
+        title={rest.title ?? rest["aria-label"]}
+      >
+        <MenuItemContent textStyle={textStyle} icon={icon} shortcut={shortcut}>
+          {children}
+        </MenuItemContent>
+      </Button>
+    </div>
+  );
+};
+FontPickerListItem.displayName = "FontPickerListItem";
+
+export const FontPickerListItemBadgeType = {
+  GREEN: "green",
+  RED: "red",
+  BLUE: "blue",
+} as const;
+
+export const FontPickerListItemBadge = ({
+  type = FontPickerListItemBadgeType.BLUE,
+  children,
+}: {
+  type?: ValueOf<typeof FontPickerListItemBadgeType>;
+  children: React.ReactNode;
+}) => {
+  const { theme } = useExcalidrawAppState();
+  const style = {
+    display: "inline-flex",
+    marginLeft: "auto",
+    padding: "2px 4px",
+    borderRadius: 6,
+    fontSize: 9,
+    fontFamily: "Cascadia, monospace",
+    border: theme === THEME.LIGHT ? "1.5px solid white" : "none",
+  };
+
+  switch (type) {
+    case FontPickerListItemBadgeType.GREEN:
+      Object.assign(style, {
+        backgroundColor: "var(--background-color-badge)",
+        color: "var(--color-badge)",
+      });
+      break;
+    case FontPickerListItemBadgeType.RED:
+      Object.assign(style, {
+        backgroundColor: "pink",
+        color: "darkred",
+      });
+      break;
+    case FontPickerListItemBadgeType.BLUE:
+    default:
+      Object.assign(style, {
+        background: "var(--color-promo)",
+        color: "var(--color-surface-lowest)",
+      });
+  }
+
+  return (
+    <div className="DropDownMenuItemBadge" style={style}>
+      {children}
+    </div>
+  );
+};
+FontPickerListItemBadge.displayName = "DropdownMenuItemBadge";
+
+FontPickerListItem.Badge = FontPickerListItemBadge;

packages/excalidraw/components/HelpDialog.tsx

@@ -238,7 +238,10 @@ export const HelpDialog = ({ onClose }: { onClose?: () => void }) => {
               shortcuts={[getShortcutKey("Enter"), getShortcutKey("Escape")]}
               isOr={true}
             />
-            <Shortcut label={t("toolBar.lock")} shortcuts={[KEYS.Q]} />
+            <Shortcut
+              label={t("toolBar.lock")}
+              shortcuts={[getShortcutFromShortcutName("toolLock")]}
+            />
             <Shortcut
               label={t("helpDialog.preventBinding")}
               shortcuts={[getShortcutKey("CtrlOrCmd")]}

packages/excalidraw/components/LibraryMenuHeaderContent.tsx

@@ -194,6 +194,7 @@ export const LibraryDropdownMenuButton: React.FC<{
       <DropdownMenu open={isLibraryMenuOpen}>
         <DropdownMenu.Trigger
           onToggle={() => setIsLibraryMenuOpen(!isLibraryMenuOpen)}
+          aria-label="Library menu"
         >
           {DotsIcon}
         </DropdownMenu.Trigger>
@@ -201,6 +202,7 @@ export const LibraryDropdownMenuButton: React.FC<{
           onClickOutside={() => setIsLibraryMenuOpen(false)}
           onSelect={() => setIsLibraryMenuOpen(false)}
           className="library-menu"
+          align="end"
         >
           {!itemsSelected && (
             <DropdownMenu.Item

packages/excalidraw/components/TTDDialog/TTDDialogTrigger.tsx

@@ -26,9 +26,9 @@ export const TTDDialogTrigger = ({
           setAppState({ openDialog: { name: "ttd", tab: "text-to-diagram" } });
         }}
         icon={icon ?? brainIcon}
+        badge={<DropdownMenu.Item.Badge>AI</DropdownMenu.Item.Badge>}
       >
         {children ?? t("labels.textToDiagram")}
-        <DropdownMenu.Item.Badge>AI</DropdownMenu.Item.Badge>
       </DropdownMenu.Item>
     </TTDDialogTriggerTunnel.In>
   );

packages/excalidraw/components/dropdownMenu/DropdownMenu.scss

@@ -1,20 +1,45 @@
-@import "../../css/variables.module.scss";
+@import "../../css/variables.module";
 
 .excalidraw {
+  [data-dropdown-menu-trigger] + [data-radix-popper-content-wrapper] {
+    z-index: 2 !important;
+  }
+
   .dropdown-menu {
-    position: absolute;
+    max-width: 16rem;
-    top: 100%;
+    margin-top: 0.25rem;
-    margin-top: 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;
+    }
+
+    .radix-menu-item {
+      &:focus-visible {
+        outline: none;
+      }
+    }
+
+    .dropdown-submenu {
+      margin-left: -0.75rem;
+      min-width: 16rem;
+      max-width: 20rem;
+    }
 
     &--mobile {
-      left: 0;
-      width: 100%;
-      row-gap: 0.75rem;
-
       .dropdown-menu-container {
+        grid-template-columns: minmax(0, 1fr);
         padding: 8px 8px;
         box-sizing: border-box;
-        // background-color: var(--island-bg-color);
+        background-color: var(--island-bg-color);
         box-shadow: var(--shadow-island);
         border-radius: var(--border-radius-lg);
         position: relative;
@@ -30,13 +55,14 @@
 
     .dropdown-menu-container {
       background-color: var(--island-bg-color);
-      max-height: calc(100vh - 150px);
+      max-height: var(--radix-popper-available-height);
       overflow-y: auto;
       --gap: 2;
     }
 
     .dropdown-menu-item-base {
       display: flex;
+      padding: 0 0.625rem;
       column-gap: 0.625rem;
       font-size: 0.875rem;
       color: var(--color-on-surface);
@@ -44,6 +70,7 @@
       box-sizing: border-box;
       font-weight: 400;
       font-family: inherit;
+      justify-content: flex-start;
     }
 
     &.manual-hover {

packages/excalidraw/components/dropdownMenu/DropdownMenu.tsx

@@ -1,5 +1,7 @@
 import React from "react";
 
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+
 import DropdownMenuContent from "./DropdownMenuContent";
 import DropdownMenuGroup from "./DropdownMenuGroup";
 import DropdownMenuItem from "./DropdownMenuItem";
@@ -23,11 +25,12 @@ const DropdownMenu = ({
 }) => {
   const MenuTriggerComp = getMenuTriggerComponent(children);
   const MenuContentComp = getMenuContentComponent(children);
+
   return (
-    <>
+    <DropdownMenuPrimitive.Root open={open} modal={false}>
       {MenuTriggerComp}
-      {open && MenuContentComp}
+      {MenuContentComp}
-    </>
+    </DropdownMenuPrimitive.Root>
   );
 };
 

packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx

@@ -3,6 +3,8 @@ import React, { useEffect, useRef } from "react";
 
 import { EVENT, KEYS } from "@excalidraw/common";
 
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+
 import { useOutsideClick } from "../../hooks/useOutsideClick";
 import { useStable } from "../../hooks/useStable";
 import { useDevice } from "../App";
@@ -17,6 +19,9 @@ const MenuContent = ({
   className = "",
   onSelect,
   style,
+  sideOffset = 4,
+  align = "start",
+  collisionPadding,
 }: {
   children?: React.ReactNode;
   onClickOutside?: () => void;
@@ -26,6 +31,11 @@ const MenuContent = ({
    */
   onSelect?: (event: Event) => void;
   style?: React.CSSProperties;
+  sideOffset?: number;
+  align?: "start" | "center" | "end";
+  collisionPadding?:
+    | number
+    | Partial<Record<"top" | "right" | "bottom" | "left", number>>;
 }) => {
   const device = useDevice();
   const menuRef = useRef<HTMLDivElement>(null);
@@ -62,11 +72,15 @@ const MenuContent = ({
 
   return (
     <DropdownMenuContentPropsContext.Provider value={{ onSelect }}>
-      <div
+      <DropdownMenuPrimitive.Content
         ref={menuRef}
         className={classNames}
         style={style}
         data-testid="dropdown-menu"
+        side="bottom"
+        sideOffset={sideOffset}
+        align={align}
+        collisionPadding={collisionPadding}
       >
         {/* the zIndex ensures this menu has higher stacking order,
     see https://github.com/excalidraw/excalidraw/pull/1445 */}
@@ -81,7 +95,7 @@ const MenuContent = ({
             {children}
           </Island>
         )}
-      </div>
+      </DropdownMenuPrimitive.Content>
     </DropdownMenuContentPropsContext.Provider>
   );
 };

packages/excalidraw/components/dropdownMenu/DropdownMenuItem.tsx

@@ -1,12 +1,17 @@
-import React, { useEffect, useRef } from "react";
+import React, { useRef } from "react";
 
 import { THEME } from "@excalidraw/common";
 
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+
 import type { ValueOf } from "@excalidraw/common/utility-types";
 
+import { Button } from "../Button";
+
 import { useExcalidrawAppState } from "../App";
 
 import MenuItemContent from "./DropdownMenuItemContent";
+
 import {
   getDropdownMenuItemClassName,
   useHandleDropdownMenuItemClick,
@@ -17,55 +22,45 @@ import type { JSX } from "react";
 const DropdownMenuItem = ({
   icon,
   value,
+  badge,
   order,
   children,
   shortcut,
   className,
-  hovered,
   selected,
-  textStyle,
   onSelect,
   onClick,
   ...rest
 }: {
   icon?: JSX.Element;
+  badge?: React.ReactNode;
   value?: string | number | undefined;
   order?: number;
   onSelect?: (event: Event) => void;
   children: React.ReactNode;
   shortcut?: string;
-  hovered?: boolean;
+
   selected?: boolean;
-  textStyle?: React.CSSProperties;
+
   className?: string;
 } & 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 (
-    <button
+    <DropdownMenuPrimitive.Item className="radix-menu-item">
-      {...rest}
+      <Button
-      ref={ref}
+        {...rest}
-      value={value}
+        ref={ref}
-      onClick={handleClick}
+        onSelect={handleClick}
-      className={getDropdownMenuItemClassName(className, selected, hovered)}
+        className={getDropdownMenuItemClassName(className)}
-      title={rest.title ?? rest["aria-label"]}
+        title={rest.title ?? rest["aria-label"]}
-    >
+      >
-      <MenuItemContent textStyle={textStyle} icon={icon} shortcut={shortcut}>
+        <MenuItemContent icon={icon} shortcut={shortcut} badge={badge}>
-        {children}
+          {children}
-      </MenuItemContent>
+        </MenuItemContent>
-    </button>
+      </Button>
+    </DropdownMenuPrimitive.Item>
   );
 };
 DropdownMenuItem.displayName = "DropdownMenuItem";

packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx

@@ -2,25 +2,24 @@ import { useDevice } from "../App";
 
 import { Ellipsify } from "../Ellipsify";
 
-import type { JSX } from "react";
-
 const MenuItemContent = ({
-  textStyle,
   icon,
+  badge,
   shortcut,
   children,
 }: {
-  icon?: JSX.Element;
+  icon?: React.ReactNode;
   shortcut?: string;
-  textStyle?: React.CSSProperties;
   children: React.ReactNode;
+  badge?: React.ReactNode;
 }) => {
   const device = useDevice();
   return (
     <>
       {icon && <div className="dropdown-menu-item__icon">{icon}</div>}
-      <div style={textStyle} className="dropdown-menu-item__text">
+      <div className="dropdown-menu-item__text">
         <Ellipsify>{children}</Ellipsify>
+        {badge}
       </div>
       {shortcut && !device.editor.isMobile && (
         <div className="dropdown-menu-item__shortcut">{shortcut}</div>

packages/excalidraw/components/dropdownMenu/DropdownMenuSub.tsx

@@ -0,0 +1,27 @@
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+
+import {
+  getSubMenuContentComponent,
+  getSubMenuTriggerComponent,
+} from "./dropdownMenuUtils";
+import DropdownMenuSubTrigger from "./DropdownMenuSubTrigger";
+import DropdownMenuSubContent from "./DropdownMenuSubContent";
+import DropdownMenuSubItem from "./DropdownMenuSubItem";
+
+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.Item = DropdownMenuSubItem;
+
+export default DropdownMenuSub;
+DropdownMenuSub.displayName = "DropdownMenuSub";

packages/excalidraw/components/dropdownMenu/DropdownMenuSubContent.tsx

@@ -0,0 +1,44 @@
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+
+import clsx from "clsx";
+
+import { useDevice } from "../App";
+import Stack from "../Stack";
+import { Island } from "../Island";
+
+const DropdownMenuSubContent = ({
+  children,
+  className,
+}: {
+  children?: React.ReactNode;
+  className?: string;
+}) => {
+  const device = useDevice();
+
+  const classNames = clsx(`dropdown-menu dropdown-submenu ${className}`, {
+    "dropdown-menu--mobile": device.editor.isMobile,
+  }).trim();
+
+  return (
+    <DropdownMenuPrimitive.SubContent
+      className={classNames}
+      sideOffset={8}
+      alignOffset={-4}
+    >
+      {device.editor.isMobile ? (
+        <Stack.Col className="dropdown-menu-container">{children}</Stack.Col>
+      ) : (
+        <Island
+          className="dropdown-menu-container"
+          padding={1}
+          style={{ zIndex: 1 }}
+        >
+          {children}
+        </Island>
+      )}
+    </DropdownMenuPrimitive.SubContent>
+  );
+};
+
+export default DropdownMenuSubContent;
+DropdownMenuSubContent.displayName = "DropdownMenuSubContent";

packages/excalidraw/components/dropdownMenu/DropdownMenuSubItem.tsx

@@ -0,0 +1,45 @@
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+
+import { Button } from "../Button";
+
+import MenuItemContent from "./DropdownMenuItemContent";
+import {
+  getDropdownMenuItemClassName,
+  useHandleDropdownMenuItemClick,
+} from "./common";
+
+const DropdownMenuSubItem = ({
+  icon,
+  onSelect,
+  children,
+  shortcut,
+  className,
+  ...rest
+}: {
+  icon?: React.ReactNode;
+  onSelect: (event: Event) => void;
+  children: React.ReactNode;
+  shortcut?: string;
+  className?: string;
+} & Omit<React.ButtonHTMLAttributes<HTMLButtonElement>, "onSelect">) => {
+  const handleClick = useHandleDropdownMenuItemClick(rest.onClick, onSelect);
+
+  return (
+    <DropdownMenuPrimitive.Item className="radix-menu-item">
+      <Button
+        {...rest}
+        onSelect={handleClick}
+        type="button"
+        className={getDropdownMenuItemClassName(className)}
+        title={rest.title ?? rest["aria-label"]}
+      >
+        <MenuItemContent icon={icon} shortcut={shortcut}>
+          {children}
+        </MenuItemContent>
+      </Button>
+    </DropdownMenuPrimitive.Item>
+  );
+};
+
+export default DropdownMenuSubItem;
+DropdownMenuSubItem.displayName = "DropdownMenuSubItem";

packages/excalidraw/components/dropdownMenu/DropdownMenuSubTrigger.tsx

@@ -0,0 +1,39 @@
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+
+import React from "react";
+
+import { ChevronRight } from "../icons";
+
+import MenuItemContent from "./DropdownMenuItemContent";
+import { getDropdownMenuItemClassName } from "./common";
+
+import type { JSX } from "react";
+
+const DropdownMenuSubTrigger = ({
+  children,
+  icon,
+  className,
+  ...rest
+}: {
+  children: React.ReactNode;
+  icon?: JSX.Element;
+  className?: string;
+} & React.HTMLAttributes<HTMLDivElement>) => {
+  return (
+    <DropdownMenuPrimitive.SubTrigger className="radix-menu-item dropdown-menu__submenu-trigger">
+      <div
+        {...rest}
+        className={getDropdownMenuItemClassName(className)}
+        title={rest.title ?? rest["aria-label"]}
+      >
+        <MenuItemContent icon={icon}>{children}</MenuItemContent>
+        <div className="dropdown-menu__submenu-trigger-icon">
+          {ChevronRight}
+        </div>
+      </div>
+    </DropdownMenuPrimitive.SubTrigger>
+  );
+};
+
+export default DropdownMenuSubTrigger;
+DropdownMenuSubTrigger.displayName = "DropdownMenuSubTrigger";

packages/excalidraw/components/dropdownMenu/DropdownMenuTrigger.tsx

@@ -1,5 +1,7 @@
 import clsx from "clsx";
 
+import * as DropdownMenuPrimitive from "@radix-ui/react-dropdown-menu";
+
 import { useDevice } from "../App";
 
 const MenuTrigger = ({
@@ -23,7 +25,8 @@ const MenuTrigger = ({
     },
   ).trim();
   return (
-    <button
+    <DropdownMenuPrimitive.Trigger
+      data-dropdown-menu-trigger
       data-prevent-outside-click
       className={classNames}
       onClick={onToggle}
@@ -33,7 +36,7 @@ const MenuTrigger = ({
       {...rest}
     >
       {children}
-    </button>
+    </DropdownMenuPrimitive.Trigger>
   );
 };
 

packages/excalidraw/components/dropdownMenu/dropdownMenuUtils.ts

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

packages/excalidraw/components/icons.tsx

@@ -72,6 +72,15 @@ const modifiedTablerIconProps: Opts = {
 
 // -----------------------------------------------------------------------------
 
+//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: present
 export const PlusPromoIcon = createIcon(
   <g strokeWidth="1.5">
@@ -2269,3 +2278,21 @@ export const elementLinkIcon = createIcon(
   </g>,
   tablerIconProps,
 );
+
+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,
+);
+
+export const emptyIcon = <div style={{ width: "1rem", height: "1rem" }} />;

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

@@ -9,8 +9,11 @@ import {
   actionLoadScene,
   actionSaveToActiveFile,
   actionShortcuts,
+  actionToggleGridMode,
+  actionToggleObjectsSnapMode,
   actionToggleSearchMenu,
   actionToggleTheme,
+  actionToggleZenMode,
 } from "../../actions";
 import { getShortcutFromShortcutName } from "../../actions/shortcuts";
 import { trackEvent } from "../../analytics";
@@ -23,13 +26,23 @@ import {
   useExcalidrawActionManager,
   useExcalidrawElements,
   useAppProps,
+  useApp,
 } from "../App";
 import { openConfirmModal } from "../OverwriteConfirm/OverwriteConfirmState";
 import Trans from "../Trans";
 import DropdownMenuItem from "../dropdownMenu/DropdownMenuItem";
 import DropdownMenuItemContentRadio from "../dropdownMenu/DropdownMenuItemContentRadio";
 import DropdownMenuItemLink from "../dropdownMenu/DropdownMenuItemLink";
-import { GithubIcon, DiscordIcon, XBrandIcon } from "../icons";
+import DropdownMenuSub from "../dropdownMenu/DropdownMenuSub";
+import { actionToggleViewMode } from "../../actions/actionToggleViewMode";
+import {
+  GithubIcon,
+  DiscordIcon,
+  XBrandIcon,
+  settingsIcon,
+  checkIcon,
+  emptyIcon,
+} from "../icons";
 import {
   boltIcon,
   DeviceDesktopIcon,
@@ -313,7 +326,10 @@ export const ChangeCanvasBackground = () => {
       >
         {t("labels.canvasBackground")}
       </div>
-      <div style={{ padding: "0 0.625rem" }}>
+      <div
+        style={{ padding: "0 0.625rem" }}
+        id="canvas-bg-color-picker-container"
+      >
         {actionManager.renderAction("changeViewBackgroundColor")}
       </div>
     </div>
@@ -393,3 +409,73 @@ export const LiveCollaborationTrigger = ({
 };
 
 LiveCollaborationTrigger.displayName = "LiveCollaborationTrigger";
+
+export const Preferences = ({ children }: { children?: React.ReactNode }) => {
+  const { t } = useI18n();
+  const actionManager = useExcalidrawActionManager();
+  const appState = useUIAppState();
+  const app = useApp();
+
+  return (
+    <DropdownMenuSub>
+      <DropdownMenuSub.Trigger icon={settingsIcon}>
+        {t("labels.preferences")}
+      </DropdownMenuSub.Trigger>
+      <DropdownMenuSub.Content className="excalidraw-main-menu-preferences-submenu">
+        <DropdownMenuSub.Item
+          icon={appState.activeTool.locked ? checkIcon : emptyIcon}
+          shortcut={getShortcutFromShortcutName("toolLock")}
+          onSelect={(event) => {
+            app.toggleLock();
+            event.preventDefault();
+          }}
+        >
+          {t("labels.preferences_toolLock")}
+        </DropdownMenuSub.Item>
+        <DropdownMenuSub.Item
+          icon={appState.objectsSnapModeEnabled ? checkIcon : emptyIcon}
+          shortcut={getShortcutFromShortcutName("objectsSnapMode")}
+          onSelect={(event) => {
+            actionManager.executeAction(actionToggleObjectsSnapMode);
+            event.preventDefault();
+          }}
+        >
+          {t("buttons.objectsSnapMode")}
+        </DropdownMenuSub.Item>
+        <DropdownMenuSub.Item
+          icon={appState.gridModeEnabled ? checkIcon : emptyIcon}
+          shortcut={getShortcutFromShortcutName("gridMode")}
+          onSelect={(event) => {
+            actionManager.executeAction(actionToggleGridMode);
+            event.preventDefault();
+          }}
+        >
+          {t("labels.toggleGrid")}
+        </DropdownMenuSub.Item>
+        <DropdownMenuSub.Item
+          icon={appState.zenModeEnabled ? checkIcon : emptyIcon}
+          shortcut={getShortcutFromShortcutName("zenMode")}
+          onSelect={(event) => {
+            actionManager.executeAction(actionToggleZenMode);
+            event.preventDefault();
+          }}
+        >
+          {t("buttons.zenMode")}
+        </DropdownMenuSub.Item>
+        <DropdownMenuSub.Item
+          icon={appState.viewModeEnabled ? checkIcon : emptyIcon}
+          shortcut={getShortcutFromShortcutName("viewMode")}
+          onSelect={(event) => {
+            actionManager.executeAction(actionToggleViewMode);
+            event.preventDefault();
+          }}
+        >
+          {t("labels.viewMode")}
+        </DropdownMenuSub.Item>
+        {children}
+      </DropdownMenuSub.Content>
+    </DropdownMenuSub>
+  );
+};
+
+Preferences.displayName = "Preferences";

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

@@ -2,8 +2,12 @@ import React from "react";
 
 import { composeEventHandlers } from "@excalidraw/common";
 
+import * as Portal from "@radix-ui/react-portal";
+
 import { useTunnels } from "../../context/tunnels";
 import { useUIAppState } from "../../context/ui-appState";
+import DropdownMenuSub from "../dropdownMenu/DropdownMenuSub";
+
 import { t } from "../../i18n";
 import { useDevice, useExcalidrawSetAppState } from "../App";
 import { UserList } from "../UserList";
@@ -36,6 +40,17 @@ const MainMenu = Object.assign(
 
       return (
         <MainMenuTunnel.In>
+          {appState.openMenu === "canvas" && device.editor.isMobile && (
+            <Portal.Root
+              style={{
+                backgroundColor: "rgba(18, 18, 18, 0.2)",
+                position: "fixed",
+                inset: "0px",
+                // zIndex: "var(--zIndex-layerUI)",
+              }}
+              onClick={() => setAppState({ openMenu: null })}
+            />
+          )}
           <DropdownMenu open={appState.openMenu === "canvas"}>
             <DropdownMenu.Trigger
               onToggle={() => {
@@ -44,15 +59,27 @@ const MainMenu = Object.assign(
                 });
               }}
               data-testid="main-menu-trigger"
+              aria-label="Main menu"
               className="main-menu-trigger"
             >
               {HamburgerMenuIcon}
             </DropdownMenu.Trigger>
             <DropdownMenu.Content
+              sideOffset={device.editor.isMobile ? 20 : undefined}
+              className="main-menu-content"
               onClickOutside={onClickOutside}
               onSelect={composeEventHandlers(onSelect, () => {
                 setAppState({ openMenu: null });
               })}
+              collisionPadding={
+                // accounting for
+                // - editor footer on desktop
+                // - toolbar on mobile
+                // we probably don't want the menu to overlay these elements
+                !device.editor.isMobile
+                  ? { bottom: 90, top: 10 }
+                  : { top: 90, bottom: 10 }
+              }
             >
               {children}
               {device.editor.isMobile && appState.collaborators.size > 0 && (
@@ -78,6 +105,7 @@ const MainMenu = Object.assign(
     ItemCustom: DropdownMenu.ItemCustom,
     Group: DropdownMenu.Group,
     Separator: DropdownMenu.Separator,
+    Sub: DropdownMenuSub,
     DefaultItems,
   },
 );

packages/excalidraw/css/theme.scss

@@ -144,6 +144,7 @@
   --color-logo-icon: var(--color-primary);
   --color-logo-text: #190064;
 
+  --border-radius-sm: 0.25rem;
   --border-radius-md: 0.375rem;
   --border-radius-lg: 0.5rem;
 

packages/excalidraw/data/restore.ts

@@ -387,7 +387,10 @@ export const restoreElement = (
             elbowed: true,
             startBinding: repairBinding(element, element.startBinding),
             endBinding: repairBinding(element, element.endBinding),
-            fixedSegments: element.fixedSegments,
+            fixedSegments:
+              element.fixedSegments?.length && base.points.length >= 4
+                ? element.fixedSegments
+                : null,
             startIsSpecial: element.startIsSpecial,
             endIsSpecial: element.endIsSpecial,
           })

packages/excalidraw/locales/en.json

@@ -171,7 +171,9 @@
     "linkToElement": "Link to object",
     "wrapSelectionInFrame": "Wrap selection in frame",
     "tab": "Tab",
-    "shapeSwitch": "Switch shape"
+    "shapeSwitch": "Switch shape",
+    "preferences": "Preferences",
+    "preferences_toolLock": "Tool lock"
   },
   "elementLink": {
     "title": "Link to object",

packages/excalidraw/package.json

@@ -81,11 +81,13 @@
     "@braintree/sanitize-url": "6.0.2",
     "@excalidraw/common": "0.18.0",
     "@excalidraw/element": "0.18.0",
-    "@excalidraw/math": "0.18.0",
     "@excalidraw/laser-pointer": "1.3.1",
-    "@excalidraw/mermaid-to-excalidraw": "1.1.2",
+    "@excalidraw/math": "0.18.0",
+    "@excalidraw/mermaid-to-excalidraw": "1.1.3",
     "@excalidraw/random-username": "1.1.0",
+    "@radix-ui/react-dropdown-menu": "2.1.16",
     "@radix-ui/react-popover": "1.1.6",
+    "@radix-ui/react-portal": "1.1.9",
     "@radix-ui/react-tabs": "1.1.3",
     "browser-fs-access": "0.29.1",
     "canvas-roundrect-polyfill": "0.0.1",
@@ -97,8 +99,8 @@
     "image-blob-reduce": "3.0.1",
     "jotai": "2.11.0",
     "jotai-scope": "0.7.2",
-    "lodash.throttle": "4.1.1",
     "lodash.debounce": "4.0.8",
+    "lodash.throttle": "4.1.1",
     "nanoid": "3.3.3",
     "open-color": "1.9.1",
     "pako": "2.0.3",

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

@@ -282,6 +282,14 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       "added": {},
       "removed": {},
       "updated": {
+        "id0": {
+          "deleted": {
+            "version": 12,
+          },
+          "inserted": {
+            "version": 11,
+          },
+        },
         "id1": {
           "deleted": {
             "boundElements": [],
@@ -396,6 +404,14 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
             "version": 12,
           },
         },
+        "id15": {
+          "deleted": {
+            "version": 10,
+          },
+          "inserted": {
+            "version": 9,
+          },
+        },
         "id4": {
           "deleted": {
             "height": "99.19972",
@@ -837,6 +853,14 @@ exports[`history > multiplayer undo/redo > conflicts in arrows and their bindabl
       "added": {},
       "removed": {},
       "updated": {
+        "id0": {
+          "deleted": {
+            "version": 13,
+          },
+          "inserted": {
+            "version": 12,
+          },
+        },
         "id1": {
           "deleted": {
             "boundElements": [],
@@ -2632,7 +2656,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "height": 100,
   "id": "id0",
   "index": "a0",
-  "isDeleted": true,
+  "isDeleted": false,
   "link": null,
   "locked": false,
   "opacity": 100,
@@ -2681,7 +2705,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "textAlign": "left",
   "type": "text",
   "updated": 1,
-  "version": 6,
+  "version": 8,
   "verticalAlign": "top",
   "width": 100,
   "x": 15,
@@ -2695,7 +2719,7 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "autoResize": true,
   "backgroundColor": "transparent",
   "boundElements": null,
-  "containerId": null,
+  "containerId": "id0",
   "customData": undefined,
   "fillStyle": "solid",
   "fontFamily": 5,
@@ -2742,10 +2766,12 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
       },
     },
     "elements": {
-      "added": {
+      "added": {},
+      "removed": {},
+      "updated": {
         "id0": {
           "deleted": {
-            "isDeleted": true,
+            "isDeleted": false,
             "version": 9,
           },
           "inserted": {
@@ -2774,16 +2800,21 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
             "y": 10,
           },
         },
-      },
+        "id1": {
-      "removed": {},
-      "updated": {
-        "id5": {
           "deleted": {
+            "containerId": null,
+            "version": 8,
+          },
+          "inserted": {
             "containerId": null,
             "version": 7,
           },
+        },
+        "id5": {
+          "deleted": {
+            "version": 7,
+          },
           "inserted": {
-            "containerId": "id0",
             "version": 6,
           },
         },
@@ -3096,6 +3127,14 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
             "version": 8,
           },
         },
+        "id5": {
+          "deleted": {
+            "version": 7,
+          },
+          "inserted": {
+            "version": 6,
+          },
+        },
       },
     },
     "id": "id9",
@@ -4645,15 +4684,15 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
         "id1": {
           "deleted": {
             "angle": 0,
-            "version": 4,
+            "version": 8,
             "x": 15,
             "y": 15,
           },
           "inserted": {
-            "angle": 90,
+            "angle": 0,
-            "version": 3,
+            "version": 7,
-            "x": 205,
+            "x": 15,
-            "y": 205,
+            "y": 15,
           },
         },
       },
@@ -4847,8 +4886,8 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "version": 6,
   "verticalAlign": "top",
   "width": 80,
-  "x": 205,
+  "x": "241.29526",
-  "y": 205,
+  "y": "247.59241",
 }
 `;
 
@@ -5632,12 +5671,12 @@ exports[`history > multiplayer undo/redo > conflicts in frames and their childre
       "updated": {
         "id1": {
           "deleted": {
-            "frameId": "id0",
+            "frameId": null,
-            "version": 5,
+            "version": 9,
           },
           "inserted": {
             "frameId": null,
-            "version": 6,
+            "version": 8,
           },
         },
       },
@@ -5784,7 +5823,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "strokeWidth": 2,
   "type": "rectangle",
   "updated": 1,
-  "version": 5,
+  "version": 6,
   "width": 100,
   "x": 0,
   "y": 0,
@@ -5816,7 +5855,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "strokeWidth": 2,
   "type": "rectangle",
   "updated": 1,
-  "version": 4,
+  "version": 5,
   "width": 100,
   "x": 100,
   "y": 100,
@@ -5852,7 +5891,74 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "elements": {
       "added": {},
       "removed": {},
-      "updated": {},
+      "updated": {
+        "id0": {
+          "deleted": {
+            "angle": 0,
+            "backgroundColor": "transparent",
+            "boundElements": null,
+            "customData": undefined,
+            "fillStyle": "solid",
+            "frameId": null,
+            "groupIds": [
+              "A",
+            ],
+            "height": 100,
+            "index": "a0",
+            "isDeleted": true,
+            "link": null,
+            "locked": false,
+            "opacity": 100,
+            "roughness": 1,
+            "roundness": null,
+            "strokeColor": "#1e1e1e",
+            "strokeStyle": "solid",
+            "strokeWidth": 2,
+            "type": "rectangle",
+            "version": 5,
+            "width": 100,
+            "x": 0,
+            "y": 0,
+          },
+          "inserted": {
+            "isDeleted": true,
+            "version": 4,
+          },
+        },
+        "id1": {
+          "deleted": {
+            "angle": 0,
+            "backgroundColor": "transparent",
+            "boundElements": null,
+            "customData": undefined,
+            "fillStyle": "solid",
+            "frameId": null,
+            "groupIds": [
+              "A",
+            ],
+            "height": 100,
+            "index": "a1",
+            "isDeleted": true,
+            "link": null,
+            "locked": false,
+            "opacity": 100,
+            "roughness": 1,
+            "roundness": null,
+            "strokeColor": "#1e1e1e",
+            "strokeStyle": "solid",
+            "strokeWidth": 2,
+            "type": "rectangle",
+            "version": 5,
+            "width": 100,
+            "x": 100,
+            "y": 100,
+          },
+          "inserted": {
+            "isDeleted": true,
+            "version": 4,
+          },
+        },
+      },
     },
     "id": "id13",
   },
@@ -6072,7 +6178,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "strokeWidth": 2,
   "type": "rectangle",
   "updated": 1,
-  "version": 8,
+  "version": 9,
   "width": 10,
   "x": 20,
   "y": 0,
@@ -6102,7 +6208,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "strokeWidth": 2,
   "type": "rectangle",
   "updated": 1,
-  "version": 8,
+  "version": 9,
   "width": 10,
   "x": 50,
   "y": 50,
@@ -6187,7 +6293,39 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "elements": {
       "added": {},
       "removed": {},
-      "updated": {},
+      "updated": {
+        "id3": {
+          "deleted": {
+            "angle": 0,
+            "backgroundColor": "transparent",
+            "boundElements": null,
+            "customData": undefined,
+            "fillStyle": "solid",
+            "frameId": null,
+            "groupIds": [],
+            "height": 10,
+            "index": "a1",
+            "isDeleted": true,
+            "link": null,
+            "locked": false,
+            "opacity": 100,
+            "roughness": 1,
+            "roundness": null,
+            "strokeColor": "#1e1e1e",
+            "strokeStyle": "solid",
+            "strokeWidth": 2,
+            "type": "rectangle",
+            "version": 8,
+            "width": 10,
+            "x": 20,
+            "y": 0,
+          },
+          "inserted": {
+            "isDeleted": true,
+            "version": 7,
+          },
+        },
+      },
     },
     "id": "id18",
   },
@@ -6205,11 +6343,11 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
         "id3": {
           "deleted": {
             "backgroundColor": "#ffc9c9",
-            "version": 8,
+            "version": 9,
           },
           "inserted": {
             "backgroundColor": "transparent",
-            "version": 7,
+            "version": 8,
           },
         },
       },
@@ -6234,7 +6372,39 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "elements": {
       "added": {},
       "removed": {},
-      "updated": {},
+      "updated": {
+        "id8": {
+          "deleted": {
+            "angle": 0,
+            "backgroundColor": "#ffc9c9",
+            "boundElements": null,
+            "customData": undefined,
+            "fillStyle": "solid",
+            "frameId": null,
+            "groupIds": [],
+            "height": 10,
+            "index": "a2",
+            "isDeleted": true,
+            "link": null,
+            "locked": false,
+            "opacity": 100,
+            "roughness": 1,
+            "roundness": null,
+            "strokeColor": "#1e1e1e",
+            "strokeStyle": "solid",
+            "strokeWidth": 2,
+            "type": "rectangle",
+            "version": 8,
+            "width": 10,
+            "x": 30,
+            "y": 30,
+          },
+          "inserted": {
+            "isDeleted": true,
+            "version": 7,
+          },
+        },
+      },
     },
     "id": "id20",
   },
@@ -6251,12 +6421,12 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
       "updated": {
         "id8": {
           "deleted": {
-            "version": 8,
+            "version": 9,
             "x": 50,
             "y": 50,
           },
           "inserted": {
-            "version": 7,
+            "version": 8,
             "x": 30,
             "y": 30,
           },
@@ -7104,7 +7274,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "strokeWidth": 2,
   "type": "arrow",
   "updated": 1,
-  "version": 8,
+  "version": 9,
   "width": 10,
   "x": 0,
   "y": 0,
@@ -7135,7 +7305,60 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "elements": {
       "added": {},
       "removed": {},
-      "updated": {},
+      "updated": {
+        "id0": {
+          "deleted": {
+            "angle": 0,
+            "backgroundColor": "transparent",
+            "boundElements": null,
+            "customData": undefined,
+            "elbowed": false,
+            "endArrowhead": "arrow",
+            "endBinding": null,
+            "fillStyle": "solid",
+            "frameId": null,
+            "groupIds": [],
+            "height": 10,
+            "index": "a0",
+            "isDeleted": true,
+            "lastCommittedPoint": [
+              10,
+              10,
+            ],
+            "link": null,
+            "locked": false,
+            "opacity": 100,
+            "points": [
+              [
+                0,
+                0,
+              ],
+              [
+                10,
+                10,
+              ],
+            ],
+            "roughness": 1,
+            "roundness": {
+              "type": 2,
+            },
+            "startArrowhead": null,
+            "startBinding": null,
+            "strokeColor": "#1e1e1e",
+            "strokeStyle": "solid",
+            "strokeWidth": 2,
+            "type": "arrow",
+            "version": 9,
+            "width": 10,
+            "x": 0,
+            "y": 0,
+          },
+          "inserted": {
+            "isDeleted": true,
+            "version": 8,
+          },
+        },
+      },
     },
     "id": "id13",
   },
@@ -7344,7 +7567,7 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
   "strokeWidth": 2,
   "type": "rectangle",
   "updated": 1,
-  "version": 8,
+  "version": 9,
   "width": 10,
   "x": 10,
   "y": 0,
@@ -7375,7 +7598,39 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
     "elements": {
       "added": {},
       "removed": {},
-      "updated": {},
+      "updated": {
+        "id0": {
+          "deleted": {
+            "angle": 0,
+            "backgroundColor": "transparent",
+            "boundElements": null,
+            "customData": undefined,
+            "fillStyle": "solid",
+            "frameId": null,
+            "groupIds": [],
+            "height": 10,
+            "index": "a0",
+            "isDeleted": true,
+            "link": null,
+            "locked": false,
+            "opacity": 100,
+            "roughness": 1,
+            "roundness": null,
+            "strokeColor": "#1e1e1e",
+            "strokeStyle": "solid",
+            "strokeWidth": 2,
+            "type": "rectangle",
+            "version": 8,
+            "width": 10,
+            "x": 10,
+            "y": 0,
+          },
+          "inserted": {
+            "isDeleted": true,
+            "version": 7,
+          },
+        },
+      },
     },
     "id": "id7",
   },
@@ -7393,11 +7648,11 @@ exports[`history > multiplayer undo/redo > should iterate through the history wh
         "id0": {
           "deleted": {
             "backgroundColor": "#ffec99",
-            "version": 8,
+            "version": 9,
           },
           "inserted": {
             "backgroundColor": "transparent",
-            "version": 7,
+            "version": 8,
           },
         },
       },
@@ -10326,7 +10581,7 @@ exports[`history > multiplayer undo/redo > should redistribute deltas when eleme
   "strokeWidth": 2,
   "type": "rectangle",
   "updated": 1,
-  "version": 8,
+  "version": 9,
   "width": 10,
   "x": 10,
   "y": 0,
@@ -10409,7 +10664,18 @@ exports[`history > multiplayer undo/redo > should redistribute deltas when eleme
     "elements": {
       "added": {},
       "removed": {},
-      "updated": {},
+      "updated": {
+        "id0": {
+          "deleted": {
+            "isDeleted": false,
+            "version": 9,
+          },
+          "inserted": {
+            "isDeleted": false,
+            "version": 8,
+          },
+        },
+      },
     },
     "id": "id8",
   },
@@ -15775,6 +16041,14 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "version": 5,
           },
         },
+        "id1": {
+          "deleted": {
+            "version": 5,
+          },
+          "inserted": {
+            "version": 4,
+          },
+        },
         "id2": {
           "deleted": {
             "boundElements": [
@@ -16736,6 +17010,14 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "version": 5,
           },
         },
+        "id1": {
+          "deleted": {
+            "version": 6,
+          },
+          "inserted": {
+            "version": 5,
+          },
+        },
         "id2": {
           "deleted": {
             "boundElements": [
@@ -17361,6 +17643,14 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "version": 9,
           },
         },
+        "id1": {
+          "deleted": {
+            "version": 10,
+          },
+          "inserted": {
+            "version": 9,
+          },
+        },
         "id2": {
           "deleted": {
             "boundElements": [
@@ -17722,6 +18012,14 @@ exports[`history > singleplayer undo/redo > should support bidirectional binding
             "version": 7,
           },
         },
+        "id2": {
+          "deleted": {
+            "version": 4,
+          },
+          "inserted": {
+            "version": 3,
+          },
+        },
       },
     },
     "id": "id21",

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

@@ -2216,7 +2216,16 @@ exports[`regression tests > alt-drag duplicates an element > [end of test] undo
           },
         },
       },
-      "updated": {},
+      "updated": {
+        "id0": {
+          "deleted": {
+            "version": 5,
+          },
+          "inserted": {
+            "version": 3,
+          },
+        },
+      },
     },
     "id": "id6",
   },
@@ -10892,7 +10901,32 @@ exports[`regression tests > make a group and duplicate it > [end of test] undo s
           },
         },
       },
-      "updated": {},
+      "updated": {
+        "id0": {
+          "deleted": {
+            "version": 6,
+          },
+          "inserted": {
+            "version": 4,
+          },
+        },
+        "id3": {
+          "deleted": {
+            "version": 6,
+          },
+          "inserted": {
+            "version": 4,
+          },
+        },
+        "id6": {
+          "deleted": {
+            "version": 6,
+          },
+          "inserted": {
+            "version": 4,
+          },
+        },
+      },
     },
     "id": "id21",
   },

packages/excalidraw/tests/excalidraw.test.tsx

@@ -1,13 +1,18 @@
 import { queryByText, queryByTestId } from "@testing-library/react";
-import React from "react";
 import { useMemo } from "react";
 
 import { THEME } from "@excalidraw/common";
 
 import { t } from "../i18n";
-import { Excalidraw, Footer, MainMenu } from "../index";
+import { Excalidraw, Footer } from "..";
+import MainMenu from "../components/main-menu/MainMenu";
 
-import { fireEvent, GlobalTestState, toggleMenu, render } from "./test-utils";
+import {
+  render,
+  togglePopover,
+  fireEvent,
+  GlobalTestState,
+} from "./test-utils";
 
 const { h } = window;
 
@@ -15,7 +20,7 @@ describe("<Excalidraw/>", () => {
   afterEach(() => {
     const menu = document.querySelector(".dropdown-menu");
     if (menu) {
-      toggleMenu(document.querySelector(".excalidraw")!);
+      togglePopover("Main menu");
     }
   });
 
@@ -136,7 +141,7 @@ describe("<Excalidraw/>", () => {
           <Excalidraw UIOptions={undefined} />,
         );
         //open menu
-        toggleMenu(container);
+        togglePopover("Main menu");
         expect(queryByTestId(container, "dropdown-menu")).toMatchSnapshot();
       });
 
@@ -145,7 +150,7 @@ describe("<Excalidraw/>", () => {
           <Excalidraw UIOptions={{ canvasActions: { clearCanvas: false } }} />,
         );
         //open menu
-        toggleMenu(container);
+        togglePopover("Main menu");
         expect(queryByTestId(container, "clear-canvas-button")).toBeNull();
       });
 
@@ -154,7 +159,7 @@ describe("<Excalidraw/>", () => {
           <Excalidraw UIOptions={{ canvasActions: { export: false } }} />,
         );
         //open menu
-        toggleMenu(container);
+        togglePopover("Main menu");
         expect(queryByTestId(container, "json-export-button")).toBeNull();
       });
 
@@ -163,7 +168,7 @@ describe("<Excalidraw/>", () => {
           <Excalidraw UIOptions={{ canvasActions: { saveAsImage: false } }} />,
         );
         //open menu
-        toggleMenu(container);
+        togglePopover("Main menu");
         expect(queryByTestId(container, "image-export-button")).toBeNull();
       });
 
@@ -182,7 +187,7 @@ describe("<Excalidraw/>", () => {
           />,
         );
         //open menu
-        toggleMenu(container);
+        togglePopover("Main menu");
         expect(queryByTestId(container, "save-as-button")).toBeNull();
       });
 
@@ -193,7 +198,7 @@ describe("<Excalidraw/>", () => {
           />,
         );
         //open menu
-        toggleMenu(container);
+        togglePopover("Main menu");
         expect(queryByTestId(container, "save-button")).toBeNull();
       });
 
@@ -204,7 +209,7 @@ describe("<Excalidraw/>", () => {
           />,
         );
         //open menu
-        toggleMenu(container);
+        togglePopover("Main menu");
         expect(queryByTestId(container, "canvas-background-label")).toBeNull();
         expect(queryByTestId(container, "canvas-background-picker")).toBeNull();
       });
@@ -220,7 +225,7 @@ describe("<Excalidraw/>", () => {
           </Excalidraw>,
         );
         //open menu
-        toggleMenu(container);
+        togglePopover("Main menu");
         expect(queryByTestId(container, "canvas-background-label")).toBeNull();
         expect(queryByTestId(container, "canvas-background-picker")).toBeNull();
       });
@@ -230,7 +235,7 @@ describe("<Excalidraw/>", () => {
           <Excalidraw UIOptions={{ canvasActions: { toggleTheme: false } }} />,
         );
         //open menu
-        toggleMenu(container);
+        togglePopover("Main menu");
         expect(queryByTestId(container, "toggle-dark-mode")).toBeNull();
       });
 
@@ -251,8 +256,8 @@ describe("<Excalidraw/>", () => {
           </Excalidraw>,
         );
         //open menu
-        toggleMenu(container);
         // load button shouldn't be rendered since `UIActions.canvasActions.loadScene` is `false`
+        togglePopover("Main menu");
         expect(queryByTestId(container, "load-button")).toBeNull();
       });
     });
@@ -263,7 +268,7 @@ describe("<Excalidraw/>", () => {
       const { container } = await render(<Excalidraw />);
       expect(h.state.theme).toBe(THEME.LIGHT);
       //open menu
-      toggleMenu(container);
+      togglePopover("Main menu");
       const darkModeToggle = queryByTestId(container, "toggle-dark-mode");
       expect(darkModeToggle).toBeTruthy();
     });
@@ -273,7 +278,7 @@ describe("<Excalidraw/>", () => {
 
       expect(h.state.theme).toBe(THEME.DARK);
       //open menu
-      toggleMenu(container);
+      togglePopover("Main menu");
       expect(queryByTestId(container, "toggle-dark-mode")).toBe(null);
     });
 
@@ -286,7 +291,7 @@ describe("<Excalidraw/>", () => {
       );
       expect(h.state.theme).toBe(THEME.DARK);
       //open menu
-      toggleMenu(container);
+      togglePopover("Main menu");
       const darkModeToggle = queryByTestId(container, "toggle-dark-mode");
       expect(darkModeToggle).toBeTruthy();
     });
@@ -300,7 +305,7 @@ describe("<Excalidraw/>", () => {
       );
       expect(h.state.theme).toBe(THEME.DARK);
       //open menu
-      toggleMenu(container);
+      togglePopover("Main menu");
       const darkModeToggle = queryByTestId(container, "toggle-dark-mode");
       expect(darkModeToggle).toBe(null);
     });
@@ -310,7 +315,7 @@ describe("<Excalidraw/>", () => {
     it("should allow editing name", async () => {
       const { container } = await render(<Excalidraw />);
       //open menu
-      toggleMenu(container);
+      togglePopover("Main menu");
       fireEvent.click(queryByTestId(container, "image-export-button")!);
       const textInput: HTMLInputElement | null = document.querySelector(
         ".ImageExportModal .ImageExportModal__preview__filename .TextInput",
@@ -323,7 +328,7 @@ describe("<Excalidraw/>", () => {
       const name = "test";
       const { container } = await render(<Excalidraw name={name} />);
       //open menu
-      toggleMenu(container);
+      togglePopover("Main menu");
       await fireEvent.click(queryByTestId(container, "image-export-button")!);
       const textInput = document.querySelector(
         ".ImageExportModal .ImageExportModal__preview__filename .TextInput",
@@ -375,7 +380,7 @@ describe("<Excalidraw/>", () => {
         </Excalidraw>,
       );
       //open menu
-      toggleMenu(container);
+      togglePopover("Main menu");
       expect(queryByTestId(container, "dropdown-menu")).toMatchSnapshot();
     });
 
@@ -394,7 +399,7 @@ describe("<Excalidraw/>", () => {
 
       const { container } = await render(<CustomExcalidraw />);
       //open menu
-      toggleMenu(container);
+      togglePopover("Main menu");
 
       expect(h.state.theme).toBe(THEME.LIGHT);
 

packages/excalidraw/tests/history.test.tsx

@@ -4055,7 +4055,7 @@ describe("history", () => {
             expect.objectContaining({
               id: container.id,
               boundElements: [{ id: remoteText.id, type: "text" }],
-              isDeleted: true,
+              isDeleted: false,
             }),
             expect.objectContaining({
               id: text.id,
@@ -4064,8 +4064,7 @@ describe("history", () => {
             }),
             expect.objectContaining({
               id: remoteText.id,
-              // unbound
+              containerId: container.id,
-              containerId: null,
               isDeleted: false,
             }),
           ]);
@@ -4355,8 +4354,8 @@ describe("history", () => {
           expect.objectContaining({
             ...textProps,
             // text element got redrawn!
-            x: 205,
+            x: 241.295259647664,
-            y: 205,
+            y: 247.59240920619527,
             angle: 90,
             id: text.id,
             containerId: container.id,
@@ -4399,8 +4398,8 @@ describe("history", () => {
           }),
           expect.objectContaining({
             ...textProps,
-            x: 205,
+            x: 241.295259647664,
-            y: 205,
+            y: 247.59240920619527,
             angle: 90,
             id: text.id,
             containerId: container.id,

packages/excalidraw/tests/library.test.tsx

@@ -1,5 +1,5 @@
-import { act, queryByTestId } from "@testing-library/react";
+import { queryByTestId } from "@testing-library/react";
-import React from "react";
+import { act } from "@testing-library/react";
 import { vi } from "vitest";
 
 import { MIME_TYPES, ORIG_ID } from "@excalidraw/common";
@@ -13,9 +13,11 @@ import { serializeLibraryAsJSON } from "../data/json";
 import { distributeLibraryItemsOnSquareGrid } from "../data/library";
 import { Excalidraw } from "../index";
 
+import { fireEvent, render, togglePopover, waitFor } from "./test-utils";
+
 import { API } from "./helpers/api";
 import { UI } from "./helpers/ui";
-import { fireEvent, getCloneByOrigId, render, waitFor } from "./test-utils";
+import { getCloneByOrigId } from "./test-utils";
 
 import type { LibraryItem, LibraryItems } from "../types";
 
@@ -215,12 +217,13 @@ describe("library menu", () => {
     const libraryButton = container.querySelector(".sidebar-trigger");
 
     fireEvent.click(libraryButton!);
-    fireEvent.click(
+    togglePopover("Library menu");
-      queryByTestId(
+    // fireEvent.click(
-        container.querySelector(".layer-ui__library")!,
+    //   queryByTestId(
-        "dropdown-menu-button",
+    //     container.querySelector(".layer-ui__library")!,
-      )!,
+    //     "dropdown-menu-button",
-    );
+    //   )!,
+    // );
     fireEvent.click(queryByTestId(container, "lib-dropdown--load")!);
 
     const libraryItems = parseLibraryJSON(await libraryJSONPromise);

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

@@ -2,26 +2,46 @@
 
 exports[`<Excalidraw/> > <MainMenu/> > should render main menu with host menu items if passed from host 1`] = `
 <div
-  class="dropdown-menu"
+  aria-labelledby="radix-:r65:"
+  aria-orientation="vertical"
+  class="dropdown-menu main-menu-content"
+  data-align="start"
+  data-orientation="vertical"
+  data-radix-menu-content=""
+  data-side="bottom"
+  data-state="open"
   data-testid="dropdown-menu"
+  dir="ltr"
+  id="radix-:r66:"
+  role="menu"
+  style="outline: none; --radix-dropdown-menu-content-transform-origin: var(--radix-popper-transform-origin); --radix-dropdown-menu-content-available-width: var(--radix-popper-available-width); --radix-dropdown-menu-content-available-height: var(--radix-popper-available-height); --radix-dropdown-menu-trigger-width: var(--radix-popper-anchor-width); --radix-dropdown-menu-trigger-height: var(--radix-popper-anchor-height); animation: none;"
+  tabindex="-1"
 >
   <div
     class="Island dropdown-menu-container"
-    style="--padding: 2; z-index: 2;"
+    style="--padding: 1; z-index: 2;"
   >
-    <button
+    <div
-      class="dropdown-menu-item dropdown-menu-item-base"
+      class="radix-menu-item"
-      type="button"
+      data-orientation="vertical"
+      data-radix-collection-item=""
+      role="menuitem"
+      tabindex="-1"
     >
-      <div
+      <button
-        class="dropdown-menu-item__icon"
+        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
-      />
+        type="button"
-      <div
-        class="dropdown-menu-item__text"
       >
-        Click me
+        <div
-      </div>
+          class="dropdown-menu-item__icon"
-    </button>
+        />
+        <div
+          class="dropdown-menu-item__text"
+        >
+          Click me
+        </div>
+      </button>
+    </div>
     <a
       class="dropdown-menu-item dropdown-menu-item-base"
       href="https://plus.excalidraw.com/blog"
@@ -46,301 +66,361 @@ exports[`<Excalidraw/> > <MainMenu/> > should render main menu with host menu it
         custom menu item
       </button>
     </div>
-    <button
+    <div
-      aria-label="Help"
+      class="radix-menu-item"
-      class="dropdown-menu-item dropdown-menu-item-base"
+      data-orientation="vertical"
-      data-testid="help-menu-item"
+      data-radix-collection-item=""
-      title="Help"
+      role="menuitem"
-      type="button"
+      tabindex="-1"
     >
-      <div
+      <button
-        class="dropdown-menu-item__icon"
+        aria-label="Help"
+        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
+        data-testid="help-menu-item"
+        title="Help"
+        type="button"
       >
-        <svg
+        <div
-          aria-hidden="true"
+          class="dropdown-menu-item__icon"
-          class=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          viewBox="0 0 24 24"
         >
-          <g
+          <svg
-            stroke-width="1.5"
+            aria-hidden="true"
+            class=""
+            fill="none"
+            focusable="false"
+            role="img"
+            stroke="currentColor"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            viewBox="0 0 24 24"
           >
-            <path
+            <g
-              d="M0 0h24v24H0z"
+              stroke-width="1.5"
-              fill="none"
+            >
-              stroke="none"
+              <path
-            />
+                d="M0 0h24v24H0z"
-            <circle
+                fill="none"
-              cx="12"
+                stroke="none"
-              cy="12"
+              />
-              r="9"
+              <circle
-            />
+                cx="12"
-            <line
+                cy="12"
-              x1="12"
+                r="9"
-              x2="12"
+              />
-              y1="17"
+              <line
-              y2="17.01"
+                x1="12"
-            />
+                x2="12"
-            <path
+                y1="17"
-              d="M12 13.5a1.5 1.5 0 0 1 1 -1.5a2.6 2.6 0 1 0 -3 -4"
+                y2="17.01"
-            />
+              />
-          </g>
+              <path
-        </svg>
+                d="M12 13.5a1.5 1.5 0 0 1 1 -1.5a2.6 2.6 0 1 0 -3 -4"
-      </div>
+              />
-      <div
+            </g>
-        class="dropdown-menu-item__text"
+          </svg>
-      >
+        </div>
-        Help
+        <div
-      </div>
+          class="dropdown-menu-item__text"
-      <div
+        >
-        class="dropdown-menu-item__shortcut"
+          Help
-      >
+        </div>
-        ?
+        <div
-      </div>
+          class="dropdown-menu-item__shortcut"
-    </button>
+        >
+          ?
+        </div>
+      </button>
+    </div>
   </div>
 </div>
 `;
 
 exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should render menu with default items when "UIOPtions" is "undefined" 1`] = `
 <div
-  class="dropdown-menu"
+  aria-labelledby="radix-:rq:"
+  aria-orientation="vertical"
+  class="dropdown-menu main-menu-content"
+  data-align="start"
+  data-orientation="vertical"
+  data-radix-menu-content=""
+  data-side="bottom"
+  data-state="open"
   data-testid="dropdown-menu"
+  dir="ltr"
+  id="radix-:rr:"
+  role="menu"
+  style="outline: none; --radix-dropdown-menu-content-transform-origin: var(--radix-popper-transform-origin); --radix-dropdown-menu-content-available-width: var(--radix-popper-available-width); --radix-dropdown-menu-content-available-height: var(--radix-popper-available-height); --radix-dropdown-menu-trigger-width: var(--radix-popper-anchor-width); --radix-dropdown-menu-trigger-height: var(--radix-popper-anchor-height); animation: none;"
+  tabindex="-1"
 >
   <div
     class="Island dropdown-menu-container"
-    style="--padding: 2; z-index: 2;"
+    style="--padding: 1; z-index: 2;"
   >
-    <button
+    <div
-      aria-label="Open"
+      class="radix-menu-item"
-      class="dropdown-menu-item dropdown-menu-item-base"
+      data-orientation="vertical"
-      data-testid="load-button"
+      data-radix-collection-item=""
-      title="Open"
+      role="menuitem"
-      type="button"
+      tabindex="-1"
     >
-      <div
+      <button
-        class="dropdown-menu-item__icon"
+        aria-label="Open"
+        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
+        data-testid="load-button"
+        title="Open"
+        type="button"
       >
-        <svg
+        <div
-          aria-hidden="true"
+          class="dropdown-menu-item__icon"
-          class=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          viewBox="0 0 20 20"
         >
-          <path
+          <svg
-            d="m9.257 6.351.183.183H15.819c.34 0 .727.182 1.051.506.323.323.505.708.505 1.05v5.819c0 .316-.183.7-.52 1.035-.337.338-.723.522-1.037.522H4.182c-.352 0-.74-.181-1.058-.5-.318-.318-.499-.705-.499-1.057V5.182c0-.351.181-.736.5-1.054.32-.321.71-.503 1.057-.503H6.53l2.726 2.726Z"
+            aria-hidden="true"
-            stroke-width="1.25"
+            class=""
-          />
+            fill="none"
-        </svg>
+            focusable="false"
-      </div>
+            role="img"
-      <div
+            stroke="currentColor"
-        class="dropdown-menu-item__text"
+            stroke-linecap="round"
-      >
+            stroke-linejoin="round"
-        Open
+            viewBox="0 0 20 20"
-      </div>
-      <div
-        class="dropdown-menu-item__shortcut"
-      >
-        Ctrl+O
-      </div>
-    </button>
-    <button
-      aria-label="Save to..."
-      class="dropdown-menu-item dropdown-menu-item-base"
-      data-testid="json-export-button"
-      title="Save to..."
-      type="button"
-    >
-      <div
-        class="dropdown-menu-item__icon"
-      >
-        <svg
-          aria-hidden="true"
-          class=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          viewBox="0 0 20 20"
-        >
-          <path
-            d="M3.333 14.167v1.666c0 .92.747 1.667 1.667 1.667h10c.92 0 1.667-.746 1.667-1.667v-1.666M5.833 9.167 10 13.333l4.167-4.166M10 3.333v10"
-            stroke-width="1.25"
-          />
-        </svg>
-      </div>
-      <div
-        class="dropdown-menu-item__text"
-      >
-        Save to...
-      </div>
-    </button>
-    <button
-      aria-label="Export image..."
-      class="dropdown-menu-item dropdown-menu-item-base"
-      data-testid="image-export-button"
-      title="Export image..."
-      type="button"
-    >
-      <div
-        class="dropdown-menu-item__icon"
-      >
-        <svg
-          aria-hidden="true"
-          class=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          viewBox="0 0 24 24"
-        >
-          <g
-            stroke-width="1.25"
           >
             <path
-              d="M0 0h24v24H0z"
+              d="m9.257 6.351.183.183H15.819c.34 0 .727.182 1.051.506.323.323.505.708.505 1.05v5.819c0 .316-.183.7-.52 1.035-.337.338-.723.522-1.037.522H4.182c-.352 0-.74-.181-1.058-.5-.318-.318-.499-.705-.499-1.057V5.182c0-.351.181-.736.5-1.054.32-.321.71-.503 1.057-.503H6.53l2.726 2.726Z"
-              fill="none"
+              stroke-width="1.25"
-              stroke="none"
             />
-            <path
+          </svg>
-              d="M15 8h.01"
+        </div>
-            />
+        <div
-            <path
+          class="dropdown-menu-item__text"
-              d="M12 20h-5a3 3 0 0 1 -3 -3v-10a3 3 0 0 1 3 -3h10a3 3 0 0 1 3 3v5"
-            />
-            <path
-              d="M4 15l4 -4c.928 -.893 2.072 -.893 3 0l4 4"
-            />
-            <path
-              d="M14 14l1 -1c.617 -.593 1.328 -.793 2.009 -.598"
-            />
-            <path
-              d="M19 16v6"
-            />
-            <path
-              d="M22 19l-3 3l-3 -3"
-            />
-          </g>
-        </svg>
-      </div>
-      <div
-        class="dropdown-menu-item__text"
-      >
-        Export image...
-      </div>
-      <div
-        class="dropdown-menu-item__shortcut"
-      >
-        Ctrl+Shift+E
-      </div>
-    </button>
-    <button
-      aria-label="Help"
-      class="dropdown-menu-item dropdown-menu-item-base"
-      data-testid="help-menu-item"
-      title="Help"
-      type="button"
-    >
-      <div
-        class="dropdown-menu-item__icon"
-      >
-        <svg
-          aria-hidden="true"
-          class=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          viewBox="0 0 24 24"
         >
-          <g
+          Open
-            stroke-width="1.5"
+        </div>
+        <div
+          class="dropdown-menu-item__shortcut"
+        >
+          Ctrl+O
+        </div>
+      </button>
+    </div>
+    <div
+      class="radix-menu-item"
+      data-orientation="vertical"
+      data-radix-collection-item=""
+      role="menuitem"
+      tabindex="-1"
+    >
+      <button
+        aria-label="Save to..."
+        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
+        data-testid="json-export-button"
+        title="Save to..."
+        type="button"
+      >
+        <div
+          class="dropdown-menu-item__icon"
+        >
+          <svg
+            aria-hidden="true"
+            class=""
+            fill="none"
+            focusable="false"
+            role="img"
+            stroke="currentColor"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            viewBox="0 0 20 20"
           >
             <path
-              d="M0 0h24v24H0z"
+              d="M3.333 14.167v1.666c0 .92.747 1.667 1.667 1.667h10c.92 0 1.667-.746 1.667-1.667v-1.666M5.833 9.167 10 13.333l4.167-4.166M10 3.333v10"
-              fill="none"
+              stroke-width="1.25"
-              stroke="none"
             />
-            <circle
+          </svg>
-              cx="12"
+        </div>
-              cy="12"
+        <div
-              r="9"
+          class="dropdown-menu-item__text"
-            />
-            <line
-              x1="12"
-              x2="12"
-              y1="17"
-              y2="17.01"
-            />
-            <path
-              d="M12 13.5a1.5 1.5 0 0 1 1 -1.5a2.6 2.6 0 1 0 -3 -4"
-            />
-          </g>
-        </svg>
-      </div>
-      <div
-        class="dropdown-menu-item__text"
-      >
-        Help
-      </div>
-      <div
-        class="dropdown-menu-item__shortcut"
-      >
-        ?
-      </div>
-    </button>
-    <button
-      aria-label="Reset the canvas"
-      class="dropdown-menu-item dropdown-menu-item-base"
-      data-testid="clear-canvas-button"
-      title="Reset the canvas"
-      type="button"
-    >
-      <div
-        class="dropdown-menu-item__icon"
-      >
-        <svg
-          aria-hidden="true"
-          class=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          viewBox="0 0 20 20"
         >
-          <path
+          Save to...
-            d="M3.333 5.833h13.334M8.333 9.167v5M11.667 9.167v5M4.167 5.833l.833 10c0 .92.746 1.667 1.667 1.667h6.666c.92 0 1.667-.746 1.667-1.667l.833-10M7.5 5.833v-2.5c0-.46.373-.833.833-.833h3.334c.46 0 .833.373.833.833v2.5"
+        </div>
-            stroke-width="1.25"
+      </button>
-          />
+    </div>
-        </svg>
+    <div
-      </div>
+      class="radix-menu-item"
-      <div
+      data-orientation="vertical"
-        class="dropdown-menu-item__text"
+      data-radix-collection-item=""
+      role="menuitem"
+      tabindex="-1"
+    >
+      <button
+        aria-label="Export image..."
+        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
+        data-testid="image-export-button"
+        title="Export image..."
+        type="button"
       >
-        Reset the canvas
+        <div
-      </div>
+          class="dropdown-menu-item__icon"
-    </button>
+        >
+          <svg
+            aria-hidden="true"
+            class=""
+            fill="none"
+            focusable="false"
+            role="img"
+            stroke="currentColor"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+          >
+            <g
+              stroke-width="1.25"
+            >
+              <path
+                d="M0 0h24v24H0z"
+                fill="none"
+                stroke="none"
+              />
+              <path
+                d="M15 8h.01"
+              />
+              <path
+                d="M12 20h-5a3 3 0 0 1 -3 -3v-10a3 3 0 0 1 3 -3h10a3 3 0 0 1 3 3v5"
+              />
+              <path
+                d="M4 15l4 -4c.928 -.893 2.072 -.893 3 0l4 4"
+              />
+              <path
+                d="M14 14l1 -1c.617 -.593 1.328 -.793 2.009 -.598"
+              />
+              <path
+                d="M19 16v6"
+              />
+              <path
+                d="M22 19l-3 3l-3 -3"
+              />
+            </g>
+          </svg>
+        </div>
+        <div
+          class="dropdown-menu-item__text"
+        >
+          Export image...
+        </div>
+        <div
+          class="dropdown-menu-item__shortcut"
+        >
+          Ctrl+Shift+E
+        </div>
+      </button>
+    </div>
+    <div
+      class="radix-menu-item"
+      data-orientation="vertical"
+      data-radix-collection-item=""
+      role="menuitem"
+      tabindex="-1"
+    >
+      <button
+        aria-label="Help"
+        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
+        data-testid="help-menu-item"
+        title="Help"
+        type="button"
+      >
+        <div
+          class="dropdown-menu-item__icon"
+        >
+          <svg
+            aria-hidden="true"
+            class=""
+            fill="none"
+            focusable="false"
+            role="img"
+            stroke="currentColor"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+          >
+            <g
+              stroke-width="1.5"
+            >
+              <path
+                d="M0 0h24v24H0z"
+                fill="none"
+                stroke="none"
+              />
+              <circle
+                cx="12"
+                cy="12"
+                r="9"
+              />
+              <line
+                x1="12"
+                x2="12"
+                y1="17"
+                y2="17.01"
+              />
+              <path
+                d="M12 13.5a1.5 1.5 0 0 1 1 -1.5a2.6 2.6 0 1 0 -3 -4"
+              />
+            </g>
+          </svg>
+        </div>
+        <div
+          class="dropdown-menu-item__text"
+        >
+          Help
+        </div>
+        <div
+          class="dropdown-menu-item__shortcut"
+        >
+          ?
+        </div>
+      </button>
+    </div>
+    <div
+      class="radix-menu-item"
+      data-orientation="vertical"
+      data-radix-collection-item=""
+      role="menuitem"
+      tabindex="-1"
+    >
+      <button
+        aria-label="Reset the canvas"
+        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
+        data-testid="clear-canvas-button"
+        title="Reset the canvas"
+        type="button"
+      >
+        <div
+          class="dropdown-menu-item__icon"
+        >
+          <svg
+            aria-hidden="true"
+            class=""
+            fill="none"
+            focusable="false"
+            role="img"
+            stroke="currentColor"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            viewBox="0 0 20 20"
+          >
+            <path
+              d="M3.333 5.833h13.334M8.333 9.167v5M11.667 9.167v5M4.167 5.833l.833 10c0 .92.746 1.667 1.667 1.667h6.666c.92 0 1.667-.746 1.667-1.667l.833-10M7.5 5.833v-2.5c0-.46.373-.833.833-.833h3.334c.46 0 .833.373.833.833v2.5"
+              stroke-width="1.25"
+            />
+          </svg>
+        </div>
+        <div
+          class="dropdown-menu-item__text"
+        >
+          Reset the canvas
+        </div>
+      </button>
+    </div>
     <div
       style="height: 1px; margin: .5rem 0px;"
     />
@@ -473,45 +553,53 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
     <div
       style="height: 1px; margin: .5rem 0px;"
     />
-    <button
+    <div
-      aria-label="Dark mode"
+      class="radix-menu-item"
-      class="dropdown-menu-item dropdown-menu-item-base"
+      data-orientation="vertical"
-      data-testid="toggle-dark-mode"
+      data-radix-collection-item=""
-      title="Dark mode"
+      role="menuitem"
-      type="button"
+      tabindex="-1"
     >
-      <div
+      <button
-        class="dropdown-menu-item__icon"
+        aria-label="Dark mode"
+        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
+        data-testid="toggle-dark-mode"
+        title="Dark mode"
+        type="button"
       >
-        <svg
+        <div
-          aria-hidden="true"
+          class="dropdown-menu-item__icon"
-          class=""
-          fill="none"
-          focusable="false"
-          role="img"
-          stroke="currentColor"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          viewBox="0 0 20 20"
         >
-          <path
+          <svg
-            clip-rule="evenodd"
+            aria-hidden="true"
-            d="M10 2.5h.328a6.25 6.25 0 0 0 6.6 10.372A7.5 7.5 0 1 1 10 2.493V2.5Z"
+            class=""
+            fill="none"
+            focusable="false"
+            role="img"
             stroke="currentColor"
-          />
+            stroke-linecap="round"
-        </svg>
+            stroke-linejoin="round"
-      </div>
+            viewBox="0 0 20 20"
-      <div
+          >
-        class="dropdown-menu-item__text"
+            <path
-      >
+              clip-rule="evenodd"
-        Dark mode
+              d="M10 2.5h.328a6.25 6.25 0 0 0 6.6 10.372A7.5 7.5 0 1 1 10 2.493V2.5Z"
-      </div>
+              stroke="currentColor"
-      <div
+            />
-        class="dropdown-menu-item__shortcut"
+          </svg>
-      >
+        </div>
-        Shift+Alt+D
+        <div
-      </div>
+          class="dropdown-menu-item__text"
-    </button>
+        >
+          Dark mode
+        </div>
+        <div
+          class="dropdown-menu-item__shortcut"
+        >
+          Shift+Alt+D
+        </div>
+      </button>
+    </div>
     <div
       style="margin-top: 0.5rem;"
     >
@@ -522,6 +610,7 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
         Canvas background
       </div>
       <div
+        id="canvas-bg-color-picker-container"
         style="padding: 0px 0.625rem;"
       >
         <div>
@@ -593,7 +682,7 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
               style="width: 1px; height: 100%; margin: 0px auto;"
             />
             <button
-              aria-controls="radix-:r0:"
+              aria-controls="radix-:r12:"
               aria-expanded="false"
               aria-haspopup="dialog"
               aria-label="Canvas background"

packages/excalidraw/wysiwyg/textWysiwyg.tsx

@@ -215,11 +215,12 @@ export const textWysiwyg = ({
           );
           app.scene.mutateElement(container, { height: targetContainerHeight });
         } else {
-          const { y } = computeBoundTextPosition(
+          const { x, y } = computeBoundTextPosition(
             container,
             updatedTextElement as ExcalidrawTextElementWithContainer,
             elementsMap,
           );
+          coordX = x;
           coordY = y;
         }
       }