fix: extend wait time for file loading on mobile devices

.env.development

@@ -12,7 +12,7 @@ VITE_APP_WS_SERVER_URL=http://localhost:3002
 VITE_APP_PLUS_LP=https://plus.excalidraw.com
 VITE_APP_PLUS_APP=http://localhost:3000
 
-VITE_APP_AI_BACKEND=http://localhost:3016
+VITE_APP_AI_BACKEND=http://localhost:3015
 
 VITE_APP_FIREBASE_CONFIG='{"apiKey":"AIzaSyCMkxA60XIW8KbqMYL7edC4qT5l4qHX2h8","authDomain":"excalidraw-oss-dev.firebaseapp.com","projectId":"excalidraw-oss-dev","storageBucket":"excalidraw-oss-dev.appspot.com","messagingSenderId":"664559512677","appId":"1:664559512677:web:a385181f2928d328a7aa8c"}'
 
@@ -27,7 +27,7 @@ VITE_APP_ENABLE_TRACKING=true
 FAST_REFRESH=false
 
 # The port the run the dev server
-VITE_APP_PORT=3001
+VITE_APP_PORT=3000
 
 #Debug flags
 

.github/workflows/autorelease-excalidraw.yml

@@ -12,10 +12,10 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 2
-      - name: Setup Node.js
+      - name: Setup Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 20.x
+          node-version: 18.x
       - name: Set up publish access
         run: |
           npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}

.github/workflows/lint.yml

@@ -9,10 +9,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Setup Node.js
+      - name: Setup Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 20.x
+          node-version: 18.x
 
       - name: Install and lint
         run: |

.github/workflows/locales-coverage.yml

@@ -14,10 +14,10 @@ jobs:
         with:
           token: ${{ secrets.PUSH_TRANSLATIONS_COVERAGE_PAT }}
 
-      - name: Setup Node.js
+      - name: Setup Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 20.x
+          node-version: 18.x
 
       - name: Create report file
         run: |

.github/workflows/sentry-production.yml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Setup Node.js
+      - name: Setup Node.js 18.x
         uses: actions/setup-node@v2
         with:
-          node-version: 20.x
+          node-version: 18.x
       - name: Install and build
         run: |
           yarn --frozen-lockfile
@@ -28,7 +28,7 @@ jobs:
           export SENTRY_RELEASE=$(sentry-cli releases propose-version)
           sentry-cli releases new $SENTRY_RELEASE --project $SENTRY_PROJECT
           sentry-cli releases set-commits --auto $SENTRY_RELEASE
-          sentry-cli sourcemaps upload --release $SENTRY_RELEASE --no-rewrite ./build/static/js/ --url-prefix "~/static/js"
+          sentry-cli releases files $SENTRY_RELEASE upload-sourcemaps --no-rewrite ./build/static/js/ --url-prefix "~/static/js"
           sentry-cli releases finalize $SENTRY_RELEASE
           sentry-cli releases deploys $SENTRY_RELEASE new -e production
         env:

.github/workflows/size-limit.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
-      - name: Setup Node.js
+      - name: Setup Node.js 18.x
         uses: actions/setup-node@v3
         with:
-          node-version: 20.x
+          node-version: 18.x
       - name: Install in packages/excalidraw
         run: yarn
         working-directory: packages/excalidraw

.github/workflows/test-coverage-pr.yml

@@ -14,7 +14,7 @@ jobs:
       - name: "Install Node"
         uses: actions/setup-node@v2
         with:
-          node-version: "20.x"
+          node-version: "18.x"
       - name: "Install Deps"
         run: yarn install
       - name: "Test Coverage"

.github/workflows/test.yml

@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Setup Node.js
+      - name: Setup Node.js 18.x
         uses: actions/setup-node@v4
         with:
-          node-version: 20.x
+          node-version: 18.x
       - name: Install and test
         run: |
           yarn install

.nvmrc

@@ -0,0 +1 @@
+18

README.md

@@ -23,17 +23,23 @@
 <br />
 <p align="center">
   <a href="https://github.com/excalidraw/excalidraw/blob/master/LICENSE">
-    <img alt="Excalidraw is released under the MIT license." src="https://img.shields.io/badge/license-MIT-blue.svg"  /></a>
+    <img alt="Excalidraw is released under the MIT license." src="https://img.shields.io/badge/license-MIT-blue.svg"  />
+  </a>
   <a href="https://www.npmjs.com/package/@excalidraw/excalidraw">
-    <img alt="npm downloads/month" src="https://img.shields.io/npm/dm/@excalidraw/excalidraw"  /></a>
+    <img alt="npm downloads/month" src="https://img.shields.io/npm/dm/@excalidraw/excalidraw"  />
+  </a>
   <a href="https://docs.excalidraw.com/docs/introduction/contributing">
-    <img alt="PRs welcome!" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat"  /></a>
+    <img alt="PRs welcome!" src="https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat"  />
+  </a>
   <a href="https://discord.gg/UexuTaE">
-    <img alt="Chat on Discord" src="https://img.shields.io/discord/723672430744174682?color=738ad6&label=Chat%20on%20Discord&logo=discord&logoColor=ffffff&widge=false"/></a>
+    <img alt="Chat on Discord" src="https://img.shields.io/discord/723672430744174682?color=738ad6&label=Chat%20on%20Discord&logo=discord&logoColor=ffffff&widge=false"/>
+  </a>
   <a href="https://deepwiki.com/excalidraw/excalidraw">
-    <img alt="Ask DeepWiki" src="https://deepwiki.com/badge.svg" /></a>
+    <img alt="Ask DeepWiki" src="https://deepwiki.com/badge.svg" />
+  </a>
   <a href="https://twitter.com/excalidraw">
-    <img alt="Follow Excalidraw on Twitter" src="https://img.shields.io/twitter/follow/excalidraw.svg?label=follow+@excalidraw&style=social&logo=twitter"/></a>
+    <img alt="Follow Excalidraw on Twitter" src="https://img.shields.io/twitter/follow/excalidraw.svg?label=follow+@excalidraw&style=social&logo=twitter"/>
+  </a>
 </p>
 
 <div align="center">

dev-docs/docs/@excalidraw/excalidraw/api/children-components/footer.mdx

