fix: extend wait time for file loading on mobile devices

2025-08-01 12:42:20 +10:00
258 changed files with 7159 additions and 23292 deletions
@@ -0,0 +1 @@
+18
@@ -9,7 +9,7 @@ You will need to import the `Footer` component from the package and wrap your co
 ```jsx live
 function App() {
  return (
-    <div style={{ height: "500px" }}>
+    <div style={{ height: "500px"}}>
      <Excalidraw>
        <Footer>
          <button
@@ -27,19 +27,19 @@ function App() {

 This will only work for `Desktop` devices.

-For `mobile` you will need to render it inside the [MainMenu](#mainmenu). You can use the [`useEditorInterface`](#useEditorInterface) hook to check the type of device, this will be available only inside the `children` of `Excalidraw` component.
+For `mobile` you will need to render it inside the [MainMenu](#mainmenu). You can use the [`useDevice`](#useDevice) hook to check the type of device, this will be available only inside the `children` of `Excalidraw` component.

 Open the `Menu` in the below playground and you will see the `custom footer` rendered.

 ```jsx live noInline
 const MobileFooter = ({}) => {
-  const editorInterface = useEditorInterface();
-  if (editorInterface.formFactor === "phone") {
+  const device = useDevice();
+  if (device.editor.isMobile) {
    return (
      <Footer>
        <button
          className="custom-footer"
-          style={{ marginLeft: "20px", height: "2rem" }}
+          style= {{ marginLeft: '20px', height: '2rem'}}
          onClick={() => alert("This is custom footer in mobile menu")}
        >
          custom footer
@@ -292,7 +292,7 @@ viewportCoordsToSceneCoords(&#123; clientX: number, clientY: number },<br/>&nbsp
  appState: <a href="https://github.com/excalidraw/excalidraw/blob/master/packages/excalidraw/types.ts#L95">AppState</a><br/>): &#123;x: number, y: number}
 </pre>

-### useEditorInterface
+### useDevice

 This hook can be used to check the type of device which is being used. It can only be used inside the `children` of `Excalidraw` component.

@@ -300,8 +300,8 @@ Open the `main menu` in the below example to view the footer.

 ```jsx live noInline
 const MobileFooter = ({}) => {
-  const editorInterface = useEditorInterface();
-  if (editorInterface.formFactor === "phone") {
+  const device = useDevice();
+  if (device.editor.isMobile) {
    return (
      <Footer>
        <button
@@ -336,20 +336,12 @@ render(<App />);
 The `device` has the following `attributes`, some grouped into `viewport` and `editor` objects, per context.

 | Name | Type | Description |
-| ---- | ---- | ----------- |
-
-The `EditorInterface` object has the following properties:
-
-| Name | Type | Description |
-| --- | --- | --- | --- | --- | --- |
-| `formFactor` | `'phone' | 'tablet' | 'desktop'` | Indicates the device type based on screen size |
-| `desktopUIMode` | `'compact' | 'full'` | UI mode for desktop form factor |
-| `userAgent.raw` | `string` | Raw user agent string |
-| `userAgent.isMobileDevice` | `boolean` | True if device is mobile |
-| `userAgent.platform` | `'ios' | 'android' | 'other' | 'unknown'` | Device platform |
-| `isTouchScreen` | `boolean` | True if touch events are detected |
-| `canFitSidebar` | `boolean` | True if sidebar can fit in the viewport |
-| `isLandscape` | `boolean` | True if viewport is in landscape mode |
+| --- | --- | --- |
+| `viewport.isMobile` | `boolean` | Set to `true` when viewport is in `mobile` breakpoint |
+| `viewport.isLandscape` | `boolean` | Set to `true` when the viewport is in `landscape` mode |
+| `editor.canFitSidebar` | `boolean` | Set to `true` if there's enough space to fit the `sidebar` |
+| `editor.isMobile` | `boolean` | Set to `true` when editor container is in `mobile` breakpoint |
+| `isTouchScreen` | `boolean` | Set to `true` for `touch` when touch event detected |

 ### i18n

@@ -1,3 +1,5 @@
+version: "3.8"
+
 services:
  excalidraw:
    build:
@@ -12,10 +12,10 @@ const MobileFooter = ({
  excalidrawAPI: ExcalidrawImperativeAPI;
  excalidrawLib: typeof TExcalidraw;
 }) => {
-  const { useEditorInterface, Footer } = excalidrawLib;
+  const { useDevice, Footer } = excalidrawLib;

-  const editorInterface = useEditorInterface();
-  if (editorInterface.formFactor === "phone") {
+  const device = useDevice();
+  if (device.editor.isMobile) {
    return (
      <Footer>
        <CustomFooter
@@ -4,7 +4,6 @@ import {
  TTDDialogTrigger,
  CaptureUpdateAction,
  reconcileElements,
-  useEditorInterface,
 } from "@excalidraw/excalidraw";
 import { trackEvent } from "@excalidraw/excalidraw/analytics";
 import { getDefaultAppState } from "@excalidraw/excalidraw/appState";
@@ -21,6 +20,7 @@ import {
  APP_NAME,
  EVENT,
  THEME,
+  TITLE_TIMEOUT,
  VERSION_TIMEOUT,
  debounce,
  getVersion,
@@ -120,7 +120,6 @@ import {
  LibraryIndexedDBAdapter,
  LibraryLocalStorageMigrationAdapter,
  LocalData,
-  localStorageQuotaExceededAtom,
 } from "./data/LocalData";
 import { isBrowserStorageStateNewer } from "./data/tabSync";
 import { ShareDialog, shareDialogStateAtom } from "./share/ShareDialog";
@@ -138,9 +137,6 @@ import { ExcalidrawPlusIframeExport } from "./ExcalidrawPlusIframeExport";

 import "./index.scss";

-import { ExcalidrawPlusPromoBanner } from "./components/ExcalidrawPlusPromoBanner";
-import { AppSidebar } from "./components/AppSidebar";
-
 import type { CollabAPI } from "./collab/Collab";

 polyfill();
@@ -346,8 +342,6 @@ const ExcalidrawWrapper = () => {

  const [langCode, setLangCode] = useAppLangCode();

-  const editorInterface = useEditorInterface();
-
  // initial state
  // ---------------------------------------------------------------------------

@@ -505,6 +499,11 @@ const ExcalidrawWrapper = () => {
      }
    };

+    const titleTimeout = setTimeout(
+      () => (document.title = APP_NAME),
+      TITLE_TIMEOUT,
+    );
+
    const syncData = debounce(() => {
      if (isTestEnv()) {
        return;
@@ -595,6 +594,7 @@ const ExcalidrawWrapper = () => {
        visibilityChange,
        false,
      );
+      clearTimeout(titleTimeout);
    };
  }, [isCollabDisabled, collabAPI, excalidrawAPI, setLangCode]);

@@ -669,8 +669,8 @@ const ExcalidrawWrapper = () => {
      debugRenderer(
        debugCanvasRef.current,
        appState,
-        elements,
        window.devicePixelRatio,
+        () => forceRefresh((prev) => !prev),
      );
    }
  };
@@ -734,8 +734,6 @@ const ExcalidrawWrapper = () => {

  const isOffline = useAtomValue(isOfflineAtom);

-  const localStorageQuotaExceeded = useAtomValue(localStorageQuotaExceededAtom);
-
  const onCollabDialogOpen = useCallback(
    () => setShareDialogState({ isOpen: true, type: "collaborationOnly" }),
    [setShareDialogState],
@@ -854,22 +852,14 @@ const ExcalidrawWrapper = () => {
          if (isMobile || !collabAPI || isCollabDisabled) {
            return null;
          }
-
          return (
-            <div className="excalidraw-ui-top-right">
-              {excalidrawAPI?.getEditorInterface().formFactor === "desktop" && (
-                <ExcalidrawPlusPromoBanner
-                  isSignedIn={isExcalidrawPlusSignedUser}
-                />
-              )}
-
+            <div className="top-right-ui">
              {collabError.message && <CollabError collabError={collabError} />}
              <LiveCollaborationTrigger
                isCollaborating={isCollaborating}
                onSelect={() =>
                  setShareDialogState({ isOpen: true, type: "share" })
                }
-                editorInterface={editorInterface}
              />
            </div>
          );
@@ -918,15 +908,10 @@ const ExcalidrawWrapper = () => {

        <TTDDialogTrigger />
        {isCollaborating && isOffline && (
-          <div className="alertalert--warning">
+          <div className="collab-offline-warning">
            {t("alerts.collabOfflineWarning")}
          </div>
        )}
-        {localStorageQuotaExceeded && (
-          <div className="alert alert--danger">
-            {t("alerts.localStorageQuotaExceeded")}
-          </div>
-        )}
        {latestShareableLink && (
          <ShareableLinkDialog
            link={latestShareableLink}
@@ -955,8 +940,6 @@ const ExcalidrawWrapper = () => {
          }}
        />

-        <AppSidebar />
-
        {errorMessage && (
          <ErrorDialog onClose={() => setErrorMessage("")}>
            {errorMessage}
@@ -8,8 +8,7 @@ export const SYNC_BROWSER_TABS_TIMEOUT = 50;
 export const CURSOR_SYNC_TIMEOUT = 33; // ~30fps
 export const DELETED_ELEMENT_TIMEOUT = 24 * 60 * 60 * 1000; // 1 day

-// should be aligned with MAX_ALLOWED_FILE_BYTES
-export const FILE_UPLOAD_MAX_BYTES = 4 * 1024 * 1024; // 4 MiB
+export const FILE_UPLOAD_MAX_BYTES = 3 * 1024 * 1024; // 3 MiB
 // 1 year (https://stackoverflow.com/a/25201898/927631)
 export const FILE_CACHE_MAX_AGE_SEC = 31536000;

@@ -530,10 +530,7 @@ class Collab extends PureComponent<CollabProps, CollabState> {
      return null;
    }

-    if (existingRoomLinkData) {
-      // when joining existing room, don't merge it with current scene data
-      this.excalidrawAPI.resetScene();
-    } else {
+    if (!existingRoomLinkData) {
      const elements = this.excalidrawAPI.getSceneElements().map((element) => {
        if (isImageElement(element) && element.status === "saved") {
          return newElementWith(element, { status: "pending" });
@@ -5,6 +5,7 @@ import { isExcalidrawPlusSignedUser } from "../app_constants";

 import { DebugFooter, isVisualDebuggerEnabled } from "./DebugCanvas";
 import { EncryptedIcon } from "./EncryptedIcon";
+import { ExcalidrawPlusAppLink } from "./ExcalidrawPlusAppLink";

 export const AppFooter = React.memo(
  ({ onChange }: { onChange: () => void }) => {
@@ -18,7 +19,11 @@ export const AppFooter = React.memo(
          }}
        >
          {isVisualDebuggerEnabled() && <DebugFooter onChange={onChange} />}
-          {!isExcalidrawPlusSignedUser && <EncryptedIcon />}
+          {isExcalidrawPlusSignedUser ? (
+            <ExcalidrawPlusAppLink />
+          ) : (
+            <EncryptedIcon />
+          )}
        </div>
      </Footer>
    );
@@ -1,36 +0,0 @@
-.excalidraw {
-  .app-sidebar-promo-container {
-    padding: 0.75rem;
-    display: flex;
-    flex-direction: column;
-    text-align: center;
-    gap: 1rem;
-    flex: 1 1 auto;
-  }
-
-  .app-sidebar-promo-image {
-    margin: 1rem 0;
-
-    height: 16.25rem;
-    background-size: contain;
-    background-position: center;
-    background-repeat: no-repeat;
-
-    background-image: radial-gradient(
-        circle,
-        transparent 60%,
-        var(--sidebar-bg-color) 100%
-      ),
-      var(--image-source);
-
-    display: flex;
-  }
-
-  .app-sidebar-promo-text {
-    padding: 0 2rem;
-  }
-
-  .link-button {
-    margin: 0 auto;
-  }
-}
@@ -1,79 +0,0 @@
-import { DefaultSidebar, Sidebar, THEME } from "@excalidraw/excalidraw";
-import {
-  messageCircleIcon,
-  presentationIcon,
-} from "@excalidraw/excalidraw/components/icons";
-import { LinkButton } from "@excalidraw/excalidraw/components/LinkButton";
-import { useUIAppState } from "@excalidraw/excalidraw/context/ui-appState";
-
-import "./AppSidebar.scss";
-
-export const AppSidebar = () => {
-  const { theme, openSidebar } = useUIAppState();
-
-  return (
-    <DefaultSidebar>
-      <DefaultSidebar.TabTriggers>
-        <Sidebar.TabTrigger
-          tab="comments"
-          style={{ opacity: openSidebar?.tab === "comments" ? 1 : 0.4 }}
-        >
-          {messageCircleIcon}
-        </Sidebar.TabTrigger>
-        <Sidebar.TabTrigger
-          tab="presentation"
-          style={{ opacity: openSidebar?.tab === "presentation" ? 1 : 0.4 }}
-        >
-          {presentationIcon}
-        </Sidebar.TabTrigger>
-      </DefaultSidebar.TabTriggers>
-      <Sidebar.Tab tab="comments">
-        <div className="app-sidebar-promo-container">
-          <div
-            className="app-sidebar-promo-image"
-            style={{
-              ["--image-source" as any]: `url(/oss_promo_comments_${
-                theme === THEME.DARK ? "dark" : "light"
-              }.jpg)`,
-              opacity: 0.7,
-            }}
-          />
-          <div className="app-sidebar-promo-text">
-            Make comments with Excalidraw+
-          </div>
-          <LinkButton
-            href={`${
-              import.meta.env.VITE_APP_PLUS_LP
-            }/plus?utm_source=excalidraw&utm_medium=app&utm_content=comments_promo#excalidraw-redirect`}
-          >
-            Sign up now
-          </LinkButton>
-        </div>
-      </Sidebar.Tab>
-      <Sidebar.Tab tab="presentation" className="px-3">
-        <div className="app-sidebar-promo-container">
-          <div
-            className="app-sidebar-promo-image"
-            style={{
-              ["--image-source" as any]: `url(/oss_promo_presentations_${
-                theme === THEME.DARK ? "dark" : "light"
-              }.svg)`,
-              backgroundSize: "60%",
-              opacity: 0.4,
-            }}
-          />
-          <div className="app-sidebar-promo-text">
-            Create presentations with Excalidraw+
-          </div>
-          <LinkButton
-            href={`${
-              import.meta.env.VITE_APP_PLUS_LP
-            }/plus?utm_source=excalidraw&utm_medium=app&utm_content=presentations_promo#excalidraw-redirect`}
-          >
-            Sign up now
-          </LinkButton>
-        </div>
-      </Sidebar.Tab>
-    </DefaultSidebar>
-  );
-};
@@ -8,35 +8,21 @@ import {
  getNormalizedCanvasDimensions,
 } from "@excalidraw/excalidraw/renderer/helpers";
 import { type AppState } from "@excalidraw/excalidraw/types";
-import { arrayToMap, throttleRAF } from "@excalidraw/common";
+import { throttleRAF } from "@excalidraw/common";
 import { useCallback } from "react";

-import {
-  getGlobalFixedPointForBindableElement,
-  isArrowElement,
-  isBindableElement,
-  isFixedPointBinding,
-} from "@excalidraw/element";
-
 import {
  isLineSegment,
  type GlobalPoint,
  type LineSegment,
-  isCurve,
 } from "@excalidraw/math";
+import { isCurve } from "@excalidraw/math/curve";

 import React from "react";

 import type { Curve } from "@excalidraw/math";
-import type { DebugElement } from "@excalidraw/common";
-import type {
-  ElementsMap,
-  ExcalidrawArrowElement,
-  ExcalidrawBindableElement,
-  FixedPointBinding,
-  OrderedExcalidrawElement,
-  PointBinding,
-} from "@excalidraw/element/types";
+
+import type { DebugElement } from "@excalidraw/utils/visualdebug";

 import { STORAGE_KEYS } from "../app_constants";

@@ -89,180 +75,6 @@ const renderOrigin = (context: CanvasRenderingContext2D, zoom: number) => {
  context.save();
 };

-const _renderBinding = (
-  context: CanvasRenderingContext2D,
-  binding: FixedPointBinding | PointBinding,
-  elementsMap: ElementsMap,
-  zoom: number,
-  width: number,
-  height: number,
-  color: string,
-) => {
-  if (isFixedPointBinding(binding)) {
-    if (!binding.fixedPoint) {
-      console.warn("Binding must have a fixedPoint");
-      return;
-    }
-
-    const bindable = elementsMap.get(
-      binding.elementId,
-    ) as ExcalidrawBindableElement;
-    const [x, y] = getGlobalFixedPointForBindableElement(
-      binding.fixedPoint,
-      bindable,
-      elementsMap,
-    );
-
-    context.save();
-    context.strokeStyle = color;
-    context.lineWidth = 1;
-    context.beginPath();
-    context.moveTo(x * zoom, y * zoom);
-    context.bezierCurveTo(
-      x * zoom - width,
-      y * zoom - height,
-      x * zoom - width,
-      y * zoom + height,
-      x * zoom,
-      y * zoom,
-    );
-    context.stroke();
-    context.restore();
-  }
-};
-
-const _renderBindableBinding = (
-  binding: FixedPointBinding | PointBinding,
-  context: CanvasRenderingContext2D,
-  elementsMap: ElementsMap,
-  zoom: number,
-  width: number,
-  height: number,
-  color: string,
-) => {
-  if (isFixedPointBinding(binding)) {
-    const bindable = elementsMap.get(
-      binding.elementId,
-    ) as ExcalidrawBindableElement;
-    if (!binding.fixedPoint) {
-      console.warn("Binding must have a fixedPoint");
-      return;
-    }
-
-    const [x, y] = getGlobalFixedPointForBindableElement(
-      binding.fixedPoint,
-      bindable,
-      elementsMap,
-    );
-
-    context.save();
-    context.strokeStyle = color;
-    context.lineWidth = 1;
-    context.beginPath();
-    context.moveTo(x * zoom, y * zoom);
-    context.bezierCurveTo(
-      x * zoom + width,
-      y * zoom + height,
-      x * zoom + width,
-      y * zoom - height,
-      x * zoom,
-      y * zoom,
-    );
-    context.stroke();
-    context.restore();
-  }
-};
-
-const renderBindings = (
-  context: CanvasRenderingContext2D,
-  elements: readonly OrderedExcalidrawElement[],
-  zoom: number,
-) => {
-  const elementsMap = arrayToMap(elements);
-  const dim = 16;
-  elements.forEach((element) => {
-    if (element.isDeleted) {
-      return;
-    }
-
-    if (isArrowElement(element)) {
-      if (element.startBinding) {
-        if (
-          !elementsMap
-            .get(element.startBinding.elementId)
-            ?.boundElements?.find((e) => e.id === element.id)
-        ) {
-          return;
-        }
-
-        _renderBinding(
-          context,
-          element.startBinding as FixedPointBinding,
-          elementsMap,
-          zoom,
-          dim,
-          dim,
-          "red",
-        );
-      }
-
-      if (element.endBinding) {
-        if (
-          !elementsMap
-            .get(element.endBinding.elementId)
-            ?.boundElements?.find((e) => e.id === element.id)
-        ) {
-          return;
-        }
-        _renderBinding(
-          context,
-          element.endBinding,
-          elementsMap,
-          zoom,
-          dim,
-          dim,
-          "red",
-        );
-      }
-    }
-
-    if (isBindableElement(element) && element.boundElements?.length) {
-      element.boundElements.forEach((boundElement) => {
-        if (boundElement.type !== "arrow") {
-          return;
-        }
-
-        const arrow = elementsMap.get(
-          boundElement.id,
-        ) as ExcalidrawArrowElement;
-
-        if (arrow && arrow.startBinding?.elementId === element.id) {
-          _renderBindableBinding(
-            arrow.startBinding,
-            context,
-            elementsMap,
-            zoom,
-            dim,
-            dim,
-            "green",
-          );
-        }
-        if (arrow && arrow.endBinding?.elementId === element.id) {
-          _renderBindableBinding(
-            arrow.endBinding,
-            context,
-            elementsMap,
-            zoom,
-            dim,
-            dim,
-            "green",
-          );
-        }
-      });
-    }
-  });
-};
-
 const render = (
  frame: DebugElement[],
  context: CanvasRenderingContext2D,
@@ -295,8 +107,8 @@ const render = (
 const _debugRenderer = (
  canvas: HTMLCanvasElement,
  appState: AppState,
-  elements: readonly OrderedExcalidrawElement[],
  scale: number,
+  refresh: () => void,
 ) => {
  const [normalizedWidth, normalizedHeight] = getNormalizedCanvasDimensions(
    canvas,
@@ -319,7 +131,6 @@ const _debugRenderer = (
  );

  renderOrigin(context, appState.zoom.value);
-  renderBindings(context, elements, appState.zoom.value);

  if (
    window.visualDebug?.currentFrame &&
@@ -371,10 +182,10 @@ export const debugRenderer = throttleRAF(
  (
    canvas: HTMLCanvasElement,
    appState: AppState,
-    elements: readonly OrderedExcalidrawElement[],
    scale: number,
+    refresh: () => void,
  ) => {
-    _debugRenderer(canvas, appState, elements, scale);
+    _debugRenderer(canvas, appState, scale, refresh);
  },
  { trailing: true },
 );
@@ -0,0 +1,19 @@
+import { isExcalidrawPlusSignedUser } from "../app_constants";
+
+export const ExcalidrawPlusAppLink = () => {
+  if (!isExcalidrawPlusSignedUser) {
+    return null;
+  }
+  return (
+    <a
+      href={`${
+        import.meta.env.VITE_APP_PLUS_APP
+      }?utm_source=excalidraw&utm_medium=app&utm_content=signedInUserRedirectButton#excalidraw-redirect`}
+      target="_blank"
+      rel="noopener"
+      className="plus-button"
+    >
+      Go to Excalidraw+
+    </a>
+  );
+};
@@ -1,22 +0,0 @@
-export const ExcalidrawPlusPromoBanner = ({
-  isSignedIn,
-}: {
-  isSignedIn: boolean;
-}) => {
-  return (
-    <a
-      href={
-        isSignedIn
-          ? import.meta.env.VITE_APP_PLUS_APP
-          : `${
-              import.meta.env.VITE_APP_PLUS_LP
-            }/plus?utm_source=excalidraw&utm_medium=app&utm_content=guestBanner#excalidraw-redirect`
-      }
-      target="_blank"
-      rel="noopener"
-      className="plus-banner"
-    >
-      Excalidraw+
-    </a>
-  );
-};
@@ -27,8 +27,6 @@ import {
  get,
 } from "idb-keyval";

-import { appJotaiStore, atom } from "excalidraw-app/app-jotai";
-
 import type { LibraryPersistedData } from "@excalidraw/excalidraw/data/library";
 import type { ImportedDataState } from "@excalidraw/excalidraw/data/types";
 import type { ExcalidrawElement, FileId } from "@excalidraw/element/types";
@@ -47,8 +45,6 @@ import { updateBrowserStateVersion } from "./tabSync";

 const filesStore = createStore("files-db", "files-store");

-export const localStorageQuotaExceededAtom = atom(false);
-
 class LocalFileManager extends FileManager {
  clearObsoleteFiles = async (opts: { currentFileIds: FileId[] }) => {
    await entries(filesStore).then((entries) => {
@@ -73,9 +69,6 @@ const saveDataStateToLocalStorage = (
  elements: readonly ExcalidrawElement[],
  appState: AppState,
 ) => {
-  const localStorageQuotaExceeded = appJotaiStore.get(
-    localStorageQuotaExceededAtom,
-  );
  try {
    const _appState = clearAppStateForLocalStorage(appState);

@@ -95,22 +88,12 @@ const saveDataStateToLocalStorage = (
      JSON.stringify(_appState),
    );
    updateBrowserStateVersion(STORAGE_KEYS.VERSION_DATA_STATE);
-    if (localStorageQuotaExceeded) {
-      appJotaiStore.set(localStorageQuotaExceededAtom, false);
-    }
  } catch (error: any) {
    // Unable to access window.localStorage
    console.error(error);
-    if (isQuotaExceededError(error) && !localStorageQuotaExceeded) {
-      appJotaiStore.set(localStorageQuotaExceededAtom, true);
-    }
  }
 };

-const isQuotaExceededError = (error: any) => {
-  return error instanceof DOMException && error.name === "QuotaExceededError";
-};
-
 type SavingLockTypes = "collaboration";

 export class LocalData {
@@ -259,9 +259,7 @@ export const loadFromFirebase = async (
  }
  const storedScene = docSnap.data() as FirebaseStoredScene;
  const elements = getSyncableElements(
-    restoreElements(await decryptElements(storedScene, roomKey), null, {
-      deleteInvisibleElements: true,
-    }),
+    restoreElements(await decryptElements(storedScene, roomKey), null),
  );

  if (socket) {
@@ -258,16 +258,11 @@ export const loadScene = async (
      await importFromBackend(id, privateKey),
      localDataState?.appState,
      localDataState?.elements,
-      {
-        repairBindings: true,
-        refreshDimensions: false,
-        deleteInvisibleElements: true,
-      },
+      { repairBindings: true, refreshDimensions: false },
    );
  } else {
    data = restore(localDataState || null, null, null, {
      repairBindings: true,
-      deleteInvisibleElements: true,
    });
  }

@@ -2,7 +2,7 @@
 <html lang="en">
  <head>
    <meta charset="utf-8" />
-    <title>Excalidraw Whiteboard</title>
+    <title>Excalidraw | Hand-drawn look & feel • Collaborative • Secure</title>
    <meta
      name="viewport"
      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover, shrink-to-fit=no"
@@ -14,7 +14,7 @@
    <!-- Primary Meta Tags -->
    <meta
      name="title"
-      content="Free, collaborative whiteboard • Hand-drawn look & feel | Excalidraw"
+      content="Excalidraw — Collaborative whiteboarding made easy"
    />
    <meta
      name="description"
@@ -1,5 +1,3 @@
-@import "../packages/excalidraw/css/variables.module.scss";
-
 .excalidraw {
  --color-primary-contrast-offset: #625ee0; // to offset Chubb illusion

@@ -7,6 +5,12 @@
    --color-primary-contrast-offset: #726dff; // to offset Chubb illusion
  }

+  .top-right-ui {
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+  }
+
  .footer-center {
    justify-content: flex-end;
    margin-top: auto;
@@ -54,7 +58,7 @@
    }
  }

-  .alert {
+  .collab-offline-warning {
    pointer-events: none;
    position: absolute;
    top: 6.5rem;
@@ -65,18 +69,10 @@
    text-align: center;
    line-height: 1.5;
    border-radius: var(--border-radius-md);
+    background-color: var(--color-warning);
+    color: var(--color-text-warning);
    z-index: 6;
    white-space: pre;
-
-    &--warning {
-      background-color: var(--color-warning);
-      color: var(--color-text-warning);
-    }
-
-    &--danger {
-      background-color: var(--color-danger-dark);
-      color: var(--color-danger-text);
-    }
  }
 }

@@ -86,31 +82,22 @@
  }
 }

-.plus-banner {
+.plus-button {
  display: flex;
  justify-content: center;
  cursor: pointer;
  align-items: center;
  border: 1px solid var(--color-primary);
-  padding: 0.5rem 0.875rem;
+  padding: 0.5rem 0.75rem;
  border-radius: var(--border-radius-lg);
  background-color: var(--island-bg-color);
+  color: var(--color-primary) !important;
  text-decoration: none !important;

-  font-family: var(--ui-font);
-  font-size: 0.8333rem;
+  font-size: 0.75rem;
  box-sizing: border-box;
  height: var(--lg-button-size);

-  border: none;
-  box-shadow: 0 0 0 1px var(--color-surface-lowest);
-  background-color: var(--color-surface-low);
-  color: var(--button-color, var(--color-on-surface)) !important;
-
-  &:active {
-    box-shadow: 0 0 0 1px var(--color-brand-active);
-  }
-
  &:hover {
    background-color: var(--color-primary);
    color: white !important;
@@ -122,7 +109,7 @@
 }

 .theme--dark {
-  .plus-banner {
+  .plus-button {
    &:hover {
      color: black !important;
    }
@@ -23,7 +23,7 @@
    ]
  },
  "engines": {
-    "node": ">=18.0.0"
+    "node": "18.0.0 - 22.x.x"
  },
  "dependencies": {
    "@excalidraw/random-username": "1.0.0",
@@ -17,15 +17,30 @@ describe("Test MobileMenu", () => {

  beforeEach(async () => {
    await render(<ExcalidrawApp />);
-    h.app.refreshEditorInterface();
+    // @ts-ignore
+    h.app.refreshViewportBreakpoints();
+    // @ts-ignore
+    h.app.refreshEditorBreakpoints();
  });

  afterAll(() => {
    restoreOriginalGetBoundingClientRect();
  });

-  it("should set editor interface correctly", () => {
-    expect(h.app.editorInterface.formFactor).toBe("phone");
+  it("should set device correctly", () => {
+    expect(h.app.device).toMatchInlineSnapshot(`
+      {
+        "editor": {
+          "canFitSidebar": false,
+          "isMobile": true,
+        },
+        "isTouchScreen": false,
+        "viewport": {
+          "isLandscape": false,
+          "isMobile": true,
+        },
+      }
+    `);
  });

  it("should initialize with welcome screen and hide once user interacts", async () => {
@@ -44,7 +44,7 @@
    "vitest-canvas-mock": "0.3.3"
  },
  "engines": {
-    "node": ">=18.0.0"
+    "node": "18.0.0 - 22.x.x"
  },
  "homepage": ".",
  "prettier": "@excalidraw/prettier-config",
@@ -5,18 +5,17 @@ export class BinaryHeap<T> {

  sinkDown(idx: number) {
    const node = this.content[idx];
-    const nodeScore = this.scoreFunction(node);
    while (idx > 0) {
      const parentN = ((idx + 1) >> 1) - 1;
      const parent = this.content[parentN];
-      if (nodeScore < this.scoreFunction(parent)) {
+      if (this.scoreFunction(node) < this.scoreFunction(parent)) {
+        this.content[parentN] = node;
        this.content[idx] = parent;
        idx = parentN; // TODO: Optimize
      } else {
        break;
      }
    }
-    this.content[idx] = node;
  }

  bubbleUp(idx: number) {
@@ -25,39 +24,35 @@ export class BinaryHeap<T> {
    const score = this.scoreFunction(node);

    while (true) {
-      const child1N = ((idx + 1) << 1) - 1;
-      const child2N = child1N + 1;
-      let smallestIdx = idx;
-      let smallestScore = score;
+      const child2N = (idx + 1) << 1;
+      const child1N = child2N - 1;
+      let swap = null;
+      let child1Score = 0;

-      // Check left child
      if (child1N < length) {
-        const child1Score = this.scoreFunction(this.content[child1N]);
-        if (child1Score < smallestScore) {
-          smallestIdx = child1N;
-          smallestScore = child1Score;
+        const child1 = this.content[child1N];
+        child1Score = this.scoreFunction(child1);
+        if (child1Score < score) {
+          swap = child1N;
        }
      }

-      // Check right child
      if (child2N < length) {
-        const child2Score = this.scoreFunction(this.content[child2N]);
-        if (child2Score < smallestScore) {
-          smallestIdx = child2N;
+        const child2 = this.content[child2N];
+        const child2Score = this.scoreFunction(child2);
+        if (child2Score < (swap === null ? score : child1Score)) {
+          swap = child2N;
        }
      }

-      if (smallestIdx === idx) {
+      if (swap !== null) {
+        this.content[idx] = this.content[swap];
+        this.content[swap] = node;
+        idx = swap; // TODO: Optimize
+      } else {
        break;
      }
-
-      // Move the smaller child up, continue finding position for node
-      this.content[idx] = this.content[smallestIdx];
-      idx = smallestIdx;
    }
-
-    // Place node in its final position
-    this.content[idx] = node;
  }

  push(node: T) {
@@ -6,6 +6,25 @@ import type { AppProps, AppState } from "@excalidraw/excalidraw/types";

 import { COLOR_PALETTE } from "./colors";

+export const isDarwin = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
+export const isWindows = /^Win/.test(navigator.platform);
+export const isAndroid = /\b(android)\b/i.test(navigator.userAgent);
+export const isFirefox =
+  typeof window !== "undefined" &&
+  "netscape" in window &&
+  navigator.userAgent.indexOf("rv:") > 1 &&
+  navigator.userAgent.indexOf("Gecko") > 1;
+export const isChrome = navigator.userAgent.indexOf("Chrome") !== -1;
+export const isSafari =
+  !isChrome && navigator.userAgent.indexOf("Safari") !== -1;
+export const isIOS =
+  /iPad|iPhone/.test(navigator.platform) ||
+  // iPadOS 13+
+  (navigator.userAgent.includes("Mac") && "ontouchend" in document);
+// keeping function so it can be mocked in test
+export const isBrave = () =>
+  (navigator as any).brave?.isBrave?.name === "isBrave";
+
 export const supportsResizeObserver =
  typeof window !== "undefined" && "ResizeObserver" in window;

@@ -99,13 +118,10 @@ export const ENV = {
 };

 export const CLASSES = {
-  SIDEBAR: "sidebar",
  SHAPE_ACTIONS_MENU: "App-menu__left",
  ZOOM_ACTIONS: "zoom-actions",
  SEARCH_MENU_INPUT_WRAPPER: "layer-ui__search-inputWrapper",
  CONVERT_ELEMENT_TYPE_POPUP: "ConvertElementTypePopup",
-  SHAPE_ACTIONS_THEME_SCOPE: "shape-actions-theme-scope",
-  FRAME_NAME: "frame-name",
 };

 export const CJK_HAND_DRAWN_FALLBACK_FONT = "Xiaolai";
@@ -236,20 +252,13 @@ export const IMAGE_MIME_TYPES = {
  jfif: "image/jfif",
 } as const;

-export const STRING_MIME_TYPES = {
+export const MIME_TYPES = {
  text: "text/plain",
  html: "text/html",
  json: "application/json",
  // excalidraw data
  excalidraw: "application/vnd.excalidraw+json",
-  // LEGACY: fully-qualified library JSON data
  excalidrawlib: "application/vnd.excalidrawlib+json",
-  // list of excalidraw library item ids
-  excalidrawlibIds: "application/vnd.excalidrawlib.ids+json",
-} as const;
-
-export const MIME_TYPES = {
-  ...STRING_MIME_TYPES,
  // image-encoded excalidraw data
  "excalidraw.svg": "image/svg+xml",
  "excalidraw.png": "image/png",
@@ -324,6 +333,16 @@ export const DEFAULT_UI_OPTIONS: AppProps["UIOptions"] = {
  },
 };

+// breakpoints
+// -----------------------------------------------------------------------------
+// md screen
+export const MQ_MAX_WIDTH_PORTRAIT = 730;
+export const MQ_MAX_WIDTH_LANDSCAPE = 1000;
+export const MQ_MAX_HEIGHT_LANDSCAPE = 500;
+// sidebar
+export const MQ_RIGHT_SIDEBAR_MIN_WIDTH = 1229;
+// -----------------------------------------------------------------------------
+
 export const MAX_DECIMALS_FOR_SVG_EXPORT = 2;

 export const EXPORT_SCALES = [1, 2, 3];
@@ -496,10 +515,3 @@ export enum UserIdleState {
 * the start and end points)
 */
 export const LINE_POLYGON_POINT_MERGE_DISTANCE = 20;
-
-export const DOUBLE_TAP_POSITION_THRESHOLD = 35;
-
-// glass background for mobile action buttons
-export const MOBILE_ACTION_BUTTON_BG = {
-  background: "var(--mobile-action-button-bg)",
-} as const;
@@ -1,223 +0,0 @@
-export type StylesPanelMode = "compact" | "full" | "mobile";
-
-export type EditorInterface = Readonly<{
-  formFactor: "phone" | "tablet" | "desktop";
-  desktopUIMode: "compact" | "full";
-  userAgent: Readonly<{
-    isMobileDevice: boolean;
-    platform: "ios" | "android" | "other" | "unknown";
-  }>;
-  isTouchScreen: boolean;
-  canFitSidebar: boolean;
-  isLandscape: boolean;
-}>;
-
-// storage key
-const DESKTOP_UI_MODE_STORAGE_KEY = "excalidraw.desktopUIMode";
-
-// breakpoints
-// mobile: up to 699px
-export const MQ_MAX_MOBILE = 599;
-
-export const MQ_MAX_WIDTH_LANDSCAPE = 1000;
-export const MQ_MAX_HEIGHT_LANDSCAPE = 500;
-
-// tablets
-export const MQ_MIN_TABLET = MQ_MAX_MOBILE + 1; // lower bound (excludes phones)
-export const MQ_MAX_TABLET = 1400; // upper bound (excludes laptops/desktops)
-
-// desktop/laptop
-export const MQ_MIN_WIDTH_DESKTOP = 1440;
-
-// sidebar
-export const MQ_RIGHT_SIDEBAR_MIN_WIDTH = 1229;
-
-// -----------------------------------------------------------------------------
-
-// user agent detections
-export const isDarwin = /Mac|iPod|iPhone|iPad/.test(navigator.platform);
-export const isWindows = /^Win/.test(navigator.platform);
-export const isAndroid = /\b(android)\b/i.test(navigator.userAgent);
-export const isFirefox =
-  typeof window !== "undefined" &&
-  "netscape" in window &&
-  navigator.userAgent.indexOf("rv:") > 1 &&
-  navigator.userAgent.indexOf("Gecko") > 1;
-export const isChrome = navigator.userAgent.indexOf("Chrome") !== -1;
-export const isSafari =
-  !isChrome && navigator.userAgent.indexOf("Safari") !== -1;
-export const isIOS =
-  /iPad|iPhone/i.test(navigator.platform) ||
-  // iPadOS 13+
-  (navigator.userAgent.includes("Mac") && "ontouchend" in document);
-// keeping function so it can be mocked in test
-export const isBrave = () =>
-  (navigator as any).brave?.isBrave?.name === "isBrave";
-
-// export const isMobile =
-//   isIOS ||
-//   /android|webos|ipod|blackberry|iemobile|opera mini/i.test(
-//     navigator.userAgent,
-//   ) ||
-//   /android|ios|ipod|blackberry|windows phone/i.test(navigator.platform);
-
-// utilities
-export const isMobileBreakpoint = (width: number, height: number) => {
-  return (
-    width <= MQ_MAX_MOBILE ||
-    (height < MQ_MAX_HEIGHT_LANDSCAPE && width < MQ_MAX_WIDTH_LANDSCAPE)
-  );
-};
-
-export const isTabletBreakpoint = (
-  editorWidth: number,
-  editorHeight: number,
-) => {
-  const minSide = Math.min(editorWidth, editorHeight);
-  const maxSide = Math.max(editorWidth, editorHeight);
-
-  return minSide >= MQ_MIN_TABLET && maxSide <= MQ_MAX_TABLET;
-};
-
-const isMobileOrTablet = (): boolean => {
-  const ua = navigator.userAgent || "";
-  const platform = navigator.platform || "";
-  const uaData = (navigator as any).userAgentData as
-    | { mobile?: boolean; platform?: string }
-    | undefined;
-
-  // --- 1) chromium: prefer ua client hints -------------------------------
-  if (uaData) {
-    const plat = (uaData.platform || "").toLowerCase();
-    const isDesktopOS =
-      plat === "windows" ||
-      plat === "macos" ||
-      plat === "linux" ||
-      plat === "chrome os";
-    if (uaData.mobile === true) {
-      return true;
-    }
-    if (uaData.mobile === false && plat === "android") {
-      const looksTouchTablet =
-        matchMedia?.("(hover: none)").matches &&
-        matchMedia?.("(pointer: coarse)").matches;
-      return looksTouchTablet;
-    }
-    if (isDesktopOS) {
-      return false;
-    }
-  }
-
-  // --- 2) ios (includes ipad) --------------------------------------------
-  if (isIOS) {
-    return true;
-  }
-
-  // --- 3) android legacy ua fallback -------------------------------------
-  if (isAndroid) {
-    const isAndroidPhone = /Mobile/i.test(ua);
-    const isAndroidTablet = !isAndroidPhone;
-    if (isAndroidPhone || isAndroidTablet) {
-      const looksTouchTablet =
-        matchMedia?.("(hover: none)").matches &&
-        matchMedia?.("(pointer: coarse)").matches;
-      return looksTouchTablet;
-    }
-  }
-
-  // --- 4) last resort desktop exclusion ----------------------------------
-  const looksDesktopPlatform =
-    /Win|Linux|CrOS|Mac/.test(platform) ||
-    /Windows NT|X11|CrOS|Macintosh/.test(ua);
-  if (looksDesktopPlatform) {
-    return false;
-  }
-  return false;
-};
-
-export const getFormFactor = (
-  editorWidth: number,
-  editorHeight: number,
-): EditorInterface["formFactor"] => {
-  if (isMobileBreakpoint(editorWidth, editorHeight)) {
-    return "phone";
-  }
-
-  if (isTabletBreakpoint(editorWidth, editorHeight)) {
-    return "tablet";
-  }
-
-  return "desktop";
-};
-
-export const deriveStylesPanelMode = (
-  editorInterface: EditorInterface,
-): StylesPanelMode => {
-  if (editorInterface.formFactor === "phone") {
-    return "mobile";
-  }
-
-  if (editorInterface.formFactor === "tablet") {
-    return "compact";
-  }
-
-  return editorInterface.desktopUIMode;
-};
-
-export const createUserAgentDescriptor = (
-  userAgentString: string,
-): EditorInterface["userAgent"] => {
-  const normalizedUA = userAgentString ?? "";
-  let platform: EditorInterface["userAgent"]["platform"] = "unknown";
-
-  if (isIOS) {
-    platform = "ios";
-  } else if (isAndroid) {
-    platform = "android";
-  } else if (normalizedUA) {
-    platform = "other";
-  }
-
-  return {
-    isMobileDevice: isMobileOrTablet(),
-    platform,
-  } as const;
-};
-
-export const loadDesktopUIModePreference = () => {
-  if (typeof window === "undefined") {
-    return null;
-  }
-
-  try {
-    const stored = window.localStorage.getItem(DESKTOP_UI_MODE_STORAGE_KEY);
-    if (stored === "compact" || stored === "full") {
-      return stored as EditorInterface["desktopUIMode"];
-    }
-  } catch (error) {
-    // ignore storage access issues (e.g., Safari private mode)
-  }
-
-  return null;
-};
-
-const persistDesktopUIMode = (mode: EditorInterface["desktopUIMode"]) => {
-  if (typeof window === "undefined") {
-    return;
-  }
-  try {
-    window.localStorage.setItem(DESKTOP_UI_MODE_STORAGE_KEY, mode);
-  } catch (error) {
-    // ignore storage access issues (e.g., Safari private mode)
-  }
-};
-
-export const setDesktopUIMode = (mode: EditorInterface["desktopUIMode"]) => {
-  if (mode !== "compact" && mode !== "full") {
-    return;
-  }
-
-  persistDesktopUIMode(mode);
-
-  return mode;
-};
@@ -10,5 +10,3 @@ export * from "./random";
 export * from "./url";
 export * from "./utils";
 export * from "./emitter";
-export * from "./visualdebug";
-export * from "./editorInterface";
@@ -1,4 +1,4 @@
-import { isDarwin } from "./editorInterface";
+import { isDarwin } from "./constants";

 import type { ValueOf } from "./utility-types";

@@ -20,6 +20,7 @@ import {
  ENV,
  FONT_FAMILY,
  getFontFamilyFallbacks,
+  isDarwin,
  WINDOWS_EMOJI_FALLBACK_FONT,
 } from "./constants";

@@ -90,8 +91,7 @@ export const isWritableElement = (
  (target instanceof HTMLInputElement &&
    (target.type === "text" ||
      target.type === "number" ||
-      target.type === "password" ||
-      target.type === "search"));
+      target.type === "password"));

 export const getFontFamilyString = ({
  fontFamily,
@@ -119,11 +119,6 @@ export const getFontString = ({
  return `${fontSize}px ${getFontFamilyString({ fontFamily })}` as FontString;
 };

-/** executes callback in the frame that's after the current one */
-export const nextAnimationFrame = async (cb: () => any) => {
-  requestAnimationFrame(() => requestAnimationFrame(cb));
-};
-
 export const debounce = <T extends any[]>(
  fn: (...args: T) => void,
  timeout: number,
@@ -423,6 +418,19 @@ export const allowFullScreen = () =>

 export const exitFullScreen = () => document.exitFullscreen();

+export const getShortcutKey = (shortcut: string): string => {
+  shortcut = shortcut
+    .replace(/\bAlt\b/i, "Alt")
+    .replace(/\bShift\b/i, "Shift")
+    .replace(/\b(Enter|Return)\b/i, "Enter");
+  if (isDarwin) {
+    return shortcut
+      .replace(/\bCtrlOrCmd\b/gi, "Cmd")
+      .replace(/\bAlt\b/i, "Option");
+  }
+  return shortcut.replace(/\bCtrlOrCmd\b/gi, "Ctrl");
+};
+
 export const viewportCoordsToSceneCoords = (
  { clientX, clientY }: { clientX: number; clientY: number },
  {
@@ -164,14 +164,9 @@ export class Scene {
    return this.frames;
  }

-  constructor(
-    elements: ElementsMapOrArray | null = null,
-    options?: {
-      skipValidation?: true;
-    },
-  ) {
+  constructor(elements: ElementsMapOrArray | null = null) {
    if (elements) {
-      this.replaceAllElements(elements, options);
+      this.replaceAllElements(elements);
    }
  }

@@ -268,19 +263,12 @@ export class Scene {
    return didChange;
  }

-  replaceAllElements(
-    nextElements: ElementsMapOrArray,
-    options?: {
-      skipValidation?: true;
-    },
-  ) {
+  replaceAllElements(nextElements: ElementsMapOrArray) {
    // we do trust the insertion order on the map, though maybe we shouldn't and should prefer order defined by fractional indices
    const _nextElements = toArray(nextElements);
    const nextFrameLikes: ExcalidrawFrameLikeElement[] = [];

-    if (!options?.skipValidation) {
-      validateIndicesThrottled(_nextElements);
-    }
+    validateIndicesThrottled(_nextElements);

    this.elements = syncInvalidIndices(_nextElements);
    this.elementsMap.clear();
@@ -999,29 +999,6 @@ export const bindPointToSnapToElementOutline = (
      intersector,
      FIXED_BINDING_DISTANCE,
    ).sort(pointDistanceSq)[0];
-
-    if (!intersection) {
-      const anotherPoint = pointFrom<GlobalPoint>(
-        !isHorizontal ? center[0] : snapPoint[0],
-        isHorizontal ? center[1] : snapPoint[1],
-      );
-      const anotherIntersector = lineSegment(
-        anotherPoint,
-        pointFromVector(
-          vectorScale(
-            vectorNormalize(vectorFromPoint(snapPoint, anotherPoint)),
-            Math.max(bindableElement.width, bindableElement.height) * 2,
-          ),
-          anotherPoint,
-        ),
-      );
-      intersection = intersectElementWithLineSegment(
-        bindableElement,
-        elementsMap,
-        anotherIntersector,
-        FIXED_BINDING_DISTANCE,
-      ).sort(pointDistanceSq)[0];
-    }
  } else {
    intersection = intersectElementWithLineSegment(
      bindableElement,
@@ -42,7 +42,6 @@ import {
  isBoundToContainer,
  isFreeDrawElement,
  isLinearElement,
-  isLineElement,
  isTextElement,
 } from "./typeChecks";

@@ -322,42 +321,19 @@ export const getElementLineSegments = (

  if (shape.type === "polycurve") {
    const curves = shape.data;
-    const pointsOnCurves = curves.map((curve) =>
-      pointsOnBezierCurves(curve, 10),
-    );
-
+    const points = curves
+      .map((curve) => pointsOnBezierCurves(curve, 10))
+      .flat();
+    let i = 0;
    const segments: LineSegment<GlobalPoint>[] = [];
-
-    if (
-      (isLineElement(element) && !element.polygon) ||
-      isArrowElement(element)
-    ) {
-      for (const points of pointsOnCurves) {
-        let i = 0;
-
-        while (i < points.length - 1) {
-          segments.push(
-            lineSegment(
-              pointFrom(points[i][0], points[i][1]),
-              pointFrom(points[i + 1][0], points[i + 1][1]),
-            ),
-          );
-          i++;
-        }
-      }
-    } else {
-      const points = pointsOnCurves.flat();
-      let i = 0;
-
-      while (i < points.length - 1) {
-        segments.push(
-          lineSegment(
-            pointFrom(points[i][0], points[i][1]),
-            pointFrom(points[i + 1][0], points[i + 1][1]),
-          ),
-        );
-        i++;
-      }
+    while (i < points.length - 1) {
+      segments.push(
+        lineSegment(
+          pointFrom(points[i][0], points[i][1]),
+          pointFrom(points[i + 1][0], points[i + 1][1]),
+        ),
+      );
+      i++;
    }

    return segments;
@@ -1150,9 +1126,7 @@ export interface BoundingBox {
 }

 export const getCommonBoundingBox = (
-  elements:
-    | readonly ExcalidrawElement[]
-    | readonly NonDeleted<ExcalidrawElement>[],
+  elements: ExcalidrawElement[] | readonly NonDeleted<ExcalidrawElement>[],
 ): BoundingBox => {
  const [minX, minY, maxX, maxY] = getCommonBounds(elements);
  return {
@@ -11,9 +11,12 @@ import {
  vectorFromPoint,
  vectorNormalize,
  vectorScale,
+} from "@excalidraw/math";
+
+import {
  ellipse,
  ellipseSegmentInterceptPoints,
-} from "@excalidraw/math";
+} from "@excalidraw/math/ellipse";

 import type {
  Curve,
@@ -10,13 +10,7 @@ export const hasBackground = (type: ElementOrToolType) =>
  type === "freedraw";

 export const hasStrokeColor = (type: ElementOrToolType) =>
-  type === "rectangle" ||
-  type === "ellipse" ||
-  type === "diamond" ||
-  type === "freedraw" ||
-  type === "arrow" ||
-  type === "line" ||
-  type === "text";
+  type !== "image" && type !== "frame" && type !== "magicframe";

 export const hasStrokeWidth = (type: ElementOrToolType) =>
  type === "rectangle" ||
@@ -2,6 +2,7 @@ import {
  arrayToMap,
  arrayToObject,
  assertNever,
+  invariant,
  isDevEnv,
  isShallowEqual,
  isTestEnv,
@@ -55,10 +56,10 @@ import { getNonDeletedGroupIds } from "./groups";

 import { orderByFractionalIndex, syncMovedIndices } from "./fractionalIndex";

-import { StoreSnapshot } from "./store";
-
 import { Scene } from "./Scene";

+import { StoreSnapshot } from "./store";
+
 import type { BindableProp, BindingProp } from "./binding";

 import type { ElementUpdate } from "./mutateElement";
@@ -150,27 +151,13 @@ export class Delta<T> {
    );
  }

-  /**
-   * Merges two deltas into a new one.
-   */
-  public static merge<T>(
-    delta1: Delta<T>,
-    delta2: Delta<T>,
-    delta3: Delta<T> = Delta.empty(),
-  ) {
-    return Delta.create(
-      { ...delta1.deleted, ...delta2.deleted, ...delta3.deleted },
-      { ...delta1.inserted, ...delta2.inserted, ...delta3.inserted },
-    );
-  }
-
  /**
   * Merges deleted and inserted object partials.
   */
  public static mergeObjects<T extends { [key: string]: unknown }>(
    prev: T,
    added: T,
-    removed: T = {} as T,
+    removed: T,
  ) {
    const cloned = { ...prev };

@@ -510,11 +497,6 @@ export interface DeltaContainer<T> {
   */
  applyTo(previous: T, ...options: unknown[]): [T, boolean];

-  /**
-   * Squashes the current delta with the given one.
-   */
-  squash(delta: DeltaContainer<T>): this;
-
  /**
   * Checks whether all `Delta`s are empty.
   */
@@ -522,11 +504,7 @@ export interface DeltaContainer<T> {
 }

 export class AppStateDelta implements DeltaContainer<AppState> {
-  private constructor(public delta: Delta<ObservedAppState>) {}
-
-  public static create(delta: Delta<ObservedAppState>): AppStateDelta {
-    return new AppStateDelta(delta);
-  }
+  private constructor(public readonly delta: Delta<ObservedAppState>) {}

  public static calculate<T extends ObservedAppState>(
    prevAppState: T,
@@ -557,137 +535,76 @@ export class AppStateDelta implements DeltaContainer<AppState> {
    return new AppStateDelta(inversedDelta);
  }

-  public squash(delta: AppStateDelta): this {
-    if (delta.isEmpty()) {
-      return this;
-    }
-
-    const mergedDeletedSelectedElementIds = Delta.mergeObjects(
-      this.delta.deleted.selectedElementIds ?? {},
-      delta.delta.deleted.selectedElementIds ?? {},
-    );
-
-    const mergedInsertedSelectedElementIds = Delta.mergeObjects(
-      this.delta.inserted.selectedElementIds ?? {},
-      delta.delta.inserted.selectedElementIds ?? {},
-    );
-
-    const mergedDeletedSelectedGroupIds = Delta.mergeObjects(
-      this.delta.deleted.selectedGroupIds ?? {},
-      delta.delta.deleted.selectedGroupIds ?? {},
-    );
-
-    const mergedInsertedSelectedGroupIds = Delta.mergeObjects(
-      this.delta.inserted.selectedGroupIds ?? {},
-      delta.delta.inserted.selectedGroupIds ?? {},
-    );
-
-    const mergedDeletedLockedMultiSelections = Delta.mergeObjects(
-      this.delta.deleted.lockedMultiSelections ?? {},
-      delta.delta.deleted.lockedMultiSelections ?? {},
-    );
-
-    const mergedInsertedLockedMultiSelections = Delta.mergeObjects(
-      this.delta.inserted.lockedMultiSelections ?? {},
-      delta.delta.inserted.lockedMultiSelections ?? {},
-    );
-
-    const mergedInserted: Partial<ObservedAppState> = {};
-    const mergedDeleted: Partial<ObservedAppState> = {};
-
-    if (
-      Object.keys(mergedDeletedSelectedElementIds).length ||
-      Object.keys(mergedInsertedSelectedElementIds).length
-    ) {
-      mergedDeleted.selectedElementIds = mergedDeletedSelectedElementIds;
-      mergedInserted.selectedElementIds = mergedInsertedSelectedElementIds;
-    }
-
-    if (
-      Object.keys(mergedDeletedSelectedGroupIds).length ||
-      Object.keys(mergedInsertedSelectedGroupIds).length
-    ) {
-      mergedDeleted.selectedGroupIds = mergedDeletedSelectedGroupIds;
-      mergedInserted.selectedGroupIds = mergedInsertedSelectedGroupIds;
-    }
-
-    if (
-      Object.keys(mergedDeletedLockedMultiSelections).length ||
-      Object.keys(mergedInsertedLockedMultiSelections).length
-    ) {
-      mergedDeleted.lockedMultiSelections = mergedDeletedLockedMultiSelections;
-      mergedInserted.lockedMultiSelections =
-        mergedInsertedLockedMultiSelections;
-    }
-
-    this.delta = Delta.merge(
-      this.delta,
-      delta.delta,
-      Delta.create(mergedDeleted, mergedInserted),
-    );
-
-    return this;
-  }
-
  public applyTo(
    appState: AppState,
    nextElements: SceneElementsMap,
  ): [AppState, boolean] {
    try {
      const {
-        selectedElementIds: deletedSelectedElementIds = {},
-        selectedGroupIds: deletedSelectedGroupIds = {},
-        lockedMultiSelections: deletedLockedMultiSelections = {},
+        selectedElementIds: removedSelectedElementIds = {},
+        selectedGroupIds: removedSelectedGroupIds = {},
      } = this.delta.deleted;

      const {
-        selectedElementIds: insertedSelectedElementIds = {},
-        selectedGroupIds: insertedSelectedGroupIds = {},
-        lockedMultiSelections: insertedLockedMultiSelections = {},
-        selectedLinearElement: insertedSelectedLinearElement,
+        selectedElementIds: addedSelectedElementIds = {},
+        selectedGroupIds: addedSelectedGroupIds = {},
+        selectedLinearElementId,
+        selectedLinearElementIsEditing,
        ...directlyApplicablePartial
      } = this.delta.inserted;

      const mergedSelectedElementIds = Delta.mergeObjects(
        appState.selectedElementIds,
-        insertedSelectedElementIds,
-        deletedSelectedElementIds,
+        addedSelectedElementIds,
+        removedSelectedElementIds,
      );

      const mergedSelectedGroupIds = Delta.mergeObjects(
        appState.selectedGroupIds,
-        insertedSelectedGroupIds,
-        deletedSelectedGroupIds,
+        addedSelectedGroupIds,
+        removedSelectedGroupIds,
      );

-      const mergedLockedMultiSelections = Delta.mergeObjects(
-        appState.lockedMultiSelections,
-        insertedLockedMultiSelections,
-        deletedLockedMultiSelections,
-      );
+      let selectedLinearElement = appState.selectedLinearElement;

-      const selectedLinearElement =
-        insertedSelectedLinearElement &&
-        nextElements.has(insertedSelectedLinearElement.elementId)
-          ? new LinearElementEditor(
-              nextElements.get(
-                insertedSelectedLinearElement.elementId,
-              ) as NonDeleted<ExcalidrawLinearElement>,
-              nextElements,
-              insertedSelectedLinearElement.isEditing,
-            )
-          : null;
+      if (selectedLinearElementId === null) {
+        // Unselect linear element (visible change)
+        selectedLinearElement = null;
+      } else if (
+        selectedLinearElementId &&
+        nextElements.has(selectedLinearElementId)
+      ) {
+        selectedLinearElement = new LinearElementEditor(
+          nextElements.get(
+            selectedLinearElementId,
+          ) as NonDeleted<ExcalidrawLinearElement>,
+          nextElements,
+          selectedLinearElementIsEditing === true, // Can be unknown which is defaulted to false
+        );
+      }
+
+      if (
+        // Value being 'null' is equivaluent to unknown in this case because it only gets set
+        // to null when 'selectedLinearElementId' is set to null
+        selectedLinearElementIsEditing != null
+      ) {
+        invariant(
+          selectedLinearElement,
+          `selectedLinearElement is null when selectedLinearElementIsEditing is set to ${selectedLinearElementIsEditing}`,
+        );
+
+        selectedLinearElement = {
+          ...selectedLinearElement,
+          isEditing: selectedLinearElementIsEditing,
+        };
+      }

      const nextAppState = {
        ...appState,
        ...directlyApplicablePartial,
        selectedElementIds: mergedSelectedElementIds,
        selectedGroupIds: mergedSelectedGroupIds,
-        lockedMultiSelections: mergedLockedMultiSelections,
-        selectedLinearElement:
-          typeof insertedSelectedLinearElement !== "undefined"
-            ? selectedLinearElement
-            : appState.selectedLinearElement,
+        selectedLinearElement,
      };

      const constainsVisibleChanges = this.filterInvisibleChanges(
@@ -816,53 +733,64 @@ export class AppStateDelta implements DeltaContainer<AppState> {
            }

            break;
-          case "selectedLinearElement":
-            const nextLinearElement = nextAppState[key];
+          case "selectedLinearElementId": {
+            const appStateKey = AppStateDelta.convertToAppStateKey(key);
+            const linearElement = nextAppState[appStateKey];

-            if (!nextLinearElement) {
+            if (!linearElement) {
              // previously there was a linear element (assuming visible), now there is none
              visibleDifferenceFlag.value = true;
            } else {
-              const element = nextElements.get(nextLinearElement.elementId);
+              const element = nextElements.get(linearElement.elementId);

              if (element && !element.isDeleted) {
                // previously there wasn't a linear element, now there is one which is visible
                visibleDifferenceFlag.value = true;
              } else {
                // there was assigned a linear element now, but it's deleted
-                nextAppState[key] = null;
+                nextAppState[appStateKey] = null;
              }
            }

            break;
-          case "lockedMultiSelections":
+          }
+          case "selectedLinearElementIsEditing": {
+            // Changes in editing state are always visible
+            const prevIsEditing =
+              prevAppState.selectedLinearElement?.isEditing ?? false;
+            const nextIsEditing =
+              nextAppState.selectedLinearElement?.isEditing ?? false;
+
+            if (prevIsEditing !== nextIsEditing) {
+              visibleDifferenceFlag.value = true;
+            }
+            break;
+          }
+          case "lockedMultiSelections": {
            const prevLockedUnits = prevAppState[key] || {};
            const nextLockedUnits = nextAppState[key] || {};

-            // TODO: this seems wrong, we are already doing this comparison generically above,
-            // hence instead we should check whether elements are actually visible,
-            // so that once these changes are applied they actually result in a visible change to the user
            if (!isShallowEqual(prevLockedUnits, nextLockedUnits)) {
              visibleDifferenceFlag.value = true;
            }
            break;
-          case "activeLockedId":
+          }
+          case "activeLockedId": {
            const prevHitLockedId = prevAppState[key] || null;
            const nextHitLockedId = nextAppState[key] || null;

-            // TODO: this seems wrong, we are already doing this comparison generically above,
-            // hence instead we should check whether elements are actually visible,
-            // so that once these changes are applied they actually result in a visible change to the user
            if (prevHitLockedId !== nextHitLockedId) {
              visibleDifferenceFlag.value = true;
            }
            break;
-          default:
+          }
+          default: {
            assertNever(
              key,
              `Unknown ObservedElementsAppState's key "${key}"`,
              true,
            );
+          }
        }
      }
    }
@@ -870,6 +798,15 @@ export class AppStateDelta implements DeltaContainer<AppState> {
    return visibleDifferenceFlag.value;
  }

+  private static convertToAppStateKey(
+    key: keyof Pick<ObservedElementsAppState, "selectedLinearElementId">,
+  ): keyof Pick<AppState, "selectedLinearElement"> {
+    switch (key) {
+      case "selectedLinearElementId":
+        return "selectedLinearElement";
+    }
+  }
+
  private static filterSelectedElements(
    selectedElementIds: AppState["selectedElementIds"],
    elements: SceneElementsMap,
@@ -934,7 +871,8 @@ export class AppStateDelta implements DeltaContainer<AppState> {
      editingGroupId,
      selectedGroupIds,
      selectedElementIds,
-      selectedLinearElement,
+      selectedLinearElementId,
+      selectedLinearElementIsEditing,
      croppingElementId,
      lockedMultiSelections,
      activeLockedId,
@@ -988,6 +926,12 @@ export class AppStateDelta implements DeltaContainer<AppState> {
        "lockedMultiSelections",
        (prevValue) => (prevValue ?? {}) as ValueOf<T["lockedMultiSelections"]>,
      );
+      Delta.diffObjects(
+        deleted,
+        inserted,
+        "activeLockedId",
+        (prevValue) => (prevValue ?? null) as ValueOf<T["activeLockedId"]>,
+      );
    } catch (e) {
      // if postprocessing fails it does not make sense to bubble up, but let's make sure we know about it
      console.error(`Couldn't postprocess appstate change deltas.`);
@@ -1016,13 +960,12 @@ type ElementPartial<TElement extends ExcalidrawElement = ExcalidrawElement> =
  Omit<Partial<Ordered<TElement>>, "id" | "updated" | "seed">;

 export type ApplyToOptions = {
-  excludedProperties?: Set<keyof ElementPartial>;
+  excludedProperties: Set<keyof ElementPartial>;
 };

 type ApplyToFlags = {
  containsVisibleDifference: boolean;
  containsZindexDifference: boolean;
-  applyDirection: "forward" | "backward" | undefined;
 };

 /**
@@ -1111,27 +1054,18 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
    inserted,
  }: Delta<ElementPartial>) =>
    !!(
+      deleted.version &&
+      inserted.version &&
      // versions are required integers
-      (
-        Number.isInteger(deleted.version) &&
-        Number.isInteger(inserted.version) &&
-        // versions should be positive, zero included
-        deleted.version! >= 0 &&
-        inserted.version! >= 0 &&
-        // versions should never be the same
-        deleted.version !== inserted.version
-      )
+      Number.isInteger(deleted.version) &&
+      Number.isInteger(inserted.version) &&
+      // versions should be positive, zero included
+      deleted.version >= 0 &&
+      inserted.version >= 0 &&
+      // versions should never be the same
+      deleted.version !== inserted.version
    );

-  private static satisfiesUniqueInvariants = (
-    elementsDelta: ElementsDelta,
-    id: string,
-  ) => {
-    const { added, removed, updated } = elementsDelta;
-    // it's required that there is only one unique delta type per element
-    return [added[id], removed[id], updated[id]].filter(Boolean).length === 1;
-  };
-
  private static validate(
    elementsDelta: ElementsDelta,
    type: "added" | "removed" | "updated",
@@ -1140,7 +1074,6 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
    for (const [id, delta] of Object.entries(elementsDelta[type])) {
      if (
        !this.satisfiesCommmonInvariants(delta) ||
-        !this.satisfiesUniqueInvariants(elementsDelta, id) ||
        !satifiesSpecialInvariants(delta)
      ) {
        console.error(
@@ -1177,7 +1110,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
      const nextElement = nextElements.get(prevElement.id);

      if (!nextElement) {
-        const deleted = { ...prevElement } as ElementPartial;
+        const deleted = { ...prevElement, isDeleted: false } as ElementPartial;

        const inserted = {
          isDeleted: true,
@@ -1191,11 +1124,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
          ElementsDelta.stripIrrelevantProps,
        );

-        if (!prevElement.isDeleted) {
-          removed[prevElement.id] = delta;
-        } else {
-          updated[prevElement.id] = delta;
-        }
+        removed[prevElement.id] = delta;
      }
    }

@@ -1211,6 +1140,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {

        const inserted = {
          ...nextElement,
+          isDeleted: false,
        } as ElementPartial;

        const delta = Delta.create(
@@ -1219,12 +1149,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
          ElementsDelta.stripIrrelevantProps,
        );

-        // ignore updates which would "delete" already deleted element
-        if (!nextElement.isDeleted) {
-          added[nextElement.id] = delta;
-        } else {
-          updated[nextElement.id] = delta;
-        }
+        added[nextElement.id] = delta;

        continue;
      }
@@ -1253,7 +1178,10 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
          continue;
        }

-        updated[nextElement.id] = delta;
+        // making sure there are at least some changes
+        if (!Delta.isEmpty(delta)) {
+          updated[nextElement.id] = delta;
+        }
      }
    }

@@ -1268,8 +1196,8 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
    const inverseInternal = (deltas: Record<string, Delta<ElementPartial>>) => {
      const inversedDeltas: Record<string, Delta<ElementPartial>> = {};

-      for (const [id, { inserted, deleted }] of Object.entries(deltas)) {
-        inversedDeltas[id] = Delta.create({ ...inserted }, { ...deleted });
+      for (const [id, delta] of Object.entries(deltas)) {
+        inversedDeltas[id] = Delta.create(delta.inserted, delta.deleted);
      }

      return inversedDeltas;
@@ -1388,7 +1316,9 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
  public applyTo(
    elements: SceneElementsMap,
    snapshot: StoreSnapshot["elements"] = StoreSnapshot.empty().elements,
-    options?: ApplyToOptions,
+    options: ApplyToOptions = {
+      excludedProperties: new Set(),
+    },
  ): [SceneElementsMap, boolean] {
    let nextElements = new Map(elements) as SceneElementsMap;
    let changedElements: Map<string, OrderedExcalidrawElement>;
@@ -1396,28 +1326,22 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
    const flags: ApplyToFlags = {
      containsVisibleDifference: false,
      containsZindexDifference: false,
-      applyDirection: undefined,
    };

    // mimic a transaction by applying deltas into `nextElements` (always new instance, no mutation)
    try {
      const applyDeltas = ElementsDelta.createApplier(
-        elements,
        nextElements,
        snapshot,
-        flags,
        options,
+        flags,
      );

      const addedElements = applyDeltas(this.added);
      const removedElements = applyDeltas(this.removed);
      const updatedElements = applyDeltas(this.updated);

-      const affectedElements = this.resolveConflicts(
-        elements,
-        nextElements,
-        flags.applyDirection,
-      );
+      const affectedElements = this.resolveConflicts(elements, nextElements);

      // TODO: #7348 validate elements semantically and syntactically the changed elements, in case they would result data integrity issues
      changedElements = new Map([
@@ -1441,15 +1365,22 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
    }

    try {
-      // the following reorder performs mutations, but only on new instances of changed elements,
-      // unless something goes really bad and it fallbacks to fixing all invalid indices
+      // the following reorder performs also mutations, but only on new instances of changed elements
+      // (unless something goes really bad and it fallbacks to fixing all invalid indices)
      nextElements = ElementsDelta.reorderElements(
        nextElements,
        changedElements,
        flags,
      );

-      ElementsDelta.redrawElements(nextElements, changedElements);
+      // we don't have an up-to-date scene, as we can be just in the middle of applying history entry
+      // we also don't have a scene on the server
+      // so we are creating a temp scene just to query and mutate elements
+      const tempScene = new Scene(nextElements);
+
+      ElementsDelta.redrawTextBoundingBoxes(tempScene, changedElements);
+      // Need ordered nextElements to avoid z-index binding issues
+      ElementsDelta.redrawBoundArrows(tempScene, changedElements);
    } catch (e) {
      console.error(
        `Couldn't mutate elements after applying elements change`,
@@ -1464,113 +1395,12 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
    }
  }

-  public squash(delta: ElementsDelta): this {
-    if (delta.isEmpty()) {
-      return this;
-    }
-
-    const { added, removed, updated } = delta;
-
-    const mergeBoundElements = (
-      prevDelta: Delta<ElementPartial>,
-      nextDelta: Delta<ElementPartial>,
-    ) => {
-      const mergedDeletedBoundElements =
-        Delta.mergeArrays(
-          prevDelta.deleted.boundElements ?? [],
-          nextDelta.deleted.boundElements ?? [],
-          undefined,
-          (x) => x.id,
-        ) ?? [];
-
-      const mergedInsertedBoundElements =
-        Delta.mergeArrays(
-          prevDelta.inserted.boundElements ?? [],
-          nextDelta.inserted.boundElements ?? [],
-          undefined,
-          (x) => x.id,
-        ) ?? [];
-
-      if (
-        !mergedDeletedBoundElements.length &&
-        !mergedInsertedBoundElements.length
-      ) {
-        return;
-      }
-
-      return Delta.create(
-        {
-          boundElements: mergedDeletedBoundElements,
-        },
-        {
-          boundElements: mergedInsertedBoundElements,
-        },
-      );
-    };
-
-    for (const [id, nextDelta] of Object.entries(added)) {
-      const prevDelta = this.added[id] ?? this.removed[id] ?? this.updated[id];
-
-      if (!prevDelta) {
-        this.added[id] = nextDelta;
-      } else {
-        const mergedDelta = mergeBoundElements(prevDelta, nextDelta);
-        delete this.removed[id];
-        delete this.updated[id];
-
-        this.added[id] = Delta.merge(prevDelta, nextDelta, mergedDelta);
-      }
-    }
-
-    for (const [id, nextDelta] of Object.entries(removed)) {
-      const prevDelta = this.added[id] ?? this.removed[id] ?? this.updated[id];
-
-      if (!prevDelta) {
-        this.removed[id] = nextDelta;
-      } else {
-        const mergedDelta = mergeBoundElements(prevDelta, nextDelta);
-        delete this.added[id];
-        delete this.updated[id];
-
-        this.removed[id] = Delta.merge(prevDelta, nextDelta, mergedDelta);
-      }
-    }
-
-    for (const [id, nextDelta] of Object.entries(updated)) {
-      const prevDelta = this.added[id] ?? this.removed[id] ?? this.updated[id];
-
-      if (!prevDelta) {
-        this.updated[id] = nextDelta;
-      } else {
-        const mergedDelta = mergeBoundElements(prevDelta, nextDelta);
-        const updatedDelta = Delta.merge(prevDelta, nextDelta, mergedDelta);
-
-        if (prevDelta === this.added[id]) {
-          this.added[id] = updatedDelta;
-        } else if (prevDelta === this.removed[id]) {
-          this.removed[id] = updatedDelta;
-        } else {
-          this.updated[id] = updatedDelta;
-        }
-      }
-    }
-
-    if (isTestEnv() || isDevEnv()) {
-      ElementsDelta.validate(this, "added", ElementsDelta.satisfiesAddition);
-      ElementsDelta.validate(this, "removed", ElementsDelta.satisfiesRemoval);
-      ElementsDelta.validate(this, "updated", ElementsDelta.satisfiesUpdate);
-    }
-
-    return this;
-  }
-
  private static createApplier =
    (
-      prevElements: SceneElementsMap,
      nextElements: SceneElementsMap,
      snapshot: StoreSnapshot["elements"],
+      options: ApplyToOptions,
      flags: ApplyToFlags,
-      options?: ApplyToOptions,
    ) =>
    (deltas: Record<string, Delta<ElementPartial>>) => {
      const getElement = ElementsDelta.createGetter(
@@ -1583,26 +1413,15 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
        const element = getElement(id, delta.inserted);

        if (element) {
-          const nextElement = ElementsDelta.applyDelta(
+          const newElement = ElementsDelta.applyDelta(
            element,
            delta,
-            flags,
            options,
+            flags,
          );

-          nextElements.set(nextElement.id, nextElement);
-          acc.set(nextElement.id, nextElement);
-
-          if (!flags.applyDirection) {
-            const prevElement = prevElements.get(id);
-
-            if (prevElement) {
-              flags.applyDirection =
-                prevElement.version > nextElement.version
-                  ? "backward"
-                  : "forward";
-            }
-          }
+          nextElements.set(newElement.id, newElement);
+          acc.set(newElement.id, newElement);
        }

        return acc;
@@ -1647,8 +1466,8 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
  private static applyDelta(
    element: OrderedExcalidrawElement,
    delta: Delta<ElementPartial>,
+    options: ApplyToOptions,
    flags: ApplyToFlags,
-    options?: ApplyToOptions,
  ) {
    const directlyApplicablePartial: Mutable<ElementPartial> = {};

@@ -1662,7 +1481,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
        continue;
      }

-      if (options?.excludedProperties?.has(key)) {
+      if (options.excludedProperties.has(key)) {
        continue;
      }

@@ -1702,7 +1521,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
        delta.deleted.index !== delta.inserted.index;
    }

-    return newElementWith(element, directlyApplicablePartial, true);
+    return newElementWith(element, directlyApplicablePartial);
  }

  /**
@@ -1742,7 +1561,6 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
  private resolveConflicts(
    prevElements: SceneElementsMap,
    nextElements: SceneElementsMap,
-    applyDirection: "forward" | "backward" = "forward",
  ) {
    const nextAffectedElements = new Map<string, OrderedExcalidrawElement>();
    const updater = (
@@ -1754,36 +1572,21 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
        return;
      }

-      const prevElement = prevElements.get(element.id);
-      const nextVersion =
-        applyDirection === "forward"
-          ? nextElement.version + 1
-          : nextElement.version - 1;
-
-      const elementUpdates = updates as ElementUpdate<OrderedExcalidrawElement>;
-
      let affectedElement: OrderedExcalidrawElement;

-      if (prevElement === nextElement) {
+      if (prevElements.get(element.id) === nextElement) {
        // create the new element instance in case we didn't modify the element yet
        // so that we won't end up in an incosistent state in case we would fail in the middle of mutations
        affectedElement = newElementWith(
          nextElement,
-          {
-            ...elementUpdates,
-            version: nextVersion,
-          },
-          true,
+          updates as ElementUpdate<OrderedExcalidrawElement>,
        );
      } else {
-        affectedElement = mutateElement(nextElement, nextElements, {
-          ...elementUpdates,
-          // don't modify the version further, if it's already different
-          version:
-            prevElement?.version !== nextElement.version
-              ? nextElement.version
-              : nextVersion,
-        });
+        affectedElement = mutateElement(
+          nextElement,
+          nextElements,
+          updates as ElementUpdate<OrderedExcalidrawElement>,
+        );
      }

      nextAffectedElements.set(affectedElement.id, affectedElement);
@@ -1821,12 +1624,25 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
      Array.from(prevElements).filter(([id]) => nextAffectedElements.has(id)),
    );

-    // calculate complete deltas for affected elements, and squash them back to the current deltas
-    this.squash(
-      // technically we could do better here if perf. would become an issue
-      ElementsDelta.calculate(prevAffectedElements, nextAffectedElements),
+    // calculate complete deltas for affected elements, and assign them back to all the deltas
+    // technically we could do better here if perf. would become an issue
+    const { added, removed, updated } = ElementsDelta.calculate(
+      prevAffectedElements,
+      nextAffectedElements,
    );

+    for (const [id, delta] of Object.entries(added)) {
+      this.added[id] = delta;
+    }
+
+    for (const [id, delta] of Object.entries(removed)) {
+      this.removed[id] = delta;
+    }
+
+    for (const [id, delta] of Object.entries(updated)) {
+      this.updated[id] = delta;
+    }
+
    return nextAffectedElements;
  }

@@ -1888,31 +1704,6 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
    BindableElement.rebindAffected(nextElements, nextElement(), updater);
  }

-  public static redrawElements(
-    nextElements: SceneElementsMap,
-    changedElements: Map<string, OrderedExcalidrawElement>,
-  ) {
-    try {
-      // we don't have an up-to-date scene, as we can be just in the middle of applying history entry
-      // we also don't have a scene on the server
-      // so we are creating a temp scene just to query and mutate elements
-      const tempScene = new Scene(nextElements, { skipValidation: true });
-
-      ElementsDelta.redrawTextBoundingBoxes(tempScene, changedElements);
-
-      // needs ordered nextElements to avoid z-index binding issues
-      ElementsDelta.redrawBoundArrows(tempScene, changedElements);
-    } catch (e) {
-      console.error(`Couldn't redraw elements`, e);
-
-      if (isTestEnv() || isDevEnv()) {
-        throw e;
-      }
-    } finally {
-      return nextElements;
-    }
-  }
-
  private static redrawTextBoundingBoxes(
    scene: Scene,
    changed: Map<string, OrderedExcalidrawElement>,
@@ -1967,7 +1758,6 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
  ) {
    for (const element of changed.values()) {
      if (!element.isDeleted && isBindableElement(element)) {
-        // TODO: with precise bindings this is quite expensive, so consider optimisation so it's only triggered when the arrow does not intersect (imprecise) element bounds
        updateBoundElements(element, scene, {
          changedElements: changed,
        });
@@ -2,10 +2,10 @@ import {
  curvePointDistance,
  distanceToLineSegment,
  pointRotateRads,
-  ellipse,
-  ellipseDistanceFromPoint,
 } from "@excalidraw/math";

+import { ellipse, ellipseDistanceFromPoint } from "@excalidraw/math/ellipse";
+
 import type { GlobalPoint, Radians } from "@excalidraw/math";

 import {
@@ -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 thirdPoint = globalUpdatedPoints.at(startIsSpecial ? 3 : 2);
-
-    if (!secondPoint || !thirdPoint) {
-      throw new Error(
-        `Second and third points must exist when handling endpoint drag (${startIsSpecial})`,
-      );
-    }
-
+    const secondPoint = globalUpdatedPoints[startIsSpecial ? 2 : 1];
+    const thirdPoint = globalUpdatedPoints[startIsSpecial ? 3 : 2];
    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(
-      globalUpdatedPoints.length - (endIsSpecial ? 3 : 2),
-    );
-    const thirdToLastPoint = globalUpdatedPoints.at(
-      globalUpdatedPoints.length - (endIsSpecial ? 4 : 3),
-    );
-
-    if (!secondToLastPoint || !thirdToLastPoint) {
-      throw new Error(
-        `Second and third to last points must exist when handling endpoint drag (${endIsSpecial})`,
-      );
-    }
-
+    const secondToLastPoint =
+      globalUpdatedPoints[globalUpdatedPoints.length - (endIsSpecial ? 3 : 2)];
+    const thirdToLastPoint =
+      globalUpdatedPoints[globalUpdatedPoints.length - (endIsSpecial ? 4 : 3)];
    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) =>
@@ -29,9 +29,6 @@ export const hashElementsVersion = (elements: ElementsMapOrArray): number => {

 // string hash function (using djb2). Not cryptographically secure, use only
 // for versioning and such.
-// note: hashes individual code units (not code points),
-// but for hashing purposes this is fine as it iterates through every code unit
-// (as such, no need to encode to byte string first)
 export const hashString = (s: string): number => {
  let hash: number = 5381;
  for (let i = 0; i < s.length; i++) {
@@ -100,7 +97,6 @@ export * from "./image";
 export * from "./linearElementEditor";
 export * from "./mutateElement";
 export * from "./newElement";
-export * from "./positionElementsOnGrid";
 export * from "./renderElement";
 export * from "./resizeElements";
 export * from "./resizeTest";
@@ -1,112 +0,0 @@
-import { getCommonBounds } from "./bounds";
-import { type ElementUpdate, newElementWith } from "./mutateElement";
-
-import type { ExcalidrawElement } from "./types";
-
-// TODO rewrite (mostly vibe-coded)
-export const positionElementsOnGrid = <TElement extends ExcalidrawElement>(
-  elements: TElement[] | TElement[][],
-  centerX: number,
-  centerY: number,
-  padding = 50,
-): TElement[] => {
-  // Ensure there are elements to position
-  if (!elements || elements.length === 0) {
-    return [];
-  }
-
-  const res: TElement[] = [];
-  // Normalize input to work with atomic units (groups of elements)
-  // If elements is a flat array, treat each element as its own atomic unit
-  const atomicUnits: TElement[][] = Array.isArray(elements[0])
-    ? (elements as TElement[][])
-    : (elements as TElement[]).map((element) => [element]);
-
-  // Determine the number of columns for atomic units
-  // A common approach for a "grid-like" layout without specific column constraints
-  // is to aim for a roughly square arrangement.
-  const numUnits = atomicUnits.length;
-  const numColumns = Math.max(1, Math.ceil(Math.sqrt(numUnits)));
-
-  // Group atomic units into rows based on the calculated number of columns
-  const rows: TElement[][][] = [];
-  for (let i = 0; i < numUnits; i += numColumns) {
-    rows.push(atomicUnits.slice(i, i + numColumns));
-  }
-
-  // Calculate properties for each row (total width, max height)
-  // and the total actual height of all row content.
-  let totalGridActualHeight = 0; // Sum of max heights of rows, without inter-row padding
-  const rowProperties = rows.map((rowUnits) => {
-    let rowWidth = 0;
-    let maxUnitHeightInRow = 0;
-
-    const unitBounds = rowUnits.map((unit) => {
-      const [minX, minY, maxX, maxY] = getCommonBounds(unit);
-      return {
-        elements: unit,
-        bounds: [minX, minY, maxX, maxY] as const,
-        width: maxX - minX,
-        height: maxY - minY,
-      };
-    });
-
-    unitBounds.forEach((unitBound, index) => {
-      rowWidth += unitBound.width;
-      // Add padding between units in the same row, but not after the last one
-      if (index < unitBounds.length - 1) {
-        rowWidth += padding;
-      }
-      if (unitBound.height > maxUnitHeightInRow) {
-        maxUnitHeightInRow = unitBound.height;
-      }
-    });
-
-    totalGridActualHeight += maxUnitHeightInRow;
-    return {
-      unitBounds,
-      width: rowWidth,
-      maxHeight: maxUnitHeightInRow,
-    };
-  });
-
-  // Calculate the total height of the grid including padding between rows
-  const totalGridHeightWithPadding =
-    totalGridActualHeight + Math.max(0, rows.length - 1) * padding;
-
-  // Calculate the starting Y position to center the entire grid vertically around centerY
-  let currentY = centerY - totalGridHeightWithPadding / 2;
-
-  // Position atomic units row by row
-  rowProperties.forEach((rowProp) => {
-    const { unitBounds, width: rowWidth, maxHeight: rowMaxHeight } = rowProp;
-
-    // Calculate the starting X for the current row to center it horizontally around centerX
-    let currentX = centerX - rowWidth / 2;
-
-    unitBounds.forEach((unitBound) => {
-      // Calculate the offset needed to position this atomic unit
-      const [originalMinX, originalMinY] = unitBound.bounds;
-      const offsetX = currentX - originalMinX;
-      const offsetY = currentY - originalMinY;
-
-      // Apply the offset to all elements in this atomic unit
-      unitBound.elements.forEach((element) => {
-        res.push(
-          newElementWith(element, {
-            x: element.x + offsetX,
-            y: element.y + offsetY,
-          } as ElementUpdate<TElement>),
-        );
-      });
-
-      // Move X for the next unit in the row
-      currentX += unitBound.width + padding;
-    });
-
-    // Move Y to the starting position for the next row
-    // This accounts for the tallest unit in the current row and the inter-row padding
-    currentY += rowMaxHeight + padding;
-  });
-  return res;
-};
@@ -1,14 +1,7 @@
 import rough from "roughjs/bin/rough";
 import { getStroke } from "perfect-freehand";

-import {
-  type GlobalPoint,
-  isRightAngleRads,
-  lineSegment,
-  pointFrom,
-  pointRotateRads,
-  type Radians,
-} from "@excalidraw/math";
+import { isRightAngleRads } from "@excalidraw/math";

 import {
  BOUND_TEXT_PADDING,
@@ -21,7 +14,6 @@ import {
  getFontString,
  isRTL,
  getVerticalOffset,
-  invariant,
 } from "@excalidraw/common";

 import type {
@@ -40,7 +32,7 @@ import type {
  InteractiveCanvasRenderConfig,
 } from "@excalidraw/excalidraw/scene/types";

-import { getElementAbsoluteCoords, getElementBounds } from "./bounds";
+import { getElementAbsoluteCoords } from "./bounds";
 import { getUncroppedImageElement } from "./cropElement";
 import { LinearElementEditor } from "./linearElementEditor";
 import {
@@ -1047,66 +1039,6 @@ export function getFreeDrawPath2D(element: ExcalidrawFreeDrawElement) {
 }

 export function getFreeDrawSvgPath(element: ExcalidrawFreeDrawElement) {
-  return getSvgPathFromStroke(getFreedrawOutlinePoints(element));
-}
-
-export function getFreedrawOutlineAsSegments(
-  element: ExcalidrawFreeDrawElement,
-  points: [number, number][],
-  elementsMap: ElementsMap,
-) {
-  const bounds = getElementBounds(
-    {
-      ...element,
-      angle: 0 as Radians,
-    },
-    elementsMap,
-  );
-  const center = pointFrom<GlobalPoint>(
-    (bounds[0] + bounds[2]) / 2,
-    (bounds[1] + bounds[3]) / 2,
-  );
-
-  invariant(points.length >= 2, "Freepath outline must have at least 2 points");
-
-  return points.slice(2).reduce(
-    (acc, curr) => {
-      acc.push(
-        lineSegment<GlobalPoint>(
-          acc[acc.length - 1][1],
-          pointRotateRads(
-            pointFrom<GlobalPoint>(curr[0] + element.x, curr[1] + element.y),
-            center,
-            element.angle,
-          ),
-        ),
-      );
-      return acc;
-    },
-    [
-      lineSegment<GlobalPoint>(
-        pointRotateRads(
-          pointFrom<GlobalPoint>(
-            points[0][0] + element.x,
-            points[0][1] + element.y,
-          ),
-          center,
-          element.angle,
-        ),
-        pointRotateRads(
-          pointFrom<GlobalPoint>(
-            points[1][0] + element.x,
-            points[1][1] + element.y,
-          ),
-          center,
-          element.angle,
-        ),
-      ),
-    ],
-  );
-}
-
-export function getFreedrawOutlinePoints(element: ExcalidrawFreeDrawElement) {
  // If input points are empty (should they ever be?) return a dot
  const inputPoints = element.simulatePressure
    ? element.points
@@ -1125,7 +1057,7 @@ export function getFreedrawOutlinePoints(element: ExcalidrawFreeDrawElement) {
    last: !!element.lastCommittedPoint, // LastCommittedPoint is added on pointerup
  };

-  return getStroke(inputPoints as number[][], options) as [number, number][];
+  return getSvgPathFromStroke(getStroke(inputPoints as number[][], options));
 }

 function med(A: number[], B: number[]) {
@@ -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(
-        element,
-        textElement,
-        scene.getNonDeletedElementsMap(),
-      );
-      scene.mutateElement(textElement, {
-        angle,
-        x,
-        y,
-      });
+      scene.mutateElement(textElement, { angle });
    }
  }
 };
@@ -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,
-          y,
+          x: boundText.x + (rotatedCX - cx),
+          y: boundText.y + (rotatedCY - cy),
          angle: normalizeRadians((centerAngle + origAngle) as Radians),
        });
      }
@@ -5,20 +5,17 @@ import {
  type Radians,
 } from "@excalidraw/math";

-import {
-  SIDE_RESIZING_THRESHOLD,
-  type EditorInterface,
-} from "@excalidraw/common";
+import { SIDE_RESIZING_THRESHOLD } from "@excalidraw/common";

 import type { GlobalPoint, LineSegment, LocalPoint } from "@excalidraw/math";

-import type { AppState, Zoom } from "@excalidraw/excalidraw/types";
+import type { AppState, Device, Zoom } from "@excalidraw/excalidraw/types";

 import { getElementAbsoluteCoords } from "./bounds";
 import {
  getTransformHandlesFromCoords,
  getTransformHandles,
-  getOmitSidesForEditorInterface,
+  getOmitSidesForDevice,
  canResizeFromSides,
 } from "./transformHandles";
 import { isImageElement, isLinearElement } from "./typeChecks";
@@ -54,7 +51,7 @@ export const resizeTest = <Point extends GlobalPoint | LocalPoint>(
  y: number,
  zoom: Zoom,
  pointerType: PointerType,
-  editorInterface: EditorInterface,
+  device: Device,
 ): MaybeTransformHandleType => {
  if (!appState.selectedElementIds[element.id]) {
    return false;
@@ -66,7 +63,7 @@ export const resizeTest = <Point extends GlobalPoint | LocalPoint>(
      zoom,
      elementsMap,
      pointerType,
-      getOmitSidesForEditorInterface(editorInterface),
+      getOmitSidesForDevice(device),
    );

  if (
@@ -89,7 +86,7 @@ export const resizeTest = <Point extends GlobalPoint | LocalPoint>(
    return filter[0] as TransformHandleType;
  }

-  if (canResizeFromSides(editorInterface)) {
+  if (canResizeFromSides(device)) {
    const [x1, y1, x2, y2, cx, cy] = getElementAbsoluteCoords(
      element,
      elementsMap,
@@ -135,7 +132,7 @@ export const getElementWithTransformHandleType = (
  zoom: Zoom,
  pointerType: PointerType,
  elementsMap: ElementsMap,
-  editorInterface: EditorInterface,
+  device: Device,
 ) => {
  return elements.reduce((result, element) => {
    if (result) {
@@ -149,7 +146,7 @@ export const getElementWithTransformHandleType = (
      scenePointerY,
      zoom,
      pointerType,
-      editorInterface,
+      device,
    );
    return transformHandleType ? { element, transformHandleType } : null;
  }, null as { element: NonDeletedExcalidrawElement; transformHandleType: MaybeTransformHandleType } | null);
@@ -163,14 +160,14 @@ export const getTransformHandleTypeFromCoords = <
  scenePointerY: number,
  zoom: Zoom,
  pointerType: PointerType,
-  editorInterface: EditorInterface,
+  device: Device,
 ): MaybeTransformHandleType => {
  const transformHandles = getTransformHandlesFromCoords(
    [x1, y1, x2, y2, (x1 + x2) / 2, (y1 + y2) / 2],
    0 as Radians,
    zoom,
    pointerType,
-    getOmitSidesForEditorInterface(editorInterface),
+    getOmitSidesForDevice(device),
  );

  const found = Object.keys(transformHandles).find((key) => {
@@ -186,7 +183,7 @@ export const getTransformHandleTypeFromCoords = <
    return found as MaybeTransformHandleType;
  }

-  if (canResizeFromSides(editorInterface)) {
+  if (canResizeFromSides(device)) {
    const cx = (x1 + x2) / 2;
    const cy = (y1 + y2) / 2;

@@ -76,9 +76,8 @@ type MicroActionsQueue = (() => void)[];
 * Store which captures the observed changes and emits them as `StoreIncrement` events.
 */
 export class Store {
-  // for internal use by history
+  // internally used by history
  public readonly onDurableIncrementEmitter = new Emitter<[DurableIncrement]>();
-  // for public use as part of onIncrement API
  public readonly onStoreIncrementEmitter = new Emitter<
    [DurableIncrement | EphemeralIncrement]
  >();
@@ -240,6 +239,7 @@ export class Store {
    if (!storeDelta.isEmpty()) {
      const increment = new DurableIncrement(storeChange, storeDelta);

+      // Notify listeners with the increment
      this.onDurableIncrementEmitter.trigger(increment);
      this.onStoreIncrementEmitter.trigger(increment);
    }
@@ -552,26 +552,10 @@ export class StoreDelta {
  public static load({
    id,
    elements: { added, removed, updated },
-    appState: { delta: appStateDelta },
  }: DTO<StoreDelta>) {
    const elements = ElementsDelta.create(added, removed, updated);
-    const appState = AppStateDelta.create(appStateDelta);

-    return new this(id, elements, appState);
-  }
-
-  /**
-   * Squash the passed deltas into the aggregated delta instance.
-   */
-  public static squash(...deltas: StoreDelta[]) {
-    const aggregatedDelta = StoreDelta.empty();
-
-    for (const delta of deltas) {
-      aggregatedDelta.elements.squash(delta.elements);
-      aggregatedDelta.appState.squash(delta.appState);
-    }
-
-    return aggregatedDelta;
+    return new this(id, elements, AppStateDelta.empty());
  }

  /**
@@ -588,7 +572,9 @@ export class StoreDelta {
    delta: StoreDelta,
    elements: SceneElementsMap,
    appState: AppState,
-    options?: ApplyToOptions,
+    options: ApplyToOptions = {
+      excludedProperties: new Set(),
+    },
  ): [SceneElementsMap, AppState, boolean] {
    const [nextElements, elementsContainVisibleChange] = delta.elements.applyTo(
      elements,
@@ -627,10 +613,6 @@ export class StoreDelta {
    );
  }

-  public static empty() {
-    return StoreDelta.create(ElementsDelta.empty(), AppStateDelta.empty());
-  }
-
  public isEmpty() {
    return this.elements.isEmpty() && this.appState.isEmpty();
  }
@@ -996,7 +978,8 @@ const getDefaultObservedAppState = (): ObservedAppState => {
    viewBackgroundColor: COLOR_PALETTE.white,
    selectedElementIds: {},
    selectedGroupIds: {},
-    selectedLinearElement: null,
+    selectedLinearElementId: null,
+    selectedLinearElementIsEditing: null,
    croppingElementId: null,
    activeLockedId: null,
    lockedMultiSelections: {},
@@ -1015,12 +998,14 @@ export const getObservedAppState = (
    croppingElementId: appState.croppingElementId,
    activeLockedId: appState.activeLockedId,
    lockedMultiSelections: appState.lockedMultiSelections,
-    selectedLinearElement: appState.selectedLinearElement
-      ? {
-          elementId: appState.selectedLinearElement.elementId,
-          isEditing: !!appState.selectedLinearElement.isEditing,
-        }
-      : null,
+    selectedLinearElementId:
+      (appState as AppState).selectedLinearElement?.elementId ??
+      (appState as ObservedAppState).selectedLinearElementId ??
+      null,
+    selectedLinearElementIsEditing:
+      (appState as AppState).selectedLinearElement?.isEditing ??
+      (appState as ObservedAppState).selectedLinearElementIsEditing ??
+      null,
  };

  Reflect.defineProperty(observedAppState, hiddenObservedAppStateProp, {
@@ -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 };
 };

@@ -1,6 +1,7 @@
 import {
  DEFAULT_TRANSFORM_HANDLE_SPACING,
-  type EditorInterface,
+  isAndroid,
+  isIOS,
 } from "@excalidraw/common";

 import { pointFrom, pointRotateRads } from "@excalidraw/math";
@@ -8,6 +9,7 @@ import { pointFrom, pointRotateRads } from "@excalidraw/math";
 import type { Radians } from "@excalidraw/math";

 import type {
+  Device,
  InteractiveCanvasAppState,
  Zoom,
 } from "@excalidraw/excalidraw/types";
@@ -109,21 +111,20 @@ const generateTransformHandle = (
  return [xx - width / 2, yy - height / 2, width, height];
 };

-export const canResizeFromSides = (editorInterface: EditorInterface) => {
-  if (
-    editorInterface.formFactor === "phone" &&
-    editorInterface.userAgent.isMobileDevice
-  ) {
+export const canResizeFromSides = (device: Device) => {
+  if (device.viewport.isMobile) {
+    return false;
+  }
+
+  if (device.isTouchScreen && (isAndroid || isIOS)) {
    return false;
  }

  return true;
 };

-export const getOmitSidesForEditorInterface = (
-  editorInterface: EditorInterface,
-) => {
-  if (canResizeFromSides(editorInterface)) {
+export const getOmitSidesForDevice = (device: Device) => {
+  if (canResizeFromSides(device)) {
    return DEFAULT_OMIT_SIDES;
  }

@@ -325,10 +326,9 @@ export const getTransformHandles = (
  );
 };

-export const hasBoundingBox = (
+export const shouldShowBoundingBox = (
  elements: readonly NonDeletedExcalidrawElement[],
  appState: InteractiveCanvasAppState,
-  editorInterface: EditorInterface,
 ) => {
  if (appState.selectedLinearElement?.isEditing) {
    return false;
@@ -345,7 +345,5 @@ export const hasBoundingBox = (
    return true;
  }

-  // on mobile/tablet we currently don't show bbox because of resize issues
-  // (also prob best for simplicity's sake)
-  return element.points.length > 2 && !editorInterface.userAgent.isMobileDevice;
+  return element.points.length > 2;
 };
@@ -10,8 +10,6 @@ import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 import { UI, Pointer, Keyboard } from "@excalidraw/excalidraw/tests/helpers/ui";
 import { fireEvent, render } from "@excalidraw/excalidraw/tests/test-utils";

-import { LinearElementEditor } from "@excalidraw/element";
-
 import { getTransformHandles } from "../src/transformHandles";
 import {
  getTextEditor,
@@ -415,12 +413,16 @@ describe("element binding", () => {
    expect(arrow.endBinding?.elementId).toBe(rectRight.id);

    // Drag arrow off of bound rectangle range
-    const [elX, elY] = LinearElementEditor.getPointAtIndexGlobalCoordinates(
+    const handles = getTransformHandles(
      arrow,
-      -1,
-      h.scene.getNonDeletedElementsMap(),
-    );
+      h.state.zoom,
+      arrayToMap(h.elements),
+      "mouse",
+    ).se!;
+
    Keyboard.keyDown(KEYS.CTRL_OR_CMD);
+    const elX = handles[0] + handles[2] / 2;
+    const elY = handles[1] + handles[3] / 2;
    mouse.downAt(elX, elY);
    mouse.moveTo(300, 400);
    mouse.up();
@@ -1,345 +1,13 @@
-import { API } from "@excalidraw/excalidraw/tests/helpers/api";
-
 import type { ObservedAppState } from "@excalidraw/excalidraw/types";
 import type { LinearElementEditor } from "@excalidraw/element";
-import type { SceneElementsMap } from "@excalidraw/element/types";

-import { AppStateDelta, Delta, ElementsDelta } from "../src/delta";
-
-describe("ElementsDelta", () => {
-  describe("elements delta calculation", () => {
-    it("should not throw when element gets removed but was already deleted", () => {
-      const element = API.createElement({
-        type: "rectangle",
-        x: 100,
-        y: 100,
-        isDeleted: true,
-      });
-
-      const prevElements = new Map([[element.id, element]]);
-      const nextElements = new Map();
-
-      expect(() =>
-        ElementsDelta.calculate(prevElements, nextElements),
-      ).not.toThrow();
-    });
-
-    it("should not throw when adding element as already deleted", () => {
-      const element = API.createElement({
-        type: "rectangle",
-        x: 100,
-        y: 100,
-        isDeleted: true,
-      });
-
-      const prevElements = new Map();
-      const nextElements = new Map([[element.id, element]]);
-
-      expect(() =>
-        ElementsDelta.calculate(prevElements, nextElements),
-      ).not.toThrow();
-    });
-
-    it("should create updated delta even when there is only version and versionNonce change", () => {
-      const baseElement = API.createElement({
-        type: "rectangle",
-        x: 100,
-        y: 100,
-        strokeColor: "#000000",
-        backgroundColor: "#ffffff",
-      });
-
-      const modifiedElement = {
-        ...baseElement,
-        version: baseElement.version + 1,
-        versionNonce: baseElement.versionNonce + 1,
-      };
-
-      // Create maps for the delta calculation
-      const prevElements = new Map([[baseElement.id, baseElement]]);
-      const nextElements = new Map([[modifiedElement.id, modifiedElement]]);
-
-      // Calculate the delta
-      const delta = ElementsDelta.calculate(
-        prevElements as SceneElementsMap,
-        nextElements as SceneElementsMap,
-      );
-
-      expect(delta).toEqual(
-        ElementsDelta.create(
-          {},
-          {},
-          {
-            [baseElement.id]: Delta.create(
-              {
-                version: baseElement.version,
-                versionNonce: baseElement.versionNonce,
-              },
-              {
-                version: baseElement.version + 1,
-                versionNonce: baseElement.versionNonce + 1,
-              },
-            ),
-          },
-        ),
-      );
-    });
-  });
-
-  describe("squash", () => {
-    it("should not squash when second delta is empty", () => {
-      const updatedDelta = Delta.create(
-        { x: 100, version: 1, versionNonce: 1 },
-        { x: 200, version: 2, versionNonce: 2 },
-      );
-
-      const elementsDelta1 = ElementsDelta.create(
-        {},
-        {},
-        { id1: updatedDelta },
-      );
-      const elementsDelta2 = ElementsDelta.empty();
-      const elementsDelta = elementsDelta1.squash(elementsDelta2);
-
-      expect(elementsDelta.isEmpty()).toBeFalsy();
-      expect(elementsDelta).toBe(elementsDelta1);
-      expect(elementsDelta.updated.id1).toBe(updatedDelta);
-    });
-
-    it("should squash mutually exclusive delta types", () => {
-      const addedDelta = Delta.create(
-        { x: 100, version: 1, versionNonce: 1, isDeleted: true },
-        { x: 200, version: 2, versionNonce: 2, isDeleted: false },
-      );
-
-      const removedDelta = Delta.create(
-        { x: 100, version: 1, versionNonce: 1, isDeleted: false },
-        { x: 200, version: 2, versionNonce: 2, isDeleted: true },
-      );
-
-      const updatedDelta = Delta.create(
-        { x: 100, version: 1, versionNonce: 1 },
-        { x: 200, version: 2, versionNonce: 2 },
-      );
-
-      const elementsDelta1 = ElementsDelta.create(
-        { id1: addedDelta },
-        { id2: removedDelta },
-        {},
-      );
-
-      const elementsDelta2 = ElementsDelta.create(
-        {},
-        {},
-        { id3: updatedDelta },
-      );
-
-      const elementsDelta = elementsDelta1.squash(elementsDelta2);
-
-      expect(elementsDelta.isEmpty()).toBeFalsy();
-      expect(elementsDelta).toBe(elementsDelta1);
-      expect(elementsDelta.added.id1).toBe(addedDelta);
-      expect(elementsDelta.removed.id2).toBe(removedDelta);
-      expect(elementsDelta.updated.id3).toBe(updatedDelta);
-    });
-
-    it("should squash the same delta types", () => {
-      const elementsDelta1 = ElementsDelta.create(
-        {
-          id1: Delta.create(
-            { x: 100, version: 1, versionNonce: 1, isDeleted: true },
-            { x: 200, version: 2, versionNonce: 2, isDeleted: false },
-          ),
-        },
-        {
-          id2: Delta.create(
-            { x: 100, version: 1, versionNonce: 1, isDeleted: false },
-            { x: 200, version: 2, versionNonce: 2, isDeleted: true },
-          ),
-        },
-        {
-          id3: Delta.create(
-            { x: 100, version: 1, versionNonce: 1 },
-            { x: 200, version: 2, versionNonce: 2 },
-          ),
-        },
-      );
-
-      const elementsDelta2 = ElementsDelta.create(
-        {
-          id1: Delta.create(
-            { y: 100, version: 2, versionNonce: 2, isDeleted: true },
-            { y: 200, version: 3, versionNonce: 3, isDeleted: false },
-          ),
-        },
-        {
-          id2: Delta.create(
-            { y: 100, version: 2, versionNonce: 2, isDeleted: false },
-            { y: 200, version: 3, versionNonce: 3, isDeleted: true },
-          ),
-        },
-        {
-          id3: Delta.create(
-            { y: 100, version: 2, versionNonce: 2 },
-            { y: 200, version: 3, versionNonce: 3 },
-          ),
-        },
-      );
-
-      const elementsDelta = elementsDelta1.squash(elementsDelta2);
-
-      expect(elementsDelta.isEmpty()).toBeFalsy();
-      expect(elementsDelta).toBe(elementsDelta1);
-      expect(elementsDelta.added.id1).toEqual(
-        Delta.create(
-          { x: 100, y: 100, version: 2, versionNonce: 2, isDeleted: true },
-          { x: 200, y: 200, version: 3, versionNonce: 3, isDeleted: false },
-        ),
-      );
-      expect(elementsDelta.removed.id2).toEqual(
-        Delta.create(
-          { x: 100, y: 100, version: 2, versionNonce: 2, isDeleted: false },
-          { x: 200, y: 200, version: 3, versionNonce: 3, isDeleted: true },
-        ),
-      );
-      expect(elementsDelta.updated.id3).toEqual(
-        Delta.create(
-          { x: 100, y: 100, version: 2, versionNonce: 2 },
-          { x: 200, y: 200, version: 3, versionNonce: 3 },
-        ),
-      );
-    });
-
-    it("should squash different delta types ", () => {
-      // id1: added   -> updated => added
-      // id2: removed -> added   => added
-      // id3: updated -> removed => removed
-      const elementsDelta1 = ElementsDelta.create(
-        {
-          id1: Delta.create(
-            { x: 100, version: 1, versionNonce: 1, isDeleted: true },
-            { x: 101, version: 2, versionNonce: 2, isDeleted: false },
-          ),
-        },
-        {
-          id2: Delta.create(
-            { x: 200, version: 1, versionNonce: 1, isDeleted: false },
-            { x: 201, version: 2, versionNonce: 2, isDeleted: true },
-          ),
-        },
-        {
-          id3: Delta.create(
-            { x: 300, version: 1, versionNonce: 1 },
-            { x: 301, version: 2, versionNonce: 2 },
-          ),
-        },
-      );
-
-      const elementsDelta2 = ElementsDelta.create(
-        {
-          id2: Delta.create(
-            { y: 200, version: 2, versionNonce: 2, isDeleted: true },
-            { y: 201, version: 3, versionNonce: 3, isDeleted: false },
-          ),
-        },
-        {
-          id3: Delta.create(
-            { y: 300, version: 2, versionNonce: 2, isDeleted: false },
-            { y: 301, version: 3, versionNonce: 3, isDeleted: true },
-          ),
-        },
-        {
-          id1: Delta.create(
-            { y: 100, version: 2, versionNonce: 2 },
-            { y: 101, version: 3, versionNonce: 3 },
-          ),
-        },
-      );
-
-      const elementsDelta = elementsDelta1.squash(elementsDelta2);
-
-      expect(elementsDelta.isEmpty()).toBeFalsy();
-      expect(elementsDelta).toBe(elementsDelta1);
-      expect(elementsDelta.added).toEqual({
-        id1: Delta.create(
-          { x: 100, y: 100, version: 2, versionNonce: 2, isDeleted: true },
-          { x: 101, y: 101, version: 3, versionNonce: 3, isDeleted: false },
-        ),
-        id2: Delta.create(
-          { x: 200, y: 200, version: 2, versionNonce: 2, isDeleted: true },
-          { x: 201, y: 201, version: 3, versionNonce: 3, isDeleted: false },
-        ),
-      });
-      expect(elementsDelta.removed).toEqual({
-        id3: Delta.create(
-          { x: 300, y: 300, version: 2, versionNonce: 2, isDeleted: false },
-          { x: 301, y: 301, version: 3, versionNonce: 3, isDeleted: true },
-        ),
-      });
-      expect(elementsDelta.updated).toEqual({});
-    });
-
-    it("should squash bound elements", () => {
-      const elementsDelta1 = ElementsDelta.create(
-        {},
-        {},
-        {
-          id1: Delta.create(
-            {
-              version: 1,
-              versionNonce: 1,
-              boundElements: [{ id: "t1", type: "text" }],
-            },
-            {
-              version: 2,
-              versionNonce: 2,
-              boundElements: [{ id: "t2", type: "text" }],
-            },
-          ),
-        },
-      );
-
-      const elementsDelta2 = ElementsDelta.create(
-        {},
-        {},
-        {
-          id1: Delta.create(
-            {
-              version: 2,
-              versionNonce: 2,
-              boundElements: [{ id: "a1", type: "arrow" }],
-            },
-            {
-              version: 3,
-              versionNonce: 3,
-              boundElements: [{ id: "a2", type: "arrow" }],
-            },
-          ),
-        },
-      );
-
-      const elementsDelta = elementsDelta1.squash(elementsDelta2);
-
-      expect(elementsDelta.updated.id1.deleted.boundElements).toEqual([
-        { id: "t1", type: "text" },
-        { id: "a1", type: "arrow" },
-      ]);
-      expect(elementsDelta.updated.id1.inserted.boundElements).toEqual([
-        { id: "t2", type: "text" },
-        { id: "a2", type: "arrow" },
-      ]);
-    });
-  });
-});
+import { AppStateDelta } from "../src/delta";

 describe("AppStateDelta", () => {
  describe("ensure stable delta properties order", () => {
    it("should maintain stable order for root properties", () => {
      const name = "untitled scene";
-      const selectedLinearElement = {
-        elementId: "id1" as LinearElementEditor["elementId"],
-        isEditing: false,
-      };
+      const selectedLinearElementId = "id1" as LinearElementEditor["elementId"];

      const commonAppState = {
        viewBackgroundColor: "#ffffff",
@@ -356,23 +24,23 @@ describe("AppStateDelta", () => {
      const prevAppState1: ObservedAppState = {
        ...commonAppState,
        name: "",
-        selectedLinearElement: null,
+        selectedLinearElementId: null,
      };

      const nextAppState1: ObservedAppState = {
        ...commonAppState,
        name,
-        selectedLinearElement,
+        selectedLinearElementId,
      };

      const prevAppState2: ObservedAppState = {
-        selectedLinearElement: null,
+        selectedLinearElementId: null,
        name: "",
        ...commonAppState,
      };

      const nextAppState2: ObservedAppState = {
-        selectedLinearElement,
+        selectedLinearElementId,
        name,
        ...commonAppState,
      };
@@ -390,7 +58,9 @@ describe("AppStateDelta", () => {
        selectedGroupIds: {},
        editingGroupId: null,
        croppingElementId: null,
-        selectedLinearElement: null,
+        selectedLinearElementId: null,
+        selectedLinearElementIsEditing: null,
+        editingLinearElementId: null,
        activeLockedId: null,
        lockedMultiSelections: {},
      };
@@ -436,7 +106,9 @@ describe("AppStateDelta", () => {
        selectedElementIds: {},
        editingGroupId: null,
        croppingElementId: null,
-        selectedLinearElement: null,
+        selectedLinearElementId: null,
+        selectedLinearElementIsEditing: null,
+        editingLinearElementId: null,
        activeLockedId: null,
        lockedMultiSelections: {},
      };
@@ -477,97 +149,4 @@ describe("AppStateDelta", () => {
      expect(JSON.stringify(delta1)).toBe(JSON.stringify(delta2));
    });
  });
-
-  describe("squash", () => {
-    it("should not squash when second delta is empty", () => {
-      const delta = Delta.create(
-        { name: "untitled scene" },
-        { name: "titled scene" },
-      );
-
-      const appStateDelta1 = AppStateDelta.create(delta);
-      const appStateDelta2 = AppStateDelta.empty();
-      const appStateDelta = appStateDelta1.squash(appStateDelta2);
-
-      expect(appStateDelta.isEmpty()).toBeFalsy();
-      expect(appStateDelta).toBe(appStateDelta1);
-      expect(appStateDelta.delta).toBe(delta);
-    });
-
-    it("should squash exclusive properties", () => {
-      const delta1 = Delta.create(
-        { name: "untitled scene" },
-        { name: "titled scene" },
-      );
-      const delta2 = Delta.create(
-        { viewBackgroundColor: "#ffffff" },
-        { viewBackgroundColor: "#000000" },
-      );
-
-      const appStateDelta1 = AppStateDelta.create(delta1);
-      const appStateDelta2 = AppStateDelta.create(delta2);
-      const appStateDelta = appStateDelta1.squash(appStateDelta2);
-
-      expect(appStateDelta.isEmpty()).toBeFalsy();
-      expect(appStateDelta).toBe(appStateDelta1);
-      expect(appStateDelta.delta).toEqual(
-        Delta.create(
-          { name: "untitled scene", viewBackgroundColor: "#ffffff" },
-          { name: "titled scene", viewBackgroundColor: "#000000" },
-        ),
-      );
-    });
-
-    it("should squash selectedElementIds, selectedGroupIds and lockedMultiSelections", () => {
-      const delta1 = Delta.create<Partial<ObservedAppState>>(
-        {
-          name: "untitled scene",
-          selectedElementIds: { id1: true },
-          selectedGroupIds: {},
-          lockedMultiSelections: { g1: true },
-        },
-        {
-          name: "titled scene",
-          selectedElementIds: { id2: true },
-          selectedGroupIds: { g1: true },
-          lockedMultiSelections: {},
-        },
-      );
-      const delta2 = Delta.create<Partial<ObservedAppState>>(
-        {
-          selectedElementIds: { id3: true },
-          selectedGroupIds: { g1: true },
-          lockedMultiSelections: {},
-        },
-        {
-          selectedElementIds: { id2: true },
-          selectedGroupIds: { g2: true, g3: true },
-          lockedMultiSelections: { g3: true },
-        },
-      );
-
-      const appStateDelta1 = AppStateDelta.create(delta1);
-      const appStateDelta2 = AppStateDelta.create(delta2);
-      const appStateDelta = appStateDelta1.squash(appStateDelta2);
-
-      expect(appStateDelta.isEmpty()).toBeFalsy();
-      expect(appStateDelta).toBe(appStateDelta1);
-      expect(appStateDelta.delta).toEqual(
-        Delta.create<Partial<ObservedAppState>>(
-          {
-            name: "untitled scene",
-            selectedElementIds: { id1: true, id3: true },
-            selectedGroupIds: { g1: true },
-            lockedMultiSelections: { g1: true },
-          },
-          {
-            name: "titled scene",
-            selectedElementIds: { id2: true },
-            selectedGroupIds: { g1: true, g2: true, g3: true },
-            lockedMultiSelections: { g3: true },
-          },
-        ),
-      );
-    });
-  });
 });
@@ -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);
-    });
-  });
-});
@@ -4,7 +4,7 @@ import { isFrameLikeElement } from "@excalidraw/element";

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

-import { KEYS, arrayToMap } from "@excalidraw/common";
+import { KEYS, arrayToMap, getShortcutKey } from "@excalidraw/common";

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

@@ -30,8 +30,6 @@ import { t } from "../i18n";

 import { isSomeElementSelected } from "../scene";

-import { getShortcutKey } from "../shortcut";
-
 import { register } from "./register";

 import type { AppClassProperties, AppState, UIAppState } from "../types";
@@ -8,7 +8,6 @@ import {
 } from "@excalidraw/common";
 import {
  getOriginalContainerHeightFromCache,
-  isBoundToContainer,
  resetOriginalContainerCache,
  updateOriginalContainerCache,
 } from "@excalidraw/element";
@@ -226,9 +225,7 @@ export const actionWrapTextInContainer = register({
  trackEvent: { category: "element" },
  predicate: (elements, appState, _, app) => {
    const selectedElements = app.scene.getSelectedElements(appState);
-    const someTextElements = selectedElements.some(
-      (el) => isTextElement(el) && !isBoundToContainer(el),
-    );
+    const someTextElements = selectedElements.some((el) => isTextElement(el));
    return selectedElements.length > 0 && someTextElements;
  },
  perform: (elements, appState, _, app) => {
@@ -237,7 +234,7 @@ export const actionWrapTextInContainer = register({
    const containerIds: Mutable<AppState["selectedElementIds"]> = {};

    for (const textElement of selectedElements) {
-      if (isTextElement(textElement) && !isBoundToContainer(textElement)) {
+      if (isTextElement(textElement)) {
        const container = newElement({
          type: "rectangle",
          backgroundColor: appState.currentItemBackgroundColor,
@@ -7,6 +7,7 @@ import {
  MIN_ZOOM,
  THEME,
  ZOOM_STEP,
+  getShortcutKey,
  updateActiveTool,
  CODES,
  KEYS,
@@ -45,7 +46,6 @@ import { t } from "../i18n";
 import { getNormalizedZoom } from "../scene";
 import { centerScrollOn } from "../scene/scroll";
 import { getStateForZoom } from "../scene/zoom";
-import { getShortcutKey } from "../shortcut";

 import { register } from "./register";

@@ -69,7 +69,7 @@ export const actionChangeViewBackgroundColor = register({
        : CaptureUpdateAction.EVENTUALLY,
    };
  },
-  PanelComponent: ({ elements, appState, updateData, appProps, data }) => {
+  PanelComponent: ({ elements, appState, updateData, appProps }) => {
    // FIXME move me to src/components/mainMenu/DefaultItems.tsx
    return (
      <ColorPicker
@@ -121,10 +121,7 @@ export const actionClearCanvas = register({
        pasteDialog: appState.pasteDialog,
        activeTool:
          appState.activeTool.type === "image"
-            ? {
-                ...appState.activeTool,
-                type: app.state.preferredSelectionTool.type,
-              }
+            ? { ...appState.activeTool, type: "selection" }
            : appState.activeTool,
      },
      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
@@ -497,13 +494,13 @@ export const actionToggleEraserTool = register({
  name: "toggleEraserTool",
  label: "toolBar.eraser",
  trackEvent: { category: "toolbar" },
-  perform: (elements, appState, _, app) => {
+  perform: (elements, appState) => {
    let activeTool: AppState["activeTool"];

    if (isEraserActive(appState)) {
      activeTool = updateActiveTool(appState, {
        ...(appState.activeTool.lastActiveTool || {
-          type: app.state.preferredSelectionTool.type,
+          type: "selection",
        }),
        lastActiveToolBeforeEraser: null,
      });
@@ -533,9 +530,6 @@ export const actionToggleLassoTool = register({
  label: "toolBar.lasso",
  icon: LassoIcon,
  trackEvent: { category: "toolbar" },
-  predicate: (elements, appState, props, app) => {
-    return app.state.preferredSelectionTool.type !== "lasso";
-  },
  perform: (elements, appState, _, app) => {
    let activeTool: AppState["activeTool"];

@@ -1,8 +1,4 @@
-import {
-  KEYS,
-  MOBILE_ACTION_BUTTON_BG,
-  updateActiveTool,
-} from "@excalidraw/common";
+import { KEYS, updateActiveTool } from "@excalidraw/common";

 import { getNonDeletedElements } from "@excalidraw/element";
 import { fixBindingsAfterDeletion } from "@excalidraw/element";
@@ -30,8 +26,6 @@ import { getSelectedElements, isSomeElementSelected } from "../scene";
 import { TrashIcon } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";

-import { useStylesPanelMode } from "..";
-
 import { register } from "./register";

 import type { AppClassProperties, AppState } from "../types";
@@ -304,9 +298,7 @@ export const actionDeleteSelected = register({
      elements: nextElements,
      appState: {
        ...nextAppState,
-        activeTool: updateActiveTool(appState, {
-          type: app.state.preferredSelectionTool.type,
-        }),
+        activeTool: updateActiveTool(appState, { type: "selection" }),
        multiElement: null,
        activeEmbeddable: null,
        selectedLinearElement: null,
@@ -322,25 +314,14 @@ export const actionDeleteSelected = register({
  keyTest: (event, appState, elements) =>
    (event.key === KEYS.BACKSPACE || event.key === KEYS.DELETE) &&
    !event[KEYS.CTRL_OR_CMD],
-  PanelComponent: ({ elements, appState, updateData, app }) => {
-    const isMobile = useStylesPanelMode() === "mobile";
-
-    return (
-      <ToolButton
-        type="button"
-        icon={TrashIcon}
-        title={t("labels.delete")}
-        aria-label={t("labels.delete")}
-        onClick={() => updateData(null)}
-        disabled={
-          !isSomeElementSelected(getNonDeletedElements(elements), appState)
-        }
-        style={{
-          ...(isMobile && appState.openPopup !== "compactOtherProperties"
-            ? MOBILE_ACTION_BUTTON_BG
-            : {}),
-        }}
-      />
-    );
-  },
+  PanelComponent: ({ elements, appState, updateData }) => (
+    <ToolButton
+      type="button"
+      icon={TrashIcon}
+      title={t("labels.delete")}
+      aria-label={t("labels.delete")}
+      onClick={() => updateData(null)}
+      visible={isSomeElementSelected(getNonDeletedElements(elements), appState)}
+    />
+  ),
 });
@@ -2,7 +2,7 @@ import { getNonDeletedElements } from "@excalidraw/element";

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

-import { CODES, KEYS, arrayToMap } from "@excalidraw/common";
+import { CODES, KEYS, arrayToMap, getShortcutKey } from "@excalidraw/common";

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

@@ -26,8 +26,6 @@ import { t } from "../i18n";

 import { isSomeElementSelected } from "../scene";

-import { getShortcutKey } from "../shortcut";
-
 import { register } from "./register";

 import type { AppClassProperties, AppState } from "../types";
@@ -1,8 +1,8 @@
 import {
  DEFAULT_GRID_SIZE,
  KEYS,
-  MOBILE_ACTION_BUTTON_BG,
  arrayToMap,
+  getShortcutKey,
 } from "@excalidraw/common";

 import { getNonDeletedElements } from "@excalidraw/element";
@@ -25,9 +25,6 @@ import { DuplicateIcon } from "../components/icons";

 import { t } from "../i18n";
 import { isSomeElementSelected } from "../scene";
-import { getShortcutKey } from "../shortcut";
-
-import { useStylesPanelMode } from "..";

 import { register } from "./register";

@@ -109,27 +106,16 @@ export const actionDuplicateSelection = register({
    };
  },
  keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === KEYS.D,
-  PanelComponent: ({ elements, appState, updateData, app }) => {
-    const isMobile = useStylesPanelMode() === "mobile";
-
-    return (
-      <ToolButton
-        type="button"
-        icon={DuplicateIcon}
-        title={`${t("labels.duplicateSelection")} — ${getShortcutKey(
-          "CtrlOrCmd+D",
-        )}`}
-        aria-label={t("labels.duplicateSelection")}
-        onClick={() => updateData(null)}
-        disabled={
-          !isSomeElementSelected(getNonDeletedElements(elements), appState)
-        }
-        style={{
-          ...(isMobile && appState.openPopup !== "compactOtherProperties"
-            ? MOBILE_ACTION_BUTTON_BG
-            : {}),
-        }}
-      />
-    );
-  },
+  PanelComponent: ({ elements, appState, updateData }) => (
+    <ToolButton
+      type="button"
+      icon={DuplicateIcon}
+      title={`${t("labels.duplicateSelection")} — ${getShortcutKey(
+        "CtrlOrCmd+D",
+      )}`}
+      aria-label={t("labels.duplicateSelection")}
+      onClick={() => updateData(null)}
+      visible={isSomeElementSelected(getNonDeletedElements(elements), appState)}
+    />
+  ),
 });
@@ -11,7 +11,7 @@ import { CaptureUpdateAction } from "@excalidraw/element";

 import type { Theme } from "@excalidraw/element/types";

-import { useEditorInterface } from "../components/App";
+import { useDevice } from "../components/App";
 import { CheckboxItem } from "../components/CheckboxItem";
 import { DarkModeToggle } from "../components/DarkModeToggle";
 import { ProjectName } from "../components/ProjectName";
@@ -242,7 +242,7 @@ export const actionSaveFileToDisk = register({
      icon={saveAs}
      title={t("buttons.saveAs")}
      aria-label={t("buttons.saveAs")}
-      showAriaLabel={useEditorInterface().formFactor === "phone"}
+      showAriaLabel={useDevice().editor.isMobile}
      hidden={!nativeFileSystemSupported}
      onClick={() => updateData(null)}
      data-testid="save-as-button"
@@ -5,11 +5,7 @@ import {
  bindOrUnbindLinearElement,
  isBindingEnabled,
 } from "@excalidraw/element/binding";
-import {
-  isValidPolygon,
-  LinearElementEditor,
-  newElementWith,
-} from "@excalidraw/element";
+import { isValidPolygon, LinearElementEditor } from "@excalidraw/element";

 import {
  isBindingElement,
@@ -82,14 +78,7 @@ export const actionFinalize = register({
        let newElements = elements;
        if (element && isInvisiblySmallElement(element)) {
          // TODO: #7348 in theory this gets recorded by the store, so the invisible elements could be restored by the undo/redo, which might be not what we would want
-          newElements = newElements.map((el) => {
-            if (el.id === element.id) {
-              return newElementWith(el, {
-                isDeleted: true,
-              });
-            }
-            return el;
-          });
+          newElements = newElements.filter((el) => el.id !== element!.id);
        }
        return {
          elements: newElements,
@@ -128,12 +117,7 @@ export const actionFinalize = register({
        return {
          elements:
            element.points.length < 2 || isInvisiblySmallElement(element)
-              ? elements.map((el) => {
-                  if (el.id === element.id) {
-                    return newElementWith(el, { isDeleted: true });
-                  }
-                  return el;
-                })
+              ? elements.filter((el) => el.id !== element.id)
              : undefined,
          appState: {
            ...appState,
@@ -188,12 +172,7 @@ export const actionFinalize = register({

      if (element && isInvisiblySmallElement(element)) {
        // TODO: #7348 in theory this gets recorded by the store, so the invisible elements could be restored by the undo/redo, which might be not what we would want
-        newElements = newElements.map((el) => {
-          if (el.id === element?.id) {
-            return newElementWith(el, { isDeleted: true });
-          }
-          return el;
-        });
+        newElements = newElements.filter((el) => el.id !== element!.id);
      }

      if (isLinearElement(element) || isFreeDrawElement(element)) {
@@ -261,13 +240,13 @@ export const actionFinalize = register({
    if (appState.activeTool.type === "eraser") {
      activeTool = updateActiveTool(appState, {
        ...(appState.activeTool.lastActiveTool || {
-          type: app.state.preferredSelectionTool.type,
+          type: "selection",
        }),
        lastActiveToolBeforeEraser: null,
      });
    } else {
      activeTool = updateActiveTool(appState, {
-        type: app.state.preferredSelectionTool.type,
+        type: "selection",
      });
    }

@@ -14,7 +14,7 @@ import {
  replaceAllElementsInFrame,
 } from "@excalidraw/element";

-import { KEYS, randomId, arrayToMap } from "@excalidraw/common";
+import { KEYS, randomId, arrayToMap, getShortcutKey } from "@excalidraw/common";

 import {
  getSelectedGroupIds,
@@ -43,8 +43,6 @@ import { t } from "../i18n";

 import { isSomeElementSelected } from "../scene";

-import { getShortcutKey } from "../shortcut";
-
 import { register } from "./register";

 import type { AppClassProperties, AppState } from "../types";
@@ -1,10 +1,4 @@
-import {
-  isWindows,
-  KEYS,
-  matchKey,
-  arrayToMap,
-  MOBILE_ACTION_BUTTON_BG,
-} from "@excalidraw/common";
+import { isWindows, KEYS, matchKey, arrayToMap } from "@excalidraw/common";

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

@@ -18,8 +12,6 @@ import { HistoryChangedEvent } from "../history";
 import { useEmitter } from "../hooks/useEmitter";
 import { t } from "../i18n";

-import { useStylesPanelMode } from "..";
-
 import type { History } from "../history";
 import type { AppClassProperties, AppState } from "../types";
 import type { Action, ActionResult } from "./types";
@@ -75,7 +67,7 @@ export const createUndoAction: ActionCreator = (history) => ({
    ),
  keyTest: (event) =>
    event[KEYS.CTRL_OR_CMD] && matchKey(event, KEYS.Z) && !event.shiftKey,
-  PanelComponent: ({ appState, updateData, data, app }) => {
+  PanelComponent: ({ updateData, data }) => {
    const { isUndoStackEmpty } = useEmitter<HistoryChangedEvent>(
      history.onHistoryChangedEmitter,
      new HistoryChangedEvent(
@@ -83,7 +75,6 @@ export const createUndoAction: ActionCreator = (history) => ({
        history.isRedoStackEmpty,
      ),
    );
-    const isMobile = useStylesPanelMode() === "mobile";

    return (
      <ToolButton
@@ -94,9 +85,6 @@ export const createUndoAction: ActionCreator = (history) => ({
        size={data?.size || "medium"}
        disabled={isUndoStackEmpty}
        data-testid="button-undo"
-        style={{
-          ...(isMobile ? MOBILE_ACTION_BUTTON_BG : {}),
-        }}
      />
    );
  },
@@ -115,7 +103,7 @@ export const createRedoAction: ActionCreator = (history) => ({
  keyTest: (event) =>
    (event[KEYS.CTRL_OR_CMD] && event.shiftKey && matchKey(event, KEYS.Z)) ||
    (isWindows && event.ctrlKey && !event.shiftKey && matchKey(event, KEYS.Y)),
-  PanelComponent: ({ appState, updateData, data, app }) => {
+  PanelComponent: ({ updateData, data }) => {
    const { isRedoStackEmpty } = useEmitter(
      history.onHistoryChangedEmitter,
      new HistoryChangedEvent(
@@ -123,7 +111,6 @@ export const createRedoAction: ActionCreator = (history) => ({
        history.isRedoStackEmpty,
      ),
    );
-    const isMobile = useStylesPanelMode() === "mobile";

    return (
      <ToolButton
@@ -134,9 +121,6 @@ export const createRedoAction: ActionCreator = (history) => ({
        size={data?.size || "medium"}
        disabled={isRedoStackEmpty}
        data-testid="button-redo"
-        style={{
-          ...(isMobile ? MOBILE_ACTION_BUTTON_BG : {}),
-        }}
      />
    );
  },
@@ -88,10 +88,6 @@ export const actionToggleLinearEditor = register({
      selectedElementIds: appState.selectedElementIds,
    })[0] as ExcalidrawLinearElement;

-    if (!selectedElement) {
-      return null;
-    }
-
    const label = t(
      selectedElement.type === "arrow"
        ? "labels.lineEditor.editArrow"
@@ -1,6 +1,6 @@
 import { isEmbeddableElement } from "@excalidraw/element";

-import { KEYS } from "@excalidraw/common";
+import { KEYS, getShortcutKey } from "@excalidraw/common";

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

@@ -8,8 +8,8 @@ import { ToolButton } from "../components/ToolButton";
 import { getContextMenuLabel } from "../components/hyperlink/Hyperlink";
 import { LinkIcon } from "../components/icons";
 import { t } from "../i18n";
+
 import { getSelectedElements } from "../scene";
-import { getShortcutKey } from "../shortcut";

 import { register } from "./register";

@@ -1,11 +1,65 @@
 import { KEYS } from "@excalidraw/common";

+import { getNonDeletedElements } from "@excalidraw/element";
+
+import { showSelectedShapeActions } from "@excalidraw/element";
+
 import { CaptureUpdateAction } from "@excalidraw/element";

-import { HelpIconThin } from "../components/icons";
+import { ToolButton } from "../components/ToolButton";
+import { HamburgerMenuIcon, HelpIconThin, palette } from "../components/icons";
+import { t } from "../i18n";

 import { register } from "./register";

+export const actionToggleCanvasMenu = register({
+  name: "toggleCanvasMenu",
+  label: "buttons.menu",
+  trackEvent: { category: "menu" },
+  perform: (_, appState) => ({
+    appState: {
+      ...appState,
+      openMenu: appState.openMenu === "canvas" ? null : "canvas",
+    },
+    captureUpdate: CaptureUpdateAction.EVENTUALLY,
+  }),
+  PanelComponent: ({ appState, updateData }) => (
+    <ToolButton
+      type="button"
+      icon={HamburgerMenuIcon}
+      aria-label={t("buttons.menu")}
+      onClick={updateData}
+      selected={appState.openMenu === "canvas"}
+    />
+  ),
+});
+
+export const actionToggleEditMenu = register({
+  name: "toggleEditMenu",
+  label: "buttons.edit",
+  trackEvent: { category: "menu" },
+  perform: (_elements, appState) => ({
+    appState: {
+      ...appState,
+      openMenu: appState.openMenu === "shape" ? null : "shape",
+    },
+    captureUpdate: CaptureUpdateAction.EVENTUALLY,
+  }),
+  PanelComponent: ({ elements, appState, updateData }) => (
+    <ToolButton
+      visible={showSelectedShapeActions(
+        appState,
+        getNonDeletedElements(elements),
+      )}
+      type="button"
+      icon={palette}
+      aria-label={t("buttons.edit")}
+      onClick={updateData}
+      selected={appState.openMenu === "shape"}
+    />
+  ),
+});
+
 export const actionShortcuts = register({
  name: "toggleShortcuts",
  label: "welcomeScreen.defaults.helpHint",
@@ -25,8 +79,6 @@ export const actionShortcuts = register({
            : {
                name: "help",
              },
-        openMenu: null,
-        openPopup: null,
      },
      captureUpdate: CaptureUpdateAction.EVENTUALLY,
    };
@@ -17,6 +17,7 @@ import {
  randomInteger,
  arrayToMap,
  getFontFamilyString,
+  getShortcutKey,
  getLineHeight,
  isTransparent,
  reduceToCommonValue,
@@ -57,8 +58,6 @@ import {
  toggleLinePolygonState,
 } from "@excalidraw/element";

-import { deriveStylesPanelMode } from "@excalidraw/common";
-
 import type { LocalPoint } from "@excalidraw/math";

 import type {
@@ -82,6 +81,9 @@ import { RadioSelection } from "../components/RadioSelection";
 import { ColorPicker } from "../components/ColorPicker/ColorPicker";
 import { FontPicker } from "../components/FontPicker/FontPicker";
 import { IconPicker } from "../components/IconPicker";
+// TODO barnabasmolnar/editor-redesign
+// TextAlignTopIcon, TextAlignBottomIcon,TextAlignMiddleIcon,
+// ArrowHead icons
 import { Range } from "../components/Range";
 import {
  ArrowheadArrowIcon,
@@ -135,28 +137,12 @@ import {
  isSomeElementSelected,
 } from "../scene";

-import {
-  withCaretPositionPreservation,
-  restoreCaretPosition,
-} from "../hooks/useTextEditorFocus";
-
-import { getShortcutKey } from "../shortcut";
-
 import { register } from "./register";

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

 const FONT_SIZE_RELATIVE_INCREASE_STEP = 0.1;

-const getStylesPanelInfo = (app: AppClassProperties) => {
-  const stylesPanelMode = deriveStylesPanelMode(app.editorInterface);
-  return {
-    stylesPanelMode,
-    isCompact: stylesPanelMode !== "full",
-    isMobile: stylesPanelMode === "mobile",
-  } as const;
-};
-
 export const changeProperty = (
  elements: readonly ExcalidrawElement[],
  appState: AppState,
@@ -335,35 +321,29 @@ export const actionChangeStrokeColor = register({
        : CaptureUpdateAction.EVENTUALLY,
    };
  },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => {
-    const { stylesPanelMode } = getStylesPanelInfo(app);
-
-    return (
-      <>
-        {stylesPanelMode === "full" && (
-          <h3 aria-hidden="true">{t("labels.stroke")}</h3>
+  PanelComponent: ({ elements, appState, updateData, app }) => (
+    <>
+      <h3 aria-hidden="true">{t("labels.stroke")}</h3>
+      <ColorPicker
+        topPicks={DEFAULT_ELEMENT_STROKE_PICKS}
+        palette={DEFAULT_ELEMENT_STROKE_COLOR_PALETTE}
+        type="elementStroke"
+        label={t("labels.stroke")}
+        color={getFormValue(
+          elements,
+          app,
+          (element) => element.strokeColor,
+          true,
+          (hasSelection) =>
+            !hasSelection ? appState.currentItemStrokeColor : null,
        )}
-        <ColorPicker
-          topPicks={DEFAULT_ELEMENT_STROKE_PICKS}
-          palette={DEFAULT_ELEMENT_STROKE_COLOR_PALETTE}
-          type="elementStroke"
-          label={t("labels.stroke")}
-          color={getFormValue(
-            elements,
-            app,
-            (element) => element.strokeColor,
-            true,
-            (hasSelection) =>
-              !hasSelection ? appState.currentItemStrokeColor : null,
-          )}
-          onChange={(color) => updateData({ currentItemStrokeColor: color })}
-          elements={elements}
-          appState={appState}
-          updateData={updateData}
-        />
-      </>
-    );
-  },
+        onChange={(color) => updateData({ currentItemStrokeColor: color })}
+        elements={elements}
+        appState={appState}
+        updateData={updateData}
+      />
+    </>
+  ),
 });

 export const actionChangeBackgroundColor = register({
@@ -418,37 +398,29 @@ export const actionChangeBackgroundColor = register({
      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
    };
  },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => {
-    const { stylesPanelMode } = getStylesPanelInfo(app);
-
-    return (
-      <>
-        {stylesPanelMode === "full" && (
-          <h3 aria-hidden="true">{t("labels.background")}</h3>
+  PanelComponent: ({ elements, appState, updateData, app }) => (
+    <>
+      <h3 aria-hidden="true">{t("labels.background")}</h3>
+      <ColorPicker
+        topPicks={DEFAULT_ELEMENT_BACKGROUND_PICKS}
+        palette={DEFAULT_ELEMENT_BACKGROUND_COLOR_PALETTE}
+        type="elementBackground"
+        label={t("labels.background")}
+        color={getFormValue(
+          elements,
+          app,
+          (element) => element.backgroundColor,
+          true,
+          (hasSelection) =>
+            !hasSelection ? appState.currentItemBackgroundColor : null,
        )}
-        <ColorPicker
-          topPicks={DEFAULT_ELEMENT_BACKGROUND_PICKS}
-          palette={DEFAULT_ELEMENT_BACKGROUND_COLOR_PALETTE}
-          type="elementBackground"
-          label={t("labels.background")}
-          color={getFormValue(
-            elements,
-            app,
-            (element) => element.backgroundColor,
-            true,
-            (hasSelection) =>
-              !hasSelection ? appState.currentItemBackgroundColor : null,
-          )}
-          onChange={(color) =>
-            updateData({ currentItemBackgroundColor: color })
-          }
-          elements={elements}
-          appState={appState}
-          updateData={updateData}
-        />
-      </>
-    );
-  },
+        onChange={(color) => updateData({ currentItemBackgroundColor: color })}
+        elements={elements}
+        appState={appState}
+        updateData={updateData}
+      />
+    </>
+  ),
 });

 export const actionChangeFillStyle = register({
@@ -459,9 +431,7 @@ export const actionChangeFillStyle = register({
    trackEvent(
      "element",
      "changeFillStyle",
-      `${value} (${
-        app.editorInterface.formFactor === "phone" ? "mobile" : "desktop"
-      })`,
+      `${value} (${app.device.editor.isMobile ? "mobile" : "desktop"})`,
    );
    return {
      elements: changeProperty(elements, appState, (el) =>
@@ -548,7 +518,7 @@ export const actionChangeStrokeWidth = register({
      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
    };
  },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => (
+  PanelComponent: ({ elements, appState, updateData, app }) => (
    <fieldset>
      <legend>{t("labels.strokeWidth")}</legend>
      <div className="buttonList">
@@ -605,7 +575,7 @@ export const actionChangeSloppiness = register({
      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
    };
  },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => (
+  PanelComponent: ({ elements, appState, updateData, app }) => (
    <fieldset>
      <legend>{t("labels.sloppiness")}</legend>
      <div className="buttonList">
@@ -658,7 +628,7 @@ export const actionChangeStrokeStyle = register({
      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
    };
  },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => (
+  PanelComponent: ({ elements, appState, updateData, app }) => (
    <fieldset>
      <legend>{t("labels.strokeStyle")}</legend>
      <div className="buttonList">
@@ -727,81 +697,70 @@ export const actionChangeFontSize = register({
  perform: (elements, appState, value, app) => {
    return changeFontSize(elements, appState, app, () => value, value);
  },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => {
-    const { isCompact } = getStylesPanelInfo(app);
-
-    return (
-      <fieldset>
-        <legend>{t("labels.fontSize")}</legend>
-        <div className="buttonList">
-          <RadioSelection
-            group="font-size"
-            options={[
-              {
-                value: 16,
-                text: t("labels.small"),
-                icon: FontSizeSmallIcon,
-                testId: "fontSize-small",
-              },
-              {
-                value: 20,
-                text: t("labels.medium"),
-                icon: FontSizeMediumIcon,
-                testId: "fontSize-medium",
-              },
-              {
-                value: 28,
-                text: t("labels.large"),
-                icon: FontSizeLargeIcon,
-                testId: "fontSize-large",
-              },
-              {
-                value: 36,
-                text: t("labels.veryLarge"),
-                icon: FontSizeExtraLargeIcon,
-                testId: "fontSize-veryLarge",
-              },
-            ]}
-            value={getFormValue(
-              elements,
-              app,
-              (element) => {
-                if (isTextElement(element)) {
-                  return element.fontSize;
-                }
-                const boundTextElement = getBoundTextElement(
-                  element,
-                  app.scene.getNonDeletedElementsMap(),
-                );
-                if (boundTextElement) {
-                  return boundTextElement.fontSize;
-                }
-                return null;
-              },
-              (element) =>
-                isTextElement(element) ||
-                getBoundTextElement(
-                  element,
-                  app.scene.getNonDeletedElementsMap(),
-                ) !== null,
-              (hasSelection) =>
-                hasSelection
-                  ? null
-                  : appState.currentItemFontSize || DEFAULT_FONT_SIZE,
-            )}
-            onChange={(value) => {
-              withCaretPositionPreservation(
-                () => updateData(value),
-                isCompact,
-                !!appState.editingTextElement,
-                data?.onPreventClose,
+  PanelComponent: ({ elements, appState, updateData, app }) => (
+    <fieldset>
+      <legend>{t("labels.fontSize")}</legend>
+      <div className="buttonList">
+        <RadioSelection
+          group="font-size"
+          options={[
+            {
+              value: 16,
+              text: t("labels.small"),
+              icon: FontSizeSmallIcon,
+              testId: "fontSize-small",
+            },
+            {
+              value: 20,
+              text: t("labels.medium"),
+              icon: FontSizeMediumIcon,
+              testId: "fontSize-medium",
+            },
+            {
+              value: 28,
+              text: t("labels.large"),
+              icon: FontSizeLargeIcon,
+              testId: "fontSize-large",
+            },
+            {
+              value: 36,
+              text: t("labels.veryLarge"),
+              icon: FontSizeExtraLargeIcon,
+              testId: "fontSize-veryLarge",
+            },
+          ]}
+          value={getFormValue(
+            elements,
+            app,
+            (element) => {
+              if (isTextElement(element)) {
+                return element.fontSize;
+              }
+              const boundTextElement = getBoundTextElement(
+                element,
+                app.scene.getNonDeletedElementsMap(),
              );
-            }}
-          />
-        </div>
-      </fieldset>
-    );
-  },
+              if (boundTextElement) {
+                return boundTextElement.fontSize;
+              }
+              return null;
+            },
+            (element) =>
+              isTextElement(element) ||
+              getBoundTextElement(
+                element,
+                app.scene.getNonDeletedElementsMap(),
+              ) !== null,
+            (hasSelection) =>
+              hasSelection
+                ? null
+                : appState.currentItemFontSize || DEFAULT_FONT_SIZE,
+          )}
+          onChange={(value) => updateData(value)}
+        />
+      </div>
+    </fieldset>
+  ),
 });

 export const actionDecreaseFontSize = register({
@@ -1063,7 +1022,6 @@ export const actionChangeFontFamily = register({
    // relying on state batching as multiple `FontPicker` handlers could be called in rapid succession and we want to combine them
    const [batchedData, setBatchedData] = useState<ChangeFontFamilyData>({});
    const isUnmounted = useRef(true);
-    const { stylesPanelMode, isCompact } = getStylesPanelInfo(app);

    const selectedFontFamily = useMemo(() => {
      const getFontFamily = (
@@ -1135,29 +1093,21 @@ export const actionChangeFontFamily = register({
    }, []);

    return (
-      <>
-        {stylesPanelMode === "full" && (
-          <legend>{t("labels.fontFamily")}</legend>
-        )}
+      <fieldset>
+        <legend>{t("labels.fontFamily")}</legend>
        <FontPicker
          isOpened={appState.openPopup === "fontFamily"}
          selectedFontFamily={selectedFontFamily}
          hoveredFontFamily={appState.currentHoveredFontFamily}
-          compactMode={stylesPanelMode !== "full"}
          onSelect={(fontFamily) => {
-            withCaretPositionPreservation(
-              () => {
-                setBatchedData({
-                  openPopup: null,
-                  currentHoveredFontFamily: null,
-                  currentItemFontFamily: fontFamily,
-                });
-                // defensive clear so immediate close won't abuse the cached elements
-                cachedElementsRef.current.clear();
-              },
-              isCompact,
-              !!appState.editingTextElement,
-            );
+            setBatchedData({
+              openPopup: null,
+              currentHoveredFontFamily: null,
+              currentItemFontFamily: fontFamily,
+            });
+
+            // defensive clear so immediate close won't abuse the cached elements
+            cachedElementsRef.current.clear();
          }}
          onHover={(fontFamily) => {
            setBatchedData({
@@ -1214,29 +1164,29 @@ export const actionChangeFontFamily = register({
              }

              setBatchedData({
-                ...batchedData,
                openPopup: "fontFamily",
              });
            } else {
-              const fontFamilyData = {
+              // close, use the cache and clear it afterwards
+              const data = {
+                openPopup: null,
                currentHoveredFontFamily: null,
                cachedElements: new Map(cachedElementsRef.current),
                resetAll: true,
              } as ChangeFontFamilyData;

-              setBatchedData({
-                ...fontFamilyData,
-              });
-              cachedElementsRef.current.clear();
-
-              // Refocus text editor when font picker closes if we were editing text
-              if (isCompact && appState.editingTextElement) {
-                restoreCaretPosition(null); // Just refocus without saved position
+              if (isUnmounted.current) {
+                // in case the component was unmounted by the parent, trigger the update directly
+                updateData({ ...batchedData, ...data });
+              } else {
+                setBatchedData(data);
              }
+
+              cachedElementsRef.current.clear();
            }
          }}
        />
-      </>
+      </fieldset>
    );
  },
 });
@@ -1275,10 +1225,8 @@ export const actionChangeTextAlign = register({
      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
    };
  },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => {
+  PanelComponent: ({ elements, appState, updateData, app }) => {
    const elementsMap = app.scene.getNonDeletedElementsMap();
-    const { isCompact } = getStylesPanelInfo(app);
-
    return (
      <fieldset>
        <legend>{t("labels.textAlign")}</legend>
@@ -1327,14 +1275,7 @@ export const actionChangeTextAlign = register({
              (hasSelection) =>
                hasSelection ? null : appState.currentItemTextAlign,
            )}
-            onChange={(value) => {
-              withCaretPositionPreservation(
-                () => updateData(value),
-                isCompact,
-                !!appState.editingTextElement,
-                data?.onPreventClose,
-              );
-            }}
+            onChange={(value) => updateData(value)}
          />
        </div>
      </fieldset>
@@ -1376,8 +1317,7 @@ export const actionChangeVerticalAlign = register({
      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
    };
  },
-  PanelComponent: ({ elements, appState, updateData, app, data }) => {
-    const { isCompact } = getStylesPanelInfo(app);
+  PanelComponent: ({ elements, appState, updateData, app }) => {
    return (
      <fieldset>
        <div className="buttonList">
@@ -1427,14 +1367,7 @@ export const actionChangeVerticalAlign = register({
                ) !== null,
              (hasSelection) => (hasSelection ? null : VERTICAL_ALIGN.MIDDLE),
            )}
-            onChange={(value) => {
-              withCaretPositionPreservation(
-                () => updateData(value),
-                isCompact,
-                !!appState.editingTextElement,
-                data?.onPreventClose,
-              );
-            }}
+            onChange={(value) => updateData(value)}
          />
        </div>
      </fieldset>
@@ -1683,25 +1616,6 @@ export const actionChangeArrowhead = register({
  },
 });

-export const actionChangeArrowProperties = register({
-  name: "changeArrowProperties",
-  label: "Change arrow properties",
-  trackEvent: false,
-  perform: (elements, appState, value, app) => {
-    // This action doesn't perform any changes directly
-    // It's just a container for the arrow type and arrowhead actions
-    return false;
-  },
-  PanelComponent: ({ elements, appState, updateData, app, renderAction }) => {
-    return (
-      <div className="selected-shape-actions">
-        {renderAction("changeArrowhead")}
-        {renderAction("changeArrowType")}
-      </div>
-    );
-  },
-});
-
 export const actionChangeArrowType = register({
  name: "changeArrowType",
  label: "Change arrow types",
@@ -25,11 +25,8 @@ export const actionToggleZenMode = register({
    };
  },
  checked: (appState) => appState.zenModeEnabled,
-  predicate: (elements, appState, appProps, app) => {
-    return (
-      app.editorInterface.formFactor !== "phone" &&
-      typeof appProps.zenModeEnabled === "undefined"
-    );
+  predicate: (elements, appState, appProps) => {
+    return typeof appProps.zenModeEnabled === "undefined";
  },
  keyTest: (event) =>
    !event[KEYS.CTRL_OR_CMD] && event.altKey && event.code === CODES.Z,
@@ -1,4 +1,4 @@
-import { KEYS, CODES, isDarwin } from "@excalidraw/common";
+import { KEYS, CODES, getShortcutKey, isDarwin } from "@excalidraw/common";

 import {
  moveOneLeft,
@@ -16,7 +16,6 @@ import {
  SendToBackIcon,
 } from "../components/icons";
 import { t } from "../i18n";
-import { getShortcutKey } from "../shortcut";

 import { register } from "./register";

@@ -18,7 +18,6 @@ export {
  actionChangeFontFamily,
  actionChangeTextAlign,
  actionChangeVerticalAlign,
-  actionChangeArrowProperties,
 } from "./actionProperties";

 export {
@@ -44,7 +43,11 @@ export {
 } from "./actionExport";

 export { actionCopyStyles, actionPasteStyles } from "./actionStyles";
-export { actionShortcuts } from "./actionMenu";
+export {
+  actionToggleCanvasMenu,
+  actionToggleEditMenu,
+  actionShortcuts,
+} from "./actionMenu";

 export { actionGroup, actionUngroup } from "./actionGroup";

@@ -37,9 +37,7 @@ const trackAction = (
          trackEvent(
            action.trackEvent.category,
            action.trackEvent.action || action.name,
-            `${source} (${
-              app.editorInterface.formFactor === "phone" ? "mobile" : "desktop"
-            })`,
+            `${source} (${app.device.editor.isMobile ? "mobile" : "desktop"})`,
          );
        }
      }
@@ -1,9 +1,8 @@
-import { isDarwin } from "@excalidraw/common";
+import { isDarwin, getShortcutKey } from "@excalidraw/common";

 import type { SubtypeOf } from "@excalidraw/common/utility-types";

 import { t } from "../i18n";
-import { getShortcutKey } from "../shortcut";

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

@@ -69,9 +69,10 @@ export type ActionName =
  | "changeStrokeStyle"
  | "changeArrowhead"
  | "changeArrowType"
-  | "changeArrowProperties"
  | "changeOpacity"
  | "changeFontSize"
+  | "toggleCanvasMenu"
+  | "toggleEditMenu"
  | "undo"
  | "redo"
  | "finalize"
@@ -55,10 +55,6 @@ export const getDefaultAppState = (): Omit<
      fromSelection: false,
      lastActiveTool: null,
    },
-    preferredSelectionTool: {
-      type: "selection",
-      initialized: false,
-    },
    penMode: false,
    penDetected: false,
    errorMessage: null,
@@ -179,7 +175,6 @@ const APP_STATE_STORAGE_CONF = (<
  editingTextElement: { browser: false, export: false, server: false },
  editingGroupId: { browser: true, export: false, server: false },
  activeTool: { browser: true, export: false, server: false },
-  preferredSelectionTool: { browser: true, export: false, server: false },
  penMode: { browser: true, export: false, server: false },
  penDetected: { browser: true, export: false, server: false },
  errorMessage: { browser: false, export: false, server: false },
@@ -1,7 +1,6 @@
 import {
  createPasteEvent,
  parseClipboard,
-  parseDataTransferEvent,
  serializeAsClipboardJSON,
 } from "./clipboard";
 import { API } from "./tests/helpers/api";
@@ -14,9 +13,7 @@ describe("parseClipboard()", () => {

    text = "123";
    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({ types: { "text/plain": text } }),
-      ),
+      createPasteEvent({ types: { "text/plain": text } }),
    );
    expect(clipboardData.text).toBe(text);

@@ -24,9 +21,7 @@ describe("parseClipboard()", () => {

    text = "[123]";
    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({ types: { "text/plain": text } }),
-      ),
+      createPasteEvent({ types: { "text/plain": text } }),
    );
    expect(clipboardData.text).toBe(text);

@@ -34,9 +29,7 @@ describe("parseClipboard()", () => {

    text = JSON.stringify({ val: 42 });
    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({ types: { "text/plain": text } }),
-      ),
+      createPasteEvent({ types: { "text/plain": text } }),
    );
    expect(clipboardData.text).toBe(text);
  });
@@ -46,13 +39,11 @@ describe("parseClipboard()", () => {

    const json = serializeAsClipboardJSON({ elements: [rect], files: null });
    const clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/plain": json,
-          },
-        }),
-      ),
+      createPasteEvent({
+        types: {
+          "text/plain": json,
+        },
+      }),
    );
    expect(clipboardData.elements).toEqual([rect]);
  });
@@ -65,25 +56,21 @@ describe("parseClipboard()", () => {
    // -------------------------------------------------------------------------
    json = serializeAsClipboardJSON({ elements: [rect], files: null });
    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/html": json,
-          },
-        }),
-      ),
+      createPasteEvent({
+        types: {
+          "text/html": json,
+        },
+      }),
    );
    expect(clipboardData.elements).toEqual([rect]);
    // -------------------------------------------------------------------------
    json = serializeAsClipboardJSON({ elements: [rect], files: null });
    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/html": `<div> ${json}</div>`,
-          },
-        }),
-      ),
+      createPasteEvent({
+        types: {
+          "text/html": `<div> ${json}</div>`,
+        },
+      }),
    );
    expect(clipboardData.elements).toEqual([rect]);
    // -------------------------------------------------------------------------
@@ -93,13 +80,11 @@ describe("parseClipboard()", () => {
    let clipboardData;
    // -------------------------------------------------------------------------
    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/html": `<img src="https://example.com/image.png" />`,
-          },
-        }),
-      ),
+      createPasteEvent({
+        types: {
+          "text/html": `<img src="https://example.com/image.png" />`,
+        },
+      }),
    );
    expect(clipboardData.mixedContent).toEqual([
      {
@@ -109,13 +94,11 @@ describe("parseClipboard()", () => {
    ]);
    // -------------------------------------------------------------------------
    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/html": `<div><img src="https://example.com/image.png" /></div><a><img src="https://example.com/image2.png" /></a>`,
-          },
-        }),
-      ),
+      createPasteEvent({
+        types: {
+          "text/html": `<div><img src="https://example.com/image.png" /></div><a><img src="https://example.com/image2.png" /></a>`,
+        },
+      }),
    );
    expect(clipboardData.mixedContent).toEqual([
      {
@@ -131,13 +114,11 @@ describe("parseClipboard()", () => {

  it("should parse text content alongside <image> `src` urls out of text/html", async () => {
    const clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/html": `<a href="https://example.com">hello </a><div><img src="https://example.com/image.png" /></div><b>my friend!</b>`,
-          },
-        }),
-      ),
+      createPasteEvent({
+        types: {
+          "text/html": `<a href="https://example.com">hello </a><div><img src="https://example.com/image.png" /></div><b>my friend!</b>`,
+        },
+      }),
    );
    expect(clipboardData.mixedContent).toEqual([
      {
@@ -160,16 +141,14 @@ describe("parseClipboard()", () => {
    let clipboardData;
    // -------------------------------------------------------------------------
    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/plain": `a	b
-            1	2
-            4	5
-            7	10`,
-          },
-        }),
-      ),
+      createPasteEvent({
+        types: {
+          "text/plain": `a	b
+        1	2
+        4	5
+        7	10`,
+        },
+      }),
    );
    expect(clipboardData.spreadsheet).toEqual({
      title: "b",
@@ -178,16 +157,14 @@ describe("parseClipboard()", () => {
    });
    // -------------------------------------------------------------------------
    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/html": `a	b
-            1	2
-            4	5
-            7	10`,
-          },
-        }),
-      ),
+      createPasteEvent({
+        types: {
+          "text/html": `a	b
+        1	2
+        4	5
+        7	10`,
+        },
+      }),
    );
    expect(clipboardData.spreadsheet).toEqual({
      title: "b",
@@ -196,21 +173,19 @@ describe("parseClipboard()", () => {
    });
    // -------------------------------------------------------------------------
    clipboardData = await parseClipboard(
-      await parseDataTransferEvent(
-        createPasteEvent({
-          types: {
-            "text/html": `<html>
-            <body>
-            <!--StartFragment--><google-sheets-html-origin><style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style><table xmlns="http://www.w3.org/1999/xhtml" cellspacing="0" cellpadding="0" dir="ltr" border="1" style="table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none"><colgroup><col width="100"/><col width="100"/></colgroup><tbody><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;a&quot;}">a</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;b&quot;}">b</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:1}">1</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:2}">2</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:4}">4</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:5}">5</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:7}">7</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:10}">10</td></tr></tbody></table><!--EndFragment-->
-            </body>
-            </html>`,
-            "text/plain": `a	b
-            1	2
-            4	5
-            7	10`,
-          },
-        }),
-      ),
+      createPasteEvent({
+        types: {
+          "text/html": `<html>
+        <body>
+        <!--StartFragment--><google-sheets-html-origin><style type="text/css"><!--td {border: 1px solid #cccccc;}br {mso-data-placement:same-cell;}--></style><table xmlns="http://www.w3.org/1999/xhtml" cellspacing="0" cellpadding="0" dir="ltr" border="1" style="table-layout:fixed;font-size:10pt;font-family:Arial;width:0px;border-collapse:collapse;border:none"><colgroup><col width="100"/><col width="100"/></colgroup><tbody><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;a&quot;}">a</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;" data-sheets-value="{&quot;1&quot;:2,&quot;2&quot;:&quot;b&quot;}">b</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:1}">1</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:2}">2</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:4}">4</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:5}">5</td></tr><tr style="height:21px;"><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:7}">7</td><td style="overflow:hidden;padding:2px 3px 2px 3px;vertical-align:bottom;text-align:right;" data-sheets-value="{&quot;1&quot;:3,&quot;3&quot;:10}">10</td></tr></tbody></table><!--EndFragment-->
+        </body>
+        </html>`,
+          "text/plain": `a	b
+        1	2
+        4	5
+        7	10`,
+        },
+      }),
    );
    expect(clipboardData.spreadsheet).toEqual({
      title: "b",
@@ -5,7 +5,6 @@ import {
  arrayToMap,
  isMemberOf,
  isPromiseLike,
-  EVENT,
 } from "@excalidraw/common";

 import { mutateElement } from "@excalidraw/element";
@@ -17,26 +16,15 @@ import {

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

-import type { ValueOf } from "@excalidraw/common/utility-types";
-
-import type { IMAGE_MIME_TYPES, STRING_MIME_TYPES } from "@excalidraw/common";
 import type {
  ExcalidrawElement,
  NonDeletedExcalidrawElement,
 } from "@excalidraw/element/types";

 import { ExcalidrawError } from "./errors";
-import {
-  createFile,
-  getFileHandle,
-  isSupportedImageFileType,
-  normalizeFile,
-} from "./data/blob";
-
+import { createFile, isSupportedImageFileType } from "./data/blob";
 import { tryParseSpreadsheet, VALID_SPREADSHEET } from "./charts";

-import type { FileSystemHandle } from "./data/filesystem";
-
 import type { Spreadsheet } from "./charts";

 import type { BinaryFiles } from "./types";
@@ -104,7 +92,7 @@ export const createPasteEvent = ({
    console.warn("createPasteEvent: no types or files provided");
  }

-  const event = new ClipboardEvent(EVENT.PASTE, {
+  const event = new ClipboardEvent("paste", {
    clipboardData: new DataTransfer(),
  });

@@ -113,11 +101,10 @@ export const createPasteEvent = ({
      if (typeof value !== "string") {
        files = files || [];
        files.push(value);
-        event.clipboardData?.items.add(value);
        continue;
      }
      try {
-        event.clipboardData?.items.add(value, type);
+        event.clipboardData?.setData(type, value);
        if (event.clipboardData?.getData(type) !== value) {
          throw new Error(`Failed to set "${type}" as clipboardData item`);
        }
@@ -242,10 +229,14 @@ function parseHTMLTree(el: ChildNode) {
  return result;
 }

-const maybeParseHTMLDataItem = (
-  dataItem: ParsedDataTransferItemType<typeof MIME_TYPES["html"]>,
+const maybeParseHTMLPaste = (
+  event: ClipboardEvent,
 ): { type: "mixedContent"; value: PastedMixedContent } | null => {
-  const html = dataItem.value;
+  const html = event.clipboardData?.getData(MIME_TYPES.html);
+
+  if (!html) {
+    return null;
+  }

  try {
    const doc = new DOMParser().parseFromString(html, MIME_TYPES.html);
@@ -341,21 +332,18 @@ export const readSystemClipboard = async () => {
 * Parses "paste" ClipboardEvent.
 */
 const parseClipboardEventTextData = async (
-  dataList: ParsedDataTranferList,
+  event: ClipboardEvent,
  isPlainPaste = false,
 ): Promise<ParsedClipboardEventTextData> => {
  try {
-    const htmlItem = dataList.findByType(MIME_TYPES.html);
-
-    const mixedContent =
-      !isPlainPaste && htmlItem && maybeParseHTMLDataItem(htmlItem);
+    const mixedContent = !isPlainPaste && event && maybeParseHTMLPaste(event);

    if (mixedContent) {
      if (mixedContent.value.every((item) => item.type === "text")) {
        return {
          type: "text",
          value:
-            dataList.getData(MIME_TYPES.text) ??
+            event.clipboardData?.getData(MIME_TYPES.text) ||
            mixedContent.value
              .map((item) => item.value)
              .join("\n")
@@ -366,156 +354,23 @@ const parseClipboardEventTextData = async (
      return mixedContent;
    }

-    return {
-      type: "text",
-      value: (dataList.getData(MIME_TYPES.text) || "").trim(),
-    };
+    const text = event.clipboardData?.getData(MIME_TYPES.text);
+
+    return { type: "text", value: (text || "").trim() };
  } catch {
    return { type: "text", value: "" };
  }
 };

-type AllowedParsedDataTransferItem =
-  | {
-      type: ValueOf<typeof IMAGE_MIME_TYPES>;
-      kind: "file";
-      file: File;
-      fileHandle: FileSystemHandle | null;
-    }
-  | { type: ValueOf<typeof STRING_MIME_TYPES>; kind: "string"; value: string };
-
-type ParsedDataTransferItem =
-  | {
-      type: string;
-      kind: "file";
-      file: File;
-      fileHandle: FileSystemHandle | null;
-    }
-  | { type: string; kind: "string"; value: string };
-
-type ParsedDataTransferItemType<
-  T extends AllowedParsedDataTransferItem["type"],
-> = AllowedParsedDataTransferItem & { type: T };
-
-export type ParsedDataTransferFile = Extract<
-  AllowedParsedDataTransferItem,
-  { kind: "file" }
->;
-
-type ParsedDataTranferList = ParsedDataTransferItem[] & {
-  /**
-   * Only allows filtering by known `string` data types, since `file`
-   * types can have multiple items of the same type (e.g. multiple image files)
-   * unlike `string` data transfer items.
-   */
-  findByType: typeof findDataTransferItemType;
-  /**
-   * Only allows filtering by known `string` data types, since `file`
-   * types can have multiple items of the same type (e.g. multiple image files)
-   * unlike `string` data transfer items.
-   */
-  getData: typeof getDataTransferItemData;
-  getFiles: typeof getDataTransferFiles;
-};
-
-const findDataTransferItemType = function <
-  T extends ValueOf<typeof STRING_MIME_TYPES>,
->(this: ParsedDataTranferList, type: T): ParsedDataTransferItemType<T> | null {
-  return (
-    this.find(
-      (item): item is ParsedDataTransferItemType<T> => item.type === type,
-    ) || null
-  );
-};
-const getDataTransferItemData = function <
-  T extends ValueOf<typeof STRING_MIME_TYPES>,
->(
-  this: ParsedDataTranferList,
-  type: T,
-):
-  | ParsedDataTransferItemType<ValueOf<typeof STRING_MIME_TYPES>>["value"]
-  | null {
-  const item = this.find(
-    (
-      item,
-    ): item is ParsedDataTransferItemType<ValueOf<typeof STRING_MIME_TYPES>> =>
-      item.type === type,
-  );
-
-  return item?.value ?? null;
-};
-
-const getDataTransferFiles = function (
-  this: ParsedDataTranferList,
-): ParsedDataTransferFile[] {
-  return this.filter(
-    (item): item is ParsedDataTransferFile => item.kind === "file",
-  );
-};
-
-export const parseDataTransferEvent = async (
-  event: ClipboardEvent | DragEvent | React.DragEvent<HTMLDivElement>,
-): Promise<ParsedDataTranferList> => {
-  let items: DataTransferItemList | undefined = undefined;
-
-  if (isClipboardEvent(event)) {
-    items = event.clipboardData?.items;
-  } else {
-    const dragEvent = event;
-    items = dragEvent.dataTransfer?.items;
-  }
-
-  const dataItems = (
-    await Promise.all(
-      Array.from(items || []).map(
-        async (item): Promise<ParsedDataTransferItem | null> => {
-          if (item.kind === "file") {
-            let file = item.getAsFile();
-            if (file) {
-              const fileHandle = await getFileHandle(item);
-              file = await normalizeFile(file);
-              return {
-                type: file.type,
-                kind: "file",
-                file,
-                fileHandle,
-              };
-            }
-          } else if (item.kind === "string") {
-            const { type } = item;
-            let value: string;
-            if ("clipboardData" in event && event.clipboardData) {
-              value = event.clipboardData?.getData(type);
-            } else {
-              value = await new Promise<string>((resolve) => {
-                item.getAsString((str) => resolve(str));
-              });
-            }
-            return { type, kind: "string", value };
-          }
-
-          return null;
-        },
-      ),
-    )
-  ).filter((data): data is ParsedDataTransferItem => data != null);
-
-  return Object.assign(dataItems, {
-    findByType: findDataTransferItemType,
-    getData: getDataTransferItemData,
-    getFiles: getDataTransferFiles,
-  });
-};
-
 /**
 * Attempts to parse clipboard event.
 */
 export const parseClipboard = async (
-  dataList: ParsedDataTranferList,
+  event: ClipboardEvent,
  isPlainPaste = false,
 ): Promise<ClipboardData> => {
  const parsedEventData = await parseClipboardEventTextData(
-    dataList,
+    event,
    isPlainPaste,
  );

@@ -664,14 +519,3 @@ const copyTextViaExecCommand = (text: string | null) => {

  return success;
 };
-
-export const isClipboardEvent = (
-  event: React.SyntheticEvent | Event,
-): event is ClipboardEvent => {
-  /** not using instanceof ClipboardEvent due to tests (jsdom) */
-  return (
-    event.type === EVENT.PASTE ||
-    event.type === EVENT.COPY ||
-    event.type === EVENT.CUT
-  );
-};
@@ -91,118 +91,3 @@
    }
  }
 }
-
-.compact-shape-actions {
-  display: flex;
-  flex-direction: column;
-  gap: 0.5rem;
-  max-height: calc(100vh - 200px);
-  overflow-y: auto;
-  padding: 0.5rem;
-
-  .compact-action-item {
-    position: relative;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    min-height: 2.5rem;
-    pointer-events: auto;
-
-    --default-button-size: 2rem;
-
-    .compact-action-button {
-      width: var(--mobile-action-button-size);
-      height: var(--mobile-action-button-size);
-      border: none;
-      border-radius: var(--border-radius-lg);
-      color: var(--color-on-surface);
-      cursor: pointer;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      transition: all 0.2s ease;
-
-      background: var(--mobile-action-button-bg);
-
-      svg {
-        width: 1rem;
-        height: 1rem;
-        flex: 0 0 auto;
-      }
-
-      &.active {
-        background: var(
-          --color-surface-primary-container,
-          var(--mobile-action-button-bg)
-        );
-      }
-    }
-
-    .compact-popover-content {
-      .popover-section {
-        margin-bottom: 1rem;
-
-        &:last-child {
-          margin-bottom: 0;
-        }
-
-        .popover-section-title {
-          font-size: 0.75rem;
-          font-weight: 600;
-          color: var(--color-text-secondary);
-          margin-bottom: 0.5rem;
-          text-transform: uppercase;
-          letter-spacing: 0.5px;
-        }
-
-        .buttonList {
-          display: flex;
-          flex-wrap: wrap;
-          gap: 0.25rem;
-        }
-      }
-    }
-  }
-
-  .ToolIcon {
-    .ToolIcon__icon {
-      width: var(--mobile-action-button-size);
-      height: var(--mobile-action-button-size);
-
-      background: var(--mobile-action-button-bg);
-
-      &:hover {
-        background-color: transparent;
-      }
-    }
-  }
-}
-
-.compact-shape-actions-island {
-  width: fit-content;
-  overflow-x: hidden;
-}
-
-.mobile-shape-actions {
-  z-index: 999;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  width: 100%;
-  background: transparent;
-  border-radius: var(--border-radius-lg);
-  box-shadow: none;
-  overflow: none;
-  scrollbar-width: none;
-  -ms-overflow-style: none;
-}
-
-.shape-actions-theme-scope {
-  --button-border: transparent;
-  --button-bg: var(--color-surface-mid);
-}
-
-:root.theme--dark .shape-actions-theme-scope {
-  --button-hover-bg: #363541;
-  --button-bg: var(--color-surface-high);
-}
@@ -1,12 +1,11 @@
 import clsx from "clsx";
 import { useCallback, useEffect, useRef, useState } from "react";

-import { KEYS } from "@excalidraw/common";
+import { KEYS, getShortcutKey } from "@excalidraw/common";

-import { getShortcutKey } from "../..//shortcut";
 import { useAtom } from "../../editor-jotai";
 import { t } from "../../i18n";
-import { useEditorInterface } from "../App";
+import { useDevice } from "../App";
 import { activeEyeDropperAtom } from "../EyeDropper";
 import { eyeDropperIcon } from "../icons";

@@ -30,7 +29,7 @@ export const ColorInput = ({
  colorPickerType,
  placeholder,
 }: ColorInputProps) => {
-  const editorInterface = useEditorInterface();
+  const device = useDevice();
  const [innerValue, setInnerValue] = useState(color);
  const [activeSection, setActiveColorPickerSection] = useAtom(
    activeColorPickerSectionAtom,
@@ -99,7 +98,7 @@ export const ColorInput = ({
        placeholder={placeholder}
      />
      {/* TODO reenable on mobile with a better UX */}
-      {editorInterface.formFactor !== "phone" && (
+      {!device.editor.isMobile && (
        <>
          <div
            style={{
@@ -7,12 +7,6 @@
    }
  }

-  .color-picker__title {
-    padding: 0 0.5rem;
-    font-size: 0.875rem;
-    text-align: left;
-  }
-
  .color-picker__heading {
    padding: 0 0.5rem;
    font-size: 0.75rem;
@@ -28,12 +22,6 @@
    @include isMobile {
      max-width: 11rem;
    }
-
-    &.color-picker-container--no-top-picks {
-      display: flex;
-      justify-content: center;
-      grid-template-columns: unset;
-    }
  }

  .color-picker__top-picks {
@@ -92,16 +80,6 @@
      }
    }

-    .color-picker__button-background {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      svg {
-        width: 100%;
-        height: 100%;
-      }
-    }
-
    &.active {
      .color-picker__button-outline {
        position: absolute;
@@ -163,15 +141,6 @@
      width: 1.625rem;
      height: 1.625rem;
    }
-
-    &.compact-sizing {
-      width: var(--mobile-action-button-size);
-      height: var(--mobile-action-button-size);
-    }
-
-    &.mobile-border {
-      border: 1px solid var(--mobile-color-border);
-    }
  }

  .color-picker__button__hotkey-label {
@@ -1,12 +1,11 @@
 import * as Popover from "@radix-ui/react-popover";
 import clsx from "clsx";
-import { useRef, useEffect } from "react";
+import { useRef } from "react";

 import {
  COLOR_OUTLINE_CONTRAST_THRESHOLD,
  COLOR_PALETTE,
  isTransparent,
-  isWritableElement,
 } from "@excalidraw/common";

 import type { ColorTuple, ColorPaletteCustom } from "@excalidraw/common";
@@ -15,16 +14,11 @@ import type { ExcalidrawElement } from "@excalidraw/element/types";

 import { useAtom } from "../../editor-jotai";
 import { t } from "../../i18n";
-import { useExcalidrawContainer, useStylesPanelMode } from "../App";
+import { useExcalidrawContainer } from "../App";
 import { ButtonSeparator } from "../ButtonSeparator";
 import { activeEyeDropperAtom } from "../EyeDropper";
 import { PropertiesPopover } from "../PropertiesPopover";
-import { slashIcon, strokeIcon } from "../icons";
-import {
-  saveCaretPosition,
-  restoreCaretPosition,
-  temporarilyDisableTextEditorBlur,
-} from "../../hooks/useTextEditorFocus";
+import { slashIcon } from "../icons";

 import { ColorInput } from "./ColorInput";
 import { Picker } from "./Picker";
@@ -83,8 +77,6 @@ const ColorPickerPopupContent = ({
  elements,
  palette = COLOR_PALETTE,
  updateData,
-  getOpenPopup,
-  appState,
 }: Pick<
  ColorPickerProps,
  | "type"
@@ -94,14 +86,8 @@ const ColorPickerPopupContent = ({
  | "elements"
  | "palette"
  | "updateData"
-  | "appState"
-> & {
-  getOpenPopup: () => AppState["openPopup"];
-}) => {
+>) => {
  const { container } = useExcalidrawContainer();
-  const stylesPanelMode = useStylesPanelMode();
-  const isCompactMode = stylesPanelMode !== "full";
-  const isMobileMode = stylesPanelMode === "mobile";
  const [, setActiveColorPickerSection] = useAtom(activeColorPickerSectionAtom);

  const [eyeDropperState, setEyeDropperState] = useAtom(activeEyeDropperAtom);
@@ -131,13 +117,9 @@ const ColorPickerPopupContent = ({
    <PropertiesPopover
      container={container}
      style={{ maxWidth: "13rem" }}
-      // Improve focus handling for text editing scenarios
-      preventAutoFocusOnTouch={!!appState.editingTextElement}
      onFocusOutside={(event) => {
        // refocus due to eye dropper
-        if (!isWritableElement(event.target)) {
-          focusPickerContent();
-        }
+        focusPickerContent();
        event.preventDefault();
      }}
      onPointerDownOutside={(event) => {
@@ -149,23 +131,8 @@ const ColorPickerPopupContent = ({
        }
      }}
      onClose={() => {
-        // only clear if we're still the active popup (avoid racing with switch)
-        if (getOpenPopup() === type) {
-          updateData({ openPopup: null });
-        }
+        updateData({ openPopup: null });
        setActiveColorPickerSection(null);
-
-        // Refocus text editor when popover closes if we were editing text
-        if (appState.editingTextElement) {
-          setTimeout(() => {
-            const textEditor = document.querySelector(
-              ".excalidraw-wysiwyg",
-            ) as HTMLTextAreaElement;
-            if (textEditor) {
-              textEditor.focus();
-            }
-          }, 0);
-        }
      }}
    >
      {palette ? (
@@ -174,17 +141,7 @@ const ColorPickerPopupContent = ({
          palette={palette}
          color={color}
          onChange={(changedColor) => {
-            // Save caret position before color change if editing text
-            const savedSelection = appState.editingTextElement
-              ? saveCaretPosition()
-              : null;
-
            onChange(changedColor);
-
-            // Restore caret position after color change if editing text
-            if (appState.editingTextElement && savedSelection) {
-              restoreCaretPosition(savedSelection);
-            }
          }}
          onEyeDropperToggle={(force) => {
            setEyeDropperState((state) => {
@@ -211,15 +168,12 @@ const ColorPickerPopupContent = ({
            if (eyeDropperState) {
              setEyeDropperState(null);
            } else {
-              // close explicitly on Escape
              updateData({ openPopup: null });
            }
          }}
          type={type}
          elements={elements}
          updateData={updateData}
-          showTitle={isCompactMode}
-          showHotKey={!isMobileMode}
        >
          {colorInputJSX}
        </Picker>
@@ -234,33 +188,11 @@ const ColorPickerTrigger = ({
  label,
  color,
  type,
-  mode = "background",
-  onToggle,
-  editingTextElement,
 }: {
  color: string | null;
  label: string;
  type: ColorPickerType;
-  mode?: "background" | "stroke";
-  onToggle: () => void;
-  editingTextElement?: boolean;
 }) => {
-  const stylesPanelMode = useStylesPanelMode();
-  const isCompactMode = stylesPanelMode !== "full";
-  const isMobileMode = stylesPanelMode === "mobile";
-  const handleClick = (e: React.MouseEvent) => {
-    // use pointerdown so we run before outside-close logic
-    e.preventDefault();
-    e.stopPropagation();
-
-    // If editing text, temporarily disable the wysiwyg blur event
-    if (editingTextElement) {
-      temporarilyDisableTextEditorBlur();
-    }
-
-    onToggle();
-  };
-
  return (
    <Popover.Trigger
      type="button"
@@ -268,8 +200,6 @@ const ColorPickerTrigger = ({
        "is-transparent": !color || color === "transparent",
        "has-outline":
          !color || !isColorDark(color, COLOR_OUTLINE_CONTRAST_THRESHOLD),
-        "compact-sizing": isCompactMode,
-        "mobile-border": isMobileMode,
      })}
      aria-label={label}
      style={color ? { "--swatch-color": color } : undefined}
@@ -278,24 +208,8 @@ const ColorPickerTrigger = ({
          ? t("labels.showStroke")
          : t("labels.showBackground")
      }
-      data-openpopup={type}
-      onClick={handleClick}
    >
      <div className="color-picker__button-outline">{!color && slashIcon}</div>
-      {isCompactMode && color && mode === "stroke" && (
-        <div className="color-picker__button-background">
-          <span
-            style={{
-              color:
-                color && isColorDark(color, COLOR_OUTLINE_CONTRAST_THRESHOLD)
-                  ? "#fff"
-                  : "#111",
-            }}
-          >
-            {strokeIcon}
-          </span>
-        </div>
-      )}
    </Popover.Trigger>
  );
 };
@@ -311,59 +225,24 @@ export const ColorPicker = ({
  updateData,
  appState,
 }: ColorPickerProps) => {
-  const openRef = useRef(appState.openPopup);
-  useEffect(() => {
-    openRef.current = appState.openPopup;
-  }, [appState.openPopup]);
-  const stylesPanelMode = useStylesPanelMode();
-  const isCompactMode = stylesPanelMode !== "full";
-
  return (
    <div>
-      <div
-        role="dialog"
-        aria-modal="true"
-        className={clsx("color-picker-container", {
-          "color-picker-container--no-top-picks": isCompactMode,
-        })}
-      >
-        {!isCompactMode && (
-          <TopPicks
-            activeColor={color}
-            onChange={onChange}
-            type={type}
-            topPicks={topPicks}
-          />
-        )}
-        {!isCompactMode && <ButtonSeparator />}
+      <div role="dialog" aria-modal="true" className="color-picker-container">
+        <TopPicks
+          activeColor={color}
+          onChange={onChange}
+          type={type}
+          topPicks={topPicks}
+        />
+        <ButtonSeparator />
        <Popover.Root
          open={appState.openPopup === type}
          onOpenChange={(open) => {
-            if (open) {
-              updateData({ openPopup: type });
-            }
+            updateData({ openPopup: open ? type : null });
          }}
        >
          {/* serves as an active color indicator as well */}
-          <ColorPickerTrigger
-            color={color}
-            label={label}
-            type={type}
-            mode={type === "elementStroke" ? "stroke" : "background"}
-            editingTextElement={!!appState.editingTextElement}
-            onToggle={() => {
-              // atomic switch: if another popup is open, close it first, then open this one next tick
-              if (appState.openPopup === type) {
-                // toggle off on same trigger
-                updateData({ openPopup: null });
-              } else if (appState.openPopup) {
-                updateData({ openPopup: type });
-              } else {
-                // open this one
-                updateData({ openPopup: type });
-              }
-            }}
-          />
+          <ColorPickerTrigger color={color} label={label} type={type} />
          {/* popup content */}
          {appState.openPopup === type && (
            <ColorPickerPopupContent
@@ -374,8 +253,6 @@ export const ColorPicker = ({
              elements={elements}
              palette={palette}
              updateData={updateData}
-              getOpenPopup={() => openRef.current}
-              appState={appState}
            />
          )}
        </Popover.Root>
@@ -37,10 +37,8 @@ interface PickerProps {
  palette: ColorPaletteCustom;
  updateData: (formData?: any) => void;
  children?: React.ReactNode;
-  showTitle?: boolean;
  onEyeDropperToggle: (force?: boolean) => void;
  onEscape: (event: React.KeyboardEvent | KeyboardEvent) => void;
-  showHotKey?: boolean;
 }

 export const Picker = React.forwardRef(
@@ -53,21 +51,11 @@ export const Picker = React.forwardRef(
      palette,
      updateData,
      children,
-      showTitle,
      onEyeDropperToggle,
      onEscape,
-      showHotKey = true,
    }: PickerProps,
    ref,
  ) => {
-    const title = showTitle
-      ? type === "elementStroke"
-        ? t("labels.stroke")
-        : type === "elementBackground"
-        ? t("labels.background")
-        : null
-      : null;
-
    const [customColors] = React.useState(() => {
      if (type === "canvasBackground") {
        return [];
@@ -166,8 +154,6 @@ export const Picker = React.forwardRef(
          // to allow focusing by clicking but not by tabbing
          tabIndex={-1}
        >
-          {title && <div className="color-picker__title">{title}</div>}
-
          {!!customColors.length && (
            <div>
              <PickerHeading>
@@ -189,18 +175,12 @@ export const Picker = React.forwardRef(
              palette={palette}
              onChange={onChange}
              activeShade={activeShade}
-              showHotKey={showHotKey}
            />
          </div>

          <div>
            <PickerHeading>{t("colorPicker.shades")}</PickerHeading>
-            <ShadeList
-              color={color}
-              onChange={onChange}
-              palette={palette}
-              showHotKey={showHotKey}
-            />
+            <ShadeList color={color} onChange={onChange} palette={palette} />
          </div>
          {children}
        </div>
@@ -20,7 +20,6 @@ interface PickerColorListProps {
  color: string | null;
  onChange: (color: string) => void;
  activeShade: number;
-  showHotKey?: boolean;
 }

 const PickerColorList = ({
@@ -28,7 +27,6 @@ const PickerColorList = ({
  color,
  onChange,
  activeShade,
-  showHotKey = true,
 }: PickerColorListProps) => {
  const colorObj = getColorNameAndShadeFromColor({
    color,
@@ -84,7 +82,7 @@ const PickerColorList = ({
            key={key}
          >
            <div className="color-picker__button-outline" />
-            {showHotKey && <HotkeyLabel color={color} keyLabel={keybinding} />}
+            <HotkeyLabel color={color} keyLabel={keybinding} />
          </button>
        );
      })}
@@ -16,15 +16,9 @@ interface ShadeListProps {
  color: string | null;
  onChange: (color: string) => void;
  palette: ColorPaletteCustom;
-  showHotKey?: boolean;
 }

-export const ShadeList = ({
-  color,
-  onChange,
-  palette,
-  showHotKey,
-}: ShadeListProps) => {
+export const ShadeList = ({ color, onChange, palette }: ShadeListProps) => {
  const colorObj = getColorNameAndShadeFromColor({
    color: color || "transparent",
    palette,
@@ -73,9 +67,7 @@ export const ShadeList = ({
              }}
            >
              <div className="color-picker__button-outline" />
-              {showHotKey && (
-                <HotkeyLabel color={color} keyLabel={i + 1} isShade />
-              )}
+              <HotkeyLabel color={color} keyLabel={i + 1} isShade />
            </button>
          ))}
        </div>
@@ -100,19 +100,6 @@ $verticalBreakpoint: 861px;
        border-radius: var(--border-radius-lg);
        cursor: pointer;

-        --icon-size: 1rem;
-
-        &.command-item-large {
-          height: 2.75rem;
-          --icon-size: 1.5rem;
-
-          .icon {
-            width: var(--icon-size);
-            height: var(--icon-size);
-            margin-right: 0.625rem;
-          }
-        }
-
        &:active {
          background-color: var(--color-surface-low);
        }
@@ -143,17 +130,9 @@ $verticalBreakpoint: 861px;
    }

    .icon {
-      width: var(--icon-size, 1rem);
-      height: var(--icon-size, 1rem);
-      margin-right: 0.375rem;
-
-      .library-item-icon {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        height: 100%;
-        width: 100%;
-      }
+      width: 16px;
+      height: 16px;
+      margin-right: 6px;
    }
  }
 }
@@ -1,19 +1,18 @@
 import clsx from "clsx";
 import fuzzy from "fuzzy";
-import { useEffect, useRef, useMemo, useState } from "react";
+import { useEffect, useRef, useState } from "react";

 import {
  DEFAULT_SIDEBAR,
  EVENT,
  KEYS,
  capitalizeString,
+  getShortcutKey,
  isWritableElement,
 } from "@excalidraw/common";

 import { actionToggleShapeSwitch } from "@excalidraw/excalidraw/actions/actionToggleShapeSwitch";

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

 import {
@@ -62,21 +61,12 @@ import { useStable } from "../../hooks/useStable";

 import { Ellipsify } from "../Ellipsify";

-import {
-  distributeLibraryItemsOnSquareGrid,
-  libraryItemsAtom,
-} from "../../data/library";
-
-import {
-  useLibraryCache,
-  useLibraryItemSvg,
-} from "../../hooks/useLibraryItemSvg";
-
 import * as defaultItems from "./defaultCommandPaletteItems";
+
 import "./CommandPalette.scss";

 import type { CommandPaletteItem } from "./types";
-import type { AppProps, AppState, LibraryItem, UIAppState } from "../../types";
+import type { AppProps, AppState, UIAppState } from "../../types";
 import type { ShortcutName } from "../../actions/shortcuts";
 import type { TranslationKeys } from "../../i18n";
 import type { Action } from "../../actions/types";
@@ -90,7 +80,6 @@ export const DEFAULT_CATEGORIES = {
  editor: "Editor",
  elements: "Elements",
  links: "Links",
-  library: "Library",
 };

 const getCategoryOrder = (category: string) => {
@@ -218,34 +207,6 @@ function CommandPaletteInner({
    appProps,
  });

-  const [libraryItemsData] = useAtom(libraryItemsAtom);
-  const libraryCommands: CommandPaletteItem[] = useMemo(() => {
-    return (
-      libraryItemsData.libraryItems
-        ?.filter(
-          (libraryItem): libraryItem is MarkRequired<LibraryItem, "name"> =>
-            !!libraryItem.name,
-        )
-        .map((libraryItem) => ({
-          label: libraryItem.name,
-          icon: (
-            <LibraryItemIcon
-              id={libraryItem.id}
-              elements={libraryItem.elements}
-            />
-          ),
-          category: "Library",
-          order: getCategoryOrder("Library"),
-          haystack: deburr(libraryItem.name),
-          perform: () => {
-            app.onInsertElements(
-              distributeLibraryItemsOnSquareGrid([libraryItem]),
-            );
-          },
-        })) || []
-    );
-  }, [app, libraryItemsData.libraryItems]);
-
  useEffect(() => {
    // these props change often and we don't want them to re-run the effect
    // which would renew `allCommands`, cascading down and resetting state.
@@ -477,6 +438,7 @@ function CommandPaletteInner({
          },
          perform: () => {
            setAppState((prevState) => ({
+              openMenu: prevState.openMenu === "shape" ? null : "shape",
              openPopup: "elementStroke",
            }));
          },
@@ -496,6 +458,7 @@ function CommandPaletteInner({
          },
          perform: () => {
            setAppState((prevState) => ({
+              openMenu: prevState.openMenu === "shape" ? null : "shape",
              openPopup: "elementBackground",
            }));
          },
@@ -625,9 +588,8 @@ function CommandPaletteInner({

      setAllCommands(allCommands);
      setLastUsed(
-        [...allCommands, ...libraryCommands].find(
-          (command) => command.label === lastUsed?.label,
-        ) ?? null,
+        allCommands.find((command) => command.label === lastUsed?.label) ??
+          null,
      );
    }
  }, [
@@ -638,7 +600,6 @@ function CommandPaletteInner({
    lastUsed?.label,
    setLastUsed,
    setAppState,
-    libraryCommands,
  ]);

  const [commandSearch, setCommandSearch] = useState("");
@@ -835,17 +796,9 @@ function CommandPaletteInner({
      return nextCommandsByCategory;
    };

-    let matchingCommands =
-      commandSearch?.length > 1
-        ? [
-            ...allCommands
-              .filter(isCommandAvailable)
-              .sort((a, b) => a.order - b.order),
-            ...libraryCommands,
-          ]
-        : allCommands
-            .filter(isCommandAvailable)
-            .sort((a, b) => a.order - b.order);
+    let matchingCommands = allCommands
+      .filter(isCommandAvailable)
+      .sort((a, b) => a.order - b.order);

    const showLastUsed =
      !commandSearch && lastUsed && isCommandAvailable(lastUsed);
@@ -869,20 +822,14 @@ function CommandPaletteInner({
    );
    matchingCommands = fuzzy
      .filter(_query, matchingCommands, {
-        extract: (command) => command.haystack ?? "",
+        extract: (command) => command.haystack,
      })
      .sort((a, b) => b.score - a.score)
      .map((item) => item.original);

    setCommandsByCategory(getNextCommandsByCategory(matchingCommands));
    setCurrentCommand(matchingCommands[0] ?? null);
-  }, [
-    commandSearch,
-    allCommands,
-    isCommandAvailable,
-    lastUsed,
-    libraryCommands,
-  ]);
+  }, [commandSearch, allCommands, isCommandAvailable, lastUsed]);

  return (
    <Dialog
@@ -903,7 +850,7 @@ function CommandPaletteInner({
        ref={inputRef}
      />

-      {app.editorInterface.formFactor !== "phone" && (
+      {!app.device.viewport.isMobile && (
        <div className="shortcuts-wrapper">
          <CommandShortcutHint shortcut="↑↓">
            {t("commandPalette.shortcuts.select")}
@@ -937,7 +884,7 @@ function CommandPaletteInner({
              onClick={(event) => executeCommand(lastUsed, event)}
              disabled={!isCommandAvailable(lastUsed)}
              onMouseMove={() => setCurrentCommand(lastUsed)}
-              showShortcut={app.editorInterface.formFactor !== "phone"}
+              showShortcut={!app.device.viewport.isMobile}
              appState={uiAppState}
            />
          </div>
@@ -955,9 +902,8 @@ function CommandPaletteInner({
                    isSelected={command.label === currentCommand?.label}
                    onClick={(event) => executeCommand(command, event)}
                    onMouseMove={() => setCurrentCommand(command)}
-                    showShortcut={app.editorInterface.formFactor !== "phone"}
+                    showShortcut={!app.device.viewport.isMobile}
                    appState={uiAppState}
-                    size={category === "Library" ? "large" : "small"}
                  />
                ))}
              </div>
@@ -973,20 +919,6 @@ function CommandPaletteInner({
    </Dialog>
  );
 }
-const LibraryItemIcon = ({
-  id,
-  elements,
-}: {
-  id: LibraryItem["id"] | null;
-  elements: LibraryItem["elements"] | undefined;
-}) => {
-  const ref = useRef<HTMLDivElement | null>(null);
-  const { svgCache } = useLibraryCache();
-
-  useLibraryItemSvg(id, elements, svgCache, ref);
-
-  return <div className="library-item-icon" ref={ref} />;
-};

 const CommandItem = ({
  command,
@@ -996,7 +928,6 @@ const CommandItem = ({
  onClick,
  showShortcut,
  appState,
-  size = "small",
 }: {
  command: CommandPaletteItem;
  isSelected: boolean;
@@ -1005,7 +936,6 @@ const CommandItem = ({
  onClick: (event: React.MouseEvent) => void;
  showShortcut: boolean;
  appState: UIAppState;
-  size?: "small" | "large";
 }) => {
  const noop = () => {};

@@ -1014,7 +944,6 @@ const CommandItem = ({
      className={clsx("command-item", {
        "item-selected": isSelected,
        "item-disabled": disabled,
-        "command-item-large": size === "large",
      })}
      ref={(ref) => {
        if (isSelected && !disabled) {
@@ -1030,8 +959,6 @@ const CommandItem = ({
      <div className="name">
        {command.icon && (
          <InlineIcon
-            className="icon"
-            size="var(--icon-size, 1rem)"
            icon={
              typeof command.icon === "function"
                ? command.icon(appState)
@@ -1,10 +1,6 @@
@import "../css/variables.module.scss";

 .excalidraw {
-  .context-menu-popover {
-    z-index: var(--zIndex-ui-context-menu);
-  }
-
  .context-menu {
    position: relative;
    border-radius: 4px;
@@ -64,7 +64,6 @@ export const ContextMenu = React.memo(
        offsetTop={appState.offsetTop}
        viewportWidth={appState.width}
        viewportHeight={appState.height}
-        className="context-menu-popover"
      >
        <ul
          className="context-menu"
@@ -9,7 +9,7 @@ import { t } from "../i18n";

 import {
  useExcalidrawContainer,
-  useEditorInterface,
+  useDevice,
  useExcalidrawSetAppState,
 } from "./App";
 import { Island } from "./Island";
@@ -51,7 +51,7 @@ export const Dialog = (props: DialogProps) => {
  const [islandNode, setIslandNode] = useCallbackRefState<HTMLDivElement>();
  const [lastActiveElement] = useState(document.activeElement);
  const { id } = useExcalidrawContainer();
-  const isFullscreen = useEditorInterface().formFactor === "phone";
+  const isFullscreen = useDevice().viewport.isMobile;

  useEffect(() => {
    if (!islandNode) {
@@ -1,8 +1,5 @@
 .excalidraw {
  .ExcalidrawLogo {
-    --logo-icon--mobile: 1rem;
-    --logo-text--mobile: 0.75rem;
-
    --logo-icon--xs: 2rem;
    --logo-text--xs: 1.5rem;

@@ -33,17 +30,6 @@
      color: var(--color-logo-text);
    }

-    &.is-mobile {
-      .ExcalidrawLogo-icon {
-        height: var(--logo-icon--mobile);
-      }
-
-      .ExcalidrawLogo-text {
-        height: var(--logo-text--mobile);
-        margin-left: 0.5rem;
-      }
-    }
-
    &.is-xs {
      .ExcalidrawLogo-icon {
        height: var(--logo-icon--xs);
@@ -41,7 +41,7 @@ const LogoText = () => (
  </svg>
 );

-type LogoSize = "xs" | "small" | "normal" | "large" | "custom" | "mobile";
+type LogoSize = "xs" | "small" | "normal" | "large" | "custom";

 interface LogoProps {
  size?: LogoSize;
@@ -20,7 +20,7 @@ export type ButtonColor =
 export type ButtonSize = "medium" | "large";

 export type FilledButtonProps = {
-  label?: string;
+  label: string;

  children?: React.ReactNode;
  onClick?: (event: React.MouseEvent) => void;
@@ -11,10 +11,5 @@
        2rem + 4 * var(--default-button-size)
      ); // 4 gaps + 4 buttons
    }
-
-    &--compact {
-      display: block;
-      grid-template-columns: none;
-    }
  }
 }
@@ -1,5 +1,4 @@
 import * as Popover from "@radix-ui/react-popover";
-import clsx from "clsx";
 import React, { useCallback, useMemo } from "react";

 import { FONT_FAMILY } from "@excalidraw/common";
@@ -59,7 +58,6 @@ interface FontPickerProps {
  onHover: (fontFamily: FontFamilyValues) => void;
  onLeave: () => void;
  onPopupChange: (open: boolean) => void;
-  compactMode?: boolean;
 }

 export const FontPicker = React.memo(
@@ -71,7 +69,6 @@ export const FontPicker = React.memo(
    onHover,
    onLeave,
    onPopupChange,
-    compactMode = false,
  }: FontPickerProps) => {
    const defaultFonts = useMemo(() => DEFAULT_FONTS, []);
    const onSelectCallback = useCallback(
@@ -84,30 +81,18 @@ export const FontPicker = React.memo(
    );

    return (
-      <div
-        role="dialog"
-        aria-modal="true"
-        className={clsx("FontPicker__container", {
-          "FontPicker__container--compact": compactMode,
-        })}
-      >
-        {!compactMode && (
-          <div className="buttonList">
-            <RadioSelection<FontFamilyValues | false>
-              type="button"
-              options={defaultFonts}
-              value={selectedFontFamily}
-              onClick={onSelectCallback}
-            />
-          </div>
-        )}
-        {!compactMode && <ButtonSeparator />}
-        <Popover.Root open={isOpened} onOpenChange={onPopupChange}>
-          <FontPickerTrigger
-            selectedFontFamily={selectedFontFamily}
-            isOpened={isOpened}
-            compactMode={compactMode}
+      <div role="dialog" aria-modal="true" className="FontPicker__container">
+        <div className="buttonList">
+          <RadioSelection<FontFamilyValues | false>
+            type="button"
+            options={defaultFonts}
+            value={selectedFontFamily}
+            onClick={onSelectCallback}
          />
+        </div>
+        <ButtonSeparator />
+        <Popover.Root open={isOpened} onOpenChange={onPopupChange}>
+          <FontPickerTrigger selectedFontFamily={selectedFontFamily} />
          {isOpened && (
            <FontPickerList
              selectedFontFamily={selectedFontFamily}
@@ -20,12 +20,7 @@ import type { ValueOf } from "@excalidraw/common/utility-types";

 import { Fonts } from "../../fonts";
 import { t } from "../../i18n";
-import {
-  useApp,
-  useAppProps,
-  useExcalidrawContainer,
-  useStylesPanelMode,
-} from "../App";
+import { useApp, useAppProps, useExcalidrawContainer } from "../App";
 import { PropertiesPopover } from "../PropertiesPopover";
 import { QuickSearch } from "../QuickSearch";
 import { ScrollableList } from "../ScrollableList";
@@ -95,10 +90,8 @@ export const FontPickerList = React.memo(
    onClose,
  }: FontPickerListProps) => {
    const { container } = useExcalidrawContainer();
-    const app = useApp();
-    const { fonts } = app;
+    const { fonts } = useApp();
    const { showDeprecatedFonts } = useAppProps();
-    const stylesPanelMode = useStylesPanelMode();

    const [searchTerm, setSearchTerm] = useState("");
    const inputRef = useRef<HTMLInputElement>(null);
@@ -194,42 +187,6 @@ export const FontPickerList = React.memo(
      onLeave,
    ]);

-    // Create a wrapped onSelect function that preserves caret position
-    const wrappedOnSelect = useCallback(
-      (fontFamily: FontFamilyValues) => {
-        // Save caret position before font selection if editing text
-        let savedSelection: { start: number; end: number } | null = null;
-        if (app.state.editingTextElement) {
-          const textEditor = document.querySelector(
-            ".excalidraw-wysiwyg",
-          ) as HTMLTextAreaElement;
-          if (textEditor) {
-            savedSelection = {
-              start: textEditor.selectionStart,
-              end: textEditor.selectionEnd,
-            };
-          }
-        }
-
-        onSelect(fontFamily);
-
-        // Restore caret position after font selection if editing text
-        if (app.state.editingTextElement && savedSelection) {
-          setTimeout(() => {
-            const textEditor = document.querySelector(
-              ".excalidraw-wysiwyg",
-            ) as HTMLTextAreaElement;
-            if (textEditor && savedSelection) {
-              textEditor.focus();
-              textEditor.selectionStart = savedSelection.start;
-              textEditor.selectionEnd = savedSelection.end;
-            }
-          }, 0);
-        }
-      },
-      [onSelect, app.state.editingTextElement],
-    );
-
    const onKeyDown = useCallback<KeyboardEventHandler<HTMLDivElement>>(
      (event) => {
        const handled = fontPickerKeyHandler({
@@ -237,7 +194,7 @@ export const FontPickerList = React.memo(
          inputRef,
          hoveredFont,
          filteredFonts,
-          onSelect: wrappedOnSelect,
+          onSelect,
          onHover,
          onClose,
        });
@@ -247,7 +204,7 @@ export const FontPickerList = React.memo(
          event.stopPropagation();
        }
      },
-      [hoveredFont, filteredFonts, wrappedOnSelect, onHover, onClose],
+      [hoveredFont, filteredFonts, onSelect, onHover, onClose],
    );

    useEffect(() => {
@@ -283,7 +240,7 @@ export const FontPickerList = React.memo(
        // allow to tab between search and selected font
        tabIndex={font.value === selectedFontFamily ? 0 : -1}
        onClick={(e) => {
-          wrappedOnSelect(Number(e.currentTarget.value));
+          onSelect(Number(e.currentTarget.value));
        }}
        onMouseMove={() => {
          if (hoveredFont?.value !== font.value) {
@@ -325,32 +282,15 @@ export const FontPickerList = React.memo(
        className="properties-content"
        container={container}
        style={{ width: "15rem" }}
-        onClose={() => {
-          onClose();
-
-          // Refocus text editor when font picker closes if we were editing text
-          if (app.state.editingTextElement) {
-            setTimeout(() => {
-              const textEditor = document.querySelector(
-                ".excalidraw-wysiwyg",
-              ) as HTMLTextAreaElement;
-              if (textEditor) {
-                textEditor.focus();
-              }
-            }, 0);
-          }
-        }}
+        onClose={onClose}
        onPointerLeave={onLeave}
        onKeyDown={onKeyDown}
-        preventAutoFocusOnTouch={!!app.state.editingTextElement}
      >
-        {stylesPanelMode === "full" && (
-          <QuickSearch
-            ref={inputRef}
-            placeholder={t("quickSearch.placeholder")}
-            onChange={debounce(setSearchTerm, 20)}
-          />
-        )}
+        <QuickSearch
+          ref={inputRef}
+          placeholder={t("quickSearch.placeholder")}
+          onChange={debounce(setSearchTerm, 20)}
+        />
        <ScrollableList
          className="dropdown-menu fonts manual-hover"
          placeholder={t("fontList.empty")}
@@ -1,6 +1,5 @@
 import * as Popover from "@radix-ui/react-popover";
-
-import { MOBILE_ACTION_BUTTON_BG } from "@excalidraw/common";
+import { useMemo } from "react";

 import type { FontFamilyValues } from "@excalidraw/element/types";

@@ -8,49 +7,33 @@ import { t } from "../../i18n";
 import { ButtonIcon } from "../ButtonIcon";
 import { TextIcon } from "../icons";

-import { useExcalidrawSetAppState } from "../App";
+import { isDefaultFont } from "./FontPicker";

 interface FontPickerTriggerProps {
  selectedFontFamily: FontFamilyValues | null;
-  isOpened?: boolean;
-  compactMode?: boolean;
 }

 export const FontPickerTrigger = ({
  selectedFontFamily,
-  isOpened = false,
-  compactMode = false,
 }: FontPickerTriggerProps) => {
-  const setAppState = useExcalidrawSetAppState();
-
-  const compactStyle = compactMode
-    ? {
-        ...MOBILE_ACTION_BUTTON_BG,
-        width: "2rem",
-        height: "2rem",
-      }
-    : {};
+  const isTriggerActive = useMemo(
+    () => Boolean(selectedFontFamily && !isDefaultFont(selectedFontFamily)),
+    [selectedFontFamily],
+  );

  return (
    <Popover.Trigger asChild>
-      <div data-openpopup="fontFamily" className="properties-trigger">
+      {/* Empty div as trigger so it's stretched 100% due to different button sizes */}
+      <div>
        <ButtonIcon
          standalone
          icon={TextIcon}
          title={t("labels.showFonts")}
          className="properties-trigger"
          testId={"font-family-show-fonts"}
-          active={isOpened}
-          onClick={() => {
-            setAppState((appState) => ({
-              openPopup:
-                appState.openPopup === "fontFamily" ? null : appState.openPopup,
-            }));
-          }}
-          style={{
-            border: "none",
-            ...compactStyle,
-          }}
+          active={isTriggerActive}
+          // no-op
+          onClick={() => {}}
        />
      </div>
    </Popover.Trigger>
@@ -18,7 +18,7 @@ type LockIconProps = {
 export const HandButton = (props: LockIconProps) => {
  return (
    <ToolButton
-      className={clsx("Shape", { fillable: false, active: props.checked })}
+      className={clsx("Shape", { fillable: false })}
      type="radio"
      icon={handIcon}
      name="editor-current-shape"
@@ -2,12 +2,11 @@ import React from "react";

 import { isDarwin, isFirefox, isWindows } from "@excalidraw/common";

-import { KEYS } from "@excalidraw/common";
+import { KEYS, getShortcutKey } from "@excalidraw/common";

 import { getShortcutFromShortcutName } from "../actions/shortcuts";
 import { probablySupportsClipboardBlob } from "../clipboard";
 import { t } from "../i18n";
-import { getShortcutKey } from "../shortcut";

 import { Dialog } from "./Dialog";
 import { ExternalLinkIcon, GithubIcon, youtubeIcon } from "./icons";
@@ -28,24 +28,11 @@ $wide-viewport-width: 1000px;
    > span {
      padding: 0.25rem;
    }
-
-    kbd {
-      display: inline-block;
-      margin: 0 1px;
-      font-family: monospace;
-      border: 1px solid var(--color-gray-40);
-      border-radius: 4px;
-      padding: 1px 3px;
-      font-size: 10px;
-    }
  }

  &.theme--dark {
    .HintViewer {
      color: var(--color-gray-60);
-      kbd {
-        border-color: var(--color-gray-60);
-      }
    }
  }
 }
@@ -9,35 +9,29 @@ import {
  isTextElement,
 } from "@excalidraw/element";

+import { getShortcutKey } from "@excalidraw/common";
+
 import { isNodeInFlowchart } from "@excalidraw/element";

-import type { EditorInterface } from "@excalidraw/common";
-
 import { t } from "../i18n";
-import { getShortcutKey } from "../shortcut";
 import { isEraserActive } from "../appState";
 import { isGridModeEnabled } from "../snapping";

 import "./HintViewer.scss";

-import type { AppClassProperties, UIAppState } from "../types";
+import type { AppClassProperties, Device, UIAppState } from "../types";

 interface HintViewerProps {
  appState: UIAppState;
  isMobile: boolean;
-  editorInterface: EditorInterface;
+  device: Device;
  app: AppClassProperties;
 }

-const getTaggedShortcutKey = (key: string | string[]) =>
-  Array.isArray(key)
-    ? `<kbd>${key.map(getShortcutKey).join(" + ")}</kbd>`
-    : `<kbd>${getShortcutKey(key)}</kbd>`;
-
 const getHints = ({
  appState,
  isMobile,
-  editorInterface,
+  device,
  app,
 }: HintViewerProps): null | string | string[] => {
  const { activeTool, isResizing, isRotating, lastPointerDownWith } = appState;
@@ -48,31 +42,22 @@ const getHints = ({
    appState.openSidebar.tab === CANVAS_SEARCH_TAB &&
    appState.searchMatches?.matches.length
  ) {
-    return t("hints.dismissSearch", {
-      shortcut: getTaggedShortcutKey("Escape"),
-    });
+    return t("hints.dismissSearch");
  }

-  if (appState.openSidebar && !editorInterface.canFitSidebar) {
+  if (appState.openSidebar && !device.editor.canFitSidebar) {
    return null;
  }

  if (isEraserActive(appState)) {
-    return t("hints.eraserRevert", {
-      shortcut: getTaggedShortcutKey("Alt"),
-    });
+    return t("hints.eraserRevert");
  }
  if (activeTool.type === "arrow" || activeTool.type === "line") {
    if (multiMode) {
-      return t("hints.linearElementMulti", {
-        shortcut_1: getTaggedShortcutKey("Escape"),
-        shortcut_2: getTaggedShortcutKey("Enter"),
-      });
+      return t("hints.linearElementMulti");
    }
    if (activeTool.type === "arrow") {
-      return t("hints.arrowTool", {
-        shortcut: getTaggedShortcutKey("A"),
-      });
+      return t("hints.arrowTool", { arrowShortcut: getShortcutKey("A") });
    }
    return t("hints.linearElement");
  }
@@ -98,51 +83,31 @@ const getHints = ({
  ) {
    const targetElement = selectedElements[0];
    if (isLinearElement(targetElement) && targetElement.points.length === 2) {
-      return t("hints.lockAngle", {
-        shortcut: getTaggedShortcutKey("Shift"),
-      });
+      return t("hints.lockAngle");
    }
    return isImageElement(targetElement)
-      ? t("hints.resizeImage", {
-          shortcut_1: getTaggedShortcutKey("Shift"),
-          shortcut_2: getTaggedShortcutKey("Alt"),
-        })
-      : t("hints.resize", {
-          shortcut_1: getTaggedShortcutKey("Shift"),
-          shortcut_2: getTaggedShortcutKey("Alt"),
-        });
+      ? t("hints.resizeImage")
+      : t("hints.resize");
  }

  if (isRotating && lastPointerDownWith === "mouse") {
-    return t("hints.rotate", {
-      shortcut: getTaggedShortcutKey("Shift"),
-    });
+    return t("hints.rotate");
  }

  if (selectedElements.length === 1 && isTextElement(selectedElements[0])) {
-    return t("hints.text_selected", {
-      shortcut: getTaggedShortcutKey("Enter"),
-    });
+    return t("hints.text_selected");
  }

  if (appState.editingTextElement) {
-    return t("hints.text_editing", {
-      shortcut_1: getTaggedShortcutKey("Escape"),
-      shortcut_2: getTaggedShortcutKey(["CtrlOrCmd", "Enter"]),
-    });
+    return t("hints.text_editing");
  }

  if (appState.croppingElementId) {
-    return t("hints.leaveCropEditor", {
-      shortcut_1: getTaggedShortcutKey("Enter"),
-      shortcut_2: getTaggedShortcutKey("Escape"),
-    });
+    return t("hints.leaveCropEditor");
  }

  if (selectedElements.length === 1 && isImageElement(selectedElements[0])) {
-    return t("hints.enterCropEditor", {
-      shortcut: getTaggedShortcutKey("Enter"),
-    });
+    return t("hints.enterCropEditor");
  }

  if (activeTool.type === "selection") {
@@ -152,57 +117,33 @@ const getHints = ({
      !appState.editingTextElement &&
      !appState.selectedLinearElement?.isEditing
    ) {
-      return t("hints.deepBoxSelect", {
-        shortcut: getTaggedShortcutKey("CtrlOrCmd"),
-      });
+      return [t("hints.deepBoxSelect")];
    }

    if (isGridModeEnabled(app) && appState.selectedElementsAreBeingDragged) {
-      return t("hints.disableSnapping", {
-        shortcut: getTaggedShortcutKey("CtrlOrCmd"),
-      });
+      return t("hints.disableSnapping");
    }

    if (!selectedElements.length && !isMobile) {
-      return t("hints.canvasPanning", {
-        shortcut_1: getTaggedShortcutKey(t("keys.mmb")),
-        shortcut_2: getTaggedShortcutKey("Space"),
-      });
+      return [t("hints.canvasPanning")];
    }

    if (selectedElements.length === 1) {
      if (isLinearElement(selectedElements[0])) {
        if (appState.selectedLinearElement?.isEditing) {
          return appState.selectedLinearElement.selectedPointsIndices
-            ? t("hints.lineEditor_pointSelected", {
-                shortcut_1: getTaggedShortcutKey("Delete"),
-                shortcut_2: getTaggedShortcutKey(["CtrlOrCmd", "D"]),
-              })
-            : t("hints.lineEditor_nothingSelected", {
-                shortcut_1: getTaggedShortcutKey("Shift"),
-                shortcut_2: getTaggedShortcutKey("Alt"),
-              });
+            ? t("hints.lineEditor_pointSelected")
+            : t("hints.lineEditor_nothingSelected");
        }
        return isLineElement(selectedElements[0])
-          ? t("hints.lineEditor_line_info", {
-              shortcut: getTaggedShortcutKey("Enter"),
-            })
-          : t("hints.lineEditor_info", {
-              shortcut_1: getTaggedShortcutKey("CtrlOrCmd"),
-              shortcut_2: getTaggedShortcutKey(["CtrlOrCmd", "Enter"]),
-            });
+          ? t("hints.lineEditor_line_info")
+          : t("hints.lineEditor_info");
      }
      if (
        !appState.newElement &&
        !appState.selectedElementsAreBeingDragged &&
        isTextBindableContainer(selectedElements[0])
      ) {
-        const bindTextToElement = t("hints.bindTextToElement", {
-          shortcut: getTaggedShortcutKey("Enter"),
-        });
-        const createFlowchart = t("hints.createFlowchart", {
-          shortcut: getTaggedShortcutKey(["CtrlOrCmd", "↑↓"]),
-        });
        if (isFlowchartNodeElement(selectedElements[0])) {
          if (
            isNodeInFlowchart(
@@ -210,13 +151,13 @@ const getHints = ({
              app.scene.getNonDeletedElementsMap(),
            )
          ) {
-            return [bindTextToElement, createFlowchart];
+            return [t("hints.bindTextToElement"), t("hints.createFlowchart")];
          }

-          return [bindTextToElement, createFlowchart];
+          return [t("hints.bindTextToElement"), t("hints.createFlowchart")];
        }

-        return bindTextToElement;
+        return t("hints.bindTextToElement");
      }
    }
  }
@@ -227,13 +168,13 @@ const getHints = ({
 export const HintViewer = ({
  appState,
  isMobile,
-  editorInterface,
+  device,
  app,
 }: HintViewerProps) => {
  const hints = getHints({
    appState,
    isMobile,
-    editorInterface,
+    device,
    app,
  });

@@ -242,21 +183,16 @@ export const HintViewer = ({
  }

  const hint = Array.isArray(hints)
-    ? hints.map((hint) => hint.replace(/\. ?$/, "")).join(", ")
-    : hints;
-
-  const hintJSX = hint.split(/(<kbd>[^<]+<\/kbd>)/g).map((part, index) => {
-    if (index % 2 === 1) {
-      const shortcutMatch =
-        part[0] === "<" && part.match(/^<kbd>([^<]+)<\/kbd>$/);
-      return <kbd key={index}>{shortcutMatch ? shortcutMatch[1] : part}</kbd>;
-    }
-    return part;
-  });
+    ? hints
+        .map((hint) => {
+          return getShortcutKey(hint).replace(/\. ?$/, "");
+        })
+        .join(". ")
+    : getShortcutKey(hints);

  return (
    <div className="HintViewer">
-      <span>{hintJSX}</span>
+      <span>{hint}</span>
    </div>
  );
 };
@@ -8,7 +8,7 @@ import { atom, useAtom } from "../editor-jotai";
 import { getLanguage, t } from "../i18n";

 import Collapsible from "./Stats/Collapsible";
-import { useEditorInterface, useExcalidrawContainer } from "./App";
+import { useDevice } from "./App";

 import "./IconPicker.scss";

@@ -38,8 +38,7 @@ function Picker<T>({
  onClose: () => void;
  numberOfOptionsToAlwaysShow?: number;
 }) {
-  const editorInterface = useEditorInterface();
-  const { container } = useExcalidrawContainer();
+  const device = useDevice();

  const handleKeyDown = (event: React.KeyboardEvent) => {
    const pressedOption = options.find(
@@ -153,16 +152,17 @@ function Picker<T>({
    );
  };

-  const isMobile = editorInterface.formFactor === "phone";
-
  return (
    <Popover.Content
-      side={isMobile ? "right" : "bottom"}
+      side={
+        device.editor.isMobile && !device.viewport.isLandscape
+          ? "top"
+          : "bottom"
+      }
      align="start"
-      sideOffset={isMobile ? 8 : 12}
-      style={{ zIndex: "var(--zIndex-ui-styles-popup)" }}
+      sideOffset={12}
+      style={{ zIndex: "var(--zIndex-popup)" }}
      onKeyDown={handleKeyDown}
-      collisionBoundary={container ?? undefined}
    >
      <div
        className={`picker`}
@@ -1,20 +1,10 @@
-export const InlineIcon = ({
-  className,
-  icon,
-  size = "1em",
-}: {
-  className?: string;
-  icon: React.ReactNode;
-  size?: string;
-}) => {
+export const InlineIcon = ({ icon }: { icon: React.ReactNode }) => {
  return (
    <span
-      className={className}
      style={{
-        width: size,
-        height: "100%",
+        width: "1em",
        margin: "0 0.5ex 0 0.5ex",
-        display: "inline-flex",
+        display: "inline-block",
        lineHeight: 0,
        verticalAlign: "middle",
        flex: "0 0 auto",
@@ -24,10 +24,6 @@
      gap: 0.75rem;
      pointer-events: none !important;

-      &--compact {
-        gap: 0.5rem;
-      }
-
      & > * {
        pointer-events: var(--ui-pointerEvents);
      }
@@ -120,53 +116,4 @@
      margin-bottom: auto;
    }
  }
-
-  .disable-view-mode {
-    display: flex;
-    justify-content: center;
-    cursor: pointer;
-    align-items: center;
-    border: 1px solid var(--color-primary);
-    padding: 0.5rem;
-    border-radius: var(--border-radius-lg);
-    background-color: var(--island-bg-color);
-    text-decoration: none !important;
-
-    font-family: var(--ui-font);
-    font-size: 0.8333rem;
-    box-sizing: border-box;
-
-    width: var(--mobile-action-button-size, var(--default-button-size));
-    height: var(--mobile-action-button-size, var(--default-button-size));
-
-    border: none;
-    box-shadow: 0 0 0 1px var(--color-surface-lowest);
-    background-color: var(--color-surface-low);
-    color: var(--button-color, var(--color-on-surface)) !important;
-
-    &:active {
-      box-shadow: 0 0 0 1px var(--color-brand-active);
-    }
-
-    &:hover {
-      background-color: var(--color-primary);
-      color: white !important;
-    }
-    &:active {
-      background-color: var(--color-primary-darker);
-    }
-
-    svg {
-      width: 20px;
-      height: 20px;
-    }
-  }
-
-  .theme--dark {
-    .plus-banner {
-      &:hover {
-        color: black !important;
-      }
-    }
-  }
 }
@@ -28,11 +28,7 @@ import { useAtom, useAtomValue } from "../editor-jotai";
 import { t } from "../i18n";
 import { calculateScrollCenter } from "../scene";

-import {
-  SelectedShapeActions,
-  ShapesSwitcher,
-  CompactShapeActions,
-} from "./Actions";
+import { SelectedShapeActions, ShapesSwitcher } from "./Actions";
 import { LoadingMessage } from "./LoadingMessage";
 import { LockButton } from "./LockButton";
 import { MobileMenu } from "./MobileMenu";
@@ -45,9 +41,9 @@ import Footer from "./footer/Footer";
 import { isSidebarDockedAtom } from "./Sidebar/Sidebar";
 import MainMenu from "./main-menu/MainMenu";
 import { ActiveConfirmDialog } from "./ActiveConfirmDialog";
-import { useEditorInterface, useStylesPanelMode } from "./App";
+import { useDevice } from "./App";
 import { OverwriteConfirmDialog } from "./OverwriteConfirm/OverwriteConfirm";
-import { sidebarRightIcon } from "./icons";
+import { LibraryIcon } from "./icons";
 import { DefaultSidebar } from "./DefaultSidebar";
 import { TTDDialog } from "./TTDDialog/TTDDialog";
 import { Stats } from "./Stats";
@@ -90,7 +86,6 @@ interface LayerUIProps {
  onPenModeToggle: AppClassProperties["togglePenMode"];
  showExitZenModeBtn: boolean;
  langCode: Language["code"];
-  renderTopLeftUI?: ExcalidrawProps["renderTopLeftUI"];
  renderTopRightUI?: ExcalidrawProps["renderTopRightUI"];
  renderCustomStats?: ExcalidrawProps["renderCustomStats"];
  UIOptions: AppProps["UIOptions"];
@@ -149,7 +144,6 @@ const LayerUI = ({
  onHandToolToggle,
  onPenModeToggle,
  showExitZenModeBtn,
-  renderTopLeftUI,
  renderTopRightUI,
  renderCustomStats,
  UIOptions,
@@ -160,29 +154,9 @@ const LayerUI = ({
  isCollaborating,
  generateLinkForSelection,
 }: LayerUIProps) => {
-  const editorInterface = useEditorInterface();
-  const stylesPanelMode = useStylesPanelMode();
-  const isCompactStylesPanel = stylesPanelMode === "compact";
+  const device = useDevice();
  const tunnels = useInitializeTunnels();

-  const spacing = isCompactStylesPanel
-    ? {
-        menuTopGap: 4,
-        toolbarColGap: 4,
-        toolbarRowGap: 1,
-        toolbarInnerRowGap: 0.5,
-        islandPadding: 1,
-        collabMarginLeft: 8,
-      }
-    : {
-        menuTopGap: 6,
-        toolbarColGap: 4,
-        toolbarRowGap: 1,
-        toolbarInnerRowGap: 1,
-        islandPadding: 1,
-        collabMarginLeft: 8,
-      };
-
  const TunnelsJotaiProvider = tunnels.tunnelsJotai.Provider;

  const [eyeDropperState, setEyeDropperState] = useAtom(activeEyeDropperAtom);
@@ -235,55 +209,31 @@ const LayerUI = ({
    </div>
  );

-  const renderSelectedShapeActions = () => {
-    const isCompactMode = isCompactStylesPanel;
-
-    return (
-      <Section
-        heading="selectedShapeActions"
-        className={clsx("selected-shape-actions zen-mode-transition", {
-          "transition-left": appState.zenModeEnabled,
-        })}
+  const renderSelectedShapeActions = () => (
+    <Section
+      heading="selectedShapeActions"
+      className={clsx("selected-shape-actions zen-mode-transition", {
+        "transition-left": appState.zenModeEnabled,
+      })}
+    >
+      <Island
+        className={CLASSES.SHAPE_ACTIONS_MENU}
+        padding={2}
+        style={{
+          // we want to make sure this doesn't overflow so subtracting the
+          // approximate height of hamburgerMenu + footer
+          maxHeight: `${appState.height - 166}px`,
+        }}
      >
-        {isCompactMode ? (
-          <Island
-            className={clsx("compact-shape-actions-island")}
-            padding={0}
-            style={{
-              // we want to make sure this doesn't overflow so subtracting the
-              // approximate height of hamburgerMenu + footer
-              maxHeight: `${appState.height - 166}px`,
-            }}
-          >
-            <CompactShapeActions
-              appState={appState}
-              elementsMap={app.scene.getNonDeletedElementsMap()}
-              renderAction={actionManager.renderAction}
-              app={app}
-              setAppState={setAppState}
-            />
-          </Island>
-        ) : (
-          <Island
-            className={CLASSES.SHAPE_ACTIONS_MENU}
-            padding={2}
-            style={{
-              // we want to make sure this doesn't overflow so subtracting the
-              // approximate height of hamburgerMenu + footer
-              maxHeight: `${appState.height - 166}px`,
-            }}
-          >
-            <SelectedShapeActions
-              appState={appState}
-              elementsMap={app.scene.getNonDeletedElementsMap()}
-              renderAction={actionManager.renderAction}
-              app={app}
-            />
-          </Island>
-        )}
-      </Section>
-    );
-  };
+        <SelectedShapeActions
+          appState={appState}
+          elementsMap={app.scene.getNonDeletedElementsMap()}
+          renderAction={actionManager.renderAction}
+          app={app}
+        />
+      </Island>
+    </Section>
+  );

  const renderFixedSideContainer = () => {
    const shouldRenderSelectedShapeActions = showSelectedShapeActions(
@@ -300,19 +250,9 @@ const LayerUI = ({
    return (
      <FixedSideContainer side="top">
        <div className="App-menu App-menu_top">
-          <Stack.Col
-            gap={spacing.menuTopGap}
-            className={clsx("App-menu_top__left")}
-          >
+          <Stack.Col gap={6} className={clsx("App-menu_top__left")}>
            {renderCanvasActions()}
-            <div
-              className={clsx("selected-shape-actions-container", {
-                "selected-shape-actions-container--compact":
-                  isCompactStylesPanel,
-              })}
-            >
-              {shouldRenderSelectedShapeActions && renderSelectedShapeActions()}
-            </div>
+            {shouldRenderSelectedShapeActions && renderSelectedShapeActions()}
          </Stack.Col>
          {!appState.viewModeEnabled &&
            appState.openDialog?.name !== "elementLinkSelector" && (
@@ -322,28 +262,27 @@ const LayerUI = ({
                    {renderWelcomeScreen && (
                      <tunnels.WelcomeScreenToolbarHintTunnel.Out />
                    )}
-                    <Stack.Col gap={spacing.toolbarColGap} align="start">
+                    <Stack.Col gap={4} align="start">
                      <Stack.Row
-                        gap={spacing.toolbarRowGap}
+                        gap={1}
                        className={clsx("App-toolbar-container", {
                          "zen-mode": appState.zenModeEnabled,
                        })}
                      >
                        <Island
-                          padding={spacing.islandPadding}
+                          padding={1}
                          className={clsx("App-toolbar", {
                            "zen-mode": appState.zenModeEnabled,
-                            "App-toolbar--compact": isCompactStylesPanel,
                          })}
                        >
                          <HintViewer
                            appState={appState}
-                            isMobile={editorInterface.formFactor === "phone"}
-                            editorInterface={editorInterface}
+                            isMobile={device.editor.isMobile}
+                            device={device}
                            app={app}
                          />
                          {heading}
-                          <Stack.Row gap={spacing.toolbarInnerRowGap}>
+                          <Stack.Row gap={1}>
                            <PenModeButton
                              zenModeEnabled={appState.zenModeEnabled}
                              checked={appState.penMode}
@@ -367,7 +306,7 @@ const LayerUI = ({
                            />

                            <ShapesSwitcher
-                              setAppState={setAppState}
+                              appState={appState}
                              activeTool={appState.activeTool}
                              UIOptions={UIOptions}
                              app={app}
@@ -377,7 +316,7 @@ const LayerUI = ({
                        {isCollaborating && (
                          <Island
                            style={{
-                              marginLeft: spacing.collabMarginLeft,
+                              marginLeft: 8,
                              alignSelf: "center",
                              height: "fit-content",
                            }}
@@ -405,7 +344,6 @@ const LayerUI = ({
              "layer-ui__wrapper__top-right zen-mode-transition",
              {
                "transition-right": appState.zenModeEnabled,
-                "layer-ui__wrapper__top-right--compact": isCompactStylesPanel,
              },
            )}
          >
@@ -415,10 +353,7 @@ const LayerUI = ({
                userToFollow={appState.userToFollow?.socketId || null}
              />
            )}
-            {renderTopRightUI?.(
-              editorInterface.formFactor === "phone",
-              appState,
-            )}
+            {renderTopRightUI?.(device.editor.isMobile, appState)}
            {!appState.viewModeEnabled &&
              appState.openDialog?.name !== "elementLinkSelector" &&
              // hide button when sidebar docked
@@ -449,9 +384,7 @@ const LayerUI = ({
          trackEvent(
            "sidebar",
            `toggleDock (${docked ? "dock" : "undock"})`,
-            `(${
-              editorInterface.formFactor === "phone" ? "mobile" : "desktop"
-            })`,
+            `(${device.editor.isMobile ? "mobile" : "desktop"})`,
          );
        }}
      />
@@ -472,21 +405,21 @@ const LayerUI = ({
      <DefaultMainMenu UIOptions={UIOptions} />
      <DefaultSidebar.Trigger
        __fallback
-        icon={sidebarRightIcon}
+        icon={LibraryIcon}
        title={capitalizeString(t("toolBar.library"))}
        onToggle={(open) => {
          if (open) {
            trackEvent(
              "sidebar",
              `${DEFAULT_SIDEBAR.name} (open)`,
-              `button (${
-                editorInterface.formFactor === "phone" ? "mobile" : "desktop"
-              })`,
+              `button (${device.editor.isMobile ? "mobile" : "desktop"})`,
            );
          }
        }}
        tab={DEFAULT_SIDEBAR.defaultTab}
-      />
+      >
+        {t("toolBar.library")}
+      </DefaultSidebar.Trigger>
      <DefaultOverwriteConfirmDialog />
      {appState.openDialog?.name === "ttd" && <TTDDialog __fallback />}
      {/* ------------------------------------------------------------------ */}
@@ -497,7 +430,7 @@ const LayerUI = ({
          {appState.errorMessage}
        </ErrorDialog>
      )}
-      {eyeDropperState && editorInterface.formFactor !== "phone" && (
+      {eyeDropperState && !device.editor.isMobile && (
        <EyeDropper
          colorPickerType={eyeDropperState.colorPickerType}
          onCancel={() => {
@@ -576,7 +509,7 @@ const LayerUI = ({
          }
        />
      )}
-      {editorInterface.formFactor === "phone" && (
+      {device.editor.isMobile && (
        <MobileMenu
          app={app}
          appState={appState}
@@ -585,23 +518,25 @@ const LayerUI = ({
          renderJSONExportDialog={renderJSONExportDialog}
          renderImageExportDialog={renderImageExportDialog}
          setAppState={setAppState}
+          onLockToggle={onLockToggle}
          onHandToolToggle={onHandToolToggle}
          onPenModeToggle={onPenModeToggle}
-          renderTopLeftUI={renderTopLeftUI}
          renderTopRightUI={renderTopRightUI}
+          renderCustomStats={renderCustomStats}
          renderSidebars={renderSidebars}
+          device={device}
          renderWelcomeScreen={renderWelcomeScreen}
          UIOptions={UIOptions}
        />
      )}
-      {editorInterface.formFactor !== "phone" && (
+      {!device.editor.isMobile && (
        <>
          <div
            className="layer-ui__wrapper"
            style={
              appState.openSidebar &&
              isSidebarDocked &&
-              editorInterface.canFitSidebar
+              device.editor.canFitSidebar
                ? { width: `calc(100% - var(--right-sidebar-width))` }
                : {}
            }
@@ -133,10 +133,15 @@
  }

  .layer-ui__library .library-menu-dropdown-container {
-    z-index: 1;
    position: relative;
+
    &--in-heading {
-      margin-left: auto;
+      padding: 0;
+      position: absolute;
+      top: 1rem;
+      right: 0.75rem;
+      z-index: 1;
+
      .dropdown-menu {
        top: 100%;
      }
--- a/Show More
+++ b/Show More