Updates to point to excalidraw-storage-backend

* change lock label

* feat: add unlock logic for single units on pointer up

* feat: add unlock popup

* fix: linting errors

* style: padding tweaks

* style: remove redundant line

* feat: lock multiple units together

* style: tweak color & position

* feat: add highlight for locked elements

* feat: select groups correctly after unlocking

* test: update snapshots

* fix: lasso from selecting locked elements

* fix: should prevent selecting unlocked elements and setting locked id at the same time

* fix: reset hit locked id immediately when appropriate

* feat: capture locked units in delta

* test: update locking test

* feat: show lock highlight when locking (including undo/redo)

* feat: make locked highlighting consistent

* feat: show correct cursor type when moving over locked elements

* fix history

* remove `lockedUnits.singleUnits`

* tweak button

* do not render UnlockPopup if not locked element selected

* tweak actions

* refactor: simplify type

* refactor: rename type

* refactor: simplify hit element setting & checking

* fix: prefer locked over link

* rename to `activeLockedId`

* refactor: getElementAtPosition takes an optional hitelments array

* fix: avoid setting active locked id after resizing

---------

Co-authored-by: dwelle <5153846+dwelle@users.noreply.github.com>

.env.production

@@ -1,5 +1,5 @@
-VITE_APP_BACKEND_V2_GET_URL=https://json.excalidraw.com/api/v2/
+VITE_APP_BACKEND_V2_GET_URL=https://ex.dylanbanta.com/api/v2/scenes/
-VITE_APP_BACKEND_V2_POST_URL=https://json.excalidraw.com/api/v2/post/
+VITE_APP_BACKEND_V2_POST_URL=https://ex.dylanbanta.com/api/v2/scenes/
 
 VITE_APP_LIBRARY_URL=https://libraries.excalidraw.com
 VITE_APP_LIBRARY_BACKEND=https://us-central1-excalidraw-room-persistence.cloudfunctions.net/libraries

.eslintrc.json

@@ -32,6 +32,12 @@
         "name": "jotai",
         "message": "Do not import from \"jotai\" directly. Use our app-specific modules (\"editor-jotai\" or \"app-jotai\")."
       }
+    ],
+    "react/jsx-no-target-blank": [
+      "error",
+      {
+        "allowReferrer": true
+      }
     ]
   }
 }

README.md

@@ -63,7 +63,7 @@ The Excalidraw editor (npm package) supports:
 - 🏗️ Customizable.
 - 📷 Image support.
 - 😀 Shape libraries support.
-- 👅 Localization (i18n) support.
+- 🌐 Localization (i18n) support.
 - 🖼️ Export to PNG, SVG & clipboard.
 - 💾 Open format - export drawings as an `.excalidraw` json file.
 - ⚒️ Wide range of tools - rectangle, circle, diamond, arrow, line, free-draw, eraser...

docker-compose.yml

@@ -19,7 +19,7 @@ services:
       - ./:/opt/node_app/app:delegated
       - ./package.json:/opt/node_app/package.json
       - ./yarn.lock:/opt/node_app/yarn.lock
-      - notused:/opt/node_app/app/node_modules
+#       - notused:/opt/node_app/app/node_modules
 
-volumes:
+# volumes:
-  notused:
+#   notused:

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

@@ -52,7 +52,7 @@
   transform: none;
 }
 