@@ -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();
+  const device = useDevice();
-  if (editorInterface.formFactor === "phone") {
+  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

dev-docs/docs/@excalidraw/excalidraw/api/utils/utils-intro.md

@@ -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();
+  const device = useDevice();
-  if (editorInterface.formFactor === "phone") {
+  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 |
-| ---- | ---- | ----------- |
+| --- | --- | --- |
-
+| `viewport.isMobile` | `boolean` | Set to `true` when viewport is in `mobile` breakpoint |
-The `EditorInterface` object has the following properties:
+| `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` |
-| Name | Type | Description |
+| `editor.isMobile` | `boolean` | Set to `true` when editor container is in `mobile` breakpoint |
-| --- | --- | --- | --- | --- | --- |
+| `isTouchScreen` | `boolean` | Set to `true` for `touch` when touch event detected |
-| `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 |
 
 ### i18n
 

docker-compose.yml

@@ -1,3 +1,5 @@
+version: "3.8"
+
 services:
   excalidraw:
     build:

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

@@ -12,10 +12,10 @@ const MobileFooter = ({
   excalidrawAPI: ExcalidrawImperativeAPI;
   excalidrawLib: typeof TExcalidraw;
 }) => {
-  const { useEditorInterface, Footer } = excalidrawLib;
+  const { useDevice, Footer } = excalidrawLib;
 
-  const editorInterface = useEditorInterface();
+  const device = useDevice();
-  if (editorInterface.formFactor === "phone") {
+  if (device.editor.isMobile) {
     return (
       <Footer>
         <CustomFooter

excalidraw-app/App.tsx

@@ -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,
@@ -48,11 +48,7 @@ import {
   youtubeIcon,
 } from "@excalidraw/excalidraw/components/icons";
 import { isElementLink } from "@excalidraw/element";
-import {
+import { restore, restoreAppState } from "@excalidraw/excalidraw/data/restore";
-  bumpElementVersions,
-  restoreAppState,
-  restoreElements,
-} from "@excalidraw/excalidraw/data/restore";
 import { newElementWith } from "@excalidraw/element";
 import { isInitializedImageElement } from "@excalidraw/element";
 import clsx from "clsx";
@@ -109,8 +105,8 @@ import { TopErrorBoundary } from "./components/TopErrorBoundary";
 import {
   exportToBackend,
   getCollaborationLinkData,
-  importFromBackend,
   isCollaborationLink,
+  loadScene,
 } from "./data";
 
 import { updateStaleImageStatuses } from "./data/FileManager";
@@ -124,7 +120,6 @@ import {
   LibraryIndexedDBAdapter,
   LibraryLocalStorageMigrationAdapter,
   LocalData,
-  localStorageQuotaExceededAtom,
 } from "./data/LocalData";
 import { isBrowserStorageStateNewer } from "./data/tabSync";
 import { ShareDialog, shareDialogStateAtom } from "./share/ShareDialog";
@@ -142,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();
@@ -228,20 +220,9 @@ const initializeScene = async (opts: {
 
   const localDataState = importFromLocalStorage();
 
-  let scene: Omit<
+  let scene: RestoredDataState & {
-    RestoredDataState,
-    // we're not storing files in the scene database/localStorage, and instead
-    // fetch them async from a different store
-    "files"
-  > & {
     scrollToContent?: boolean;
-  } = {
+  } = await loadScene(null, null, localDataState);
-    elements: restoreElements(localDataState?.elements, null, {
-      repairBindings: true,
-      deleteInvisibleElements: true,
-    }),
-    appState: restoreAppState(localDataState?.appState, null),
-  };
 
   let roomLinkData = getCollaborationLinkData(window.location.href);
   const isExternalScene = !!(id || jsonBackendMatch || roomLinkData);
@@ -255,26 +236,11 @@ const initializeScene = async (opts: {
       (await openConfirmModal(shareableLinkConfirmDialog))
     ) {
       if (jsonBackendMatch) {
-        const imported = await importFromBackend(
+        scene = await loadScene(
           jsonBackendMatch[1],
           jsonBackendMatch[2],
+          localDataState,
         );
-
-        scene = {
-          elements: bumpElementVersions(
-            restoreElements(imported.elements, null, {
-              repairBindings: true,
-              deleteInvisibleElements: true,
-            }),
-            localDataState?.elements,
-          ),
-          appState: restoreAppState(
-            imported.appState,
-            // local appState when importing from backend to ensure we restore
-            // localStorage user settings which we do not persist on server.
-            localDataState?.appState,
-          ),
-        };
       }
       scene.scrollToContent = true;
       if (!roomLinkData) {
@@ -376,8 +342,6 @@ const ExcalidrawWrapper = () => {
 
   const [langCode, setLangCode] = useAppLangCode();
 
-  const editorInterface = useEditorInterface();
-
   // initial state
   // ---------------------------------------------------------------------------
 
@@ -526,10 +490,8 @@ const ExcalidrawWrapper = () => {
           loadImages(data);
           if (data.scene) {
             excalidrawAPI.updateScene({
-              elements: restoreElements(data.scene.elements, null, {
+              ...data.scene,
-                repairBindings: true,
+              ...restore(data.scene, null, null, { repairBindings: true }),
-              }),
-              appState: restoreAppState(data.scene.appState, null),
               captureUpdate: CaptureUpdateAction.IMMEDIATELY,
             });
           }
@@ -537,6 +499,11 @@ const ExcalidrawWrapper = () => {
       }
     };
 
+    const titleTimeout = setTimeout(
+      () => (document.title = APP_NAME),
+      TITLE_TIMEOUT,
+    );
+
     const syncData = debounce(() => {
       if (isTestEnv()) {
         return;
@@ -627,6 +594,7 @@ const ExcalidrawWrapper = () => {
         visibilityChange,
         false,
       );
+      clearTimeout(titleTimeout);
     };
   }, [isCollabDisabled, collabAPI, excalidrawAPI, setLangCode]);
 
@@ -701,8 +669,8 @@ const ExcalidrawWrapper = () => {
       debugRenderer(
         debugCanvasRef.current,
         appState,
-        elements,
         window.devicePixelRatio,
+        () => forceRefresh((prev) => !prev),
       );
     }
   };
@@ -766,8 +734,6 @@ const ExcalidrawWrapper = () => {
 
   const isOffline = useAtomValue(isOfflineAtom);
 
-  const localStorageQuotaExceeded = useAtomValue(localStorageQuotaExceededAtom);
-
   const onCollabDialogOpen = useCallback(
     () => setShareDialogState({ isOpen: true, type: "collaborationOnly" }),
     [setShareDialogState],
@@ -886,22 +852,14 @@ const ExcalidrawWrapper = () => {
           if (isMobile || !collabAPI || isCollabDisabled) {
             return null;
           }
-
           return (
-            <div className="excalidraw-ui-top-right">
+            <div className="top-right-ui">
-              {excalidrawAPI?.getEditorInterface().formFactor === "desktop" && (
-                <ExcalidrawPlusPromoBanner
-                  isSignedIn={isExcalidrawPlusSignedUser}
-                />
-              )}
-
               {collabError.message && <CollabError collabError={collabError} />}
               <LiveCollaborationTrigger
                 isCollaborating={isCollaborating}
                 onSelect={() =>
                   setShareDialogState({ isOpen: true, type: "share" })
                 }
-                editorInterface={editorInterface}
               />
             </div>
           );
@@ -950,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}
@@ -987,8 +940,6 @@ const ExcalidrawWrapper = () => {
           }}
         />
 
-        <AppSidebar />
-
         {errorMessage && (
           <ErrorDialog onClose={() => setErrorMessage("")}>
             {errorMessage}

excalidraw-app/app_constants.ts

@@ -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 = 3 * 1024 * 1024; // 3 MiB
-export const FILE_UPLOAD_MAX_BYTES = 4 * 1024 * 1024; // 4 MiB
 // 1 year (https://stackoverflow.com/a/25201898/927631)
 export const FILE_CACHE_MAX_AGE_SEC = 31536000;
 
@@ -46,7 +45,6 @@ export const STORAGE_KEYS = {
   VERSION_FILES: "version-files",
 
   IDB_LIBRARY: "excalidraw-library",
-  IDB_TTD_CHATS: "excalidraw-ttd-chats",
 
   // do not use apart from migrations
   __LEGACY_LOCAL_STORAGE_LIBRARY: "excalidraw-library",

excalidraw-app/collab/Collab.tsx

@@ -6,7 +6,7 @@ import {
   reconcileElements,
 } from "@excalidraw/excalidraw";
 import { ErrorDialog } from "@excalidraw/excalidraw/components/ErrorDialog";
-import { APP_NAME, cloneJSON, EVENT, toBrandedType } from "@excalidraw/common";
+import { APP_NAME, EVENT } from "@excalidraw/common";
 import {
   IDLE_THRESHOLD,
   ACTIVE_THRESHOLD,
@@ -29,8 +29,6 @@ import { withBatchedUpdates } from "@excalidraw/excalidraw/reactUtils";
 import throttle from "lodash.throttle";
 import { PureComponent } from "react";
 
-import { bumpElementVersions } from "@excalidraw/excalidraw/data/restore";
-
 import type {
   ReconciledExcalidrawElement,
   RemoteExcalidrawElement,
@@ -313,7 +311,6 @@ class Collab extends PureComponent<CollabProps, CollabState> {
   saveCollabRoomToFirebase = async (
     syncableElements: readonly SyncableExcalidrawElement[],
   ) => {
-    syncableElements = cloneJSON(syncableElements);
     try {
       const storedElements = await saveToFirebase(
         this.portal,
@@ -444,7 +441,7 @@ class Collab extends PureComponent<CollabProps, CollabState> {
   };
 
   private decryptPayload = async (
-    iv: Uint8Array<ArrayBuffer>,
+    iv: Uint8Array,
     encryptedData: ArrayBuffer,
     decryptionKey: string,
   ): Promise<ValueOf<SocketUpdateDataSource>> => {
@@ -533,10 +530,7 @@ class Collab extends PureComponent<CollabProps, CollabState> {
       return null;
     }
 
-    if (existingRoomLinkData) {
+    if (!existingRoomLinkData) {
-      // when joining existing room, don't merge it with current scene data
-      this.excalidrawAPI.resetScene();
-    } else {
       const elements = this.excalidrawAPI.getSceneElements().map((element) => {
         if (isImageElement(element) && element.status === "saved") {
           return newElementWith(element, { status: "pending" });
@@ -565,7 +559,7 @@ class Collab extends PureComponent<CollabProps, CollabState> {
     // All socket listeners are moving to Portal
     this.portal.socket.on(
       "client-broadcast",
-      async (encryptedData: ArrayBuffer, iv: Uint8Array<ArrayBuffer>) => {
+      async (encryptedData: ArrayBuffer, iv: Uint8Array) => {
         if (!this.portal.roomKey) {
           return;
         }
@@ -582,9 +576,7 @@ class Collab extends PureComponent<CollabProps, CollabState> {
           case WS_SUBTYPES.INIT: {
             if (!this.portal.socketInitialized) {
               this.initializeRoom({ fetchScene: false });
-              const remoteElements = toBrandedType<
+              const remoteElements = decryptedData.payload.elements;
-                readonly RemoteExcalidrawElement[]
-              >(decryptedData.payload.elements);
               const reconciledElements =
                 this._reconcileElements(remoteElements);
               this.handleRemoteSceneUpdate(reconciledElements);
@@ -598,11 +590,7 @@ class Collab extends PureComponent<CollabProps, CollabState> {
           }
           case WS_SUBTYPES.UPDATE:
             this.handleRemoteSceneUpdate(
-              this._reconcileElements(
+              this._reconcileElements(decryptedData.payload.elements),
-                toBrandedType<readonly RemoteExcalidrawElement[]>(
-                  decryptedData.payload.elements,
-                ),
-              ),
             );
             break;
           case WS_SUBTYPES.MOUSE_LOCATION: {
@@ -751,28 +739,17 @@ class Collab extends PureComponent<CollabProps, CollabState> {
   };
 
   private _reconcileElements = (
-    remoteElements: readonly RemoteExcalidrawElement[],
+    remoteElements: readonly ExcalidrawElement[],
   ): ReconciledExcalidrawElement[] => {
+    const localElements = this.getSceneElementsIncludingDeleted();
     const appState = this.excalidrawAPI.getAppState();
-
+    const restoredRemoteElements = restoreElements(remoteElements, null);
-    const existingElements = this.getSceneElementsIncludingDeleted();
+    const reconciledElements = reconcileElements(
-
+      localElements,
-    // NOTE ideally we restore _after_ reconciliation but we can't do that
+      restoredRemoteElements as RemoteExcalidrawElement[],
-    // as we'd regenerate even elements such as appState.newElement which would
-    // break the state
-    remoteElements = restoreElements(remoteElements, existingElements);
-
-    let reconciledElements = reconcileElements(
-      existingElements,
-      remoteElements,
       appState,
     );
 
-    reconciledElements = bumpElementVersions(
-      reconciledElements,
-      existingElements,
-    );
-
     // Avoid broadcasting to the rest of the collaborators the scene
     // we just received!
     // Note: this needs to be set before updating the scene as it

excalidraw-app/components/AI.tsx

@@ -4,15 +4,12 @@ import {
   getTextFromElements,
   MIME_TYPES,
   TTDDialog,
-  TTDStreamFetch,
 } from "@excalidraw/excalidraw";
 import { getDataURL } from "@excalidraw/excalidraw/data/blob";
 import { safelyParseJSON } from "@excalidraw/common";
 
 import type { ExcalidrawImperativeAPI } from "@excalidraw/excalidraw/types";
 
-import { TTDIndexedDBAdapter } from "../data/TTDStorage";
-
 export const AIComponents = ({
   excalidrawAPI,
 }: {
@@ -102,23 +99,61 @@ export const AIComponents = ({
       />
 
       <TTDDialog
-        onTextSubmit={async (props) => {
+        onTextSubmit={async (input) => {
-          const { onChunk, onStreamCreated, signal, messages } = props;
+          try {
+            const response = await fetch(
+              `${
+                import.meta.env.VITE_APP_AI_BACKEND
+              }/v1/ai/text-to-diagram/generate`,
+              {
+                method: "POST",
+                headers: {
+                  Accept: "application/json",
+                  "Content-Type": "application/json",
+                },
+                body: JSON.stringify({ prompt: input }),
+              },
+            );
 
-          const result = await TTDStreamFetch({
+            const rateLimit = response.headers.has("X-Ratelimit-Limit")
-            url: `${
+              ? parseInt(response.headers.get("X-Ratelimit-Limit") || "0", 10)
-              import.meta.env.VITE_APP_AI_BACKEND
+              : undefined;
-            }/v1/ai/text-to-diagram/chat-streaming`,
-            messages,
-            onChunk,
-            onStreamCreated,
-            extractRateLimits: true,
-            signal,
-          });
 
-          return result;
+            const rateLimitRemaining = response.headers.has(
+              "X-Ratelimit-Remaining",
+            )
+              ? parseInt(
+                  response.headers.get("X-Ratelimit-Remaining") || "0",
+                  10,
+                )
+              : undefined;
+
+            const json = await response.json();
+
+            if (!response.ok) {
+              if (response.status === 429) {
+                return {
+                  rateLimit,
+                  rateLimitRemaining,
+                  error: new Error(
+                    "Too many requests today, please try again tomorrow!",
+                  ),
+                };
+              }
+
+              throw new Error(json.message || "Generation failed...");
+            }
+
+            const generatedResponse = json.generatedResponse;
+            if (!generatedResponse) {
+              throw new Error("Generation failed...");
+            }
+
+            return { generatedResponse, rateLimit, rateLimitRemaining };
+          } catch (err: any) {
+            throw new Error("Request failed");
+          }
         }}
-        persistenceAdapter={TTDIndexedDBAdapter}
       />
     </>
   );

excalidraw-app/components/AppFooter.tsx

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

excalidraw-app/components/AppSidebar.scss

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

excalidraw-app/components/AppSidebar.tsx

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

excalidraw-app/components/DebugCanvas.tsx

@@ -8,15 +8,9 @@ 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,
-} from "@excalidraw/element";
-
 import {
   isLineSegment,
   type GlobalPoint,
@@ -27,17 +21,8 @@ import { isCurve } from "@excalidraw/math/curve";
 import React from "react";
 
 import type { Curve } from "@excalidraw/math";
-import type {
+
-  DebugElement,
+import type { DebugElement } from "@excalidraw/utils/visualdebug";
-  DebugPolygon,
-} from "@excalidraw/element/visualdebug";
-import type {
-  ElementsMap,
-  ExcalidrawArrowElement,
-  ExcalidrawBindableElement,
-  FixedPointBinding,
-  OrderedExcalidrawElement,
-} from "@excalidraw/element/types";
 
 import { STORAGE_KEYS } from "../app_constants";
 
@@ -78,44 +63,6 @@ const renderCubicBezier = (
   context.restore();
 };
 
-const renderPolygon = (
-  context: CanvasRenderingContext2D,
-  zoom: number,
-  polygon: DebugPolygon,
-  color: string,
-) => {
-  const { points, fill, close } = polygon;
-
-  if (points.length < 2) {
-    return;
-  }
-
-  context.save();
-  context.beginPath();
-  context.moveTo(points[0][0] * zoom, points[0][1] * zoom);
-  for (let i = 1; i < points.length; i += 1) {
-    context.lineTo(points[i][0] * zoom, points[i][1] * zoom);
-  }
-  if (close !== false) {
-    context.closePath();
-  }
-
-  if (fill) {
-    context.save();
-    context.globalAlpha = 0.15;
-    context.fillStyle = color;
-    context.fill();
-    context.restore();
-  }
-
-  context.strokeStyle = color;
-  context.stroke();
-  context.restore();
-};
-
-const isDebugPolygon = (data: DebugElement["data"]): data is DebugPolygon =>
-  (data as DebugPolygon).type === "polygon";
-
 const renderOrigin = (context: CanvasRenderingContext2D, zoom: number) => {
   context.strokeStyle = "#888";
   context.save();
@@ -128,176 +75,6 @@ const renderOrigin = (context: CanvasRenderingContext2D, zoom: number) => {
   context.save();
 };
 
-const _renderBinding = (
-  context: CanvasRenderingContext2D,
-  binding: FixedPointBinding,
-  elementsMap: ElementsMap,
-  zoom: number,
-  width: number,
-  height: number,
-  color: string,
-) => {
-  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,
-  context: CanvasRenderingContext2D,
-  elementsMap: ElementsMap,
-  zoom: number,
-  width: number,
-  height: number,
-  color: string,
-) => {
-  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,
-          elementsMap,
-          zoom,
-          dim,
-          dim,
-          element.startBinding?.mode === "orbit" ? "red" : "black",
-        );
-      }
-
-      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,
-          element.endBinding?.mode === "orbit" ? "red" : "black",
-        );
-      }
-    }
-
-    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,
@@ -321,9 +98,6 @@ const render = (
           el.color,
         );
         break;
-      case isDebugPolygon(el.data):
-        renderPolygon(context, appState.zoom.value, el.data, el.color);
-        break;
       default:
         throw new Error(`Unknown element type ${JSON.stringify(el)}`);
     }
@@ -333,8 +107,8 @@ const render = (
 const _debugRenderer = (
   canvas: HTMLCanvasElement,
   appState: AppState,
-  elements: readonly OrderedExcalidrawElement[],
   scale: number,
+  refresh: () => void,
 ) => {
   const [normalizedWidth, normalizedHeight] = getNormalizedCanvasDimensions(
     canvas,
@@ -357,7 +131,6 @@ const _debugRenderer = (
   );
 
   renderOrigin(context, appState.zoom.value);
-  renderBindings(context, elements, appState.zoom.value);
 
   if (
     window.visualDebug?.currentFrame &&
@@ -409,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 },
 );

excalidraw-app/components/ExcalidrawPlusAppLink.tsx

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

excalidraw-app/components/ExcalidrawPlusPromoBanner.tsx

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

excalidraw-app/components/GitHubCorner.tsx

@@ -0,0 +1,46 @@
+import { THEME } from "@excalidraw/common";
+import oc from "open-color";
+import React from "react";
+
+import type { Theme } from "@excalidraw/element/types";
+
+// https://github.com/tholman/github-corners
+export const GitHubCorner = React.memo(
+  ({ theme, dir }: { theme: Theme; dir: string }) => (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      width="40"
+      height="40"
+      viewBox="0 0 250 250"
+      className="rtl-mirror"
+      style={{
+        marginTop: "calc(var(--space-factor) * -1)",
+        [dir === "rtl" ? "marginLeft" : "marginRight"]:
+          "calc(var(--space-factor) * -1)",
+      }}
+    >
+      <a
+        href="https://github.com/excalidraw/excalidraw"
+        target="_blank"
+        rel="noopener noreferrer"
+        aria-label="GitHub repository"
+      >
+        <path
+          d="M0 0l115 115h15l12 27 108 108V0z"
+          fill={theme === THEME.LIGHT ? oc.gray[6] : oc.gray[7]}
+        />
+        <path
+          className="octo-arm"
+          d="M128 109c-15-9-9-19-9-19 3-7 2-11 2-11-1-7 3-2 3-2 4 5 2 11 2 11-3 10 5 15 9 16"
+          style={{ transformOrigin: "130px 106px" }}
+          fill={theme === THEME.LIGHT ? oc.white : "var(--default-bg-color)"}
+        />
+        <path
+          className="octo-body"
+          d="M115 115s4 2 5 0l14-14c3-2 6-3 8-3-8-11-15-24 2-41 5-5 10-7 16-7 1-2 3-7 12-11 0 0 5 3 7 16 4 2 8 5 12 9s7 8 9 12c14 3 17 7 17 7-4 8-9 11-11 11 0 6-2 11-7 16-16 16-30 10-41 2 0 3-1 7-5 11l-12 11c-1 1 1 5 1 5z"
+          fill={theme === THEME.LIGHT ? oc.white : "var(--default-bg-color)"}
+        />
+      </a>
+    </svg>
+  ),
+);

excalidraw-app/data/LocalData.ts

@@ -16,6 +16,7 @@ import {
   DEFAULT_SIDEBAR,
   debounce,
 } from "@excalidraw/common";
+import { clearElementsForLocalStorage } from "@excalidraw/element";
 import {
   createStore,
   entries,
@@ -26,9 +27,6 @@ import {
   get,
 } from "idb-keyval";
 
-import { appJotaiStore, atom } from "excalidraw-app/app-jotai";
-import { getNonDeletedElements } from "@excalidraw/element";
-
 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);
 
@@ -88,29 +81,19 @@ const saveDataStateToLocalStorage = (
 
     localStorage.setItem(
       STORAGE_KEYS.LOCAL_STORAGE_ELEMENTS,
-      JSON.stringify(getNonDeletedElements(elements)),
+      JSON.stringify(clearElementsForLocalStorage(elements)),
     );
     localStorage.setItem(
       STORAGE_KEYS.LOCAL_STORAGE_APP_STATE,
       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 {

excalidraw-app/data/TTDStorage.ts

@@ -1,51 +0,0 @@
-import { createStore, get, set } from "idb-keyval";
-
-import type { SavedChats } from "@excalidraw/excalidraw/components/TTDDialog/types";
-
-import { STORAGE_KEYS } from "../app_constants";
-
-/**
- * IndexedDB adapter for TTD chat storage.
- * Implements TTDPersistenceAdapter interface.
- */
-export class TTDIndexedDBAdapter {
-  /** IndexedDB database name */
-  private static idb_name = STORAGE_KEYS.IDB_TTD_CHATS;
-  /** Store key for chat data */
-  private static key = "ttdChats";
-
-  private static store = createStore(
-    `${TTDIndexedDBAdapter.idb_name}-db`,
-    `${TTDIndexedDBAdapter.idb_name}-store`,
-  );
-
-  /**
-   * Load saved chats from IndexedDB.
-   * @returns Promise resolving to saved chats array (empty if none found)
-   */
-  static async loadChats(): Promise<SavedChats> {
-    try {
-      const data = await get<SavedChats>(
-        TTDIndexedDBAdapter.key,
-        TTDIndexedDBAdapter.store,
-      );
-      return data || [];
-    } catch (error) {
-      console.warn("Failed to load TTD chats from IndexedDB:", error);
-      return [];
-    }
-  }
-
-  /**
-   * Save chats to IndexedDB.
-   * @param chats - The chats array to persist
-   */
-  static async saveChats(chats: SavedChats): Promise<void> {
-    try {
-      await set(TTDIndexedDBAdapter.key, chats, TTDIndexedDBAdapter.store);
-    } catch (error) {
-      console.warn("Failed to save TTD chats to IndexedDB:", error);
-      throw error;
-    }
-  }
-}

excalidraw-app/data/firebase.ts

@@ -1,5 +1,5 @@
 import { reconcileElements } from "@excalidraw/excalidraw";
-import { MIME_TYPES, toBrandedType } from "@excalidraw/common";
+import { MIME_TYPES } from "@excalidraw/common";
 import { decompressData } from "@excalidraw/excalidraw/data/encode";
 import {
   encryptData,
@@ -105,8 +105,8 @@ const decryptElements = async (
   data: FirebaseStoredScene,
   roomKey: string,
 ): Promise<readonly ExcalidrawElement[]> => {
-  const ciphertext = data.ciphertext.toUint8Array() as Uint8Array<ArrayBuffer>;
+  const ciphertext = data.ciphertext.toUint8Array();
-  const iv = data.iv.toUint8Array() as Uint8Array<ArrayBuffer>;
+  const iv = data.iv.toUint8Array();
 
   const decrypted = await decryptData(iv, ciphertext, roomKey);
   const decodedData = new TextDecoder("utf-8").decode(
@@ -243,7 +243,7 @@ export const saveToFirebase = async (
 
   FirebaseSceneVersionCache.set(socket, storedElements);
 
-  return toBrandedType<RemoteExcalidrawElement[]>(storedElements);
+  return storedElements;
 };
 
 export const loadFromFirebase = async (
@@ -259,9 +259,7 @@ export const loadFromFirebase = async (
   }
   const storedScene = docSnap.data() as FirebaseStoredScene;
   const elements = getSyncableElements(
-    restoreElements(await decryptElements(storedScene, roomKey), null, {
+    restoreElements(await decryptElements(storedScene, roomKey), null),
-      deleteInvisibleElements: true,
-    }),
   );
 
   if (socket) {

excalidraw-app/data/index.ts

@@ -8,6 +8,7 @@ import {
   IV_LENGTH_BYTES,
 } from "@excalidraw/excalidraw/data/encryption";
 import { serializeAsJSON } from "@excalidraw/excalidraw/data/json";
+import { restore } from "@excalidraw/excalidraw/data/restore";
 import { isInvisiblySmallElement } from "@excalidraw/element";
 import { isInitializedImageElement } from "@excalidraw/element";
 import { t } from "@excalidraw/excalidraw/i18n";
@@ -83,13 +84,13 @@ export type SocketUpdateDataSource = {
   SCENE_INIT: {
     type: WS_SUBTYPES.INIT;
     payload: {
-      elements: readonly OrderedExcalidrawElement[];
+      elements: readonly ExcalidrawElement[];
     };
   };
   SCENE_UPDATE: {
     type: WS_SUBTYPES.UPDATE;
     payload: {
-      elements: readonly OrderedExcalidrawElement[];
+      elements: readonly ExcalidrawElement[];
     };
   };
   MOUSE_LOCATION: {
@@ -199,7 +200,7 @@ const legacy_decodeFromBackend = async ({
   };
 };
 
-export const importFromBackend = async (
+const importFromBackend = async (
   id: string,
   decryptionKey: string,
 ): Promise<ImportedDataState> => {
@@ -241,6 +242,40 @@ export const importFromBackend = async (
   }
 };
 
+export const loadScene = async (
+  id: string | null,
+  privateKey: string | null,
+  // Supply local state even if importing from backend to ensure we restore
+  // localStorage user settings which we do not persist on server.
+  // Non-optional so we don't forget to pass it even if `undefined`.
+  localDataState: ImportedDataState | undefined | null,
+) => {
+  let data;
+  if (id != null && privateKey != null) {
+    // the private key is used to decrypt the content from the server, take
+    // extra care not to leak it
+    data = restore(
+      await importFromBackend(id, privateKey),
+      localDataState?.appState,
+      localDataState?.elements,
+      { repairBindings: true, refreshDimensions: false },
+    );
+  } else {
+    data = restore(localDataState || null, null, null, {
+      repairBindings: true,
+    });
+  }
+
+  return {
+    elements: data.elements,
+    appState: data.appState,
+    // note: this will always be empty because we're not storing files
+    // in the scene database/localStorage, and instead fetch them async
+    // from a different database
+    files: data.files,
+  };
+};
+
 type ExportToBackendResult =
   | { url: null; errorMessage: string }
   | { url: string; errorMessage: null };

excalidraw-app/data/localStorage.ts

@@ -2,6 +2,7 @@ import {
   clearAppStateForLocalStorage,
   getDefaultAppState,
 } from "@excalidraw/excalidraw/appState";
+import { clearElementsForLocalStorage } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 import type { AppState } from "@excalidraw/excalidraw/types";
@@ -49,7 +50,7 @@ export const importFromLocalStorage = () => {
   let elements: ExcalidrawElement[] = [];
   if (savedElements) {
     try {
-      elements = JSON.parse(savedElements);
+      elements = clearElementsForLocalStorage(JSON.parse(savedElements));
     } catch (error: any) {
       console.error(error);
       // Do nothing because elements array is already empty

excalidraw-app/debug.ts

@@ -10,6 +10,8 @@ const lessPrecise = (num: number, precision = 5) =>
 const getAvgFrameTime = (times: number[]) =>
   lessPrecise(times.reduce((a, b) => a + b) / times.length);
 
+const getFps = (frametime: number) => lessPrecise(1000 / frametime);
+
 export class Debug {
   public static DEBUG_LOG_TIMES = true;
 
@@ -22,35 +24,34 @@ export class Debug {
   private static LAST_DEBUG_LOG_CALL = 0;
   private static DEBUG_LOG_INTERVAL_ID: null | number = null;
 
-  private static LAST_FRAME_TIMESTAMP = 0;
-  private static FRAME_COUNT = 0;
-  private static ANIMATION_FRAME_ID: null | number = null;
-
-  private static scheduleAnimationFrame = () => {
-    if (Debug.DEBUG_LOG_INTERVAL_ID !== null) {
-      Debug.ANIMATION_FRAME_ID = requestAnimationFrame((timestamp) => {
-        if (Debug.LAST_FRAME_TIMESTAMP !== timestamp) {
-          Debug.LAST_FRAME_TIMESTAMP = timestamp;
-          Debug.FRAME_COUNT++;
-        }
-
-        if (Debug.DEBUG_LOG_INTERVAL_ID !== null) {
-          Debug.scheduleAnimationFrame();
-        }
-      });
-    }
-  };
-
   private static setupInterval = () => {
     if (Debug.DEBUG_LOG_INTERVAL_ID === null) {
       console.info("%c(starting perf recording)", "color: lime");
       Debug.DEBUG_LOG_INTERVAL_ID = window.setInterval(Debug.debugLogger, 1000);
-      Debug.scheduleAnimationFrame();
     }
     Debug.LAST_DEBUG_LOG_CALL = Date.now();
   };
 
   private static debugLogger = () => {
+    if (
+      Date.now() - Debug.LAST_DEBUG_LOG_CALL > 600 &&
+      Debug.DEBUG_LOG_INTERVAL_ID !== null
+    ) {
+      window.clearInterval(Debug.DEBUG_LOG_INTERVAL_ID);
+      Debug.DEBUG_LOG_INTERVAL_ID = null;
+      for (const [name, { avg }] of Object.entries(Debug.TIMES_AVG)) {
+        if (avg != null) {
+          console.info(
+            `%c${name} run avg: ${avg}ms (${getFps(avg)} fps)`,
+            "color: blue",
+          );
+        }
+      }
+      console.info("%c(stopping perf recording)", "color: red");
+      Debug.TIMES_AGGR = {};
+      Debug.TIMES_AVG = {};
+      return;
+    }
     if (Debug.DEBUG_LOG_TIMES) {
       for (const [name, { t, times }] of Object.entries(Debug.TIMES_AGGR)) {
         if (times.length) {
@@ -64,18 +65,8 @@ export class Debug {
       }
       for (const [name, { t, times, avg }] of Object.entries(Debug.TIMES_AVG)) {
         if (times.length) {
-          // const avgFrameTime = getAvgFrameTime(times);
+          const avgFrameTime = getAvgFrameTime(times);
-          const totalTime = times.reduce((a, b) => a + b);
+          console.info(name, `${avgFrameTime}ms (${getFps(avgFrameTime)} fps)`);
-          const avgFrameTime = lessPrecise(totalTime / Debug.FRAME_COUNT);
-          console.info(
-            name,
-            `- ${times.length} calls - ${avgFrameTime}ms/frame across ${
-              Debug.FRAME_COUNT
-            } frames (${lessPrecise(
-              (avgFrameTime / 16.67) * 100,
-              1,
-            )}% of frame budget)`,
-          );
           Debug.TIMES_AVG[name] = {
             t,
             times: [],
@@ -85,24 +76,6 @@ export class Debug {
         }
       }
     }
-    Debug.FRAME_COUNT = 0;
-
-    // Check for stop condition after logging
-    if (
-      Date.now() - Debug.LAST_DEBUG_LOG_CALL > 600 &&
-      Debug.DEBUG_LOG_INTERVAL_ID !== null
-    ) {
-      console.info("%c(stopping perf recording)", "color: red");
-      window.clearInterval(Debug.DEBUG_LOG_INTERVAL_ID);
-      window.cancelAnimationFrame(Debug.ANIMATION_FRAME_ID!);
-      Debug.ANIMATION_FRAME_ID = null;
-      Debug.FRAME_COUNT = 0;
-      Debug.LAST_FRAME_TIMESTAMP = 0;
-
-      Debug.DEBUG_LOG_INTERVAL_ID = null;
-      Debug.TIMES_AGGR = {};
-      Debug.TIMES_AVG = {};
-    }
   };
 
   public static logTime = (time?: number, name = "default") => {
@@ -136,7 +109,7 @@ export class Debug {
       return (...args: T) => {
         const t0 = performance.now();
         const ret = fn(...args);
-        Debug[type](performance.now() - t0, name);
+        Debug.logTime(performance.now() - t0, name);
         return ret;
       };
     };

excalidraw-app/index.html

@@ -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"

excalidraw-app/index.scss

@@ -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.75rem;
-  font-size: 0.8333rem;
   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;
     }

excalidraw-app/package.json

@@ -23,7 +23,7 @@
     ]
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": "18.0.0 - 22.x.x"
   },
   "dependencies": {
     "@excalidraw/random-username": "1.0.0",
@@ -36,7 +36,6 @@
     "react": "19.0.0",
     "react-dom": "19.0.0",
     "socket.io-client": "4.7.2",
-    "uqr": "0.1.2",
     "vite-plugin-html": "3.2.2"
   },
   "prettier": "@excalidraw/prettier-config",

excalidraw-app/sentry.ts

@@ -1,4 +1,3 @@
-import { getFeatureFlag } from "@excalidraw/common";
 import * as Sentry from "@sentry/browser";
 import callsites from "callsites";
 
@@ -34,7 +33,6 @@ Sentry.init({
     Sentry.captureConsoleIntegration({
       levels: ["error"],
     }),
-    Sentry.featureFlagsIntegration(),
   ],
   beforeSend(event) {
     if (event.request?.url) {
@@ -81,14 +79,3 @@ Sentry.init({
     return event;
   },
 });
-
-const flagsIntegration =
-  Sentry.getClient()?.getIntegrationByName<Sentry.FeatureFlagsIntegration>(
-    "FeatureFlags",
-  );
-if (flagsIntegration) {
-  flagsIntegration.addFeatureFlag(
-    "COMPLEX_BINDINGS",
-    getFeatureFlag("COMPLEX_BINDINGS"),
-  );
-}

excalidraw-app/share/QRCode.tsx

@@ -1,56 +0,0 @@
-import { useEffect, useState } from "react";
-import Spinner from "@excalidraw/excalidraw/components/Spinner";
-
-interface QRCodeProps {
-  value: string;
-}
-
-export const QRCode = ({ value }: QRCodeProps) => {
-  const [svgData, setSvgData] = useState<string | null>(null);
-  const [error, setError] = useState<boolean>(false);
-
-  useEffect(() => {
-    let mounted = true;
-
-    import("./qrcode.chunk")
-      .then(({ generateQRCodeSVG }) => {
-        if (mounted) {
-          try {
-            setSvgData(generateQRCodeSVG(value));
-          } catch {
-            setError(true);
-          }
-        }
-      })
-      .catch(() => {
-        if (mounted) {
-          setError(true);
-        }
-      });
-
-    return () => {
-      mounted = false;
-    };
-  }, [value]);
-
-  if (error) {
-    return null;
-  }
-
-  if (!svgData) {
-    return (
-      <div className="ShareDialog__active__qrcode ShareDialog__active__qrcode--loading">
-        <Spinner />
-      </div>
-    );
-  }
-
-  return (
-    <div
-      className="ShareDialog__active__qrcode"
-      role="img"
-      aria-label="QR code for collaboration link"
-      dangerouslySetInnerHTML={{ __html: svgData }}
-    />
-  );
-};

excalidraw-app/share/ShareDialog.scss

@@ -140,31 +140,6 @@
         gap: 0.75rem;
       }
 
-      &__qrcode {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        align-self: center;
-        padding: 1rem;
-        background: #fff;
-        border-radius: 0.5rem;
-        border: 1px solid #e0e0e0;
-
-        $size: 150px;
-        width: $size;
-        height: $size;
-
-        & svg {
-          width: $size;
-          height: $size;
-        }
-
-        &--loading {
-          background: var(--island-bg-color);
-          border: 1px solid var(--dialog-border-color);
-        }
-      }
-
       &__description {
         border-top: 1px solid var(--color-gray-20);
 

excalidraw-app/share/ShareDialog.tsx

@@ -22,7 +22,6 @@ import { atom, useAtom, useAtomValue } from "../app-jotai";
 import { activeRoomLinkAtom } from "../collab/Collab";
 
 import "./ShareDialog.scss";
-import { QRCode } from "./QRCode";
 
 import type { CollabAPI } from "../collab/Collab";
 
@@ -143,7 +142,6 @@ const ActiveRoomDialog = ({
           }}
         />
       </div>
-      <QRCode value={activeRoomLink} />
       <div className="ShareDialog__active__description">
         <p>
           <span

excalidraw-app/share/qrcode.chunk.ts

@@ -1,5 +0,0 @@
-import { renderSVG } from "uqr";
-
-export const generateQRCodeSVG = (text: string): string => {
-  return renderSVG(text);
-};

excalidraw-app/tests/MobileMenu.test.tsx

@@ -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", () => {
+  it("should set device correctly", () => {
-    expect(h.app.editorInterface.formFactor).toBe("phone");
+    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 () => {

excalidraw-app/vite.config.mts

@@ -102,10 +102,6 @@ export default defineConfig(({ mode }) => {
               // Taking the substring after "locales/"
               return `locales/${id.substring(index + 8)}`;
             }
-
-            if (id.includes("@excalidraw/mermaid-to-excalidraw")) {
-              return "mermaid-to-excalidraw";
-            }
           },
         },
       },
@@ -200,7 +196,6 @@ export default defineConfig(({ mode }) => {
               },
             },
           ],
-          maximumFileSizeToCacheInBytes: 2.3 * 1024 ** 2, // 2.3MB
         },
         manifest: {
           short_name: "Excalidraw",

package.json

@@ -34,7 +34,7 @@
     "prettier": "2.6.2",
     "rewire": "6.0.0",
     "rimraf": "^5.0.0",
-    "typescript": "5.9.3",
+    "typescript": "4.9.4",
     "vite": "5.0.12",
     "vite-plugin-checker": "0.7.2",
     "vite-plugin-ejs": "1.7.0",
@@ -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",

packages/common/package.json

@@ -55,11 +55,5 @@
   "scripts": {
     "gen:types": "rimraf types && tsc",
     "build:esm": "rimraf dist && node ../../scripts/buildBase.js && yarn gen:types"
-  },
-  "dependencies": {
-    "tinycolor2": "1.6.0"
-  },
-  "devDependencies": {
-    "@types/tinycolor2": "1.4.6"
   }
 }

packages/common/src/__snapshots__/colors.test.ts.snap

@@ -1,185 +0,0 @@
-// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
-
-exports[`COLOR_PALETTE > color palette doesn't regress 1`] = `
-{
-  "black": "#1e1e1e",
-  "blue": [
-    "#e7f5ff",
-    "#a5d8ff",
-    "#4dabf7",
-    "#228be6",
-    "#1971c2",
-  ],
-  "bronze": [
-    "#f8f1ee",
-    "#eaddd7",
-    "#d2bab0",
-    "#a18072",
-    "#846358",
-  ],
-  "cyan": [
-    "#e3fafc",
-    "#99e9f2",
-    "#3bc9db",
-    "#15aabf",
-    "#0c8599",
-  ],
-  "grape": [
-    "#f8f0fc",
-    "#eebefa",
-    "#da77f2",
-    "#be4bdb",
-    "#9c36b5",
-  ],
-  "gray": [
-    "#f8f9fa",
-    "#e9ecef",
-    "#ced4da",
-    "#868e96",
-    "#343a40",
-  ],
-  "green": [
-    "#ebfbee",
-    "#b2f2bb",
-    "#69db7c",
-    "#40c057",
-    "#2f9e44",
-  ],
-  "orange": [
-    "#fff4e6",
-    "#ffd8a8",
-    "#ffa94d",
-    "#fd7e14",
-    "#e8590c",
-  ],
-  "pink": [
-    "#fff0f6",
-    "#fcc2d7",
-    "#f783ac",
-    "#e64980",
-    "#c2255c",
-  ],
-  "red": [
-    "#fff5f5",
-    "#ffc9c9",
-    "#ff8787",
-    "#fa5252",
-    "#e03131",
-  ],
-  "teal": [
-    "#e6fcf5",
-    "#96f2d7",
-    "#38d9a9",
-    "#12b886",
-    "#099268",
-  ],
-  "transparent": "transparent",
-  "violet": [
-    "#f3f0ff",
-    "#d0bfff",
-    "#9775fa",
-    "#7950f2",
-    "#6741d9",
-  ],
-  "white": "#ffffff",
-  "yellow": [
-    "#fff9db",
-    "#ffec99",
-    "#ffd43b",
-    "#fab005",
-    "#f08c00",
-  ],
-}
-`;
-
-exports[`applyDarkModeFilter > COLOR_PALETTE regression tests > matches snapshot for all palette colors 1`] = `
-{
-  "black": "#d3d3d3",
-  "blue": [
-    "#121e26",
-    "#154162",
-    "#2273b4",
-    "#3791e0",
-    "#56a2e8",
-  ],
-  "bronze": [
-    "#221c1a",
-    "#362b26",
-    "#5a463d",
-    "#917569",
-    "#a98d84",
-  ],
-  "cyan": [
-    "#0a1e20",
-    "#004149",
-    "#007281",
-    "#0f8fa1",
-    "#3da5b6",
-  ],
-  "grape": [
-    "#211a25",
-    "#5b3165",
-    "#a954be",
-    "#d471ed",
-    "#e28af8",
-  ],
-  "gray": [
-    "#161718",
-    "#202325",
-    "#33383d",
-    "#6e757c",
-    "#b7bcc1",
-  ],
-  "green": [
-    "#0f1d12",
-    "#043b0c",
-    "#056715",
-    "#16842a",
-    "#39994b",
-  ],
-  "orange": [
-    "#22190d",
-    "#4c2b01",
-    "#924800",
-    "#cd6005",
-    "#f17634",
-  ],
-  "pink": [
-    "#26191e",
-    "#602e40",
-    "#b04d70",
-    "#f56e9d",
-    "#ff8dbc",
-  ],
-  "red": [
-    "#1f1717",
-    "#5a2c2c",
-    "#b44d4d",
-    "#fa6969",
-    "#ff8383",
-  ],
-  "teal": [
-    "#0a1d17",
-    "#00422b",
-    "#00744b",
-    "#039267",
-    "#32a783",
-  ],
-  "transparent": "#ededed00",
-  "violet": [
-    "#1f1c29",
-    "#4a3b72",
-    "#8a6cdf",
-    "#a885ff",
-    "#b595ff",
-  ],
-  "white": "#121212",
-  "yellow": [
-    "#1e1900",
-    "#362600",
-    "#5f3a00",
-    "#905000",
-    "#b86200",
-  ],
-}
-`;

packages/common/src/binary-heap.ts

@@ -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 = (idx + 1) << 1;
-      const child2N = child1N + 1;
+      const child1N = child2N - 1;
-      let smallestIdx = idx;
+      let swap = null;
-      let smallestScore = score;
+      let child1Score = 0;
 
-      // Check left child
       if (child1N < length) {
-        const child1Score = this.scoreFunction(this.content[child1N]);
+        const child1 = this.content[child1N];
-        if (child1Score < smallestScore) {
+        child1Score = this.scoreFunction(child1);
-          smallestIdx = child1N;
+        if (child1Score < score) {
-          smallestScore = child1Score;
+          swap = child1N;
         }
       }
 
-      // Check right child
       if (child2N < length) {
-        const child2Score = this.scoreFunction(this.content[child2N]);
+        const child2 = this.content[child2N];
-        if (child2Score < smallestScore) {
+        const child2Score = this.scoreFunction(child2);
-          smallestIdx = child2N;
+        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) {

packages/common/src/bounds.ts

@@ -1,17 +0,0 @@
-/**
- * x and y position of top left corner, x and y position of bottom right corner
- */
-export type Bounds = readonly [
-  minX: number,
-  minY: number,
-  maxX: number,
-  maxY: number,
-];
-
-export const isBounds = (box: unknown): box is Bounds =>
-  Array.isArray(box) &&
-  box.length === 4 &&
-  typeof box[0] === "number" &&
-  typeof box[1] === "number" &&
-  typeof box[2] === "number" &&
-  typeof box[3] === "number";

packages/common/src/colors.test.ts

@@ -1,286 +0,0 @@
-import {
-  applyDarkModeFilter,
-  COLOR_PALETTE,
-  rgbToHex,
-} from "@excalidraw/common";
-
-describe("COLOR_PALETTE", () => {
-  it("color palette doesn't regress", () => {
-    expect(COLOR_PALETTE).toMatchSnapshot();
-  });
-});
-
-describe("applyDarkModeFilter", () => {
-  describe("basic transformations", () => {
-    it("transforms black to near-white", () => {
-      const result = applyDarkModeFilter("#000000");
-      // Black inverted 93% + hue rotate should be near white/light gray
-      expect(result).toBe("#ededed");
-    });
-
-    it("transforms white to near-black", () => {
-      const result = applyDarkModeFilter("#ffffff");
-      // White inverted 93% should be near black/dark gray
-      expect(result).toBe("#121212");
-    });
-
-    it("transforms pure red", () => {
-      const result = applyDarkModeFilter("#ff0000");
-      // Invert 93% + hue rotate 180deg produces a cyan-ish tint
-      expect(result).toBe("#ff9090");
-    });
-
-    it("transforms pure green", () => {
-      const result = applyDarkModeFilter("#00ff00");
-      // Invert 93% + hue rotate 180deg
-      expect(result).toBe("#008f00");
-    });
-
-    it("transforms pure blue", () => {
-      const result = applyDarkModeFilter("#0000ff");
-      // Invert 93% + hue rotate 180deg produces a light purple
-      expect(result).toBe("#cdcdff");
-    });
-  });
-
-  describe("color formats", () => {
-    it("handles hex with hash", () => {
-      const result = applyDarkModeFilter("#ff0000");
-      // Fully opaque colors return 6-char hex
-      expect(result).toMatch(/^#[0-9a-f]{6}$/);
-    });
-
-    it("handles named colors", () => {
-      const result = applyDarkModeFilter("red");
-      // "red" = #ff0000, fully opaque
-      expect(result).toBe("#ff9090");
-    });
-
-    it("handles rgb format", () => {
-      const result = applyDarkModeFilter("rgb(255, 0, 0)");
-      expect(result).toBe("#ff9090");
-    });
-
-    it("handles rgba format and preserves alpha", () => {
-      const result = applyDarkModeFilter("rgba(255, 0, 0, 0.5)");
-      expect(result).toMatch(/^#[0-9a-f]{8}$/);
-      // Alpha 0.5 = 128 in hex = 80
-      expect(result).toBe("#ff909080");
-    });
-
-    it("handles transparent", () => {
-      const result = applyDarkModeFilter("transparent");
-      // transparent = rgba(0,0,0,0), inverted should still have 0 alpha
-      expect(result).toBe("#ededed00");
-    });
-
-    it("handles shorthand hex", () => {
-      const result = applyDarkModeFilter("#f00");
-      expect(result).toBe("#ff9090");
-    });
-  });
-
-  describe("alpha preservation", () => {
-    it("omits alpha for full opacity", () => {
-      const result = applyDarkModeFilter("#ff0000ff");
-      // Full opacity returns 6-char hex (no alpha suffix)
-      expect(result).toBe("#ff9090");
-    });
-
-    it("preserves 50% opacity", () => {
-      const result = applyDarkModeFilter("#ff000080");
-      expect(result.slice(-2)).toBe("80");
-    });
-
-    it("preserves 0% opacity", () => {
-      const result = applyDarkModeFilter("#ff000000");
-      expect(result.slice(-2)).toBe("00");
-    });
-  });
-
-  describe("COLOR_PALETTE regression tests", () => {
-    it("transforms black from palette", () => {
-      // COLOR_PALETTE.black is #1e1e1e (not pure black)
-      const result = applyDarkModeFilter(COLOR_PALETTE.black);
-      expect(result).toBe("#d3d3d3");
-    });
-
-    it("transforms white from palette", () => {
-      const result = applyDarkModeFilter(COLOR_PALETTE.white);
-      expect(result).toBe("#121212");
-    });
-
-    it("transforms transparent from palette", () => {
-      const result = applyDarkModeFilter(COLOR_PALETTE.transparent);
-      expect(result).toBe("#ededed00");
-    });
-
-    // Test each color family from the palette (all opaque, so 6-char hex)
-    describe("red shades", () => {
-      const redShades = COLOR_PALETTE.red;
-      it.each(redShades.map((color, i) => [color, i]))(
-        "transforms red shade %s (index %d)",
-        (color) => {
-          const result = applyDarkModeFilter(color as string);
-          expect(result).toMatch(/^#[0-9a-f]{6}$/);
-        },
-      );
-    });
-
-    describe("blue shades", () => {
-      const blueShades = COLOR_PALETTE.blue;
-      it.each(blueShades.map((color, i) => [color, i]))(
-        "transforms blue shade %s (index %d)",
-        (color) => {
-          const result = applyDarkModeFilter(color as string);
-          expect(result).toMatch(/^#[0-9a-f]{6}$/);
-        },
-      );
-    });
-
-    describe("green shades", () => {
-      const greenShades = COLOR_PALETTE.green;
-      it.each(greenShades.map((color, i) => [color, i]))(
-        "transforms green shade %s (index %d)",
-        (color) => {
-          const result = applyDarkModeFilter(color as string);
-          expect(result).toMatch(/^#[0-9a-f]{6}$/);
-        },
-      );
-    });
-
-    describe("gray shades", () => {
-      const grayShades = COLOR_PALETTE.gray;
-      it.each(grayShades.map((color, i) => [color, i]))(
-        "transforms gray shade %s (index %d)",
-        (color) => {
-          const result = applyDarkModeFilter(color as string);
-          expect(result).toMatch(/^#[0-9a-f]{6}$/);
-        },
-      );
-    });
-
-    describe("bronze shades", () => {
-      const bronzeShades = COLOR_PALETTE.bronze;
-      it.each(bronzeShades.map((color, i) => [color, i]))(
-        "transforms bronze shade %s (index %d)",
-        (color) => {
-          const result = applyDarkModeFilter(color as string);
-          expect(result).toMatch(/^#[0-9a-f]{6}$/);
-        },
-      );
-    });
-
-    // Snapshot test for full palette to catch any regressions
-    it("matches snapshot for all palette colors", () => {
-      const transformedPalette: Record<string, string | string[]> = {};
-
-      transformedPalette.black = applyDarkModeFilter(COLOR_PALETTE.black);
-      transformedPalette.white = applyDarkModeFilter(COLOR_PALETTE.white);
-      transformedPalette.transparent = applyDarkModeFilter(
-        COLOR_PALETTE.transparent,
-      );
-
-      // Transform color arrays
-      for (const colorName of [
-        "gray",
-        "red",
-        "pink",
-        "grape",
-        "violet",
-        "blue",
-        "cyan",
-        "teal",
-        "green",
-        "yellow",
-        "orange",
-        "bronze",
-      ] as const) {
-        const shades = COLOR_PALETTE[colorName];
-        transformedPalette[colorName] = shades.map((shade) =>
-          applyDarkModeFilter(shade),
-        );
-      }
-
-      expect(transformedPalette).toMatchSnapshot();
-    });
-  });
-
-  describe("caching", () => {
-    it("returns same result for same input (cached)", () => {
-      const result1 = applyDarkModeFilter("#ff0000");
-      const result2 = applyDarkModeFilter("#ff0000");
-      expect(result1).toBe(result2);
-    });
-  });
-});
-
-describe("rgbToHex", () => {
-  describe("basic RGB conversion", () => {
-    it("converts black (0,0,0)", () => {
-      expect(rgbToHex(0, 0, 0)).toBe("#000000");
-    });
-
-    it("converts white (255,255,255)", () => {
-      expect(rgbToHex(255, 255, 255)).toBe("#ffffff");
-    });
-
-    it("converts red (255,0,0)", () => {
-      expect(rgbToHex(255, 0, 0)).toBe("#ff0000");
-    });
-
-    it("converts green (0,255,0)", () => {
-      expect(rgbToHex(0, 255, 0)).toBe("#00ff00");
-    });
-
-    it("converts blue (0,0,255)", () => {
-      expect(rgbToHex(0, 0, 255)).toBe("#0000ff");
-    });
-
-    it("converts arbitrary color", () => {
-      expect(rgbToHex(30, 30, 30)).toBe("#1e1e1e");
-    });
-  });
-
-  describe("leading zeros preservation", () => {
-    it("preserves leading zeros for low values", () => {
-      expect(rgbToHex(0, 0, 1)).toBe("#000001");
-      expect(rgbToHex(0, 1, 0)).toBe("#000100");
-      expect(rgbToHex(1, 0, 0)).toBe("#010000");
-    });
-
-    it("preserves zeros for single-digit hex values", () => {
-      expect(rgbToHex(15, 15, 15)).toBe("#0f0f0f");
-    });
-  });
-
-  describe("alpha handling", () => {
-    it("omits alpha when undefined", () => {
-      expect(rgbToHex(255, 0, 0)).toBe("#ff0000");
-      expect(rgbToHex(255, 0, 0, undefined)).toBe("#ff0000");
-    });
-
-    it("omits alpha when fully opaque (1)", () => {
-      expect(rgbToHex(255, 0, 0, 1)).toBe("#ff0000");
-    });
-
-    it("includes alpha for semi-transparent (0.5)", () => {
-      // 0.5 * 255 = 127.5 -> rounds to 128 = 0x80
-      expect(rgbToHex(255, 0, 0, 0.5)).toBe("#ff000080");
-    });
-
-    it("includes alpha for fully transparent (0)", () => {
-      expect(rgbToHex(255, 0, 0, 0)).toBe("#ff000000");
-    });
-
-    it("includes alpha for near-opaque (0.99)", () => {
-      // 0.99 * 255 = 252.45 -> rounds to 252 = 0xfc
-      expect(rgbToHex(255, 0, 0, 0.99)).toBe("#ff0000fc");
-    });
-
-    it("pads alpha with leading zero when needed", () => {
-      // 0.05 * 255 = 12.75 -> rounds to 13 = 0x0d
-      expect(rgbToHex(255, 0, 0, 0.05)).toBe("#ff00000d");
-    });
-  });
-});

packages/common/src/colors.ts

@@ -1,117 +1,8 @@
-import tinycolor from "tinycolor2";
+import oc from "open-color";
 
-import { clamp } from "@excalidraw/math";
+import type { Merge } from "./utility-types";
-import { degreesToRadians } from "@excalidraw/math";
 
-import type { Degrees } from "@excalidraw/math";
+export const COLOR_OUTLINE_CONTRAST_THRESHOLD = 240;
-
-// ---------------------------------------------------------------------------
-// Dark mode color transformation
-// ---------------------------------------------------------------------------
-
-// Browser-only cache to avoid memory leaks on server
-const DARK_MODE_COLORS_CACHE: Map<string, string> | null =
-  typeof window !== "undefined" ? new Map() : null;
-
-function cssHueRotate(
-  red: number,
-  green: number,
-  blue: number,
-  degrees: Degrees,
-): { r: number; g: number; b: number } {
-  // normalize
-  const r = red / 255;
-  const g = green / 255;
-  const b = blue / 255;
-
-  // Convert degrees to radians
-  const a = degreesToRadians(degrees);
-
-  const c = Math.cos(a);
-  const s = Math.sin(a);
-
-  // rotation matrix
-  const matrix = [
-    0.213 + c * 0.787 - s * 0.213,
-    0.715 - c * 0.715 - s * 0.715,
-    0.072 - c * 0.072 + s * 0.928,
-    0.213 - c * 0.213 + s * 0.143,
-    0.715 + c * 0.285 + s * 0.14,
-    0.072 - c * 0.072 - s * 0.283,
-    0.213 - c * 0.213 - s * 0.787,
-    0.715 - c * 0.715 + s * 0.715,
-    0.072 + c * 0.928 + s * 0.072,
-  ];
-
-  // transform
-  const newR = r * matrix[0] + g * matrix[1] + b * matrix[2];
-  const newG = r * matrix[3] + g * matrix[4] + b * matrix[5];
-  const newB = r * matrix[6] + g * matrix[7] + b * matrix[8];
-
-  // clamp the values to [0, 1] range and convert back to [0, 255]
-  return {
-    r: Math.round(Math.max(0, Math.min(1, newR)) * 255),
-    g: Math.round(Math.max(0, Math.min(1, newG)) * 255),
-    b: Math.round(Math.max(0, Math.min(1, newB)) * 255),
-  };
-}
-
-const cssInvert = (
-  r: number,
-  g: number,
-  b: number,
-  percent: number,
-): { r: number; g: number; b: number } => {
-  const p = clamp(percent, 0, 100) / 100;
-
-  // Function to invert a single color component
-  const invertComponent = (color: number): number => {
-    // Apply the invert formula
-    const inverted = color * (1 - p) + (255 - color) * p;
-    // Round to the nearest integer and clamp to [0, 255]
-    return Math.round(clamp(inverted, 0, 255));
-  };
-
-  // Calculate the inverted RGB components
-  const invertedR = invertComponent(r);
-  const invertedG = invertComponent(g);
-  const invertedB = invertComponent(b);
-
-  return { r: invertedR, g: invertedG, b: invertedB };
-};
-
-export const applyDarkModeFilter = (color: string): string => {
-  const cached = DARK_MODE_COLORS_CACHE?.get(color);
-  if (cached) {
-    return cached;
-  }
-
-  const tc = tinycolor(color);
-  const alpha = tc.getAlpha();
-
-  // order of operations matters
-  // (corresponds to "filter: invert(invertPercent) hue-rotate(hueDegrees)" in css)
-  const rgb = tc.toRgb();
-  const inverted = cssInvert(rgb.r, rgb.g, rgb.b, 93);
-  const rotated = cssHueRotate(
-    inverted.r,
-    inverted.g,
-    inverted.b,
-    180 as Degrees,
-  );
-
-  const result = rgbToHex(rotated.r, rotated.g, rotated.b, alpha);
-
-  if (DARK_MODE_COLORS_CACHE) {
-    DARK_MODE_COLORS_CACHE.set(color, result);
-  }
-
-  return result;
-};
-
-// ---------------------------------------------------------------------------
-// Color palette
-// ---------------------------------------------------------------------------
 
 // FIXME can't put to utils.ts rn because of circular dependency
 const pick = <R extends Record<string, any>, K extends readonly (keyof R)[]>(
@@ -126,7 +17,15 @@ const pick = <R extends Record<string, any>, K extends readonly (keyof R)[]>(
   }, {} as Pick<R, K[number]>) as Pick<R, K[number]>;
 };
 
+export type ColorPickerColor =
+  | Exclude<keyof oc, "indigo" | "lime">
+  | "transparent"
+  | "bronze";
 export type ColorTuple = readonly [string, string, string, string, string];
+export type ColorPalette = Merge<
+  Record<ColorPickerColor, ColorTuple>,
+  { black: "#1e1e1e"; white: "#ffffff"; transparent: "transparent" }
+>;
 
 // used general type instead of specific type (ColorPalette) to support custom colors
 export type ColorPaletteCustom = { [key: string]: ColorTuple | string };
@@ -139,30 +38,38 @@ export const DEFAULT_CHART_COLOR_INDEX = 4;
 
 export const DEFAULT_ELEMENT_STROKE_COLOR_INDEX = 4;
 export const DEFAULT_ELEMENT_BACKGROUND_COLOR_INDEX = 1;
+export const ELEMENTS_PALETTE_SHADE_INDEXES = [0, 2, 4, 6, 8] as const;
+export const CANVAS_PALETTE_SHADE_INDEXES = [0, 1, 2, 3, 4] as const;
+
+export const getSpecificColorShades = (
+  color: Exclude<
+    ColorPickerColor,
+    "transparent" | "white" | "black" | "bronze"
+  >,
+  indexArr: Readonly<ColorShadesIndexes>,
+) => {
+  return indexArr.map((index) => oc[color][index]) as any as ColorTuple;
+};
 
 export const COLOR_PALETTE = {
   transparent: "transparent",
   black: "#1e1e1e",
   white: "#ffffff",
-  // open-color from https://github.com/yeun/open-color/blob/master/open-color.js
+  // open-colors
-  // corresponds to indexes [0,2,4,6,8] (weights: 50, 200, 400, 600, 800)
+  gray: getSpecificColorShades("gray", ELEMENTS_PALETTE_SHADE_INDEXES),
-  gray: ["#f8f9fa", "#e9ecef", "#ced4da", "#868e96", "#343a40"],
+  red: getSpecificColorShades("red", ELEMENTS_PALETTE_SHADE_INDEXES),
-  red: ["#fff5f5", "#ffc9c9", "#ff8787", "#fa5252", "#e03131"],
+  pink: getSpecificColorShades("pink", ELEMENTS_PALETTE_SHADE_INDEXES),
-  pink: ["#fff0f6", "#fcc2d7", "#f783ac", "#e64980", "#c2255c"],
+  grape: getSpecificColorShades("grape", ELEMENTS_PALETTE_SHADE_INDEXES),
-  grape: ["#f8f0fc", "#eebefa", "#da77f2", "#be4bdb", "#9c36b5"],
+  violet: getSpecificColorShades("violet", ELEMENTS_PALETTE_SHADE_INDEXES),
-  violet: ["#f3f0ff", "#d0bfff", "#9775fa", "#7950f2", "#6741d9"],
+  blue: getSpecificColorShades("blue", ELEMENTS_PALETTE_SHADE_INDEXES),
-  blue: ["#e7f5ff", "#a5d8ff", "#4dabf7", "#228be6", "#1971c2"],
+  cyan: getSpecificColorShades("cyan", ELEMENTS_PALETTE_SHADE_INDEXES),
-  cyan: ["#e3fafc", "#99e9f2", "#3bc9db", "#15aabf", "#0c8599"],
+  teal: getSpecificColorShades("teal", ELEMENTS_PALETTE_SHADE_INDEXES),
-  teal: ["#e6fcf5", "#96f2d7", "#38d9a9", "#12b886", "#099268"],
+  green: getSpecificColorShades("green", ELEMENTS_PALETTE_SHADE_INDEXES),
-  green: ["#ebfbee", "#b2f2bb", "#69db7c", "#40c057", "#2f9e44"],
+  yellow: getSpecificColorShades("yellow", ELEMENTS_PALETTE_SHADE_INDEXES),
-  yellow: ["#fff9db", "#ffec99", "#ffd43b", "#fab005", "#f08c00"],
+  orange: getSpecificColorShades("orange", ELEMENTS_PALETTE_SHADE_INDEXES),
-  orange: ["#fff4e6", "#ffd8a8", "#ffa94d", "#fd7e14", "#e8590c"],
+  // radix bronze shades 3,5,7,9,11
-  // radix bronze shades [3,5,7,9,11]
   bronze: ["#f8f1ee", "#eaddd7", "#d2bab0", "#a18072", "#846358"],
-} as const;
+} as ColorPalette;
-
-export type ColorPalette = typeof COLOR_PALETTE;
-export type ColorPickerColor = keyof typeof COLOR_PALETTE;
 
 const COMMON_ELEMENT_SHADES = pick(COLOR_PALETTE, [
   "cyan",
@@ -177,6 +84,7 @@ const COMMON_ELEMENT_SHADES = pick(COLOR_PALETTE, [
   "red",
 ]);
 
+// -----------------------------------------------------------------------------
 // quick picks defaults
 // -----------------------------------------------------------------------------
 
@@ -211,6 +119,7 @@ export const DEFAULT_CANVAS_BACKGROUND_PICKS = [
   "#fdf8f6",
 ] as ColorTuple;
 
+// -----------------------------------------------------------------------------
 // palette defaults
 // -----------------------------------------------------------------------------
 
@@ -236,7 +145,8 @@ export const DEFAULT_ELEMENT_BACKGROUND_COLOR_PALETTE = {
   ...COMMON_ELEMENT_SHADES,
 } as const;
 
-// color palette helpers
+// -----------------------------------------------------------------------------
+// helpers
 // -----------------------------------------------------------------------------
 
 // !!!MUST BE WITHOUT GRAY, TRANSPARENT AND BLACK!!!
@@ -257,100 +167,7 @@ export const getAllColorsSpecificShade = (index: 0 | 1 | 2 | 3 | 4) =>
     COLOR_PALETTE.red[index],
   ] as const;
 
-// -----------------------------------------------------------------------------
+export const rgbToHex = (r: number, g: number, b: number) =>
-// other helpers
+  `#${((1 << 24) + (r << 16) + (g << 8) + b).toString(16).slice(1)}`;
-// -----------------------------------------------------------------------------
-
-export const rgbToHex = (r: number, g: number, b: number, a?: number) => {
-  // (1 << 24) adds 0x1000000 to ensure the hex string is always 7 chars,
-  // then slice(1) removes the leading "1" to get exactly 6 hex digits
-  // e.g. rgb(0,0,0) -> 0x1000000 -> "1000000" -> "000000"
-  const hex6 = `#${((1 << 24) + (r << 16) + (g << 8) + b)
-    .toString(16)
-    .slice(1)}`;
-  if (a !== undefined && a < 1) {
-    // convert alpha from 0-1 float to 0-255 int, then to 2-digit hex
-    // e.g. 0.5 -> 128 -> "80"
-    const alphaHex = Math.round(a * 255)
-      .toString(16)
-      .padStart(2, "0");
-    return `${hex6}${alphaHex}`;
-  }
-  return hex6;
-};
-
-/**
- * @returns #RRGGBB or #RRGGBBAA based on color containing non-opaque alpha,
- *  null if not valid color
- */
-export const colorToHex = (color: string): string | null => {
-  const tc = tinycolor(color);
-  if (!tc.isValid()) {
-    return null;
-  }
-  const { r, g, b, a } = tc.toRgb();
-  return rgbToHex(r, g, b, a);
-};
-
-export const isTransparent = (color: string) => {
-  return tinycolor(color).getAlpha() === 0;
-};
 
 // -----------------------------------------------------------------------------
-// color contract helpers
-// -----------------------------------------------------------------------------
-
-export const COLOR_OUTLINE_CONTRAST_THRESHOLD = 240;
-
-const calculateContrast = (r: number, g: number, b: number): number => {
-  const yiq = (r * 299 + g * 587 + b * 114) / 1000;
-  return yiq;
-};
-
-// YIQ algo, inspiration from https://stackoverflow.com/a/11868398
-export const isColorDark = (color: string, threshold = 160): boolean => {
-  // no color ("") -> assume it default to black
-  if (!color) {
-    return true;
-  }
-
-  if (isTransparent(color)) {
-    return false;
-  }
-
-  const tc = tinycolor(color);
-  if (!tc.isValid()) {
-    // invalid color -> assume it defaults to black
-    return true;
-  }
-
-  const { r, g, b } = tc.toRgb();
-  return calculateContrast(r, g, b) < threshold;
-};
-
-// -----------------------------------------------------------------------------
-// normalization
-// -----------------------------------------------------------------------------
-
-/**
- * tries to keep the input color as-is if it's valid, making minimal adjustments
- * (trimming whitespace or adding `#` to hex colors)
- */
-export const normalizeInputColor = (color: string): string | null => {
-  color = color.trim();
-  if (isTransparent(color)) {
-    return color;
-  }
-
-  const tc = tinycolor(color);
-  if (tc.isValid()) {
-    // testing for `#` first fixes a bug on Electron (more specfically, an
-    // Obsidian popout window), where a hex color without `#` is considered valid
-    if (tc.getFormat() === "hex" && !color.startsWith("#")) {
-      return `#${color}`;
-    }
-    return color;
-  }
-
-  return null;
-};

packages/common/src/constants.ts

@@ -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,22 +118,12 @@ 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 FONT_SIZES = {
-  sm: 16,
-  md: 20,
-  lg: 28,
-  xl: 36,
-} as const;
-
 export const CJK_HAND_DRAWN_FALLBACK_FONT = "Xiaolai";
 export const WINDOWS_EMOJI_FALLBACK_FONT = "Segoe UI Emoji";
 
@@ -190,8 +199,6 @@ export const THEME = {
   DARK: "dark",
 } as const;
 
-export const DARK_THEME_FILTER = "invert(93%) hue-rotate(180deg)";
-
 export const FRAME_STYLE = {
   strokeColor: "#bbb" as ExcalidrawElement["strokeColor"],
   strokeWidth: 2 as ExcalidrawElement["strokeWidth"],
@@ -245,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",
@@ -307,6 +307,9 @@ export const IDLE_THRESHOLD = 60_000;
 // Report a user active each ACTIVE_THRESHOLD milliseconds
 export const ACTIVE_THRESHOLD = 3_000;
 
+// duplicates --theme-filter, should be removed soon
+export const THEME_FILTER = "invert(93%) hue-rotate(180deg)";
+
 export const URL_QUERY_KEYS = {
   addLibrary: "addLibrary",
 } as const;
@@ -330,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];
@@ -502,12 +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;
-
-export const BIND_MODE_TIMEOUT = 700; // ms
-
-// glass background for mobile action buttons
-export const MOBILE_ACTION_BUTTON_BG = {
-  background: "var(--mobile-action-button-bg)",
-} as const;

packages/common/src/editorInterface.ts

@@ -1,222 +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
-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 = 1180; // ipad air
-
-// desktop/laptop (NOTE: not used for form factor detection)
-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;
-};

packages/common/src/index.ts

@@ -1,5 +1,4 @@
 export * from "./binary-heap";
-export * from "./bounds";
 export * from "./colors";
 export * from "./constants";
 export * from "./font-metadata";
@@ -11,4 +10,3 @@ export * from "./random";
 export * from "./url";
 export * from "./utils";
 export * from "./emitter";
-export * from "./editorInterface";

packages/common/src/keys.ts

@@ -1,4 +1,4 @@
-import { isDarwin } from "./editorInterface";
+import { isDarwin } from "./constants";
 
 import type { ValueOf } from "./utility-types";
 

packages/common/src/utils.ts

@@ -1,6 +1,10 @@
 import { average } from "@excalidraw/math";
 
-import type { FontFamilyValues, FontString } from "@excalidraw/element/types";
+import type {
+  ExcalidrawBindableElement,
+  FontFamilyValues,
+  FontString,
+} from "@excalidraw/element/types";
 
 import type {
   ActiveTool,
@@ -10,11 +14,13 @@ import type {
   Zoom,
 } from "@excalidraw/excalidraw/types";
 
+import { COLOR_PALETTE } from "./colors";
 import {
   DEFAULT_VERSION,
   ENV,
   FONT_FAMILY,
   getFontFamilyFallbacks,
+  isDarwin,
   WINDOWS_EMOJI_FALLBACK_FONT,
 } from "./constants";
 
@@ -85,8 +91,7 @@ export const isWritableElement = (
   (target instanceof HTMLInputElement &&
     (target.type === "text" ||
       target.type === "number" ||
-      target.type === "password" ||
+      target.type === "password"));
-      target.type === "search"));
 
 export const getFontFamilyString = ({
   fontFamily,
@@ -114,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,
@@ -377,10 +377,6 @@ export const removeSelection = () => {
 
 export const distance = (x: number, y: number) => Math.abs(x - y);
 
-export const isSelectionLikeTool = (type: ToolType | "custom") => {
-  return type === "selection" || type === "lasso";
-};
-
 export const updateActiveTool = (
   appState: Pick<AppState, "activeTool">,
   data: ((
@@ -422,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 },
   {
@@ -547,6 +556,19 @@ export const mapFind = <T, K>(
   return undefined;
 };
 
+export const isTransparent = (color: string) => {
+  const isRGBTransparent = color.length === 5 && color.substr(4, 1) === "0";
+  const isRRGGBBTransparent = color.length === 9 && color.substr(7, 2) === "00";
+  return (
+    isRGBTransparent ||
+    isRRGGBBTransparent ||
+    color === COLOR_PALETTE.transparent
+  );
+};
+
+export const isBindingFallthroughEnabled = (el: ExcalidrawBindableElement) =>
+  el.fillStyle !== "solid" || isTransparent(el.backgroundColor);
+
 export type ResolvablePromise<T> = Promise<T> & {
   resolve: [T] extends [undefined]
     ? (value?: MaybePromise<Awaited<T>>) => void
@@ -1146,69 +1168,39 @@ export const normalizeEOL = (str: string) => {
 };
 
 // -----------------------------------------------------------------------------
-export type HasBrand<T> = {
+type HasBrand<T> = {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  [K in keyof T]: K extends `~brand${infer _}` | "_brand" ? true : never;
+  [K in keyof T]: K extends `~brand${infer _}` ? true : never;
 }[keyof T];
 
 type RemoveAllBrands<T> = HasBrand<T> extends true
   ? {
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      [K in keyof T as K extends `~brand~${infer _}` | "_brand"
+      [K in keyof T as K extends `~brand~${infer _}` ? never : K]: T[K];
-        ? never
-        : K]: T[K];
     }
-  : T;
+  : never;
 
-// For accepting values - uses loose matching for branded types
+// adapted from https://github.com/colinhacks/zod/discussions/1994#discussioncomment-6068940
-// Preserves readonly modifier: mutable array requires mutable input
+// currently does not cover all types (e.g. tuples, promises...)
-type UnbrandForValue<T> = T extends Map<infer E, infer F>
+type Unbrand<T> = T extends Map<infer E, infer F>
-  ? Map<UnbrandForValue<E>, UnbrandForValue<F>>
+  ? Map<E, F>
   : T extends Set<infer E>
-  ? Set<UnbrandForValue<E>>
+  ? Set<E>
-  : T extends readonly any[]
+  : T extends Array<infer E>
-  ? T extends any[]
+  ? Array<E>
-    ? unknown[] // mutable array - require mutable input
-    : readonly unknown[] // readonly array - accept readonly input
   : RemoveAllBrands<T>;
 
-// For return types - preserves array element unbranding
-export type Unbrand<T> = T extends Map<infer E, infer F>
-  ? Map<Unbrand<E>, Unbrand<F>>
-  : T extends Set<infer E>
-  ? Set<Unbrand<E>>
-  : T extends readonly (infer E)[]
-  ? Array<Unbrand<E>>
-  : RemoveAllBrands<T>;
-
-export type CombineBrands<BrandedType, CurrentType> =
-  BrandedType extends readonly (infer BE)[]
-    ? CurrentType extends readonly (infer CE)[]
-      ? Array<CE & BE>
-      : CurrentType & BrandedType
-    : CurrentType & BrandedType;
-
-export type CombineBrandsIfNeeded<T, Required> = [T] extends [Required]
-  ? T[]
-  : HasBrand<T> extends true
-  ? CombineBrands<T, Required>[]
-  : Required[];
-
 /**
  * Makes type into a branded type, ensuring that value is assignable to
- * the base unbranded type. Optionally you can explicitly supply current value
+ * the base ubranded type. Optionally you can explicitly supply current value
  * type to combine both (useful for composite branded types. Make sure you
  * compose branded types which are not composite themselves.)
  */
-export function toBrandedType<BrandedType>(
+export const toBrandedType = <BrandedType, CurrentType = BrandedType>(
-  value: UnbrandForValue<BrandedType>,
+  value: Unbrand<BrandedType>,
-): BrandedType;
+) => {
-export function toBrandedType<BrandedType, CurrentType>(
+  return value as CurrentType & BrandedType;
-  value: CurrentType,
+};
-): CombineBrands<BrandedType, CurrentType>;
-export function toBrandedType(value: unknown) {
-  return value;
-}
 
 // -----------------------------------------------------------------------------
 
@@ -1286,47 +1278,3 @@ export const reduceToCommonValue = <T, R = T>(
 
   return commonValue;
 };
-
-type FEATURE_FLAGS = {
-  COMPLEX_BINDINGS: boolean;
-};
-
-const FEATURE_FLAGS_STORAGE_KEY = "excalidraw-feature-flags";
-const DEFAULT_FEATURE_FLAGS: FEATURE_FLAGS = {
-  COMPLEX_BINDINGS: false,
-};
-let featureFlags: FEATURE_FLAGS | null = null;
-
-export const getFeatureFlag = <F extends keyof FEATURE_FLAGS>(
-  flag: F,
-): FEATURE_FLAGS[F] => {
-  if (!featureFlags) {
-    try {
-      const serializedFlags = localStorage.getItem(FEATURE_FLAGS_STORAGE_KEY);
-      if (serializedFlags) {
-        const flags = JSON.parse(serializedFlags);
-        featureFlags = flags ?? DEFAULT_FEATURE_FLAGS;
-      }
-    } catch {}
-  }
-
-  return (featureFlags || DEFAULT_FEATURE_FLAGS)[flag];
-};
-
-export const setFeatureFlag = <F extends keyof FEATURE_FLAGS>(
-  flag: F,
-  value: FEATURE_FLAGS[F],
-) => {
-  try {
-    featureFlags = {
-      ...(featureFlags || DEFAULT_FEATURE_FLAGS),
-      [flag]: value,
-    };
-    localStorage.setItem(
-      FEATURE_FLAGS_STORAGE_KEY,
-      JSON.stringify(featureFlags),
-    );
-  } catch (e) {
-    console.error("unable to set feature flag", e);
-  }
-};

packages/element/package.json

@@ -17,12 +17,6 @@
       "development": "./dist/dev/index.js",
       "production": "./dist/prod/index.js",
       "default": "./dist/prod/index.js"
-    },
-    "./visualdebug": {
-      "types": "./dist/types/element/src/visualdebug.d.ts",
-      "development": "./dist/dev/visualdebug.js",
-      "production": "./dist/prod/visualdebug.js",
-      "default": "./dist/prod/visualdebug.js"
     }
   },
   "files": [

packages/element/src/Scene.ts

@@ -164,14 +164,9 @@ export class Scene {
     return this.frames;
   }
 
-  constructor(
+  constructor(elements: ElementsMapOrArray | null = null) {
-    elements: ElementsMapOrArray | null = null,
-    options?: {
-      skipValidation?: true;
-    },
-  ) {
     if (elements) {
-      this.replaceAllElements(elements, options);
+      this.replaceAllElements(elements);
     }
   }
 
@@ -268,19 +263,12 @@ export class Scene {
     return didChange;
   }
 
-  replaceAllElements(
+  replaceAllElements(nextElements: ElementsMapOrArray) {
-    nextElements: ElementsMapOrArray,
-    options?: {
-      skipValidation?: true;
-    },
-  ) {
     // 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();

packages/element/src/bounds.ts

@@ -2,7 +2,6 @@ import rough from "roughjs/bin/rough";
 
 import {
   arrayToMap,
-  type Bounds,
   invariant,
   rescalePoints,
   sizeOf,
@@ -43,7 +42,6 @@ import {
   isBoundToContainer,
   isFreeDrawElement,
   isLinearElement,
-  isLineElement,
   isTextElement,
 } from "./typeChecks";
 
@@ -79,6 +77,16 @@ export type RectangleBox = {
 
 type MaybeQuadraticSolution = [number | null, number | null] | false;
 
+/**
+ * x and y position of top left corner, x and y position of bottom right corner
+ */
+export type Bounds = readonly [
+  minX: number,
+  minY: number,
+  maxX: number,
+  maxY: number,
+];
+
 export type SceneBounds = readonly [
   sceneX: number,
   sceneY: number,
@@ -313,42 +321,19 @@ export const getElementLineSegments = (
 
   if (shape.type === "polycurve") {
     const curves = shape.data;
-    const pointsOnCurves = curves.map((curve) =>
+    const points = curves
-      pointsOnBezierCurves(curve, 10),
+      .map((curve) => pointsOnBezierCurves(curve, 10))
-    );
+      .flat();
-
+    let i = 0;
     const segments: LineSegment<GlobalPoint>[] = [];
-
+    while (i < points.length - 1) {
-    if (
+      segments.push(
-      (isLineElement(element) && !element.polygon) ||
+        lineSegment(
-      isArrowElement(element)
+          pointFrom(points[i][0], points[i][1]),
-    ) {
+          pointFrom(points[i + 1][0], points[i + 1][1]),
-      for (const points of pointsOnCurves) {
+        ),
-        let i = 0;
+      );
-
+      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++;
-        }
-      }
-    } 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++;
-      }
     }
 
     return segments;
@@ -897,7 +882,6 @@ export const getArrowheadPoints = (
   return [x2, y2, x3, y3, x4, y4];
 };
 
-// TODO reuse shape.ts
 const generateLinearElementShape = (
   element: ExcalidrawLinearElement,
 ): Drawable => {
@@ -955,7 +939,7 @@ const getLinearElementRotatedBounds = (
   }
 
   // first element is always the curve
-  const cachedShape = ShapeCache.get(element, null)?.[0];
+  const cachedShape = ShapeCache.get(element)?.[0];
   const shape = cachedShape ?? generateLinearElementShape(element);
   const ops = getCurvePathOps(shape);
   const transformXY = ([x, y]: GlobalPoint) =>
@@ -1142,9 +1126,7 @@ export interface BoundingBox {
 }
 
 export const getCommonBoundingBox = (
-  elements:
+  elements: ExcalidrawElement[] | readonly NonDeleted<ExcalidrawElement>[],
-    | readonly ExcalidrawElement[]
-    | readonly NonDeleted<ExcalidrawElement>[],
 ): BoundingBox => {
   const [minX, minY, maxX, maxY] = getCommonBounds(elements);
   return {
@@ -1268,13 +1250,6 @@ export const elementCenterPoint = (
   xOffset: number = 0,
   yOffset: number = 0,
 ) => {
-  if (isLinearElement(element)) {
-    const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
-    const [x, y] = pointFrom<GlobalPoint>((x1 + x2) / 2, (y1 + y2) / 2);
-
-    return pointFrom<GlobalPoint>(x + xOffset, y + yOffset);
-  }
-
   const [x, y] = getCenterForBounds(getElementBounds(element, elementsMap));
 
   return pointFrom<GlobalPoint>(x + xOffset, y + yOffset);

packages/element/src/collision.ts

@@ -1,4 +1,4 @@
-import { invariant, isTransparent, type Bounds } from "@excalidraw/common";
+import { isTransparent } from "@excalidraw/common";
 import {
   curveIntersectLineSegment,
   isPointWithinBounds,
@@ -29,18 +29,15 @@ import type { FrameNameBounds } from "@excalidraw/excalidraw/types";
 
 import { isPathALoop } from "./utils";
 import {
+  type Bounds,
   doBoundsIntersect,
   elementCenterPoint,
   getCenterForBounds,
   getCubicBezierCurveBound,
-  getDiamondPoints,
   getElementBounds,
-  pointInsideBounds,
 } from "./bounds";
 import {
   hasBoundTextElement,
-  isBindableElement,
-  isFrameLikeElement,
   isFreeDrawElement,
   isIframeLikeElement,
   isImageElement,
@@ -61,17 +58,12 @@ import { distanceToElement } from "./distance";
 
 import type {
   ElementsMap,
-  ExcalidrawBindableElement,
   ExcalidrawDiamondElement,
   ExcalidrawElement,
   ExcalidrawEllipseElement,
   ExcalidrawFreeDrawElement,
   ExcalidrawLinearElement,
   ExcalidrawRectanguloidElement,
-  NonDeleted,
-  NonDeletedExcalidrawElement,
-  NonDeletedSceneElementsMap,
-  Ordered,
 } from "./types";
 
 export const shouldTestInside = (element: ExcalidrawElement) => {
@@ -102,41 +94,15 @@ export type HitTestArgs = {
   threshold: number;
   elementsMap: ElementsMap;
   frameNameBound?: FrameNameBounds | null;
-  overrideShouldTestInside?: boolean;
 };
 
-let cachedPoint: GlobalPoint | null = null;
-let cachedElement: WeakRef<ExcalidrawElement> | null = null;
-let cachedThreshold: number = Infinity;
-let cachedHit: boolean = false;
-let cachedOverrideShouldTestInside = false;
-
 export const hitElementItself = ({
   point,
   element,
   threshold,
   elementsMap,
   frameNameBound = null,
-  overrideShouldTestInside = false,
 }: HitTestArgs) => {
-  // Return cached result if the same point and element version is tested again
-  if (
-    cachedPoint &&
-    pointsEqual(point, cachedPoint) &&
-    cachedThreshold <= threshold &&
-    overrideShouldTestInside === cachedOverrideShouldTestInside
-  ) {
-    const derefElement = cachedElement?.deref();
-    if (
-      derefElement &&
-      derefElement.id === element.id &&
-      derefElement.version === element.version &&
-      derefElement.versionNonce === element.versionNonce
-    ) {
-      return cachedHit;
-    }
-  }
-
   // Hit test against a frame's name
   const hitFrameName = frameNameBound
     ? isPointWithinBounds(
@@ -168,25 +134,14 @@ export const hitElementItself = ({
   }
 
   // Do the precise (and relatively costly) hit test
-  const hitElement = (
+  const hitElement = shouldTestInside(element)
-    overrideShouldTestInside ? true : shouldTestInside(element)
-  )
     ? // Since `inShape` tests STRICTLY againt the insides of a shape
       // we would need `onShape` as well to include the "borders"
       isPointInElement(point, element, elementsMap) ||
       isPointOnElementOutline(point, element, elementsMap, threshold)
     : isPointOnElementOutline(point, element, elementsMap, threshold);
 
-  const result = hitElement || hitFrameName;
+  return hitElement || hitFrameName;
-
-  // Cache end result
-  cachedPoint = point;
-  cachedElement = new WeakRef(element);
-  cachedThreshold = threshold;
-  cachedOverrideShouldTestInside = overrideShouldTestInside;
-  cachedHit = result;
-
-  return result;
 };
 
 export const hitElementBoundingBox = (
@@ -238,116 +193,6 @@ export const hitElementBoundText = (
   return isPointInElement(point, boundTextElement, elementsMap);
 };
 
-const bindingBorderTest = (
-  element: NonDeleted<ExcalidrawBindableElement>,
-  [x, y]: Readonly<GlobalPoint>,
-  elementsMap: NonDeletedSceneElementsMap,
-  tolerance: number = 0,
-): boolean => {
-  const p = pointFrom<GlobalPoint>(x, y);
-  const shouldTestInside =
-    // disable fullshape snapping for frame elements so we
-    // can bind to frame children
-    !isFrameLikeElement(element);
-
-  // PERF: Run a cheap test to see if the binding element
-  // is even close to the element
-  const t = Math.max(1, tolerance);
-  const bounds = [x - t, y - t, x + t, y + t] as Bounds;
-  const elementBounds = getElementBounds(element, elementsMap);
-  if (!doBoundsIntersect(bounds, elementBounds)) {
-    return false;
-  }
-
-  // If the element is inside a frame, we should clip the element
-  if (element.frameId) {
-    const enclosingFrame = elementsMap.get(element.frameId);
-    if (enclosingFrame && isFrameLikeElement(enclosingFrame)) {
-      const enclosingFrameBounds = getElementBounds(
-        enclosingFrame,
-        elementsMap,
-      );
-      if (!pointInsideBounds(p, enclosingFrameBounds)) {
-        return false;
-      }
-    }
-  }
-
-  // Do the intersection test against the element since it's close enough
-  const intersections = intersectElementWithLineSegment(
-    element,
-    elementsMap,
-    lineSegment(elementCenterPoint(element, elementsMap), p),
-  );
-  const distance = distanceToElement(element, elementsMap, p);
-
-  return shouldTestInside
-    ? intersections.length === 0 || distance <= tolerance
-    : intersections.length > 0 && distance <= t;
-};
-
-export const getAllHoveredElementAtPoint = (
-  point: Readonly<GlobalPoint>,
-  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
-  elementsMap: NonDeletedSceneElementsMap,
-  toleranceFn?: (element: ExcalidrawBindableElement) => number,
-): NonDeleted<ExcalidrawBindableElement>[] => {
-  const candidateElements: NonDeleted<ExcalidrawBindableElement>[] = [];
-  // We need to to hit testing from front (end of the array) to back (beginning of the array)
-  // because array is ordered from lower z-index to highest and we want element z-index
-  // with higher z-index
-  for (let index = elements.length - 1; index >= 0; --index) {
-    const element = elements[index];
-
-    invariant(
-      !element.isDeleted,
-      "Elements in the function parameter for getAllElementsAtPositionForBinding() should not contain deleted elements",
-    );
-
-    if (
-      isBindableElement(element, false) &&
-      bindingBorderTest(element, point, elementsMap, toleranceFn?.(element))
-    ) {
-      candidateElements.push(element);
-
-      if (!isTransparent(element.backgroundColor)) {
-        break;
-      }
-    }
-  }
-
-  return candidateElements;
-};
-
-export const getHoveredElementForBinding = (
-  point: Readonly<GlobalPoint>,
-  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
-  elementsMap: NonDeletedSceneElementsMap,
-  toleranceFn?: (element: ExcalidrawBindableElement) => number,
-): NonDeleted<ExcalidrawBindableElement> | null => {
-  const candidateElements = getAllHoveredElementAtPoint(
-    point,
-    elements,
-    elementsMap,
-    toleranceFn,
-  );
-
-  if (!candidateElements || candidateElements.length === 0) {
-    return null;
-  }
-
-  if (candidateElements.length === 1) {
-    return candidateElements[0];
-  }
-
-  // Prefer smaller shapes
-  return candidateElements
-    .sort(
-      (a, b) => b.width ** 2 + b.height ** 2 - (a.width ** 2 + a.height ** 2),
-    )
-    .pop() as NonDeleted<ExcalidrawBindableElement>;
-};
-
 /**
  * Intersect a line with an element for binding test
  *
@@ -709,61 +554,3 @@ export const isPointInElement = (
 
   return intersections.length % 2 === 1;
 };
-
-export const isBindableElementInsideOtherBindable = (
-  innerElement: ExcalidrawBindableElement,
-  outerElement: ExcalidrawBindableElement,
-  elementsMap: ElementsMap,
-): boolean => {
-  // Get corner points of the inner element based on its type
-  const getCornerPoints = (
-    element: ExcalidrawElement,
-    offset: number,
-  ): GlobalPoint[] => {
-    const { x, y, width, height, angle } = element;
-    const center = elementCenterPoint(element, elementsMap);
-
-    if (element.type === "diamond") {
-      // Diamond has 4 corner points at the middle of each side
-      const [topX, topY, rightX, rightY, bottomX, bottomY, leftX, leftY] =
-        getDiamondPoints(element);
-      const corners: GlobalPoint[] = [
-        pointFrom(x + topX, y + topY - offset), // top
-        pointFrom(x + rightX + offset, y + rightY), // right
-        pointFrom(x + bottomX, y + bottomY + offset), // bottom
-        pointFrom(x + leftX - offset, y + leftY), // left
-      ];
-      return corners.map((corner) => pointRotateRads(corner, center, angle));
-    }
-    if (element.type === "ellipse") {
-      // For ellipse, test points at the extremes (top, right, bottom, left)
-      const cx = x + width / 2;
-      const cy = y + height / 2;
-      const rx = width / 2;
-      const ry = height / 2;
-      const corners: GlobalPoint[] = [
-        pointFrom(cx, cy - ry - offset), // top
-        pointFrom(cx + rx + offset, cy), // right
-        pointFrom(cx, cy + ry + offset), // bottom
-        pointFrom(cx - rx - offset, cy), // left
-      ];
-      return corners.map((corner) => pointRotateRads(corner, center, angle));
-    }
-    // Rectangle and other rectangular shapes (image, text, etc.)
-    const corners: GlobalPoint[] = [
-      pointFrom(x - offset, y - offset), // top-left
-      pointFrom(x + width + offset, y - offset), // top-right
-      pointFrom(x + width + offset, y + height + offset), // bottom-right
-      pointFrom(x - offset, y + height + offset), // bottom-left
-    ];
-    return corners.map((corner) => pointRotateRads(corner, center, angle));
-  };
-
-  const offset = (-1 * Math.max(innerElement.width, innerElement.height)) / 20; // 5% offset
-  const innerCorners = getCornerPoints(innerElement, offset);
-
-  // Check if all corner points of the inner element are inside the outer element
-  return innerCorners.every((corner) =>
-    isPointInElement(corner, outerElement, elementsMap),
-  );
-};

packages/element/src/comparisons.ts

@@ -10,14 +10,7 @@ export const hasBackground = (type: ElementOrToolType) =>
   type === "freedraw";
 
 export const hasStrokeColor = (type: ElementOrToolType) =>
-  type === "rectangle" ||
+  type !== "image" && type !== "frame" && type !== "magicframe";
-  type === "ellipse" ||
-  type === "diamond" ||
-  type === "freedraw" ||
-  type === "arrow" ||
-  type === "line" ||
-  type === "text" ||
-  type === "embeddable";
 
 export const hasStrokeWidth = (type: ElementOrToolType) =>
   type === "rectangle" ||

packages/element/src/delta.ts

@@ -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>) {}
+  private constructor(public readonly delta: Delta<ObservedAppState>) {}
-
-  public static create(delta: Delta<ObservedAppState>): AppStateDelta {
-    return new AppStateDelta(delta);
-  }
 
   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 = {},
+        selectedElementIds: removedSelectedElementIds = {},
-        selectedGroupIds: deletedSelectedGroupIds = {},
+        selectedGroupIds: removedSelectedGroupIds = {},
-        lockedMultiSelections: deletedLockedMultiSelections = {},
       } = this.delta.deleted;
 
       const {
-        selectedElementIds: insertedSelectedElementIds = {},
+        selectedElementIds: addedSelectedElementIds = {},
-        selectedGroupIds: insertedSelectedGroupIds = {},
+        selectedGroupIds: addedSelectedGroupIds = {},
-        lockedMultiSelections: insertedLockedMultiSelections = {},
+        selectedLinearElementId,
-        selectedLinearElement: insertedSelectedLinearElement,
+        selectedLinearElementIsEditing,
         ...directlyApplicablePartial
       } = this.delta.inserted;
 
       const mergedSelectedElementIds = Delta.mergeObjects(
         appState.selectedElementIds,
-        insertedSelectedElementIds,
+        addedSelectedElementIds,
-        deletedSelectedElementIds,
+        removedSelectedElementIds,
       );
 
       const mergedSelectedGroupIds = Delta.mergeObjects(
         appState.selectedGroupIds,
-        insertedSelectedGroupIds,
+        addedSelectedGroupIds,
-        deletedSelectedGroupIds,
+        removedSelectedGroupIds,
       );
 
-      const mergedLockedMultiSelections = Delta.mergeObjects(
+      let selectedLinearElement = appState.selectedLinearElement;
-        appState.lockedMultiSelections,
-        insertedLockedMultiSelections,
-        deletedLockedMultiSelections,
-      );
 
-      const selectedLinearElement =
+      if (selectedLinearElementId === null) {
-        insertedSelectedLinearElement &&
+        // Unselect linear element (visible change)
-        nextElements.has(insertedSelectedLinearElement.elementId)
+        selectedLinearElement = null;
-          ? new LinearElementEditor(
+      } else if (
-              nextElements.get(
+        selectedLinearElementId &&
-                insertedSelectedLinearElement.elementId,
+        nextElements.has(selectedLinearElementId)
-              ) as NonDeleted<ExcalidrawLinearElement>,
+      ) {
-              nextElements,
+        selectedLinearElement = new LinearElementEditor(
-              insertedSelectedLinearElement.isEditing,
+          nextElements.get(
-            )
+            selectedLinearElementId,
-          : null;
+          ) 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,
-        selectedLinearElement:
-          typeof insertedSelectedLinearElement !== "undefined"
-            ? selectedLinearElement
-            : appState.selectedLinearElement,
       };
 
       const constainsVisibleChanges = this.filterInvisibleChanges(
@@ -816,53 +733,64 @@ export class AppStateDelta implements DeltaContainer<AppState> {
             }
 
             break;
-          case "selectedLinearElement":
+          case "selectedLinearElementId": {
-            const nextLinearElement = nextAppState[key];
+            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(deleted.version) &&
+      Number.isInteger(inserted.version) &&
-        Number.isInteger(inserted.version) &&
+      // versions should be positive, zero included
-        // versions should be positive, zero included
+      deleted.version >= 0 &&
-        deleted.version! >= 0 &&
+      inserted.version >= 0 &&
-        inserted.version! >= 0 &&
+      // versions should never be the same
-        // versions should never be the same
+      deleted.version !== inserted.version
-        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;
-          removed[prevElement.id] = delta;
-        } else {
-          updated[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
+        added[nextElement.id] = delta;
-        if (!nextElement.isDeleted) {
-          added[nextElement.id] = delta;
-        } else {
-          updated[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)) {
+      for (const [id, delta] of Object.entries(deltas)) {
-        inversedDeltas[id] = Delta.create({ ...inserted }, { ...deleted });
+        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(
+      const affectedElements = this.resolveConflicts(elements, nextElements);
-        elements,
-        nextElements,
-        flags.applyDirection,
-      );
 
       // 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,
+      // 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
+      // (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);
+          nextElements.set(newElement.id, newElement);
-          acc.set(nextElement.id, nextElement);
+          acc.set(newElement.id, newElement);
-
-          if (!flags.applyDirection) {
-            const prevElement = prevElements.get(id);
-
-            if (prevElement) {
-              flags.applyDirection =
-                prevElement.version > nextElement.version
-                  ? "backward"
-                  : "forward";
-            }
-          }
         }
 
         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,
-          {
+          updates as ElementUpdate<OrderedExcalidrawElement>,
-            ...elementUpdates,
-            version: nextVersion,
-          },
-          true,
         );
       } else {
-        affectedElement = mutateElement(nextElement, nextElements, {
+        affectedElement = mutateElement(
-          ...elementUpdates,
+          nextElement,
-          // don't modify the version further, if it's already different
+          nextElements,
-          version:
+          updates as ElementUpdate<OrderedExcalidrawElement>,
-            prevElement?.version !== nextElement.version
+        );
-              ? nextElement.version
-              : nextVersion,
-        });
       }
 
       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
+    // calculate complete deltas for affected elements, and assign them back to all the deltas
-    this.squash(
+    // technically we could do better here if perf. would become an issue
-      // technically we could do better here if perf. would become an issue
+    const { added, removed, updated } = ElementsDelta.calculate(
-      ElementsDelta.calculate(prevAffectedElements, nextAffectedElements),
+      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,
         });

packages/element/src/distribute.ts

@@ -1,12 +1,10 @@
 import type { AppState } from "@excalidraw/excalidraw/types";
 
-import { updateBoundElements } from "./binding";
 import { getCommonBoundingBox } from "./bounds";
+import { newElementWith } from "./mutateElement";
 
 import { getSelectedElementsByGroup } from "./groups";
 
-import type { Scene } from "./Scene";
-
 import type { ElementsMap, ExcalidrawElement } from "./types";
 
 export interface Distribution {
@@ -19,7 +17,6 @@ export const distributeElements = (
   elementsMap: ElementsMap,
   distribution: Distribution,
   appState: Readonly<AppState>,
-  scene: Scene,
 ): ExcalidrawElement[] => {
   const [start, mid, end, extent] =
     distribution.axis === "x"
@@ -69,16 +66,12 @@ export const distributeElements = (
         translation[distribution.axis] = pos - box[mid];
       }
 
-      return group.map((element) => {
+      return group.map((element) =>
-        const updatedElement = scene.mutateElement(element, {
+        newElementWith(element, {
           x: element.x + translation.x,
           y: element.y + translation.y,
-        });
+        }),
-        updateBoundElements(element, scene, {
+      );
-          simultaneouslyUpdated: group,
-        });
-        return updatedElement;
-      });
     });
   }
 
@@ -97,15 +90,11 @@ export const distributeElements = (
     pos += step;
     pos += box[extent];
 
-    return group.map((element) => {
+    return group.map((element) =>
-      const updatedElement = scene.mutateElement(element, {
+      newElementWith(element, {
         x: element.x + translation.x,
         y: element.y + translation.y,
-      });
+      }),
-      updateBoundElements(element, scene, {
+    );
-        simultaneouslyUpdated: group,
-      });
-      return updatedElement;
-    });
   });
 };

packages/element/src/dragElements.ts

@@ -1,9 +1,7 @@
 import {
-  type Bounds,
   TEXT_AUTOWRAP_THRESHOLD,
   getGridPoint,
   getFontString,
-  DRAGGING_THRESHOLD,
 } from "@excalidraw/common";
 
 import type {
@@ -15,7 +13,7 @@ import type {
 
 import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
 
-import { unbindBindingElement, updateBoundElements } from "./binding";
+import { updateBoundElements } from "./binding";
 import { getCommonBounds } from "./bounds";
 import { getPerfectElementSize } from "./sizeHelpers";
 import { getBoundTextElement } from "./textElement";
@@ -30,6 +28,7 @@ import {
 
 import type { Scene } from "./Scene";
 
+import type { Bounds } from "./bounds";
 import type { ExcalidrawElement } from "./types";
 
 export const dragSelectedElements = (
@@ -103,26 +102,9 @@ export const dragSelectedElements = (
     gridSize,
   );
 
-  const elementsToUpdateIds = new Set(
-    Array.from(elementsToUpdate, (el) => el.id),
-  );
-
   elementsToUpdate.forEach((element) => {
-    const isArrow = !isArrowElement(element);
+    updateElementCoords(pointerDownState, element, scene, adjustedOffset);
-    const isStartBoundElementSelected =
-      isArrow ||
-      (element.startBinding
-        ? elementsToUpdateIds.has(element.startBinding.elementId)
-        : false);
-    const isEndBoundElementSelected =
-      isArrow ||
-      (element.endBinding
-        ? elementsToUpdateIds.has(element.endBinding.elementId)
-        : false);
-
     if (!isArrowElement(element)) {
-      updateElementCoords(pointerDownState, element, scene, adjustedOffset);
-
       // skip arrow labels since we calculate its position during render
       const textElement = getBoundTextElement(
         element,
@@ -139,33 +121,6 @@ export const dragSelectedElements = (
       updateBoundElements(element, scene, {
         simultaneouslyUpdated: Array.from(elementsToUpdate),
       });
-    } else if (
-      // NOTE: Add a little initial drag to the arrow dragging when the arrow
-      // is the single element being dragged to avoid accidentally unbinding
-      // the arrow when the user just wants to select it.
-
-      elementsToUpdate.size > 1 ||
-      Math.max(Math.abs(adjustedOffset.x), Math.abs(adjustedOffset.y)) >
-        DRAGGING_THRESHOLD ||
-      (!element.startBinding && !element.endBinding)
-    ) {
-      updateElementCoords(pointerDownState, element, scene, adjustedOffset);
-
-      const shouldUnbindStart =
-        element.startBinding && !isStartBoundElementSelected;
-      const shouldUnbindEnd = element.endBinding && !isEndBoundElementSelected;
-      if (shouldUnbindStart || shouldUnbindEnd) {
-        // NOTE: Moving the bound arrow should unbind it, otherwise we would
-        // have weird situations, like 0 lenght arrow when the user moves
-        // the arrow outside a filled shape suddenly forcing the arrow start
-        // and end point to jump "outside" the shape.
-        if (shouldUnbindStart) {
-          unbindBindingElement(element, "start", scene);
-        }
-        if (shouldUnbindEnd) {
-          unbindBindingElement(element, "end", scene);
-        }
-      }
     }
   });
 };

packages/element/src/elbowArrow.ts

@@ -14,10 +14,10 @@ import {
 } from "@excalidraw/math";
 
 import {
-  type Bounds,
   BinaryHeap,
   invariant,
   isAnyTrue,
+  tupleToCoors,
   getSizeFromPoints,
   isDevEnv,
   arrayToMap,
@@ -27,11 +27,10 @@ import type { AppState } from "@excalidraw/excalidraw/types";
 
 import {
   bindPointToSnapToElementOutline,
+  FIXED_BINDING_DISTANCE,
   getHeadingForElbowArrowSnap,
   getGlobalFixedPointForBindableElement,
-  getBindingGap,
+  getHoveredElementForBinding,
-  maxBindingDistance_simple,
-  BASE_BINDING_GAP_ELBOW,
 } from "./binding";
 import { distanceToElement } from "./distance";
 import {
@@ -52,9 +51,10 @@ import {
   type ExcalidrawElbowArrowElement,
   type NonDeletedSceneElementsMap,
 } from "./types";
-import { aabbForElement, pointInsideBounds } from "./bounds";
-import { getHoveredElementForBinding } from "./collision";
 
+import { aabbForElement, pointInsideBounds } from "./bounds";
+
+import type { Bounds } from "./bounds";
 import type { Heading } from "./heading";
 import type {
   Arrowhead,
@@ -63,7 +63,6 @@ import type {
   FixedPointBinding,
   FixedSegment,
   NonDeletedExcalidrawElement,
-  Ordered,
 } from "./types";
 
 type GridAddress = [number, number] & { _brand: "gridaddress" };
@@ -360,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
@@ -713,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) =>
@@ -748,15 +741,8 @@ const handleEndpointDrag = (
 
   // Calculate the moving second point connection and add the start point
   {
-    const secondPoint = globalUpdatedPoints.at(startIsSpecial ? 2 : 1);
+    const secondPoint = globalUpdatedPoints[startIsSpecial ? 2 : 1];
-    const thirdPoint = globalUpdatedPoints.at(startIsSpecial ? 3 : 2);
+    const thirdPoint = globalUpdatedPoints[startIsSpecial ? 3 : 2];
-
-    if (!secondPoint || !thirdPoint) {
-      throw new Error(
-        `Second and third points must exist when handling endpoint drag (${startIsSpecial})`,
-      );
-    }
-
     const startIsHorizontal = headingIsHorizontal(startHeading);
     const secondIsHorizontal = headingIsHorizontal(
       vectorToHeading(vectorFromPoint(secondPoint, thirdPoint)),
@@ -815,19 +801,10 @@ const handleEndpointDrag = (
 
   // Calculate the moving second to last point connection
   {
-    const secondToLastPoint = globalUpdatedPoints.at(
+    const secondToLastPoint =
-      globalUpdatedPoints.length - (endIsSpecial ? 3 : 2),
+      globalUpdatedPoints[globalUpdatedPoints.length - (endIsSpecial ? 3 : 2)];
-    );
+    const thirdToLastPoint =
-    const thirdToLastPoint = globalUpdatedPoints.at(
+      globalUpdatedPoints[globalUpdatedPoints.length - (endIsSpecial ? 4 : 3)];
-      globalUpdatedPoints.length - (endIsSpecial ? 4 : 3),
-    );
-
-    if (!secondToLastPoint || !thirdToLastPoint) {
-      throw new Error(
-        `Second and third to last points must exist when handling endpoint drag (${endIsSpecial})`,
-      );
-    }
-
     const endIsHorizontal = headingIsHorizontal(endHeading);
     const secondIsHorizontal = headingForPointIsHorizontal(
       thirdToLastPoint,
@@ -1244,7 +1221,6 @@ const getElbowArrowData = (
   const startGlobalPoint = getGlobalPoint(
     {
       ...arrow,
-      angle: 0,
       type: "arrow",
       elbowed: true,
       points: nextPoints,
@@ -1259,7 +1235,6 @@ const getElbowArrowData = (
   const endGlobalPoint = getGlobalPoint(
     {
       ...arrow,
-      angle: 0,
       type: "arrow",
       elbowed: true,
       points: nextPoints,
@@ -1277,7 +1252,6 @@ const getElbowArrowData = (
     hoveredStartElement,
     origStartGlobalPoint,
     elementsMap,
-    options?.zoom,
   );
   const endHeading = getBindPointHeading(
     endGlobalPoint,
@@ -1285,7 +1259,6 @@ const getElbowArrowData = (
     hoveredEndElement,
     origEndGlobalPoint,
     elementsMap,
-    options?.zoom,
   );
   const startPointBounds = [
     startGlobalPoint[0] - 2,
@@ -1306,8 +1279,8 @@ const getElbowArrowData = (
         offsetFromHeading(
           startHeading,
           arrow.startArrowhead
-            ? getBindingGap(hoveredStartElement, { elbowed: true }) * 6
+            ? FIXED_BINDING_DISTANCE * 6
-            : getBindingGap(hoveredStartElement, { elbowed: true }) * 2,
+            : FIXED_BINDING_DISTANCE * 2,
           1,
         ),
       )
@@ -1319,8 +1292,8 @@ const getElbowArrowData = (
         offsetFromHeading(
           endHeading,
           arrow.endArrowhead
-            ? getBindingGap(hoveredEndElement, { elbowed: true }) * 6
+            ? FIXED_BINDING_DISTANCE * 6
-            : getBindingGap(hoveredEndElement, { elbowed: true }) * 2,
+            : FIXED_BINDING_DISTANCE * 2,
           1,
         ),
       )
@@ -1367,8 +1340,8 @@ const getElbowArrowData = (
             ? 0
             : BASE_PADDING -
                 (arrow.startArrowhead
-                  ? BASE_BINDING_GAP_ELBOW * 6
+                  ? FIXED_BINDING_DISTANCE * 6
-                  : BASE_BINDING_GAP_ELBOW * 2),
+                  : FIXED_BINDING_DISTANCE * 2),
           BASE_PADDING,
         ),
     boundsOverlap
@@ -1383,8 +1356,8 @@ const getElbowArrowData = (
             ? 0
             : BASE_PADDING -
                 (arrow.endArrowhead
-                  ? BASE_BINDING_GAP_ELBOW * 6
+                  ? FIXED_BINDING_DISTANCE * 6
-                  : BASE_BINDING_GAP_ELBOW * 2),
+                  : FIXED_BINDING_DISTANCE * 2),
           BASE_PADDING,
         ),
     boundsOverlap,
@@ -2098,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) =>
@@ -2244,7 +2226,6 @@ const getBindPointHeading = (
   hoveredElement: ExcalidrawBindableElement | null | undefined,
   origPoint: GlobalPoint,
   elementsMap: ElementsMap,
-  zoom?: AppState["zoom"],
 ): Heading =>
   getHeadingForElbowArrowSnap(
     p,
@@ -2263,20 +2244,21 @@ const getBindPointHeading = (
       ),
     origPoint,
     elementsMap,
-    zoom,
   );
 
 const getHoveredElement = (
   origPoint: GlobalPoint,
   elementsMap: NonDeletedSceneElementsMap,
-  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
+  elements: readonly NonDeletedExcalidrawElement[],
   zoom?: AppState["zoom"],
 ) => {
   return getHoveredElementForBinding(
-    origPoint,
+    tupleToCoors(origPoint),
     elements,
     elementsMap,
-    (element) => maxBindingDistance_simple(zoom),
+    zoom,
+    true,
+    true,
   );
 };
 

packages/element/src/flowchart.ts

@@ -7,7 +7,7 @@ import type {
   PendingExcalidrawElements,
 } from "@excalidraw/excalidraw/types";
 
-import { bindBindingElement } from "./binding";
+import { bindLinearElement } from "./binding";
 import { updateElbowArrowPoints } from "./elbowArrow";
 import {
   HEADING_DOWN,
@@ -446,14 +446,8 @@ const createBindingArrow = (
 
   const elementsMap = scene.getNonDeletedElementsMap();
 
-  bindBindingElement(
+  bindLinearElement(bindingArrow, startBindingElement, "start", scene);
-    bindingArrow,
+  bindLinearElement(bindingArrow, endBindingElement, "end", scene);
-    startBindingElement,
-    "orbit",
-    "start",
-    scene,
-  );
-  bindBindingElement(bindingArrow, endBindingElement, "orbit", "end", scene);
 
   const changedElements = new Map<string, OrderedExcalidrawElement>();
   changedElements.set(

packages/element/src/heading.ts

@@ -1,9 +1,4 @@
-import {
+import { invariant, isDevEnv, isTestEnv } from "@excalidraw/common";
-  invariant,
-  isDevEnv,
-  isTestEnv,
-  type Bounds,
-} from "@excalidraw/common";
 
 import {
   pointFrom,
@@ -24,7 +19,7 @@ import type {
   Vector,
 } from "@excalidraw/math";
 
-import { getCenterForBounds } from "./bounds";
+import { getCenterForBounds, type Bounds } from "./bounds";
 
 import type { ExcalidrawBindableElement } from "./types";
 

packages/element/src/index.ts

@@ -1,6 +1,7 @@
 import { toIterable } from "@excalidraw/common";
 
 import { isInvisiblySmallElement } from "./sizeHelpers";
+import { isLinearElementType } from "./typeChecks";
 
 import type {
   ExcalidrawElement,
@@ -28,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++) {
@@ -54,6 +52,27 @@ export const isNonDeletedElement = <T extends ExcalidrawElement>(
   element: T,
 ): element is NonDeleted<T> => !element.isDeleted;
 
+const _clearElements = (
+  elements: readonly ExcalidrawElement[],
+): ExcalidrawElement[] =>
+  getNonDeletedElements(elements).map((element) =>
+    isLinearElementType(element.type)
+      ? { ...element, lastCommittedPoint: null }
+      : element,
+  );
+
+export const clearElementsForDatabase = (
+  elements: readonly ExcalidrawElement[],
+) => _clearElements(elements);
+
+export const clearElementsForExport = (
+  elements: readonly ExcalidrawElement[],
+) => _clearElements(elements);
+
+export const clearElementsForLocalStorage = (
+  elements: readonly ExcalidrawElement[],
+) => _clearElements(elements);
+
 export * from "./align";
 export * from "./binding";
 export * from "./bounds";
@@ -78,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";
@@ -92,7 +110,6 @@ export * from "./store";
 export * from "./textElement";
 export * from "./textMeasurements";
 export * from "./textWrapping";
-export * from "./transform";
 export * from "./transformHandles";
 export * from "./typeChecks";
 export * from "./utils";

packages/element/src/mutateElement.ts

@@ -46,13 +46,16 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
 
   // casting to any because can't use `in` operator
   // (see https://github.com/microsoft/TypeScript/issues/21732)
-  const { points, fixedSegments, fileId } = updates as any;
+  const { points, fixedSegments, startBinding, endBinding, fileId } =
+    updates as any;
 
   if (
     isElbowArrow(element) &&
     (Object.keys(updates).length === 0 || // normalization case
       typeof points !== "undefined" || // repositioning
-      typeof fixedSegments !== "undefined") // segment fixing
+      typeof fixedSegments !== "undefined" || // segment fixing
+      typeof startBinding !== "undefined" ||
+      typeof endBinding !== "undefined") // manual binding to element
   ) {
     updates = {
       ...updates,

packages/element/src/newElement.ts

@@ -452,6 +452,7 @@ export const newFreeDrawElement = (
     points: opts.points || [],
     pressures: opts.pressures || [],
     simulatePressure: opts.simulatePressure,
+    lastCommittedPoint: null,
   };
 };
 
@@ -465,7 +466,7 @@ export const newLinearElement = (
   const element = {
     ..._newElementBase<ExcalidrawLinearElement>(opts.type, opts),
     points: opts.points || [],
-
+    lastCommittedPoint: null,
     startBinding: null,
     endBinding: null,
     startArrowhead: null,
@@ -500,6 +501,7 @@ export const newArrowElement = <T extends boolean>(
     return {
       ..._newElementBase<ExcalidrawElbowArrowElement>(opts.type, opts),
       points: opts.points || [],
+      lastCommittedPoint: null,
       startBinding: null,
       endBinding: null,
       startArrowhead: opts.startArrowhead || null,
@@ -514,6 +516,7 @@ export const newArrowElement = <T extends boolean>(
   return {
     ..._newElementBase<ExcalidrawArrowElement>(opts.type, opts),
     points: opts.points || [],
+    lastCommittedPoint: null,
     startBinding: null,
     endBinding: null,
     startArrowhead: opts.startArrowhead || null,

packages/element/src/positionElementsOnGrid.ts

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

packages/element/src/renderElement.ts

@@ -1,28 +1,19 @@
 import rough from "roughjs/bin/rough";
+import { getStroke } from "perfect-freehand";
 
-import {
+import { isRightAngleRads } from "@excalidraw/math";
-  type GlobalPoint,
-  isRightAngleRads,
-  lineSegment,
-  pointFrom,
-  pointRotateRads,
-  type Radians,
-} from "@excalidraw/math";
 
 import {
   BOUND_TEXT_PADDING,
   DEFAULT_REDUCED_GLOBAL_ALPHA,
   ELEMENT_READY_TO_ERASE_OPACITY,
   FRAME_STYLE,
-  DARK_THEME_FILTER,
   MIME_TYPES,
   THEME,
   distance,
   getFontString,
   isRTL,
   getVerticalOffset,
-  invariant,
-  applyDarkModeFilter,
 } from "@excalidraw/common";
 
 import type {
@@ -41,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 {
@@ -79,8 +70,16 @@ import type {
   ElementsMap,
 } from "./types";
 
+import type { StrokeOptions } from "perfect-freehand";
 import type { RoughCanvas } from "roughjs/bin/canvas";
 
+// using a stronger invert (100% vs our regular 93%) and saturate
+// as a temp hack to make images in dark theme look closer to original
+// color scheme (it's still not quite there and the colors look slightly
+// desatured, alas...)
+export const IMAGE_INVERT_FILTER =
+  "invert(100%) hue-rotate(180deg) saturate(1.25)";
+
 const isPendingImageElement = (
   element: ExcalidrawElement,
   renderConfig: StaticCanvasRenderConfig,
@@ -88,6 +87,19 @@ const isPendingImageElement = (
   isInitializedImageElement(element) &&
   !renderConfig.imageCache.has(element.fileId);
 
+const shouldResetImageFilter = (
+  element: ExcalidrawElement,
+  renderConfig: StaticCanvasRenderConfig,
+  appState: StaticCanvasAppState,
+) => {
+  return (
+    appState.theme === THEME.DARK &&
+    isInitializedImageElement(element) &&
+    !isPendingImageElement(element, renderConfig) &&
+    renderConfig.imageCache.get(element.fileId)?.mimeType !== MIME_TYPES.svg
+  );
+};
+
 const getCanvasPadding = (element: ExcalidrawElement) => {
   switch (element.type) {
     case "freedraw":
@@ -205,7 +217,7 @@ const generateElementCanvas = (
   elementsMap: NonDeletedSceneElementsMap,
   zoom: Zoom,
   renderConfig: StaticCanvasRenderConfig,
-  appState: StaticCanvasAppState | InteractiveCanvasAppState,
+  appState: StaticCanvasAppState,
 ): ExcalidrawElementWithCanvas | null => {
   const canvas = document.createElement("canvas");
   const context = canvas.getContext("2d")!;
@@ -252,7 +264,12 @@ const generateElementCanvas = (
 
   const rc = rough.canvas(canvas);
 
-  drawElementOnCanvas(element, rc, context, renderConfig);
+  // in dark theme, revert the image color filter
+  if (shouldResetImageFilter(element, renderConfig, appState)) {
+    context.filter = IMAGE_INVERT_FILTER;
+  }
+
+  drawElementOnCanvas(element, rc, context, renderConfig, appState);
 
   context.restore();
 
@@ -387,6 +404,7 @@ const drawElementOnCanvas = (
   rc: RoughCanvas,
   context: CanvasRenderingContext2D,
   renderConfig: StaticCanvasRenderConfig,
+  appState: StaticCanvasAppState,
 ) => {
   switch (element.type) {
     case "rectangle":
@@ -396,8 +414,7 @@ const drawElementOnCanvas = (
     case "ellipse": {
       context.lineJoin = "round";
       context.lineCap = "round";
-
+      rc.draw(ShapeCache.get(element)!);
-      rc.draw(ShapeCache.generateElementShape(element, renderConfig));
       break;
     }
     case "arrow":
@@ -405,51 +422,33 @@ const drawElementOnCanvas = (
       context.lineJoin = "round";
       context.lineCap = "round";
 
-      ShapeCache.generateElementShape(element, renderConfig).forEach(
+      ShapeCache.get(element)!.forEach((shape) => {
-        (shape) => {
+        rc.draw(shape);
-          rc.draw(shape);
+      });
-        },
-      );
       break;
     }
     case "freedraw": {
       // Draw directly to canvas
       context.save();
+      context.fillStyle = element.strokeColor;
 
-      const shapes = ShapeCache.generateElementShape(element, renderConfig);
+      const path = getFreeDrawPath2D(element) as Path2D;
+      const fillShape = ShapeCache.get(element);
 
-      for (const shape of shapes) {
+      if (fillShape) {
-        if (typeof shape === "string") {
+        rc.draw(fillShape);
-          context.fillStyle =
-            renderConfig.theme === THEME.DARK
-              ? applyDarkModeFilter(element.strokeColor)
-              : element.strokeColor;
-          context.fill(new Path2D(shape));
-        } else {
-          rc.draw(shape);
-        }
       }
 
+      context.fillStyle = element.strokeColor;
+      context.fill(path);
+
       context.restore();
       break;
     }
     case "image": {
-      context.save();
-      const cacheEntry =
-        element.fileId !== null
-          ? renderConfig.imageCache.get(element.fileId)
-          : null;
       const img = isInitializedImageElement(element)
-        ? cacheEntry?.image
+        ? renderConfig.imageCache.get(element.fileId)?.image
         : undefined;
-
-      const shouldInvertImage =
-        renderConfig.theme === THEME.DARK &&
-        cacheEntry?.mimeType === MIME_TYPES.svg;
-
-      if (shouldInvertImage) {
-        context.filter = DARK_THEME_FILTER;
-      }
       if (img != null && !(img instanceof Promise)) {
         if (element.roundness && context.roundRect) {
           context.beginPath();
@@ -486,7 +485,6 @@ const drawElementOnCanvas = (
       } else {
         drawImagePlaceholder(element, context);
       }
-      context.restore();
       break;
     }
     default: {
@@ -501,10 +499,7 @@ const drawElementOnCanvas = (
         context.canvas.setAttribute("dir", rtl ? "rtl" : "ltr");
         context.save();
         context.font = getFontString(element);
-        context.fillStyle =
+        context.fillStyle = element.strokeColor;
-          renderConfig.theme === THEME.DARK
-            ? applyDarkModeFilter(element.strokeColor)
-            : element.strokeColor;
         context.textAlign = element.textAlign as CanvasTextAlign;
 
         // Canvas does not support multiline text by default
@@ -555,7 +550,7 @@ const generateElementWithCanvas = (
   element: NonDeletedExcalidrawElement,
   elementsMap: NonDeletedSceneElementsMap,
   renderConfig: StaticCanvasRenderConfig,
-  appState: StaticCanvasAppState | InteractiveCanvasAppState,
+  appState: StaticCanvasAppState,
 ) => {
   const zoom: Zoom = renderConfig
     ? appState.zoom
@@ -612,7 +607,7 @@ const drawElementFromCanvas = (
   elementWithCanvas: ExcalidrawElementWithCanvas,
   context: CanvasRenderingContext2D,
   renderConfig: StaticCanvasRenderConfig,
-  appState: StaticCanvasAppState | InteractiveCanvasAppState,
+  appState: StaticCanvasAppState,
   allElementsMap: NonDeletedSceneElementsMap,
 ) => {
   const element = elementWithCanvas.element;
@@ -730,7 +725,7 @@ export const renderElement = (
   rc: RoughCanvas,
   context: CanvasRenderingContext2D,
   renderConfig: StaticCanvasRenderConfig,
-  appState: StaticCanvasAppState | InteractiveCanvasAppState,
+  appState: StaticCanvasAppState,
 ) => {
   const reduceAlphaForSelection =
     appState.openDialog?.name === "elementLinkSelector" &&
@@ -757,17 +752,12 @@ export const renderElement = (
         context.fillStyle = "rgba(0, 0, 200, 0.04)";
 
         context.lineWidth = FRAME_STYLE.strokeWidth / appState.zoom.value;
-        context.strokeStyle =
+        context.strokeStyle = FRAME_STYLE.strokeColor;
-          appState.theme === THEME.DARK
-            ? applyDarkModeFilter(FRAME_STYLE.strokeColor)
-            : FRAME_STYLE.strokeColor;
 
         // TODO change later to only affect AI frames
         if (isMagicFrameElement(element)) {
           context.strokeStyle =
-            appState.theme === THEME.LIGHT
+            appState.theme === THEME.LIGHT ? "#7affd7" : "#1d8264";
-              ? "#7affd7"
-              : applyDarkModeFilter("#1d8264");
         }
 
         if (FRAME_STYLE.radius && context.roundRect) {
@@ -790,6 +780,11 @@ export const renderElement = (
       break;
     }
     case "freedraw": {
+      // TODO investigate if we can do this in situ. Right now we need to call
+      // beforehand because math helpers (such as getElementAbsoluteCoords)
+      // rely on existing shapes
+      ShapeCache.generateElementShape(element, null);
+
       if (renderConfig.isExporting) {
         const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
         const cx = (x1 + x2) / 2 + appState.scrollX;
@@ -800,7 +795,7 @@ export const renderElement = (
         context.translate(cx, cy);
         context.rotate(element.angle);
         context.translate(-shiftX, -shiftY);
-        drawElementOnCanvas(element, rc, context, renderConfig);
+        drawElementOnCanvas(element, rc, context, renderConfig, appState);
         context.restore();
       } else {
         const elementWithCanvas = generateElementWithCanvas(
@@ -833,6 +828,10 @@ export const renderElement = (
     case "text":
     case "iframe":
     case "embeddable": {
+      // TODO investigate if we can do this in situ. Right now we need to call
+      // beforehand because math helpers (such as getElementAbsoluteCoords)
+      // rely on existing shapes
+      ShapeCache.generateElementShape(element, renderConfig);
       if (renderConfig.isExporting) {
         const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
         const cx = (x1 + x2) / 2 + appState.scrollX;
@@ -855,6 +854,9 @@ export const renderElement = (
         context.save();
         context.translate(cx, cy);
 
+        if (shouldResetImageFilter(element, renderConfig, appState)) {
+          context.filter = "none";
+        }
         const boundTextElement = getBoundTextElement(element, elementsMap);
 
         if (isArrowElement(element) && boundTextElement) {
@@ -886,7 +888,13 @@ export const renderElement = (
 
           tempCanvasContext.translate(-shiftX, -shiftY);
 
-          drawElementOnCanvas(element, tempRc, tempCanvasContext, renderConfig);
+          drawElementOnCanvas(
+            element,
+            tempRc,
+            tempCanvasContext,
+            renderConfig,
+            appState,
+          );
 
           tempCanvasContext.translate(shiftX, shiftY);
 
@@ -925,7 +933,7 @@ export const renderElement = (
           }
 
           context.translate(-shiftX, -shiftY);
-          drawElementOnCanvas(element, rc, context, renderConfig);
+          drawElementOnCanvas(element, rc, context, renderConfig, appState);
         }
 
         context.restore();
@@ -1017,58 +1025,69 @@ export const renderElement = (
   context.globalAlpha = 1;
 };
 
-export function getFreedrawOutlineAsSegments(
+export const pathsCache = new WeakMap<ExcalidrawFreeDrawElement, Path2D>([]);
-  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");
+export function generateFreeDrawShape(element: ExcalidrawFreeDrawElement) {
-
+  const svgPathData = getFreeDrawSvgPath(element);
-  return points.slice(2).reduce(
+  const path = new Path2D(svgPathData);
-    (acc, curr) => {
+  pathsCache.set(element, path);
-      acc.push(
+  return path;
-        lineSegment<GlobalPoint>(
+}
-          acc[acc.length - 1][1],
+
-          pointRotateRads(
+export function getFreeDrawPath2D(element: ExcalidrawFreeDrawElement) {
-            pointFrom<GlobalPoint>(curr[0] + element.x, curr[1] + element.y),
+  return pathsCache.get(element);
-            center,
+}
-            element.angle,
+
-          ),
+export function getFreeDrawSvgPath(element: ExcalidrawFreeDrawElement) {
-        ),
+  // If input points are empty (should they ever be?) return a dot
-      );
+  const inputPoints = element.simulatePressure
-      return acc;
+    ? element.points
-    },
+    : element.points.length
-    [
+    ? element.points.map(([x, y], i) => [x, y, element.pressures[i]])
-      lineSegment<GlobalPoint>(
+    : [[0, 0, 0.5]];
-        pointRotateRads(
+
-          pointFrom<GlobalPoint>(
+  // Consider changing the options for simulated pressure vs real pressure
-            points[0][0] + element.x,
+  const options: StrokeOptions = {
-            points[0][1] + element.y,
+    simulatePressure: element.simulatePressure,
-          ),
+    size: element.strokeWidth * 4.25,
-          center,
+    thinning: 0.6,
-          element.angle,
+    smoothing: 0.5,
-        ),
+    streamline: 0.5,
-        pointRotateRads(
+    easing: (t) => Math.sin((t * Math.PI) / 2), // https://easings.net/#easeOutSine
-          pointFrom<GlobalPoint>(
+    last: !!element.lastCommittedPoint, // LastCommittedPoint is added on pointerup
-            points[1][0] + element.x,
+  };
-            points[1][1] + element.y,
+
-          ),
+  return getSvgPathFromStroke(getStroke(inputPoints as number[][], options));
-          center,
+}
-          element.angle,
+
-        ),
+function med(A: number[], B: number[]) {
-      ),
+  return [(A[0] + B[0]) / 2, (A[1] + B[1]) / 2];
-    ],
+}
-  );
+
+// Trim SVG path data so number are each two decimal points. This
+// improves SVG exports, and prevents rendering errors on points
+// with long decimals.
+const TO_FIXED_PRECISION = /(\s?[A-Z]?,?-?[0-9]*\.[0-9]{0,2})(([0-9]|e|-)*)/g;
+
+function getSvgPathFromStroke(points: number[][]): string {
+  if (!points.length) {
+    return "";
+  }
+
+  const max = points.length - 1;
+
+  return points
+    .reduce(
+      (acc, point, i, arr) => {
+        if (i === max) {
+          acc.push(point, med(point, arr[0]), "L", arr[0], "Z");
+        } else {
+          acc.push(point, med(point, arr[i + 1]));
+        }
+        return acc;
+      },
+      ["M", points[0], "Q"],
+    )
+    .join(" ")
+    .replace(TO_FIXED_PRECISION, "$1");
 }

packages/element/src/resizeElements.ts

@@ -20,11 +20,7 @@ import type { PointerDownState } from "@excalidraw/excalidraw/types";
 
 import type { Mutable } from "@excalidraw/common/utility-types";
 
-import {
+import { getArrowLocalFixedPoints, updateBoundElements } from "./binding";
-  getArrowLocalFixedPoints,
-  unbindBindingElement,
-  updateBoundElements,
-} from "./binding";
 import {
   getElementAbsoluteCoords,
   getCommonBounds,
@@ -39,7 +35,6 @@ import {
   getContainerElement,
   handleBindTextResize,
   getBoundTextMaxWidth,
-  computeBoundTextPosition,
 } from "./textElement";
 import {
   getMinTextElementWidth,
@@ -50,7 +45,6 @@ import {
 import { wrapText } from "./textWrapping";
 import {
   isArrowElement,
-  isBindingElement,
   isBoundToContainer,
   isElbowArrow,
   isFrameLikeElement,
@@ -79,9 +73,7 @@ import type {
   ExcalidrawImageElement,
   ElementsMap,
   ExcalidrawElbowArrowElement,
-  ExcalidrawArrowElement,
 } from "./types";
-import type { ElementUpdate } from "./mutateElement";
 
 // Returns true when transform (resizing/rotation) happened
 export const transformElements = (
@@ -227,40 +219,13 @@ const rotateSingleElement = (
   }
   const boundTextElementId = getBoundTextElementId(element);
 
-  let update: ElementUpdate<NonDeletedExcalidrawElement> = {
+  scene.mutateElement(element, { angle });
-    angle,
-  };
-
-  if (isBindingElement(element)) {
-    update = {
-      ...update,
-    } as ElementUpdate<ExcalidrawArrowElement>;
-
-    if (element.startBinding) {
-      unbindBindingElement(element, "start", scene);
-    }
-    if (element.endBinding) {
-      unbindBindingElement(element, "end", scene);
-    }
-  }
-
-  scene.mutateElement(element, update);
-
   if (boundTextElementId) {
     const textElement =
       scene.getElement<ExcalidrawTextElementWithContainer>(boundTextElementId);
 
     if (textElement && !isArrowElement(element)) {
-      const { x, y } = computeBoundTextPosition(
+      scene.mutateElement(textElement, { angle });
-        element,
-        textElement,
-        scene.getNonDeletedElementsMap(),
-      );
-      scene.mutateElement(textElement, {
-        angle,
-        x,
-        y,
-      });
     }
   }
 };
@@ -318,18 +283,7 @@ export const resizeSingleTextElement = (
 ) => {
   const elementsMap = scene.getNonDeletedElementsMap();
 
-  const isCornerHandle = transformHandleType.length === 2;
+  const metricsWidth = element.width * (nextHeight / element.height);
-  let metricsWidth = element.width * (nextHeight / element.height);
-  let metricsHeight = nextHeight;
-
-  if (isCornerHandle) {
-    const widthRatio = Math.abs(nextWidth) / element.width;
-    const heightRatio = Math.abs(nextHeight) / element.height;
-    const ratio = Math.max(widthRatio, heightRatio);
-    const sign = Math.sign(nextHeight) || 1;
-    metricsWidth = element.width * ratio * sign;
-    metricsHeight = element.height * ratio * sign;
-  }
 
   const metrics = measureFontSizeFromWidth(element, elementsMap, metricsWidth);
   if (metrics === null) {
@@ -344,7 +298,7 @@ export const resizeSingleTextElement = (
       origElement.width,
       origElement.height,
       metricsWidth,
-      metricsHeight,
+      nextHeight,
       origElement.angle,
       transformHandleType,
       false,
@@ -354,7 +308,7 @@ export const resizeSingleTextElement = (
     scene.mutateElement(element, {
       fontSize: metrics.size,
       width: metricsWidth,
-      height: metricsHeight,
+      height: nextHeight,
       x: newOrigin.x,
       y: newOrigin.y,
     });
@@ -430,11 +384,6 @@ const rotateMultipleElements = (
     centerAngle -= centerAngle % SHIFT_LOCKING_ANGLE;
   }
 
-  const rotatedElementsMap = new Map<
-    ExcalidrawElement["id"],
-    NonDeletedExcalidrawElement
-  >(elements.map((element) => [element.id, element]));
-
   for (const element of elements) {
     if (!isFrameLikeElement(element)) {
       const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
@@ -465,30 +414,11 @@ const rotateMultipleElements = (
         simultaneouslyUpdated: elements,
       });
 
-      if (isBindingElement(element)) {
-        if (element.startBinding) {
-          if (!rotatedElementsMap.has(element.startBinding.elementId)) {
-            unbindBindingElement(element, "start", scene);
-          }
-        }
-        if (element.endBinding) {
-          if (!rotatedElementsMap.has(element.endBinding.elementId)) {
-            unbindBindingElement(element, "end", scene);
-          }
-        }
-      }
-
       const boundText = getBoundTextElement(element, elementsMap);
       if (boundText && !isArrowElement(element)) {
-        const { x, y } = computeBoundTextPosition(
-          element,
-          boundText,
-          elementsMap,
-        );
-
         scene.mutateElement(boundText, {
-          x,
+          x: boundText.x + (rotatedCX - cx),
-          y,
+          y: boundText.y + (rotatedCY - cy),
           angle: normalizeRadians((centerAngle + origAngle) as Radians),
         });
       }
@@ -889,32 +819,13 @@ export const resizeSingleElement = (
     Number.isFinite(newOrigin.x) &&
     Number.isFinite(newOrigin.y)
   ) {
-    let updates: ElementUpdate<ExcalidrawElement> = {
+    const updates = {
       ...newOrigin,
       width: Math.abs(nextWidth),
       height: Math.abs(nextHeight),
       ...rescaledPoints,
     };
 
-    if (isBindingElement(latestElement)) {
-      if (latestElement.startBinding) {
-        updates = {
-          ...updates,
-        } as ElementUpdate<ExcalidrawArrowElement>;
-
-        if (latestElement.startBinding) {
-          unbindBindingElement(latestElement, "start", scene);
-        }
-      }
-
-      if (latestElement.endBinding) {
-        updates = {
-          ...updates,
-          endBinding: null,
-        } as ElementUpdate<ExcalidrawArrowElement>;
-      }
-    }
-
     scene.mutateElement(latestElement, updates, {
       informMutation: shouldInformMutation,
       isDragging: false,
@@ -932,7 +843,10 @@ export const resizeSingleElement = (
       shouldMaintainAspectRatio,
     );
 
-    updateBoundElements(latestElement, scene);
+    updateBoundElements(latestElement, scene, {
+      // TODO: confirm with MARK if this actually makes sense
+      newSize: { width: nextWidth, height: nextHeight },
+    });
   }
 };
 
@@ -1466,36 +1380,20 @@ export const resizeMultipleElements = (
     }
 
     const elementsToUpdate = elementsAndUpdates.map(({ element }) => element);
-    const resizedElementsMap = new Map<
-      ExcalidrawElement["id"],
-      NonDeletedExcalidrawElement
-    >(elementsAndUpdates.map(({ element }) => [element.id, element]));
 
     for (const {
       element,
       update: { boundTextFontSize, ...update },
     } of elementsAndUpdates) {
-      const { angle } = update;
+      const { width, height, angle } = update;
 
       scene.mutateElement(element, update);
 
       updateBoundElements(element, scene, {
         simultaneouslyUpdated: elementsToUpdate,
+        newSize: { width, height },
       });
 
-      if (isBindingElement(element)) {
-        if (element.startBinding) {
-          if (!resizedElementsMap.has(element.startBinding.elementId)) {
-            unbindBindingElement(element, "start", scene);
-          }
-        }
-        if (element.endBinding) {
-          if (!resizedElementsMap.has(element.endBinding.elementId)) {
-            unbindBindingElement(element, "end", scene);
-          }
-        }
-      }
-
       const boundTextElement = getBoundTextElement(element, elementsMap);
       if (boundTextElement && boundTextFontSize) {
         scene.mutateElement(boundTextElement, {

packages/element/src/resizeTest.ts

@@ -5,25 +5,22 @@ import {
   type Radians,
 } from "@excalidraw/math";
 
-import {
+import { SIDE_RESIZING_THRESHOLD } from "@excalidraw/common";
-  SIDE_RESIZING_THRESHOLD,
-  type EditorInterface,
-} 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 type { Bounds } from "@excalidraw/common";
 
 import { getElementAbsoluteCoords } from "./bounds";
 import {
   getTransformHandlesFromCoords,
   getTransformHandles,
-  getOmitSidesForEditorInterface,
+  getOmitSidesForDevice,
   canResizeFromSides,
 } from "./transformHandles";
 import { isImageElement, isLinearElement } from "./typeChecks";
 
+import type { Bounds } from "./bounds";
 import type {
   TransformHandleType,
   TransformHandle,
@@ -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;
 

packages/element/src/shape.ts

@@ -1,5 +1,4 @@
 import { simplify } from "points-on-curve";
-import { getStroke } from "perfect-freehand";
 
 import {
   type GeometricShape,
@@ -18,12 +17,10 @@ import {
 } from "@excalidraw/math";
 import {
   ROUGHNESS,
-  THEME,
   isTransparent,
   assertNever,
   COLOR_PALETTE,
   LINE_POLYGON_POINT_MERGE_DISTANCE,
-  applyDarkModeFilter,
 } from "@excalidraw/common";
 
 import { RoughGenerator } from "roughjs/bin/generator";
@@ -39,7 +36,6 @@ import type {
 import type {
   ElementShape,
   ElementShapes,
-  SVGPathString,
 } from "@excalidraw/excalidraw/scene/types";
 
 import { elementWithCanvasCache } from "./renderElement";
@@ -56,6 +52,7 @@ import { getCornerRadius, isPathALoop } from "./utils";
 import { headingForPointIsHorizontal } from "./heading";
 
 import { canChangeRoundness } from "./comparisons";
+import { generateFreeDrawShape } from "./renderElement";
 import {
   getArrowheadPoints,
   getCenterForBounds,
@@ -80,32 +77,29 @@ import type { Point as RoughPoint } from "roughjs/bin/geometry";
 
 export class ShapeCache {
   private static rg = new RoughGenerator();
-  private static cache = new WeakMap<
+  private static cache = new WeakMap<ExcalidrawElement, ElementShape>();
-    ExcalidrawElement,
-    { shape: ElementShape; theme: AppState["theme"] }
-  >();
 
   /**
    * Retrieves shape from cache if available. Use this only if shape
    * is optional and you have a fallback in case it's not cached.
    */
-  public static get = <T extends ExcalidrawElement>(
+  public static get = <T extends ExcalidrawElement>(element: T) => {
-    element: T,
+    return ShapeCache.cache.get(
-    theme: AppState["theme"] | null,
+      element,
-  ) => {
+    ) as T["type"] extends keyof ElementShapes
-    const cached = ShapeCache.cache.get(element);
+      ? ElementShapes[T["type"]] | undefined
-    if (cached && (theme === null || cached.theme === theme)) {
+      : ElementShape | undefined;
-      return cached.shape as T["type"] extends keyof ElementShapes
-        ? ElementShapes[T["type"]] | undefined
-        : ElementShape | undefined;
-    }
-    return undefined;
   };
 
-  public static delete = (element: ExcalidrawElement) => {
+  public static set = <T extends ExcalidrawElement>(
+    element: T,
+    shape: T["type"] extends keyof ElementShapes
+      ? ElementShapes[T["type"]]
+      : Drawable,
+  ) => ShapeCache.cache.set(element, shape);
+
+  public static delete = (element: ExcalidrawElement) =>
     ShapeCache.cache.delete(element);
-    elementWithCanvasCache.delete(element);
-  };
 
   public static destroy = () => {
     ShapeCache.cache = new WeakMap();
@@ -123,13 +117,12 @@ export class ShapeCache {
       isExporting: boolean;
       canvasBackgroundColor: AppState["viewBackgroundColor"];
       embedsValidationStatus: EmbedsValidationStatus;
-      theme: AppState["theme"];
     } | null,
   ) => {
     // when exporting, always regenerated to guarantee the latest shape
     const cachedShape = renderConfig?.isExporting
       ? undefined
-      : ShapeCache.get(element, renderConfig ? renderConfig.theme : null);
+      : ShapeCache.get(element);
 
     // `null` indicates no rc shape applicable for this element type,
     // but it's considered a valid cache value (= do not regenerate)
@@ -139,25 +132,19 @@ export class ShapeCache {
 
     elementWithCanvasCache.delete(element);
 
-    const shape = _generateElementShape(
+    const shape = generateElementShape(
       element,
       ShapeCache.rg,
       renderConfig || {
         isExporting: false,
         canvasBackgroundColor: COLOR_PALETTE.white,
         embedsValidationStatus: null,
-        theme: THEME.LIGHT,
       },
     ) as T["type"] extends keyof ElementShapes
       ? ElementShapes[T["type"]]
       : Drawable | null;
 
-    if (!renderConfig?.isExporting) {
+    ShapeCache.cache.set(element, shape);
-      ShapeCache.cache.set(element, {
-        shape,
-        theme: renderConfig?.theme || THEME.LIGHT,
-      });
-    }
 
     return shape;
   };
@@ -193,7 +180,6 @@ function adjustRoughness(element: ExcalidrawElement): number {
 export const generateRoughOptions = (
   element: ExcalidrawElement,
   continuousPath = false,
-  isDarkMode: boolean = false,
 ): Options => {
   const options: Options = {
     seed: element.seed,
@@ -218,9 +204,7 @@ export const generateRoughOptions = (
     fillWeight: element.strokeWidth / 2,
     hachureGap: element.strokeWidth * 4,
     roughness: adjustRoughness(element),
-    stroke: isDarkMode
+    stroke: element.strokeColor,
-      ? applyDarkModeFilter(element.strokeColor)
-      : element.strokeColor,
     preserveVertices:
       continuousPath || element.roughness < ROUGHNESS.cartoonist,
   };
@@ -234,8 +218,6 @@ export const generateRoughOptions = (
       options.fillStyle = element.fillStyle;
       options.fill = isTransparent(element.backgroundColor)
         ? undefined
-        : isDarkMode
-        ? applyDarkModeFilter(element.backgroundColor)
         : element.backgroundColor;
       if (element.type === "ellipse") {
         options.curveFitting = 1;
@@ -249,8 +231,6 @@ export const generateRoughOptions = (
         options.fill =
           element.backgroundColor === "transparent"
             ? undefined
-            : isDarkMode
-            ? applyDarkModeFilter(element.backgroundColor)
             : element.backgroundColor;
       }
       return options;
@@ -304,7 +284,6 @@ const getArrowheadShapes = (
   generator: RoughGenerator,
   options: Options,
   canvasBackgroundColor: string,
-  isDarkMode: boolean,
 ) => {
   const arrowheadPoints = getArrowheadPoints(
     element,
@@ -330,10 +309,6 @@ const getArrowheadShapes = (
     return [generator.line(x3, y3, x4, y4, options)];
   };
 
-  const strokeColor = isDarkMode
-    ? applyDarkModeFilter(element.strokeColor)
-    : element.strokeColor;
-
   switch (arrowhead) {
     case "dot":
     case "circle":
@@ -349,10 +324,10 @@ const getArrowheadShapes = (
           fill:
             arrowhead === "circle_outline"
               ? canvasBackgroundColor
-              : strokeColor,
+              : element.strokeColor,
 
           fillStyle: "solid",
-          stroke: strokeColor,
+          stroke: element.strokeColor,
           roughness: Math.min(0.5, options.roughness || 0),
         }),
       ];
@@ -377,7 +352,7 @@ const getArrowheadShapes = (
             fill:
               arrowhead === "triangle_outline"
                 ? canvasBackgroundColor
-                : strokeColor,
+                : element.strokeColor,
             fillStyle: "solid",
             roughness: Math.min(1, options.roughness || 0),
           },
@@ -405,7 +380,7 @@ const getArrowheadShapes = (
             fill:
               arrowhead === "diamond_outline"
                 ? canvasBackgroundColor
-                : strokeColor,
+                : element.strokeColor,
             fillStyle: "solid",
             roughness: Math.min(1, options.roughness || 0),
           },
@@ -627,22 +602,19 @@ export const generateLinearCollisionShape = (
  *
  * @private
  */
-const _generateElementShape = (
+const generateElementShape = (
   element: Exclude<NonDeletedExcalidrawElement, ExcalidrawSelectionElement>,
   generator: RoughGenerator,
   {
     isExporting,
     canvasBackgroundColor,
     embedsValidationStatus,
-    theme,
   }: {
     isExporting: boolean;
     canvasBackgroundColor: string;
     embedsValidationStatus: EmbedsValidationStatus | null;
-    theme?: AppState["theme"];
   },
-): ElementShape => {
+): Drawable | Drawable[] | null => {
-  const isDarkMode = theme === THEME.DARK;
   switch (element.type) {
     case "rectangle":
     case "iframe":
@@ -668,7 +640,6 @@ const _generateElementShape = (
               embedsValidationStatus,
             ),
             true,
-            isDarkMode,
           ),
         );
       } else {
@@ -684,7 +655,6 @@ const _generateElementShape = (
               embedsValidationStatus,
             ),
             false,
-            isDarkMode,
           ),
         );
       }
@@ -722,7 +692,7 @@ const _generateElementShape = (
             C ${topX} ${topY}, ${topX} ${topY}, ${topX + verticalRadius} ${
             topY + horizontalRadius
           }`,
-          generateRoughOptions(element, true, isDarkMode),
+          generateRoughOptions(element, true),
         );
       } else {
         shape = generator.polygon(
@@ -732,7 +702,7 @@ const _generateElementShape = (
             [bottomX, bottomY],
             [leftX, leftY],
           ],
-          generateRoughOptions(element, false, isDarkMode),
+          generateRoughOptions(element),
         );
       }
       return shape;
@@ -743,14 +713,14 @@ const _generateElementShape = (
         element.height / 2,
         element.width,
         element.height,
-        generateRoughOptions(element, false, isDarkMode),
+        generateRoughOptions(element),
       );
       return shape;
     }
     case "line":
     case "arrow": {
       let shape: ElementShapes[typeof element.type];
-      const options = generateRoughOptions(element, false, isDarkMode);
+      const options = generateRoughOptions(element);
 
       // points array can be empty in the beginning, so it is important to add
       // initial position to it
@@ -775,7 +745,7 @@ const _generateElementShape = (
           shape = [
             generator.path(
               generateElbowArrowShape(points, 16),
-              generateRoughOptions(element, true, isDarkMode),
+              generateRoughOptions(element, true),
             ),
           ];
         }
@@ -808,7 +778,6 @@ const _generateElementShape = (
             generator,
             options,
             canvasBackgroundColor,
-            isDarkMode,
           );
           shape.push(...shapes);
         }
@@ -826,7 +795,6 @@ const _generateElementShape = (
             generator,
             options,
             canvasBackgroundColor,
-            isDarkMode,
           );
           shape.push(...shapes);
         }
@@ -834,28 +802,23 @@ const _generateElementShape = (
       return shape;
     }
     case "freedraw": {
-      // oredered in terms of z-index [background, stroke]
+      let shape: ElementShapes[typeof element.type];
-      const shapes: ElementShapes[typeof element.type] = [];
+      generateFreeDrawShape(element);
 
-      // (1) background fill (rc shape), optional
       if (isPathALoop(element.points)) {
         // generate rough polygon to fill freedraw shape
         const simplifiedPoints = simplify(
           element.points as Mutable<LocalPoint[]>,
           0.75,
         );
-        shapes.push(
+        shape = generator.curve(simplifiedPoints as [number, number][], {
-          generator.curve(simplifiedPoints as [number, number][], {
+          ...generateRoughOptions(element),
-            ...generateRoughOptions(element, false, isDarkMode),
+          stroke: "none",
-            stroke: "none",
+        });
-          }),
+      } else {
-        );
+        shape = null;
       }
-
+      return shape;
-      // (2) stroke
-      shapes.push(getFreeDrawSvgPath(element));
-
-      return shapes;
     }
     case "frame":
     case "magicframe":
@@ -962,7 +925,9 @@ export const getElementShape = <Point extends GlobalPoint | LocalPoint>(
       return getPolygonShape(element);
     case "arrow":
     case "line": {
-      const roughShape = ShapeCache.generateElementShape(element, null)[0];
+      const roughShape =
+        ShapeCache.get(element)?.[0] ??
+        ShapeCache.generateElementShape(element, null)[0];
       const [, , , , cx, cy] = getElementAbsoluteCoords(element, elementsMap);
 
       return shouldTestInside(element)
@@ -1038,69 +1003,3 @@ export const toggleLinePolygonState = (
 
   return ret;
 };
-
-// -----------------------------------------------------------------------------
-//                         freedraw shape helper
-// -----------------------------------------------------------------------------
-
-// NOTE not cached (-> for SVG export)
-const getFreeDrawSvgPath = (element: ExcalidrawFreeDrawElement) => {
-  return getSvgPathFromStroke(
-    getFreedrawOutlinePoints(element),
-  ) as SVGPathString;
-};
-
-export const getFreedrawOutlinePoints = (
-  element: ExcalidrawFreeDrawElement,
-) => {
-  // If input points are empty (should they ever be?) return a dot
-  const inputPoints = element.simulatePressure
-    ? element.points
-    : element.points.length
-    ? element.points.map(([x, y], i) => [x, y, element.pressures[i]])
-    : [[0, 0, 0.5]];
-
-  return getStroke(inputPoints as number[][], {
-    simulatePressure: element.simulatePressure,
-    size: element.strokeWidth * 4.25,
-    thinning: 0.6,
-    smoothing: 0.5,
-    streamline: 0.5,
-    easing: (t) => Math.sin((t * Math.PI) / 2), // https://easings.net/#easeOutSine
-    last: true,
-  }) as [number, number][];
-};
-
-const med = (A: number[], B: number[]) => {
-  return [(A[0] + B[0]) / 2, (A[1] + B[1]) / 2];
-};
-
-// Trim SVG path data so number are each two decimal points. This
-// improves SVG exports, and prevents rendering errors on points
-// with long decimals.
-const TO_FIXED_PRECISION = /(\s?[A-Z]?,?-?[0-9]*\.[0-9]{0,2})(([0-9]|e|-)*)/g;
-
-const getSvgPathFromStroke = (points: number[][]): string => {
-  if (!points.length) {
-    return "";
-  }
-
-  const max = points.length - 1;
-
-  return points
-    .reduce(
-      (acc, point, i, arr) => {
-        if (i === max) {
-          acc.push(point, med(point, arr[0]), "L", arr[0], "Z");
-        } else {
-          acc.push(point, med(point, arr[i + 1]));
-        }
-        return acc;
-      },
-      ["M", points[0], "Q"],
-    )
-    .join(" ")
-    .replace(TO_FIXED_PRECISION, "$1");
-};
-
-// -----------------------------------------------------------------------------

packages/element/src/store.ts

@@ -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);
+    return new this(id, elements, AppStateDelta.empty());
-  }
-
-  /**
-   * 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;
   }
 
   /**
@@ -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
+    selectedLinearElementId:
-      ? {
+      (appState as AppState).selectedLinearElement?.elementId ??
-          elementId: appState.selectedLinearElement.elementId,
+      (appState as ObservedAppState).selectedLinearElementId ??
-          isEditing: !!appState.selectedLinearElement.isEditing,
+      null,
-        }
+    selectedLinearElementIsEditing:
-      : null,
+      (appState as AppState).selectedLinearElement?.isEditing ??
+      (appState as ObservedAppState).selectedLinearElementIsEditing ??
+      null,
   };
 
   Reflect.defineProperty(observedAppState, hiddenObservedAppStateProp, {

packages/element/src/textElement.ts

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

packages/element/src/transformHandles.ts

@@ -1,6 +1,7 @@
 import {
   DEFAULT_TRANSFORM_HANDLE_SPACING,
-  type EditorInterface,
+  isAndroid,
+  isIOS,
 } from "@excalidraw/common";
 
 import { pointFrom, pointRotateRads } from "@excalidraw/math";
@@ -8,10 +9,10 @@ import { pointFrom, pointRotateRads } from "@excalidraw/math";
 import type { Radians } from "@excalidraw/math";
 
 import type {
+  Device,
   InteractiveCanvasAppState,
   Zoom,
 } from "@excalidraw/excalidraw/types";
-import type { Bounds } from "@excalidraw/common";
 
 import { getElementAbsoluteCoords } from "./bounds";
 import {
@@ -21,6 +22,7 @@ import {
   isLinearElement,
 } from "./typeChecks";
 
+import type { Bounds } from "./bounds";
 import type {
   ElementsMap,
   ExcalidrawElement,
@@ -109,21 +111,20 @@ const generateTransformHandle = (
   return [xx - width / 2, yy - height / 2, width, height];
 };
 
-export const canResizeFromSides = (editorInterface: EditorInterface) => {
+export const canResizeFromSides = (device: Device) => {
-  if (
+  if (device.viewport.isMobile) {
-    editorInterface.formFactor === "phone" &&
+    return false;
-    editorInterface.userAgent.isMobileDevice
+  }
-  ) {
+
+  if (device.isTouchScreen && (isAndroid || isIOS)) {
     return false;
   }
 
   return true;
 };
 
-export const getOmitSidesForEditorInterface = (
+export const getOmitSidesForDevice = (device: Device) => {
-  editorInterface: EditorInterface,
+  if (canResizeFromSides(device)) {
-) => {
-  if (canResizeFromSides(editorInterface)) {
     return DEFAULT_OMIT_SIDES;
   }
 
@@ -325,15 +326,11 @@ export const getTransformHandles = (
   );
 };
 
-export const hasBoundingBox = (
+export const shouldShowBoundingBox = (
   elements: readonly NonDeletedExcalidrawElement[],
   appState: InteractiveCanvasAppState,
-  editorInterface: EditorInterface,
 ) => {
-  if (
+  if (appState.selectedLinearElement?.isEditing) {
-    appState.selectedLinearElement?.isEditing ||
-    appState.selectedLinearElement?.isDragging
-  ) {
     return false;
   }
   if (elements.length > 1) {
@@ -348,7 +345,5 @@ export const hasBoundingBox = (
     return true;
   }
 
-  // on mobile/tablet we currently don't show bbox because of resize issues
+  return element.points.length > 2;
-  // (also prob best for simplicity's sake)
-  return element.points.length > 2 && !editorInterface.userAgent.isMobileDevice;
 };

packages/element/src/typeChecks.ts

@@ -6,6 +6,7 @@ import type { ElementOrToolType } from "@excalidraw/excalidraw/types";
 
 import type { MarkNonNullable } from "@excalidraw/common/utility-types";
 
+import type { Bounds } from "./bounds";
 import type {
   ExcalidrawElement,
   ExcalidrawTextElement,
@@ -27,6 +28,8 @@ import type {
   ExcalidrawArrowElement,
   ExcalidrawElbowArrowElement,
   ExcalidrawLineElement,
+  PointBinding,
+  FixedPointBinding,
   ExcalidrawFlowchartNodeElement,
   ExcalidrawLinearElementSubType,
 } from "./types";
@@ -160,7 +163,7 @@ export const isLinearElementType = (
 export const isBindingElement = (
   element?: ExcalidrawElement | null,
   includeLocked = true,
-): element is ExcalidrawArrowElement => {
+): element is ExcalidrawLinearElement => {
   return (
     element != null &&
     (!element.locked || includeLocked === true) &&
@@ -355,6 +358,24 @@ export const getDefaultRoundnessTypeForElement = (
   return null;
 };
 
+export const isFixedPointBinding = (
+  binding: PointBinding | FixedPointBinding,
+): binding is FixedPointBinding => {
+  return (
+    Object.hasOwn(binding, "fixedPoint") &&
+    (binding as FixedPointBinding).fixedPoint != null
+  );
+};
+
+// TODO: Move this to @excalidraw/math
+export const isBounds = (box: unknown): box is Bounds =>
+  Array.isArray(box) &&
+  box.length === 4 &&
+  typeof box[0] === "number" &&
+  typeof box[1] === "number" &&
+  typeof box[2] === "number" &&
+  typeof box[3] === "number";
+
 export const getLinearElementSubType = (
   element: ExcalidrawLinearElement,
 ): ExcalidrawLinearElementSubType => {

packages/element/src/types.ts

@@ -279,23 +279,24 @@ export type ExcalidrawTextElementWithContainer = {
 
 export type FixedPoint = [number, number];
 
-export type BindMode = "inside" | "orbit" | "skip";
+export type PointBinding = {
-
-export type FixedPointBinding = {
   elementId: ExcalidrawBindableElement["id"];
-
+  focus: number;
-  // Represents the fixed point binding information in form of a vertical and
+  gap: number;
-  // horizontal ratio (i.e. a percentage value in the 0.0-1.0 range). This ratio
-  // gives the user selected fixed point by multiplying the bound element width
-  // with fixedPoint[0] and the bound element height with fixedPoint[1] to get the
-  // bound element-local point coordinate.
-  fixedPoint: FixedPoint;
-
-  // Determines whether the arrow remains outside the shape or is allowed to
-  // go all the way inside the shape up to the exact fixed point.
-  mode: BindMode;
 };
 
+export type FixedPointBinding = Merge<
+  PointBinding,
+  {
+    // Represents the fixed point binding information in form of a vertical and
+    // horizontal ratio (i.e. a percentage value in the 0.0-1.0 range). This ratio
+    // gives the user selected fixed point by multiplying the bound element width
+    // with fixedPoint[0] and the bound element height with fixedPoint[1] to get the
+    // bound element-local point coordinate.
+    fixedPoint: FixedPoint;
+  }
+>;
+
 type Index = number;
 
 export type PointsPositionUpdates = Map<
@@ -321,8 +322,9 @@ export type ExcalidrawLinearElement = _ExcalidrawElementBase &
   Readonly<{
     type: "line" | "arrow";
     points: readonly LocalPoint[];
-    startBinding: FixedPointBinding | null;
+    lastCommittedPoint: LocalPoint | null;
-    endBinding: FixedPointBinding | null;
+    startBinding: PointBinding | null;
+    endBinding: PointBinding | null;
     startArrowhead: Arrowhead | null;
     endArrowhead: Arrowhead | null;
   }>;
@@ -349,9 +351,9 @@ export type ExcalidrawElbowArrowElement = Merge<
   ExcalidrawArrowElement,
   {
     elbowed: true;
-    fixedSegments: readonly FixedSegment[] | null;
     startBinding: FixedPointBinding | null;
     endBinding: FixedPointBinding | null;
+    fixedSegments: readonly FixedSegment[] | null;
     /**
      * Marks that the 3rd point should be used as the 2nd point of the arrow in
      * order to temporarily hide the first segment of the arrow without losing
@@ -377,6 +379,7 @@ export type ExcalidrawFreeDrawElement = _ExcalidrawElementBase &
     points: readonly LocalPoint[];
     pressures: readonly number[];
     simulatePressure: boolean;
+    lastCommittedPoint: LocalPoint | null;
   }>;
 
 export type FileId = string & { _brand: "FileId" };

packages/element/src/utils.ts

@@ -1,7 +1,6 @@
 import {
   DEFAULT_ADAPTIVE_RADIUS,
   DEFAULT_PROPORTIONAL_RADIUS,
-  invariant,
   LINE_CONFIRM_THRESHOLD,
   ROUNDNESS,
 } from "@excalidraw/common";
@@ -11,17 +10,10 @@ import {
   curveCatmullRomCubicApproxPoints,
   curveOffsetPoints,
   lineSegment,
-  lineSegmentIntersectionPoints,
   pointDistance,
   pointFrom,
   pointFromArray,
-  pointFromVector,
-  pointRotateRads,
-  pointTranslate,
   rectangle,
-  vectorFromPoint,
-  vectorNormalize,
-  vectorScale,
   type GlobalPoint,
 } from "@excalidraw/math";
 
@@ -29,17 +21,11 @@ import type { Curve, LineSegment, LocalPoint } from "@excalidraw/math";
 
 import type { NormalizedZoomValue, Zoom } from "@excalidraw/excalidraw/types";
 
-import { elementCenterPoint, getDiamondPoints } from "./bounds";
+import { getDiamondPoints } from "./bounds";
 
 import { generateLinearCollisionShape } from "./shape";
 
-import { isPointInElement } from "./collision";
-import { LinearElementEditor } from "./linearElementEditor";
-import { isRectangularElement } from "./typeChecks";
-
 import type {
-  ElementsMap,
-  ExcalidrawArrowElement,
   ExcalidrawDiamondElement,
   ExcalidrawElement,
   ExcalidrawFreeDrawElement,
@@ -414,10 +400,20 @@ export function deconstructDiamondElement(
     ), // TOP
   ];
 
-  const corners = baseCorners.map(
+  const corners =
-    (corner) =>
+    offset > 0
-      curveCatmullRomCubicApproxPoints(curveOffsetPoints(corner, offset))!,
+      ? baseCorners.map(
-  );
+          (corner) =>
+            curveCatmullRomCubicApproxPoints(
+              curveOffsetPoints(corner, offset),
+            )!,
+        )
+      : [
+          [baseCorners[0]],
+          [baseCorners[1]],
+          [baseCorners[2]],
+          [baseCorners[3]],
+        ];
 
   const sides = [
     lineSegment<GlobalPoint>(
@@ -485,136 +481,3 @@ export const getCornerRadius = (x: number, element: ExcalidrawElement) => {
 
   return 0;
 };
-
-const getDiagonalsForBindableElement = (
-  element: ExcalidrawElement,
-  elementsMap: ElementsMap,
-) => {
-  // for rectangles, shrink the diagonals a bit because there's something
-  // going on with the focus points around the corners. Ask Mark for details.
-  const OFFSET_PX = element.type === "rectangle" ? 15 : 0;
-  const shrinkSegment = (seg: LineSegment<GlobalPoint>) => {
-    const v = vectorNormalize(vectorFromPoint(seg[1], seg[0]));
-    const offset = vectorScale(v, OFFSET_PX);
-    return lineSegment<GlobalPoint>(
-      pointTranslate(seg[0], offset),
-      pointTranslate(seg[1], vectorScale(offset, -1)),
-    );
-  };
-
-  const center = elementCenterPoint(element, elementsMap);
-  const diagonalOne = shrinkSegment(
-    isRectangularElement(element)
-      ? lineSegment<GlobalPoint>(
-          pointRotateRads(
-            pointFrom<GlobalPoint>(element.x, element.y),
-            center,
-            element.angle,
-          ),
-          pointRotateRads(
-            pointFrom<GlobalPoint>(
-              element.x + element.width,
-              element.y + element.height,
-            ),
-            center,
-            element.angle,
-          ),
-        )
-      : lineSegment<GlobalPoint>(
-          pointRotateRads(
-            pointFrom<GlobalPoint>(element.x + element.width / 2, element.y),
-            center,
-            element.angle,
-          ),
-          pointRotateRads(
-            pointFrom<GlobalPoint>(
-              element.x + element.width / 2,
-              element.y + element.height,
-            ),
-            center,
-            element.angle,
-          ),
-        ),
-  );
-  const diagonalTwo = shrinkSegment(
-    isRectangularElement(element)
-      ? lineSegment<GlobalPoint>(
-          pointRotateRads(
-            pointFrom<GlobalPoint>(element.x + element.width, element.y),
-            center,
-            element.angle,
-          ),
-          pointRotateRads(
-            pointFrom<GlobalPoint>(element.x, element.y + element.height),
-            center,
-            element.angle,
-          ),
-        )
-      : lineSegment<GlobalPoint>(
-          pointRotateRads(
-            pointFrom<GlobalPoint>(element.x, element.y + element.height / 2),
-            center,
-            element.angle,
-          ),
-          pointRotateRads(
-            pointFrom<GlobalPoint>(
-              element.x + element.width,
-              element.y + element.height / 2,
-            ),
-            center,
-            element.angle,
-          ),
-        ),
-  );
-
-  return [diagonalOne, diagonalTwo];
-};
-
-export const projectFixedPointOntoDiagonal = (
-  arrow: ExcalidrawArrowElement,
-  point: GlobalPoint,
-  element: ExcalidrawElement,
-  startOrEnd: "start" | "end",
-  elementsMap: ElementsMap,
-): GlobalPoint | null => {
-  invariant(arrow.points.length >= 2, "Arrow must have at least two points");
-  if (arrow.width < 3 && arrow.height < 3) {
-    return null;
-  }
-
-  const [diagonalOne, diagonalTwo] = getDiagonalsForBindableElement(
-    element,
-    elementsMap,
-  );
-
-  const a = LinearElementEditor.getPointAtIndexGlobalCoordinates(
-    arrow,
-    startOrEnd === "start" ? 1 : arrow.points.length - 2,
-    elementsMap,
-  );
-  const b = pointFromVector<GlobalPoint>(
-    vectorScale(
-      vectorFromPoint(point, a),
-      2 * pointDistance(a, point) +
-        Math.max(
-          pointDistance(diagonalOne[0], diagonalOne[1]),
-          pointDistance(diagonalTwo[0], diagonalTwo[1]),
-        ),
-    ),
-    a,
-  );
-  const intersector = lineSegment<GlobalPoint>(point, b);
-  const p1 = lineSegmentIntersectionPoints(diagonalOne, intersector);
-  const p2 = lineSegmentIntersectionPoints(diagonalTwo, intersector);
-  const d1 = p1 && pointDistance(a, p1);
-  const d2 = p2 && pointDistance(a, p2);
-
-  let p = null;
-  if (d1 != null && d2 != null) {
-    p = d1 < d2 ? p1 : p2;
-  } else {
-    p = p1 || p2 || null;
-  }
-
-  return p && isPointInElement(p, element, elementsMap) ? p : null;
-};

packages/element/src/zindex.ts

@@ -1,25 +1,18 @@
 import { arrayToMap, findIndex, findLastIndex } from "@excalidraw/common";
 
 import type { AppState } from "@excalidraw/excalidraw/types";
-import type { GlobalPoint } from "@excalidraw/math";
 
-import { isFrameLikeElement, isTextElement } from "./typeChecks";
+import { isFrameLikeElement } from "./typeChecks";
+
 import { getElementsInGroup } from "./groups";
+
 import { syncMovedIndices } from "./fractionalIndex";
+
 import { getSelectedElements } from "./selection";
-import { getBoundTextElement, getContainerElement } from "./textElement";
-import { getHoveredElementForBinding } from "./collision";
 
 import type { Scene } from "./Scene";
-import type {
+
-  ExcalidrawArrowElement,
+import type { ExcalidrawElement, ExcalidrawFrameLikeElement } from "./types";
-  ExcalidrawElement,
-  ExcalidrawFrameLikeElement,
-  NonDeletedExcalidrawElement,
-  NonDeletedSceneElementsMap,
-  Ordered,
-  OrderedExcalidrawElement,
-} from "./types";
 
 const isOfTargetFrame = (element: ExcalidrawElement, frameId: string) => {
   return element.frameId === frameId || element.id === frameId;
@@ -146,51 +139,6 @@ const getContiguousFrameRangeElements = (
   return allElements.slice(rangeStart, rangeEnd + 1);
 };
 
-/**
- * Moves the arrow element above any bindable elements it intersects with or
- * hovers over.
- */
-export const moveArrowAboveBindable = (
-  point: GlobalPoint,
-  arrow: ExcalidrawArrowElement,
-  elements: readonly Ordered<NonDeletedExcalidrawElement>[],
-  elementsMap: NonDeletedSceneElementsMap,
-  scene: Scene,
-): readonly OrderedExcalidrawElement[] => {
-  const hoveredElement = getHoveredElementForBinding(
-    point,
-    elements,
-    elementsMap,
-  );
-
-  if (!hoveredElement) {
-    return elements;
-  }
-
-  const boundTextElement = getBoundTextElement(hoveredElement, elementsMap);
-  const containerElement = isTextElement(hoveredElement)
-    ? getContainerElement(hoveredElement, elementsMap)
-    : null;
-
-  const bindableIds = [
-    hoveredElement.id,
-    boundTextElement?.id,
-    containerElement?.id,
-  ].filter((id): id is NonDeletedExcalidrawElement["id"] => !!id);
-  const bindableIdx = elements.findIndex((el) => bindableIds.includes(el.id));
-  const arrowIdx = elements.findIndex((el) => el.id === arrow.id);
-
-  if (arrowIdx !== -1 && bindableIdx !== -1 && arrowIdx < bindableIdx) {
-    const updatedElements = Array.from(elements);
-    const arrow = updatedElements.splice(arrowIdx, 1)[0];
-    updatedElements.splice(bindableIdx, 0, arrow);
-
-    scene.replaceAllElements(updatedElements);
-  }
-
-  return elements;
-};
-
 /**
  * Returns next candidate index that's available to be moved to. Currently that
  *  is a non-deleted element, and not inside a group (unless we're editing it).

packages/element/tests/__snapshots__/linearElementEditor.test.tsx.snap

@@ -17,7 +17,7 @@ exports[`Test Linear Elements > Test bound text element > should match styles fo
   class="excalidraw-wysiwyg"
   data-type="wysiwyg"
   dir="auto"
-  style="position: absolute; display: inline-block; min-height: 1em; backface-visibility: hidden; margin: 0px; padding: 0px; border: 0px; outline: 0; resize: none; background: transparent; overflow: hidden; z-index: var(--zIndex-wysiwyg); word-break: break-word; white-space: pre-wrap; overflow-wrap: break-word; box-sizing: content-box; width: 10.5px; height: 26.25px; left: 35px; top: 7.5px; transform: translate(0px, 0px) scale(1) rotate(0deg); text-align: center; vertical-align: middle; color: rgb(30, 30, 30); opacity: 1; max-height: 992.5px; font: Emoji 20px 20px; line-height: 1.25; font-family: Excalifont, Xiaolai, sans-serif, Segoe UI Emoji;"
+  style="position: absolute; display: inline-block; min-height: 1em; backface-visibility: hidden; margin: 0px; padding: 0px; border: 0px; outline: 0; resize: none; background: transparent; overflow: hidden; z-index: var(--zIndex-wysiwyg); word-break: break-word; white-space: pre-wrap; overflow-wrap: break-word; box-sizing: content-box; width: 10.5px; height: 26.25px; left: 35px; top: 7.5px; transform: translate(0px, 0px) scale(1) rotate(0deg); text-align: center; vertical-align: middle; color: rgb(30, 30, 30); opacity: 1; filter: var(--theme-filter); max-height: 992.5px; font: Emoji 20px 20px; line-height: 1.25; font-family: Excalifont, Xiaolai, sans-serif, Segoe UI Emoji;"
   tabindex="0"
   wrap="off"
 />

packages/element/tests/bounds.test.ts

@@ -135,9 +135,9 @@ describe("getElementBounds", () => {
     } as ExcalidrawLinearElement;
 
     const [x1, y1, x2, y2] = getElementBounds(element, arrayToMap([element]));
-    expect(x1).toEqual(360.9291017525165);
+    expect(x1).toEqual(360.3176068760539);
-    expect(y1).toEqual(185.24770129343722);
+    expect(y1).toEqual(185.90654264413516);
-    expect(x2).toEqual(481.4815539037601);
+    expect(x2).toEqual(480.87005902729743);
-    expect(y2).toEqual(319.8162855827246);
+    expect(y2).toEqual(320.4751269334226);
   });
 });

packages/element/tests/collision.test.tsx

@@ -1,12 +1,9 @@
-import { arrayToMap } from "@excalidraw/common";
 import { type GlobalPoint, type LocalPoint, pointFrom } from "@excalidraw/math";
 import { Excalidraw } from "@excalidraw/excalidraw";
-import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 import { UI } from "@excalidraw/excalidraw/tests/helpers/ui";
 import "@excalidraw/utils/test-utils";
 import { render } from "@excalidraw/excalidraw/tests/test-utils";
 
-import * as distance from "../src/distance";
 import { hitElementItself } from "../src/collision";
 
 describe("check rotated elements can be hit:", () => {
@@ -28,6 +25,8 @@ describe("check rotated elements can be hit:", () => {
         [-4, -302],
       ] as LocalPoint[],
     });
+    //const p = [120, -211];
+    //const p = [0, 13];
     const hit = hitElementItself({
       point: pointFrom<GlobalPoint>(88, -68),
       element: window.h.elements[0],
@@ -37,182 +36,3 @@ describe("check rotated elements can be hit:", () => {
     expect(hit).toBe(true);
   });
 });
-
-describe("hitElementItself cache", () => {
-  beforeEach(async () => {
-    // reset cache
-    hitElementItself({
-      point: pointFrom<GlobalPoint>(50, 50),
-      element: API.createElement({
-        type: "rectangle",
-        x: 0,
-        y: 0,
-        width: 100,
-        height: 100,
-        backgroundColor: "#ffffff",
-      }),
-      threshold: Infinity,
-      elementsMap: new Map([]),
-    });
-
-    localStorage.clear();
-    await render(<Excalidraw handleKeyboardGlobally={true} />);
-  });
-
-  it("reuses cached result when threshold increases", () => {
-    const element = API.createElement({
-      type: "rectangle",
-      x: 0,
-      y: 0,
-      width: 100,
-      height: 100,
-      backgroundColor: "#ffffff",
-    });
-    const elementsMap = arrayToMap([element]);
-    const point = pointFrom<GlobalPoint>(100.5, 50);
-
-    const distanceSpy = jest.spyOn(distance, "distanceToElement");
-
-    expect(
-      hitElementItself({
-        point,
-        element,
-        threshold: 1,
-        elementsMap,
-      }),
-    ).toBe(true);
-
-    expect(distanceSpy).toHaveBeenCalledTimes(1);
-
-    expect(
-      hitElementItself({
-        point,
-        element,
-        threshold: 10,
-        elementsMap,
-      }),
-    ).toBe(true);
-
-    expect(distanceSpy).toHaveBeenCalledTimes(1);
-
-    distanceSpy.mockRestore();
-  });
-
-  it("does not reuse cache when threshold decreases", () => {
-    const element = API.createElement({
-      type: "rectangle",
-      x: 0,
-      y: 0,
-      width: 100,
-      height: 100,
-      backgroundColor: "transparent",
-    });
-    const elementsMap = arrayToMap([element]);
-    const point = pointFrom<GlobalPoint>(105, 50);
-
-    const distanceSpy = jest.spyOn(distance, "distanceToElement");
-
-    expect(
-      hitElementItself({
-        point,
-        element,
-        threshold: 10,
-        elementsMap,
-      }),
-    ).toBe(true);
-
-    expect(distanceSpy).toHaveBeenCalledTimes(1);
-
-    expect(
-      hitElementItself({
-        point,
-        element,
-        threshold: 6,
-        elementsMap,
-      }),
-    ).toBe(true);
-
-    expect(distanceSpy).toHaveBeenCalledTimes(2);
-    distanceSpy.mockRestore();
-  });
-
-  it("invalidates cache when element version changes", () => {
-    const element = API.createElement({
-      type: "rectangle",
-      x: 0,
-      y: 0,
-      width: 100,
-      height: 100,
-      backgroundColor: "#ffffff",
-    });
-    const elementsMap = arrayToMap([element]);
-    const point = pointFrom<GlobalPoint>(100.5, 50);
-
-    const distanceSpy = jest.spyOn(distance, "distanceToElement");
-
-    expect(
-      hitElementItself({
-        point,
-        element,
-        threshold: 1,
-        elementsMap,
-      }),
-    ).toBe(true);
-
-    expect(distanceSpy).toHaveBeenCalledTimes(1);
-
-    const movedElement = {
-      ...element,
-      version: element.version + 1,
-      versionNonce: element.versionNonce + 1,
-    };
-
-    expect(
-      hitElementItself({
-        point,
-        element: movedElement,
-        threshold: 1,
-        elementsMap,
-      }),
-    ).toBe(true);
-
-    expect(distanceSpy).toHaveBeenCalledTimes(2);
-    distanceSpy.mockRestore();
-  });
-
-  it("override does not affect caching", () => {
-    const element = API.createElement({
-      type: "rectangle",
-      x: 0,
-      y: 0,
-      width: 100,
-      height: 100,
-      backgroundColor: "transparent",
-    });
-    const elementsMap = arrayToMap([element]);
-    const point = pointFrom<GlobalPoint>(50, 50);
-
-    const distanceSpy = jest.spyOn(distance, "distanceToElement");
-
-    expect(
-      hitElementItself({
-        point,
-        element,
-        threshold: 10,
-        elementsMap,
-      }),
-    ).toBe(false);
-
-    expect(distanceSpy).toHaveBeenCalledTimes(1);
-
-    expect(
-      hitElementItself({
-        point,
-        element,
-        threshold: 10,
-        elementsMap,
-        overrideShouldTestInside: true,
-      }),
-    ).toBe(true);
-  });
-});

packages/element/tests/delta.test.tsx

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

packages/element/tests/duplicate.test.tsx

@@ -144,8 +144,9 @@ describe("duplicating multiple elements", () => {
       id: "arrow1",
       startBinding: {
         elementId: "rectangle1",
+        focus: 0.2,
+        gap: 7,
         fixedPoint: [0.5, 1],
-        mode: "orbit",
       },
     });
 
@@ -154,8 +155,9 @@ describe("duplicating multiple elements", () => {
       id: "arrow2",
       endBinding: {
         elementId: "rectangle1",
+        focus: 0.2,
+        gap: 7,
         fixedPoint: [0.5, 1],
-        mode: "orbit",
       },
       boundElements: [{ id: "text2", type: "text" }],
     });
@@ -274,8 +276,9 @@ describe("duplicating multiple elements", () => {
       id: "arrow1",
       startBinding: {
         elementId: "rectangle1",
+        focus: 0.2,
+        gap: 7,
         fixedPoint: [0.5, 1],
-        mode: "orbit",
       },
     });
 
@@ -290,13 +293,15 @@ describe("duplicating multiple elements", () => {
       id: "arrow2",
       startBinding: {
         elementId: "rectangle1",
+        focus: 0.2,
+        gap: 7,
         fixedPoint: [0.5, 1],
-        mode: "orbit",
       },
       endBinding: {
         elementId: "rectangle-not-exists",
+        focus: 0.2,
+        gap: 7,
         fixedPoint: [0.5, 1],
-        mode: "orbit",
       },
     });
 
@@ -305,13 +310,15 @@ describe("duplicating multiple elements", () => {
       id: "arrow3",
       startBinding: {
         elementId: "rectangle-not-exists",
+        focus: 0.2,
+        gap: 7,
         fixedPoint: [0.5, 1],
-        mode: "orbit",
       },
       endBinding: {
         elementId: "rectangle1",
+        focus: 0.2,
+        gap: 7,
         fixedPoint: [0.5, 1],
-        mode: "orbit",
       },
     });
 
@@ -814,7 +821,7 @@ describe("duplication z-order", () => {
     const arrow = UI.createElement("arrow", {
       x: -100,
       y: 50,
-      width: 115,
+      width: 95,
       height: 0,
     });
 

packages/element/tests/elbowArrow.test.tsx

@@ -1,10 +1,13 @@
 import { ARROW_TYPE } from "@excalidraw/common";
 import { pointFrom } from "@excalidraw/math";
 import { Excalidraw } from "@excalidraw/excalidraw";
+
 import { actionSelectAll } from "@excalidraw/excalidraw/actions";
 import { actionDuplicateSelection } from "@excalidraw/excalidraw/actions/actionDuplicateSelection";
+
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 import { Pointer, UI } from "@excalidraw/excalidraw/tests/helpers/ui";
+
 import {
   act,
   fireEvent,
@@ -12,11 +15,13 @@ import {
   queryByTestId,
   render,
 } from "@excalidraw/excalidraw/tests/test-utils";
+
 import "@excalidraw/utils/test-utils";
-import { bindBindingElement } from "@excalidraw/element";
 
 import type { LocalPoint } from "@excalidraw/math";
 
+import { bindLinearElement } from "../src/binding";
+
 import { Scene } from "../src/Scene";
 
 import type {
@@ -131,11 +136,6 @@ describe("elbow arrow segment move", () => {
 });
 
 describe("elbow arrow routing", () => {
-  beforeEach(async () => {
-    localStorage.clear();
-    await render(<Excalidraw handleKeyboardGlobally={true} />);
-  });
-
   it("can properly generate orthogonal arrow points", () => {
     const scene = new Scene();
     const arrow = API.createElement({
@@ -160,8 +160,8 @@ describe("elbow arrow routing", () => {
     expect(arrow.width).toEqual(90);
     expect(arrow.height).toEqual(200);
   });
-
   it("can generate proper points for bound elbow arrow", () => {
+    const scene = new Scene();
     const rectangle1 = API.createElement({
       type: "rectangle",
       x: -150,
@@ -185,23 +185,25 @@ describe("elbow arrow routing", () => {
       height: 200,
       points: [pointFrom(0, 0), pointFrom(90, 200)],
     }) as ExcalidrawElbowArrowElement;
-    API.setElements([rectangle1, rectangle2, arrow]);
+    scene.insertElement(rectangle1);
+    scene.insertElement(rectangle2);
+    scene.insertElement(arrow);
 
-    bindBindingElement(arrow, rectangle1, "orbit", "start", h.scene);
+    bindLinearElement(arrow, rectangle1, "start", scene);
-    bindBindingElement(arrow, rectangle2, "orbit", "end", h.scene);
+    bindLinearElement(arrow, rectangle2, "end", scene);
 
     expect(arrow.startBinding).not.toBe(null);
     expect(arrow.endBinding).not.toBe(null);
 
-    h.scene.mutateElement(arrow, {
+    h.app.scene.mutateElement(arrow, {
       points: [pointFrom<LocalPoint>(0, 0), pointFrom<LocalPoint>(90, 200)],
     });
 
-    expect(arrow.points).toCloselyEqualPoints([
+    expect(arrow.points).toEqual([
       [0, 0],
-      [39, 0],
+      [45, 0],
-      [39, 200],
+      [45, 200],
-      [78, 200],
+      [90, 200],
     ]);
   });
 });
@@ -240,9 +242,9 @@ describe("elbow arrow ui", () => {
     expect(h.state.currentItemArrowType).toBe(ARROW_TYPE.elbow);
 
     mouse.reset();
-    mouse.moveTo(-53, -99);
+    mouse.moveTo(-43, -99);
     mouse.click();
-    mouse.moveTo(53, 99);
+    mouse.moveTo(43, 99);
     mouse.click();
 
     const arrow = h.scene.getSelectedElements(
@@ -251,11 +253,11 @@ describe("elbow arrow ui", () => {
 
     expect(arrow.type).toBe("arrow");
     expect(arrow.elbowed).toBe(true);
-    expect(arrow.points).toCloselyEqualPoints([
+    expect(arrow.points).toEqual([
       [0, 0],
-      [39, 0],
+      [45, 0],
-      [39, 200],
+      [45, 200],
-      [78, 200],
+      [90, 200],
     ]);
   });
 
@@ -277,9 +279,9 @@ describe("elbow arrow ui", () => {
     UI.clickOnTestId("elbow-arrow");
 
     mouse.reset();
-    mouse.moveTo(-53, -99);
+    mouse.moveTo(-43, -99);
     mouse.click();
-    mouse.moveTo(53, 99);
+    mouse.moveTo(43, 99);
     mouse.click();
 
     const arrow = h.scene.getSelectedElements(
@@ -295,11 +297,9 @@ describe("elbow arrow ui", () => {
 
     expect(arrow.points.map((point) => point.map(Math.round))).toEqual([
       [0, 0],
-      [36, 0],
+      [35, 0],
-      [36, 90],
+      [35, 165],
-      [28, 90],
+      [103, 165],
-      [28, 164],
-      [101, 164],
     ]);
   });
 
@@ -321,9 +321,9 @@ describe("elbow arrow ui", () => {
     UI.clickOnTestId("elbow-arrow");
 
     mouse.reset();
-    mouse.moveTo(-53, -99);
+    mouse.moveTo(-43, -99);
     mouse.click();
-    mouse.moveTo(53, 99);
+    mouse.moveTo(43, 99);
     mouse.click();
 
     const arrow = h.scene.getSelectedElements(
@@ -351,11 +351,11 @@ describe("elbow arrow ui", () => {
     expect(duplicatedArrow.id).not.toBe(originalArrowId);
     expect(duplicatedArrow.type).toBe("arrow");
     expect(duplicatedArrow.elbowed).toBe(true);
-    expect(duplicatedArrow.points).toCloselyEqualPoints([
+    expect(duplicatedArrow.points).toEqual([
       [0, 0],
-      [39, 0],
+      [45, 0],
-      [39, 200],
+      [45, 200],
-      [78, 200],
+      [90, 200],
     ]);
     expect(arrow.startBinding).not.toBe(null);
     expect(arrow.endBinding).not.toBe(null);
@@ -379,9 +379,9 @@ describe("elbow arrow ui", () => {
     UI.clickOnTestId("elbow-arrow");
 
     mouse.reset();
-    mouse.moveTo(-53, -99);
+    mouse.moveTo(-43, -99);
     mouse.click();
-    mouse.moveTo(53, 99);
+    mouse.moveTo(43, 99);
     mouse.click();
 
     const arrow = h.scene.getSelectedElements(
@@ -405,11 +405,11 @@ describe("elbow arrow ui", () => {
     expect(duplicatedArrow.id).not.toBe(originalArrowId);
     expect(duplicatedArrow.type).toBe("arrow");
     expect(duplicatedArrow.elbowed).toBe(true);
-    expect(duplicatedArrow.points).toCloselyEqualPoints([
+    expect(duplicatedArrow.points).toEqual([
       [0, 0],
       [0, 100],
-      [78, 100],
+      [90, 100],
-      [78, 200],
+      [90, 200],
     ]);
   });
 });

packages/element/tests/linearElementEditor.test.tsx

@@ -217,8 +217,8 @@ describe("Test Linear Elements", () => {
 
     // drag line from midpoint
     drag(midpoint, pointFrom(midpoint[0] + delta, midpoint[1] + delta));
-    expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(`8`);
+    expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(`9`);
-    expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
+    expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
     expect(line.points.length).toEqual(3);
     expect(line.points).toMatchInlineSnapshot(`
       [
@@ -329,7 +329,7 @@ describe("Test Linear Elements", () => {
     expect(h.state.selectedLinearElement?.isEditing).toBe(false);
 
     mouse.doubleClick();
-    expect(h.state.selectedLinearElement?.isEditing).toBe(false);
+    expect(h.state.selectedLinearElement).toBe(null);
     await getTextEditor();
   });
 
@@ -357,7 +357,6 @@ describe("Test Linear Elements", () => {
       const originalY = line.y;
       enterLineEditingMode(line);
 
-      expect(h.state.selectedLinearElement?.isEditing).toBe(true);
       expect(line.points.length).toEqual(2);
 
       mouse.clickAt(midpoint[0], midpoint[1]);
@@ -380,7 +379,7 @@ describe("Test Linear Elements", () => {
       expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
         `11`,
       );
-      expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
+      expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
 
       expect(line.points.length).toEqual(3);
       expect(line.points).toMatchInlineSnapshot(`
@@ -550,7 +549,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `14`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`9`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
         expect(line.points.length).toEqual(5);
 
@@ -601,7 +600,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `11`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
 
         const newPoints = LinearElementEditor.getPointsGlobalCoordinates(
           line,
@@ -642,7 +641,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `11`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
 
         const newPoints = LinearElementEditor.getPointsGlobalCoordinates(
           line,
@@ -690,7 +689,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `17`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`10`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
 
         const newMidPoints = LinearElementEditor.getEditorMidPoints(
           line,
@@ -748,7 +747,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `14`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`9`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
         expect(line.points.length).toEqual(5);
 
         expect((h.elements[0] as ExcalidrawLinearElement).points)
@@ -846,7 +845,7 @@ describe("Test Linear Elements", () => {
         expect(renderInteractiveScene.mock.calls.length).toMatchInlineSnapshot(
           `11`,
         );
-        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`7`);
+        expect(renderStaticScene.mock.calls.length).toMatchInlineSnapshot(`6`);
 
         const newPoints = LinearElementEditor.getPointsGlobalCoordinates(
           line,
@@ -1304,7 +1303,7 @@ describe("Test Linear Elements", () => {
       const arrow = UI.createElement("arrow", {
         x: -10,
         y: 250,
-        width: 410,
+        width: 400,
         height: 1,
       });
 
@@ -1317,7 +1316,7 @@ describe("Test Linear Elements", () => {
       const textElement = h.elements[2] as ExcalidrawTextElementWithContainer;
 
       expect(arrow.endBinding?.elementId).toBe(rect.id);
-      expect(arrow.width).toBeCloseTo(399);
+      expect(arrow.width).toBe(400);
       expect(rect.x).toBe(400);
       expect(rect.y).toBe(0);
       expect(
@@ -1336,7 +1335,7 @@ describe("Test Linear Elements", () => {
       mouse.downAt(rect.x, rect.y);
       mouse.moveTo(200, 0);
       mouse.upAt(200, 0);
-      expect(arrow.width).toBeCloseTo(199);
+      expect(arrow.width).toBeCloseTo(200, 0);
       expect(rect.x).toBe(200);
       expect(rect.y).toBe(0);
       expect(handleBindTextResizeSpy).toHaveBeenCalledWith(

packages/element/tests/resize.test.tsx

@@ -2,7 +2,6 @@ import { pointFrom } from "@excalidraw/math";
 
 import { Excalidraw } from "@excalidraw/excalidraw";
 import {
-  type Bounds,
   KEYS,
   getSizeFromPoints,
   reseed,
@@ -23,6 +22,7 @@ import { resizeSingleElement } from "../src/resizeElements";
 import { LinearElementEditor } from "../src/linearElementEditor";
 import { getElementPointsCoords } from "../src/bounds";
 
+import type { Bounds } from "../src/bounds";
 import type {
   ExcalidrawElbowArrowElement,
   ExcalidrawFreeDrawElement,
@@ -174,29 +174,29 @@ describe("generic element", () => {
     expect(rectangle.angle).toBeCloseTo(0);
   });
 
-  // it("resizes with bound arrow", async () => {
+  it("resizes with bound arrow", async () => {
-  //   const rectangle = UI.createElement("rectangle", {
+    const rectangle = UI.createElement("rectangle", {
-  //     width: 200,
+      width: 200,
-  //     height: 100,
+      height: 100,
-  //   });
+    });
-  //   const arrow = UI.createElement("arrow", {
+    const arrow = UI.createElement("arrow", {
-  //     x: -30,
+      x: -30,
-  //     y: 50,
+      y: 50,
-  //     width: 28,
+      width: 28,
-  //     height: 5,
+      height: 5,
-  //   });
+    });
 
-  //   expect(arrow.endBinding?.elementId).toEqual(rectangle.id);
+    expect(arrow.endBinding?.elementId).toEqual(rectangle.id);
 
-  //   UI.resize(rectangle, "e", [40, 0]);
+    UI.resize(rectangle, "e", [40, 0]);
 
-  //   expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(30, 0);
+    expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(30, 0);
 
-  //   UI.resize(rectangle, "w", [50, 0]);
+    UI.resize(rectangle, "w", [50, 0]);
 
-  //   expect(arrow.endBinding?.elementId).toEqual(rectangle.id);
+    expect(arrow.endBinding?.elementId).toEqual(rectangle.id);
-  //   expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(80, 0);
+    expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(80, 0);
-  // });
+  });
 
   it("resizes with a label", async () => {
     const rectangle = UI.createElement("rectangle", {
@@ -510,12 +510,12 @@ describe("arrow element", () => {
       h.state,
     )[0] as ExcalidrawElbowArrowElement;
 
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.06);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.05);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.75);
 
     UI.resize(rectangle, "se", [-200, -150]);
 
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.06);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.05);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.75);
   });
 
@@ -538,11 +538,11 @@ describe("arrow element", () => {
       h.state,
     )[0] as ExcalidrawElbowArrowElement;
 
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.06);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(1.05);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.75);
 
     UI.resize([rectangle, arrow], "nw", [300, 350]);
-    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(-0.06);
+    expect(arrow.startBinding?.fixedPoint?.[0]).toBeCloseTo(-0.05);
     expect(arrow.startBinding?.fixedPoint?.[1]).toBeCloseTo(0.25);
   });
 });
@@ -563,24 +563,6 @@ describe("text element", () => {
     expect(text.fontSize).toBeCloseTo(fontSize * scale);
   });
 
-  it("resizes proportionally using horizontal delta from corner handles", async () => {
-    const text = UI.createElement("text");
-    await UI.editText(text, "hello\nworld");
-    const { x, y, width, height, fontSize } = text;
-    const deltaX = width;
-    const deltaY = 0;
-    const scale = (width + deltaX) / width;
-
-    UI.resize(text, "se", [deltaX, deltaY]);
-
-    expect(text.x).toBeCloseTo(x);
-    expect(text.y).toBeCloseTo(y);
-    expect(text.width).toBeCloseTo(width * scale);
-    expect(text.height).toBeCloseTo(height * scale);
-    expect(text.angle).toBeCloseTo(0);
-    expect(text.fontSize).toBeCloseTo(fontSize * scale);
-  });
-
   // TODO enable this test after adding single text element flipping
   it.skip("flips while resizing", async () => {
     const text = UI.createElement("text");
@@ -613,31 +595,31 @@ describe("text element", () => {
     expect(text.fontSize).toBeCloseTo(fontSize * scale);
   });
 
-  // it("resizes with bound arrow", async () => {
+  it("resizes with bound arrow", async () => {
-  //   const text = UI.createElement("text");
+    const text = UI.createElement("text");
-  //   await UI.editText(text, "hello\nworld");
+    await UI.editText(text, "hello\nworld");
-  //   const boundArrow = UI.createElement("arrow", {
+    const boundArrow = UI.createElement("arrow", {
-  //     x: -30,
+      x: -30,
-  //     y: 25,
+      y: 25,
-  //     width: 28,
+      width: 28,
-  //     height: 5,
+      height: 5,
-  //   });
+    });
 
-  //   expect(boundArrow.endBinding?.elementId).toEqual(text.id);
+    expect(boundArrow.endBinding?.elementId).toEqual(text.id);
 
-  //   UI.resize(text, "ne", [40, 0]);
+    UI.resize(text, "ne", [40, 0]);
 
-  //   expect(boundArrow.width + boundArrow.endBinding!.gap).toBeCloseTo(30);
+    expect(boundArrow.width + boundArrow.endBinding!.gap).toBeCloseTo(30);
 
-  //   const textWidth = text.width;
+    const textWidth = text.width;
-  //   const scale = 20 / text.height;
+    const scale = 20 / text.height;
-  //   UI.resize(text, "nw", [50, 20]);
+    UI.resize(text, "nw", [50, 20]);
 
-  //   expect(boundArrow.endBinding?.elementId).toEqual(text.id);
+    expect(boundArrow.endBinding?.elementId).toEqual(text.id);
-  //   expect(boundArrow.width + boundArrow.endBinding!.gap).toBeCloseTo(
+    expect(boundArrow.width + boundArrow.endBinding!.gap).toBeCloseTo(
-  //     30 + textWidth * scale,
+      30 + textWidth * scale,
-  //   );
+    );
-  // });
+  });
 
   it("updates font size via keyboard", async () => {
     const text = UI.createElement("text");
@@ -819,36 +801,36 @@ describe("image element", () => {
     expect(image.scale).toEqual([1, 1]);
   });
 
-  // it("resizes with bound arrow", async () => {
+  it("resizes with bound arrow", async () => {
-  //   const image = API.createElement({
+    const image = API.createElement({
-  //     type: "image",
+      type: "image",
-  //     width: 100,
+      width: 100,
-  //     height: 100,
+      height: 100,
-  //   });
+    });
-  //   API.setElements([image]);
+    API.setElements([image]);
-  //   const arrow = UI.createElement("arrow", {
+    const arrow = UI.createElement("arrow", {
-  //     x: -30,
+      x: -30,
-  //     y: 50,
+      y: 50,
-  //     width: 28,
+      width: 28,
-  //     height: 5,
+      height: 5,
-  //   });
+    });
 
-  //   expect(arrow.endBinding?.elementId).toEqual(image.id);
+    expect(arrow.endBinding?.elementId).toEqual(image.id);
 
-  //   UI.resize(image, "ne", [40, 0]);
+    UI.resize(image, "ne", [40, 0]);
 
-  //   expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(30, 0);
+    expect(arrow.width + arrow.endBinding!.gap).toBeCloseTo(30, 0);
 
-  //   const imageWidth = image.width;
+    const imageWidth = image.width;
-  //   const scale = 20 / image.height;
+    const scale = 20 / image.height;
-  //   UI.resize(image, "nw", [50, 20]);
+    UI.resize(image, "nw", [50, 20]);
 
-  //   expect(arrow.endBinding?.elementId).toEqual(image.id);
+    expect(arrow.endBinding?.elementId).toEqual(image.id);
-  //   expect(Math.floor(arrow.width + arrow.endBinding!.gap)).toBeCloseTo(
+    expect(Math.floor(arrow.width + arrow.endBinding!.gap)).toBeCloseTo(
-  //     30 + imageWidth * scale,
+      30 + imageWidth * scale,
-  //     0,
+      0,
-  //   );
+    );
-  // });
+  });
 });
 
 describe("multiple selection", () => {
@@ -1015,80 +997,68 @@ describe("multiple selection", () => {
     expect(diagLine.angle).toEqual(0);
   });
 
-  // it("resizes with bound arrows", async () => {
+  it("resizes with bound arrows", async () => {
-  //   const rectangle = UI.createElement("rectangle", {
+    const rectangle = UI.createElement("rectangle", {
-  //     position: 0,
+      position: 0,
-  //     size: 100,
+      size: 100,
-  //   });
+    });
-  //   const leftBoundArrow = UI.createElement("arrow", {
+    const leftBoundArrow = UI.createElement("arrow", {
-  //     x: -110,
+      x: -110,
-  //     y: 50,
+      y: 50,
-  //     width: 100,
+      width: 100,
-  //     height: 0,
+      height: 0,
-  //   });
+    });
 
-  //   const rightBoundArrow = UI.createElement("arrow", {
+    const rightBoundArrow = UI.createElement("arrow", {
-  //     x: 210,
+      x: 210,
-  //     y: 50,
+      y: 50,
-  //     width: -100,
+      width: -100,
-  //     height: 0,
+      height: 0,
-  //   });
+    });
 
-  //   const selectionWidth = 210;
+    const selectionWidth = 210;
-  //   const selectionHeight = 100;
+    const selectionHeight = 100;
-  //   const move = [40, 40] as [number, number];
+    const move = [40, 40] as [number, number];
-  //   const scale = Math.max(
+    const scale = Math.max(
-  //     1 - move[0] / selectionWidth,
+      1 - move[0] / selectionWidth,
-  //     1 - move[1] / selectionHeight,
+      1 - move[1] / selectionHeight,
-  //   );
+    );
-  //   const leftArrowBinding: {
+    const leftArrowBinding = { ...leftBoundArrow.endBinding };
-  //     elementId: string;
+    const rightArrowBinding = { ...rightBoundArrow.endBinding };
-  //     gap?: number;
+    delete rightArrowBinding.gap;
-  //     focus?: number;
-  //   } = {
-  //     ...leftBoundArrow.endBinding,
-  //   } as PointBinding;
-  //   const rightArrowBinding: {
-  //     elementId: string;
-  //     gap?: number;
-  //     focus?: number;
-  //   } = {
-  //     ...rightBoundArrow.endBinding,
-  //   } as PointBinding;
-  //   delete rightArrowBinding.gap;
 
-  //   UI.resize([rectangle, rightBoundArrow], "nw", move, {
+    UI.resize([rectangle, rightBoundArrow], "nw", move, {
-  //     shift: true,
+      shift: true,
-  //   });
+    });
 
-  //   expect(leftBoundArrow.x).toBeCloseTo(-110);
+    expect(leftBoundArrow.x).toBeCloseTo(-110);
-  //   expect(leftBoundArrow.y).toBeCloseTo(50);
+    expect(leftBoundArrow.y).toBeCloseTo(50);
-  //   expect(leftBoundArrow.width).toBeCloseTo(140, 0);
+    expect(leftBoundArrow.width).toBeCloseTo(140, 0);
-  //   expect(leftBoundArrow.height).toBeCloseTo(7, 0);
+    expect(leftBoundArrow.height).toBeCloseTo(7, 0);
-  //   expect(leftBoundArrow.angle).toEqual(0);
+    expect(leftBoundArrow.angle).toEqual(0);
-  //   expect(leftBoundArrow.startBinding).toBeNull();
+    expect(leftBoundArrow.startBinding).toBeNull();
-  //   expect(leftBoundArrow.endBinding?.gap).toBeCloseTo(10);
+    expect(leftBoundArrow.endBinding?.gap).toBeCloseTo(10);
-  //   expect(leftBoundArrow.endBinding?.elementId).toBe(
+    expect(leftBoundArrow.endBinding?.elementId).toBe(
-  //     leftArrowBinding.elementId,
+      leftArrowBinding.elementId,
-  //   );
+    );
-  //   expect(leftBoundArrow.endBinding?.focus).toBe(leftArrowBinding.focus);
+    expect(leftBoundArrow.endBinding?.focus).toBe(leftArrowBinding.focus);
 
-  //   expect(rightBoundArrow.x).toBeCloseTo(210);
+    expect(rightBoundArrow.x).toBeCloseTo(210);
-  //   expect(rightBoundArrow.y).toBeCloseTo(
+    expect(rightBoundArrow.y).toBeCloseTo(
-  //     (selectionHeight - 50) * (1 - scale) + 50,
+      (selectionHeight - 50) * (1 - scale) + 50,
-  //   );
+    );
-  //   expect(rightBoundArrow.width).toBeCloseTo(100 * scale);
+    expect(rightBoundArrow.width).toBeCloseTo(100 * scale);
-  //   expect(rightBoundArrow.height).toBeCloseTo(0);
+    expect(rightBoundArrow.height).toBeCloseTo(0);
-  //   expect(rightBoundArrow.angle).toEqual(0);
+    expect(rightBoundArrow.angle).toEqual(0);
-  //   expect(rightBoundArrow.startBinding).toBeNull();
+    expect(rightBoundArrow.startBinding).toBeNull();
-  //   expect(rightBoundArrow.endBinding?.gap).toBeCloseTo(8.0952);
+    expect(rightBoundArrow.endBinding?.gap).toBeCloseTo(8.0952);
-  //   expect(rightBoundArrow.endBinding?.elementId).toBe(
+    expect(rightBoundArrow.endBinding?.elementId).toBe(
-  //     rightArrowBinding.elementId,
+      rightArrowBinding.elementId,
-  //   );
+    );
-  //   expect(rightBoundArrow.endBinding?.focus).toBeCloseTo(
+    expect(rightBoundArrow.endBinding?.focus).toBeCloseTo(
-  //     rightArrowBinding.focus!,
+      rightArrowBinding.focus!,
-  //   );
+    );
-  // });
+  });
 
   it("resizes with labeled arrows", async () => {
     const topArrow = UI.createElement("arrow", {
@@ -1368,8 +1338,8 @@ describe("multiple selection", () => {
 
     expect(boundArrow.x).toBeCloseTo(380 * scaleX);
     expect(boundArrow.y).toBeCloseTo(240 * scaleY);
-    expect(boundArrow.points[1][0]).toBeCloseTo(59.7979);
+    expect(boundArrow.points[1][0]).toBeCloseTo(-60 * scaleX);
-    expect(boundArrow.points[1][1]).toBeCloseTo(-79.7305);
+    expect(boundArrow.points[1][1]).toBeCloseTo(-80 * scaleY);
 
     expect(arrowLabelPos.x + arrowLabel.width / 2).toBeCloseTo(
       boundArrow.x + boundArrow.points[1][0] / 2,

packages/element/tests/textElement.test.ts

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

packages/excalidraw/actions/actionAlign.tsx

@@ -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";

packages/excalidraw/actions/actionBoundText.tsx

@@ -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(
+    const someTextElements = selectedElements.some((el) => isTextElement(el));
-      (el) => isTextElement(el) && !isBoundToContainer(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,

packages/excalidraw/actions/actionCanvas.tsx

@@ -7,6 +7,7 @@ import {
   MIN_ZOOM,
   THEME,
   ZOOM_STEP,
+  getShortcutKey,
   updateActiveTool,
   CODES,
   KEYS,
@@ -45,13 +46,12 @@ 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";
 
 import type { AppState, Offsets } from "../types";
 
-export const actionChangeViewBackgroundColor = register<Partial<AppState>>({
+export const actionChangeViewBackgroundColor = register({
   name: "changeViewBackgroundColor",
   label: "labels.canvasBackground",
   trackEvent: false,
@@ -64,12 +64,12 @@ export const actionChangeViewBackgroundColor = register<Partial<AppState>>({
   perform: (_, appState, value) => {
     return {
       appState: { ...appState, ...value },
-      captureUpdate: !!value?.viewBackgroundColor
+      captureUpdate: !!value.viewBackgroundColor
         ? CaptureUpdateAction.IMMEDIATELY
         : 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: "selection" }
-                ...appState.activeTool,
-                type: app.state.preferredSelectionTool.type,
-              }
             : appState.activeTool,
       },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
@@ -466,7 +463,7 @@ export const actionZoomToFit = register({
     !event[KEYS.CTRL_OR_CMD],
 });
 
-export const actionToggleTheme = register<AppState["theme"]>({
+export const actionToggleTheme = register({
   name: "toggleTheme",
   label: (_, appState) => {
     return appState.theme === THEME.DARK
@@ -474,8 +471,7 @@ export const actionToggleTheme = register<AppState["theme"]>({
       : "buttons.darkMode";
   },
   keywords: ["toggle", "dark", "light", "mode", "theme"],
-  icon: (appState, elements) =>
+  icon: (appState) => (appState.theme === THEME.LIGHT ? MoonIcon : SunIcon),
-    appState.theme === THEME.LIGHT ? MoonIcon : SunIcon,
   viewMode: true,
   trackEvent: { category: "canvas" },
   perform: (_, appState, value) => {
@@ -498,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,
       });
@@ -534,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"];
 

packages/excalidraw/actions/actionClipboard.tsx

@@ -20,12 +20,12 @@ import { t } from "../i18n";
 import { actionDeleteSelected } from "./actionDeleteSelected";
 import { register } from "./register";
 
-export const actionCopy = register<ClipboardEvent | null>({
+export const actionCopy = register({
   name: "copy",
   label: "labels.copy",
   icon: DuplicateIcon,
   trackEvent: { category: "element" },
-  perform: async (elements, appState, event, app) => {
+  perform: async (elements, appState, event: ClipboardEvent | null, app) => {
     const elementsToCopy = app.scene.getSelectedElements({
       selectedElementIds: appState.selectedElementIds,
       includeBoundTextElement: true,
@@ -109,12 +109,12 @@ export const actionPaste = register({
   keyTest: undefined,
 });
 
-export const actionCut = register<ClipboardEvent | null>({
+export const actionCut = register({
   name: "cut",
   label: "labels.cut",
   icon: cutIcon,
   trackEvent: { category: "element" },
-  perform: (elements, appState, event, app) => {
+  perform: (elements, appState, event: ClipboardEvent | null, app) => {
     actionCopy.perform(elements, appState, event, app);
     return actionDeleteSelected.perform(elements, appState, null, app);
   },

packages/excalidraw/actions/actionDeleteSelected.tsx

@@ -1,8 +1,4 @@
-import {
+import { KEYS, updateActiveTool } from "@excalidraw/common";
-  KEYS,
-  MOBILE_ACTION_BUTTON_BG,
-  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";
@@ -212,8 +206,12 @@ export const actionDeleteSelected = register({
   trackEvent: { category: "element", action: "delete" },
   perform: (elements, appState, formData, app) => {
     if (appState.selectedLinearElement?.isEditing) {
-      const { elementId, selectedPointsIndices } =
+      const {
-        appState.selectedLinearElement;
+        elementId,
+        selectedPointsIndices,
+        startBindingElement,
+        endBindingElement,
+      } = appState.selectedLinearElement;
       const elementsMap = app.scene.getNonDeletedElementsMap();
       const linearElement = LinearElementEditor.getElement(
         elementId,
@@ -250,6 +248,19 @@ export const actionDeleteSelected = register({
         };
       }
 
+      // We cannot do this inside `movePoint` because it is also called
+      // when deleting the uncommitted point (which hasn't caused any binding)
+      const binding = {
+        startBindingElement: selectedPointsIndices?.includes(0)
+          ? null
+          : startBindingElement,
+        endBindingElement: selectedPointsIndices?.includes(
+          linearElement.points.length - 1,
+        )
+          ? null
+          : endBindingElement,
+      };
+
       LinearElementEditor.deletePoints(
         linearElement,
         app,
@@ -262,6 +273,7 @@ export const actionDeleteSelected = register({
           ...appState,
           selectedLinearElement: {
             ...appState.selectedLinearElement,
+            ...binding,
             selectedPointsIndices:
               selectedPointsIndices?.[0] > 0
                 ? [selectedPointsIndices[0] - 1]
@@ -286,11 +298,8 @@ export const actionDeleteSelected = register({
       elements: nextElements,
       appState: {
         ...nextAppState,
-        activeTool: updateActiveTool(appState, {
+        activeTool: updateActiveTool(appState, { type: "selection" }),
-          type: app.state.preferredSelectionTool.type,
-        }),
         multiElement: null,
-        newElement: null,
         activeEmbeddable: null,
         selectedLinearElement: null,
       },
@@ -305,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 }) => {
+  PanelComponent: ({ elements, appState, updateData }) => (
-    const isMobile = useStylesPanelMode() === "mobile";
+    <ToolButton
-
+      type="button"
-    return (
+      icon={TrashIcon}
-      <ToolButton
+      title={t("labels.delete")}
-        type="button"
+      aria-label={t("labels.delete")}
-        icon={TrashIcon}
+      onClick={() => updateData(null)}
-        title={t("labels.delete")}
+      visible={isSomeElementSelected(getNonDeletedElements(elements), appState)}
-        aria-label={t("labels.delete")}
+    />
-        onClick={() => updateData(null)}
+  ),
-        disabled={
-          !isSomeElementSelected(getNonDeletedElements(elements), appState)
-        }
-        style={{
-          ...(isMobile && appState.openPopup !== "compactOtherProperties"
-            ? MOBILE_ACTION_BUTTON_BG
-            : {}),
-        }}
-      />
-    );
-  },
 });

packages/excalidraw/actions/actionDistribute.tsx

@@ -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";
@@ -58,7 +56,6 @@ const distributeSelectedElements = (
     app.scene.getNonDeletedElementsMap(),
     distribution,
     appState,
-    app.scene,
   );
 
   const updatedElementsMap = arrayToMap(updatedElements);

packages/excalidraw/actions/actionDuplicateSelection.tsx

@@ -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 }) => {
+  PanelComponent: ({ elements, appState, updateData }) => (
-    const isMobile = useStylesPanelMode() === "mobile";
+    <ToolButton
-
+      type="button"
-    return (
+      icon={DuplicateIcon}
-      <ToolButton
+      title={`${t("labels.duplicateSelection")} — ${getShortcutKey(
-        type="button"
+        "CtrlOrCmd+D",
-        icon={DuplicateIcon}
+      )}`}
-        title={`${t("labels.duplicateSelection")} — ${getShortcutKey(
+      aria-label={t("labels.duplicateSelection")}
-          "CtrlOrCmd+D",
+      onClick={() => updateData(null)}
-        )}`}
+      visible={isSomeElementSelected(getNonDeletedElements(elements), appState)}
-        aria-label={t("labels.duplicateSelection")}
+    />
-        onClick={() => updateData(null)}
+  ),
-        disabled={
-          !isSomeElementSelected(getNonDeletedElements(elements), appState)
-        }
-        style={{
-          ...(isMobile && appState.openPopup !== "compactOtherProperties"
-            ? MOBILE_ACTION_BUTTON_BG
-            : {}),
-        }}
-      />
-    );
-  },
 });

packages/excalidraw/actions/actionExport.tsx

@@ -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";
@@ -31,9 +31,7 @@ import "../components/ToolIcon.scss";
 
 import { register } from "./register";
 
-import type { AppState } from "../types";
+export const actionChangeProjectName = register({
-
-export const actionChangeProjectName = register<AppState["name"]>({
   name: "changeProjectName",
   label: "labels.fileTitle",
   trackEvent: false,
@@ -53,7 +51,7 @@ export const actionChangeProjectName = register<AppState["name"]>({
   ),
 });
 
-export const actionChangeExportScale = register<AppState["exportScale"]>({
+export const actionChangeExportScale = register({
   name: "changeExportScale",
   label: "imageExportDialog.scale",
   trackEvent: { category: "export", action: "scale" },
@@ -103,9 +101,7 @@ export const actionChangeExportScale = register<AppState["exportScale"]>({
   },
 });
 
-export const actionChangeExportBackground = register<
+export const actionChangeExportBackground = register({
-  AppState["exportBackground"]
->({
   name: "changeExportBackground",
   label: "imageExportDialog.label.withBackground",
   trackEvent: { category: "export", action: "toggleBackground" },
@@ -125,9 +121,7 @@ export const actionChangeExportBackground = register<
   ),
 });
 
-export const actionChangeExportEmbedScene = register<
+export const actionChangeExportEmbedScene = register({
-  AppState["exportEmbedScene"]
->({
   name: "changeExportEmbedScene",
   label: "imageExportDialog.tooltip.embedScene",
   trackEvent: { category: "export", action: "embedScene" },
@@ -248,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"
@@ -294,9 +288,7 @@ export const actionLoadScene = register({
   keyTest: (event) => event[KEYS.CTRL_OR_CMD] && event.key === KEYS.O,
 });
 
-export const actionExportWithDarkMode = register<
+export const actionExportWithDarkMode = register({
-  AppState["exportWithDarkMode"]
->({
   name: "exportWithDarkMode",
   label: "imageExportDialog.label.darkMode",
   trackEvent: { category: "export", action: "toggleTheme" },

packages/excalidraw/actions/actionFinalize.tsx

@@ -1,11 +1,11 @@
 import { pointFrom } from "@excalidraw/math";
 
-import { bindOrUnbindBindingElement } from "@excalidraw/element/binding";
 import {
-  isValidPolygon,
+  maybeBindLinearElement,
-  LinearElementEditor,
+  bindOrUnbindLinearElement,
-  newElementWith,
+  isBindingEnabled,
-} from "@excalidraw/element";
+} from "@excalidraw/element/binding";
+import { isValidPolygon, LinearElementEditor } from "@excalidraw/element";
 
 import {
   isBindingElement,
@@ -17,8 +17,7 @@ import {
 import {
   KEYS,
   arrayToMap,
-  invariant,
+  tupleToCoors,
-  shouldRotateWithDiscreteAngle,
   updateActiveTool,
 } from "@excalidraw/common";
 import { isPathALoop } from "@excalidraw/element";
@@ -27,12 +26,11 @@ import { isInvisiblySmallElement } from "@excalidraw/element";
 
 import { CaptureUpdateAction } from "@excalidraw/element";
 
-import type { GlobalPoint, LocalPoint } from "@excalidraw/math";
+import type { LocalPoint } from "@excalidraw/math";
 import type {
   ExcalidrawElement,
   ExcalidrawLinearElement,
   NonDeleted,
-  PointsPositionUpdates,
 } from "@excalidraw/element/types";
 
 import { t } from "../i18n";
@@ -44,37 +42,20 @@ import { register } from "./register";
 
 import type { AppState } from "../types";
 
-type FormData = {
+export const actionFinalize = register({
-  event: PointerEvent;
-  sceneCoords: { x: number; y: number };
-};
-
-export const actionFinalize = register<FormData>({
   name: "finalize",
   label: "",
   trackEvent: false,
   perform: (elements, appState, data, app) => {
-    let newElements = elements;
     const { interactiveCanvas, focusContainer, scene } = app;
+    const { event, sceneCoords } =
+      (data as {
+        event?: PointerEvent;
+        sceneCoords?: { x: number; y: number };
+      }) ?? {};
     const elementsMap = scene.getNonDeletedElementsMap();
 
-    if (data && appState.selectedLinearElement) {
+    if (event && appState.selectedLinearElement) {
-      const { event, sceneCoords } = data;
-      const element = LinearElementEditor.getElement(
-        appState.selectedLinearElement.elementId,
-        elementsMap,
-      );
-
-      invariant(
-        element,
-        "Arrow element should exist if selectedLinearElement is set",
-      );
-
-      invariant(
-        sceneCoords,
-        "sceneCoords should be defined if actionFinalize is called with event",
-      );
-
       const linearElementEditor = LinearElementEditor.handlePointerUp(
         event,
         appState.selectedLinearElement,
@@ -82,112 +63,78 @@ export const actionFinalize = register<FormData>({
         app.scene,
       );
 
-      if (
+      const { startBindingElement, endBindingElement } = linearElementEditor;
-        isBindingElement(element) &&
+      const element = app.scene.getElement(linearElementEditor.elementId);
-        !appState.selectedLinearElement.segmentMidPointHoveredCoords
+      if (isBindingElement(element)) {
-      ) {
+        bindOrUnbindLinearElement(
-        const newArrow = !!appState.newElement;
-
-        const selectedPointsIndices =
-          newArrow || !appState.selectedLinearElement.selectedPointsIndices
-            ? [element.points.length - 1] // New arrow creation
-            : appState.selectedLinearElement.selectedPointsIndices;
-
-        const draggedPoints: PointsPositionUpdates =
-          selectedPointsIndices.reduce((map, index) => {
-            map.set(index, {
-              point: LinearElementEditor.pointFromAbsoluteCoords(
-                element,
-                pointFrom<GlobalPoint>(
-                  sceneCoords.x - linearElementEditor.pointerOffset.x,
-                  sceneCoords.y - linearElementEditor.pointerOffset.y,
-                ),
-                elementsMap,
-              ),
-            });
-
-            return map;
-          }, new Map()) ?? new Map();
-
-        bindOrUnbindBindingElement(
           element,
-          draggedPoints,
+          startBindingElement,
-          sceneCoords.x - linearElementEditor.pointerOffset.x,
+          endBindingElement,
-          sceneCoords.y - linearElementEditor.pointerOffset.y,
+          app.scene,
-          scene,
-          appState,
-          {
-            newArrow,
-            altKey: event.altKey,
-            angleLocked: shouldRotateWithDiscreteAngle(event),
-          },
         );
-      } else if (isLineElement(element)) {
-        if (
-          appState.selectedLinearElement?.isEditing &&
-          !appState.newElement &&
-          !isValidPolygon(element.points)
-        ) {
-          scene.mutateElement(element, {
-            polygon: false,
-          });
-        }
       }
 
       if (linearElementEditor !== appState.selectedLinearElement) {
-        // `handlePointerUp()` updated the linear element instance,
+        let newElements = elements;
-        // so filter out this element if it is too small,
-        // but do an update to all new elements anyway for undo/redo purposes.
-
         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) => {
+          newElements = newElements.filter((el) => el.id !== element!.id);
-            if (el.id === element.id) {
-              return newElementWith(el, {
-                isDeleted: true,
-              });
-            }
-            return el;
-          });
         }
-
-        const activeToolLocked = appState.activeTool?.locked;
-
         return {
-          elements:
+          elements: newElements,
-            element.points.length < 2 || isInvisiblySmallElement(element)
-              ? elements.map((el) => {
-                  if (el.id === element.id) {
-                    return newElementWith(el, { isDeleted: true });
-                  }
-                  return el;
-                })
-              : newElements,
           appState: {
-            ...appState,
+            selectedLinearElement: {
-            cursorButton: "up",
+              ...linearElementEditor,
-            selectedLinearElement: activeToolLocked
+              selectedPointsIndices: null,
-              ? null
+            },
-              : {
+            suggestedBindings: [],
-                  ...linearElementEditor,
-                  selectedPointsIndices: null,
-                  isEditing: false,
-                  initialState: {
-                    ...linearElementEditor.initialState,
-                    lastClickedPoint: -1,
-                  },
-                  pointerOffset: { x: 0, y: 0 },
-                },
-            selectionElement: null,
-            suggestedBinding: null,
-            newElement: null,
-            multiElement: null,
           },
           captureUpdate: CaptureUpdateAction.IMMEDIATELY,
         };
       }
     }
 
+    if (appState.selectedLinearElement?.isEditing) {
+      const { elementId, startBindingElement, endBindingElement } =
+        appState.selectedLinearElement;
+      const element = LinearElementEditor.getElement(elementId, elementsMap);
+
+      if (element) {
+        if (isBindingElement(element)) {
+          bindOrUnbindLinearElement(
+            element,
+            startBindingElement,
+            endBindingElement,
+            scene,
+          );
+        }
+        if (isLineElement(element) && !isValidPolygon(element.points)) {
+          scene.mutateElement(element, {
+            polygon: false,
+          });
+        }
+
+        return {
+          elements:
+            element.points.length < 2 || isInvisiblySmallElement(element)
+              ? elements.filter((el) => el.id !== element.id)
+              : undefined,
+          appState: {
+            ...appState,
+            cursorButton: "up",
+            selectedLinearElement: new LinearElementEditor(
+              element,
+              arrayToMap(elementsMap),
+              false, // exit editing mode
+            ),
+          },
+          captureUpdate: CaptureUpdateAction.IMMEDIATELY,
+        };
+      }
+    }
+
+    let newElements = elements;
+
     if (window.document.activeElement instanceof HTMLElement) {
       focusContainer();
     }
@@ -211,14 +158,8 @@ export const actionFinalize = register<FormData>({
 
     if (element) {
       // pen and mouse have hover
-      if (
+      if (appState.multiElement && element.type !== "freedraw") {
-        appState.selectedLinearElement &&
+        const { points, lastCommittedPoint } = element;
-        appState.multiElement &&
-        element.type !== "freedraw" &&
-        appState.lastPointerDownWith !== "touch"
-      ) {
-        const { points } = element;
-        const { lastCommittedPoint } = appState.selectedLinearElement;
         if (
           !lastCommittedPoint ||
           points[points.length - 1] !== lastCommittedPoint
@@ -231,12 +172,7 @@ export const actionFinalize = register<FormData>({
 
       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) => {
+        newElements = newElements.filter((el) => el.id !== element!.id);
-          if (el.id === element?.id) {
-            return newElementWith(el, { isDeleted: true });
-          }
-          return el;
-        });
       }
 
       if (isLinearElement(element) || isFreeDrawElement(element)) {
@@ -270,6 +206,25 @@ export const actionFinalize = register<FormData>({
             polygon: false,
           });
         }
+
+        if (
+          isBindingElement(element) &&
+          !isLoop &&
+          element.points.length > 1 &&
+          isBindingEnabled(appState)
+        ) {
+          const coords =
+            sceneCoords ??
+            tupleToCoors(
+              LinearElementEditor.getPointAtIndexGlobalCoordinates(
+                element,
+                -1,
+                arrayToMap(elements),
+              ),
+            );
+
+          maybeBindLinearElement(element, appState, coords, scene);
+        }
       }
     }
 
@@ -285,35 +240,16 @@ export const actionFinalize = register<FormData>({
     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",
       });
     }
 
-    let selectedLinearElement =
-      element && isLinearElement(element)
-        ? new LinearElementEditor(element, arrayToMap(newElements)) // To select the linear element when user has finished mutipoint editing
-        : appState.selectedLinearElement;
-
-    selectedLinearElement = selectedLinearElement
-      ? {
-          ...selectedLinearElement,
-          isEditing: appState.newElement
-            ? false
-            : selectedLinearElement.isEditing,
-          initialState: {
-            ...selectedLinearElement.initialState,
-            lastClickedPoint: -1,
-            origin: null,
-          },
-        }
-      : selectedLinearElement;
-
     return {
       elements: newElements,
       appState: {
@@ -331,7 +267,7 @@ export const actionFinalize = register<FormData>({
         multiElement: null,
         editingTextElement: null,
         startBoundElement: null,
-        suggestedBinding: null,
+        suggestedBindings: [],
         selectedElementIds:
           element &&
           !appState.activeTool.locked &&
@@ -341,8 +277,11 @@ export const actionFinalize = register<FormData>({
                 [element.id]: true,
               }
             : appState.selectedElementIds,
-
+        // To select the linear element when user has finished mutipoint editing
-        selectedLinearElement,
+        selectedLinearElement:
+          element && isLinearElement(element)
+            ? new LinearElementEditor(element, arrayToMap(newElements))
+            : appState.selectedLinearElement,
       },
       // TODO: #7348 we should not capture everything, but if we don't, it leads to incosistencies -> revisit
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,