add design doc

dev-docs/docs/codebase/hierarchy-plan.md

@@ -0,0 +1,101 @@
+## Excalidraw Hierarchical Model Plan
+
+### Background & Goals
+
+Introduce a fully in-memory hierarchical (tree) model on top of the existing flat `elements[]` storage for more efficient complex operations (queries, selection, collision), while keeping flat arrays as the persistence/collab projection. Gradually move to tree-first edits with flat projection.
+
+### Capabilities To Preserve
+
+- z-index via fractional indices
+- add/remove to frame
+- group/ungroup
+- bound texts (containerId)
+- arrow bindings (start/endBinding)
+- history (undo/redo) and collab (delta broadcast)
+- load/save the flat array
+
+### Existing Reusable Capabilities
+
+- Deltas & History: `element/src/delta.ts` (ElementsDelta/AppStateDelta/StoreDelta), `excalidraw/history.ts` (HistoryDelta), auto rebind, text bbox redraw, z-index normalization.
+- Store & Snapshot: `element/src/store.ts` provides commit levels, batching, and delta emission.
+- Scene & Relationships: `element/src/Scene.ts`, `element/src/frame.ts`, `element/src/groups.ts` for frames and groups logic.
+- Rendering: `excalidraw/renderer/staticScene.ts` with order by fractional index.
+- Restore/Import: `excalidraw/data/restore.ts`.
+
+### Data Model & Invariants
+
+- Node types: `ElementNode`, logical `GroupNode` (id=groupId), `FrameNode` (bound to frame element). `Table*Node` reserved.
+- Parent priority: container > group (deep→shallow) > frame > root; single parent per node.
+- Groups must not span multiple frames.
+- Drawing order remains by fractional index; the tree offers structural and sibling-order views only.
+
+### Flat→Tree Build (`buildFromFlat`)
+
+- Input: `elements[]`/`elementsMap` (optionally including deleted).
+- Output: `{ nodesById, roots, orderHints, diagnostics }`.
+- Rules:
+  - Bound text attaches to its container; groups form deep→shallow parent chains from `groupIds`; frame parent from `frameId`; otherwise root.
+  - Sibling order: ascending by the minimum `index` across the node’s represented elements.
+  - Diagnostics: cross-frame groups, invalid container, cycles, missing refs (error/warn).
+
+### Tree → Flat Projection (`flattenToArray`)
+
+- Input: tree, optional "apply recommended reorder".
+- Output: `{ nextFieldsByElementId, reorderIntent? }`.
+- Rules:
+  - `frameId` from nearest frame ancestor; `groupIds` nearest→farthest; `containerId` from nearest container.
+  - Do not change draw order by default; any reordering is applied by the caller via `Scene.insert*` and `syncMovedIndices`.
+
+### Operations Mapping (Tree edits → Flat deltas)
+
+- z-index: sibling reordering → index deltas; normalized with `syncMovedIndices`.
+- Frame membership: reparent to `FrameNode`/root → `frameId` updates; cross-frame groups disallowed.
+- Group/ungroup: modify `GroupNode` structure → update `groupIds` chains.
+- Bound text: reparent to container → update `containerId`/`boundElements`; text bbox redraw handled by `ElementsDelta`.
+- Arrow binding: does not change parentage; only update start/endBinding; `ElementsDelta` handles rebind/unbind.
+
+### History & Collab
+
+- Transactional edits on the tree via `HierarchyManager.begin/commit/rollback`; commit projects to a minimal flat diff, wrapped as `StoreDelta`, and submitted via `Store.scheduleMicroAction` (IMMEDIATELY).
+- Undo/redo uses `HistoryDelta`; replay re-emits flat deltas for sync.
+- Collab remains flat-delta based; peers rebuild the tree deterministically from flats.
+
+### Rendering Strategy
+
+- Add a tree-backed rendering adapter beside `renderStaticScene` behind a feature flag, preserving draw-order semantics (fractional index). In the short term, use the tree for selection/collision pruning (frame → group → element).
+
+### Challenges & Risks
+
+- Cross-frame group handling (block or guided fix).
+- Reorder consistency (tree sibling order vs fractional index).
+- Collab conflicts (use `ElementsDelta.applyLatestChanges`).
+- Performance (build O(n), queries O(1)/O(k)); cache/incremental via `sceneNonce`.
+- Test coverage (round-trip, collab equivalence, history replay, deep groups/large frames/binding chains).
+
+### Phased Plan
+
+- Phase 0 Rules & Contracts
+  - Lock invariants and priorities; define diagnostics (error/warn).
+- Phase 1 Pure functions & Validation
+  - Implement `buildFromFlat`, `flattenToArray`, `validateIntegrity`; cache by `sceneNonce`; add round-trip tests.
+- Phase 2 Read-only integration
+  - Tree-backed selection and collision pruning; measure wins.
+- Phase 3 Parallel render adapter
+  - Tree render adapter (flag) with preserved order semantics.
+- Phase 4 Projection & Transactions
+  - `HierarchyManager.begin/commit/rollback`; commit→`StoreDelta`→Store.
+- Phase 5 Migrate operations
+  - Frame membership and group/ungroup → tree+projection; then bound text; optional z-index reorder intent.
+- Phase 6 Extensions & Tables
+  - Introduce `Table*Node` (in-memory first, then projection), with validation and UI.
+
+### Success Criteria
+
+- Correctness: same flat → same tree; unchanged structure round-trip no-ops; existing operations equivalent.
+- History/Collab: still record and broadcast minimal flat deltas; deterministic tree on peers.
+- Performance: selection/collision candidate reduction on large scenes; build/query latency targets met.
+- Rollback: feature flag to fall back to legacy path at any time.
+
+### Next Steps
+
+- Finalize invariants and IO contracts; implement `buildFromFlat`/`flattenToArray` and `validateIntegrity`; add round‑trip and failure-case tests; prototype read-only integration and render adapter.

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