-.excalidraw .panelColumn {
+.excalidraw .selected-shape-actions {
   text-align: left;
 }
 

excalidraw-app/App.tsx

@@ -1,7 +1,3 @@
-import Slider from "rc-slider";
-
-import "rc-slider/assets/index.css";
-
 import {
   Excalidraw,
   LiveCollaborationTrigger,
@@ -34,7 +30,6 @@ import {
   resolvablePromise,
   isRunningInIframe,
   isDevEnv,
-  assertNever,
 } from "@excalidraw/common";
 import polyfill from "@excalidraw/excalidraw/polyfill";
 import { useCallback, useEffect, useRef, useState } from "react";
@@ -52,16 +47,15 @@ import {
   share,
   youtubeIcon,
 } from "@excalidraw/excalidraw/components/icons";
-import { isElementLink } from "@excalidraw/element/elementLink";
+import { isElementLink } from "@excalidraw/element";
 import { restore, restoreAppState } from "@excalidraw/excalidraw/data/restore";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
+import { isInitializedImageElement } from "@excalidraw/element";
 import clsx from "clsx";
 import {
   parseLibraryTokensFromUrl,
   useHandleLibrary,
 } from "@excalidraw/excalidraw/data/library";
-import { StoreDelta, DurableStoreIncrement, EphemeralStoreIncrement, StoreIncrement } from "@excalidraw/excalidraw/store";
 
 import type { RemoteExcalidrawElement } from "@excalidraw/excalidraw/data/reconcile";
 import type { RestoredDataState } from "@excalidraw/excalidraw/data/restore";
@@ -69,7 +63,6 @@ import type {
   FileId,
   NonDeletedExcalidrawElement,
   OrderedExcalidrawElement,
-  SceneElementsMap,
 } from "@excalidraw/element/types";
 import type {
   AppState,
@@ -99,7 +92,6 @@ import Collab, {
   collabAPIAtom,
   isCollaboratingAtom,
   isOfflineAtom,
-  syncApiAtom,
 } from "./collab/Collab";
 import { AppFooter } from "./components/AppFooter";
 import { AppMainMenu } from "./components/AppMainMenu";
@@ -376,40 +368,11 @@ const ExcalidrawWrapper = () => {
 
   const [, setShareDialogState] = useAtom(shareDialogStateAtom);
   const [collabAPI] = useAtom(collabAPIAtom);
-  const [syncAPI] = useAtom(syncApiAtom);
-  const [sliderVersion, setSliderVersion] = useState(0);
-  const [acknowledgedDeltas, setAcknowledgedDeltas] = useState<StoreDelta[]>(
-    [],
-  );
-  const acknowledgedDeltasRef = useRef<StoreDelta[]>(acknowledgedDeltas);
   const [isCollaborating] = useAtomWithInitialValue(isCollaboratingAtom, () => {
     return isCollaborationLink(window.location.href);
   });
   const collabError = useAtomValue(collabErrorIndicatorAtom);
 
-  useEffect(() => {
-    acknowledgedDeltasRef.current = acknowledgedDeltas;
-  }, [acknowledgedDeltas]);
-
-  useEffect(() => {
-    const interval = setInterval(() => {
-      const deltas = syncAPI?.acknowledgedDeltas ?? [];
-
-      // CFDO: buffer local deltas as well, not only acknowledged ones
-      if (deltas.length > acknowledgedDeltasRef.current.length) {
-        setAcknowledgedDeltas([...deltas]);
-        setSliderVersion(deltas.length);
-      }
-    }, 1000);
-
-    syncAPI?.connect();
-
-    return () => {
-      syncAPI?.disconnect();
-      clearInterval(interval);
-    };
-  }, [syncAPI]);
-
   useHandleLibrary({
     excalidrawAPI,
     adapter: LibraryIndexedDBAdapter,
@@ -712,34 +675,6 @@ const ExcalidrawWrapper = () => {
     }
   };
 
-  const onIncrement = (
-    increment: DurableStoreIncrement | EphemeralStoreIncrement,
-  ) => {
-    try {
-      if (!syncAPI) {
-        return;
-      }
-
-      if (StoreIncrement.isDurable(increment)) {
-        // push only if there are element changes
-        if (!increment.delta.elements.isEmpty()) {
-          syncAPI.push(increment.delta);
-        }
-
-        return;
-      }
-
-      if (StoreIncrement.isEphemeral(increment)) {
-        syncAPI.relay(increment.change);
-        return;
-      }
-
-      assertNever(increment, `Unknown increment type`);
-    } catch (e) {
-      console.error("Error during onIncrement handler", e);
-    }
-  };
-
   const [latestShareableLink, setLatestShareableLink] = useState<string | null>(
     null,
   );
@@ -862,57 +797,6 @@ const ExcalidrawWrapper = () => {
     },
   };
 
-  const debouncedTimeTravel = debounce(
-    (value: number, direction: "forward" | "backward") => {
-      if (!excalidrawAPI) {
-        return;
-      }
-
-      let nextAppState = excalidrawAPI.getAppState();
-      // CFDO: retrieve the scene map already
-      let nextElements = new Map(
-        excalidrawAPI.getSceneElements().map((x) => [x.id, x]),
-      ) as SceneElementsMap;
-
-      let deltas: StoreDelta[] = [];
-
-      // CFDO I: going both in collaborative setting means the (acknowledge) deltas need to have applied latest changes
-      switch (direction) {
-        case "forward": {
-          deltas = acknowledgedDeltas.slice(sliderVersion, value) ?? [];
-          break;
-        }
-        case "backward": {
-          deltas = acknowledgedDeltas
-            .slice(value)
-            .reverse()
-            .map((x) => StoreDelta.inverse(x));
-          break;
-        }
-        default:
-          assertNever(direction, `Unknown direction: ${direction}`);
-      }
-
-      for (const delta of deltas) {
-        [nextElements, nextAppState] = excalidrawAPI.store.applyDeltaTo(
-          delta,
-          nextElements,
-          nextAppState,
-        );
-      }
-
-      excalidrawAPI?.updateScene({
-        appState: {
-          ...nextAppState,
-          viewModeEnabled: value !== acknowledgedDeltas.length,
-        },
-        elements: Array.from(nextElements.values()),
-        captureUpdate: CaptureUpdateAction.NEVER,
-      });
-    },
-    0,
-  );
-
   return (
     <div
       style={{ height: "100%" }}
@@ -920,45 +804,9 @@ const ExcalidrawWrapper = () => {
         "is-collaborating": isCollaborating,
       })}
     >
-      <Slider
-        style={{
-          position: "fixed",
-          bottom: "25px",
-          zIndex: 999,
-          width: "60%",
-          left: "25%",
-        }}
-        step={1}
-        min={0}
-        max={acknowledgedDeltas.length}
-        value={sliderVersion}
-        onChange={(value) => {
-          const nextSliderVersion = value as number;
-          // CFDO: in safari the whole canvas gets selected when dragging
-          if (nextSliderVersion !== acknowledgedDeltas.length) {
-            // don't listen to updates in the detached mode
-            syncAPI?.disconnect();
-          } else {
-            // reconnect once we're back to the latest version
-            syncAPI?.connect();
-          }
-
-          if (nextSliderVersion === sliderVersion) {
-            return;
-          }
-
-          debouncedTimeTravel(
-            nextSliderVersion,
-            nextSliderVersion < sliderVersion ? "backward" : "forward",
-          );
-
-          setSliderVersion(nextSliderVersion);
-        }}
-      />
       <Excalidraw
         excalidrawAPI={excalidrawRefCallback}
         onChange={onChange}
-        onIncrement={onIncrement}
         initialData={initialStatePromiseRef.current.promise}
         isCollaborating={isCollaborating}
         onPointerUpdate={collabAPI?.onPointerUpdate}
@@ -1037,6 +885,7 @@ const ExcalidrawWrapper = () => {
         />
         <OverwriteConfirmDialog>
           <OverwriteConfirmDialog.Actions.ExportToImage />
+          <OverwriteConfirmDialog.Actions.SaveToDisk />
           {excalidrawAPI && (
             <OverwriteConfirmDialog.Action
               title={t("overwriteConfirm.action.excalidrawPlus.title")}
@@ -1077,16 +926,21 @@ const ExcalidrawWrapper = () => {
         <ShareDialog
           collabAPI={collabAPI}
           onExportToBackend={async () => {
-            if (excalidrawAPI) {
+            if (!excalidrawAPI) {
-              try {
+              return;
-                await onExportToBackend(
+            }
-                  excalidrawAPI.getSceneElements(),
+            try {
-                  excalidrawAPI.getAppState(),
+              const { url, errorMessage } = await exportToBackend(
-                  excalidrawAPI.getFiles(),
+                excalidrawAPI.getSceneElements(),
-                );
+                excalidrawAPI.getAppState(),
-              } catch (error: any) {
+                excalidrawAPI.getFiles(),
-                setErrorMessage(error.message);
+              );
+              if (errorMessage) {
+                throw new Error(errorMessage);
               }
+              setLatestShareableLink(url);
+            } catch (error: any) {
+              setErrorMessage(error.message);
             }
           }}
         />

excalidraw-app/app_constants.ts

@@ -45,7 +45,6 @@ export const STORAGE_KEYS = {
   VERSION_FILES: "version-files",
 
   IDB_LIBRARY: "excalidraw-library",
-  IDB_SYNC: "excalidraw-sync",
 
   // do not use apart from migrations
   __LEGACY_LOCAL_STORAGE_LIBRARY: "excalidraw-library",

excalidraw-app/collab/Collab.tsx

@@ -19,12 +19,9 @@ import {
   throttleRAF,
 } from "@excalidraw/common";
 import { decryptData } from "@excalidraw/excalidraw/data/encryption";
-import { getVisibleSceneBounds } from "@excalidraw/element/bounds";
+import { getVisibleSceneBounds } from "@excalidraw/element";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import {
+import { isImageElement, isInitializedImageElement } from "@excalidraw/element";
-  isImageElement,
-  isInitializedImageElement,
-} from "@excalidraw/element/typeChecks";
 import { AbortError } from "@excalidraw/excalidraw/errors";
 import { t } from "@excalidraw/excalidraw/i18n";
 import { withBatchedUpdates } from "@excalidraw/excalidraw/reactUtils";
@@ -73,7 +70,7 @@ import {
   FileManager,
   updateStaleImageStatuses,
 } from "../data/FileManager";
-import { LocalData, SyncIndexedDBAdapter } from "../data/LocalData";
+import { LocalData } from "../data/LocalData";
 import {
   isSavedToFirebase,
   loadFilesFromFirebase,
@@ -95,7 +92,6 @@ import type {
   SyncableExcalidrawElement,
 } from "../data";
 
-export const syncApiAtom = atom<SyncClient | null>(null);
 export const collabAPIAtom = atom<CollabAPI | null>(null);
 export const isCollaboratingAtom = atom(false);
 export const isOfflineAtom = atom(false);
@@ -242,12 +238,6 @@ class Collab extends PureComponent<CollabProps, CollabState> {
 
     appJotaiStore.set(collabAPIAtom, collabAPI);
 
-    SyncClient.create(this.excalidrawAPI, SyncIndexedDBAdapter).then(
-      (syncAPI) => {
-        appJotaiStore.set(syncApiAtom, syncAPI);
-      },
-    );
-
     if (isTestEnv() || isDevEnv()) {
       window.collab = window.collab || ({} as Window["collab"]);
       Object.defineProperties(window, {
@@ -281,8 +271,6 @@ class Collab extends PureComponent<CollabProps, CollabState> {
       window.clearTimeout(this.idleTimeoutId);
       this.idleTimeoutId = null;
     }
-
-    appJotaiStore.get(syncApiAtom)?.disconnect();
     this.onUmmount?.();
   }
 

excalidraw-app/collab/Portal.tsx

@@ -1,7 +1,7 @@
 import { CaptureUpdateAction } from "@excalidraw/excalidraw";
 import { trackEvent } from "@excalidraw/excalidraw/analytics";
 import { encryptData } from "@excalidraw/excalidraw/data/encryption";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
 import throttle from "lodash.throttle";
 
 import type { UserIdleState } from "@excalidraw/common";

excalidraw-app/components/AI.tsx

@@ -73,7 +73,7 @@ export const AIComponents = ({
                   </br>
                   <div>You can also try <a href="${
                     import.meta.env.VITE_APP_PLUS_LP
-                  }/plus?utm_source=excalidraw&utm_medium=app&utm_content=d2c" target="_blank" rel="noreferrer noopener">Excalidraw+</a> to get more requests.</div>
+                  }/plus?utm_source=excalidraw&utm_medium=app&utm_content=d2c" target="_blank" rel="noopener">Excalidraw+</a> to get more requests.</div>
                 </div>
                 </body>
                 </html>`,

excalidraw-app/components/EncryptedIcon.tsx

@@ -10,7 +10,7 @@ export const EncryptedIcon = () => {
       className="encrypted-icon tooltip"
       href="https://plus.excalidraw.com/blog/end-to-end-encryption"
       target="_blank"
-      rel="noopener noreferrer"
+      rel="noopener"
       aria-label={t("encrypted.link")}
     >
       <Tooltip label={t("encrypted.tooltip")} long={true}>

excalidraw-app/components/ExcalidrawPlusAppLink.tsx

@@ -10,7 +10,7 @@ export const ExcalidrawPlusAppLink = () => {
         import.meta.env.VITE_APP_PLUS_APP
       }?utm_source=excalidraw&utm_medium=app&utm_content=signedInUserRedirectButton#excalidraw-redirect`}
       target="_blank"
-      rel="noreferrer"
+      rel="noopener"
       className="plus-button"
     >
       Go to Excalidraw+

excalidraw-app/components/ExportToExcalidrawPlus.tsx

@@ -12,7 +12,7 @@ import {
   generateEncryptionKey,
 } from "@excalidraw/excalidraw/data/encryption";
 import { serializeAsJSON } from "@excalidraw/excalidraw/data/json";
-import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
+import { isInitializedImageElement } from "@excalidraw/element";
 import { useI18n } from "@excalidraw/excalidraw/i18n";
 
 import type {

excalidraw-app/data/FileManager.ts

@@ -1,7 +1,7 @@
 import { CaptureUpdateAction } from "@excalidraw/excalidraw";
 import { compressData } from "@excalidraw/excalidraw/data/encode";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
+import { isInitializedImageElement } from "@excalidraw/element";
 import { t } from "@excalidraw/excalidraw/i18n";
 
 import type {

excalidraw-app/data/LocalData.ts

@@ -27,8 +27,6 @@ import {
   get,
 } from "idb-keyval";
 
-import { StoreDelta } from "@excalidraw/excalidraw/store";
-
 import type { LibraryPersistedData } from "@excalidraw/excalidraw/data/library";
 import type { ImportedDataState } from "@excalidraw/excalidraw/data/types";
 import type { ExcalidrawElement, FileId } from "@excalidraw/element/types";
@@ -37,7 +35,7 @@ import type {
   BinaryFileData,
   BinaryFiles,
 } from "@excalidraw/excalidraw/types";
-import type { DTO, MaybePromise } from "@excalidraw/common/utility-types";
+import type { MaybePromise } from "@excalidraw/common/utility-types";
 
 import { SAVE_TO_LOCAL_STORAGE_TIMEOUT, STORAGE_KEYS } from "../app_constants";
 
@@ -106,12 +104,13 @@ export class LocalData {
       files: BinaryFiles,
       onFilesSaved: () => void,
     ) => {
-      // saveDataStateToLocalStorage(elements, appState);
+      saveDataStateToLocalStorage(elements, appState);
-      // await this.fileStorage.saveFiles({
+
-      //   elements,
+      await this.fileStorage.saveFiles({
-      //   files,
+        elements,
-      // });
+        files,
-      // onFilesSaved();
+      });
+      onFilesSaved();
     },
     SAVE_TO_LOCAL_STORAGE_TIMEOUT,
   );
@@ -257,60 +256,3 @@ export class LibraryLocalStorageMigrationAdapter {
     localStorage.removeItem(STORAGE_KEYS.__LEGACY_LOCAL_STORAGE_LIBRARY);
   }
 }
-
-type SyncDeltaPersistedData = DTO<StoreDelta>[];
-
-type SyncMetaPersistedData = {
-  lastAcknowledgedVersion: number;
-};
-
-export class SyncIndexedDBAdapter {
-  /** IndexedDB database and store name */
-  private static idb_name = STORAGE_KEYS.IDB_SYNC;
-  /** library data store keys */
-  private static deltasKey = "deltas";
-  private static metadataKey = "metadata";
-
-  private static store = createStore(
-    `${SyncIndexedDBAdapter.idb_name}-db`,
-    `${SyncIndexedDBAdapter.idb_name}-store`,
-  );
-
-  static async loadDeltas() {
-    const deltas = await get<SyncDeltaPersistedData>(
-      SyncIndexedDBAdapter.deltasKey,
-      SyncIndexedDBAdapter.store,
-    );
-
-    if (deltas?.length) {
-      return deltas.map((storeDeltaDTO) => StoreDelta.restore(storeDeltaDTO));
-    }
-
-    return null;
-  }
-
-  static async saveDeltas(data: SyncDeltaPersistedData): Promise<void> {
-    return set(
-      SyncIndexedDBAdapter.deltasKey,
-      data,
-      SyncIndexedDBAdapter.store,
-    );
-  }
-
-  static async loadMetadata() {
-    const metadata = await get<SyncMetaPersistedData>(
-      SyncIndexedDBAdapter.metadataKey,
-      SyncIndexedDBAdapter.store,
-    );
-
-    return metadata || null;
-  }
-
-  static async saveMetadata(data: SyncMetaPersistedData): Promise<void> {
-    return set(
-      SyncIndexedDBAdapter.metadataKey,
-      data,
-      SyncIndexedDBAdapter.store,
-    );
-  }
-}

excalidraw-app/data/index.ts

@@ -9,14 +9,14 @@ import {
 } from "@excalidraw/excalidraw/data/encryption";
 import { serializeAsJSON } from "@excalidraw/excalidraw/data/json";
 import { restore } from "@excalidraw/excalidraw/data/restore";
-import { isInvisiblySmallElement } from "@excalidraw/element/sizeHelpers";
+import { isInvisiblySmallElement } from "@excalidraw/element";
-import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
+import { isInitializedImageElement } from "@excalidraw/element";
 import { t } from "@excalidraw/excalidraw/i18n";
 import { bytesToHexString } from "@excalidraw/common";
 
 import type { UserIdleState } from "@excalidraw/common";
 import type { ImportedDataState } from "@excalidraw/excalidraw/data/types";
-import type { SceneBounds } from "@excalidraw/element/bounds";
+import type { SceneBounds } from "@excalidraw/element";
 import type {
   ExcalidrawElement,
   FileId,

excalidraw-app/package.json

@@ -33,7 +33,6 @@
     "i18next-browser-languagedetector": "6.1.4",
     "idb-keyval": "6.0.3",
     "jotai": "2.11.0",
-    "rc-slider": "11.1.7",
     "react": "19.0.0",
     "react-dom": "19.0.0",
     "socket.io-client": "4.7.2",
@@ -42,8 +41,8 @@
   "prettier": "@excalidraw/prettier-config",
   "scripts": {
     "build-node": "node ./scripts/build-node.js",
-    "build:app:docker": "cross-env VITE_APP_DISABLE_SENTRY=true vite build",
+    "build:app:docker": "vite build",
-    "build:app": "cross-env VITE_APP_GIT_SHA=$VERCEL_GIT_COMMIT_SHA cross-env VITE_APP_ENABLE_TRACKING=true vite build",
+    "build:app": "vite build",
     "build:version": "node ../scripts/build-version.js",
     "build": "yarn build:app && yarn build:version",
     "start": "yarn && vite",

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

@@ -198,7 +198,7 @@ exports[`Test MobileMenu > should initialize with welcome screen and hide once u
     <a
       class="welcome-screen-menu-item "
       href="undefined/plus?utm_source=excalidraw&utm_medium=app&utm_content=welcomeScreenGuest"
-      rel="noreferrer"
+      rel="noopener"
       target="_blank"
     >
       <div

excalidraw-app/tests/collab.test.tsx

@@ -3,11 +3,15 @@ import {
   createRedoAction,
   createUndoAction,
 } from "@excalidraw/excalidraw/actions/actionHistory";
-import { syncInvalidIndices } from "@excalidraw/element/fractionalIndex";
+import { syncInvalidIndices } from "@excalidraw/element";
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 import { act, render, waitFor } from "@excalidraw/excalidraw/tests/test-utils";
 import { vi } from "vitest";
 
+import { StoreIncrement } from "@excalidraw/element";
+
+import type { DurableIncrement, EphemeralIncrement } from "@excalidraw/element";
+
 import ExcalidrawApp from "../App";
 
 const { h } = window;
@@ -65,6 +69,79 @@ vi.mock("socket.io-client", () => {
  * i.e. multiplayer history tests could be a good first candidate, as we could test both history stacks simultaneously.
  */
 describe("collaboration", () => {
+  it("should emit two ephemeral increments even though updates get batched", async () => {
+    const durableIncrements: DurableIncrement[] = [];
+    const ephemeralIncrements: EphemeralIncrement[] = [];
+
+    await render(<ExcalidrawApp />);
+
+    h.store.onStoreIncrementEmitter.on((increment) => {
+      if (StoreIncrement.isDurable(increment)) {
+        durableIncrements.push(increment);
+      } else {
+        ephemeralIncrements.push(increment);
+      }
+    });
+
+    // eslint-disable-next-line dot-notation
+    expect(h.store["scheduledMicroActions"].length).toBe(0);
+    expect(durableIncrements.length).toBe(0);
+    expect(ephemeralIncrements.length).toBe(0);
+
+    const rectProps = {
+      type: "rectangle",
+      id: "A",
+      height: 200,
+      width: 100,
+      x: 0,
+      y: 0,
+    } as const;
+
+    const rect = API.createElement({ ...rectProps });
+
+    API.updateScene({
+      elements: [rect],
+      captureUpdate: CaptureUpdateAction.IMMEDIATELY,
+    });
+
+    await waitFor(() => {
+      // expect(commitSpy).toHaveBeenCalledTimes(1);
+      expect(durableIncrements.length).toBe(1);
+    });
+
+    // simulate two batched remote updates
+    act(() => {
+      h.app.updateScene({
+        elements: [newElementWith(h.elements[0], { x: 100 })],
+        captureUpdate: CaptureUpdateAction.NEVER,
+      });
+      h.app.updateScene({
+        elements: [newElementWith(h.elements[0], { x: 200 })],
+        captureUpdate: CaptureUpdateAction.NEVER,
+      });
+
+      // we scheduled two micro actions,
+      // which confirms they are going to be executed as part of one batched component update
+      // eslint-disable-next-line dot-notation
+      expect(h.store["scheduledMicroActions"].length).toBe(2);
+    });
+
+    await waitFor(() => {
+      // altough the updates get batched,
+      // we expect two ephemeral increments for each update,
+      // and each such update should have the expected change
+      expect(ephemeralIncrements.length).toBe(2);
+      expect(ephemeralIncrements[0].change.elements.A).toEqual(
+        expect.objectContaining({ x: 100 }),
+      );
+      expect(ephemeralIncrements[1].change.elements.A).toEqual(
+        expect.objectContaining({ x: 200 }),
+      );
+      // eslint-disable-next-line dot-notation
+      expect(h.store["scheduledMicroActions"].length).toBe(0);
+    });
+  });
+
   it("should allow to undo / redo even on force-deleted elements", async () => {
     await render(<ExcalidrawApp />);
     const rect1Props = {

package.json

@@ -33,6 +33,7 @@
     "pepjs": "0.5.3",
     "prettier": "2.6.2",
     "rewire": "6.0.0",
+    "rimraf": "^5.0.0",
     "typescript": "4.9.4",
     "vite": "5.0.12",
     "vite-plugin-checker": "0.7.2",
@@ -78,8 +79,8 @@
     "autorelease": "node scripts/autorelease.js",
     "prerelease:excalidraw": "node scripts/prerelease.js",
     "release:excalidraw": "node scripts/release.js",
-    "rm:build": "rm -rf excalidraw-app/{build,dist,dev-dist} && rm -rf packages/*/{dist,build} && rm -rf examples/*/{build,dist}",
+    "rm:build": "rimraf --glob excalidraw-app/build excalidraw-app/dist excalidraw-app/dev-dist packages/*/dist packages/*/build examples/*/build examples/*/dist",
-    "rm:node_modules": "rm -rf node_modules && rm -rf excalidraw-app/node_modules && rm -rf packages/*/node_modules",
+    "rm:node_modules": "rimraf --glob node_modules excalidraw-app/node_modules packages/*/node_modules",
     "clean-install": "yarn rm:node_modules && yarn install"
   },
   "resolutions": {

packages/common/package.json

@@ -13,7 +13,7 @@
       "default": "./dist/prod/index.js"
     },
     "./*": {
-      "types": "./../common/dist/types/common/src/*.d.ts"
+      "types": "./dist/types/common/src/*.d.ts"
     }
   },
   "files": [
@@ -50,7 +50,7 @@
   "bugs": "https://github.com/excalidraw/excalidraw/issues",
   "repository": "https://github.com/excalidraw/excalidraw",
   "scripts": {
-    "gen:types": "rm -rf types && tsc",
+    "gen:types": "rimraf types && tsc",
-    "build:esm": "rm -rf dist && node ../../scripts/buildBase.js && yarn gen:types"
+    "build:esm": "rimraf dist && node ../../scripts/buildBase.js && yarn gen:types"
   }
 }

packages/common/src/constants.ts

@@ -10,6 +10,7 @@ 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;
@@ -119,6 +120,7 @@ export const CLASSES = {
   SHAPE_ACTIONS_MENU: "App-menu__left",
   ZOOM_ACTIONS: "zoom-actions",
   SEARCH_MENU_INPUT_WRAPPER: "layer-ui__search-inputWrapper",
+  CONVERT_ELEMENT_TYPE_POPUP: "ConvertElementTypePopup",
 };
 
 export const CJK_HAND_DRAWN_FALLBACK_FONT = "Xiaolai";
@@ -142,6 +144,7 @@ export const FONT_FAMILY = {
   "Lilita One": 7,
   "Comic Shanns": 8,
   "Liberation Sans": 9,
+  Assistant: 10,
 };
 
 export const FONT_FAMILY_FALLBACKS = {
@@ -253,7 +256,7 @@ export const EXPORT_DATA_TYPES = {
   excalidrawClipboardWithAPI: "excalidraw-api/clipboard",
 } as const;
 
-export const EXPORT_SOURCE =
+export const getExportSource = () =>
   window.EXCALIDRAW_EXPORT_SOURCE || window.location.origin;
 
 // time in milliseconds

packages/common/src/emitter.ts

@@ -1,4 +1,4 @@
-import type { UnsubscribeCallback } from "./types";
+import type { UnsubscribeCallback } from "@excalidraw/excalidraw/types";
 
 type Subscriber<T extends any[]> = (...payload: T) => void;
 

packages/common/src/font-metadata.ts

@@ -22,8 +22,10 @@ export interface FontMetadata {
   };
   /** flag to indicate a deprecated font */
   deprecated?: true;
-  /** flag to indicate a server-side only font */
+  /**
-  serverSide?: true;
+   * whether this is a font that users can use (= shown in font picker)
+   */
+  private?: true;
   /** flag to indiccate a local-only font */
   local?: true;
   /** flag to indicate a fallback font */
@@ -44,7 +46,7 @@ export const FONT_METADATA: Record<number, FontMetadata> = {
       unitsPerEm: 1000,
       ascender: 1011,
       descender: -353,
-      lineHeight: 1.35,
+      lineHeight: 1.25,
     },
   },
   [FONT_FAMILY["Lilita One"]]: {
@@ -98,14 +100,23 @@ export const FONT_METADATA: Record<number, FontMetadata> = {
       descender: -434,
       lineHeight: 1.15,
     },
-    serverSide: true,
+    private: true,
+  },
+  [FONT_FAMILY.Assistant]: {
+    metrics: {
+      unitsPerEm: 2048,
+      ascender: 1021,
+      descender: -287,
+      lineHeight: 1.25,
+    },
+    private: true,
   },
   [FONT_FAMILY_FALLBACKS.Xiaolai]: {
     metrics: {
       unitsPerEm: 1000,
       ascender: 880,
       descender: -144,
-      lineHeight: 1.15,
+      lineHeight: 1.25,
     },
     fallback: true,
   },

packages/common/src/index.ts

@@ -9,3 +9,4 @@ export * from "./promise-pool";
 export * from "./random";
 export * from "./url";
 export * from "./utils";
+export * from "./emitter";

packages/common/src/utility-types.ts

@@ -66,10 +66,14 @@ export type MakeBrand<T extends string> = {
 /** Maybe just promise or already fulfilled one! */
 export type MaybePromise<T> = T | Promise<T>;
 
+// get union of all keys from the union of types
+export type AllPossibleKeys<T> = T extends any ? keyof T : never;
+
 /** Strip all the methods or functions from a type */
 export type DTO<T> = {
   [K in keyof T as T[K] extends Function ? never : K]: T[K];
 };
 
-// get union of all keys from the union of types
+export type MapEntry<M extends Map<any, any>> = M extends Map<infer K, infer V>
-export type AllPossibleKeys<T> = T extends any ? keyof T : never;
+  ? [K, V]
+  : never;

packages/common/src/utils.test.ts

@@ -0,0 +1,82 @@
+import {
+  isTransparent,
+  mapFind,
+  reduceToCommonValue,
+} from "@excalidraw/common";
+
+describe("@excalidraw/common/utils", () => {
+  describe("isTransparent()", () => {
+    it("should return true when color is rgb transparent", () => {
+      expect(isTransparent("#ff00")).toEqual(true);
+      expect(isTransparent("#fff00000")).toEqual(true);
+      expect(isTransparent("transparent")).toEqual(true);
+    });
+
+    it("should return false when color is not transparent", () => {
+      expect(isTransparent("#ced4da")).toEqual(false);
+    });
+  });
+
+  describe("reduceToCommonValue()", () => {
+    it("should return the common value when all values are the same", () => {
+      expect(reduceToCommonValue([1, 1])).toEqual(1);
+      expect(reduceToCommonValue([0, 0])).toEqual(0);
+      expect(reduceToCommonValue(["a", "a"])).toEqual("a");
+      expect(reduceToCommonValue(new Set([1]))).toEqual(1);
+      expect(reduceToCommonValue([""])).toEqual("");
+      expect(reduceToCommonValue([0])).toEqual(0);
+
+      const o = {};
+      expect(reduceToCommonValue([o, o])).toEqual(o);
+
+      expect(
+        reduceToCommonValue([{ a: 1 }, { a: 1, b: 2 }], (o) => o.a),
+      ).toEqual(1);
+      expect(
+        reduceToCommonValue(new Set([{ a: 1 }, { a: 1, b: 2 }]), (o) => o.a),
+      ).toEqual(1);
+    });
+
+    it("should return `null` when values are different", () => {
+      expect(reduceToCommonValue([1, 2, 3])).toEqual(null);
+      expect(reduceToCommonValue(new Set([1, 2]))).toEqual(null);
+      expect(reduceToCommonValue([{ a: 1 }, { a: 2 }], (o) => o.a)).toEqual(
+        null,
+      );
+    });
+
+    it("should return `null` when some values are nullable", () => {
+      expect(reduceToCommonValue([1, null, 1])).toEqual(null);
+      expect(reduceToCommonValue([null, 1])).toEqual(null);
+      expect(reduceToCommonValue([1, undefined])).toEqual(null);
+      expect(reduceToCommonValue([undefined, 1])).toEqual(null);
+      expect(reduceToCommonValue([null])).toEqual(null);
+      expect(reduceToCommonValue([undefined])).toEqual(null);
+      expect(reduceToCommonValue([])).toEqual(null);
+    });
+  });
+
+  describe("mapFind()", () => {
+    it("should return the first mapped non-null element", () => {
+      {
+        let counter = 0;
+
+        const result = mapFind(["a", "b", "c"], (value) => {
+          counter++;
+          return value === "b" ? 42 : null;
+        });
+        expect(result).toEqual(42);
+        expect(counter).toBe(2);
+      }
+
+      expect(mapFind([1, 2], (value) => value * 0)).toBe(0);
+      expect(mapFind([1, 2], () => false)).toBe(false);
+      expect(mapFind([1, 2], () => "")).toBe("");
+    });
+
+    it("should return undefined if no mapped element is found", () => {
+      expect(mapFind([1, 2], () => undefined)).toBe(undefined);
+      expect(mapFind([1, 2], () => null)).toBe(undefined);
+    });
+  });
+});

packages/common/src/utils.ts

@@ -544,6 +544,20 @@ export const findLastIndex = <T>(
   return -1;
 };
 
+/** returns the first non-null mapped value */
+export const mapFind = <T, K>(
+  collection: readonly T[],
+  iteratee: (value: T, index: number) => K | undefined | null,
+): K | undefined => {
+  for (let idx = 0; idx < collection.length; idx++) {
+    const result = iteratee(collection[idx], idx);
+    if (result != null) {
+      return result;
+    }
+  }
+  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";
@@ -735,6 +749,25 @@ export const arrayToList = <T>(array: readonly T[]): Node<T>[] =>
     return acc;
   }, [] as Node<T>[]);
 
+/**
+ * Converts a readonly array or map into an iterable.
+ * Useful for avoiding entry allocations when iterating object / map on each iteration.
+ */
+export const toIterable = <T>(
+  values: readonly T[] | ReadonlyMap<string, T>,
+): Iterable<T> => {
+  return Array.isArray(values) ? values : values.values();
+};
+
+/**
+ * Converts a readonly array or map into an array.
+ */
+export const toArray = <T>(
+  values: readonly T[] | ReadonlyMap<string, T>,
+): T[] => {
+  return Array.isArray(values) ? values : Array.from(toIterable(values));
+};
+
 export const isTestEnv = () => import.meta.env.MODE === ENV.TEST;
 
 export const isDevEnv = () => import.meta.env.MODE === ENV.DEVELOPMENT;
@@ -1225,11 +1258,39 @@ export const isReadonlyArray = (value?: any): value is readonly any[] => {
 };
 
 export const sizeOf = (
-  value: readonly number[] | Readonly<Map<any, any>> | Record<any, any>,
+  value:
+    | readonly unknown[]
+    | Readonly<Map<string, unknown>>
+    | Readonly<Record<string, unknown>>
+    | ReadonlySet<unknown>,
 ): number => {
   return isReadonlyArray(value)
     ? value.length
-    : value instanceof Map
+    : value instanceof Map || value instanceof Set
     ? value.size
     : Object.keys(value).length;
 };
+
+export const reduceToCommonValue = <T, R = T>(
+  collection: readonly T[] | ReadonlySet<T>,
+  getValue?: (item: T) => R,
+): R | null => {
+  if (sizeOf(collection) === 0) {
+    return null;
+  }
+
+  const valueExtractor = getValue || ((item: T) => item as unknown as R);
+
+  let commonValue: R | null = null;
+
+  for (const item of collection) {
+    const value = valueExtractor(item);
+    if ((commonValue === null || commonValue === value) && value != null) {
+      commonValue = value;
+    } else {
+      return null;
+    }
+  }
+
+  return commonValue;
+};

packages/deltas/package.json

@@ -1,38 +0,0 @@
-{
-  "name": "@excalidraw/deltas",
-  "version": "0.0.1",
-  "main": "./dist/prod/index.js",
-  "type": "module",
-  "module": "./dist/prod/index.js",
-  "exports": {
-    ".": {
-      "development": "./dist/dev/index.js",
-      "default": "./dist/prod/index.js"
-    }
-  },
-  "types": "./dist/types/index.d.ts",
-  "files": [
-    "dist/*"
-  ],
-  "description": "Excalidraw utilities for handling deltas",
-  "publishConfig": {
-    "access": "public"
-  },
-  "license": "MIT",
-  "keywords": [
-    "excalidraw",
-    "excalidraw-deltas"
-  ],
-  "dependencies": {
-    "nanoid": "5.0.9",
-    "roughjs": "4.6.6"
-  },
-  "devDependencies": {},
-  "bugs": "https://github.com/excalidraw/excalidraw/issues",
-  "repository": "https://github.com/excalidraw/excalidraw",
-  "scripts": {
-    "gen:types": "rm -rf types && tsc",
-    "build:esm": "rm -rf dist && node ../../scripts/buildShared.js && yarn gen:types",
-    "pack": "yarn build:umd && yarn pack"
-  }
-}

packages/deltas/src/common/delta.ts

@@ -1,357 +0,0 @@
-import { arrayToObject, assertNever } from "./utils";
-
-/**
- * Represents the difference between two objects of the same type.
- *
- * Both `deleted` and `inserted` partials represent the same set of added, removed or updated properties, where:
- * - `deleted` is a set of all the deleted values
- * - `inserted` is a set of all the inserted (added, updated) values
- *
- * Keeping it as pure object (without transient state, side-effects, etc.), so we won't have to instantiate it on load.
- */
-export class Delta<T> {
-  private constructor(
-    public readonly deleted: Partial<T>,
-    public readonly inserted: Partial<T>,
-  ) {}
-
-  public static create<T>(
-    deleted: Partial<T>,
-    inserted: Partial<T>,
-    modifier?: (delta: Partial<T>) => Partial<T>,
-    modifierOptions?: "deleted" | "inserted",
-  ) {
-    const modifiedDeleted =
-      modifier && modifierOptions !== "inserted" ? modifier(deleted) : deleted;
-    const modifiedInserted =
-      modifier && modifierOptions !== "deleted" ? modifier(inserted) : inserted;
-
-    return new Delta(modifiedDeleted, modifiedInserted);
-  }
-
-  /**
-   * Calculates the delta between two objects.
-   *
-   * @param prevObject - The previous state of the object.
-   * @param nextObject - The next state of the object.
-   *
-   * @returns new delta instance.
-   */
-  public static calculate<T extends { [key: string]: any }>(
-    prevObject: T,
-    nextObject: T,
-    modifier?: (partial: Partial<T>) => Partial<T>,
-    postProcess?: (
-      deleted: Partial<T>,
-      inserted: Partial<T>,
-    ) => [Partial<T>, Partial<T>],
-  ): Delta<T> {
-    if (prevObject === nextObject) {
-      return Delta.empty();
-    }
-
-    const deleted = {} as Partial<T>;
-    const inserted = {} as Partial<T>;
-
-    // O(n^3) here for elements, but it's not as bad as it looks:
-    // - we do this only on store recordings, not on every frame (not for ephemerals)
-    // - we do this only on previously detected changed elements
-    // - we do shallow compare only on the first level of properties (not going any deeper)
-    // - # of properties is reasonably small
-    for (const key of this.distinctKeysIterator(
-      "full",
-      prevObject,
-      nextObject,
-    )) {
-      deleted[key as keyof T] = prevObject[key];
-      inserted[key as keyof T] = nextObject[key];
-    }
-
-    const [processedDeleted, processedInserted] = postProcess
-      ? postProcess(deleted, inserted)
-      : [deleted, inserted];
-
-    return Delta.create(processedDeleted, processedInserted, modifier);
-  }
-
-  public static empty() {
-    return new Delta({}, {});
-  }
-
-  public static isEmpty<T>(delta: Delta<T>): boolean {
-    return (
-      !Object.keys(delta.deleted).length && !Object.keys(delta.inserted).length
-    );
-  }
-
-  /**
-   * Merges deleted and inserted object partials.
-   */
-  public static mergeObjects<T extends { [key: string]: unknown }>(
-    prev: T,
-    added: T,
-    removed: T,
-  ) {
-    const cloned = { ...prev };
-
-    for (const key of Object.keys(removed)) {
-      delete cloned[key];
-    }
-
-    return { ...cloned, ...added };
-  }
-
-  /**
-   * Merges deleted and inserted array partials.
-   */
-  public static mergeArrays<T>(
-    prev: readonly T[] | null,
-    added: readonly T[] | null | undefined,
-    removed: readonly T[] | null | undefined,
-    predicate?: (value: T) => string,
-  ) {
-    return Object.values(
-      Delta.mergeObjects(
-        arrayToObject(prev ?? [], predicate),
-        arrayToObject(added ?? [], predicate),
-        arrayToObject(removed ?? [], predicate),
-      ),
-    );
-  }
-
-  /**
-   * Diff object partials as part of the `postProcess`.
-   */
-  public static diffObjects<T, K extends keyof T, V extends T[K][keyof T[K]]>(
-    deleted: Partial<T>,
-    inserted: Partial<T>,
-    property: K,
-    setValue: (prevValue: V | undefined) => V,
-  ) {
-    if (!deleted[property] && !inserted[property]) {
-      return;
-    }
-
-    if (
-      typeof deleted[property] === "object" ||
-      typeof inserted[property] === "object"
-    ) {
-      type RecordLike = Record<string, V | undefined>;
-
-      const deletedObject: RecordLike = deleted[property] ?? {};
-      const insertedObject: RecordLike = inserted[property] ?? {};
-
-      const deletedDifferences = Delta.getLeftDifferences(
-        deletedObject,
-        insertedObject,
-      ).reduce((acc, curr) => {
-        acc[curr] = setValue(deletedObject[curr]);
-        return acc;
-      }, {} as RecordLike);
-
-      const insertedDifferences = Delta.getRightDifferences(
-        deletedObject,
-        insertedObject,
-      ).reduce((acc, curr) => {
-        acc[curr] = setValue(insertedObject[curr]);
-        return acc;
-      }, {} as RecordLike);
-
-      if (
-        Object.keys(deletedDifferences).length ||
-        Object.keys(insertedDifferences).length
-      ) {
-        Reflect.set(deleted, property, deletedDifferences);
-        Reflect.set(inserted, property, insertedDifferences);
-      } else {
-        Reflect.deleteProperty(deleted, property);
-        Reflect.deleteProperty(inserted, property);
-      }
-    }
-  }
-
-  /**
-   * Diff array partials as part of the `postProcess`.
-   */
-  public static diffArrays<T, K extends keyof T, V extends T[K]>(
-    deleted: Partial<T>,
-    inserted: Partial<T>,
-    property: K,
-    groupBy: (value: V extends ArrayLike<infer T> ? T : never) => string,
-  ) {
-    if (!deleted[property] && !inserted[property]) {
-      return;
-    }
-
-    if (Array.isArray(deleted[property]) || Array.isArray(inserted[property])) {
-      const deletedArray = (
-        Array.isArray(deleted[property]) ? deleted[property] : []
-      ) as [];
-      const insertedArray = (
-        Array.isArray(inserted[property]) ? inserted[property] : []
-      ) as [];
-
-      const deletedDifferences = arrayToObject(
-        Delta.getLeftDifferences(
-          arrayToObject(deletedArray, groupBy),
-          arrayToObject(insertedArray, groupBy),
-        ),
-      );
-      const insertedDifferences = arrayToObject(
-        Delta.getRightDifferences(
-          arrayToObject(deletedArray, groupBy),
-          arrayToObject(insertedArray, groupBy),
-        ),
-      );
-
-      if (
-        Object.keys(deletedDifferences).length ||
-        Object.keys(insertedDifferences).length
-      ) {
-        const deletedValue = deletedArray.filter(
-          (x) => deletedDifferences[groupBy ? groupBy(x) : String(x)],
-        );
-        const insertedValue = insertedArray.filter(
-          (x) => insertedDifferences[groupBy ? groupBy(x) : String(x)],
-        );
-
-        Reflect.set(deleted, property, deletedValue);
-        Reflect.set(inserted, property, insertedValue);
-      } else {
-        Reflect.deleteProperty(deleted, property);
-        Reflect.deleteProperty(inserted, property);
-      }
-    }
-  }
-
-  /**
-   * Compares if object1 contains any different value compared to the object2.
-   */
-  public static isLeftDifferent<T extends {}>(
-    object1: T,
-    object2: T,
-    skipShallowCompare = false,
-  ): boolean {
-    const anyDistinctKey = this.distinctKeysIterator(
-      "left",
-      object1,
-      object2,
-      skipShallowCompare,
-    ).next().value;
-
-    return !!anyDistinctKey;
-  }
-
-  /**
-   * Compares if object2 contains any different value compared to the object1.
-   */
-  public static isRightDifferent<T extends {}>(
-    object1: T,
-    object2: T,
-    skipShallowCompare = false,
-  ): boolean {
-    const anyDistinctKey = this.distinctKeysIterator(
-      "right",
-      object1,
-      object2,
-      skipShallowCompare,
-    ).next().value;
-
-    return !!anyDistinctKey;
-  }
-
-  /**
-   * Returns all the object1 keys that have distinct values.
-   */
-  public static getLeftDifferences<T extends {}>(
-    object1: T,
-    object2: T,
-    skipShallowCompare = false,
-  ) {
-    return Array.from(
-      this.distinctKeysIterator("left", object1, object2, skipShallowCompare),
-    );
-  }
-
-  /**
-   * Returns all the object2 keys that have distinct values.
-   */
-  public static getRightDifferences<T extends {}>(
-    object1: T,
-    object2: T,
-    skipShallowCompare = false,
-  ) {
-    return Array.from(
-      this.distinctKeysIterator("right", object1, object2, skipShallowCompare),
-    );
-  }
-
-  /**
-   * Iterator comparing values of object properties based on the passed joining strategy.
-   *
-   * @yields keys of properties with different values
-   *
-   * WARN: it's based on shallow compare performed only on the first level and doesn't go deeper than that.
-   */
-  private static *distinctKeysIterator<T extends {}>(
-    join: "left" | "right" | "full",
-    object1: T,
-    object2: T,
-    skipShallowCompare = false,
-  ) {
-    if (object1 === object2) {
-      return;
-    }
-
-    let keys: string[] = [];
-
-    if (join === "left") {
-      keys = Object.keys(object1);
-    } else if (join === "right") {
-      keys = Object.keys(object2);
-    } else if (join === "full") {
-      keys = Array.from(
-        new Set([...Object.keys(object1), ...Object.keys(object2)]),
-      );
-    } else {
-      assertNever(join, "Unknown distinctKeysIterator's join param");
-    }
-
-    for (const key of keys) {
-      const object1Value = object1[key as keyof T];
-      const object2Value = object2[key as keyof T];
-
-      if (object1Value !== object2Value) {
-        if (
-          !skipShallowCompare &&
-          typeof object1Value === "object" &&
-          typeof object2Value === "object" &&
-          object1Value !== null &&
-          object2Value !== null &&
-          this.isShallowEqual(object1Value, object2Value)
-        ) {
-          continue;
-        }
-
-        yield key;
-      }
-    }
-  }
-
-  private static isShallowEqual(object1: any, object2: any) {
-    const keys1 = Object.keys(object1);
-    const keys2 = Object.keys(object1);
-
-    if (keys1.length !== keys2.length) {
-      return false;
-    }
-
-    for (const key of keys1) {
-      if (object1[key] !== object2[key]) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-}

packages/deltas/src/common/interfaces.ts

@@ -1,21 +0,0 @@
-/**
- * Encapsulates a set of application-level `Delta`s.
- */
-export interface DeltaContainer<T> {
-  /**
-   * Inverses the `Delta`s while creating a new `DeltaContainer` instance.
-   */
-  inverse(): DeltaContainer<T>;
-
-  /**
-   * Applies the `Delta`s to the previous object.
-   *
-   * @returns a tuple of the next object `T` with applied `Delta`s, and `boolean`, indicating whether the applied deltas resulted in a visible change.
-   */
-  applyTo(previous: T, ...options: unknown[]): [T, boolean];
-
-  /**
-   * Checks whether all `Delta`s are empty.
-   */
-  isEmpty(): boolean;
-}

packages/deltas/src/common/utils.ts

@@ -1,149 +0,0 @@
-import { Random } from "roughjs/bin/math";
-import { nanoid } from "nanoid";
-
-import type {
-  AppState,
-  ObservedAppState,
-  ElementsMap,
-  ExcalidrawElement,
-  ElementUpdate,
-} from "../excalidraw-types";
-
-/**
- * Transform array into an object, use only when array order is irrelevant.
- */
-export const arrayToObject = <T>(
-  array: readonly T[],
-  groupBy?: (value: T) => string | number,
-) =>
-  array.reduce((acc, value) => {
-    acc[groupBy ? groupBy(value) : String(value)] = value;
-    return acc;
-  }, {} as { [key: string]: T });
-
-/**
- * Transforms array of elements with `id` property into into a Map grouped by `id`.
- */
-export const elementsToMap = <T extends { id: string }>(
-  items: readonly T[],
-) => {
-  return items.reduce((acc: Map<string, T>, element) => {
-    acc.set(element.id, element);
-    return acc;
-  }, new Map());
-};
-
-// --
-
-// hidden non-enumerable property for runtime checks
-const hiddenObservedAppStateProp = "__observedAppState";
-
-export const getObservedAppState = (appState: AppState): ObservedAppState => {
-  const observedAppState = {
-    name: appState.name,
-    editingGroupId: appState.editingGroupId,
-    viewBackgroundColor: appState.viewBackgroundColor,
-    selectedElementIds: appState.selectedElementIds,
-    selectedGroupIds: appState.selectedGroupIds,
-    editingLinearElementId: appState.editingLinearElement?.elementId || null,
-    selectedLinearElementId: appState.selectedLinearElement?.elementId || null,
-    croppingElementId: appState.croppingElementId,
-  };
-
-  Reflect.defineProperty(observedAppState, hiddenObservedAppStateProp, {
-    value: true,
-    enumerable: false,
-  });
-
-  return observedAppState;
-};
-
-// ------------------------------------------------------------
-
-export const assertNever = (value: never, message: string): never => {
-  throw new Error(`${message}: "${value}".`);
-};
-
-// ------------------------------------------------------------
-
-export const getNonDeletedGroupIds = (elements: ElementsMap) => {
-  const nonDeletedGroupIds = new Set<string>();
-
-  for (const [, element] of elements) {
-    // defensive check
-    if (element.isDeleted) {
-      continue;
-    }
-
-    // defensive fallback
-    for (const groupId of element.groupIds ?? []) {
-      nonDeletedGroupIds.add(groupId);
-    }
-  }
-
-  return nonDeletedGroupIds;
-};
-
-// ------------------------------------------------------------
-
-export const isTestEnv = () => import.meta.env.MODE === "test";
-
-export const isDevEnv = () => import.meta.env.MODE === "development";
-
-export const isServerEnv = () => import.meta.env.MODE === "server";
-
-export const shouldThrow = () => isDevEnv() || isTestEnv() || isServerEnv();
-
-// ------------------------------------------------------------
-
-let random = new Random(Date.now());
-let testIdBase = 0;
-
-export const randomInteger = () => Math.floor(random.next() * 2 ** 31);
-
-export const reseed = (seed: number) => {
-  random = new Random(seed);
-  testIdBase = 0;
-};
-
-export const randomId = () => (isTestEnv() ? `id${testIdBase++}` : nanoid());
-
-// ------------------------------------------------------------
-
-export const getUpdatedTimestamp = () => (isTestEnv() ? 1 : Date.now());
-
-// ------------------------------------------------------------
-
-export const newElementWith = <TElement extends ExcalidrawElement>(
-  element: TElement,
-  updates: ElementUpdate<TElement>,
-  /** pass `true` to always regenerate */
-  force = false,
-): TElement => {
-  let didChange = false;
-  for (const key in updates) {
-    const value = (updates as any)[key];
-    if (typeof value !== "undefined") {
-      if (
-        (element as any)[key] === value &&
-        // if object, always update because its attrs could have changed
-        (typeof value !== "object" || value === null)
-      ) {
-        continue;
-      }
-      didChange = true;
-    }
-  }
-
-  if (!didChange && !force) {
-    return element;
-  }
-
-  return {
-    ...element,
-    ...updates,
-    updated: getUpdatedTimestamp(),
-    version: element.version + 1,
-    versionNonce: randomInteger(),
-  };
-};

packages/deltas/src/containers/appstate.ts

@@ -1,404 +0,0 @@
-import { Delta } from "../common/delta";
-import {
-  assertNever,
-  getNonDeletedGroupIds,
-  getObservedAppState,
-  isDevEnv,
-  isTestEnv,
-  shouldThrow,
-} from "../common/utils";
-
-import type { DeltaContainer } from "../common/interfaces";
-import type {
-  AppState,
-  ObservedAppState,
-  DTO,
-  SceneElementsMap,
-  ValueOf,
-  ObservedElementsAppState,
-  ObservedStandaloneAppState,
-  SubtypeOf,
-} from "../excalidraw-types";
-
-export class AppStateDelta implements DeltaContainer<AppState> {
-  private constructor(public readonly delta: Delta<ObservedAppState>) {}
-
-  public static calculate<T extends ObservedAppState>(
-    prevAppState: T,
-    nextAppState: T,
-  ): AppStateDelta {
-    const delta = Delta.calculate(
-      prevAppState,
-      nextAppState,
-      undefined,
-      AppStateDelta.postProcess,
-    );
-
-    return new AppStateDelta(delta);
-  }
-
-  public static restore(appStateDeltaDTO: DTO<AppStateDelta>): AppStateDelta {
-    const { delta } = appStateDeltaDTO;
-    return new AppStateDelta(delta);
-  }
-
-  public static empty() {
-    return new AppStateDelta(Delta.create({}, {}));
-  }
-
-  public inverse(): AppStateDelta {
-    const inversedDelta = Delta.create(this.delta.inserted, this.delta.deleted);
-    return new AppStateDelta(inversedDelta);
-  }
-
-  public applyTo(
-    appState: AppState,
-    nextElements: SceneElementsMap,
-  ): [AppState, boolean] {
-    try {
-      const {
-        selectedElementIds: removedSelectedElementIds = {},
-        selectedGroupIds: removedSelectedGroupIds = {},
-      } = this.delta.deleted;
-
-      const {
-        selectedElementIds: addedSelectedElementIds = {},
-        selectedGroupIds: addedSelectedGroupIds = {},
-        selectedLinearElementId,
-        editingLinearElementId,
-        ...directlyApplicablePartial
-      } = this.delta.inserted;
-
-      const mergedSelectedElementIds = Delta.mergeObjects(
-        appState.selectedElementIds,
-        addedSelectedElementIds,
-        removedSelectedElementIds,
-      );
-
-      const mergedSelectedGroupIds = Delta.mergeObjects(
-        appState.selectedGroupIds,
-        addedSelectedGroupIds,
-        removedSelectedGroupIds,
-      );
-
-      //   const selectedLinearElement =
-      //     selectedLinearElementId && nextElements.has(selectedLinearElementId)
-      //       ? new LinearElementEditor(
-      //           nextElements.get(
-      //             selectedLinearElementId,
-      //           ) as NonDeleted<ExcalidrawLinearElement>,
-      //         )
-      //       : null;
-
-      //   const editingLinearElement =
-      //     editingLinearElementId && nextElements.has(editingLinearElementId)
-      //       ? new LinearElementEditor(
-      //           nextElements.get(
-      //             editingLinearElementId,
-      //           ) as NonDeleted<ExcalidrawLinearElement>,
-      //         )
-      //       : null;
-
-      const nextAppState = {
-        ...appState,
-        ...directlyApplicablePartial,
-        selectedElementIds: mergedSelectedElementIds,
-        selectedGroupIds: mergedSelectedGroupIds,
-        // selectedLinearElement:
-        //   typeof selectedLinearElementId !== "undefined"
-        //     ? selectedLinearElement // element was either inserted or deleted
-        //     : appState.selectedLinearElement, // otherwise assign what we had before
-        // editingLinearElement:
-        //   typeof editingLinearElementId !== "undefined"
-        //     ? editingLinearElement // element was either inserted or deleted
-        //     : appState.editingLinearElement, // otherwise assign what we had before
-      };
-
-      const constainsVisibleChanges = this.filterInvisibleChanges(
-        appState,
-        nextAppState,
-        nextElements,
-      );
-
-      return [nextAppState, constainsVisibleChanges];
-    } catch (e) {
-      // shouldn't really happen, but just in case
-      console.error(`Couldn't apply appstate delta`, e);
-
-      if (shouldThrow()) {
-        throw e;
-      }
-
-      return [appState, false];
-    }
-  }
-
-  public isEmpty(): boolean {
-    return Delta.isEmpty(this.delta);
-  }
-
-  /**
-   * It is necessary to post process the partials in case of reference values,
-   * for which we need to calculate the real diff between `deleted` and `inserted`.
-   */
-  private static postProcess<T extends ObservedAppState>(
-    deleted: Partial<T>,
-    inserted: Partial<T>,
-  ): [Partial<T>, Partial<T>] {
-    try {
-      Delta.diffObjects(
-        deleted,
-        inserted,
-        "selectedElementIds",
-        // ts language server has a bit trouble resolving this, so we are giving it a little push
-        (_) => true as ValueOf<T["selectedElementIds"]>,
-      );
-      Delta.diffObjects(
-        deleted,
-        inserted,
-        "selectedGroupIds",
-        (prevValue) => (prevValue ?? false) as ValueOf<T["selectedGroupIds"]>,
-      );
-    } 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.`);
-
-      if (isDevEnv() || isTestEnv()) {
-        throw e;
-      }
-    } finally {
-      return [deleted, inserted];
-    }
-  }
-
-  /**
-   * Mutates `nextAppState` be filtering out state related to deleted elements.
-   *
-   * @returns `true` if a visible change is found, `false` otherwise.
-   */
-  private filterInvisibleChanges(
-    prevAppState: AppState,
-    nextAppState: AppState,
-    nextElements: SceneElementsMap,
-  ): boolean {
-    // TODO: #7348 we could still get an empty undo/redo, as we assume that previous appstate does not contain references to deleted elements
-    // which is not always true - i.e. now we do cleanup appstate during history, but we do not do it during remote updates
-    const prevObservedAppState = getObservedAppState(prevAppState);
-    const nextObservedAppState = getObservedAppState(nextAppState);
-
-    const containsStandaloneDifference = Delta.isRightDifferent(
-      AppStateDelta.stripElementsProps(prevObservedAppState),
-      AppStateDelta.stripElementsProps(nextObservedAppState),
-    );
-
-    const containsElementsDifference = Delta.isRightDifferent(
-      AppStateDelta.stripStandaloneProps(prevObservedAppState),
-      AppStateDelta.stripStandaloneProps(nextObservedAppState),
-    );
-
-    if (!containsStandaloneDifference && !containsElementsDifference) {
-      // no change in appstate was detected
-      return false;
-    }
-
-    const visibleDifferenceFlag = {
-      value: containsStandaloneDifference,
-    };
-
-    if (containsElementsDifference) {
-      // filter invisible changes on each iteration
-      const changedElementsProps = Delta.getRightDifferences(
-        AppStateDelta.stripStandaloneProps(prevObservedAppState),
-        AppStateDelta.stripStandaloneProps(nextObservedAppState),
-      ) as Array<keyof ObservedElementsAppState>;
-
-      let nonDeletedGroupIds = new Set<string>();
-
-      if (
-        changedElementsProps.includes("editingGroupId") ||
-        changedElementsProps.includes("selectedGroupIds")
-      ) {
-        // this one iterates through all the non deleted elements, so make sure it's not done twice
-        nonDeletedGroupIds = getNonDeletedGroupIds(nextElements);
-      }
-
-      // check whether delta properties are related to the existing non-deleted elements
-      for (const key of changedElementsProps) {
-        switch (key) {
-          case "selectedElementIds":
-            nextAppState[key] = AppStateDelta.filterSelectedElements(
-              nextAppState[key],
-              nextElements,
-              visibleDifferenceFlag,
-            );
-
-            break;
-          case "selectedGroupIds":
-            nextAppState[key] = AppStateDelta.filterSelectedGroups(
-              nextAppState[key],
-              nonDeletedGroupIds,
-              visibleDifferenceFlag,
-            );
-
-            break;
-          case "croppingElementId": {
-            const croppingElementId = nextAppState[key];
-            const element =
-              croppingElementId && nextElements.get(croppingElementId);
-
-            if (element && !element.isDeleted) {
-              visibleDifferenceFlag.value = true;
-            } else {
-              nextAppState[key] = null;
-            }
-            break;
-          }
-          case "editingGroupId":
-            const editingGroupId = nextAppState[key];
-
-            if (!editingGroupId) {
-              // previously there was an editingGroup (assuming visible), now there is none
-              visibleDifferenceFlag.value = true;
-            } else if (nonDeletedGroupIds.has(editingGroupId)) {
-              // previously there wasn't an editingGroup, now there is one which is visible
-              visibleDifferenceFlag.value = true;
-            } else {
-              // there was assigned an editingGroup now, but it's related to deleted element
-              nextAppState[key] = null;
-            }
-
-            break;
-          case "selectedLinearElementId":
-          case "editingLinearElementId":
-            const appStateKey = AppStateDelta.convertToAppStateKey(key);
-            const linearElement = nextAppState[appStateKey];
-
-            if (!linearElement) {
-              // previously there was a linear element (assuming visible), now there is none
-              visibleDifferenceFlag.value = true;
-            } else {
-              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[appStateKey] = null;
-              }
-            }
-
-            break;
-          default: {
-            assertNever(key, `Unknown ObservedElementsAppState's key "${key}"`);
-          }
-        }
-      }
-    }
-
-    return visibleDifferenceFlag.value;
-  }
-
-  private static convertToAppStateKey(
-    key: keyof Pick<
-      ObservedElementsAppState,
-      "selectedLinearElementId" | "editingLinearElementId"
-    >,
-  ): keyof Pick<AppState, "selectedLinearElement" | "editingLinearElement"> {
-    switch (key) {
-      case "selectedLinearElementId":
-        return "selectedLinearElement";
-      case "editingLinearElementId":
-        return "editingLinearElement";
-    }
-  }
-
-  private static filterSelectedElements(
-    selectedElementIds: AppState["selectedElementIds"],
-    elements: SceneElementsMap,
-    visibleDifferenceFlag: { value: boolean },
-  ) {
-    const ids = Object.keys(selectedElementIds);
-
-    if (!ids.length) {
-      // previously there were ids (assuming related to visible elements), now there are none
-      visibleDifferenceFlag.value = true;
-      return selectedElementIds;
-    }
-
-    const nextSelectedElementIds = { ...selectedElementIds };
-
-    for (const id of ids) {
-      const element = elements.get(id);
-
-      if (element && !element.isDeleted) {
-        // there is a selected element id related to a visible element
-        visibleDifferenceFlag.value = true;
-      } else {
-        delete nextSelectedElementIds[id];
-      }
-    }
-
-    return nextSelectedElementIds;
-  }
-
-  private static filterSelectedGroups(
-    selectedGroupIds: AppState["selectedGroupIds"],
-    nonDeletedGroupIds: Set<string>,
-    visibleDifferenceFlag: { value: boolean },
-  ) {
-    const ids = Object.keys(selectedGroupIds);
-
-    if (!ids.length) {
-      // previously there were ids (assuming related to visible groups), now there are none
-      visibleDifferenceFlag.value = true;
-      return selectedGroupIds;
-    }
-
-    const nextSelectedGroupIds = { ...selectedGroupIds };
-
-    for (const id of Object.keys(nextSelectedGroupIds)) {
-      if (nonDeletedGroupIds.has(id)) {
-        // there is a selected group id related to a visible group
-        visibleDifferenceFlag.value = true;
-      } else {
-        delete nextSelectedGroupIds[id];
-      }
-    }
-
-    return nextSelectedGroupIds;
-  }
-
-  private static stripElementsProps(
-    delta: Partial<ObservedAppState>,
-  ): Partial<ObservedStandaloneAppState> {
-    // WARN: Do not remove the type-casts as they here to ensure proper type checks
-    const {
-      editingGroupId,
-      selectedGroupIds,
-      selectedElementIds,
-      editingLinearElementId,
-      selectedLinearElementId,
-      croppingElementId,
-      ...standaloneProps
-    } = delta as ObservedAppState;
-
-    return standaloneProps as SubtypeOf<
-      typeof standaloneProps,
-      ObservedStandaloneAppState
-    >;
-  }
-
-  private static stripStandaloneProps(
-    delta: Partial<ObservedAppState>,
-  ): Partial<ObservedElementsAppState> {
-    // WARN: Do not remove the type-casts as they here to ensure proper type checks
-    const { name, viewBackgroundColor, ...elementsProps } =
-      delta as ObservedAppState;
-
-    return elementsProps as SubtypeOf<
-      typeof elementsProps,
-      ObservedElementsAppState
-    >;
-  }
-}

packages/deltas/src/containers/elements.ts

@@ -1,825 +0,0 @@
-import { Delta } from "../common/delta";
-import { newElementWith, shouldThrow } from "../common/utils";
-
-import type { DeltaContainer } from "../common/interfaces";
-import type {
-  ExcalidrawElement,
-  ElementUpdate,
-  Ordered,
-  SceneElementsMap,
-  DTO,
-  OrderedExcalidrawElement,
-  ExcalidrawImageElement,
-} from "../excalidraw-types";
-
-// CFDO: consider adding here (nonnullable) version & versionNonce & updated (so that we have correct versions when recunstructing from remote)
-type ElementPartial<T extends ExcalidrawElement = ExcalidrawElement> =
-  ElementUpdate<Ordered<T>>;
-
-/**
- * Elements delta is a low level primitive to encapsulate property changes between two sets of elements.
- * It does so by encapsulating forward and backward `Delta`s, allowing to time-travel in both directions.
- */
-export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
-  private constructor(
-    public readonly added: Record<string, Delta<ElementPartial>>,
-    public readonly removed: Record<string, Delta<ElementPartial>>,
-    public readonly updated: Record<string, Delta<ElementPartial>>,
-  ) {}
-
-  public static create(
-    added: Record<string, Delta<ElementPartial>>,
-    removed: Record<string, Delta<ElementPartial>>,
-    updated: Record<string, Delta<ElementPartial>>,
-    options: {
-      shouldRedistribute: boolean;
-    } = {
-      shouldRedistribute: false,
-      // CFDO: don't forget to re-enable
-    },
-  ) {
-    const { shouldRedistribute } = options;
-    let delta: ElementsDelta;
-
-    if (shouldRedistribute) {
-      const nextAdded: Record<string, Delta<ElementPartial>> = {};
-      const nextRemoved: Record<string, Delta<ElementPartial>> = {};
-      const nextUpdated: Record<string, Delta<ElementPartial>> = {};
-
-      const deltas = [
-        ...Object.entries(added),
-        ...Object.entries(removed),
-        ...Object.entries(updated),
-      ];
-
-      for (const [id, delta] of deltas) {
-        if (this.satisfiesAddition(delta)) {
-          nextAdded[id] = delta;
-        } else if (this.satisfiesRemoval(delta)) {
-          nextRemoved[id] = delta;
-        } else {
-          nextUpdated[id] = delta;
-        }
-      }
-
-      delta = new ElementsDelta(nextAdded, nextRemoved, nextUpdated);
-    } else {
-      delta = new ElementsDelta(added, removed, updated);
-    }
-
-    if (shouldThrow()) {
-      ElementsDelta.validate(delta, "added", this.satisfiesAddition);
-      ElementsDelta.validate(delta, "removed", this.satisfiesRemoval);
-      ElementsDelta.validate(delta, "updated", this.satisfiesUpdate);
-    }
-
-    return delta;
-  }
-
-  public static restore(elementsDeltaDTO: DTO<ElementsDelta>): ElementsDelta {
-    const { added, removed, updated } = elementsDeltaDTO;
-    return ElementsDelta.create(added, removed, updated);
-  }
-
-  private static satisfiesAddition = ({
-    deleted,
-    inserted,
-  }: Delta<ElementPartial>) =>
-    // dissallowing added as "deleted", which could cause issues when resolving conflicts
-    deleted.isDeleted === true && !inserted.isDeleted;
-
-  private static satisfiesRemoval = ({
-    deleted,
-    inserted,
-  }: Delta<ElementPartial>) =>
-    !deleted.isDeleted && inserted.isDeleted === true;
-
-  private static satisfiesUpdate = ({
-    deleted,
-    inserted,
-  }: Delta<ElementPartial>) => !!deleted.isDeleted === !!inserted.isDeleted;
-
-  private static validate(
-    elementsDelta: ElementsDelta,
-    type: "added" | "removed" | "updated",
-    satifies: (delta: Delta<ElementPartial>) => boolean,
-  ) {
-    for (const [id, delta] of Object.entries(elementsDelta[type])) {
-      if (!satifies(delta)) {
-        console.error(
-          `Broken invariant for "${type}" delta, element "${id}", delta:`,
-          delta,
-        );
-        throw new Error(`ElementsDelta invariant broken for element "${id}".`);
-      }
-    }
-  }
-
-  /**
-   * Calculates the `Delta`s between the previous and next set of elements.
-   *
-   * @param prevElements - Map representing the previous state of elements.
-   * @param nextElements - Map representing the next state of elements.
-   *
-   * @returns `ElementsDelta` instance representing the `Delta` changes between the two sets of elements.
-   */
-  public static calculate<T extends OrderedExcalidrawElement>(
-    prevElements: Map<string, T>,
-    nextElements: Map<string, T>,
-  ): ElementsDelta {
-    if (prevElements === nextElements) {
-      return ElementsDelta.empty();
-    }
-
-    const added: Record<string, Delta<ElementPartial>> = {};
-    const removed: Record<string, Delta<ElementPartial>> = {};
-    const updated: Record<string, Delta<ElementPartial>> = {};
-
-    // this might be needed only in same edge cases, like during collab, when `isDeleted` elements get removed or when we (un)intentionally remove the elements
-    for (const prevElement of prevElements.values()) {
-      const nextElement = nextElements.get(prevElement.id);
-
-      if (!nextElement) {
-        const deleted = { ...prevElement, isDeleted: false } as ElementPartial;
-        const inserted = { isDeleted: true } as ElementPartial;
-
-        const delta = Delta.create(
-          deleted,
-          inserted,
-          ElementsDelta.stripIrrelevantProps,
-        );
-
-        removed[prevElement.id] = delta;
-      }
-    }
-
-    for (const nextElement of nextElements.values()) {
-      const prevElement = prevElements.get(nextElement.id);
-
-      if (!prevElement) {
-        const deleted = { isDeleted: true } as ElementPartial;
-        const inserted = {
-          ...nextElement,
-          isDeleted: false,
-        } as ElementPartial;
-
-        const delta = Delta.create(
-          deleted,
-          inserted,
-          ElementsDelta.stripIrrelevantProps,
-        );
-
-        added[nextElement.id] = delta;
-
-        continue;
-      }
-
-      if (prevElement.versionNonce !== nextElement.versionNonce) {
-        const delta = Delta.calculate<ElementPartial>(
-          prevElement,
-          nextElement,
-          ElementsDelta.stripIrrelevantProps,
-          ElementsDelta.postProcess,
-        );
-
-        if (
-          // making sure we don't get here some non-boolean values (i.e. undefined, null, etc.)
-          typeof prevElement.isDeleted === "boolean" &&
-          typeof nextElement.isDeleted === "boolean" &&
-          prevElement.isDeleted !== nextElement.isDeleted
-        ) {
-          // notice that other props could have been updated as well
-          if (prevElement.isDeleted && !nextElement.isDeleted) {
-            added[nextElement.id] = delta;
-          } else {
-            removed[nextElement.id] = delta;
-          }
-
-          continue;
-        }
-
-        // making sure there are at least some changes
-        if (!Delta.isEmpty(delta)) {
-          updated[nextElement.id] = delta;
-        }
-      }
-    }
-
-    return ElementsDelta.create(added, removed, updated);
-  }
-
-  public static empty() {
-    return ElementsDelta.create({}, {}, {});
-  }
-
-  public inverse(): ElementsDelta {
-    const inverseInternal = (deltas: Record<string, Delta<ElementPartial>>) => {
-      const inversedDeltas: Record<string, Delta<ElementPartial>> = {};
-
-      for (const [id, delta] of Object.entries(deltas)) {
-        inversedDeltas[id] = Delta.create(delta.inserted, delta.deleted);
-      }
-
-      return inversedDeltas;
-    };
-
-    const added = inverseInternal(this.added);
-    const removed = inverseInternal(this.removed);
-    const updated = inverseInternal(this.updated);
-
-    // notice we inverse removed with added not to break the invariants
-    // notice we force generate a new id
-    return ElementsDelta.create(removed, added, updated);
-  }
-
-  public isEmpty(): boolean {
-    return (
-      Object.keys(this.added).length === 0 &&
-      Object.keys(this.removed).length === 0 &&
-      Object.keys(this.updated).length === 0
-    );
-  }
-
-  /**
-   * Update delta/s based on the existing elements.
-   *
-   * @param elements current elements
-   * @param modifierOptions defines which of the delta (`deleted` or `inserted`) will be updated
-   * @returns new instance with modified delta/s
-   */
-  public applyLatestChanges(
-    elements: SceneElementsMap,
-    modifierOptions: "deleted" | "inserted",
-  ): ElementsDelta {
-    const modifier =
-      (element: OrderedExcalidrawElement) => (partial: ElementPartial) => {
-        const latestPartial: { [key: string]: unknown } = {};
-
-        for (const key of Object.keys(partial) as Array<keyof typeof partial>) {
-          // do not update following props:
-          // - `boundElements`, as it is a reference value which is postprocessed to contain only deleted/inserted keys
-          switch (key) {
-            case "boundElements":
-              latestPartial[key] = partial[key];
-              break;
-            default:
-              latestPartial[key] = element[key];
-          }
-        }
-
-        return latestPartial;
-      };
-
-    const applyLatestChangesInternal = (
-      deltas: Record<string, Delta<ElementPartial>>,
-    ) => {
-      const modifiedDeltas: Record<string, Delta<ElementPartial>> = {};
-
-      for (const [id, delta] of Object.entries(deltas)) {
-        const existingElement = elements.get(id);
-
-        if (existingElement) {
-          const modifiedDelta = Delta.create(
-            delta.deleted,
-            delta.inserted,
-            modifier(existingElement),
-            modifierOptions,
-          );
-
-          modifiedDeltas[id] = modifiedDelta;
-        } else {
-          modifiedDeltas[id] = delta;
-        }
-      }
-
-      return modifiedDeltas;
-    };
-
-    const added = applyLatestChangesInternal(this.added);
-    const removed = applyLatestChangesInternal(this.removed);
-    const updated = applyLatestChangesInternal(this.updated);
-
-    return ElementsDelta.create(added, removed, updated, {
-      shouldRedistribute: true, // redistribute the deltas as `isDeleted` could have been updated
-    });
-  }
-
-  // CFDO: does it make sense having a separate snapshot?
-  public applyTo(
-    elements: SceneElementsMap,
-    elementsSnapshot: Map<string, OrderedExcalidrawElement>,
-  ): [SceneElementsMap, boolean] {
-    const nextElements = new Map(elements) as SceneElementsMap;
-    let changedElements: Map<string, OrderedExcalidrawElement>;
-
-    const flags = {
-      containsVisibleDifference: false,
-      containsZindexDifference: false,
-    };
-
-    // mimic a transaction by applying deltas into `nextElements` (always new instance, no mutation)
-    try {
-      const applyDeltas = ElementsDelta.createApplier(
-        nextElements,
-        elementsSnapshot,
-        flags,
-      );
-
-      const addedElements = applyDeltas("added", this.added);
-      const removedElements = applyDeltas("removed", this.removed);
-      const updatedElements = applyDeltas("updated", this.updated);
-
-      // CFDO I: don't forget to fix this part
-      // const affectedElements = this.resolveConflicts(elements, nextElements);
-
-      // TODO: #7348 validate elements semantically and syntactically the changed elements, in case they would result data integrity issues
-      changedElements = new Map([
-        ...addedElements,
-        ...removedElements,
-        ...updatedElements,
-        // ...affectedElements,
-      ]);
-    } catch (e) {
-      console.error(`Couldn't apply elements delta`, e);
-
-      if (shouldThrow()) {
-        throw e;
-      }
-
-      // should not really happen, but just in case we cannot apply deltas, let's return the previous elements with visible change set to `true`
-      // even though there is obviously no visible change, returning `false` could be dangerous, as i.e.:
-      // in the worst case, it could lead into iterating through the whole stack with no possibility to redo
-      // instead, the worst case when returning `true` is an empty undo / redo
-      return [elements, true];
-    }
-
-    try {
-      // CFDO I: don't forget to fix this part
-      // // TODO: #7348 refactor away mutations below, so that we couldn't end up in an incosistent state
-      // ElementsDelta.redrawTextBoundingBoxes(nextElements, changedElements);
-      // // the following reorder performs also mutations, but only on new instances of changed elements
-      // // (unless something goes really bad and it fallbacks to fixing all invalid indices)
-      // nextElements = ElementsDelta.reorderElements(
-      //   nextElements,
-      //   changedElements,
-      //   flags,
-      // );
-      // // Need ordered nextElements to avoid z-index binding issues
-      // ElementsDelta.redrawBoundArrows(nextElements, changedElements);
-    } catch (e) {
-      console.error(
-        `Couldn't mutate elements after applying elements change`,
-        e,
-      );
-
-      if (shouldThrow()) {
-        throw e;
-      }
-    } finally {
-      return [nextElements, flags.containsVisibleDifference];
-    }
-  }
-
-  private static createApplier =
-    (
-      nextElements: SceneElementsMap,
-      snapshot: Map<string, OrderedExcalidrawElement>,
-      flags: {
-        containsVisibleDifference: boolean;
-        containsZindexDifference: boolean;
-      },
-    ) =>
-    (
-      type: "added" | "removed" | "updated",
-      deltas: Record<string, Delta<ElementPartial>>,
-    ) => {
-      const getElement = ElementsDelta.createGetter(
-        type,
-        nextElements,
-        snapshot,
-        flags,
-      );
-
-      return Object.entries(deltas).reduce((acc, [id, delta]) => {
-        const element = getElement(id, delta.inserted);
-
-        if (element) {
-          const newElement = ElementsDelta.applyDelta(element, delta, flags);
-          nextElements.set(newElement.id, newElement);
-          acc.set(newElement.id, newElement);
-        }
-
-        return acc;
-      }, new Map<string, OrderedExcalidrawElement>());
-    };
-
-  private static createGetter =
-    (
-      type: "added" | "removed" | "updated",
-      elements: SceneElementsMap,
-      snapshot: Map<string, OrderedExcalidrawElement>,
-      flags: {
-        containsVisibleDifference: boolean;
-        containsZindexDifference: boolean;
-      },
-    ) =>
-    (id: string, partial: ElementPartial) => {
-      let element = elements.get(id);
-
-      if (!element) {
-        // always fallback to the local snapshot, in cases when we cannot find the element in the elements array
-        element = snapshot.get(id);
-
-        if (element) {
-          // as the element was brought from the snapshot, it automatically results in a possible zindex difference
-          flags.containsZindexDifference = true;
-
-          // as the element was force deleted, we need to check if adding it back results in a visible change
-          if (
-            partial.isDeleted === false ||
-            (partial.isDeleted !== true && element.isDeleted === false)
-          ) {
-            flags.containsVisibleDifference = true;
-          }
-        } else if (type === "added") {
-          // for additions the element does not have to exist (i.e. remote update)
-          // CFDO II: the version itself might be different!
-          element = newElementWith(
-            { id, version: 1 } as OrderedExcalidrawElement,
-            {
-              ...partial,
-            },
-          );
-        }
-      }
-
-      return element;
-    };
-
-  private static applyDelta(
-    element: OrderedExcalidrawElement,
-    delta: Delta<ElementPartial>,
-    flags: {
-      containsVisibleDifference: boolean;
-      containsZindexDifference: boolean;
-    } = {
-      // by default we don't care about about the flags
-      containsVisibleDifference: true,
-      containsZindexDifference: true,
-    },
-  ) {
-    const { boundElements, ...directlyApplicablePartial } = delta.inserted;
-
-    if (
-      delta.deleted.boundElements?.length ||
-      delta.inserted.boundElements?.length
-    ) {
-      const mergedBoundElements = Delta.mergeArrays(
-        element.boundElements,
-        delta.inserted.boundElements,
-        delta.deleted.boundElements,
-        (x) => x.id,
-      );
-
-      Object.assign(directlyApplicablePartial, {
-        boundElements: mergedBoundElements,
-      });
-    }
-
-    // CFDO: this looks wrong
-    if (element.type === "image") {
-      const _delta = delta as Delta<ElementPartial<ExcalidrawImageElement>>;
-      // we want to override `crop` only if modified so that we don't reset
-      // when undoing/redoing unrelated change
-      if (_delta.deleted.crop || _delta.inserted.crop) {
-        Object.assign(directlyApplicablePartial, {
-          // apply change verbatim
-          crop: _delta.inserted.crop ?? null,
-        });
-      }
-    }
-
-    if (!flags.containsVisibleDifference) {
-      // strip away fractional index, as even if it would be different, it doesn't have to result in visible change
-      const { index, ...rest } = directlyApplicablePartial;
-      const containsVisibleDifference = ElementsDelta.checkForVisibleDifference(
-        element,
-        rest,
-      );
-
-      flags.containsVisibleDifference = containsVisibleDifference;
-    }
-
-    if (!flags.containsZindexDifference) {
-      flags.containsZindexDifference =
-        delta.deleted.index !== delta.inserted.index;
-    }
-
-    return newElementWith(element, directlyApplicablePartial);
-  }
-
-  /**
-   * Check for visible changes regardless of whether they were removed, added or updated.
-   */
-  private static checkForVisibleDifference(
-    element: OrderedExcalidrawElement,
-    partial: ElementPartial,
-  ) {
-    if (element.isDeleted && partial.isDeleted !== false) {
-      // when it's deleted and partial is not false, it cannot end up with a visible change
-      return false;
-    }
-
-    if (element.isDeleted && partial.isDeleted === false) {
-      // when we add an element, it results in a visible change
-      return true;
-    }
-
-    if (element.isDeleted === false && partial.isDeleted) {
-      // when we remove an element, it results in a visible change
-      return true;
-    }
-
-    // check for any difference on a visible element
-    return Delta.isRightDifferent(element, partial);
-  }
-
-  // /**
-  //  * Resolves conflicts for all previously added, removed and updated elements.
-  //  * Updates the previous deltas with all the changes after conflict resolution.
-  //  *
-  //  * // CFDO: revisit since arrow seem often redrawn incorrectly
-  //  *
-  //  * @returns all elements affected by the conflict resolution
-  //  */
-  // private resolveConflicts(
-  //   prevElements: SceneElementsMap,
-  //   nextElements: SceneElementsMap,
-  // ) {
-  //   const nextAffectedElements = new Map<string, OrderedExcalidrawElement>();
-  //   const updater = (
-  //     element: ExcalidrawElement,
-  //     updates: ElementUpdate<ExcalidrawElement>,
-  //   ) => {
-  //     const nextElement = nextElements.get(element.id); // only ever modify next element!
-  //     if (!nextElement) {
-  //       return;
-  //     }
-
-  //     let affectedElement: OrderedExcalidrawElement;
-
-  //     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>,
-  //       );
-  //     } else {
-  //       affectedElement = mutateElement(
-  //         nextElement,
-  //         updates as ElementUpdate<OrderedExcalidrawElement>,
-  //       );
-  //     }
-
-  //     nextAffectedElements.set(affectedElement.id, affectedElement);
-  //     nextElements.set(affectedElement.id, affectedElement);
-  //   };
-
-  //   // removed delta is affecting the bindings always, as all the affected elements of the removed elements need to be unbound
-  //   for (const id of Object.keys(this.removed)) {
-  //     ElementsDelta.unbindAffected(prevElements, nextElements, id, updater);
-  //   }
-
-  //   // added delta is affecting the bindings always, all the affected elements of the added elements need to be rebound
-  //   for (const id of Object.keys(this.added)) {
-  //     ElementsDelta.rebindAffected(prevElements, nextElements, id, updater);
-  //   }
-
-  //   // updated delta is affecting the binding only in case it contains changed binding or bindable property
-  //   for (const [id] of Array.from(Object.entries(this.updated)).filter(
-  //     ([_, delta]) =>
-  //       Object.keys({ ...delta.deleted, ...delta.inserted }).find((prop) =>
-  //         bindingProperties.has(prop as BindingProp | BindableProp),
-  //       ),
-  //   )) {
-  //     const updatedElement = nextElements.get(id);
-  //     if (!updatedElement || updatedElement.isDeleted) {
-  //       // skip fixing bindings for updates on deleted elements
-  //       continue;
-  //     }
-
-  //     ElementsDelta.rebindAffected(prevElements, nextElements, id, updater);
-  //   }
-
-  //   // filter only previous elements, which were now affected
-  //   const prevAffectedElements = new Map(
-  //     Array.from(prevElements).filter(([id]) => nextAffectedElements.has(id)),
-  //   );
-
-  //   // calculate complete deltas for affected elements, and assign them back to all the deltas
-  //   // technically we could do better here if perf. would become an issue
-  //   const { added, removed, updated } = ElementsDelta.calculate(
-  //     prevAffectedElements,
-  //     nextAffectedElements,
-  //   );
-
-  //   for (const [id, delta] of Object.entries(added)) {
-  //     this.added[id] = delta;
-  //   }
-
-  //   for (const [id, delta] of Object.entries(removed)) {
-  //     this.removed[id] = delta;
-  //   }
-
-  //   for (const [id, delta] of Object.entries(updated)) {
-  //     this.updated[id] = delta;
-  //   }
-
-  //   return nextAffectedElements;
-  // }
-
-  // /**
-  //  * Non deleted affected elements of removed elements (before and after applying delta),
-  //  * should be unbound ~ bindings should not point from non deleted into the deleted element/s.
-  //  */
-  // private static unbindAffected(
-  //   prevElements: SceneElementsMap,
-  //   nextElements: SceneElementsMap,
-  //   id: string,
-  //   updater: (
-  //     element: ExcalidrawElement,
-  //     updates: ElementUpdate<ExcalidrawElement>,
-  //   ) => void,
-  // ) {
-  //   // the instance could have been updated, so make sure we are passing the latest element to each function below
-  //   const prevElement = () => prevElements.get(id); // element before removal
-  //   const nextElement = () => nextElements.get(id); // element after removal
-
-  //   BoundElement.unbindAffected(nextElements, prevElement(), updater);
-  //   BoundElement.unbindAffected(nextElements, nextElement(), updater);
-
-  //   BindableElement.unbindAffected(nextElements, prevElement(), updater);
-  //   BindableElement.unbindAffected(nextElements, nextElement(), updater);
-  // }
-
-  // /**
-  //  * Non deleted affected elements of added or updated element/s (before and after applying delta),
-  //  * should be rebound (if possible) with the current element ~ bindings should be bidirectional.
-  //  */
-  // private static rebindAffected(
-  //   prevElements: SceneElementsMap,
-  //   nextElements: SceneElementsMap,
-  //   id: string,
-  //   updater: (
-  //     element: ExcalidrawElement,
-  //     updates: ElementUpdate<ExcalidrawElement>,
-  //   ) => void,
-  // ) {
-  //   // the instance could have been updated, so make sure we are passing the latest element to each function below
-  //   const prevElement = () => prevElements.get(id); // element before addition / update
-  //   const nextElement = () => nextElements.get(id); // element after addition / update
-
-  //   BoundElement.unbindAffected(nextElements, prevElement(), updater);
-  //   BoundElement.rebindAffected(nextElements, nextElement(), updater);
-
-  //   BindableElement.unbindAffected(
-  //     nextElements,
-  //     prevElement(),
-  //     (element, updates) => {
-  //       // we cannot rebind arrows with bindable element so we don't unbind them at all during rebind (we still need to unbind them on removal)
-  //       // TODO: #7348 add startBinding / endBinding to the `BoundElement` context so that we could rebind arrows and remove this condition
-  //       if (isTextElement(element)) {
-  //         updater(element, updates);
-  //       }
-  //     },
-  //   );
-  //   BindableElement.rebindAffected(nextElements, nextElement(), updater);
-  // }
-
-  // private static redrawTextBoundingBoxes(
-  //   elements: SceneElementsMap,
-  //   changed: Map<string, OrderedExcalidrawElement>,
-  // ) {
-  //   const boxesToRedraw = new Map<
-  //     string,
-  //     { container: OrderedExcalidrawElement; boundText: ExcalidrawTextElement }
-  //   >();
-
-  //   for (const element of changed.values()) {
-  //     if (isBoundToContainer(element)) {
-  //       const { containerId } = element as ExcalidrawTextElement;
-  //       const container = containerId ? elements.get(containerId) : undefined;
-
-  //       if (container) {
-  //         boxesToRedraw.set(container.id, {
-  //           container,
-  //           boundText: element as ExcalidrawTextElement,
-  //         });
-  //       }
-  //     }
-
-  //     if (hasBoundTextElement(element)) {
-  //       const boundTextElementId = getBoundTextElementId(element);
-  //       const boundText = boundTextElementId
-  //         ? elements.get(boundTextElementId)
-  //         : undefined;
-
-  //       if (boundText) {
-  //         boxesToRedraw.set(element.id, {
-  //           container: element,
-  //           boundText: boundText as ExcalidrawTextElement,
-  //         });
-  //       }
-  //     }
-  //   }
-
-  //   for (const { container, boundText } of boxesToRedraw.values()) {
-  //     if (container.isDeleted || boundText.isDeleted) {
-  //       // skip redraw if one of them is deleted, as it would not result in a meaningful redraw
-  //       continue;
-  //     }
-
-  //     redrawTextBoundingBox(boundText, container, elements, false);
-  //   }
-  // }
-
-  // private static redrawBoundArrows(
-  //   elements: SceneElementsMap,
-  //   changed: Map<string, OrderedExcalidrawElement>,
-  // ) {
-  //   for (const element of changed.values()) {
-  //     if (!element.isDeleted && isBindableElement(element)) {
-  //       updateBoundElements(element, elements, {
-  //         changedElements: changed,
-  //       });
-  //     }
-  //   }
-  // }
-
-  // private static reorderElements(
-  //   elements: SceneElementsMap,
-  //   changed: Map<string, OrderedExcalidrawElement>,
-  //   flags: {
-  //     containsVisibleDifference: boolean;
-  //     containsZindexDifference: boolean;
-  //   },
-  // ) {
-  //   if (!flags.containsZindexDifference) {
-  //     return elements;
-  //   }
-
-  //   const unordered = Array.from(elements.values());
-  //   const ordered = orderByFractionalIndex([...unordered]);
-  //   const moved = Delta.getRightDifferences(unordered, ordered, true).reduce(
-  //     (acc, arrayIndex) => {
-  //       const candidate = unordered[Number(arrayIndex)];
-  //       if (candidate && changed.has(candidate.id)) {
-  //         acc.set(candidate.id, candidate);
-  //       }
-
-  //       return acc;
-  //     },
-  //     new Map(),
-  //   );
-
-  //   if (!flags.containsVisibleDifference && moved.size) {
-  //     // we found a difference in order!
-  //     flags.containsVisibleDifference = true;
-  //   }
-
-  //   // synchronize all elements that were actually moved
-  //   // could fallback to synchronizing all invalid indices
-  //   return elementsToMap(syncMovedIndices(ordered, moved)) as typeof elements;
-  // }
-
-  /**
-   * It is necessary to post process the partials in case of reference values,
-   * for which we need to calculate the real diff between `deleted` and `inserted`.
-   */
-  private static postProcess(
-    deleted: ElementPartial,
-    inserted: ElementPartial,
-  ): [ElementPartial, ElementPartial] {
-    try {
-      Delta.diffArrays(deleted, inserted, "boundElements", (x) => x.id);
-    } 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 elements delta.`);
-
-      if (shouldThrow()) {
-        throw e;
-      }
-    } finally {
-      return [deleted, inserted];
-    }
-  }
-
-  private static stripIrrelevantProps(
-    partial: Partial<OrderedExcalidrawElement>,
-  ): ElementPartial {
-    const { id, updated, version, versionNonce, ...strippedPartial } = partial;
-
-    return strippedPartial;
-  }
-}

packages/deltas/src/excalidraw-types.d.ts

@@ -1,26 +0,0 @@
-export type {
-  AppState,
-  ObservedElementsAppState,
-  ObservedStandaloneAppState,
-  ObservedAppState,
-} from "@excalidraw/excalidraw/dist/excalidraw/types";
-export type {
-  DTO,
-  SubtypeOf,
-  ValueOf,
-} from "@excalidraw/excalidraw/dist/excalidraw/utility-types";
-
-export type {
-  ExcalidrawElement,
-  ExcalidrawImageElement,
-  ExcalidrawTextElement,
-  Ordered,
-  OrderedExcalidrawElement,
-  SceneElementsMap,
-  ElementsMap,
-} from "@excalidraw/excalidraw/dist/excalidraw/element/types";
-export type { ElementUpdate } from "@excalidraw/excalidraw/dist/excalidraw/element/mutateElement";
-export type {
-  BindableProp,
-  BindingProp,
-} from "@excalidraw/excalidraw/dist/excalidraw/element/binding";

packages/deltas/src/index.ts

@@ -1,5 +0,0 @@
-export type { DeltaContainer } from "./common/interfaces";
-
-export { Delta } from "./common/delta";
-export { ElementsDelta } from "./containers/elements";
-export { AppStateDelta } from "./containers/appstate";

packages/deltas/tsconfig.json

@@ -1,19 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "strict": true,
-    "outDir": "dist/types",
-    "skipLibCheck": true,
-    "declaration": true,
-    "emitDeclarationOnly": true,
-    "allowSyntheticDefaultImports": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
-  },
-  "exclude": [
-    "**/*.test.*",
-    "**/tests/*",
-    "types",
-    "dist",
-  ],
-}

packages/element/package.json

@@ -13,7 +13,7 @@
       "default": "./dist/prod/index.js"
     },
     "./*": {
-      "types": "./../element/dist/types/element/src/*.d.ts"
+      "types": "./dist/types/element/src/*.d.ts"
     }
   },
   "files": [
@@ -50,7 +50,7 @@
   "bugs": "https://github.com/excalidraw/excalidraw/issues",
   "repository": "https://github.com/excalidraw/excalidraw",
   "scripts": {
-    "gen:types": "rm -rf types && tsc",
+    "gen:types": "rimraf types && tsc",
-    "build:esm": "rm -rf dist && node ../../scripts/buildBase.js && yarn gen:types"
+    "build:esm": "rimraf dist && node ../../scripts/buildBase.js && yarn gen:types"
   }
 }

packages/element/src/Scene.ts

@@ -6,25 +6,21 @@ import {
   toBrandedType,
   isDevEnv,
   isTestEnv,
-  isReadonlyArray,
+  toArray,
 } from "@excalidraw/common";
 import { isNonDeletedElement } from "@excalidraw/element";
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { isFrameLikeElement } from "@excalidraw/element";
-import { getElementsInGroup } from "@excalidraw/element/groups";
+import { getElementsInGroup } from "@excalidraw/element";
 
 import {
-  orderByFractionalIndex,
   syncInvalidIndices,
   syncMovedIndices,
   validateFractionalIndices,
-} from "@excalidraw/element/fractionalIndex";
+} from "@excalidraw/element";
 
-import { getSelectedElements } from "@excalidraw/element/selection";
+import { getSelectedElements } from "@excalidraw/element";
 
-import {
+import { mutateElement, type ElementUpdate } from "@excalidraw/element";
-  mutateElement,
-  type ElementUpdate,
-} from "@excalidraw/element/mutateElement";
 
 import type {
   ExcalidrawElement,
@@ -109,7 +105,7 @@ const hashSelectionOpts = (
 // in our codebase
 export type ExcalidrawElementsIncludingDeleted = readonly ExcalidrawElement[];
 
-class Scene {
+export class Scene {
   // ---------------------------------------------------------------------------
   // instance methods/props
   // ---------------------------------------------------------------------------
@@ -268,19 +264,13 @@ class Scene {
   }
 
   replaceAllElements(nextElements: ElementsMapOrArray) {
-    // ts doesn't like `Array.isArray` of `instanceof Map`
+    // we do trust the insertion order on the map, though maybe we shouldn't and should prefer order defined by fractional indices
-    if (!isReadonlyArray(nextElements)) {
+    const _nextElements = toArray(nextElements);
-      // need to order by fractional indices to get the correct order
-      nextElements = orderByFractionalIndex(
-        Array.from(nextElements.values()) as OrderedExcalidrawElement[],
-      );
-    }
-
     const nextFrameLikes: ExcalidrawFrameLikeElement[] = [];
 
-    validateIndicesThrottled(nextElements);
+    validateIndicesThrottled(_nextElements);
 
-    this.elements = syncInvalidIndices(nextElements);
+    this.elements = syncInvalidIndices(_nextElements);
     this.elementsMap.clear();
     this.elements.forEach((element) => {
       if (isFrameLikeElement(element)) {
@@ -464,5 +454,3 @@ class Scene {
     return element;
   }
 }
-
-export default Scene;

packages/element/src/align.ts

@@ -2,7 +2,7 @@ import { updateBoundElements } from "./binding";
 import { getCommonBoundingBox } from "./bounds";
 import { getMaximumGroups } from "./groups";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { BoundingBox } from "./bounds";
 import type { ExcalidrawElement } from "./types";

packages/element/src/binding.ts

@@ -33,7 +33,7 @@ import type { LocalPoint, Radians } from "@excalidraw/math";
 
 import type { AppState } from "@excalidraw/excalidraw/types";
 
-import type { Mutable } from "@excalidraw/common/utility-types";
+import type { MapEntry, Mutable } from "@excalidraw/common/utility-types";
 
 import {
   getCenterForBounds,
@@ -66,7 +66,7 @@ import {
 import { aabbForElement, getElementShape, pointInsideBounds } from "./shapes";
 import { updateElbowArrowPoints } from "./elbowArrow";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { Bounds } from "./bounds";
 import type { ElementUpdate } from "./mutateElement";
@@ -81,10 +81,10 @@ import type {
   NonDeletedSceneElementsMap,
   ExcalidrawTextElement,
   ExcalidrawArrowElement,
-  OrderedExcalidrawElement,
   ExcalidrawElbowArrowElement,
   FixedPoint,
   FixedPointBinding,
+  PointsPositionUpdates,
 } from "./types";
 
 export type SuggestedBinding =
@@ -276,15 +276,6 @@ const getBindingStrategyForDraggingArrowEndpoints = (
           zoom,
         )
       : null // If binding is disabled and start is dragged, break all binds
-    : !isElbowArrow(selectedElement)
-    ? // We have to update the focus and gap of the binding, so let's rebind
-      getElligibleElementForBindingElement(
-        selectedElement,
-        "start",
-        elementsMap,
-        elements,
-        zoom,
-      )
     : "keep";
   const end = endDragged
     ? isBindingEnabled
@@ -296,15 +287,6 @@ const getBindingStrategyForDraggingArrowEndpoints = (
           zoom,
         )
       : null // If binding is disabled and end is dragged, break all binds
-    : !isElbowArrow(selectedElement)
-    ? // We have to update the focus and gap of the binding, so let's rebind
-      getElligibleElementForBindingElement(
-        selectedElement,
-        "end",
-        elementsMap,
-        elements,
-        zoom,
-      )
     : "keep";
 
   return [start, end];
@@ -728,29 +710,32 @@ const calculateFocusAndGap = (
 
 // Supports translating, rotating and scaling `changedElement` with bound
 // linear elements.
-// Because scaling involves moving the focus points as well, it is
-// done before the `changedElement` is updated, and the `newSize` is passed
-// in explicitly.
 export const updateBoundElements = (
   changedElement: NonDeletedExcalidrawElement,
   scene: Scene,
   options?: {
     simultaneouslyUpdated?: readonly ExcalidrawElement[];
     newSize?: { width: number; height: number };
-    changedElements?: Map<string, OrderedExcalidrawElement>;
+    changedElements?: Map<string, ExcalidrawElement>;
   },
 ) => {
+  if (!isBindableElement(changedElement)) {
+    return;
+  }
+
   const { newSize, simultaneouslyUpdated } = options ?? {};
   const simultaneouslyUpdatedElementIds = getSimultaneouslyUpdatedElementIds(
     simultaneouslyUpdated,
   );
 
-  if (!isBindableElement(changedElement)) {
+  let elementsMap: ElementsMap = scene.getNonDeletedElementsMap();
-    return;
+  if (options?.changedElements) {
+    elementsMap = new Map(elementsMap) as typeof elementsMap;
+    options.changedElements.forEach((element) => {
+      elementsMap.set(element.id, element);
+    });
   }
 
-  const elementsMap = scene.getNonDeletedElementsMap();
-
   boundElementsVisitor(elementsMap, changedElement, (element) => {
     if (!isLinearElement(element) || element.isDeleted) {
       return;
@@ -817,28 +802,22 @@ export const updateBoundElements = (
             bindableElement,
             elementsMap,
           );
+
           if (point) {
-            return {
+            return [
-              index:
+              bindingProp === "startBinding" ? 0 : element.points.length - 1,
-                bindingProp === "startBinding" ? 0 : element.points.length - 1,
+              { point },
-              point,
+            ] as MapEntry<PointsPositionUpdates>;
-            };
           }
         }
 
         return null;
       },
     ).filter(
-      (
+      (update): update is MapEntry<PointsPositionUpdates> => update !== null,
-        update,
-      ): update is NonNullable<{
-        index: number;
-        point: LocalPoint;
-        isDragging?: boolean;
-      }> => update !== null,
     );
 
-    LinearElementEditor.movePoints(element, scene, updates, {
+    LinearElementEditor.movePoints(element, scene, new Map(updates), {
       ...(changedElement.id === element.startBinding?.elementId
         ? { startBinding: bindings.startBinding }
         : {}),
@@ -854,6 +833,25 @@ export const updateBoundElements = (
   });
 };
 
+export const updateBindings = (
+  latestElement: ExcalidrawElement,
+  scene: Scene,
+  options?: {
+    simultaneouslyUpdated?: readonly ExcalidrawElement[];
+    newSize?: { width: number; height: number };
+    zoom?: AppState["zoom"];
+  },
+) => {
+  if (isLinearElement(latestElement)) {
+    bindOrUnbindLinearElements([latestElement], true, [], scene, options?.zoom);
+  } else {
+    updateBoundElements(latestElement, scene, {
+      ...options,
+      changedElements: new Map([[latestElement.id, latestElement]]),
+    });
+  }
+};
+
 const doesNeedUpdate = (
   boundElement: NonDeleted<ExcalidrawLinearElement>,
   changedElement: ExcalidrawBindableElement,
@@ -1168,6 +1166,48 @@ export const snapToMid = (
       center,
       angle,
     );
+  } else if (element.type === "diamond") {
+    const distance = FIXED_BINDING_DISTANCE - 1;
+    const topLeft = pointFrom<GlobalPoint>(
+      x + width / 4 - distance,
+      y + height / 4 - distance,
+    );
+    const topRight = pointFrom<GlobalPoint>(
+      x + (3 * width) / 4 + distance,
+      y + height / 4 - distance,
+    );
+    const bottomLeft = pointFrom<GlobalPoint>(
+      x + width / 4 - distance,
+      y + (3 * height) / 4 + distance,
+    );
+    const bottomRight = pointFrom<GlobalPoint>(
+      x + (3 * width) / 4 + distance,
+      y + (3 * height) / 4 + distance,
+    );
+    if (
+      pointDistance(topLeft, nonRotated) <
+      Math.max(horizontalThrehsold, verticalThrehsold)
+    ) {
+      return pointRotateRads(topLeft, center, angle);
+    }
+    if (
+      pointDistance(topRight, nonRotated) <
+      Math.max(horizontalThrehsold, verticalThrehsold)
+    ) {
+      return pointRotateRads(topRight, center, angle);
+    }
+    if (
+      pointDistance(bottomLeft, nonRotated) <
+      Math.max(horizontalThrehsold, verticalThrehsold)
+    ) {
+      return pointRotateRads(bottomLeft, center, angle);
+    }
+    if (
+      pointDistance(bottomRight, nonRotated) <
+      Math.max(horizontalThrehsold, verticalThrehsold)
+    ) {
+      return pointRotateRads(bottomRight, center, angle);
+    }
   }
 
   return p;

packages/element/src/bounds.ts

@@ -1,17 +1,17 @@
 import rough from "roughjs/bin/rough";
 
 import {
-  rescalePoints,
   arrayToMap,
   invariant,
+  rescalePoints,
   sizeOf,
 } from "@excalidraw/common";
 
 import {
   degreesToRadians,
   lineSegment,
-  pointFrom,
   pointDistance,
+  pointFrom,
   pointFromArray,
   pointRotateRads,
 } from "@excalidraw/math";
@@ -33,8 +33,8 @@ import type { AppState } from "@excalidraw/excalidraw/types";
 
 import type { Mutable } from "@excalidraw/common/utility-types";
 
-import { ShapeCache } from "./ShapeCache";
 import { generateRoughOptions } from "./Shape";
+import { ShapeCache } from "./ShapeCache";
 import { LinearElementEditor } from "./linearElementEditor";
 import { getBoundTextElement, getContainerElement } from "./textElement";
 import {
@@ -52,20 +52,20 @@ import {
   deconstructRectanguloidElement,
 } from "./utils";
 
-import type {
-  ExcalidrawElement,
-  ExcalidrawLinearElement,
-  Arrowhead,
-  ExcalidrawFreeDrawElement,
-  NonDeleted,
-  ExcalidrawTextElementWithContainer,
-  ElementsMap,
-  ExcalidrawRectanguloidElement,
-  ExcalidrawEllipseElement,
-  ElementsMapOrArray,
-} from "./types";
 import type { Drawable, Op } from "roughjs/bin/core";
 import type { Point as RoughPoint } from "roughjs/bin/geometry";
+import type {
+  Arrowhead,
+  ElementsMap,
+  ElementsMapOrArray,
+  ExcalidrawElement,
+  ExcalidrawEllipseElement,
+  ExcalidrawFreeDrawElement,
+  ExcalidrawLinearElement,
+  ExcalidrawRectanguloidElement,
+  ExcalidrawTextElementWithContainer,
+  NonDeleted,
+} from "./types";
 
 export type RectangleBox = {
   x: number;

packages/element/src/delta.ts

@@ -5,43 +5,7 @@ import {
   isDevEnv,
   isShallowEqual,
   isTestEnv,
-  toBrandedType,
 } from "@excalidraw/common";
-import {
-  BoundElement,
-  BindableElement,
-  bindingProperties,
-  updateBoundElements,
-} from "@excalidraw/element/binding";
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
-import {
-  mutateElement,
-  newElementWith,
-} from "@excalidraw/element/mutateElement";
-import {
-  getBoundTextElementId,
-  redrawTextBoundingBox,
-} from "@excalidraw/element/textElement";
-import {
-  hasBoundTextElement,
-  isBindableElement,
-  isBoundToContainer,
-  isImageElement,
-  isTextElement,
-} from "@excalidraw/element/typeChecks";
-
-import { getNonDeletedGroupIds } from "@excalidraw/element/groups";
-
-import {
-  orderByFractionalIndex,
-  syncMovedIndices,
-} from "@excalidraw/element/fractionalIndex";
-
-import Scene from "@excalidraw/element/Scene";
-
-import type { BindableProp, BindingProp } from "@excalidraw/element/binding";
-
-import type { ElementUpdate } from "@excalidraw/element/mutateElement";
 
 import type {
   ExcalidrawElement,
@@ -56,14 +20,40 @@ import type {
 
 import type { DTO, SubtypeOf, ValueOf } from "@excalidraw/common/utility-types";
 
-import { getObservedAppState, StoreSnapshot } from "./store";
-
 import type {
   AppState,
   ObservedAppState,
   ObservedElementsAppState,
   ObservedStandaloneAppState,
-} from "./types";
+} from "@excalidraw/excalidraw/types";
+
+import { getObservedAppState } from "./store";
+
+import {
+  BoundElement,
+  BindableElement,
+  bindingProperties,
+  updateBoundElements,
+} from "./binding";
+import { LinearElementEditor } from "./linearElementEditor";
+import { mutateElement, newElementWith } from "./mutateElement";
+import { getBoundTextElementId, redrawTextBoundingBox } from "./textElement";
+import {
+  hasBoundTextElement,
+  isBindableElement,
+  isBoundToContainer,
+  isTextElement,
+} from "./typeChecks";
+
+import { getNonDeletedGroupIds } from "./groups";
+
+import { orderByFractionalIndex, syncMovedIndices } from "./fractionalIndex";
+
+import { Scene } from "./Scene";
+
+import type { BindableProp, BindingProp } from "./binding";
+
+import type { ElementUpdate } from "./mutateElement";
 
 /**
  * Represents the difference between two objects of the same type.
@@ -197,10 +187,12 @@ export class Delta<T> {
       return;
     }
 
-    if (
+    const isDeletedObject =
-      typeof deleted[property] === "object" ||
+      deleted[property] !== null && typeof deleted[property] === "object";
-      typeof inserted[property] === "object"
+    const isInsertedObject =
-    ) {
+      inserted[property] !== null && typeof inserted[property] === "object";
+
+    if (isDeletedObject || isInsertedObject) {
       type RecordLike = Record<string, V | undefined>;
 
       const deletedObject: RecordLike = deleted[property] ?? {};
@@ -232,6 +224,9 @@ export class Delta<T> {
         Reflect.deleteProperty(deleted, property);
         Reflect.deleteProperty(inserted, property);
       }
+    } else if (deleted[property] === inserted[property]) {
+      Reflect.deleteProperty(deleted, property);
+      Reflect.deleteProperty(inserted, property);
     }
   }
 
@@ -326,7 +321,7 @@ export class Delta<T> {
   }
 
   /**
-   * Returns all the object1 keys that have distinct values.
+   * Returns sorted object1 keys that have distinct values.
    */
   public static getLeftDifferences<T extends {}>(
     object1: T,
@@ -335,11 +330,11 @@ export class Delta<T> {
   ) {
     return Array.from(
       this.distinctKeysIterator("left", object1, object2, skipShallowCompare),
-    );
+    ).sort();
   }
 
   /**
-   * Returns all the object2 keys that have distinct values.
+   * Returns sorted object2 keys that have distinct values.
    */
   public static getRightDifferences<T extends {}>(
     object1: T,
@@ -348,7 +343,7 @@ export class Delta<T> {
   ) {
     return Array.from(
       this.distinctKeysIterator("right", object1, object2, skipShallowCompare),
-    );
+    ).sort();
   }
 
   /**
@@ -386,8 +381,6 @@ export class Delta<T> {
       );
     }
 
-    // CFDO: order the keys based on the most common ones to change
-    // (i.e. x/y, width/height, isDeleted, etc.) for quick exit
     for (const key of keys) {
       const object1Value = object1[key as keyof T];
       const object2Value = object2[key as keyof T];
@@ -413,7 +406,7 @@ export class Delta<T> {
 /**
  * Encapsulates a set of application-level `Delta`s.
  */
-interface DeltaContainer<T> {
+export interface DeltaContainer<T> {
   /**
    * Inverses the `Delta`s while creating a new `DeltaContainer` instance.
    */
@@ -442,7 +435,8 @@ export class AppStateDelta implements DeltaContainer<AppState> {
     const delta = Delta.calculate(
       prevAppState,
       nextAppState,
-      undefined,
+      // making the order of keys in deltas stable for hashing purposes
+      AppStateDelta.orderAppStateKeys,
       AppStateDelta.postProcess,
     );
 
@@ -537,7 +531,7 @@ export class AppStateDelta implements DeltaContainer<AppState> {
       return [nextAppState, constainsVisibleChanges];
     } catch (e) {
       // shouldn't really happen, but just in case
-      console.error(`Couldn't apply appstate delta`, e);
+      console.error(`Couldn't apply appstate change`, e);
 
       if (isTestEnv() || isDevEnv()) {
         throw e;
@@ -551,40 +545,6 @@ export class AppStateDelta implements DeltaContainer<AppState> {
     return Delta.isEmpty(this.delta);
   }
 
-  /**
-   * It is necessary to post process the partials in case of reference values,
-   * for which we need to calculate the real diff between `deleted` and `inserted`.
-   */
-  private static postProcess<T extends ObservedAppState>(
-    deleted: Partial<T>,
-    inserted: Partial<T>,
-  ): [Partial<T>, Partial<T>] {
-    try {
-      Delta.diffObjects(
-        deleted,
-        inserted,
-        "selectedElementIds",
-        // ts language server has a bit trouble resolving this, so we are giving it a little push
-        (_) => true as ValueOf<T["selectedElementIds"]>,
-      );
-      Delta.diffObjects(
-        deleted,
-        inserted,
-        "selectedGroupIds",
-        (prevValue) => (prevValue ?? false) as ValueOf<T["selectedGroupIds"]>,
-      );
-    } 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.`);
-
-      if (isTestEnv() || isDevEnv()) {
-        throw e;
-      }
-    } finally {
-      return [deleted, inserted];
-    }
-  }
-
   /**
    * Mutates `nextAppState` be filtering out state related to deleted elements.
    *
@@ -703,6 +663,24 @@ export class AppStateDelta implements DeltaContainer<AppState> {
             }
 
             break;
+          case "lockedMultiSelections": {
+            const prevLockedUnits = prevAppState[key] || {};
+            const nextLockedUnits = nextAppState[key] || {};
+
+            if (!isShallowEqual(prevLockedUnits, nextLockedUnits)) {
+              visibleDifferenceFlag.value = true;
+            }
+            break;
+          }
+          case "activeLockedId": {
+            const prevHitLockedId = prevAppState[key] || null;
+            const nextHitLockedId = nextAppState[key] || null;
+
+            if (prevHitLockedId !== nextHitLockedId) {
+              visibleDifferenceFlag.value = true;
+            }
+            break;
+          }
           default: {
             assertNever(
               key,
@@ -798,6 +776,8 @@ export class AppStateDelta implements DeltaContainer<AppState> {
       editingLinearElementId,
       selectedLinearElementId,
       croppingElementId,
+      lockedMultiSelections,
+      activeLockedId,
       ...standaloneProps
     } = delta as ObservedAppState;
 
@@ -819,14 +799,72 @@ export class AppStateDelta implements DeltaContainer<AppState> {
       ObservedElementsAppState
     >;
   }
+
+  /**
+   * It is necessary to post process the partials in case of reference values,
+   * for which we need to calculate the real diff between `deleted` and `inserted`.
+   */
+  private static postProcess<T extends ObservedAppState>(
+    deleted: Partial<T>,
+    inserted: Partial<T>,
+  ): [Partial<T>, Partial<T>] {
+    try {
+      Delta.diffObjects(
+        deleted,
+        inserted,
+        "selectedElementIds",
+        // ts language server has a bit trouble resolving this, so we are giving it a little push
+        (_) => true as ValueOf<T["selectedElementIds"]>,
+      );
+      Delta.diffObjects(
+        deleted,
+        inserted,
+        "selectedGroupIds",
+        (prevValue) => (prevValue ?? false) as ValueOf<T["selectedGroupIds"]>,
+      );
+      Delta.diffObjects(
+        deleted,
+        inserted,
+        "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.`);
+
+      if (isTestEnv() || isDevEnv()) {
+        throw e;
+      }
+    } finally {
+      return [deleted, inserted];
+    }
+  }
+
+  private static orderAppStateKeys(partial: Partial<ObservedAppState>) {
+    const orderedPartial: { [key: string]: unknown } = {};
+
+    for (const key of Object.keys(partial).sort()) {
+      // relying on insertion order
+      orderedPartial[key] = partial[key as keyof ObservedAppState];
+    }
+
+    return orderedPartial as Partial<ObservedAppState>;
+  }
 }
 
-// CFDO: consider adding here (nonnullable) version & versionNonce & updated (so that we have correct versions when recunstructing from remote)
+type ElementPartial<T extends ExcalidrawElement = ExcalidrawElement> = Omit<
-type ElementPartial<T extends ExcalidrawElement = ExcalidrawElement> =
+  ElementUpdate<Ordered<T>>,
-  ElementUpdate<Ordered<T>>;
+  "seed"
+>;
 
 /**
- * Elements delta is a low level primitive to encapsulate property changes between two sets of elements.
+ * Elements change is a low level primitive to capture a change between two sets of elements.
  * It does so by encapsulating forward and backward `Delta`s, allowing to time-travel in both directions.
  */
 export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
@@ -846,10 +884,9 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
       shouldRedistribute: false,
     },
   ) {
-    const { shouldRedistribute } = options;
     let delta: ElementsDelta;
 
-    if (shouldRedistribute) {
+    if (options.shouldRedistribute) {
       const nextAdded: Record<string, Delta<ElementPartial>> = {};
       const nextRemoved: Record<string, Delta<ElementPartial>> = {};
       const nextUpdated: Record<string, Delta<ElementPartial>> = {};
@@ -1036,7 +1073,6 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
     const updated = inverseInternal(this.updated);
 
     // notice we inverse removed with added not to break the invariants
-    // notice we force generate a new id
     return ElementsDelta.create(removed, added, updated);
   }
 
@@ -1114,12 +1150,9 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
 
   public applyTo(
     elements: SceneElementsMap,
-    elementsSnapshot: Map<
+    elementsSnapshot: Map<string, OrderedExcalidrawElement>,
-      string,
-      OrderedExcalidrawElement
-    > = StoreSnapshot.empty().elements,
   ): [SceneElementsMap, boolean] {
-    let nextElements = toBrandedType<SceneElementsMap>(new Map(elements));
+    let nextElements = new Map(elements) as SceneElementsMap;
     let changedElements: Map<string, OrderedExcalidrawElement>;
 
     const flags = {
@@ -1254,9 +1287,8 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
           ) {
             flags.containsVisibleDifference = true;
           }
-        } else if (type === "added") {
+        } else {
-          // for additions the element does not have to exist (i.e. remote update)
+          // not in elements, not in snapshot? element might have been added remotely!
-          // CFDO II: the version itself might be different!
           element = newElementWith(
             { id, version: 1 } as OrderedExcalidrawElement,
             {
@@ -1299,8 +1331,8 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
       });
     }
 
-    // CFDO: this looks wrong
+    // TODO: this looks wrong, shouldn't be here
-    if (isImageElement(element)) {
+    if (element.type === "image") {
       const _delta = delta as Delta<ElementPartial<ExcalidrawImageElement>>;
       // we want to override `crop` only if modified so that we don't reset
       // when undoing/redoing unrelated change
@@ -1313,7 +1345,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
     }
 
     if (!flags.containsVisibleDifference) {
-      // strip away fractional as even if it would be different, it doesn't have to result in visible change
+      // strip away fractional index, as even if it would be different, it doesn't have to result in visible change
       const { index, ...rest } = directlyApplicablePartial;
       const containsVisibleDifference = ElementsDelta.checkForVisibleDifference(
         element,
@@ -1361,7 +1393,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
    * Resolves conflicts for all previously added, removed and updated elements.
    * Updates the previous deltas with all the changes after conflict resolution.
    *
-   * // CFDO: revisit since arrow seem often redrawn incorrectly
+   * // TODO: revisit since some bound arrows seem to be often redrawn incorrectly
    *
    * @returns all elements affected by the conflict resolution
    */
@@ -1393,7 +1425,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
           nextElement,
           nextElements,
           updates as ElementUpdate<OrderedExcalidrawElement>,
-        ) as OrderedExcalidrawElement;
+        );
       }
 
       nextAffectedElements.set(affectedElement.id, affectedElement);

packages/element/src/dragElements.ts

@@ -26,7 +26,7 @@ import {
   isTextElement,
 } from "./typeChecks";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { Bounds } from "./bounds";
 import type { ExcalidrawElement } from "./types";

packages/element/src/embeddable.ts

@@ -33,6 +33,8 @@ const RE_GH_GIST = /^https:\/\/gist\.github\.com\/([\w_-]+)\/([\w_-]+)/;
 const RE_GH_GIST_EMBED =
   /^<script[\s\S]*?\ssrc=["'](https:\/\/gist\.github\.com\/.*?)\.js["']/i;
 
+const RE_MSFORMS = /^(?:https?:\/\/)?forms\.microsoft\.com\//;
+
 // not anchored to start to allow <blockquote> twitter embeds
 const RE_TWITTER =
   /(?:https?:\/\/)?(?:(?:w){3}\.)?(?:twitter|x)\.com\/[^/]+\/status\/(\d+)/;
@@ -69,6 +71,7 @@ const ALLOWED_DOMAINS = new Set([
   "val.town",
   "giphy.com",
   "reddit.com",
+  "forms.microsoft.com",
 ]);
 
 const ALLOW_SAME_ORIGIN = new Set([
@@ -82,6 +85,7 @@ const ALLOW_SAME_ORIGIN = new Set([
   "*.simplepdf.eu",
   "stackblitz.com",
   "reddit.com",
+  "forms.microsoft.com",
 ]);
 
 export const createSrcDoc = (body: string) => {
@@ -206,6 +210,10 @@ export const getEmbedLink = (
     };
   }
 
+  if (RE_MSFORMS.test(link) && !link.includes("embed=true")) {
+    link += link.includes("?") ? "&embed=true" : "?embed=true";
+  }
+
   if (RE_TWITTER.test(link)) {
     const postId = link.match(RE_TWITTER)![1];
     // the embed srcdoc still supports twitter.com domain only.

packages/element/src/flowchart.ts

@@ -39,7 +39,7 @@ import {
   type OrderedExcalidrawElement,
 } from "./types";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 type LinkDirection = "up" | "right" | "down" | "left";
 
@@ -462,12 +462,18 @@ const createBindingArrow = (
     bindingArrow as OrderedExcalidrawElement,
   );
 
-  LinearElementEditor.movePoints(bindingArrow, scene, [
+  LinearElementEditor.movePoints(
-    {
+    bindingArrow,
-      index: 1,
+    scene,
-      point: bindingArrow.points[1],
+    new Map([
-    },
+      [
-  ]);
+        1,
+        {
+          point: bindingArrow.points[1],
+        },
+      ],
+    ]),
+  );
 
   const update = updateElbowArrowPoints(
     bindingArrow,

packages/element/src/frame.ts

@@ -905,13 +905,16 @@ export const shouldApplyFrameClip = (
   return false;
 };
 
-export const getFrameLikeTitle = (element: ExcalidrawFrameLikeElement) => {
+const DEFAULT_FRAME_NAME = "Frame";
+const DEFAULT_AI_FRAME_NAME = "AI Frame";
+
+export const getDefaultFrameName = (element: ExcalidrawFrameLikeElement) => {
   // TODO name frames "AI" only if specific to AI frames
-  return element.name === null
+  return isFrameElement(element) ? DEFAULT_FRAME_NAME : DEFAULT_AI_FRAME_NAME;
-    ? isFrameElement(element)
+};
-      ? "Frame"
+
-      : "AI Frame"
+export const getFrameLikeTitle = (element: ExcalidrawFrameLikeElement) => {
-    : element.name;
+  return element.name === null ? getDefaultFrameName(element) : element.name;
 };
 
 export const getElementsOverlappingFrame = (

packages/element/src/index.ts

@@ -1,3 +1,5 @@
+import { toIterable } from "@excalidraw/common";
+
 import { isInvisiblySmallElement } from "./sizeHelpers";
 import { isLinearElementType } from "./typeChecks";
 
@@ -5,6 +7,7 @@ import type {
   ExcalidrawElement,
   NonDeletedExcalidrawElement,
   NonDeleted,
+  ElementsMapOrArray,
 } from "./types";
 
 /**
@@ -16,12 +19,10 @@ export const getSceneVersion = (elements: readonly ExcalidrawElement[]) =>
 /**
  * Hashes elements' versionNonce (using djb2 algo). Order of elements matters.
  */
-export const hashElementsVersion = (
+export const hashElementsVersion = (elements: ElementsMapOrArray): number => {
-  elements: readonly ExcalidrawElement[],
-): number => {
   let hash = 5381;
-  for (let i = 0; i < elements.length; i++) {
+  for (const element of toIterable(elements)) {
-    hash = (hash << 5) + hash + elements[i].versionNonce;
+    hash = (hash << 5) + hash + element.versionNonce;
   }
   return hash >>> 0; // Ensure unsigned 32-bit integer
 };
@@ -71,3 +72,47 @@ export const clearElementsForExport = (
 export const clearElementsForLocalStorage = (
   elements: readonly ExcalidrawElement[],
 ) => _clearElements(elements);
+
+export * from "./align";
+export * from "./binding";
+export * from "./bounds";
+export * from "./collision";
+export * from "./comparisons";
+export * from "./containerCache";
+export * from "./cropElement";
+export * from "./delta";
+export * from "./distance";
+export * from "./distribute";
+export * from "./dragElements";
+export * from "./duplicate";
+export * from "./elbowArrow";
+export * from "./elementLink";
+export * from "./embeddable";
+export * from "./flowchart";
+export * from "./fractionalIndex";
+export * from "./frame";
+export * from "./groups";
+export * from "./heading";
+export * from "./image";
+export * from "./linearElementEditor";
+export * from "./mutateElement";
+export * from "./newElement";
+export * from "./renderElement";
+export * from "./resizeElements";
+export * from "./resizeTest";
+export * from "./Scene";
+export * from "./selection";
+export * from "./Shape";
+export * from "./ShapeCache";
+export * from "./shapes";
+export * from "./showSelectedShapeActions";
+export * from "./sizeHelpers";
+export * from "./sortElements";
+export * from "./store";
+export * from "./textElement";
+export * from "./textMeasurements";
+export * from "./textWrapping";
+export * from "./transformHandles";
+export * from "./typeChecks";
+export * from "./utils";
+export * from "./zindex";

packages/element/src/linearElementEditor.ts

@@ -20,7 +20,7 @@ import {
   tupleToCoors,
 } from "@excalidraw/common";
 
-import type { Store } from "@excalidraw/excalidraw/store";
+import type { Store } from "@excalidraw/element";
 
 import type { Radians } from "@excalidraw/math";
 
@@ -67,7 +67,7 @@ import {
 
 import { getLockedLinearCursorAlignSize } from "./sizeHelpers";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { Bounds } from "./bounds";
 import type {
@@ -82,13 +82,9 @@ import type {
   FixedPointBinding,
   FixedSegment,
   ExcalidrawElbowArrowElement,
+  PointsPositionUpdates,
 } from "./types";
 
-const editorMidPointsCache: {
-  version: number | null;
-  points: (GlobalPoint | null)[];
-  zoom: number | null;
-} = { version: null, points: [], zoom: null };
 export class LinearElementEditor {
   public readonly elementId: ExcalidrawElement["id"] & {
     _brand: "excalidrawLinearElementId";
@@ -306,16 +302,22 @@ export class LinearElementEditor {
           event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
         );
 
-        LinearElementEditor.movePoints(element, scene, [
+        LinearElementEditor.movePoints(
-          {
+          element,
-            index: selectedIndex,
+          scene,
-            point: pointFrom(
+          new Map([
-              width + referencePoint[0],
+            [
-              height + referencePoint[1],
+              selectedIndex,
-            ),
+              {
-            isDragging: selectedIndex === lastClickedPoint,
+                point: pointFrom(
-          },
+                  width + referencePoint[0],
-        ]);
+                  height + referencePoint[1],
+                ),
+                isDragging: selectedIndex === lastClickedPoint,
+              },
+            ],
+          ]),
+        );
       } else {
         const newDraggingPointPosition = LinearElementEditor.createPointAt(
           element,
@@ -331,26 +333,32 @@ export class LinearElementEditor {
         LinearElementEditor.movePoints(
           element,
           scene,
-          selectedPointsIndices.map((pointIndex) => {
+          new Map(
-            const newPointPosition: LocalPoint =
+            selectedPointsIndices.map((pointIndex) => {
-              pointIndex === lastClickedPoint
+              const newPointPosition: LocalPoint =
-                ? LinearElementEditor.createPointAt(
+                pointIndex === lastClickedPoint
-                    element,
+                  ? LinearElementEditor.createPointAt(
-                    elementsMap,
+                      element,
-                    scenePointerX - linearElementEditor.pointerOffset.x,
+                      elementsMap,
-                    scenePointerY - linearElementEditor.pointerOffset.y,
+                      scenePointerX - linearElementEditor.pointerOffset.x,
-                    event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
+                      scenePointerY - linearElementEditor.pointerOffset.y,
-                  )
+                      event[KEYS.CTRL_OR_CMD]
-                : pointFrom(
+                        ? null
-                    element.points[pointIndex][0] + deltaX,
+                        : app.getEffectiveGridSize(),
-                    element.points[pointIndex][1] + deltaY,
+                    )
-                  );
+                  : pointFrom(
-            return {
+                      element.points[pointIndex][0] + deltaX,
-              index: pointIndex,
+                      element.points[pointIndex][1] + deltaY,
-              point: newPointPosition,
+                    );
-              isDragging: pointIndex === lastClickedPoint,
+              return [
-            };
+                pointIndex,
-          }),
+                {
+                  point: newPointPosition,
+                  isDragging: pointIndex === lastClickedPoint,
+                },
+              ];
+            }),
+          ),
         );
       }
 
@@ -451,15 +459,21 @@ export class LinearElementEditor {
           selectedPoint === element.points.length - 1
         ) {
           if (isPathALoop(element.points, appState.zoom.value)) {
-            LinearElementEditor.movePoints(element, scene, [
+            LinearElementEditor.movePoints(
-              {
+              element,
-                index: selectedPoint,
+              scene,
-                point:
+              new Map([
-                  selectedPoint === 0
+                [
-                    ? element.points[element.points.length - 1]
+                  selectedPoint,
-                    : element.points[0],
+                  {
-              },
+                    point:
-            ]);
+                      selectedPoint === 0
+                        ? element.points[element.points.length - 1]
+                        : element.points[0],
+                  },
+                ],
+              ]),
+            );
           }
 
           const bindingElement = isBindingEnabled(appState)
@@ -517,7 +531,7 @@ export class LinearElementEditor {
     element: NonDeleted<ExcalidrawLinearElement>,
     elementsMap: ElementsMap,
     appState: InteractiveCanvasAppState,
-  ): typeof editorMidPointsCache["points"] => {
+  ): (GlobalPoint | null)[] => {
     const boundText = getBoundTextElement(element, elementsMap);
 
     // Since its not needed outside editor unless 2 pointer lines or bound text
@@ -529,25 +543,7 @@ export class LinearElementEditor {
     ) {
       return [];
     }
-    if (
-      editorMidPointsCache.version === element.version &&
-      editorMidPointsCache.zoom === appState.zoom.value
-    ) {
-      return editorMidPointsCache.points;
-    }
-    LinearElementEditor.updateEditorMidPointsCache(
-      element,
-      elementsMap,
-      appState,
-    );
-    return editorMidPointsCache.points!;
-  };
 
-  static updateEditorMidPointsCache = (
-    element: NonDeleted<ExcalidrawLinearElement>,
-    elementsMap: ElementsMap,
-    appState: InteractiveCanvasAppState,
-  ) => {
     const points = LinearElementEditor.getPointsGlobalCoordinates(
       element,
       elementsMap,
@@ -579,9 +575,8 @@ export class LinearElementEditor {
       midpoints.push(segmentMidPoint);
       index++;
     }
-    editorMidPointsCache.points = midpoints;
+
-    editorMidPointsCache.version = element.version;
+    return midpoints;
-    editorMidPointsCache.zoom = appState.zoom.value;
   };
 
   static getSegmentMidpointHitCoords = (
@@ -635,8 +630,11 @@ export class LinearElementEditor {
       }
     }
     let index = 0;
-    const midPoints: typeof editorMidPointsCache["points"] =
+    const midPoints = LinearElementEditor.getEditorMidPoints(
-      LinearElementEditor.getEditorMidPoints(element, elementsMap, appState);
+      element,
+      elementsMap,
+      appState,
+    );
 
     while (index < midPoints.length) {
       if (midPoints[index] !== null) {
@@ -988,12 +986,18 @@ export class LinearElementEditor {
     }
 
     if (lastPoint === lastUncommittedPoint) {
-      LinearElementEditor.movePoints(element, app.scene, [
+      LinearElementEditor.movePoints(
-        {
+        element,
-          index: element.points.length - 1,
+        app.scene,
-          point: newPoint,
+        new Map([
-        },
+          [
-      ]);
+            element.points.length - 1,
+            {
+              point: newPoint,
+            },
+          ],
+        ]),
+      );
     } else {
       LinearElementEditor.addPoints(element, app.scene, [{ point: newPoint }]);
     }
@@ -1227,12 +1231,16 @@ export class LinearElementEditor {
     // potentially expanding the bounding box
     if (pointAddedToEnd) {
       const lastPoint = element.points[element.points.length - 1];
-      LinearElementEditor.movePoints(element, scene, [
+      LinearElementEditor.movePoints(
-        {
+        element,
-          index: element.points.length - 1,
+        scene,
-          point: pointFrom(lastPoint[0] + 30, lastPoint[1] + 30),
+        new Map([
-        },
+          [
-      ]);
+            element.points.length - 1,
+            { point: pointFrom(lastPoint[0] + 30, lastPoint[1] + 30) },
+          ],
+        ]),
+      );
     }
 
     return {
@@ -1307,7 +1315,7 @@ export class LinearElementEditor {
   static movePoints(
     element: NonDeleted<ExcalidrawLinearElement>,
     scene: Scene,
-    targetPoints: { index: number; point: LocalPoint; isDragging?: boolean }[],
+    pointUpdates: PointsPositionUpdates,
     otherUpdates?: {
       startBinding?: PointBinding | null;
       endBinding?: PointBinding | null;
@@ -1321,8 +1329,7 @@ export class LinearElementEditor {
     // offset it. We do the same with actual element.x/y position, so
     // this hacks are completely transparent to the user.
     const [deltaX, deltaY] =
-      targetPoints.find(({ index }) => index === 0)?.point ??
+      pointUpdates.get(0)?.point ?? pointFrom<LocalPoint>(0, 0);
-      pointFrom<LocalPoint>(0, 0);
     const [offsetX, offsetY] = pointFrom<LocalPoint>(
       deltaX - points[0][0],
       deltaY - points[0][1],
@@ -1330,12 +1337,12 @@ export class LinearElementEditor {
 
     const nextPoints = isElbowArrow(element)
       ? [
-          targetPoints.find((t) => t.index === 0)?.point ?? points[0],
+          pointUpdates.get(0)?.point ?? points[0],
-          targetPoints.find((t) => t.index === points.length - 1)?.point ??
+          pointUpdates.get(points.length - 1)?.point ??
             points[points.length - 1],
         ]
       : points.map((p, idx) => {
-          const current = targetPoints.find((t) => t.index === idx)?.point ?? p;
+          const current = pointUpdates.get(idx)?.point ?? p;
 
           return pointFrom<LocalPoint>(
             current[0] - offsetX,
@@ -1351,11 +1358,7 @@ export class LinearElementEditor {
       offsetY,
       otherUpdates,
       {
-        isDragging: targetPoints.reduce(
+        isDragging: Array.from(pointUpdates.values()).some((t) => t.isDragging),
-          (dragging, targetPoint): boolean =>
-            dragging || targetPoint.isDragging === true,
-          false,
-        ),
       },
     );
   }
@@ -1587,23 +1590,14 @@ export class LinearElementEditor {
       y = midPoint[1] - boundTextElement.height / 2;
     } else {
       const index = element.points.length / 2 - 1;
+      const midSegmentMidpoint = LinearElementEditor.getSegmentMidPoint(
+        element,
+        points[index],
+        points[index + 1],
+        index + 1,
+        elementsMap,
+      );
 
-      let midSegmentMidpoint = editorMidPointsCache.points[index];
-      if (element.points.length === 2) {
-        midSegmentMidpoint = pointCenter(points[0], points[1]);
-      }
-      if (
-        !midSegmentMidpoint ||
-        editorMidPointsCache.version !== element.version
-      ) {
-        midSegmentMidpoint = LinearElementEditor.getSegmentMidPoint(
-          element,
-          points[index],
-          points[index + 1],
-          index + 1,
-          elementsMap,
-        );
-      }
       x = midSegmentMidpoint[0] - boundTextElement.width / 2;
       y = midSegmentMidpoint[1] - boundTextElement.height / 2;
     }

packages/element/src/newElement.ts

@@ -44,7 +44,6 @@ import type {
   ExcalidrawIframeElement,
   ElementsMap,
   ExcalidrawArrowElement,
-  FixedSegment,
   ExcalidrawElbowArrowElement,
 } from "./types";
 
@@ -478,7 +477,7 @@ export const newArrowElement = <T extends boolean>(
     endArrowhead?: Arrowhead | null;
     points?: ExcalidrawArrowElement["points"];
     elbowed?: T;
-    fixedSegments?: FixedSegment[] | null;
+    fixedSegments?: ExcalidrawElbowArrowElement["fixedSegments"] | null;
   } & ElementConstructorOpts,
 ): T extends true
   ? NonDeleted<ExcalidrawElbowArrowElement>

packages/element/src/renderElement.ts

@@ -351,12 +351,20 @@ const generateElementCanvas = (
 
 export const DEFAULT_LINK_SIZE = 14;
 
-const IMAGE_PLACEHOLDER_IMG = document.createElement("img");
+const IMAGE_PLACEHOLDER_IMG =
+  typeof document !== "undefined"
+    ? document.createElement("img")
+    : ({ src: "" } as HTMLImageElement); // mock image element outside of browser
+
 IMAGE_PLACEHOLDER_IMG.src = `data:${MIME_TYPES.svg},${encodeURIComponent(
   `<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="image" class="svg-inline--fa fa-image fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="#888" d="M464 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h416c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48zM112 120c-30.928 0-56 25.072-56 56s25.072 56 56 56 56-25.072 56-56-25.072-56-56-56zM64 384h384V272l-87.515-87.515c-4.686-4.686-12.284-4.686-16.971 0L208 320l-55.515-55.515c-4.686-4.686-12.284-4.686-16.971 0L64 336v48z"></path></svg>`,
 )}`;
 
-const IMAGE_ERROR_PLACEHOLDER_IMG = document.createElement("img");
+const IMAGE_ERROR_PLACEHOLDER_IMG =
+  typeof document !== "undefined"
+    ? document.createElement("img")
+    : ({ src: "" } as HTMLImageElement); // mock image element outside of browser
+
 IMAGE_ERROR_PLACEHOLDER_IMG.src = `data:${MIME_TYPES.svg},${encodeURIComponent(
   `<svg viewBox="0 0 668 668" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2"><path d="M464 448H48c-26.51 0-48-21.49-48-48V112c0-26.51 21.49-48 48-48h416c26.51 0 48 21.49 48 48v288c0 26.51-21.49 48-48 48ZM112 120c-30.928 0-56 25.072-56 56s25.072 56 56 56 56-25.072 56-56-25.072-56-56-56ZM64 384h384V272l-87.515-87.515c-4.686-4.686-12.284-4.686-16.971 0L208 320l-55.515-55.515c-4.686-4.686-12.284-4.686-16.971 0L64 336v48Z" style="fill:#888;fill-rule:nonzero" transform="matrix(.81709 0 0 .81709 124.825 145.825)"/><path d="M256 8C119.034 8 8 119.033 8 256c0 136.967 111.034 248 248 248s248-111.034 248-248S392.967 8 256 8Zm130.108 117.892c65.448 65.448 70 165.481 20.677 235.637L150.47 105.216c70.204-49.356 170.226-44.735 235.638 20.676ZM125.892 386.108c-65.448-65.448-70-165.481-20.677-235.637L361.53 406.784c-70.203 49.356-170.226 44.736-235.638-20.676Z" style="fill:#888;fill-rule:nonzero" transform="matrix(.30366 0 0 .30366 506.822 60.065)"/></svg>`,
 )}`;

packages/element/src/resizeElements.ts

@@ -57,7 +57,7 @@ import {
 
 import { isInGroup } from "./groups";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { BoundingBox } from "./bounds";
 import type {
@@ -962,11 +962,6 @@ export const resizeSingleElement = (
       isDragging: false,
     });
 
-    updateBoundElements(latestElement, scene, {
-      // TODO: confirm with MARK if this actually makes sense
-      newSize: { width: nextWidth, height: nextHeight },
-    });
-
     if (boundTextElement && boundTextFont != null) {
       scene.mutateElement(boundTextElement, {
         fontSize: boundTextFont.fontSize,
@@ -978,6 +973,11 @@ export const resizeSingleElement = (
       handleDirection,
       shouldMaintainAspectRatio,
     );
+
+    updateBoundElements(latestElement, scene, {
+      // TODO: confirm with MARK if this actually makes sense
+      newSize: { width: nextWidth, height: nextHeight },
+    });
   }
 };
 

packages/element/src/selection.ts

@@ -169,25 +169,6 @@ export const isSomeElementSelected = (function () {
   return ret;
 })();
 
-/**
- * Returns common attribute (picked by `getAttribute` callback) of selected
- *  elements. If elements don't share the same value, returns `null`.
- */
-export const getCommonAttributeOfSelectedElements = <T>(
-  elements: readonly NonDeletedExcalidrawElement[],
-  appState: Pick<AppState, "selectedElementIds">,
-  getAttribute: (element: ExcalidrawElement) => T,
-): T | null => {
-  const attributes = Array.from(
-    new Set(
-      getSelectedElements(elements, appState).map((element) =>
-        getAttribute(element),
-      ),
-    ),
-  );
-  return attributes.length === 1 ? attributes[0] : null;
-};
-
 export const getSelectedElements = (
   elements: ElementsMapOrArray,
   appState: Pick<InteractiveCanvasAppState, "selectedElementIds">,

packages/element/src/store.ts

@@ -0,0 +1,972 @@
+import {
+  assertNever,
+  COLOR_PALETTE,
+  isDevEnv,
+  isTestEnv,
+  randomId,
+  Emitter,
+  toIterable,
+} from "@excalidraw/common";
+
+import type App from "@excalidraw/excalidraw/components/App";
+
+import type { DTO, ValueOf } from "@excalidraw/common/utility-types";
+
+import type { AppState, ObservedAppState } from "@excalidraw/excalidraw/types";
+
+import { deepCopyElement } from "./duplicate";
+import { newElementWith } from "./mutateElement";
+
+import { ElementsDelta, AppStateDelta, Delta } from "./delta";
+
+import { hashElementsVersion, hashString } from "./index";
+
+import type { OrderedExcalidrawElement, SceneElementsMap } from "./types";
+
+export const CaptureUpdateAction = {
+  /**
+   * Immediately undoable.
+   *
+   * Use for updates which should be captured.
+   * Should be used for most of the local updates, except ephemerals such as dragging or resizing.
+   *
+   * These updates will _immediately_ make it to the local undo / redo stacks.
+   */
+  IMMEDIATELY: "IMMEDIATELY",
+  /**
+   * Never undoable.
+   *
+   * Use for updates which should never be recorded, such as remote updates
+   * or scene initialization.
+   *
+   * These updates will _never_ make it to the local undo / redo stacks.
+   */
+  NEVER: "NEVER",
+  /**
+   * Eventually undoable.
+   *
+   * Use for updates which should not be captured immediately - likely
+   * exceptions which are part of some async multi-step process. Otherwise, all
+   * such updates would end up being captured with the next
+   * `CaptureUpdateAction.IMMEDIATELY` - triggered either by the next `updateScene`
+   * or internally by the editor.
+   *
+   * These updates will _eventually_ make it to the local undo / redo stacks.
+   */
+  EVENTUALLY: "EVENTUALLY",
+} as const;
+
+export type CaptureUpdateActionType = ValueOf<typeof CaptureUpdateAction>;
+
+type MicroActionsQueue = (() => void)[];
+
+/**
+ * Store which captures the observed changes and emits them as `StoreIncrement` events.
+ */
+export class Store {
+  // internally used by history
+  public readonly onDurableIncrementEmitter = new Emitter<[DurableIncrement]>();
+  public readonly onStoreIncrementEmitter = new Emitter<
+    [DurableIncrement | EphemeralIncrement]
+  >();
+
+  private scheduledMacroActions: Set<CaptureUpdateActionType> = new Set();
+  private scheduledMicroActions: MicroActionsQueue = [];
+
+  private _snapshot = StoreSnapshot.empty();
+
+  public get snapshot() {
+    return this._snapshot;
+  }
+
+  public set snapshot(snapshot: StoreSnapshot) {
+    this._snapshot = snapshot;
+  }
+
+  constructor(private readonly app: App) {}
+
+  public scheduleAction(action: CaptureUpdateActionType) {
+    this.scheduledMacroActions.add(action);
+    this.satisfiesScheduledActionsInvariant();
+  }
+
+  /**
+   * Use to schedule a delta calculation, which will consquentially be emitted as `DurableStoreIncrement` and pushed in the undo stack.
+   */
+  // TODO: Suspicious that this is called so many places. Seems error-prone.
+  public scheduleCapture() {
+    this.scheduleAction(CaptureUpdateAction.IMMEDIATELY);
+  }
+
+  /**
+   * Schedule special "micro" actions, to-be executed before the next commit, before it executes a scheduled "macro" action.
+   */
+  public scheduleMicroAction(
+    params:
+      | {
+          action: CaptureUpdateActionType;
+          elements: SceneElementsMap | undefined;
+          appState: AppState | ObservedAppState | undefined;
+        }
+      | {
+          action: typeof CaptureUpdateAction.IMMEDIATELY;
+          change: StoreChange;
+          delta: StoreDelta;
+        }
+      | {
+          action:
+            | typeof CaptureUpdateAction.NEVER
+            | typeof CaptureUpdateAction.EVENTUALLY;
+          change: StoreChange;
+        },
+  ) {
+    const { action } = params;
+
+    let change: StoreChange;
+
+    if ("change" in params) {
+      change = params.change;
+    } else {
+      // immediately create an immutable change of the scheduled updates,
+      // compared to the current state, so that they won't mutate later on during batching
+      const currentSnapshot = StoreSnapshot.create(
+        this.app.scene.getElementsMapIncludingDeleted(),
+        this.app.state,
+      );
+      const scheduledSnapshot = currentSnapshot.maybeClone(
+        action,
+        params.elements,
+        params.appState,
+      );
+
+      change = StoreChange.create(currentSnapshot, scheduledSnapshot);
+    }
+
+    const delta = "delta" in params ? params.delta : undefined;
+
+    this.scheduledMicroActions.push(() =>
+      this.processAction({
+        action,
+        change,
+        delta,
+      }),
+    );
+  }
+
+  /**
+   * Performs the incoming `CaptureUpdateAction` and emits the corresponding `StoreIncrement`.
+   * Emits `DurableStoreIncrement` when action is "capture", emits `EphemeralStoreIncrement` otherwise.
+   *
+   * @emits StoreIncrement
+   */
+  public commit(
+    elements: SceneElementsMap | undefined,
+    appState: AppState | ObservedAppState | undefined,
+  ): void {
+    // execute all scheduled micro actions first
+    // similar to microTasks, there can be many
+    this.flushMicroActions();
+
+    try {
+      // execute a single scheduled "macro" function
+      // similar to macro tasks, there can be only one within a single commit (loop)
+      const action = this.getScheduledMacroAction();
+      this.processAction({ action, elements, appState });
+    } finally {
+      this.satisfiesScheduledActionsInvariant();
+      // defensively reset all scheduled "macro" actions, possibly cleans up other runtime garbage
+      this.scheduledMacroActions = new Set();
+    }
+  }
+
+  /**
+   * Clears the store instance.
+   */
+  public clear(): void {
+    this.snapshot = StoreSnapshot.empty();
+    this.scheduledMacroActions = new Set();
+  }
+
+  /**
+   * Performs delta & change calculation and emits a durable increment.
+   *
+   * @emits StoreIncrement.
+   */
+  private emitDurableIncrement(
+    snapshot: StoreSnapshot,
+    change: StoreChange | undefined = undefined,
+    delta: StoreDelta | undefined = undefined,
+  ) {
+    const prevSnapshot = this.snapshot;
+
+    let storeChange: StoreChange;
+    let storeDelta: StoreDelta;
+
+    if (change) {
+      storeChange = change;
+    } else {
+      storeChange = StoreChange.create(prevSnapshot, snapshot);
+    }
+
+    if (delta) {
+      // we might have the delta already (i.e. when applying history entry), thus we don't need to calculate it again
+      // using the same instance, since in history we have a check against `HistoryEntry`, so that we don't re-record the same delta again
+      storeDelta = delta;
+    } else {
+      // calculate the deltas based on the previous and next snapshot
+      const elementsDelta = snapshot.metadata.didElementsChange
+        ? ElementsDelta.calculate(prevSnapshot.elements, snapshot.elements)
+        : ElementsDelta.empty();
+
+      const appStateDelta = snapshot.metadata.didAppStateChange
+        ? AppStateDelta.calculate(prevSnapshot.appState, snapshot.appState)
+        : AppStateDelta.empty();
+
+      storeDelta = StoreDelta.create(elementsDelta, appStateDelta);
+    }
+
+    if (!storeDelta.isEmpty()) {
+      const increment = new DurableIncrement(storeChange, storeDelta);
+
+      // Notify listeners with the increment
+      this.onDurableIncrementEmitter.trigger(increment);
+      this.onStoreIncrementEmitter.trigger(increment);
+    }
+  }
+
+  /**
+   * Performs change calculation and emits an ephemeral increment.
+   *
+   * @emits EphemeralStoreIncrement
+   */
+  private emitEphemeralIncrement(
+    snapshot: StoreSnapshot,
+    change: StoreChange | undefined = undefined,
+  ) {
+    let storeChange: StoreChange;
+
+    if (change) {
+      storeChange = change;
+    } else {
+      const prevSnapshot = this.snapshot;
+      storeChange = StoreChange.create(prevSnapshot, snapshot);
+    }
+
+    const increment = new EphemeralIncrement(storeChange);
+
+    // Notify listeners with the increment
+    this.onStoreIncrementEmitter.trigger(increment);
+  }
+
+  private applyChangeToSnapshot(change: StoreChange) {
+    const prevSnapshot = this.snapshot;
+    const nextSnapshot = this.snapshot.applyChange(change);
+
+    if (prevSnapshot === nextSnapshot) {
+      return null;
+    }
+
+    return nextSnapshot;
+  }
+
+  /**
+   * Clones the snapshot if there are changes detected.
+   */
+  private maybeCloneSnapshot(
+    action: CaptureUpdateActionType,
+    elements: SceneElementsMap | undefined,
+    appState: AppState | ObservedAppState | undefined,
+  ) {
+    if (!elements && !appState) {
+      return null;
+    }
+
+    const prevSnapshot = this.snapshot;
+    const nextSnapshot = this.snapshot.maybeClone(action, elements, appState);
+
+    if (prevSnapshot === nextSnapshot) {
+      return null;
+    }
+
+    return nextSnapshot;
+  }
+
+  private flushMicroActions() {
+    for (const microAction of this.scheduledMicroActions) {
+      try {
+        microAction();
+      } catch (error) {
+        console.error(`Failed to execute scheduled micro action`, error);
+      }
+    }
+
+    this.scheduledMicroActions = [];
+  }
+
+  private processAction(
+    params:
+      | {
+          action: CaptureUpdateActionType;
+          elements: SceneElementsMap | undefined;
+          appState: AppState | ObservedAppState | undefined;
+        }
+      | {
+          action: CaptureUpdateActionType;
+          change: StoreChange;
+          delta: StoreDelta | undefined;
+        },
+  ) {
+    const { action } = params;
+
+    // perf. optimisation, since "EVENTUALLY" does not update the snapshot,
+    // so if nobody is listening for increments, we don't need to even clone the snapshot
+    // as it's only needed for `StoreChange` computation inside `EphemeralIncrement`
+    if (
+      action === CaptureUpdateAction.EVENTUALLY &&
+      !this.onStoreIncrementEmitter.subscribers.length
+    ) {
+      return;
+    }
+
+    let nextSnapshot: StoreSnapshot | null;
+
+    if ("change" in params) {
+      nextSnapshot = this.applyChangeToSnapshot(params.change);
+    } else {
+      nextSnapshot = this.maybeCloneSnapshot(
+        action,
+        params.elements,
+        params.appState,
+      );
+    }
+
+    if (!nextSnapshot) {
+      // don't continue if there is not change detected
+      return;
+    }
+
+    const change = "change" in params ? params.change : undefined;
+    const delta = "delta" in params ? params.delta : undefined;
+
+    try {
+      switch (action) {
+        // only immediately emits a durable increment
+        case CaptureUpdateAction.IMMEDIATELY:
+          this.emitDurableIncrement(nextSnapshot, change, delta);
+          break;
+        // both never and eventually emit an ephemeral increment
+        case CaptureUpdateAction.NEVER:
+        case CaptureUpdateAction.EVENTUALLY:
+          this.emitEphemeralIncrement(nextSnapshot, change);
+          break;
+        default:
+          assertNever(action, `Unknown store action`);
+      }
+    } finally {
+      // update the snapshot no-matter what, as it would mess up with the next action
+      switch (action) {
+        // both immediately and never update the snapshot, unlike eventually
+        case CaptureUpdateAction.IMMEDIATELY:
+        case CaptureUpdateAction.NEVER:
+          this.snapshot = nextSnapshot;
+          break;
+      }
+    }
+  }
+
+  /**
+   * Returns the scheduled macro action.
+   */
+  private getScheduledMacroAction() {
+    let scheduledAction: CaptureUpdateActionType;
+
+    if (this.scheduledMacroActions.has(CaptureUpdateAction.IMMEDIATELY)) {
+      // Capture has a precedence over update, since it also performs snapshot update
+      scheduledAction = CaptureUpdateAction.IMMEDIATELY;
+    } else if (this.scheduledMacroActions.has(CaptureUpdateAction.NEVER)) {
+      // Update has a precedence over none, since it also emits an (ephemeral) increment
+      scheduledAction = CaptureUpdateAction.NEVER;
+    } else {
+      // Default is to emit ephemeral increment and don't update the snapshot
+      scheduledAction = CaptureUpdateAction.EVENTUALLY;
+    }
+
+    return scheduledAction;
+  }
+
+  /**
+   * Ensures that the scheduled actions invariant is satisfied.
+   */
+  private satisfiesScheduledActionsInvariant() {
+    if (
+      !(
+        this.scheduledMacroActions.size >= 0 &&
+        this.scheduledMacroActions.size <=
+          Object.keys(CaptureUpdateAction).length
+      )
+    ) {
+      const message = `There can be at most three store actions scheduled at the same time, but there are "${this.scheduledMacroActions.size}".`;
+      console.error(message, this.scheduledMacroActions.values());
+
+      if (isTestEnv() || isDevEnv()) {
+        throw new Error(message);
+      }
+    }
+  }
+}
+
+/**
+ * Repsents a change to the store containing changed elements and appState.
+ */
+export class StoreChange {
+  // so figuring out what has changed should ideally be just quick reference checks
+  // TODO: we might need to have binary files here as well, in order to be drop-in replacement for `onChange`
+  private constructor(
+    public readonly elements: Record<string, OrderedExcalidrawElement>,
+    public readonly appState: Partial<ObservedAppState>,
+  ) {}
+
+  public static create(
+    prevSnapshot: StoreSnapshot,
+    nextSnapshot: StoreSnapshot,
+  ) {
+    const changedElements = nextSnapshot.getChangedElements(prevSnapshot);
+    const changedAppState = nextSnapshot.getChangedAppState(prevSnapshot);
+
+    return new StoreChange(changedElements, changedAppState);
+  }
+}
+
+/**
+ * Encpasulates any change to the store (durable or ephemeral).
+ */
+export abstract class StoreIncrement {
+  protected constructor(
+    public readonly type: "durable" | "ephemeral",
+    public readonly change: StoreChange,
+  ) {}
+
+  public static isDurable(
+    increment: StoreIncrement,
+  ): increment is DurableIncrement {
+    return increment.type === "durable";
+  }
+
+  public static isEphemeral(
+    increment: StoreIncrement,
+  ): increment is EphemeralIncrement {
+    return increment.type === "ephemeral";
+  }
+}
+
+/**
+ * Represents a durable change to the store.
+ */
+export class DurableIncrement extends StoreIncrement {
+  constructor(
+    public readonly change: StoreChange,
+    public readonly delta: StoreDelta,
+  ) {
+    super("durable", change);
+  }
+}
+
+/**
+ * Represents an ephemeral change to the store.
+ */
+export class EphemeralIncrement extends StoreIncrement {
+  constructor(public readonly change: StoreChange) {
+    super("ephemeral", change);
+  }
+}
+
+/**
+ * Represents a captured delta by the Store.
+ */
+export class StoreDelta {
+  protected constructor(
+    public readonly id: string,
+    public readonly elements: ElementsDelta,
+    public readonly appState: AppStateDelta,
+  ) {}
+
+  /**
+   * Create a new instance of `StoreDelta`.
+   */
+  public static create(
+    elements: ElementsDelta,
+    appState: AppStateDelta,
+    opts: {
+      id: string;
+    } = {
+      id: randomId(),
+    },
+  ) {
+    return new this(opts.id, elements, appState);
+  }
+
+  /**
+   * Restore a store delta instance from a DTO.
+   */
+  public static restore(storeDeltaDTO: DTO<StoreDelta>) {
+    const { id, elements, appState } = storeDeltaDTO;
+    return new this(
+      id,
+      ElementsDelta.restore(elements),
+      AppStateDelta.restore(appState),
+    );
+  }
+
+  /**
+   * Parse and load the delta from the remote payload.
+   */
+  public static load({
+    id,
+    elements: { added, removed, updated },
+  }: DTO<StoreDelta>) {
+    const elements = ElementsDelta.create(added, removed, updated, {
+      shouldRedistribute: false,
+    });
+
+    return new this(id, elements, AppStateDelta.empty());
+  }
+
+  /**
+   * Inverse store delta, creates new instance of `StoreDelta`.
+   */
+  public static inverse(delta: StoreDelta): StoreDelta {
+    return this.create(delta.elements.inverse(), delta.appState.inverse());
+  }
+
+  /**
+   * Apply latest (remote) changes to the delta, creates new instance of `StoreDelta`.
+   */
+  public static applyLatestChanges(
+    delta: StoreDelta,
+    elements: SceneElementsMap,
+    modifierOptions: "deleted" | "inserted",
+  ): StoreDelta {
+    return this.create(
+      delta.elements.applyLatestChanges(elements, modifierOptions),
+      delta.appState,
+      {
+        id: delta.id,
+      },
+    );
+  }
+
+  /**
+   * Apply the delta to the passed elements and appState, does not modify the snapshot.
+   */
+  public static applyTo(
+    delta: StoreDelta,
+    elements: SceneElementsMap,
+    appState: AppState,
+    prevSnapshot: StoreSnapshot = StoreSnapshot.empty(),
+  ): [SceneElementsMap, AppState, boolean] {
+    const [nextElements, elementsContainVisibleChange] = delta.elements.applyTo(
+      elements,
+      prevSnapshot.elements,
+    );
+
+    const [nextAppState, appStateContainsVisibleChange] =
+      delta.appState.applyTo(appState, nextElements);
+
+    const appliedVisibleChanges =
+      elementsContainVisibleChange || appStateContainsVisibleChange;
+
+    return [nextElements, nextAppState, appliedVisibleChanges];
+  }
+
+  public isEmpty() {
+    return this.elements.isEmpty() && this.appState.isEmpty();
+  }
+}
+
+/**
+ * Represents a snapshot of the captured or updated changes in the store,
+ * used for producing deltas and emitting `DurableStoreIncrement`s.
+ */
+export class StoreSnapshot {
+  private _lastChangedElementsHash: number = 0;
+  private _lastChangedAppStateHash: number = 0;
+
+  private constructor(
+    public readonly elements: SceneElementsMap,
+    public readonly appState: ObservedAppState,
+    public readonly metadata: {
+      didElementsChange: boolean;
+      didAppStateChange: boolean;
+      isEmpty?: boolean;
+    } = {
+      didElementsChange: false,
+      didAppStateChange: false,
+      isEmpty: false,
+    },
+  ) {}
+
+  public static create(
+    elements: SceneElementsMap,
+    appState: AppState | ObservedAppState,
+    metadata: {
+      didElementsChange: boolean;
+      didAppStateChange: boolean;
+    } = {
+      didElementsChange: false,
+      didAppStateChange: false,
+    },
+  ) {
+    return new StoreSnapshot(
+      elements,
+      isObservedAppState(appState) ? appState : getObservedAppState(appState),
+      metadata,
+    );
+  }
+
+  public static empty() {
+    return new StoreSnapshot(
+      new Map() as SceneElementsMap,
+      getDefaultObservedAppState(),
+      {
+        didElementsChange: false,
+        didAppStateChange: false,
+        isEmpty: true,
+      },
+    );
+  }
+
+  public getChangedElements(prevSnapshot: StoreSnapshot) {
+    const changedElements: Record<string, OrderedExcalidrawElement> = {};
+
+    for (const prevElement of toIterable(prevSnapshot.elements)) {
+      const nextElement = this.elements.get(prevElement.id);
+
+      if (!nextElement) {
+        changedElements[prevElement.id] = newElementWith(prevElement, {
+          isDeleted: true,
+        });
+      }
+    }
+
+    for (const nextElement of toIterable(this.elements)) {
+      // Due to the structural clone inside `maybeClone`, we can perform just these reference checks
+      if (prevSnapshot.elements.get(nextElement.id) !== nextElement) {
+        changedElements[nextElement.id] = nextElement;
+      }
+    }
+
+    return changedElements;
+  }
+
+  public getChangedAppState(
+    prevSnapshot: StoreSnapshot,
+  ): Partial<ObservedAppState> {
+    return Delta.getRightDifferences(
+      prevSnapshot.appState,
+      this.appState,
+    ).reduce(
+      (acc, key) =>
+        Object.assign(acc, {
+          [key]: this.appState[key as keyof ObservedAppState],
+        }),
+      {} as Partial<ObservedAppState>,
+    );
+  }
+
+  public isEmpty() {
+    return this.metadata.isEmpty;
+  }
+
+  /**
+   * Apply the change and return a new snapshot instance.
+   */
+  public applyChange(change: StoreChange): StoreSnapshot {
+    const nextElements = new Map(this.elements) as SceneElementsMap;
+
+    for (const [id, changedElement] of Object.entries(change.elements)) {
+      nextElements.set(id, changedElement);
+    }
+
+    const nextAppState = Object.assign(
+      {},
+      this.appState,
+      change.appState,
+    ) as ObservedAppState;
+
+    return StoreSnapshot.create(nextElements, nextAppState, {
+      // by default we assume that change is different from what we have in the snapshot
+      // so that we trigger the delta calculation and if it isn't different, delta will be empty
+      didElementsChange: Object.keys(change.elements).length > 0,
+      didAppStateChange: Object.keys(change.appState).length > 0,
+    });
+  }
+
+  /**
+   * Efficiently clone the existing snapshot, only if we detected changes.
+   *
+   * @returns same instance if there are no changes detected, new instance otherwise.
+   */
+  public maybeClone(
+    action: CaptureUpdateActionType,
+    elements: SceneElementsMap | undefined,
+    appState: AppState | ObservedAppState | undefined,
+  ) {
+    const options = {
+      shouldCompareHashes: false,
+    };
+
+    if (action === CaptureUpdateAction.EVENTUALLY) {
+      // actions that do not update the snapshot immediately, must be additionally checked for changes against the latest hash
+      // as we are always comparing against the latest snapshot, so they would emit elements or appState as changed on every component update
+      // instead of just the first time the elements or appState actually changed
+      options.shouldCompareHashes = true;
+    }
+
+    const nextElementsSnapshot = this.maybeCreateElementsSnapshot(
+      elements,
+      options,
+    );
+    const nextAppStateSnapshot = this.maybeCreateAppStateSnapshot(
+      appState,
+      options,
+    );
+
+    let didElementsChange = false;
+    let didAppStateChange = false;
+
+    if (this.elements !== nextElementsSnapshot) {
+      didElementsChange = true;
+    }
+
+    if (this.appState !== nextAppStateSnapshot) {
+      didAppStateChange = true;
+    }
+
+    if (!didElementsChange && !didAppStateChange) {
+      return this;
+    }
+
+    const snapshot = new StoreSnapshot(
+      nextElementsSnapshot,
+      nextAppStateSnapshot,
+      {
+        didElementsChange,
+        didAppStateChange,
+      },
+    );
+
+    return snapshot;
+  }
+
+  private maybeCreateAppStateSnapshot(
+    appState: AppState | ObservedAppState | undefined,
+    options: {
+      shouldCompareHashes: boolean;
+    } = {
+      shouldCompareHashes: false,
+    },
+  ): ObservedAppState {
+    if (!appState) {
+      return this.appState;
+    }
+
+    // Not watching over everything from the app state, just the relevant props
+    const nextAppStateSnapshot = !isObservedAppState(appState)
+      ? getObservedAppState(appState)
+      : appState;
+
+    const didAppStateChange = this.detectChangedAppState(
+      nextAppStateSnapshot,
+      options,
+    );
+
+    if (!didAppStateChange) {
+      return this.appState;
+    }
+
+    return nextAppStateSnapshot;
+  }
+
+  private maybeCreateElementsSnapshot(
+    elements: SceneElementsMap | undefined,
+    options: {
+      shouldCompareHashes: boolean;
+    } = {
+      shouldCompareHashes: false,
+    },
+  ): SceneElementsMap {
+    if (!elements) {
+      return this.elements;
+    }
+
+    const changedElements = this.detectChangedElements(elements, options);
+
+    if (!changedElements?.size) {
+      return this.elements;
+    }
+
+    const elementsSnapshot = this.createElementsSnapshot(changedElements);
+    return elementsSnapshot;
+  }
+
+  private detectChangedAppState(
+    nextObservedAppState: ObservedAppState,
+    options: {
+      shouldCompareHashes: boolean;
+    } = {
+      shouldCompareHashes: false,
+    },
+  ): boolean | undefined {
+    if (this.appState === nextObservedAppState) {
+      return;
+    }
+
+    const didAppStateChange = Delta.isRightDifferent(
+      this.appState,
+      nextObservedAppState,
+    );
+
+    if (!didAppStateChange) {
+      return;
+    }
+
+    const changedAppStateHash = hashString(
+      JSON.stringify(nextObservedAppState),
+    );
+
+    if (
+      options.shouldCompareHashes &&
+      this._lastChangedAppStateHash === changedAppStateHash
+    ) {
+      return;
+    }
+
+    this._lastChangedAppStateHash = changedAppStateHash;
+
+    return didAppStateChange;
+  }
+
+  /**
+   * Detect if there any changed elements.
+   */
+  private detectChangedElements(
+    nextElements: SceneElementsMap,
+    options: {
+      shouldCompareHashes: boolean;
+    } = {
+      shouldCompareHashes: false,
+    },
+  ): SceneElementsMap | undefined {
+    if (this.elements === nextElements) {
+      return;
+    }
+
+    const changedElements: SceneElementsMap = new Map() as SceneElementsMap;
+
+    for (const prevElement of toIterable(this.elements)) {
+      const nextElement = nextElements.get(prevElement.id);
+
+      if (!nextElement) {
+        // element was deleted
+        changedElements.set(
+          prevElement.id,
+          newElementWith(prevElement, { isDeleted: true }),
+        );
+      }
+    }
+
+    for (const nextElement of toIterable(nextElements)) {
+      const prevElement = this.elements.get(nextElement.id);
+
+      if (
+        !prevElement || // element was added
+        prevElement.version < nextElement.version // element was updated
+      ) {
+        changedElements.set(nextElement.id, nextElement);
+      }
+    }
+
+    if (!changedElements.size) {
+      return;
+    }
+
+    const changedElementsHash = hashElementsVersion(changedElements);
+
+    if (
+      options.shouldCompareHashes &&
+      this._lastChangedElementsHash === changedElementsHash
+    ) {
+      return;
+    }
+
+    this._lastChangedElementsHash = changedElementsHash;
+
+    return changedElements;
+  }
+
+  /**
+   * Perform structural clone, deep cloning only elements that changed.
+   */
+  private createElementsSnapshot(changedElements: SceneElementsMap) {
+    const clonedElements = new Map() as SceneElementsMap;
+
+    for (const prevElement of toIterable(this.elements)) {
+      // Clone previous elements, never delete, in case nextElements would be just a subset of previous elements
+      // i.e. during collab, persist or whenenever isDeleted elements get cleared
+      clonedElements.set(prevElement.id, prevElement);
+    }
+
+    for (const changedElement of toIterable(changedElements)) {
+      // TODO: consider just creating new instance, once we can ensure that all reference properties on every element are immutable
+      // TODO: consider creating a lazy deep clone, having a one-time-usage proxy over the snapshotted element and deep cloning only if it gets mutated
+      clonedElements.set(changedElement.id, deepCopyElement(changedElement));
+    }
+
+    return clonedElements;
+  }
+}
+
+// hidden non-enumerable property for runtime checks
+const hiddenObservedAppStateProp = "__observedAppState";
+
+const getDefaultObservedAppState = (): ObservedAppState => {
+  return {
+    name: null,
+    editingGroupId: null,
+    viewBackgroundColor: COLOR_PALETTE.white,
+    selectedElementIds: {},
+    selectedGroupIds: {},
+    editingLinearElementId: null,
+    selectedLinearElementId: null,
+    croppingElementId: null,
+    activeLockedId: null,
+    lockedMultiSelections: {},
+  };
+};
+
+export const getObservedAppState = (appState: AppState): ObservedAppState => {
+  const observedAppState = {
+    name: appState.name,
+    editingGroupId: appState.editingGroupId,
+    viewBackgroundColor: appState.viewBackgroundColor,
+    selectedElementIds: appState.selectedElementIds,
+    selectedGroupIds: appState.selectedGroupIds,
+    editingLinearElementId: appState.editingLinearElement?.elementId || null,
+    selectedLinearElementId: appState.selectedLinearElement?.elementId || null,
+    croppingElementId: appState.croppingElementId,
+    activeLockedId: appState.activeLockedId,
+    lockedMultiSelections: appState.lockedMultiSelections,
+  };
+
+  Reflect.defineProperty(observedAppState, hiddenObservedAppStateProp, {
+    value: true,
+    enumerable: false,
+  });
+
+  return observedAppState;
+};
+
+const isObservedAppState = (
+  appState: AppState | ObservedAppState,
+): appState is ObservedAppState =>
+  !!Reflect.get(appState, hiddenObservedAppStateProp);

packages/element/src/textElement.ts

@@ -30,7 +30,7 @@ import {
   isTextElement,
 } from "./typeChecks";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { MaybeTransformHandleType } from "./transformHandles";
 import type {

packages/element/src/typeChecks.ts

@@ -28,6 +28,7 @@ import type {
   PointBinding,
   FixedPointBinding,
   ExcalidrawFlowchartNodeElement,
+  ExcalidrawLinearElementSubType,
 } from "./types";
 
 export const isInitializedImageElement = (
@@ -119,6 +120,20 @@ export const isElbowArrow = (
   return isArrowElement(element) && element.elbowed;
 };
 
+export const isSharpArrow = (
+  element?: ExcalidrawElement,
+): element is ExcalidrawArrowElement => {
+  return isArrowElement(element) && !element.elbowed && !element.roundness;
+};
+
+export const isCurvedArrow = (
+  element?: ExcalidrawElement,
+): element is ExcalidrawArrowElement => {
+  return (
+    isArrowElement(element) && !element.elbowed && element.roundness !== null
+  );
+};
+
 export const isLinearElementType = (
   elementType: ElementOrToolType,
 ): boolean => {
@@ -271,6 +286,10 @@ export const isBoundToContainer = (
   );
 };
 
+export const isArrowBoundToElement = (element: ExcalidrawArrowElement) => {
+  return !!element.startBinding || !!element.endBinding;
+};
+
 export const isUsingAdaptiveRadius = (type: string) =>
   type === "rectangle" ||
   type === "embeddable" ||
@@ -338,3 +357,18 @@ export const isBounds = (box: unknown): box is Bounds =>
   typeof box[1] === "number" &&
   typeof box[2] === "number" &&
   typeof box[3] === "number";
+
+export const getLinearElementSubType = (
+  element: ExcalidrawLinearElement,
+): ExcalidrawLinearElementSubType => {
+  if (isSharpArrow(element)) {
+    return "sharpArrow";
+  }
+  if (isCurvedArrow(element)) {
+    return "curvedArrow";
+  }
+  if (isElbowArrow(element)) {
+    return "elbowArrow";
+  }
+  return "line";
+};

packages/element/src/types.ts

@@ -296,6 +296,11 @@ export type FixedPointBinding = Merge<
   }
 >;
 
+export type PointsPositionUpdates = Map<
+  number,
+  { point: LocalPoint; isDragging?: boolean }
+>;
+
 export type Arrowhead =
   | "arrow"
   | "bar"
@@ -412,3 +417,13 @@ export type NonDeletedSceneElementsMap = Map<
 export type ElementsMapOrArray =
   | readonly ExcalidrawElement[]
   | Readonly<ElementsMap>;
+
+export type ExcalidrawLinearElementSubType =
+  | "line"
+  | "sharpArrow"
+  | "curvedArrow"
+  | "elbowArrow";
+
+export type ConvertibleGenericTypes = "rectangle" | "diamond" | "ellipse";
+export type ConvertibleLinearTypes = ExcalidrawLinearElementSubType;
+export type ConvertibleTypes = ConvertibleGenericTypes | ConvertibleLinearTypes;

packages/element/src/zindex.ts

@@ -10,7 +10,7 @@ import { syncMovedIndices } from "./fractionalIndex";
 
 import { getSelectedElements } from "./selection";
 
-import type Scene from "./Scene";
+import type { Scene } from "./Scene";
 
 import type { ExcalidrawElement, ExcalidrawFrameLikeElement } from "./types";
 

packages/element/tests/cropElement.test.tsx

@@ -3,21 +3,30 @@ import { vi } from "vitest";
 
 import { KEYS, cloneJSON } from "@excalidraw/common";
 
-import { duplicateElement } from "@excalidraw/element/duplicate";
+import {
+  Excalidraw,
+  exportToCanvas,
+  exportToSvg,
+} from "@excalidraw/excalidraw";
+import {
+  actionFlipHorizontal,
+  actionFlipVertical,
+} from "@excalidraw/excalidraw/actions";
 
-import type {
+import { API } from "@excalidraw/excalidraw/tests/helpers/api";
-  ExcalidrawImageElement,
+import { Keyboard, Pointer, UI } from "@excalidraw/excalidraw/tests/helpers/ui";
-  ImageCrop,
+import {
-} from "@excalidraw/element/types";
+  act,
+  GlobalTestState,
+  render,
+  unmountComponent,
+} from "@excalidraw/excalidraw/tests/test-utils";
 
-import { Excalidraw, exportToCanvas, exportToSvg } from "..";
+import type { NormalizedZoomValue } from "@excalidraw/excalidraw/types";
-import { actionFlipHorizontal, actionFlipVertical } from "../actions";
 
-import { API } from "./helpers/api";
+import { duplicateElement } from "../src/duplicate";
-import { Keyboard, Pointer, UI } from "./helpers/ui";
-import { act, GlobalTestState, render, unmountComponent } from "./test-utils";
 
-import type { NormalizedZoomValue } from "../types";
+import type { ExcalidrawImageElement, ImageCrop } from "../src/types";
 
 const { h } = window;
 const mouse = new Pointer("mouse");

packages/element/tests/delta.test.tsx

@@ -0,0 +1,149 @@
+import type { ObservedAppState } from "@excalidraw/excalidraw/types";
+import type { LinearElementEditor } from "@excalidraw/element";
+
+import { AppStateDelta } from "../src/delta";
+
+describe("AppStateDelta", () => {
+  describe("ensure stable delta properties order", () => {
+    it("should maintain stable order for root properties", () => {
+      const name = "untitled scene";
+      const selectedLinearElementId = "id1" as LinearElementEditor["elementId"];
+
+      const commonAppState = {
+        viewBackgroundColor: "#ffffff",
+        selectedElementIds: {},
+        selectedGroupIds: {},
+        editingGroupId: null,
+        croppingElementId: null,
+        editingLinearElementId: null,
+        lockedMultiSelections: {},
+        activeLockedId: null,
+      };
+
+      const prevAppState1: ObservedAppState = {
+        ...commonAppState,
+        name: "",
+        selectedLinearElementId: null,
+      };
+
+      const nextAppState1: ObservedAppState = {
+        ...commonAppState,
+        name,
+        selectedLinearElementId,
+      };
+
+      const prevAppState2: ObservedAppState = {
+        selectedLinearElementId: null,
+        name: "",
+        ...commonAppState,
+      };
+
+      const nextAppState2: ObservedAppState = {
+        selectedLinearElementId,
+        name,
+        ...commonAppState,
+      };
+
+      const delta1 = AppStateDelta.calculate(prevAppState1, nextAppState1);
+      const delta2 = AppStateDelta.calculate(prevAppState2, nextAppState2);
+
+      expect(JSON.stringify(delta1)).toBe(JSON.stringify(delta2));
+    });
+
+    it("should maintain stable order for selectedElementIds", () => {
+      const commonAppState = {
+        name: "",
+        viewBackgroundColor: "#ffffff",
+        selectedGroupIds: {},
+        editingGroupId: null,
+        croppingElementId: null,
+        selectedLinearElementId: null,
+        editingLinearElementId: null,
+        activeLockedId: null,
+        lockedMultiSelections: {},
+      };
+
+      const prevAppState1: ObservedAppState = {
+        ...commonAppState,
+        selectedElementIds: { id5: true, id2: true, id4: true },
+      };
+
+      const nextAppState1: ObservedAppState = {
+        ...commonAppState,
+        selectedElementIds: {
+          id1: true,
+          id2: true,
+          id3: true,
+        },
+      };
+
+      const prevAppState2: ObservedAppState = {
+        ...commonAppState,
+        selectedElementIds: { id4: true, id2: true, id5: true },
+      };
+
+      const nextAppState2: ObservedAppState = {
+        ...commonAppState,
+        selectedElementIds: {
+          id3: true,
+          id2: true,
+          id1: true,
+        },
+      };
+
+      const delta1 = AppStateDelta.calculate(prevAppState1, nextAppState1);
+      const delta2 = AppStateDelta.calculate(prevAppState2, nextAppState2);
+
+      expect(JSON.stringify(delta1)).toBe(JSON.stringify(delta2));
+    });
+
+    it("should maintain stable order for selectedGroupIds", () => {
+      const commonAppState = {
+        name: "",
+        viewBackgroundColor: "#ffffff",
+        selectedElementIds: {},
+        editingGroupId: null,
+        croppingElementId: null,
+        selectedLinearElementId: null,
+        editingLinearElementId: null,
+        activeLockedId: null,
+        lockedMultiSelections: {},
+      };
+
+      const prevAppState1: ObservedAppState = {
+        ...commonAppState,
+        selectedGroupIds: { id5: false, id2: true, id4: true, id0: true },
+      };
+
+      const nextAppState1: ObservedAppState = {
+        ...commonAppState,
+        selectedGroupIds: {
+          id0: true,
+          id1: true,
+          id2: false,
+          id3: true,
+        },
+      };
+
+      const prevAppState2: ObservedAppState = {
+        ...commonAppState,
+        selectedGroupIds: { id0: true, id4: true, id2: true, id5: false },
+      };
+
+      const nextAppState2: ObservedAppState = {
+        ...commonAppState,
+        selectedGroupIds: {
+          id3: true,
+          id2: false,
+          id1: true,
+          id0: true,
+        },
+      };
+
+      const delta1 = AppStateDelta.calculate(prevAppState1, nextAppState1);
+      const delta2 = AppStateDelta.calculate(prevAppState2, nextAppState2);
+
+      expect(JSON.stringify(delta1)).toBe(JSON.stringify(delta2));
+    });
+  });
+});

packages/element/tests/elbowArrow.test.tsx

@@ -22,7 +22,7 @@ import type { LocalPoint } from "@excalidraw/math";
 
 import { bindLinearElement } from "../src/binding";
 
-import Scene from "../src/Scene";
+import { Scene } from "../src/Scene";
 
 import type {
   ExcalidrawArrowElement,

packages/element/tests/fractionalIndex.test.ts

@@ -7,9 +7,9 @@ import {
   syncInvalidIndices,
   syncMovedIndices,
   validateFractionalIndices,
-} from "@excalidraw/element/fractionalIndex";
+} from "@excalidraw/element";
 
-import { deepCopyElement } from "@excalidraw/element/duplicate";
+import { deepCopyElement } from "@excalidraw/element";
 
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 

packages/element/tests/linearElementEditor.test.tsx

@@ -1,5 +1,3 @@
-import { newArrowElement } from "@excalidraw/element/newElement";
-
 import { pointCenter, pointFrom } from "@excalidraw/math";
 import { act, queryByTestId, queryByText } from "@testing-library/react";
 import React from "react";
@@ -13,36 +11,34 @@ import {
   arrayToMap,
 } from "@excalidraw/common";
 
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { Excalidraw } from "@excalidraw/excalidraw";
-import {
+import * as InteractiveCanvas from "@excalidraw/excalidraw/renderer/interactiveScene";
-  getBoundTextElementPosition,
+import * as StaticScene from "@excalidraw/excalidraw/renderer/staticScene";
-  getBoundTextMaxWidth,
+import { API } from "@excalidraw/excalidraw/tests/helpers/api";
-} from "@excalidraw/element/textElement";
-import * as textElementUtils from "@excalidraw/element/textElement";
-import { wrapText } from "@excalidraw/element/textWrapping";
 
-import type { GlobalPoint, LocalPoint } from "@excalidraw/math";
+import { Keyboard, Pointer, UI } from "@excalidraw/excalidraw/tests/helpers/ui";
-
-import type {
-  ExcalidrawElement,
-  ExcalidrawLinearElement,
-  ExcalidrawTextElementWithContainer,
-  FontString,
-} from "@excalidraw/element/types";
-
-import { Excalidraw } from "../index";
-import * as InteractiveCanvas from "../renderer/interactiveScene";
-import * as StaticScene from "../renderer/staticScene";
-import { API } from "../tests/helpers/api";
-
-import { Keyboard, Pointer, UI } from "./helpers/ui";
 import {
   screen,
   render,
   fireEvent,
   GlobalTestState,
   unmountComponent,
-} from "./test-utils";
+} from "@excalidraw/excalidraw/tests/test-utils";
+
+import type { GlobalPoint, LocalPoint } from "@excalidraw/math";
+
+import { wrapText } from "../src";
+import * as textElementUtils from "../src/textElement";
+import { getBoundTextElementPosition, getBoundTextMaxWidth } from "../src";
+import { LinearElementEditor } from "../src";
+import { newArrowElement } from "../src";
+
+import type {
+  ExcalidrawElement,
+  ExcalidrawLinearElement,
+  ExcalidrawTextElementWithContainer,
+  FontString,
+} from "../src/types";
 
 const renderInteractiveScene = vi.spyOn(
   InteractiveCanvas,
@@ -1384,19 +1380,30 @@ describe("Test Linear Elements", () => {
       const [origStartX, origStartY] = [line.x, line.y];
 
       act(() => {
-        LinearElementEditor.movePoints(line, h.app.scene, [
+        LinearElementEditor.movePoints(
-          {
+          line,
-            index: 0,
+          h.app.scene,
-            point: pointFrom(line.points[0][0] + 10, line.points[0][1] + 10),
+          new Map([
-          },
+            [
-          {
+              0,
-            index: line.points.length - 1,
+              {
-            point: pointFrom(
+                point: pointFrom(
-              line.points[line.points.length - 1][0] - 10,
+                  line.points[0][0] + 10,
-              line.points[line.points.length - 1][1] - 10,
+                  line.points[0][1] + 10,
-            ),
+                ),
-          },
+              },
-        ]);
+            ],
+            [
+              line.points.length - 1,
+              {
+                point: pointFrom(
+                  line.points[line.points.length - 1][0] - 10,
+                  line.points[line.points.length - 1][1] - 10,
+                ),
+              },
+            ],
+          ]),
+        );
       });
       expect(line.x).toBe(origStartX + 10);
       expect(line.y).toBe(origStartY + 10);

packages/element/tests/sortElements.test.ts

@@ -1,6 +1,6 @@
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 
-import { mutateElement } from "@excalidraw/element/mutateElement";
+import { mutateElement } from "@excalidraw/element";
 
 import { normalizeElementOrder } from "../src/sortElements";
 

packages/excalidraw/.gitignore

@@ -1,3 +1,2 @@
 node_modules
 types
-.wrangler

packages/excalidraw/actions/actionAddToLibrary.ts

@@ -1,8 +1,9 @@
 import { LIBRARY_DISABLED_TYPES, randomId } from "@excalidraw/common";
-import { deepCopyElement } from "@excalidraw/element/duplicate";
+import { deepCopyElement } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { t } from "../i18n";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionAlign.tsx

@@ -1,16 +1,18 @@
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { isFrameLikeElement } from "@excalidraw/element";
 
-import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element/frame";
+import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
 
 import { KEYS, arrayToMap, getShortcutKey } from "@excalidraw/common";
 
-import { alignElements } from "@excalidraw/element/align";
+import { alignElements } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import type { Alignment } from "@excalidraw/element/align";
+import type { Alignment } from "@excalidraw/element";
 
 import { ToolButton } from "../components/ToolButton";
 import {
@@ -25,7 +27,6 @@ import {
 import { t } from "../i18n";
 
 import { isSomeElementSelected } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionBoundText.tsx

@@ -10,14 +10,14 @@ import {
   getOriginalContainerHeightFromCache,
   resetOriginalContainerCache,
   updateOriginalContainerCache,
-} from "@excalidraw/element/containerCache";
+} from "@excalidraw/element";
 
 import {
   computeBoundTextPosition,
   computeContainerDimensionForBoundText,
   getBoundTextElement,
   redrawTextBoundingBox,
-} from "@excalidraw/element/textElement";
+} from "@excalidraw/element";
 
 import {
   hasBoundTextElement,
@@ -25,13 +25,15 @@ import {
   isTextBindableContainer,
   isTextElement,
   isUsingAdaptiveRadius,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
-import { measureText } from "@excalidraw/element/textMeasurements";
+import { measureText } from "@excalidraw/element";
 
-import { syncMovedIndices } from "@excalidraw/element/fractionalIndex";
+import { syncMovedIndices } from "@excalidraw/element";
 
-import { newElement } from "@excalidraw/element/newElement";
+import { newElement } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type {
   ExcalidrawElement,
@@ -44,8 +46,6 @@ import type { Mutable } from "@excalidraw/common/utility-types";
 
 import type { Radians } from "@excalidraw/math";
 
-import { CaptureUpdateAction } from "../store";
-
 import { register } from "./register";
 
 import type { AppState } from "../types";

packages/excalidraw/actions/actionCanvas.tsx

@@ -14,8 +14,10 @@ import {
 } from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { getCommonBounds, type SceneBounds } from "@excalidraw/element/bounds";
+import { getCommonBounds, type SceneBounds } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
@@ -44,7 +46,6 @@ import { t } from "../i18n";
 import { getNormalizedZoom } from "../scene";
 import { centerScrollOn } from "../scene/scroll";
 import { getStateForZoom } from "../scene/zoom";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionClipboard.tsx

@@ -1,8 +1,10 @@
-import { isTextElement } from "@excalidraw/element/typeChecks";
+import { isTextElement } from "@excalidraw/element";
-import { getTextFromElements } from "@excalidraw/element/textElement";
+import { getTextFromElements } from "@excalidraw/element";
 
 import { CODES, KEYS, isFirefox } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import {
   copyTextToSystemClipboard,
   copyToClipboard,
@@ -15,8 +17,6 @@ import { DuplicateIcon, cutIcon, pngIcon, svgIcon } from "../components/icons";
 import { exportCanvas, prepareElementsForExport } from "../data/index";
 import { t } from "../i18n";
 
-import { CaptureUpdateAction } from "../store";
-
 import { actionDeleteSelected } from "./actionDeleteSelected";
 import { register } from "./register";
 

packages/excalidraw/actions/actionCropEditor.tsx

@@ -1,11 +1,12 @@
-import { isImageElement } from "@excalidraw/element/typeChecks";
+import { isImageElement } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawImageElement } from "@excalidraw/element/types";
 
 import { ToolButton } from "../components/ToolButton";
 import { cropIcon } from "../components/icons";
 import { t } from "../i18n";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionDeleteSelected.tsx

@@ -1,27 +1,28 @@
 import { KEYS, updateActiveTool } from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
-import { fixBindingsAfterDeletion } from "@excalidraw/element/binding";
+import { fixBindingsAfterDeletion } from "@excalidraw/element";
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { getContainerElement } from "@excalidraw/element/textElement";
+import { getContainerElement } from "@excalidraw/element";
 import {
   isBoundToContainer,
   isElbowArrow,
   isFrameLikeElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
-import { getFrameChildren } from "@excalidraw/element/frame";
+import { getFrameChildren } from "@excalidraw/element";
 
 import {
   getElementsInGroup,
   selectGroupsForSelectedElements,
-} from "@excalidraw/element/groups";
+} from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
 import { t } from "../i18n";
 import { getSelectedElements, isSomeElementSelected } from "../scene";
-import { CaptureUpdateAction } from "../store";
 import { TrashIcon } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
 

packages/excalidraw/actions/actionDistribute.tsx

@@ -1,16 +1,18 @@
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { isFrameLikeElement } from "@excalidraw/element";
 
 import { CODES, KEYS, arrayToMap, getShortcutKey } from "@excalidraw/common";
 
-import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element/frame";
+import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
 
-import { distributeElements } from "@excalidraw/element/distribute";
+import { distributeElements } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import type { Distribution } from "@excalidraw/element/distribute";
+import type { Distribution } from "@excalidraw/element";
 
 import { ToolButton } from "../components/ToolButton";
 import {
@@ -21,7 +23,6 @@ import {
 import { t } from "../i18n";
 
 import { isSomeElementSelected } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionDuplicateSelection.tsx

@@ -7,23 +7,24 @@ import {
 
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
 
 import {
   getSelectedElements,
   getSelectionStateForElements,
-} from "@excalidraw/element/selection";
+} from "@excalidraw/element";
 
-import { syncMovedIndices } from "@excalidraw/element/fractionalIndex";
+import { syncMovedIndices } from "@excalidraw/element";
 
-import { duplicateElements } from "@excalidraw/element/duplicate";
+import { duplicateElements } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { ToolButton } from "../components/ToolButton";
 import { DuplicateIcon } from "../components/icons";
 
 import { t } from "../i18n";
 import { isSomeElementSelected } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionElementLink.ts

@@ -2,13 +2,14 @@ import {
   canCreateLinkFromElements,
   defaultGetElementLinkFromSelection,
   getLinkIdAndTypeFromSelection,
-} from "@excalidraw/element/elementLink";
+} from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { copyTextToSystemClipboard } from "../clipboard";
 import { copyIcon, elementLinkIcon } from "../components/icons";
 import { t } from "../i18n";
 import { getSelectedElements } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionElementLock.ts

@@ -1,18 +1,23 @@
-import { KEYS, arrayToMap } from "@excalidraw/common";
+import { KEYS, arrayToMap, randomId } from "@excalidraw/common";
 
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import {
+  elementsAreInSameGroup,
+  newElementWith,
+  selectGroupsFromGivenElements,
+} from "@excalidraw/element";
 
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
 import { LockedIcon, UnlockedIcon } from "../components/icons";
 
 import { getSelectedElements } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 
+import type { AppState } from "../types";
+
 const shouldLock = (elements: readonly ExcalidrawElement[]) =>
   elements.every((el) => !el.locked);
 
@@ -23,15 +28,10 @@ export const actionToggleElementLock = register({
       selectedElementIds: appState.selectedElementIds,
       includeBoundTextElement: false,
     });
-    if (selected.length === 1 && !isFrameLikeElement(selected[0])) {
-      return selected[0].locked
-        ? "labels.elementLock.unlock"
-        : "labels.elementLock.lock";
-    }
 
     return shouldLock(selected)
-      ? "labels.elementLock.lockAll"
+      ? "labels.elementLock.lock"
-      : "labels.elementLock.unlockAll";
+      : "labels.elementLock.unlock";
   },
   icon: (appState, elements) => {
     const selectedElements = getSelectedElements(elements, appState);
@@ -58,19 +58,84 @@ export const actionToggleElementLock = register({
 
     const nextLockState = shouldLock(selectedElements);
     const selectedElementsMap = arrayToMap(selectedElements);
-    return {
-      elements: elements.map((element) => {
-        if (!selectedElementsMap.has(element.id)) {
-          return element;
-        }
 
-        return newElementWith(element, { locked: nextLockState });
+    const isAGroup =
-      }),
+      selectedElements.length > 1 && elementsAreInSameGroup(selectedElements);
+    const isASingleUnit = selectedElements.length === 1 || isAGroup;
+    const newGroupId = isASingleUnit ? null : randomId();
+
+    let nextLockedMultiSelections = { ...appState.lockedMultiSelections };
+
+    if (nextLockState) {
+      nextLockedMultiSelections = {
+        ...appState.lockedMultiSelections,
+        ...(newGroupId ? { [newGroupId]: true } : {}),
+      };
+    } else if (isAGroup) {
+      const groupId = selectedElements[0].groupIds.at(-1)!;
+      delete nextLockedMultiSelections[groupId];
+    }
+
+    const nextElements = elements.map((element) => {
+      if (!selectedElementsMap.has(element.id)) {
+        return element;
+      }
+
+      let nextGroupIds = element.groupIds;
+
+      // if locking together, add to group
+      // if unlocking, remove the temporary group
+      if (nextLockState) {
+        if (newGroupId) {
+          nextGroupIds = [...nextGroupIds, newGroupId];
+        }
+      } else {
+        nextGroupIds = nextGroupIds.filter(
+          (groupId) => !appState.lockedMultiSelections[groupId],
+        );
+      }
+
+      return newElementWith(element, {
+        locked: nextLockState,
+        // do not recreate the array unncessarily
+        groupIds:
+          nextGroupIds.length !== element.groupIds.length
+            ? nextGroupIds
+            : element.groupIds,
+      });
+    });
+
+    const nextElementsMap = arrayToMap(nextElements);
+    const nextSelectedElementIds: AppState["selectedElementIds"] = nextLockState
+      ? {}
+      : Object.fromEntries(selectedElements.map((el) => [el.id, true]));
+    const unlockedSelectedElements = selectedElements.map(
+      (el) => nextElementsMap.get(el.id) || el,
+    );
+    const nextSelectedGroupIds = nextLockState
+      ? {}
+      : selectGroupsFromGivenElements(unlockedSelectedElements, appState);
+
+    const activeLockedId = nextLockState
+      ? newGroupId
+        ? newGroupId
+        : isAGroup
+        ? selectedElements[0].groupIds.at(-1)!
+        : selectedElements[0].id
+      : null;
+
+    return {
+      elements: nextElements,
+
       appState: {
         ...appState,
+        selectedElementIds: nextSelectedElementIds,
+        selectedGroupIds: nextSelectedGroupIds,
         selectedLinearElement: nextLockState
           ? null
           : appState.selectedLinearElement,
+        lockedMultiSelections: nextLockedMultiSelections,
+        activeLockedId,
       },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
@@ -103,18 +168,44 @@ export const actionUnlockAllElements = register({
   perform: (elements, appState) => {
     const lockedElements = elements.filter((el) => el.locked);
 
+    const nextElements = elements.map((element) => {
+      if (element.locked) {
+        // remove the temporary groupId if it exists
+        const nextGroupIds = element.groupIds.filter(
+          (gid) => !appState.lockedMultiSelections[gid],
+        );
+
+        return newElementWith(element, {
+          locked: false,
+          groupIds:
+            // do not recreate the array unncessarily
+            element.groupIds.length !== nextGroupIds.length
+              ? nextGroupIds
+              : element.groupIds,
+        });
+      }
+      return element;
+    });
+
+    const nextElementsMap = arrayToMap(nextElements);
+
+    const unlockedElements = lockedElements.map(
+      (el) => nextElementsMap.get(el.id) || el,
+    );
+
     return {
-      elements: elements.map((element) => {
+      elements: nextElements,
-        if (element.locked) {
-          return newElementWith(element, { locked: false });
-        }
-        return element;
-      }),
       appState: {
         ...appState,
         selectedElementIds: Object.fromEntries(
           lockedElements.map((el) => [el.id, true]),
         ),
+        selectedGroupIds: selectGroupsFromGivenElements(
+          unlockedElements,
+          appState,
+        ),
+        lockedMultiSelections: {},
+        activeLockedId: null,
       },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };

packages/excalidraw/actions/actionEmbeddable.ts

@@ -1,7 +1,8 @@
 import { updateActiveTool } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import { setCursorForShape } from "../cursor";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionExport.tsx

@@ -7,6 +7,8 @@ import {
 
 import { getNonDeletedElements } from "@excalidraw/element";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import type { Theme } from "@excalidraw/element/types";
 
 import { useDevice } from "../components/App";
@@ -24,7 +26,6 @@ import { resaveAsImageWithScene } from "../data/resave";
 import { t } from "../i18n";
 import { getSelectedElements, isSomeElementSelected } from "../scene";
 import { getExportSize } from "../scene/export";
-import { CaptureUpdateAction } from "../store";
 
 import "../components/ToolIcon.scss";
 

packages/excalidraw/actions/actionFinalize.tsx

@@ -3,24 +3,22 @@ import { pointFrom } from "@excalidraw/math";
 import {
   maybeBindLinearElement,
   bindOrUnbindLinearElement,
-} from "@excalidraw/element/binding";
+} from "@excalidraw/element";
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
 
-import {
+import { isBindingElement, isLinearElement } from "@excalidraw/element";
-  isBindingElement,
-  isLinearElement,
-} from "@excalidraw/element/typeChecks";
 
 import { KEYS, arrayToMap, updateActiveTool } from "@excalidraw/common";
-import { isPathALoop } from "@excalidraw/element/shapes";
+import { isPathALoop } from "@excalidraw/element";
 
-import { isInvisiblySmallElement } from "@excalidraw/element/sizeHelpers";
+import { isInvisiblySmallElement } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { t } from "../i18n";
 import { resetCursor } from "../cursor";
 import { done } from "../components/icons";
 import { ToolButton } from "../components/ToolButton";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionFlip.ts

@@ -2,19 +2,21 @@ import { getNonDeletedElements } from "@excalidraw/element";
 import {
   bindOrUnbindLinearElements,
   isBindingEnabled,
-} from "@excalidraw/element/binding";
+} from "@excalidraw/element";
-import { getCommonBoundingBox } from "@excalidraw/element/bounds";
+import { getCommonBoundingBox } from "@excalidraw/element";
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { deepCopyElement } from "@excalidraw/element/duplicate";
+import { deepCopyElement } from "@excalidraw/element";
-import { resizeMultipleElements } from "@excalidraw/element/resizeElements";
+import { resizeMultipleElements } from "@excalidraw/element";
 import {
   isArrowElement,
   isElbowArrow,
   isLinearElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
-import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element/frame";
+import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
 import { CODES, KEYS, arrayToMap } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import type {
   ExcalidrawArrowElement,
   ExcalidrawElbowArrowElement,
@@ -24,7 +26,6 @@ import type {
 } from "@excalidraw/element/types";
 
 import { getSelectedElements } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { flipHorizontal, flipVertical } from "../components/icons";
 

packages/excalidraw/actions/actionFrame.ts

@@ -1,25 +1,26 @@
 import { getNonDeletedElements } from "@excalidraw/element";
-import { mutateElement } from "@excalidraw/element/mutateElement";
+import { mutateElement } from "@excalidraw/element";
-import { newFrameElement } from "@excalidraw/element/newElement";
+import { newFrameElement } from "@excalidraw/element";
-import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
+import { isFrameLikeElement } from "@excalidraw/element";
 import {
   addElementsToFrame,
   removeAllElementsFromFrame,
-} from "@excalidraw/element/frame";
+} from "@excalidraw/element";
-import { getFrameChildren } from "@excalidraw/element/frame";
+import { getFrameChildren } from "@excalidraw/element";
 
 import { KEYS, updateActiveTool } from "@excalidraw/common";
 
-import { getElementsInGroup } from "@excalidraw/element/groups";
+import { getElementsInGroup } from "@excalidraw/element";
 
-import { getCommonBounds } from "@excalidraw/element/bounds";
+import { getCommonBounds } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
 import { setCursorForShape } from "../cursor";
 import { frameToolIcon } from "../components/icons";
 import { getSelectedElements } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionGroup.tsx

@@ -1,8 +1,8 @@
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
 
-import { isBoundToContainer } from "@excalidraw/element/typeChecks";
+import { isBoundToContainer } from "@excalidraw/element";
 
 import {
   frameAndChildrenSelectedTogether,
@@ -12,7 +12,7 @@ import {
   groupByFrameLikes,
   removeElementsFromFrame,
   replaceAllElementsInFrame,
-} from "@excalidraw/element/frame";
+} from "@excalidraw/element";
 
 import { KEYS, randomId, arrayToMap, getShortcutKey } from "@excalidraw/common";
 
@@ -24,9 +24,11 @@ import {
   addToGroup,
   removeFromSelectedGroups,
   isElementInGroup,
-} from "@excalidraw/element/groups";
+} from "@excalidraw/element";
 
-import { syncMovedIndices } from "@excalidraw/element/fractionalIndex";
+import { syncMovedIndices } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type {
   ExcalidrawElement,
@@ -40,7 +42,6 @@ import { UngroupIcon, GroupIcon } from "../components/icons";
 import { t } from "../i18n";
 
 import { isSomeElementSelected } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionHistory.tsx

@@ -1,5 +1,9 @@
 import { isWindows, KEYS, matchKey, arrayToMap } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
+import { orderByFractionalIndex } from "@excalidraw/element";
+
 import type { SceneElementsMap } from "@excalidraw/element/types";
 
 import { ToolButton } from "../components/ToolButton";
@@ -7,7 +11,6 @@ import { UndoIcon, RedoIcon } from "../components/icons";
 import { HistoryChangedEvent } from "../history";
 import { useEmitter } from "../hooks/useEmitter";
 import { t } from "../i18n";
-import { CaptureUpdateAction } from "../store";
 
 import type { History } from "../history";
 import type { AppClassProperties, AppState } from "../types";
@@ -34,7 +37,11 @@ const executeHistoryAction = (
     }
 
     const [nextElementsMap, nextAppState] = result;
-    const nextElements = Array.from(nextElementsMap.values());
+
+    // order by fractional indices in case the map was accidently modified in the meantime
+    const nextElements = orderByFractionalIndex(
+      Array.from(nextElementsMap.values()),
+    );
 
     return {
       appState: nextAppState,

packages/excalidraw/actions/actionLinearEditor.tsx

@@ -1,9 +1,11 @@
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
 
-import { isElbowArrow, isLinearElement } from "@excalidraw/element/typeChecks";
+import { isElbowArrow, isLinearElement } from "@excalidraw/element";
 
 import { arrayToMap } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import type { ExcalidrawLinearElement } from "@excalidraw/element/types";
 
 import { DEFAULT_CATEGORIES } from "../components/CommandPalette/CommandPalette";
@@ -11,7 +13,6 @@ import { ToolButton } from "../components/ToolButton";
 import { lineEditorIcon } from "../components/icons";
 
 import { t } from "../i18n";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionLink.tsx

@@ -1,14 +1,15 @@
-import { isEmbeddableElement } from "@excalidraw/element/typeChecks";
+import { isEmbeddableElement } from "@excalidraw/element";
 
 import { KEYS, getShortcutKey } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import { ToolButton } from "../components/ToolButton";
 import { getContextMenuLabel } from "../components/hyperlink/Hyperlink";
 import { LinkIcon } from "../components/icons";
 import { t } from "../i18n";
 
 import { getSelectedElements } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionMenu.tsx

@@ -2,14 +2,14 @@ import { KEYS } from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { showSelectedShapeActions } from "@excalidraw/element/showSelectedShapeActions";
+import { showSelectedShapeActions } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { ToolButton } from "../components/ToolButton";
 import { HamburgerMenuIcon, HelpIconThin, palette } from "../components/icons";
 import { t } from "../i18n";
 
-import { CaptureUpdateAction } from "../store";
-
 import { register } from "./register";
 
 export const actionToggleCanvasMenu = register({

packages/excalidraw/actions/actionNavigate.tsx

@@ -1,5 +1,7 @@
 import clsx from "clsx";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import { getClientColor } from "../clients";
 import { Avatar } from "../components/Avatar";
 import {
@@ -8,7 +10,6 @@ import {
   microphoneMutedIcon,
 } from "../components/icons";
 import { t } from "../i18n";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionSelectAll.ts

@@ -1,15 +1,15 @@
 import { getNonDeletedElements } from "@excalidraw/element";
-import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+import { LinearElementEditor } from "@excalidraw/element";
-import { isLinearElement, isTextElement } from "@excalidraw/element/typeChecks";
+import { isLinearElement, isTextElement } from "@excalidraw/element";
 
 import { arrayToMap, KEYS } from "@excalidraw/common";
 
-import { selectGroupsForSelectedElements } from "@excalidraw/element/groups";
+import { selectGroupsForSelectedElements } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import { CaptureUpdateAction } from "../store";
-
 import { selectAllIcon } from "../components/icons";
 
 import { register } from "./register";

packages/excalidraw/actions/actionStyles.ts

@@ -7,7 +7,7 @@ import {
   getLineHeight,
 } from "@excalidraw/common";
 
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
 
 import {
   hasBoundTextElement,
@@ -17,12 +17,14 @@ import {
   isArrowElement,
   isExcalidrawElement,
   isTextElement,
-} from "@excalidraw/element/typeChecks";
+} from "@excalidraw/element";
 
 import {
   getBoundTextElement,
   redrawTextBoundingBox,
-} from "@excalidraw/element/textElement";
+} from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawTextElement } from "@excalidraw/element/types";
 
@@ -30,7 +32,6 @@ import { paintIcon } from "../components/icons";
 
 import { t } from "../i18n";
 import { getSelectedElements } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionTextAutoResize.ts

@@ -1,12 +1,13 @@
 import { getFontString } from "@excalidraw/common";
 
-import { newElementWith } from "@excalidraw/element/mutateElement";
+import { newElementWith } from "@excalidraw/element";
-import { measureText } from "@excalidraw/element/textMeasurements";
+import { measureText } from "@excalidraw/element";
 
-import { isTextElement } from "@excalidraw/element/typeChecks";
+import { isTextElement } from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import { getSelectedElements } from "../scene";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionToggleGridMode.tsx

@@ -1,7 +1,8 @@
 import { CODES, KEYS } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import { gridIcon } from "../components/icons";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionToggleObjectsSnapMode.tsx

@@ -1,7 +1,8 @@
 import { CODES, KEYS } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import { magnetIcon } from "../components/icons";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionToggleSearchMenu.ts

@@ -5,8 +5,9 @@ import {
   DEFAULT_SIDEBAR,
 } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import { searchIcon } from "../components/icons";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 
@@ -33,13 +34,6 @@ export const actionToggleSearchMenu = register({
           `.${CLASSES.SEARCH_MENU_INPUT_WRAPPER} input`,
         );
 
-      if (searchInput?.matches(":focus")) {
-        return {
-          appState: { ...appState, openSidebar: null },
-          captureUpdate: CaptureUpdateAction.EVENTUALLY,
-        };
-      }
-
       searchInput?.focus();
       searchInput?.select();
       return false;

packages/excalidraw/actions/actionToggleShapeSwitch.tsx

@@ -0,0 +1,35 @@
+import { CaptureUpdateAction } from "@excalidraw/element";
+
+import type { ExcalidrawElement } from "@excalidraw/element/types";
+
+import {
+  getConversionTypeFromElements,
+  convertElementTypePopupAtom,
+} from "../components/ConvertElementTypePopup";
+import { editorJotaiStore } from "../editor-jotai";
+
+import { register } from "./register";
+
+export const actionToggleShapeSwitch = register({
+  name: "toggleShapeSwitch",
+  label: "labels.shapeSwitch",
+  icon: () => null,
+  viewMode: true,
+  trackEvent: {
+    category: "shape_switch",
+    action: "toggle",
+  },
+  keywords: ["change", "switch", "swap"],
+  perform(elements, appState, _, app) {
+    editorJotaiStore.set(convertElementTypePopupAtom, {
+      type: "panel",
+    });
+
+    return {
+      captureUpdate: CaptureUpdateAction.NEVER,
+    };
+  },
+  checked: (appState) => appState.gridModeEnabled,
+  predicate: (elements, appState, props) =>
+    getConversionTypeFromElements(elements as ExcalidrawElement[]) !== null,
+});

packages/excalidraw/actions/actionToggleStats.tsx

@@ -1,7 +1,8 @@
 import { CODES, KEYS } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import { abacusIcon } from "../components/icons";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionToggleViewMode.tsx

@@ -1,7 +1,8 @@
 import { CODES, KEYS } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import { eyeIcon } from "../components/icons";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionToggleZenMode.tsx

@@ -1,7 +1,8 @@
 import { CODES, KEYS } from "@excalidraw/common";
 
+import { CaptureUpdateAction } from "@excalidraw/element";
+
 import { coffeeIcon } from "../components/icons";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionZindex.tsx

@@ -5,7 +5,9 @@ import {
   moveOneRight,
   moveAllLeft,
   moveAllRight,
-} from "@excalidraw/element/zindex";
+} from "@excalidraw/element";
+
+import { CaptureUpdateAction } from "@excalidraw/element";
 
 import {
   BringForwardIcon,
@@ -14,7 +16,6 @@ import {
   SendToBackIcon,
 } from "../components/icons";
 import { t } from "../i18n";
-import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";