@@ -615,52 +615,6 @@ 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 />
@@ -668,57 +622,10 @@ 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/components/AppMainMenu.tsx

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

packages/common/src/constants.ts

@@ -28,9 +28,11 @@ export const isBrave = () =>
 export const isMobile =
   isIOS ||
   /android|webos|ipod|blackberry|iemobile|opera mini/i.test(
-    navigator.userAgent,
+    navigator.userAgent.toLowerCase(),
   ) ||
-  /android|ios|ipod|blackberry|windows phone/i.test(navigator.platform);
+  /android|ios|ipod|blackberry|windows phone/i.test(
+    navigator.platform.toLowerCase(),
+  );
 
 export const supportsResizeObserver =
   typeof window !== "undefined" && "ResizeObserver" in window;
@@ -522,5 +524,3 @@ 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/elbowArrow.ts

@@ -359,12 +359,6 @@ 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
@@ -712,7 +706,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) =>
@@ -747,15 +741,8 @@ const handleEndpointDrag = (
 
   // Calculate the moving second point connection and add the start point
   {
-    const secondPoint = globalUpdatedPoints.at(startIsSpecial ? 2 : 1);
+    const secondPoint = globalUpdatedPoints[startIsSpecial ? 2 : 1];
-    const thirdPoint = globalUpdatedPoints.at(startIsSpecial ? 3 : 2);
+    const thirdPoint = globalUpdatedPoints[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)),
@@ -814,19 +801,10 @@ const handleEndpointDrag = (
 
   // Calculate the moving second to last point connection
   {
-    const secondToLastPoint = globalUpdatedPoints.at(
+    const secondToLastPoint =
-      globalUpdatedPoints.length - (endIsSpecial ? 3 : 2),
+      globalUpdatedPoints[globalUpdatedPoints.length - (endIsSpecial ? 3 : 2)];
-    );
+    const thirdToLastPoint =
-    const thirdToLastPoint = globalUpdatedPoints.at(
+      globalUpdatedPoints[globalUpdatedPoints.length - (endIsSpecial ? 4 : 3)];
-      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,
@@ -2093,7 +2071,16 @@ 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,7 +35,6 @@ import {
   getContainerElement,
   handleBindTextResize,
   getBoundTextMaxWidth,
-  computeBoundTextPosition,
 } from "./textElement";
 import {
   getMinTextElementWidth,
@@ -226,16 +225,7 @@ const rotateSingleElement = (
       scene.getElement<ExcalidrawTextElementWithContainer>(boundTextElementId);
 
     if (textElement && !isArrowElement(element)) {
-      const { x, y } = computeBoundTextPosition(
+      scene.mutateElement(textElement, { angle });
-        element,
-        textElement,
-        scene.getNonDeletedElementsMap(),
-      );
-      scene.mutateElement(textElement, {
-        angle,
-        x,
-        y,
-      });
     }
   }
 };
@@ -426,15 +416,9 @@ const rotateMultipleElements = (
 
       const boundText = getBoundTextElement(element, elementsMap);
       if (boundText && !isArrowElement(element)) {
-        const { x, y } = computeBoundTextPosition(
-          element,
-          boundText,
-          elementsMap,
-        );
-
         scene.mutateElement(boundText, {
-          x,
+          x: boundText.x + (rotatedCX - cx),
-          y,
+          y: boundText.y + (rotatedCY - cy),
           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,26 +254,6 @@ 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/textElement.test.ts

@@ -1,14 +1,13 @@
 import { getLineHeight } from "@excalidraw/common";
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 
-import { FONT_FAMILY, TEXT_ALIGN, VERTICAL_ALIGN } from "@excalidraw/common";
+import { FONT_FAMILY } from "@excalidraw/common";
 
 import {
   computeContainerDimensionForBoundText,
   getContainerCoords,
   getBoundTextMaxWidth,
   getBoundTextMaxHeight,
-  computeBoundTextPosition,
 } from "../src/textElement";
 import { detectLineHeight, getLineHeightInPx } from "../src/textMeasurements";
 
@@ -208,172 +207,3 @@ 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,8 +54,7 @@ export type ShortcutName =
   | "saveScene"
   | "imageExport"
   | "commandPalette"
-  | "searchMenu"
+  | "searchMenu";
-  | "toolLock";
 
 const shortcutMap: Record<ShortcutName, string[]> = {
   toggleTheme: [getShortcutKey("Shift+Alt+D")],
@@ -117,7 +116,6 @@ const shortcutMap: Record<ShortcutName, string[]> = {
   toggleShortcuts: [getShortcutKey("?")],
   searchMenu: [getShortcutKey("CtrlOrCmd+F")],
   wrapSelectionInFrame: [],
-  toolLock: [getShortcutKey("Q")],
 };
 
 export const getShortcutFromShortcutName = (name: ShortcutName, idx = 0) => {

packages/excalidraw/components/Actions.tsx

@@ -397,7 +397,6 @@ export const ShapesSwitcher = ({
           onClickOutside={() => setIsExtraToolsMenuOpen(false)}
           onSelect={() => setIsExtraToolsMenuOpen(false)}
           className="App-toolbar__extra-tools-dropdown"
-          align="end"
         >
           <DropdownMenu.Item
             onSelect={() => app.setActiveTool({ type: "frame" })}
@@ -451,10 +450,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,7 +102,6 @@ import {
   Emitter,
   isMobile,
   MINIMUM_ARROW_SIZE,
-  DOUBLE_TAP_POSITION_THRESHOLD,
 } from "@excalidraw/common";
 
 import {
@@ -532,7 +531,6 @@ 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;
@@ -2991,7 +2989,6 @@ class App extends React.Component<AppProps, AppState> {
 
   private static resetTapTwice() {
     didTapTwice = false;
-    firstTapPosition = null;
   }
 
   private onTouchStart = (event: TouchEvent) => {
@@ -3002,13 +2999,6 @@ 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,
@@ -3016,29 +3006,15 @@ 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 && firstTapPosition) {
+    if (didTapTwice && event.touches.length === 1) {
       const touch = event.touches[0];
-      const distance = pointDistance(
+      // @ts-ignore
-        pointFrom(touch.clientX, touch.clientY),
+      this.handleCanvasDoubleClick({
-        pointFrom(firstTapPosition.x, firstTapPosition.y),
+        clientX: touch.clientX,
-      );
+        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: (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => any;
+  onSelect: () => 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(event);
+        onSelect();
       })}
       type={type}
       className={clsx("excalidraw-button", className, { selected })}

packages/excalidraw/components/ColorPicker/ColorPicker.scss

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

packages/excalidraw/components/FontPicker/FontPickerListItem.tsx

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

packages/excalidraw/components/LibraryMenuHeaderContent.tsx

@@ -194,7 +194,6 @@ export const LibraryDropdownMenuButton: React.FC<{
       <DropdownMenu open={isLibraryMenuOpen}>
         <DropdownMenu.Trigger
           onToggle={() => setIsLibraryMenuOpen(!isLibraryMenuOpen)}
-          aria-label="Library menu"
         >
           {DotsIcon}
         </DropdownMenu.Trigger>
@@ -202,7 +201,6 @@ 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,45 +1,20 @@
-@import "../../css/variables.module";
+@import "../../css/variables.module.scss";
 
 .excalidraw {
-  [data-dropdown-menu-trigger] + [data-radix-popper-content-wrapper] {
-    z-index: 2 !important;
-  }
-
   .dropdown-menu {
-    max-width: 16rem;
+    position: absolute;
-    margin-top: 0.25rem;
+    top: 100%;
-
+    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;
@@ -55,14 +30,13 @@
 
     .dropdown-menu-container {
       background-color: var(--island-bg-color);
-      max-height: var(--radix-popper-available-height);
+      max-height: calc(100vh - 150px);
       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);
@@ -70,7 +44,6 @@
       box-sizing: border-box;
       font-weight: 400;
       font-family: inherit;
-      justify-content: flex-start;
     }
 
     &.manual-hover {

packages/excalidraw/components/dropdownMenu/DropdownMenu.tsx

@@ -1,7 +1,5 @@
 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";
@@ -25,12 +23,11 @@ const DropdownMenu = ({
 }) => {
   const MenuTriggerComp = getMenuTriggerComponent(children);
   const MenuContentComp = getMenuContentComponent(children);
-
   return (
-    <DropdownMenuPrimitive.Root open={open} modal={false}>
+    <>
       {MenuTriggerComp}
-      {MenuContentComp}
+      {open && MenuContentComp}
-    </DropdownMenuPrimitive.Root>
+    </>
   );
 };
 

packages/excalidraw/components/dropdownMenu/DropdownMenuContent.tsx

@@ -3,8 +3,6 @@ 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";
@@ -19,9 +17,6 @@ const MenuContent = ({
   className = "",
   onSelect,
   style,
-  sideOffset = 4,
-  align = "start",
-  collisionPadding,
 }: {
   children?: React.ReactNode;
   onClickOutside?: () => void;
@@ -31,11 +26,6 @@ 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);
@@ -72,15 +62,11 @@ const MenuContent = ({
 
   return (
     <DropdownMenuContentPropsContext.Provider value={{ onSelect }}>
-      <DropdownMenuPrimitive.Content
+      <div
         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 */}
@@ -95,7 +81,7 @@ const MenuContent = ({
             {children}
           </Island>
         )}
-      </DropdownMenuPrimitive.Content>
+      </div>
     </DropdownMenuContentPropsContext.Provider>
   );
 };

packages/excalidraw/components/dropdownMenu/DropdownMenuItem.tsx

@@ -1,17 +1,12 @@
-import React, { useRef } from "react";
+import React, { useEffect, 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,
@@ -22,45 +17,55 @@ 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 (
-    <DropdownMenuPrimitive.Item className="radix-menu-item">
+    <button
-      <Button
+      {...rest}
-        {...rest}
+      ref={ref}
-        ref={ref}
+      value={value}
-        onSelect={handleClick}
+      onClick={handleClick}
-        className={getDropdownMenuItemClassName(className)}
+      className={getDropdownMenuItemClassName(className, selected, hovered)}
-        title={rest.title ?? rest["aria-label"]}
+      title={rest.title ?? rest["aria-label"]}
-      >
+    >
-        <MenuItemContent icon={icon} shortcut={shortcut} badge={badge}>
+      <MenuItemContent textStyle={textStyle} icon={icon} shortcut={shortcut}>
-          {children}
+        {children}
-        </MenuItemContent>
+      </MenuItemContent>
-      </Button>
+    </button>
-    </DropdownMenuPrimitive.Item>
   );
 };
 DropdownMenuItem.displayName = "DropdownMenuItem";

packages/excalidraw/components/dropdownMenu/DropdownMenuItemContent.tsx

@@ -2,24 +2,25 @@ import { useDevice } from "../App";
 
 import { Ellipsify } from "../Ellipsify";
 
+import type { JSX } from "react";
+
 const MenuItemContent = ({
+  textStyle,
   icon,
-  badge,
   shortcut,
   children,
 }: {
-  icon?: React.ReactNode;
+  icon?: JSX.Element;
   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 className="dropdown-menu-item__text">
+      <div style={textStyle} 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

@@ -1,27 +0,0 @@
-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

@@ -1,44 +0,0 @@
-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

@@ -1,45 +0,0 @@
-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

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

packages/excalidraw/components/dropdownMenu/dropdownMenuUtils.ts

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

packages/excalidraw/components/icons.tsx

@@ -72,15 +72,6 @@ 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">
@@ -2278,21 +2269,3 @@ 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,11 +9,8 @@ import {
   actionLoadScene,
   actionSaveToActiveFile,
   actionShortcuts,
-  actionToggleGridMode,
-  actionToggleObjectsSnapMode,
   actionToggleSearchMenu,
   actionToggleTheme,
-  actionToggleZenMode,
 } from "../../actions";
 import { getShortcutFromShortcutName } from "../../actions/shortcuts";
 import { trackEvent } from "../../analytics";
@@ -26,23 +23,13 @@ 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 DropdownMenuSub from "../dropdownMenu/DropdownMenuSub";
+import { GithubIcon, DiscordIcon, XBrandIcon } from "../icons";
-import { actionToggleViewMode } from "../../actions/actionToggleViewMode";
-import {
-  GithubIcon,
-  DiscordIcon,
-  XBrandIcon,
-  settingsIcon,
-  checkIcon,
-  emptyIcon,
-} from "../icons";
 import {
   boltIcon,
   DeviceDesktopIcon,
@@ -326,10 +313,7 @@ export const ChangeCanvasBackground = () => {
       >
         {t("labels.canvasBackground")}
       </div>
-      <div
+      <div style={{ padding: "0 0.625rem" }}>
-        style={{ padding: "0 0.625rem" }}
-        id="canvas-bg-color-picker-container"
-      >
         {actionManager.renderAction("changeViewBackgroundColor")}
       </div>
     </div>
@@ -409,73 +393,3 @@ 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,12 +2,8 @@ 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";
@@ -40,17 +36,6 @@ 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={() => {
@@ -59,27 +44,15 @@ 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 && (
@@ -105,7 +78,6 @@ const MainMenu = Object.assign(
     ItemCustom: DropdownMenu.ItemCustom,
     Group: DropdownMenu.Group,
     Separator: DropdownMenu.Separator,
-    Sub: DropdownMenuSub,
     DefaultItems,
   },
 );

packages/excalidraw/css/theme.scss

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

packages/excalidraw/locales/en.json

@@ -171,9 +171,7 @@
     "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,13 +81,11 @@
     "@braintree/sanitize-url": "6.0.2",
     "@excalidraw/common": "0.18.0",
     "@excalidraw/element": "0.18.0",
-    "@excalidraw/laser-pointer": "1.3.1",
     "@excalidraw/math": "0.18.0",
+    "@excalidraw/laser-pointer": "1.3.1",
     "@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",
@@ -99,8 +97,8 @@
     "image-blob-reduce": "3.0.1",
     "jotai": "2.11.0",
     "jotai-scope": "0.7.2",
-    "lodash.debounce": "4.0.8",
     "lodash.throttle": "4.1.1",
+    "lodash.debounce": "4.0.8",
     "nanoid": "3.3.3",
     "open-color": "1.9.1",
     "pako": "2.0.3",

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

@@ -4886,8 +4886,8 @@ exports[`history > multiplayer undo/redo > conflicts in bound text elements and
   "version": 6,
   "verticalAlign": "top",
   "width": 80,
-  "x": "241.29526",
+  "x": 205,
-  "y": "247.59241",
+  "y": 205,
 }
 `;
 

packages/excalidraw/tests/excalidraw.test.tsx

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

packages/excalidraw/tests/history.test.tsx

@@ -4354,8 +4354,8 @@ describe("history", () => {
           expect.objectContaining({
             ...textProps,
             // text element got redrawn!
-            x: 241.295259647664,
+            x: 205,
-            y: 247.59240920619527,
+            y: 205,
             angle: 90,
             id: text.id,
             containerId: container.id,
@@ -4398,8 +4398,8 @@ describe("history", () => {
           }),
           expect.objectContaining({
             ...textProps,
-            x: 241.295259647664,
+            x: 205,
-            y: 247.59240920619527,
+            y: 205,
             angle: 90,
             id: text.id,
             containerId: container.id,

packages/excalidraw/tests/library.test.tsx

@@ -1,5 +1,5 @@
-import { queryByTestId } from "@testing-library/react";
+import { act, queryByTestId } from "@testing-library/react";
-import { act } from "@testing-library/react";
+import React from "react";
 import { vi } from "vitest";
 
 import { MIME_TYPES, ORIG_ID } from "@excalidraw/common";
@@ -13,11 +13,9 @@ 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 { getCloneByOrigId } from "./test-utils";
+import { fireEvent, getCloneByOrigId, render, waitFor } from "./test-utils";
 
 import type { LibraryItem, LibraryItems } from "../types";
 
@@ -217,13 +215,12 @@ describe("library menu", () => {
     const libraryButton = container.querySelector(".sidebar-trigger");
 
     fireEvent.click(libraryButton!);
-    togglePopover("Library menu");
+    fireEvent.click(
-    // fireEvent.click(
+      queryByTestId(
-    //   queryByTestId(
+        container.querySelector(".layer-ui__library")!,
-    //     container.querySelector(".layer-ui__library")!,
+        "dropdown-menu-button",
-    //     "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,46 +2,26 @@
 
 exports[`<Excalidraw/> > <MainMenu/> > should render main menu with host menu items if passed from host 1`] = `
 <div
-  aria-labelledby="radix-:r65:"
+  class="dropdown-menu"
-  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: 1; z-index: 2;"
+    style="--padding: 2; z-index: 2;"
   >
-    <div
+    <button
-      class="radix-menu-item"
+      class="dropdown-menu-item dropdown-menu-item-base"
-      data-orientation="vertical"
+      type="button"
-      data-radix-collection-item=""
-      role="menuitem"
-      tabindex="-1"
     >
-      <button
+      <div
-        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
+        class="dropdown-menu-item__icon"
-        type="button"
+      />
+      <div
+        class="dropdown-menu-item__text"
       >
-        <div
+        Click me
-          class="dropdown-menu-item__icon"
+      </div>
-        />
+    </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"
@@ -66,361 +46,301 @@ exports[`<Excalidraw/> > <MainMenu/> > should render main menu with host menu it
         custom menu item
       </button>
     </div>
-    <div
+    <button
-      class="radix-menu-item"
+      aria-label="Help"
-      data-orientation="vertical"
+      class="dropdown-menu-item dropdown-menu-item-base"
-      data-radix-collection-item=""
+      data-testid="help-menu-item"
-      role="menuitem"
+      title="Help"
-      tabindex="-1"
+      type="button"
     >
-      <button
+      <div
-        aria-label="Help"
+        class="dropdown-menu-item__icon"
-        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
-        data-testid="help-menu-item"
-        title="Help"
-        type="button"
       >
-        <div
+        <svg
-          class="dropdown-menu-item__icon"
+          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"
         >
-          <svg
+          <g
-            aria-hidden="true"
+            stroke-width="1.5"
-            class=""
-            fill="none"
-            focusable="false"
-            role="img"
-            stroke="currentColor"
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            stroke-width="2"
-            viewBox="0 0 24 24"
           >
-            <g
+            <path
-              stroke-width="1.5"
+              d="M0 0h24v24H0z"
-            >
+              fill="none"
-              <path
+              stroke="none"
-                d="M0 0h24v24H0z"
+            />
-                fill="none"
+            <circle
-                stroke="none"
+              cx="12"
-              />
+              cy="12"
-              <circle
+              r="9"
-                cx="12"
+            />
-                cy="12"
+            <line
-                r="9"
+              x1="12"
-              />
+              x2="12"
-              <line
+              y1="17"
-                x1="12"
+              y2="17.01"
-                x2="12"
+            />
-                y1="17"
+            <path
-                y2="17.01"
+              d="M12 13.5a1.5 1.5 0 0 1 1 -1.5a2.6 2.6 0 1 0 -3 -4"
-              />
+            />
-              <path
+          </g>
-                d="M12 13.5a1.5 1.5 0 0 1 1 -1.5a2.6 2.6 0 1 0 -3 -4"
+        </svg>
-              />
+      </div>
-            </g>
+      <div
-          </svg>
+        class="dropdown-menu-item__text"
-        </div>
+      >
-        <div
+        Help
-          class="dropdown-menu-item__text"
+      </div>
-        >
+      <div
-          Help
+        class="dropdown-menu-item__shortcut"
-        </div>
+      >
-        <div
+        ?
-          class="dropdown-menu-item__shortcut"
+      </div>
-        >
+    </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
-  aria-labelledby="radix-:rq:"
+  class="dropdown-menu"
-  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: 1; z-index: 2;"
+    style="--padding: 2; z-index: 2;"
   >
-    <div
+    <button
-      class="radix-menu-item"
+      aria-label="Open"
-      data-orientation="vertical"
+      class="dropdown-menu-item dropdown-menu-item-base"
-      data-radix-collection-item=""
+      data-testid="load-button"
-      role="menuitem"
+      title="Open"
-      tabindex="-1"
+      type="button"
     >
-      <button
+      <div
-        aria-label="Open"
+        class="dropdown-menu-item__icon"
-        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
-        data-testid="load-button"
-        title="Open"
-        type="button"
       >
-        <div
+        <svg
-          class="dropdown-menu-item__icon"
+          aria-hidden="true"
+          class=""
+          fill="none"
+          focusable="false"
+          role="img"
+          stroke="currentColor"
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          viewBox="0 0 20 20"
         >
-          <svg
+          <path
-            aria-hidden="true"
+            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"
-            class=""
+            stroke-width="1.25"
-            fill="none"
+          />
-            focusable="false"
+        </svg>
-            role="img"
+      </div>
-            stroke="currentColor"
+      <div
-            stroke-linecap="round"
+        class="dropdown-menu-item__text"
-            stroke-linejoin="round"
+      >
-            viewBox="0 0 20 20"
+        Open
+      </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="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"
+              d="M0 0h24v24H0z"
-              stroke-width="1.25"
+              fill="none"
+              stroke="none"
             />
-          </svg>
+            <path
-        </div>
+              d="M15 8h.01"
-        <div
+            />
-          class="dropdown-menu-item__text"
+            <path
-        >
+              d="M12 20h-5a3 3 0 0 1 -3 -3v-10a3 3 0 0 1 3 -3h10a3 3 0 0 1 3 3v5"
-          Open
+            />
-        </div>
+            <path
-        <div
+              d="M4 15l4 -4c.928 -.893 2.072 -.893 3 0l4 4"
-          class="dropdown-menu-item__shortcut"
+            />
-        >
+            <path
-          Ctrl+O
+              d="M14 14l1 -1c.617 -.593 1.328 -.793 2.009 -.598"
-        </div>
+            />
-      </button>
+            <path
-    </div>
+              d="M19 16v6"
-    <div
+            />
-      class="radix-menu-item"
+            <path
-      data-orientation="vertical"
+              d="M22 19l-3 3l-3 -3"
-      data-radix-collection-item=""
+            />
-      role="menuitem"
+          </g>
-      tabindex="-1"
+        </svg>
-    >
+      </div>
-      <button
+      <div
-        aria-label="Save to..."
+        class="dropdown-menu-item__text"
-        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
-        data-testid="json-export-button"
-        title="Save to..."
-        type="button"
       >
-        <div
+        Export image...
-          class="dropdown-menu-item__icon"
+      </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"
         >
-          <svg
+          <g
-            aria-hidden="true"
+            stroke-width="1.5"
-            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"
+              d="M0 0h24v24H0z"
-              stroke-width="1.25"
+              fill="none"
+              stroke="none"
+            />
+            <circle
+              cx="12"
+              cy="12"
+              r="9"
+            />
+            <line
+              x1="12"
+              x2="12"
+              y1="17"
+              y2="17.01"
             />
-          </svg>
-        </div>
-        <div
-          class="dropdown-menu-item__text"
-        >
-          Save to...
-        </div>
-      </button>
-    </div>
-    <div
-      class="radix-menu-item"
-      data-orientation="vertical"
-      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"
-      >
-        <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"
-                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"
+              d="M12 13.5a1.5 1.5 0 0 1 1 -1.5a2.6 2.6 0 1 0 -3 -4"
-              stroke-width="1.25"
             />
-          </svg>
+          </g>
-        </div>
+        </svg>
-        <div
+      </div>
-          class="dropdown-menu-item__text"
+      <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"
         >
-          Reset the canvas
+          <path
-        </div>
+            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"
-      </button>
+            stroke-width="1.25"
-    </div>
+          />
+        </svg>
+      </div>
+      <div
+        class="dropdown-menu-item__text"
+      >
+        Reset the canvas
+      </div>
+    </button>
     <div
       style="height: 1px; margin: .5rem 0px;"
     />
@@ -553,53 +473,45 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
     <div
       style="height: 1px; margin: .5rem 0px;"
     />
-    <div
+    <button
-      class="radix-menu-item"
+      aria-label="Dark mode"
-      data-orientation="vertical"
+      class="dropdown-menu-item dropdown-menu-item-base"
-      data-radix-collection-item=""
+      data-testid="toggle-dark-mode"
-      role="menuitem"
+      title="Dark mode"
-      tabindex="-1"
+      type="button"
     >
-      <button
+      <div
-        aria-label="Dark mode"
+        class="dropdown-menu-item__icon"
-        class="excalidraw-button dropdown-menu-item dropdown-menu-item-base"
-        data-testid="toggle-dark-mode"
-        title="Dark mode"
-        type="button"
       >
-        <div
+        <svg
-          class="dropdown-menu-item__icon"
+          aria-hidden="true"
+          class=""
+          fill="none"
+          focusable="false"
+          role="img"
+          stroke="currentColor"
+          stroke-linecap="round"
+          stroke-linejoin="round"
+          viewBox="0 0 20 20"
         >
-          <svg
+          <path
-            aria-hidden="true"
+            clip-rule="evenodd"
-            class=""
+            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"
-            fill="none"
-            focusable="false"
-            role="img"
             stroke="currentColor"
-            stroke-linecap="round"
+          />
-            stroke-linejoin="round"
+        </svg>
-            viewBox="0 0 20 20"
+      </div>
-          >
+      <div
-            <path
+        class="dropdown-menu-item__text"
-              clip-rule="evenodd"
+      >
-              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"
+        Dark mode
-              stroke="currentColor"
+      </div>
-            />
+      <div
-          </svg>
+        class="dropdown-menu-item__shortcut"
-        </div>
+      >
-        <div
+        Shift+Alt+D
-          class="dropdown-menu-item__text"
+      </div>
-        >
+    </button>
-          Dark mode
-        </div>
-        <div
-          class="dropdown-menu-item__shortcut"
-        >
-          Shift+Alt+D
-        </div>
-      </button>
-    </div>
     <div
       style="margin-top: 0.5rem;"
     >
@@ -610,7 +522,6 @@ 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>
@@ -682,7 +593,7 @@ exports[`<Excalidraw/> > Test UIOptions prop > Test canvasActions > should rende
               style="width: 1px; height: 100%; margin: 0px auto;"
             />
             <button
-              aria-controls="radix-:r12:"
+              aria-controls="radix-:r0:"
               aria-expanded="false"
               aria-haspopup="dialog"
               aria-label="Canvas background"

packages/excalidraw/wysiwyg/textWysiwyg.tsx

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