prefer props.viewModeEnabled

# Conflicts:
#	packages/excalidraw/appState.ts
#	packages/excalidraw/components/App.tsx
#	packages/excalidraw/element/textWysiwyg.test.tsx
#	packages/excalidraw/scene/scrollConstraints.ts
#	packages/excalidraw/scene/types.ts
#	packages/excalidraw/tests/__snapshots__/contextmenu.test.tsx.snap
#	packages/excalidraw/tests/__snapshots__/dragCreate.test.tsx.snap
#	packages/excalidraw/tests/__snapshots__/move.test.tsx.snap
#	packages/excalidraw/tests/__snapshots__/multiPointCreate.test.tsx.snap
#	packages/excalidraw/tests/__snapshots__/regressionTests.test.tsx.snap
#	packages/excalidraw/tests/__snapshots__/selection.test.tsx.snap
#	packages/excalidraw/tests/linearElementEditor.test.tsx
#	packages/excalidraw/types.ts
#	packages/utils/export.ts

.env.production

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

.eslintrc.json

@@ -32,12 +32,6 @@
         "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...

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

@@ -2,7 +2,7 @@
 
 Earlier we were using `renderFooter` prop to render custom footer which was removed in [#5970](https://github.com/excalidraw/excalidraw/pull/5970). Now you can pass a `Footer` component instead to render the custom UI for footer.
 
-You will need to import the `Footer` component from the package and wrap your component with the Footer component. The `Footer` should be a valid React Node.
+You will need to import the `Footer` component from the package and wrap your component with the Footer component. The `Footer` should a valid React Node.
 
 **Usage**
 
@@ -25,7 +25,7 @@ function App() {
 }
 ```
 
-This will only work for `Desktop` devices.
+This will only for `Desktop` devices.
 
 For `mobile` you will need to render it inside the [MainMenu](#mainmenu). You can use the [`useDevice`](#useDevice) hook to check the type of device, this will be available only inside the `children` of `Excalidraw` component.
 

dev-docs/docs/@excalidraw/excalidraw/api/props/props.mdx

@@ -31,7 +31,6 @@ All `props` are _optional_.
 | [`generateIdForFile`](#generateidforfile) | `function` | \_ | Allows you to override `id` generation for files added on canvas |
 | [`validateEmbeddable`](#validateembeddable) | `string[]` \| `boolean` \| `RegExp` \| `RegExp[]` \| <code>((link: string) => boolean &#124; undefined)</code> | \_ | use for custom src url validation |
 | [`renderEmbeddable`](/docs/@excalidraw/excalidraw/api/props/render-props#renderEmbeddable) | `function` | \_ | Render function that can override the built-in `<iframe>` |
-| [`renderScrollbars`] | `boolean`| | `false` | Indicates whether scrollbars will be shown
 
 ### Storing custom data on Excalidraw elements
 

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 .selected-shape-actions {
+.excalidraw .panelColumn {
   text-align: left;
 }
 

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

@@ -104,7 +104,6 @@ export default function ExampleApp({
   const [viewModeEnabled, setViewModeEnabled] = useState(false);
   const [zenModeEnabled, setZenModeEnabled] = useState(false);
   const [gridModeEnabled, setGridModeEnabled] = useState(false);
-  const [renderScrollbars, setRenderScrollbars] = useState(false);
   const [blobUrl, setBlobUrl] = useState<string>("");
   const [canvasUrl, setCanvasUrl] = useState<string>("");
   const [exportWithDarkMode, setExportWithDarkMode] = useState(false);
@@ -193,7 +192,6 @@ export default function ExampleApp({
         }) => setPointerData(payload),
         viewModeEnabled,
         zenModeEnabled,
-        renderScrollbars,
         gridModeEnabled,
         theme,
         name: "Custom name of drawing",
@@ -712,14 +710,6 @@ export default function ExampleApp({
             />
             Grid mode
           </label>
-          <label>
-            <input
-              type="checkbox"
-              checked={renderScrollbars}
-              onChange={() => setRenderScrollbars(!renderScrollbars)}
-            />
-            Render scrollbars
-          </label>
           <label>
             <input
               type="checkbox"

excalidraw-app/App.tsx

@@ -4,6 +4,7 @@ import {
   TTDDialogTrigger,
   CaptureUpdateAction,
   reconcileElements,
+  getCommonBounds,
 } from "@excalidraw/excalidraw";
 import { trackEvent } from "@excalidraw/excalidraw/analytics";
 import { getDefaultAppState } from "@excalidraw/excalidraw/appState";
@@ -47,19 +48,31 @@ import {
   share,
   youtubeIcon,
 } from "@excalidraw/excalidraw/components/icons";
-import { isElementLink } from "@excalidraw/element";
+import { isElementLink } from "@excalidraw/element/elementLink";
 import { restore, restoreAppState } from "@excalidraw/excalidraw/data/restore";
-import { newElementWith } from "@excalidraw/element";
+import { newElementWith } from "@excalidraw/element/mutateElement";
-import { isInitializedImageElement } from "@excalidraw/element";
+import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
 import clsx from "clsx";
 import {
   parseLibraryTokensFromUrl,
   useHandleLibrary,
 } from "@excalidraw/excalidraw/data/library";
 
+import { getSelectedElements } from "@excalidraw/element/selection";
+
+import {
+  decodeConstraints,
+  encodeConstraints,
+} from "@excalidraw/excalidraw/scene/scrollConstraints";
+
+import { useApp } from "@excalidraw/excalidraw/components/App";
+
+import { clamp } from "@excalidraw/math";
+
 import type { RemoteExcalidrawElement } from "@excalidraw/excalidraw/data/reconcile";
 import type { RestoredDataState } from "@excalidraw/excalidraw/data/restore";
 import type {
+  ExcalidrawElement,
   FileId,
   NonDeletedExcalidrawElement,
   OrderedExcalidrawElement,
@@ -70,8 +83,9 @@ import type {
   BinaryFiles,
   ExcalidrawInitialDataState,
   UIAppState,
+  ScrollConstraints,
 } from "@excalidraw/excalidraw/types";
-import type { ResolutionType } from "@excalidraw/common/utility-types";
+import type { Merge, ResolutionType } from "@excalidraw/common/utility-types";
 import type { ResolvablePromise } from "@excalidraw/common/utils";
 
 import CustomStats from "./CustomStats";
@@ -141,6 +155,274 @@ import type { CollabAPI } from "./collab/Collab";
 
 polyfill();
 
+type DebugScrollConstraints = Merge<
+  ScrollConstraints,
+  { viewportZoomFactor: number; enabled: boolean }
+>;
+
+const ConstraintsSettings = ({
+  initialConstraints,
+  excalidrawAPI,
+}: {
+  initialConstraints: DebugScrollConstraints;
+  excalidrawAPI: ExcalidrawImperativeAPI;
+}) => {
+  const [constraints, setConstraints] =
+    useState<DebugScrollConstraints>(initialConstraints);
+
+  const app = useApp();
+  const frames = app.scene.getNonDeletedFramesLikes();
+  const [activeFrameId, setActiveFrameId] = useState<string | null>(null);
+
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    params.set("constraints", encodeConstraints(constraints));
+    history.replaceState(null, "", `?${params.toString()}`);
+
+    constraints.enabled
+      ? excalidrawAPI.setScrollConstraints(constraints)
+      : excalidrawAPI.setScrollConstraints(null);
+  }, [constraints, excalidrawAPI]);
+
+  useEffect(() => {
+    const frame = frames.find((frame) => frame.id === activeFrameId);
+    if (frame) {
+      const { x, y, width, height } = frame;
+      setConstraints((s) => ({
+        x: Math.round(x),
+        y: Math.round(y),
+        width: Math.round(width),
+        height: Math.round(height),
+        enabled: s.enabled,
+        viewportZoomFactor: s.viewportZoomFactor,
+        lockZoom: s.lockZoom,
+      }));
+    }
+  }, [activeFrameId, frames]);
+
+  const [selection, setSelection] = useState<ExcalidrawElement[]>([]);
+  useEffect(() => {
+    return excalidrawAPI.onChange((elements, appState) => {
+      setSelection(getSelectedElements(elements, appState));
+    });
+  }, [excalidrawAPI]);
+
+  const parseValue = (
+    value: string,
+    opts?: {
+      min?: number;
+      max?: number;
+    },
+  ) => {
+    const { min = -Infinity, max = Infinity } = opts || {};
+    let parsedValue = parseInt(value);
+    if (isNaN(parsedValue)) {
+      parsedValue = 0;
+    }
+    return clamp(parsedValue, min, max);
+  };
+
+  const inputStyle = {
+    width: "4rem",
+    height: "1rem",
+  };
+
+  return (
+    <div
+      style={{
+        position: "fixed",
+        bottom: 10,
+        left: "calc(50%)",
+        transform: "translateX(-50%)",
+        zIndex: 999999,
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        flexDirection: "column",
+        gap: "0.5rem",
+      }}
+    >
+      <div
+        style={{
+          display: "flex",
+          gap: "0.6rem",
+          alignItems: "center",
+        }}
+      >
+        enabled:{" "}
+        <input
+          type="checkbox"
+          defaultChecked={!!constraints.enabled}
+          onChange={(e) =>
+            setConstraints((s) => ({ ...s, enabled: e.target.checked }))
+          }
+        />
+        x:{" "}
+        <input
+          placeholder="x"
+          type="number"
+          step={"10"}
+          value={constraints.x.toString()}
+          onChange={(e) => {
+            setConstraints((s) => ({
+              ...s,
+              x: parseValue(e.target.value),
+            }));
+          }}
+          style={inputStyle}
+        />
+        y:{" "}
+        <input
+          placeholder="y"
+          type="number"
+          step={"10"}
+          value={constraints.y.toString()}
+          onChange={(e) =>
+            setConstraints((s) => ({
+              ...s,
+              y: parseValue(e.target.value),
+            }))
+          }
+          style={inputStyle}
+        />
+        w:{" "}
+        <input
+          placeholder="width"
+          type="number"
+          step={"10"}
+          value={constraints.width.toString()}
+          onChange={(e) =>
+            setConstraints((s) => ({
+              ...s,
+              width: parseValue(e.target.value, {
+                min: 200,
+              }),
+            }))
+          }
+          style={inputStyle}
+        />
+        h:{" "}
+        <input
+          placeholder="height"
+          type="number"
+          step={"10"}
+          value={constraints.height.toString()}
+          onChange={(e) =>
+            setConstraints((s) => ({
+              ...s,
+              height: parseValue(e.target.value, {
+                min: 200,
+              }),
+            }))
+          }
+          style={inputStyle}
+        />
+        zoomFactor:
+        <input
+          placeholder="zoom factor"
+          type="number"
+          min="0.1"
+          max="1"
+          step="0.1"
+          value={constraints.viewportZoomFactor.toString()}
+          onChange={(e) =>
+            setConstraints((s) => ({
+              ...s,
+              viewportZoomFactor: parseFloat(e.target.value.toString()) ?? 0.7,
+            }))
+          }
+          style={inputStyle}
+        />
+        overscrollAllowance:
+        <input
+          placeholder="overscroll allowance"
+          type="number"
+          min="0"
+          max="1"
+          step="0.1"
+          value={constraints.overscrollAllowance?.toString()}
+          onChange={(e) =>
+            setConstraints((s) => ({
+              ...s,
+              overscrollAllowance: parseFloat(e.target.value.toString()) ?? 0.5,
+            }))
+          }
+          style={inputStyle}
+        />
+        lockZoom:{" "}
+        <input
+          type="checkbox"
+          defaultChecked={!!constraints.lockZoom}
+          onChange={(e) =>
+            setConstraints((s) => ({ ...s, lockZoom: e.target.checked }))
+          }
+          value={constraints.lockZoom?.toString()}
+        />
+        {selection.length > 0 && (
+          <button
+            onClick={() => {
+              const bbox = getCommonBounds(selection);
+              setConstraints((s) => ({
+                ...s,
+                x: Math.round(bbox[0]),
+                y: Math.round(bbox[1]),
+                width: Math.round(bbox[2] - bbox[0]),
+                height: Math.round(bbox[3] - bbox[1]),
+              }));
+            }}
+          >
+            use selection
+          </button>
+        )}
+      </div>
+
+      {frames.length > 0 && (
+        <div
+          style={{
+            display: "flex",
+            gap: "0.6rem",
+            flexDirection: "row",
+          }}
+        >
+          <button
+            onClick={() => {
+              const currentIndex = frames.findIndex(
+                (frame) => frame.id === activeFrameId,
+              );
+
+              if (currentIndex === -1) {
+                setActiveFrameId(frames[frames.length - 1].id);
+              } else {
+                const nextIndex =
+                  (currentIndex - 1 + frames.length) % frames.length;
+                setActiveFrameId(frames[nextIndex].id);
+              }
+            }}
+          >
+            Prev
+          </button>
+          <button
+            onClick={() => {
+              const currentIndex = frames.findIndex(
+                (frame) => frame.id === activeFrameId,
+              );
+
+              if (currentIndex === -1) {
+                setActiveFrameId(frames[0].id);
+              } else {
+                const nextIndex = (currentIndex + 1) % frames.length;
+                setActiveFrameId(frames[nextIndex].id);
+              }
+            }}
+          >
+            Next
+          </button>
+        </div>
+      )}
+    </div>
+  );
+};
+
 window.EXCALIDRAW_THROTTLE_RENDER = true;
 
 declare global {
@@ -212,10 +494,20 @@ const initializeScene = async (opts: {
   )
 > => {
   const searchParams = new URLSearchParams(window.location.search);
+  const hashParams = new URLSearchParams(window.location.hash.slice(1));
   const id = searchParams.get("id");
-  const jsonBackendMatch = window.location.hash.match(
+  const shareableLink = hashParams.get("json")?.split(",");
-    /^#json=([a-zA-Z0-9_-]+),([a-zA-Z0-9_-]+)$/,
+
+  if (shareableLink) {
+    hashParams.delete("json");
+    const hash = `#${decodeURIComponent(hashParams.toString())}`;
+    window.history.replaceState(
+      {},
+      APP_NAME,
+      `${window.location.origin}${hash}`,
     );
+  }
+
   const externalUrlMatch = window.location.hash.match(/^#url=(.*)$/);
 
   const localDataState = importFromLocalStorage();
@@ -225,7 +517,7 @@ const initializeScene = async (opts: {
   } = await loadScene(null, null, localDataState);
 
   let roomLinkData = getCollaborationLinkData(window.location.href);
-  const isExternalScene = !!(id || jsonBackendMatch || roomLinkData);
+  const isExternalScene = !!(id || shareableLink || roomLinkData);
   if (isExternalScene) {
     if (
       // don't prompt if scene is empty
@@ -235,16 +527,16 @@ const initializeScene = async (opts: {
       // otherwise, prompt whether user wants to override current scene
       (await openConfirmModal(shareableLinkConfirmDialog))
     ) {
-      if (jsonBackendMatch) {
+      if (shareableLink) {
         scene = await loadScene(
-          jsonBackendMatch[1],
+          shareableLink[0],
-          jsonBackendMatch[2],
+          shareableLink[1],
           localDataState,
         );
       }
       scene.scrollToContent = true;
       if (!roomLinkData) {
-        window.history.replaceState({}, APP_NAME, window.location.origin);
+        // window.history.replaceState({}, APP_NAME, window.location.origin);
       }
     } else {
       // https://github.com/excalidraw/excalidraw/issues/1919
@@ -261,7 +553,7 @@ const initializeScene = async (opts: {
       }
 
       roomLinkData = null;
-      window.history.replaceState({}, APP_NAME, window.location.origin);
+      // window.history.replaceState({}, APP_NAME, window.location.origin);
     }
   } else if (externalUrlMatch) {
     window.history.replaceState({}, APP_NAME, window.location.origin);
@@ -322,12 +614,12 @@ const initializeScene = async (opts: {
       key: roomLinkData.roomKey,
     };
   } else if (scene) {
-    return isExternalScene && jsonBackendMatch
+    return isExternalScene && shareableLink
       ? {
           scene,
           isExternalScene,
-          id: jsonBackendMatch[1],
+          id: shareableLink[0],
-          key: jsonBackendMatch[2],
+          key: shareableLink[1],
         }
       : { scene, isExternalScene: false };
   }
@@ -739,6 +1031,32 @@ const ExcalidrawWrapper = () => {
     [setShareDialogState],
   );
 
+  const [constraints] = useState<DebugScrollConstraints>(() => {
+    const stored = new URLSearchParams(location.search.slice(1)).get(
+      "constraints",
+    );
+    let storedConstraints = {};
+    if (stored) {
+      try {
+        storedConstraints = decodeConstraints(stored);
+      } catch {
+        console.error("Invalid scroll constraints in URL");
+      }
+    }
+
+    return {
+      x: 0,
+      y: 0,
+      width: document.body.clientWidth,
+      height: document.body.clientHeight,
+      lockZoom: false,
+      viewportZoomFactor: 0.7,
+      overscrollAllowance: 0.5,
+      enabled: !isTestEnv(),
+      ...storedConstraints,
+    };
+  });
+
   // browsers generally prevent infinite self-embedding, there are
   // cases where it still happens, and while we disallow self-embedding
   // by not whitelisting our own origin, this serves as an additional guard
@@ -864,6 +1182,7 @@ const ExcalidrawWrapper = () => {
             </div>
           );
         }}
+        scrollConstraints={constraints.enabled ? constraints : undefined}
         onLinkOpen={(element, event) => {
           if (element.link && isElementLink(element.link)) {
             event.preventDefault();
@@ -871,6 +1190,12 @@ const ExcalidrawWrapper = () => {
           }
         }}
       >
+        {excalidrawAPI && !isTestEnv() && (
+          <ConstraintsSettings
+            excalidrawAPI={excalidrawAPI}
+            initialConstraints={constraints}
+          />
+        )}
         <AppMainMenu
           onCollabDialogOpen={onCollabDialogOpen}
           isCollaborating={isCollaborating}
@@ -926,22 +1251,17 @@ const ExcalidrawWrapper = () => {
         <ShareDialog
           collabAPI={collabAPI}
           onExportToBackend={async () => {
-            if (!excalidrawAPI) {
+            if (excalidrawAPI) {
-              return;
-            }
               try {
-              const { url, errorMessage } = await exportToBackend(
+                await onExportToBackend(
                   excalidrawAPI.getSceneElements(),
                   excalidrawAPI.getAppState(),
                   excalidrawAPI.getFiles(),
                 );
-              if (errorMessage) {
-                throw new Error(errorMessage);
-              }
-              setLatestShareableLink(url);
               } catch (error: any) {
                 setErrorMessage(error.message);
               }
+            }
           }}
         />
 

excalidraw-app/collab/Collab.tsx

@@ -19,9 +19,12 @@ import {
   throttleRAF,
 } from "@excalidraw/common";
 import { decryptData } from "@excalidraw/excalidraw/data/encryption";
-import { getVisibleSceneBounds } from "@excalidraw/element";
+import { getVisibleSceneBounds } from "@excalidraw/element/bounds";
-import { newElementWith } from "@excalidraw/element";
+import { newElementWith } from "@excalidraw/element/mutateElement";
-import { isImageElement, isInitializedImageElement } from "@excalidraw/element";
+import {
+  isImageElement,
+  isInitializedImageElement,
+} from "@excalidraw/element/typeChecks";
 import { AbortError } from "@excalidraw/excalidraw/errors";
 import { t } from "@excalidraw/excalidraw/i18n";
 import { withBatchedUpdates } from "@excalidraw/excalidraw/reactUtils";

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";
+import { newElementWith } from "@excalidraw/element/mutateElement";
 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="noopener">Excalidraw+</a> to get more requests.</div>
+                  }/plus?utm_source=excalidraw&utm_medium=app&utm_content=d2c" target="_blank" rel="noreferrer 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"
+      rel="noopener noreferrer"
       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="noopener"
+      rel="noreferrer"
       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";
+import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
 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";
+import { newElementWith } from "@excalidraw/element/mutateElement";
-import { isInitializedImageElement } from "@excalidraw/element";
+import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
 import { t } from "@excalidraw/excalidraw/i18n";
 
 import type {

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";
+import { isInvisiblySmallElement } from "@excalidraw/element/sizeHelpers";
-import { isInitializedImageElement } from "@excalidraw/element";
+import { isInitializedImageElement } from "@excalidraw/element/typeChecks";
 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";
+import type { SceneBounds } from "@excalidraw/element/bounds";
 import type {
   ExcalidrawElement,
   FileId,

excalidraw-app/package.json

@@ -41,8 +41,8 @@
   "prettier": "@excalidraw/prettier-config",
   "scripts": {
     "build-node": "node ./scripts/build-node.js",
-    "build:app:docker": "vite build",
+    "build:app:docker": "cross-env VITE_APP_DISABLE_SENTRY=true vite build",
-    "build:app": "vite build",
+    "build:app": "cross-env VITE_APP_GIT_SHA=$VERCEL_GIT_COMMIT_SHA cross-env VITE_APP_ENABLE_TRACKING=true 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="noopener"
+      rel="noreferrer"
       target="_blank"
     >
       <div

excalidraw-app/tests/collab.test.tsx

@@ -3,15 +3,11 @@ import {
   createRedoAction,
   createUndoAction,
 } from "@excalidraw/excalidraw/actions/actionHistory";
-import { syncInvalidIndices } from "@excalidraw/element";
+import { syncInvalidIndices } from "@excalidraw/element/fractionalIndex";
 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;
@@ -69,79 +65,6 @@ 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 = {
@@ -199,7 +122,7 @@ describe("collaboration", () => {
       expect(h.elements).toEqual([expect.objectContaining(rect1Props)]);
     });
 
-    const undoAction = createUndoAction(h.history);
+    const undoAction = createUndoAction(h.history, h.store);
     act(() => h.app.actionManager.executeAction(undoAction));
 
     // with explicit undo (as addition) we expect our item to be restored from the snapshot!
@@ -231,7 +154,7 @@ describe("collaboration", () => {
       expect(h.elements).toEqual([expect.objectContaining(rect1Props)]);
     });
 
-    const redoAction = createRedoAction(h.history);
+    const redoAction = createRedoAction(h.history, h.store);
     act(() => h.app.actionManager.executeAction(redoAction));
 
     // with explicit redo (as removal) we again restore the element from the snapshot!

package.json

@@ -33,7 +33,6 @@
     "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",
@@ -79,8 +78,8 @@
     "autorelease": "node scripts/autorelease.js",
     "prerelease:excalidraw": "node scripts/prerelease.js",
     "release:excalidraw": "node scripts/release.js",
-    "rm:build": "rimraf --glob excalidraw-app/build excalidraw-app/dist excalidraw-app/dev-dist packages/*/dist packages/*/build examples/*/build examples/*/dist",
+    "rm:build": "rm -rf excalidraw-app/{build,dist,dev-dist} && rm -rf packages/*/{dist,build} && rm -rf examples/*/{build,dist}",
-    "rm:node_modules": "rimraf --glob node_modules excalidraw-app/node_modules packages/*/node_modules",
+    "rm:node_modules": "rm -rf node_modules && rm -rf excalidraw-app/node_modules && rm -rf 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": "./dist/types/common/src/*.d.ts"
+      "types": "./../common/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": "rimraf types && tsc",
+    "gen:types": "rm -rf types && tsc",
-    "build:esm": "rimraf dist && node ../../scripts/buildBase.js && yarn gen:types"
+    "build:esm": "rm -rf dist && node ../../scripts/buildBase.js && yarn gen:types"
   }
 }

packages/common/src/constants.ts

@@ -10,7 +10,6 @@ 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;
@@ -120,7 +119,6 @@ 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";
@@ -144,7 +142,6 @@ export const FONT_FAMILY = {
   "Lilita One": 7,
   "Comic Shanns": 8,
   "Liberation Sans": 9,
-  Assistant: 10,
 };
 
 export const FONT_FAMILY_FALLBACKS = {
@@ -256,7 +253,7 @@ export const EXPORT_DATA_TYPES = {
   excalidrawClipboardWithAPI: "excalidraw-api/clipboard",
 } as const;
 
-export const getExportSource = () =>
+export const EXPORT_SOURCE =
   window.EXCALIDRAW_EXPORT_SOURCE || window.location.origin;
 
 // time in milliseconds
@@ -322,9 +319,6 @@ export const DEFAULT_MAX_IMAGE_WIDTH_OR_HEIGHT = 1440;
 export const MAX_ALLOWED_FILE_BYTES = 4 * 1024 * 1024;
 
 export const SVG_NS = "http://www.w3.org/2000/svg";
-export const SVG_DOCUMENT_PREAMBLE = `<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-`;
 
 export const ENCRYPTION_KEY_BITS = 128;
 

packages/common/src/font-metadata.ts

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

packages/common/src/index.ts

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

packages/common/src/utility-types.ts

@@ -68,12 +68,3 @@ 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];
-};
-
-export type MapEntry<M extends Map<any, any>> = M extends Map<infer K, infer V>
-  ? [K, V]
-  : never;

packages/common/src/utils.test.ts

@@ -1,82 +0,0 @@
-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,20 +544,6 @@ 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";
@@ -694,7 +680,7 @@ export const arrayToMap = <T extends { id: string } | string>(
   return items.reduce((acc: Map<string, T>, element) => {
     acc.set(typeof element === "string" ? element : element.id, element);
     return acc;
-  }, new Map() as Map<string, T>);
+  }, new Map());
 };
 
 export const arrayToMapWithIndex = <T extends { id: string }>(
@@ -749,25 +735,6 @@ 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;
@@ -1251,46 +1218,3 @@ export const elementCenterPoint = (
 
   return pointFrom<GlobalPoint>(centerXPoint, centerYPoint);
 };
-
-/** hack for Array.isArray type guard not working with readonly value[] */
-export const isReadonlyArray = (value?: any): value is readonly any[] => {
-  return Array.isArray(value);
-};
-
-export const sizeOf = (
-  value:
-    | readonly unknown[]
-    | Readonly<Map<string, unknown>>
-    | Readonly<Record<string, unknown>>
-    | ReadonlySet<unknown>,
-): number => {
-  return isReadonlyArray(value)
-    ? value.length
-    : 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/element/package.json

@@ -13,7 +13,7 @@
       "default": "./dist/prod/index.js"
     },
     "./*": {
-      "types": "./dist/types/element/src/*.d.ts"
+      "types": "./../element/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": "rimraf types && tsc",
+    "gen:types": "rm -rf types && tsc",
-    "build:esm": "rimraf dist && node ../../scripts/buildBase.js && yarn gen:types"
+    "build:esm": "rm -rf dist && node ../../scripts/buildBase.js && yarn gen:types"
   }
 }

packages/element/src/align.ts

@@ -1,11 +1,12 @@
+import type Scene from "@excalidraw/excalidraw/scene/Scene";
+
 import { updateBoundElements } from "./binding";
 import { getCommonBoundingBox } from "./bounds";
+import { mutateElement } from "./mutateElement";
 import { getMaximumGroups } from "./groups";
 
-import type { Scene } from "./Scene";
-
 import type { BoundingBox } from "./bounds";
-import type { ExcalidrawElement } from "./types";
+import type { ElementsMap, ExcalidrawElement } from "./types";
 
 export interface Alignment {
   position: "start" | "center" | "end";
@@ -14,10 +15,10 @@ export interface Alignment {
 
 export const alignElements = (
   selectedElements: ExcalidrawElement[],
+  elementsMap: ElementsMap,
   alignment: Alignment,
   scene: Scene,
 ): ExcalidrawElement[] => {
-  const elementsMap = scene.getNonDeletedElementsMap();
   const groups: ExcalidrawElement[][] = getMaximumGroups(
     selectedElements,
     elementsMap,
@@ -32,13 +33,12 @@ export const alignElements = (
     );
     return group.map((element) => {
       // update element
-      const updatedEle = scene.mutateElement(element, {
+      const updatedEle = mutateElement(element, {
         x: element.x + translation.x,
         y: element.y + translation.y,
       });
-
       // update bound elements
-      updateBoundElements(element, scene, {
+      updateBoundElements(element, scene.getNonDeletedElementsMap(), {
         simultaneouslyUpdated: group,
       });
       return updatedEle;

packages/element/src/binding.ts

@@ -31,9 +31,11 @@ import { isPointOnShape } from "@excalidraw/utils/collision";
 
 import type { LocalPoint, Radians } from "@excalidraw/math";
 
+import type Scene from "@excalidraw/excalidraw/scene/Scene";
+
 import type { AppState } from "@excalidraw/excalidraw/types";
 
-import type { MapEntry, Mutable } from "@excalidraw/common/utility-types";
+import type { Mutable } from "@excalidraw/common/utility-types";
 
 import {
   getCenterForBounds,
@@ -54,6 +56,7 @@ import { getBoundTextElement, handleBindTextResize } from "./textElement";
 import {
   isArrowElement,
   isBindableElement,
+  isBindingElement,
   isBoundToContainer,
   isElbowArrow,
   isFixedPointBinding,
@@ -66,8 +69,6 @@ import {
 import { aabbForElement, getElementShape, pointInsideBounds } from "./shapes";
 import { updateElbowArrowPoints } from "./elbowArrow";
 
-import type { Scene } from "./Scene";
-
 import type { Bounds } from "./bounds";
 import type { ElementUpdate } from "./mutateElement";
 import type {
@@ -81,10 +82,11 @@ import type {
   NonDeletedSceneElementsMap,
   ExcalidrawTextElement,
   ExcalidrawArrowElement,
+  OrderedExcalidrawElement,
   ExcalidrawElbowArrowElement,
   FixedPoint,
+  SceneElementsMap,
   FixedPointBinding,
-  PointsPositionUpdates,
 } from "./types";
 
 export type SuggestedBinding =
@@ -129,6 +131,7 @@ export const bindOrUnbindLinearElement = (
   linearElement: NonDeleted<ExcalidrawLinearElement>,
   startBindingElement: ExcalidrawBindableElement | null | "keep",
   endBindingElement: ExcalidrawBindableElement | null | "keep",
+  elementsMap: NonDeletedSceneElementsMap,
   scene: Scene,
 ): void => {
   const boundToElementIds: Set<ExcalidrawBindableElement["id"]> = new Set();
@@ -140,7 +143,7 @@ export const bindOrUnbindLinearElement = (
     "start",
     boundToElementIds,
     unboundFromElementIds,
-    scene,
+    elementsMap,
   );
   bindOrUnbindLinearElementEdge(
     linearElement,
@@ -149,7 +152,7 @@ export const bindOrUnbindLinearElement = (
     "end",
     boundToElementIds,
     unboundFromElementIds,
-    scene,
+    elementsMap,
   );
 
   const onlyUnbound = Array.from(unboundFromElementIds).filter(
@@ -157,7 +160,7 @@ export const bindOrUnbindLinearElement = (
   );
 
   getNonDeletedElements(scene, onlyUnbound).forEach((element) => {
-    scene.mutateElement(element, {
+    mutateElement(element, {
       boundElements: element.boundElements?.filter(
         (element) =>
           element.type !== "arrow" || element.id !== linearElement.id,
@@ -175,7 +178,7 @@ const bindOrUnbindLinearElementEdge = (
   boundToElementIds: Set<ExcalidrawBindableElement["id"]>,
   // Is mutated
   unboundFromElementIds: Set<ExcalidrawBindableElement["id"]>,
-  scene: Scene,
+  elementsMap: NonDeletedSceneElementsMap,
 ): void => {
   // "keep" is for method chaining convenience, a "no-op", so just bail out
   if (bindableElement === "keep") {
@@ -184,7 +187,7 @@ const bindOrUnbindLinearElementEdge = (
 
   // null means break the bind, so nothing to consider here
   if (bindableElement === null) {
-    const unbound = unbindLinearElement(linearElement, startOrEnd, scene);
+    const unbound = unbindLinearElement(linearElement, startOrEnd);
     if (unbound != null) {
       unboundFromElementIds.add(unbound);
     }
@@ -207,11 +210,16 @@ const bindOrUnbindLinearElementEdge = (
         : startOrEnd === "start" ||
           otherEdgeBindableElement.id !== bindableElement.id)
     ) {
-      bindLinearElement(linearElement, bindableElement, startOrEnd, scene);
+      bindLinearElement(
+        linearElement,
+        bindableElement,
+        startOrEnd,
+        elementsMap,
+      );
       boundToElementIds.add(bindableElement.id);
     }
   } else {
-    bindLinearElement(linearElement, bindableElement, startOrEnd, scene);
+    bindLinearElement(linearElement, bindableElement, startOrEnd, elementsMap);
     boundToElementIds.add(bindableElement.id);
   }
 };
@@ -276,6 +284,15 @@ 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
@@ -287,6 +304,15 @@ 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];
@@ -337,9 +363,11 @@ const getBindingStrategyForDraggingArrowOrJoints = (
 
 export const bindOrUnbindLinearElements = (
   selectedElements: NonDeleted<ExcalidrawLinearElement>[],
+  elementsMap: NonDeletedSceneElementsMap,
+  elements: readonly NonDeletedExcalidrawElement[],
+  scene: Scene,
   isBindingEnabled: boolean,
   draggingPoints: readonly number[] | null,
-  scene: Scene,
   zoom?: AppState["zoom"],
 ): void => {
   selectedElements.forEach((selectedElement) => {
@@ -349,20 +377,20 @@ export const bindOrUnbindLinearElements = (
           selectedElement,
           isBindingEnabled,
           draggingPoints ?? [],
-          scene.getNonDeletedElementsMap(),
+          elementsMap,
-          scene.getNonDeletedElements(),
+          elements,
           zoom,
         )
       : // The arrow itself (the shaft) or the inner joins are dragged
         getBindingStrategyForDraggingArrowOrJoints(
           selectedElement,
-          scene.getNonDeletedElementsMap(),
+          elementsMap,
-          scene.getNonDeletedElements(),
+          elements,
           isBindingEnabled,
           zoom,
         );
 
-    bindOrUnbindLinearElement(selectedElement, start, end, scene);
+    bindOrUnbindLinearElement(selectedElement, start, end, elementsMap, scene);
   });
 };
 
@@ -402,17 +430,15 @@ export const maybeBindLinearElement = (
   linearElement: NonDeleted<ExcalidrawLinearElement>,
   appState: AppState,
   pointerCoords: { x: number; y: number },
-  scene: Scene,
+  elementsMap: NonDeletedSceneElementsMap,
+  elements: readonly NonDeletedExcalidrawElement[],
 ): void => {
-  const elements = scene.getNonDeletedElements();
-  const elementsMap = scene.getNonDeletedElementsMap();
-
   if (appState.startBoundElement != null) {
     bindLinearElement(
       linearElement,
       appState.startBoundElement,
       "start",
-      scene,
+      elementsMap,
     );
   }
 
@@ -433,7 +459,7 @@ export const maybeBindLinearElement = (
         "end",
       )
     ) {
-      bindLinearElement(linearElement, hoveredElement, "end", scene);
+      bindLinearElement(linearElement, hoveredElement, "end", elementsMap);
     }
   }
 };
@@ -462,7 +488,7 @@ export const bindLinearElement = (
   linearElement: NonDeleted<ExcalidrawLinearElement>,
   hoveredElement: ExcalidrawBindableElement,
   startOrEnd: "start" | "end",
-  scene: Scene,
+  elementsMap: NonDeletedSceneElementsMap,
 ): void => {
   if (!isArrowElement(linearElement)) {
     return;
@@ -475,7 +501,7 @@ export const bindLinearElement = (
         linearElement,
         hoveredElement,
         startOrEnd,
-        scene.getNonDeletedElementsMap(),
+        elementsMap,
       ),
       hoveredElement,
     ),
@@ -488,17 +514,18 @@ export const bindLinearElement = (
         linearElement,
         hoveredElement,
         startOrEnd,
+        elementsMap,
       ),
     };
   }
 
-  scene.mutateElement(linearElement, {
+  mutateElement(linearElement, {
     [startOrEnd === "start" ? "startBinding" : "endBinding"]: binding,
   });
 
   const boundElementsMap = arrayToMap(hoveredElement.boundElements || []);
   if (!boundElementsMap.has(linearElement.id)) {
-    scene.mutateElement(hoveredElement, {
+    mutateElement(hoveredElement, {
       boundElements: (hoveredElement.boundElements || []).concat({
         id: linearElement.id,
         type: "arrow",
@@ -540,14 +567,13 @@ const isLinearElementSimple = (
 const unbindLinearElement = (
   linearElement: NonDeleted<ExcalidrawLinearElement>,
   startOrEnd: "start" | "end",
-  scene: Scene,
 ): ExcalidrawBindableElement["id"] | null => {
   const field = startOrEnd === "start" ? "startBinding" : "endBinding";
   const binding = linearElement[field];
   if (binding == null) {
     return null;
   }
-  scene.mutateElement(linearElement, { [field]: null });
+  mutateElement(linearElement, { [field]: null });
   return binding.elementId;
 };
 
@@ -710,30 +736,25 @@ 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,
+  elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,
   options?: {
     simultaneouslyUpdated?: readonly ExcalidrawElement[];
     newSize?: { width: number; height: number };
-    changedElements?: Map<string, ExcalidrawElement>;
+    changedElements?: Map<string, OrderedExcalidrawElement>;
   },
 ) => {
-  if (!isBindableElement(changedElement)) {
-    return;
-  }
-
   const { newSize, simultaneouslyUpdated } = options ?? {};
   const simultaneouslyUpdatedElementIds = getSimultaneouslyUpdatedElementIds(
     simultaneouslyUpdated,
   );
 
-  let elementsMap: ElementsMap = scene.getNonDeletedElementsMap();
+  if (!isBindableElement(changedElement)) {
-  if (options?.changedElements) {
+    return;
-    elementsMap = new Map(elementsMap) as typeof elementsMap;
-    options.changedElements.forEach((element) => {
-      elementsMap.set(element.id, element);
-    });
   }
 
   boundElementsVisitor(elementsMap, changedElement, (element) => {
@@ -776,7 +797,7 @@ export const updateBoundElements = (
 
     // `linearElement` is being moved/scaled already, just update the binding
     if (simultaneouslyUpdatedElementIds.has(element.id)) {
-      scene.mutateElement(element, bindings);
+      mutateElement(element, bindings, true);
       return;
     }
 
@@ -802,56 +823,48 @@ export const updateBoundElements = (
             bindableElement,
             elementsMap,
           );
-
           if (point) {
-            return [
+            return {
+              index:
                 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, new Map(updates), {
+    LinearElementEditor.movePoints(
+      element,
+      updates,
+      {
         ...(changedElement.id === element.startBinding?.elementId
           ? { startBinding: bindings.startBinding }
           : {}),
         ...(changedElement.id === element.endBinding?.elementId
           ? { endBinding: bindings.endBinding }
           : {}),
-    });
+      },
+      elementsMap as NonDeletedSceneElementsMap,
+    );
 
     const boundText = getBoundTextElement(element, elementsMap);
     if (boundText && !boundText.isDeleted) {
-      handleBindTextResize(element, scene, false);
+      handleBindTextResize(element, elementsMap, false);
     }
   });
 };
 
-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,
@@ -873,6 +886,7 @@ export const getHeadingForElbowArrowSnap = (
   otherPoint: Readonly<GlobalPoint>,
   bindableElement: ExcalidrawBindableElement | undefined | null,
   aabb: Bounds | undefined | null,
+  elementsMap: ElementsMap,
   origPoint: GlobalPoint,
   zoom?: AppState["zoom"],
 ): Heading => {
@@ -882,7 +896,12 @@ export const getHeadingForElbowArrowSnap = (
     return otherPointHeading;
   }
 
-  const distance = getDistanceForBinding(origPoint, bindableElement, zoom);
+  const distance = getDistanceForBinding(
+    origPoint,
+    bindableElement,
+    elementsMap,
+    zoom,
+  );
 
   if (!distance) {
     return vectorToHeading(
@@ -896,6 +915,7 @@ export const getHeadingForElbowArrowSnap = (
 const getDistanceForBinding = (
   point: Readonly<GlobalPoint>,
   bindableElement: ExcalidrawBindableElement,
+  elementsMap: ElementsMap,
   zoom?: AppState["zoom"],
 ) => {
   const distance = distanceToBindableElement(bindableElement, point);
@@ -1166,48 +1186,6 @@ 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;
@@ -1239,6 +1217,7 @@ const updateBoundPoint = (
         linearElement,
         bindableElement,
         startOrEnd === "startBinding" ? "start" : "end",
+        elementsMap,
       ).fixedPoint;
     const globalMidPoint = elementCenterPoint(bindableElement);
     const global = pointFrom<GlobalPoint>(
@@ -1342,6 +1321,7 @@ export const calculateFixedPointForElbowArrowBinding = (
   linearElement: NonDeleted<ExcalidrawElbowArrowElement>,
   hoveredElement: ExcalidrawBindableElement,
   startOrEnd: "start" | "end",
+  elementsMap: ElementsMap,
 ): { fixedPoint: FixedPoint } => {
   const bounds = [
     hoveredElement.x,
@@ -1429,19 +1409,19 @@ const getLinearElementEdgeCoors = (
 };
 
 export const fixDuplicatedBindingsAfterDuplication = (
-  duplicatedElements: ExcalidrawElement[],
+  newElements: ExcalidrawElement[],
-  origIdToDuplicateId: Map<ExcalidrawElement["id"], ExcalidrawElement["id"]>,
+  oldIdToDuplicatedId: Map<ExcalidrawElement["id"], ExcalidrawElement["id"]>,
-  duplicateElementsMap: NonDeletedSceneElementsMap,
+  duplicatedElementsMap: NonDeletedSceneElementsMap,
 ) => {
-  for (const duplicateElement of duplicatedElements) {
+  for (const element of newElements) {
-    if ("boundElements" in duplicateElement && duplicateElement.boundElements) {
+    if ("boundElements" in element && element.boundElements) {
-      Object.assign(duplicateElement, {
+      Object.assign(element, {
-        boundElements: duplicateElement.boundElements.reduce(
+        boundElements: element.boundElements.reduce(
           (
             acc: Mutable<NonNullable<ExcalidrawElement["boundElements"]>>,
             binding,
           ) => {
-            const newBindingId = origIdToDuplicateId.get(binding.id);
+            const newBindingId = oldIdToDuplicatedId.get(binding.id);
             if (newBindingId) {
               acc.push({ ...binding, id: newBindingId });
             }
@@ -1452,47 +1432,46 @@ export const fixDuplicatedBindingsAfterDuplication = (
       });
     }
 
-    if ("containerId" in duplicateElement && duplicateElement.containerId) {
+    if ("containerId" in element && element.containerId) {
-      Object.assign(duplicateElement, {
+      Object.assign(element, {
-        containerId:
+        containerId: oldIdToDuplicatedId.get(element.containerId) ?? null,
-          origIdToDuplicateId.get(duplicateElement.containerId) ?? null,
       });
     }
 
-    if ("endBinding" in duplicateElement && duplicateElement.endBinding) {
+    if ("endBinding" in element && element.endBinding) {
-      const newEndBindingId = origIdToDuplicateId.get(
+      const newEndBindingId = oldIdToDuplicatedId.get(
-        duplicateElement.endBinding.elementId,
+        element.endBinding.elementId,
       );
-      Object.assign(duplicateElement, {
+      Object.assign(element, {
         endBinding: newEndBindingId
           ? {
-              ...duplicateElement.endBinding,
+              ...element.endBinding,
               elementId: newEndBindingId,
             }
           : null,
       });
     }
-    if ("startBinding" in duplicateElement && duplicateElement.startBinding) {
+    if ("startBinding" in element && element.startBinding) {
-      const newEndBindingId = origIdToDuplicateId.get(
+      const newEndBindingId = oldIdToDuplicatedId.get(
-        duplicateElement.startBinding.elementId,
+        element.startBinding.elementId,
       );
-      Object.assign(duplicateElement, {
+      Object.assign(element, {
         startBinding: newEndBindingId
           ? {
-              ...duplicateElement.startBinding,
+              ...element.startBinding,
               elementId: newEndBindingId,
             }
           : null,
       });
     }
 
-    if (isElbowArrow(duplicateElement)) {
+    if (isElbowArrow(element)) {
       Object.assign(
-        duplicateElement,
+        element,
-        updateElbowArrowPoints(duplicateElement, duplicateElementsMap, {
+        updateElbowArrowPoints(element, duplicatedElementsMap, {
           points: [
-            duplicateElement.points[0],
+            element.points[0],
-            duplicateElement.points[duplicateElement.points.length - 1],
+            element.points[element.points.length - 1],
           ],
         }),
       );
@@ -1500,6 +1479,196 @@ export const fixDuplicatedBindingsAfterDuplication = (
   }
 };
 
+const fixReversedBindingsForBindables = (
+  original: ExcalidrawBindableElement,
+  duplicate: ExcalidrawBindableElement,
+  originalElements: Map<string, ExcalidrawElement>,
+  elementsWithClones: ExcalidrawElement[],
+  oldIdToDuplicatedId: Map<ExcalidrawElement["id"], ExcalidrawElement["id"]>,
+) => {
+  original.boundElements?.forEach((binding, idx) => {
+    if (binding.type !== "arrow") {
+      return;
+    }
+
+    const oldArrow = elementsWithClones.find((el) => el.id === binding.id);
+
+    if (!isBindingElement(oldArrow)) {
+      return;
+    }
+
+    if (originalElements.has(binding.id)) {
+      // Linked arrow is in the selection, so find the duplicate pair
+      const newArrowId = oldIdToDuplicatedId.get(binding.id) ?? binding.id;
+      const newArrow = elementsWithClones.find(
+        (el) => el.id === newArrowId,
+      )! as ExcalidrawArrowElement;
+
+      mutateElement(newArrow, {
+        startBinding:
+          oldArrow.startBinding?.elementId === binding.id
+            ? {
+                ...oldArrow.startBinding,
+                elementId: duplicate.id,
+              }
+            : newArrow.startBinding,
+        endBinding:
+          oldArrow.endBinding?.elementId === binding.id
+            ? {
+                ...oldArrow.endBinding,
+                elementId: duplicate.id,
+              }
+            : newArrow.endBinding,
+      });
+      mutateElement(duplicate, {
+        boundElements: [
+          ...(duplicate.boundElements ?? []).filter(
+            (el) => el.id !== binding.id && el.id !== newArrowId,
+          ),
+          {
+            type: "arrow",
+            id: newArrowId,
+          },
+        ],
+      });
+    } else {
+      // Linked arrow is outside the selection,
+      // so we move the binding to the duplicate
+      mutateElement(oldArrow, {
+        startBinding:
+          oldArrow.startBinding?.elementId === original.id
+            ? {
+                ...oldArrow.startBinding,
+                elementId: duplicate.id,
+              }
+            : oldArrow.startBinding,
+        endBinding:
+          oldArrow.endBinding?.elementId === original.id
+            ? {
+                ...oldArrow.endBinding,
+                elementId: duplicate.id,
+              }
+            : oldArrow.endBinding,
+      });
+      mutateElement(duplicate, {
+        boundElements: [
+          ...(duplicate.boundElements ?? []),
+          {
+            type: "arrow",
+            id: oldArrow.id,
+          },
+        ],
+      });
+      mutateElement(original, {
+        boundElements:
+          original.boundElements?.filter((_, i) => i !== idx) ?? null,
+      });
+    }
+  });
+};
+
+const fixReversedBindingsForArrows = (
+  original: ExcalidrawArrowElement,
+  duplicate: ExcalidrawArrowElement,
+  originalElements: Map<string, ExcalidrawElement>,
+  bindingProp: "startBinding" | "endBinding",
+  oldIdToDuplicatedId: Map<ExcalidrawElement["id"], ExcalidrawElement["id"]>,
+  elementsWithClones: ExcalidrawElement[],
+) => {
+  const oldBindableId = original[bindingProp]?.elementId;
+
+  if (oldBindableId) {
+    if (originalElements.has(oldBindableId)) {
+      // Linked element is in the selection
+      const newBindableId =
+        oldIdToDuplicatedId.get(oldBindableId) ?? oldBindableId;
+      const newBindable = elementsWithClones.find(
+        (el) => el.id === newBindableId,
+      ) as ExcalidrawBindableElement;
+      mutateElement(duplicate, {
+        [bindingProp]: {
+          ...original[bindingProp],
+          elementId: newBindableId,
+        },
+      });
+      mutateElement(newBindable, {
+        boundElements: [
+          ...(newBindable.boundElements ?? []).filter(
+            (el) => el.id !== original.id && el.id !== duplicate.id,
+          ),
+          {
+            id: duplicate.id,
+            type: "arrow",
+          },
+        ],
+      });
+    } else {
+      // Linked element is outside the selection
+      const originalBindable = elementsWithClones.find(
+        (el) => el.id === oldBindableId,
+      );
+      if (originalBindable) {
+        mutateElement(duplicate, {
+          [bindingProp]: original[bindingProp],
+        });
+        mutateElement(original, {
+          [bindingProp]: null,
+        });
+        mutateElement(originalBindable, {
+          boundElements: [
+            ...(originalBindable.boundElements?.filter(
+              (el) => el.id !== original.id,
+            ) ?? []),
+            {
+              id: duplicate.id,
+              type: "arrow",
+            },
+          ],
+        });
+      }
+    }
+  }
+};
+
+export const fixReversedBindings = (
+  originalElements: Map<string, ExcalidrawElement>,
+  elementsWithClones: ExcalidrawElement[],
+  oldIdToDuplicatedId: Map<ExcalidrawElement["id"], ExcalidrawElement["id"]>,
+) => {
+  for (const original of originalElements.values()) {
+    const duplicate = elementsWithClones.find(
+      (el) => el.id === oldIdToDuplicatedId.get(original.id),
+    )!;
+
+    if (isBindableElement(original) && isBindableElement(duplicate)) {
+      fixReversedBindingsForBindables(
+        original,
+        duplicate,
+        originalElements,
+        elementsWithClones,
+        oldIdToDuplicatedId,
+      );
+    } else if (isArrowElement(original) && isArrowElement(duplicate)) {
+      fixReversedBindingsForArrows(
+        original,
+        duplicate,
+        originalElements,
+        "startBinding",
+        oldIdToDuplicatedId,
+        elementsWithClones,
+      );
+      fixReversedBindingsForArrows(
+        original,
+        duplicate,
+        originalElements,
+        "endBinding",
+        oldIdToDuplicatedId,
+        elementsWithClones,
+      );
+    }
+  }
+};
+
 export const fixBindingsAfterDeletion = (
   sceneElements: readonly ExcalidrawElement[],
   deletedElements: readonly ExcalidrawElement[],
@@ -1507,12 +1676,8 @@ export const fixBindingsAfterDeletion = (
   const elements = arrayToMap(sceneElements);
 
   for (const element of deletedElements) {
-    BoundElement.unbindAffected(elements, element, (element, updates) =>
+    BoundElement.unbindAffected(elements, element, mutateElement);
-      mutateElement(element, elements, updates),
+    BindableElement.unbindAffected(elements, element, mutateElement);
-    );
-    BindableElement.unbindAffected(elements, element, (element, updates) =>
-      mutateElement(element, elements, updates),
-    );
   }
 };
 

packages/element/src/bounds.ts

@@ -1,17 +1,12 @@
 import rough from "roughjs/bin/rough";
 
-import {
+import { rescalePoints, arrayToMap, invariant } from "@excalidraw/common";
-  arrayToMap,
-  invariant,
-  rescalePoints,
-  sizeOf,
-} from "@excalidraw/common";
 
 import {
   degreesToRadians,
   lineSegment,
-  pointDistance,
   pointFrom,
+  pointDistance,
   pointFromArray,
   pointRotateRads,
 } from "@excalidraw/math";
@@ -33,8 +28,8 @@ import type { AppState } from "@excalidraw/excalidraw/types";
 
 import type { Mutable } from "@excalidraw/common/utility-types";
 
-import { generateRoughOptions } from "./Shape";
 import { ShapeCache } from "./ShapeCache";
+import { generateRoughOptions } from "./Shape";
 import { LinearElementEditor } from "./linearElementEditor";
 import { getBoundTextElement, getContainerElement } from "./textElement";
 import {
@@ -52,20 +47,19 @@ import {
   deconstructRectanguloidElement,
 } from "./utils";
 
+import type {
+  ExcalidrawElement,
+  ExcalidrawLinearElement,
+  Arrowhead,
+  ExcalidrawFreeDrawElement,
+  NonDeleted,
+  ExcalidrawTextElementWithContainer,
+  ElementsMap,
+  ExcalidrawRectanguloidElement,
+  ExcalidrawEllipseElement,
+} 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;
@@ -944,10 +938,10 @@ export const getElementBounds = (
 };
 
 export const getCommonBounds = (
-  elements: ElementsMapOrArray,
+  elements: readonly ExcalidrawElement[],
   elementsMap?: ElementsMap,
 ): Bounds => {
-  if (!sizeOf(elements)) {
+  if (!elements.length) {
     return [0, 0, 0, 0];
   }
 

packages/element/src/dragElements.ts

@@ -11,10 +11,13 @@ import type {
   PointerDownState,
 } from "@excalidraw/excalidraw/types";
 
+import type Scene from "@excalidraw/excalidraw/scene/Scene";
+
 import type { NonDeletedExcalidrawElement } from "@excalidraw/element/types";
 
 import { updateBoundElements } from "./binding";
 import { getCommonBounds } from "./bounds";
+import { mutateElement } from "./mutateElement";
 import { getPerfectElementSize } from "./sizeHelpers";
 import { getBoundTextElement } from "./textElement";
 import { getMinTextElementWidth } from "./textMeasurements";
@@ -26,8 +29,6 @@ import {
   isTextElement,
 } from "./typeChecks";
 
-import type { Scene } from "./Scene";
-
 import type { Bounds } from "./bounds";
 import type { ExcalidrawElement } from "./types";
 
@@ -103,7 +104,7 @@ export const dragSelectedElements = (
   );
 
   elementsToUpdate.forEach((element) => {
-    updateElementCoords(pointerDownState, element, scene, adjustedOffset);
+    updateElementCoords(pointerDownState, element, adjustedOffset);
     if (!isArrowElement(element)) {
       // skip arrow labels since we calculate its position during render
       const textElement = getBoundTextElement(
@@ -111,14 +112,9 @@ export const dragSelectedElements = (
         scene.getNonDeletedElementsMap(),
       );
       if (textElement) {
-        updateElementCoords(
+        updateElementCoords(pointerDownState, textElement, adjustedOffset);
-          pointerDownState,
-          textElement,
-          scene,
-          adjustedOffset,
-        );
       }
-      updateBoundElements(element, scene, {
+      updateBoundElements(element, scene.getElementsMapIncludingDeleted(), {
         simultaneouslyUpdated: Array.from(elementsToUpdate),
       });
     }
@@ -159,7 +155,6 @@ const calculateOffset = (
 const updateElementCoords = (
   pointerDownState: PointerDownState,
   element: NonDeletedExcalidrawElement,
-  scene: Scene,
   dragOffset: { x: number; y: number },
 ) => {
   const originalElement =
@@ -168,7 +163,7 @@ const updateElementCoords = (
   const nextX = originalElement.x + dragOffset.x;
   const nextY = originalElement.y + dragOffset.y;
 
-  scene.mutateElement(element, {
+  mutateElement(element, {
     x: nextX,
     y: nextY,
   });
@@ -195,7 +190,6 @@ export const dragNewElement = ({
   shouldMaintainAspectRatio,
   shouldResizeFromCenter,
   zoom,
-  scene,
   widthAspectRatio = null,
   originOffset = null,
   informMutation = true,
@@ -211,7 +205,6 @@ export const dragNewElement = ({
   shouldMaintainAspectRatio: boolean;
   shouldResizeFromCenter: boolean;
   zoom: NormalizedZoomValue;
-  scene: Scene;
   /** whether to keep given aspect ratio when `isResizeWithSidesSameLength` is
       true */
   widthAspectRatio?: number | null;
@@ -292,7 +285,7 @@ export const dragNewElement = ({
       };
     }
 
-    scene.mutateElement(
+    mutateElement(
       newElement,
       {
         x: newX + (originOffset?.x ?? 0),
@@ -302,7 +295,7 @@ export const dragNewElement = ({
         ...textAutoResize,
         ...imageInitialDimension,
       },
-      { informMutation, isDragging: false },
+      informMutation,
     );
   }
 };

packages/element/src/duplicate.ts

@@ -36,7 +36,10 @@ import {
 
 import { getBoundTextElement, getContainerElement } from "./textElement";
 
-import { fixDuplicatedBindingsAfterDuplication } from "./binding";
+import {
+  fixDuplicatedBindingsAfterDuplication,
+  fixReversedBindings,
+} from "./binding";
 
 import type {
   ElementsMap,
@@ -57,14 +60,16 @@ import type {
  *                               multiple elements at once, share this map
  *                               amongst all of them
  * @param element Element to duplicate
+ * @param overrides Any element properties to override
  */
 export const duplicateElement = <TElement extends ExcalidrawElement>(
   editingGroupId: AppState["editingGroupId"],
   groupIdMapForOperation: Map<GroupId, GroupId>,
   element: TElement,
+  overrides?: Partial<TElement>,
   randomizeSeed?: boolean,
 ): Readonly<TElement> => {
-  const copy = deepCopyElement(element);
+  let copy = deepCopyElement(element);
 
   if (isTestEnv()) {
     __test__defineOrigId(copy, element.id);
@@ -87,6 +92,9 @@ export const duplicateElement = <TElement extends ExcalidrawElement>(
       return groupIdMapForOperation.get(groupId)!;
     },
   );
+  if (overrides) {
+    copy = Object.assign(copy, overrides);
+  }
   return copy;
 };
 
@@ -94,14 +102,9 @@ export const duplicateElements = (
   opts: {
     elements: readonly ExcalidrawElement[];
     randomizeSeed?: boolean;
-    overrides?: (data: {
+    overrides?: (
-      duplicateElement: ExcalidrawElement;
+      originalElement: ExcalidrawElement,
-      origElement: ExcalidrawElement;
+    ) => Partial<ExcalidrawElement>;
-      origIdToDuplicateId: Map<
-        ExcalidrawElement["id"],
-        ExcalidrawElement["id"]
-      >;
-    }) => Partial<ExcalidrawElement>;
   } & (
     | {
         /**
@@ -129,6 +132,14 @@ export const duplicateElements = (
           editingGroupId: AppState["editingGroupId"];
           selectedGroupIds: AppState["selectedGroupIds"];
         };
+        /**
+         * If true, duplicated elements are inserted _before_ specified
+         * elements. Case: alt-dragging elements to duplicate them.
+         *
+         * TODO: remove this once (if) we stop replacing the original element
+         * with the duplicated one in the scene array.
+         */
+        reverseOrder: boolean;
       }
   ),
 ) => {
@@ -142,6 +153,8 @@ export const duplicateElements = (
           selectedGroupIds: {},
         } as const);
 
+  const reverseOrder = opts.type === "in-place" ? opts.reverseOrder : false;
+
   // Ids of elements that have already been processed so we don't push them
   // into the array twice if we end up backtracking when retrieving
   // discontiguous group of elements (can happen due to a bug, or in edge
@@ -154,17 +167,10 @@ export const duplicateElements = (
   // loop over them.
   const processedIds = new Map<ExcalidrawElement["id"], true>();
   const groupIdMap = new Map();
-  const duplicatedElements: ExcalidrawElement[] = [];
+  const newElements: ExcalidrawElement[] = [];
-  const origElements: ExcalidrawElement[] = [];
+  const oldElements: ExcalidrawElement[] = [];
-  const origIdToDuplicateId = new Map<
+  const oldIdToDuplicatedId = new Map();
-    ExcalidrawElement["id"],
+  const duplicatedElementsMap = new Map<string, ExcalidrawElement>();
-    ExcalidrawElement["id"]
-  >();
-  const duplicateIdToOrigElement = new Map<
-    ExcalidrawElement["id"],
-    ExcalidrawElement
-  >();
-  const duplicateElementsMap = new Map<string, ExcalidrawElement>();
   const elementsMap = arrayToMap(elements) as ElementsMap;
   const _idsOfElementsToDuplicate =
     opts.type === "in-place"
@@ -182,7 +188,7 @@ export const duplicateElements = (
 
   elements = normalizeElementOrder(elements);
 
-  const elementsWithDuplicates: ExcalidrawElement[] = elements.slice();
+  const elementsWithClones: ExcalidrawElement[] = elements.slice();
 
   // helper functions
   // -------------------------------------------------------------------------
@@ -208,17 +214,17 @@ export const duplicateElements = (
           appState.editingGroupId,
           groupIdMap,
           element,
+          opts.overrides?.(element),
           opts.randomizeSeed,
         );
 
         processedIds.set(newElement.id, true);
 
-        duplicateElementsMap.set(newElement.id, newElement);
+        duplicatedElementsMap.set(newElement.id, newElement);
-        origIdToDuplicateId.set(element.id, newElement.id);
+        oldIdToDuplicatedId.set(element.id, newElement.id);
-        duplicateIdToOrigElement.set(newElement.id, element);
 
-        origElements.push(element);
+        oldElements.push(element);
-        duplicatedElements.push(newElement);
+        newElements.push(newElement);
 
         acc.push(newElement);
         return acc;
@@ -242,12 +248,21 @@ export const duplicateElements = (
       return;
     }
 
-    if (index > elementsWithDuplicates.length - 1) {
+    if (reverseOrder && index < 1) {
-      elementsWithDuplicates.push(...castArray(elements));
+      elementsWithClones.unshift(...castArray(elements));
       return;
     }
 
-    elementsWithDuplicates.splice(index + 1, 0, ...castArray(elements));
+    if (!reverseOrder && index > elementsWithClones.length - 1) {
+      elementsWithClones.push(...castArray(elements));
+      return;
+    }
+
+    elementsWithClones.splice(
+      index + (reverseOrder ? 0 : 1),
+      0,
+      ...castArray(elements),
+    );
   };
 
   const frameIdsToDuplicate = new Set(
@@ -279,7 +294,11 @@ export const duplicateElements = (
             : [element],
       );
 
-      const targetIndex = findLastIndex(elementsWithDuplicates, (el) => {
+      const targetIndex = reverseOrder
+        ? elementsWithClones.findIndex((el) => {
+            return el.groupIds?.includes(groupId);
+          })
+        : findLastIndex(elementsWithClones, (el) => {
             return el.groupIds?.includes(groupId);
           });
 
@@ -299,7 +318,7 @@ export const duplicateElements = (
 
       const frameChildren = getFrameChildren(elements, frameId);
 
-      const targetIndex = findLastIndex(elementsWithDuplicates, (el) => {
+      const targetIndex = findLastIndex(elementsWithClones, (el) => {
         return el.frameId === frameId || el.id === frameId;
       });
 
@@ -316,7 +335,7 @@ export const duplicateElements = (
     if (hasBoundTextElement(element)) {
       const boundTextElement = getBoundTextElement(element, elementsMap);
 
-      const targetIndex = findLastIndex(elementsWithDuplicates, (el) => {
+      const targetIndex = findLastIndex(elementsWithClones, (el) => {
         return (
           el.id === element.id ||
           ("containerId" in el && el.containerId === element.id)
@@ -325,7 +344,7 @@ export const duplicateElements = (
 
       if (boundTextElement) {
         insertBeforeOrAfterIndex(
-          targetIndex,
+          targetIndex + (reverseOrder ? -1 : 0),
           copyElements([element, boundTextElement]),
         );
       } else {
@@ -338,7 +357,7 @@ export const duplicateElements = (
     if (isBoundToContainer(element)) {
       const container = getContainerElement(element, elementsMap);
 
-      const targetIndex = findLastIndex(elementsWithDuplicates, (el) => {
+      const targetIndex = findLastIndex(elementsWithClones, (el) => {
         return el.id === element.id || el.id === container?.id;
       });
 
@@ -358,7 +377,7 @@ export const duplicateElements = (
     // -------------------------------------------------------------------------
 
     insertBeforeOrAfterIndex(
-      findLastIndex(elementsWithDuplicates, (el) => el.id === element.id),
+      findLastIndex(elementsWithClones, (el) => el.id === element.id),
       copyElements(element),
     );
   }
@@ -366,38 +385,28 @@ export const duplicateElements = (
   // ---------------------------------------------------------------------------
 
   fixDuplicatedBindingsAfterDuplication(
-    duplicatedElements,
+    newElements,
-    origIdToDuplicateId,
+    oldIdToDuplicatedId,
-    duplicateElementsMap as NonDeletedSceneElementsMap,
+    duplicatedElementsMap as NonDeletedSceneElementsMap,
   );
 
+  if (reverseOrder) {
+    fixReversedBindings(
+      _idsOfElementsToDuplicate,
+      elementsWithClones,
+      oldIdToDuplicatedId,
+    );
+  }
+
   bindElementsToFramesAfterDuplication(
-    elementsWithDuplicates,
+    elementsWithClones,
-    origElements,
+    oldElements,
-    origIdToDuplicateId,
+    oldIdToDuplicatedId,
   );
 
-  if (opts.overrides) {
-    for (const duplicateElement of duplicatedElements) {
-      const origElement = duplicateIdToOrigElement.get(duplicateElement.id);
-      if (origElement) {
-        Object.assign(
-          duplicateElement,
-          opts.overrides({
-            duplicateElement,
-            origElement,
-            origIdToDuplicateId,
-          }),
-        );
-      }
-    }
-  }
-
   return {
-    duplicatedElements,
+    newElements,
-    duplicateElementsMap,
+    elementsWithClones,
-    elementsWithDuplicates,
-    origIdToDuplicateId,
   };
 };
 

packages/element/src/elbowArrow.ts

@@ -50,6 +50,7 @@ import { isBindableElement } from "./typeChecks";
 import {
   type ExcalidrawElbowArrowElement,
   type NonDeletedSceneElementsMap,
+  type SceneElementsMap,
 } from "./types";
 
 import { aabbForElement, pointInsideBounds } from "./shapes";
@@ -886,7 +887,7 @@ export const updateElbowArrowPoints = (
   elementsMap: NonDeletedSceneElementsMap,
   updates: {
     points?: readonly LocalPoint[];
-    fixedSegments?: readonly FixedSegment[] | null;
+    fixedSegments?: FixedSegment[] | null;
     startBinding?: FixedPointBinding | null;
     endBinding?: FixedPointBinding | null;
   },
@@ -1272,12 +1273,14 @@ const getElbowArrowData = (
   const startHeading = getBindPointHeading(
     startGlobalPoint,
     endGlobalPoint,
+    elementsMap,
     hoveredStartElement,
     origStartGlobalPoint,
   );
   const endHeading = getBindPointHeading(
     endGlobalPoint,
     startGlobalPoint,
+    elementsMap,
     hoveredEndElement,
     origEndGlobalPoint,
   );
@@ -2247,6 +2250,7 @@ const getGlobalPoint = (
 const getBindPointHeading = (
   p: GlobalPoint,
   otherPoint: GlobalPoint,
+  elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,
   hoveredElement: ExcalidrawBindableElement | null | undefined,
   origPoint: GlobalPoint,
 ): Heading =>
@@ -2264,6 +2268,7 @@ const getBindPointHeading = (
           number,
         ],
       ),
+    elementsMap,
     origPoint,
   );
 

packages/element/src/embeddable.ts

@@ -33,8 +33,6 @@ 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+)/;
@@ -71,7 +69,6 @@ const ALLOWED_DOMAINS = new Set([
   "val.town",
   "giphy.com",
   "reddit.com",
-  "forms.microsoft.com",
 ]);
 
 const ALLOW_SAME_ORIGIN = new Set([
@@ -85,7 +82,6 @@ const ALLOW_SAME_ORIGIN = new Set([
   "*.simplepdf.eu",
   "stackblitz.com",
   "reddit.com",
-  "forms.microsoft.com",
 ]);
 
 export const createSrcDoc = (body: string) => {
@@ -210,10 +206,6 @@ 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,8 +39,6 @@ import {
   type OrderedExcalidrawElement,
 } from "./types";
 
-import type { Scene } from "./Scene";
-
 type LinkDirection = "up" | "right" | "down" | "left";
 
 const VERTICAL_OFFSET = 100;
@@ -238,11 +236,10 @@ const getOffsets = (
 
 const addNewNode = (
   element: ExcalidrawFlowchartNodeElement,
+  elementsMap: ElementsMap,
   appState: AppState,
   direction: LinkDirection,
-  scene: Scene,
 ) => {
-  const elementsMap = scene.getNonDeletedElementsMap();
   const successors = getSuccessors(element, elementsMap, direction);
   const predeccessors = getPredecessors(element, elementsMap, direction);
 
@@ -277,9 +274,9 @@ const addNewNode = (
   const bindingArrow = createBindingArrow(
     element,
     nextNode,
+    elementsMap,
     direction,
     appState,
-    scene,
   );
 
   return {
@@ -290,9 +287,9 @@ const addNewNode = (
 
 export const addNewNodes = (
   startNode: ExcalidrawFlowchartNodeElement,
+  elementsMap: ElementsMap,
   appState: AppState,
   direction: LinkDirection,
-  scene: Scene,
   numberOfNodes: number,
 ) => {
   // always start from 0 and distribute evenly
@@ -355,9 +352,9 @@ export const addNewNodes = (
     const bindingArrow = createBindingArrow(
       startNode,
       nextNode,
+      elementsMap,
       direction,
       appState,
-      scene,
     );
 
     newNodes.push(nextNode);
@@ -370,9 +367,9 @@ export const addNewNodes = (
 const createBindingArrow = (
   startBindingElement: ExcalidrawFlowchartNodeElement,
   endBindingElement: ExcalidrawFlowchartNodeElement,
+  elementsMap: ElementsMap,
   direction: LinkDirection,
   appState: AppState,
-  scene: Scene,
 ) => {
   let startX: number;
   let startY: number;
@@ -443,10 +440,18 @@ const createBindingArrow = (
     elbowed: true,
   });
 
-  const elementsMap = scene.getNonDeletedElementsMap();
+  bindLinearElement(
-
+    bindingArrow,
-  bindLinearElement(bindingArrow, startBindingElement, "start", scene);
+    startBindingElement,
-  bindLinearElement(bindingArrow, endBindingElement, "end", scene);
+    "start",
+    elementsMap as NonDeletedSceneElementsMap,
+  );
+  bindLinearElement(
+    bindingArrow,
+    endBindingElement,
+    "end",
+    elementsMap as NonDeletedSceneElementsMap,
+  );
 
   const changedElements = new Map<string, OrderedExcalidrawElement>();
   changedElements.set(
@@ -462,18 +467,12 @@ const createBindingArrow = (
     bindingArrow as OrderedExcalidrawElement,
   );
 
-  LinearElementEditor.movePoints(
+  LinearElementEditor.movePoints(bindingArrow, [
-    bindingArrow,
-    scene,
-    new Map([
-      [
-        1,
     {
+      index: 1,
       point: bindingArrow.points[1],
     },
-      ],
+  ]);
-    ]),
-  );
 
   const update = updateElbowArrowPoints(
     bindingArrow,
@@ -633,17 +632,16 @@ export class FlowChartCreator {
 
   createNodes(
     startNode: ExcalidrawFlowchartNodeElement,
+    elementsMap: ElementsMap,
     appState: AppState,
     direction: LinkDirection,
-    scene: Scene,
   ) {
-    const elementsMap = scene.getNonDeletedElementsMap();
     if (direction !== this.direction) {
       const { nextNode, bindingArrow } = addNewNode(
         startNode,
+        elementsMap,
         appState,
         direction,
-        scene,
       );
 
       this.numberOfNodes = 1;
@@ -654,9 +652,9 @@ export class FlowChartCreator {
       this.numberOfNodes += 1;
       const newNodes = addNewNodes(
         startNode,
+        elementsMap,
         appState,
         direction,
-        scene,
         this.numberOfNodes,
       );
 
@@ -684,9 +682,13 @@ export class FlowChartCreator {
         )
       ) {
         this.pendingNodes = this.pendingNodes.map((node) =>
-          mutateElement(node, elementsMap, {
+          mutateElement(
+            node,
+            {
               frameId: startNode.frameId,
-          }),
+            },
+            false,
+          ),
         );
       }
     }

packages/element/src/fractionalIndex.ts

@@ -7,7 +7,6 @@ import { getBoundTextElement } from "./textElement";
 import { hasBoundTextElement } from "./typeChecks";
 
 import type {
-  ElementsMap,
   ExcalidrawElement,
   FractionalIndex,
   OrderedExcalidrawElement,
@@ -153,10 +152,9 @@ export const orderByFractionalIndex = (
  */
 export const syncMovedIndices = (
   elements: readonly ExcalidrawElement[],
-  movedElements: ElementsMap,
+  movedElements: Map<string, ExcalidrawElement>,
 ): OrderedExcalidrawElement[] => {
   try {
-    const elementsMap = arrayToMap(elements);
     const indicesGroups = getMovedIndicesGroups(elements, movedElements);
 
     // try generatating indices, throws on invalid movedElements
@@ -178,7 +176,7 @@ export const syncMovedIndices = (
 
     // split mutation so we don't end up in an incosistent state
     for (const [element, update] of elementsUpdates) {
-      mutateElement(element, elementsMap, update);
+      mutateElement(element, update, false);
     }
   } catch (e) {
     // fallback to default sync
@@ -196,12 +194,10 @@ export const syncMovedIndices = (
 export const syncInvalidIndices = (
   elements: readonly ExcalidrawElement[],
 ): OrderedExcalidrawElement[] => {
-  const elementsMap = arrayToMap(elements);
   const indicesGroups = getInvalidIndicesGroups(elements);
   const elementsUpdates = generateIndices(elements, indicesGroups);
-
   for (const [element, update] of elementsUpdates) {
-    mutateElement(element, elementsMap, update);
+    mutateElement(element, update, false);
   }
 
   return elements as OrderedExcalidrawElement[];
@@ -214,7 +210,7 @@ export const syncInvalidIndices = (
  */
 const getMovedIndicesGroups = (
   elements: readonly ExcalidrawElement[],
-  movedElements: ElementsMap,
+  movedElements: Map<string, ExcalidrawElement>,
 ) => {
   const indicesGroups: number[][] = [];
 

packages/element/src/frame.ts

@@ -3,6 +3,8 @@ import { isPointWithinBounds, pointFrom } from "@excalidraw/math";
 import { doLineSegmentsIntersect } from "@excalidraw/utils/bbox";
 import { elementsOverlappingBBox } from "@excalidraw/utils/withinBounds";
 
+import type { ExcalidrawElementsIncludingDeleted } from "@excalidraw/excalidraw/scene/Scene";
+
 import type {
   AppClassProperties,
   AppState,
@@ -27,8 +29,6 @@ import {
   isTextElement,
 } from "./typeChecks";
 
-import type { ExcalidrawElementsIncludingDeleted } from "./Scene";
-
 import type {
   ElementsMap,
   ElementsMapOrArray,
@@ -41,24 +41,30 @@ import type {
 // --------------------------- Frame State ------------------------------------
 export const bindElementsToFramesAfterDuplication = (
   nextElements: readonly ExcalidrawElement[],
-  origElements: readonly ExcalidrawElement[],
+  oldElements: readonly ExcalidrawElement[],
-  origIdToDuplicateId: Map<ExcalidrawElement["id"], ExcalidrawElement["id"]>,
+  oldIdToDuplicatedId: Map<ExcalidrawElement["id"], ExcalidrawElement["id"]>,
 ) => {
   const nextElementMap = arrayToMap(nextElements) as Map<
     ExcalidrawElement["id"],
     ExcalidrawElement
   >;
 
-  for (const element of origElements) {
+  for (const element of oldElements) {
     if (element.frameId) {
       // use its frameId to get the new frameId
-      const nextElementId = origIdToDuplicateId.get(element.id);
+      const nextElementId = oldIdToDuplicatedId.get(element.id);
-      const nextFrameId = origIdToDuplicateId.get(element.frameId);
+      const nextFrameId = oldIdToDuplicatedId.get(element.frameId);
-      const nextElement = nextElementId && nextElementMap.get(nextElementId);
+      if (nextElementId) {
+        const nextElement = nextElementMap.get(nextElementId);
         if (nextElement) {
-        mutateElement(nextElement, nextElementMap, {
+          mutateElement(
-          frameId: nextFrameId ?? null,
+            nextElement,
-        });
+            {
+              frameId: nextFrameId ?? element.frameId,
+            },
+            false,
+          );
+        }
       }
     }
   }
@@ -561,9 +567,13 @@ export const addElementsToFrame = <T extends ElementsMapOrArray>(
   }
 
   for (const element of finalElementsToAdd) {
-    mutateElement(element, elementsMap, {
+    mutateElement(
+      element,
+      {
         frameId: frame.id,
-    });
+      },
+      false,
+    );
   }
 
   return allElements;
@@ -601,9 +611,13 @@ export const removeElementsFromFrame = (
   }
 
   for (const [, element] of _elementsToRemove) {
-    mutateElement(element, elementsMap, {
+    mutateElement(
+      element,
+      {
         frameId: null,
-    });
+      },
+      false,
+    );
   }
 };
 
@@ -905,16 +919,13 @@ export const shouldApplyFrameClip = (
   return false;
 };
 
-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 isFrameElement(element) ? DEFAULT_FRAME_NAME : DEFAULT_AI_FRAME_NAME;
-};
-
 export const getFrameLikeTitle = (element: ExcalidrawFrameLikeElement) => {
-  return element.name === null ? getDefaultFrameName(element) : element.name;
+  // TODO name frames "AI" only if specific to AI frames
+  return element.name === null
+    ? isFrameElement(element)
+      ? "Frame"
+      : "AI Frame"
+    : element.name;
 };
 
 export const getElementsOverlappingFrame = (

packages/element/src/index.ts

@@ -1,5 +1,3 @@
-import { toIterable } from "@excalidraw/common";
-
 import { isInvisiblySmallElement } from "./sizeHelpers";
 import { isLinearElementType } from "./typeChecks";
 
@@ -7,7 +5,6 @@ import type {
   ExcalidrawElement,
   NonDeletedExcalidrawElement,
   NonDeleted,
-  ElementsMapOrArray,
 } from "./types";
 
 /**
@@ -19,10 +16,12 @@ export const getSceneVersion = (elements: readonly ExcalidrawElement[]) =>
 /**
  * Hashes elements' versionNonce (using djb2 algo). Order of elements matters.
  */
-export const hashElementsVersion = (elements: ElementsMapOrArray): number => {
+export const hashElementsVersion = (
+  elements: readonly ExcalidrawElement[],
+): number => {
   let hash = 5381;
-  for (const element of toIterable(elements)) {
+  for (let i = 0; i < elements.length; i++) {
-    hash = (hash << 5) + hash + element.versionNonce;
+    hash = (hash << 5) + hash + elements[i].versionNonce;
   }
   return hash >>> 0; // Ensure unsigned 32-bit integer
 };
@@ -72,47 +71,3 @@ 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,11 @@ import {
   tupleToCoors,
 } from "@excalidraw/common";
 
-import type { Store } from "@excalidraw/element";
+// TODO: remove direct dependency on the scene, should be passed in or injected instead
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+import Scene from "@excalidraw/excalidraw/scene/Scene";
+
+import type { Store } from "@excalidraw/excalidraw/store";
 
 import type { Radians } from "@excalidraw/math";
 
@@ -46,8 +50,10 @@ import {
   getMinMaxXYFromCurvePathOps,
 } from "./bounds";
 
+import { updateElbowArrowPoints } from "./elbowArrow";
+
 import { headingIsHorizontal, vectorToHeading } from "./heading";
-import { mutateElement } from "./mutateElement";
+import { bumpVersion, mutateElement } from "./mutateElement";
 import { getBoundTextElement, handleBindTextResize } from "./textElement";
 import {
   isBindingElement,
@@ -67,8 +73,6 @@ import {
 
 import { getLockedLinearCursorAlignSize } from "./sizeHelpers";
 
-import type { Scene } from "./Scene";
-
 import type { Bounds } from "./bounds";
 import type {
   NonDeleted,
@@ -80,11 +84,16 @@ import type {
   ElementsMap,
   NonDeletedSceneElementsMap,
   FixedPointBinding,
+  SceneElementsMap,
   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";
@@ -118,17 +127,15 @@ export class LinearElementEditor {
   public readonly segmentMidPointHoveredCoords: GlobalPoint | null;
   public readonly elbowed: boolean;
 
-  constructor(
+  constructor(element: NonDeleted<ExcalidrawLinearElement>) {
-    element: NonDeleted<ExcalidrawLinearElement>,
-    elementsMap: ElementsMap,
-  ) {
     this.elementId = element.id as string & {
       _brand: "excalidrawLinearElementId";
     };
     if (!pointsEqual(element.points[0], pointFrom(0, 0))) {
       console.error("Linear element is not normalized", Error().stack);
-      LinearElementEditor.normalizePoints(element, elementsMap);
+      LinearElementEditor.normalizePoints(element);
     }
+
     this.selectedPointsIndices = null;
     this.lastUncommittedPoint = null;
     this.isDragging = false;
@@ -302,22 +309,16 @@ export class LinearElementEditor {
           event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
         );
 
-        LinearElementEditor.movePoints(
+        LinearElementEditor.movePoints(element, [
-          element,
-          scene,
-          new Map([
-            [
-              selectedIndex,
           {
+            index: selectedIndex,
             point: pointFrom(
               width + referencePoint[0],
               height + referencePoint[1],
             ),
             isDragging: selectedIndex === lastClickedPoint,
           },
-            ],
+        ]);
-          ]),
-        );
       } else {
         const newDraggingPointPosition = LinearElementEditor.createPointAt(
           element,
@@ -332,8 +333,6 @@ export class LinearElementEditor {
 
         LinearElementEditor.movePoints(
           element,
-          scene,
-          new Map(
           selectedPointsIndices.map((pointIndex) => {
             const newPointPosition: LocalPoint =
               pointIndex === lastClickedPoint
@@ -342,29 +341,24 @@ export class LinearElementEditor {
                     elementsMap,
                     scenePointerX - linearElementEditor.pointerOffset.x,
                     scenePointerY - linearElementEditor.pointerOffset.y,
-                      event[KEYS.CTRL_OR_CMD]
+                    event[KEYS.CTRL_OR_CMD] ? null : app.getEffectiveGridSize(),
-                        ? null
-                        : app.getEffectiveGridSize(),
                   )
                 : pointFrom(
                     element.points[pointIndex][0] + deltaX,
                     element.points[pointIndex][1] + deltaY,
                   );
-              return [
+            return {
-                pointIndex,
+              index: pointIndex,
-                {
               point: newPointPosition,
               isDragging: pointIndex === lastClickedPoint,
-                },
+            };
-              ];
           }),
-          ),
         );
       }
 
       const boundTextElement = getBoundTextElement(element, elementsMap);
       if (boundTextElement) {
-        handleBindTextResize(element, scene, false);
+        handleBindTextResize(element, elementsMap, false);
       }
 
       // suggest bindings for first and last point if selected
@@ -459,21 +453,15 @@ export class LinearElementEditor {
           selectedPoint === element.points.length - 1
         ) {
           if (isPathALoop(element.points, appState.zoom.value)) {
-            LinearElementEditor.movePoints(
+            LinearElementEditor.movePoints(element, [
-              element,
-              scene,
-              new Map([
-                [
-                  selectedPoint,
               {
+                index: selectedPoint,
                 point:
                   selectedPoint === 0
                     ? element.points[element.points.length - 1]
                     : element.points[0],
               },
-                ],
+            ]);
-              ]),
-            );
           }
 
           const bindingElement = isBindingEnabled(appState)
@@ -531,7 +519,7 @@ export class LinearElementEditor {
     element: NonDeleted<ExcalidrawLinearElement>,
     elementsMap: ElementsMap,
     appState: InteractiveCanvasAppState,
-  ): (GlobalPoint | null)[] => {
+  ): typeof editorMidPointsCache["points"] => {
     const boundText = getBoundTextElement(element, elementsMap);
 
     // Since its not needed outside editor unless 2 pointer lines or bound text
@@ -543,7 +531,25 @@ 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,
@@ -575,8 +581,9 @@ export class LinearElementEditor {
       midpoints.push(segmentMidPoint);
       index++;
     }
-
+    editorMidPointsCache.points = midpoints;
-    return midpoints;
+    editorMidPointsCache.version = element.version;
+    editorMidPointsCache.zoom = appState.zoom.value;
   };
 
   static getSegmentMidpointHitCoords = (
@@ -630,11 +637,8 @@ export class LinearElementEditor {
       }
     }
     let index = 0;
-    const midPoints = LinearElementEditor.getEditorMidPoints(
+    const midPoints: typeof editorMidPointsCache["points"] =
-      element,
+      LinearElementEditor.getEditorMidPoints(element, elementsMap, appState);
-      elementsMap,
-      appState,
-    );
 
     while (index < midPoints.length) {
       if (midPoints[index] !== null) {
@@ -791,7 +795,7 @@ export class LinearElementEditor {
       );
     } else if (event.altKey && appState.editingLinearElement) {
       if (linearElementEditor.lastUncommittedPoint == null) {
-        scene.mutateElement(element, {
+        mutateElement(element, {
           points: [
             ...element.points,
             LinearElementEditor.createPointAt(
@@ -805,7 +809,7 @@ export class LinearElementEditor {
         });
         ret.didAddPoint = true;
       }
-      store.scheduleCapture();
+      store.shouldCaptureIncrement();
       ret.linearElementEditor = {
         ...linearElementEditor,
         pointerDownState: {
@@ -857,6 +861,7 @@ export class LinearElementEditor {
           element,
           startBindingElement,
           endBindingElement,
+          elementsMap,
           scene,
         );
       }
@@ -929,13 +934,13 @@ export class LinearElementEditor {
     scenePointerX: number,
     scenePointerY: number,
     app: AppClassProperties,
+    elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,
   ): LinearElementEditor | null {
     const appState = app.state;
     if (!appState.editingLinearElement) {
       return null;
     }
     const { elementId, lastUncommittedPoint } = appState.editingLinearElement;
-    const elementsMap = app.scene.getNonDeletedElementsMap();
     const element = LinearElementEditor.getElement(elementId, elementsMap);
     if (!element) {
       return appState.editingLinearElement;
@@ -946,9 +951,7 @@ export class LinearElementEditor {
 
     if (!event.altKey) {
       if (lastPoint === lastUncommittedPoint) {
-        LinearElementEditor.deletePoints(element, app.scene, [
+        LinearElementEditor.deletePoints(element, [points.length - 1]);
-          points.length - 1,
-        ]);
       }
       return {
         ...appState.editingLinearElement,
@@ -986,20 +989,14 @@ export class LinearElementEditor {
     }
 
     if (lastPoint === lastUncommittedPoint) {
-      LinearElementEditor.movePoints(
+      LinearElementEditor.movePoints(element, [
-        element,
-        app.scene,
-        new Map([
-          [
-            element.points.length - 1,
         {
+          index: element.points.length - 1,
           point: newPoint,
         },
-          ],
+      ]);
-        ]),
-      );
     } else {
-      LinearElementEditor.addPoints(element, app.scene, [{ point: newPoint }]);
+      LinearElementEditor.addPoints(element, [{ point: newPoint }]);
     }
     return {
       ...appState.editingLinearElement,
@@ -1163,26 +1160,23 @@ export class LinearElementEditor {
       y: element.y + offsetY,
     };
   }
+
   // element-mutating methods
   // ---------------------------------------------------------------------------
-  static normalizePoints(
+
-    element: NonDeleted<ExcalidrawLinearElement>,
+  static normalizePoints(element: NonDeleted<ExcalidrawLinearElement>) {
-    elementsMap: ElementsMap,
+    mutateElement(element, LinearElementEditor.getNormalizedPoints(element));
-  ) {
-    mutateElement(
-      element,
-      elementsMap,
-      LinearElementEditor.getNormalizedPoints(element),
-    );
   }
 
-  static duplicateSelectedPoints(appState: AppState, scene: Scene): AppState {
+  static duplicateSelectedPoints(
+    appState: AppState,
+    elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,
+  ): AppState {
     invariant(
       appState.editingLinearElement,
       "Not currently editing a linear element",
     );
 
-    const elementsMap = scene.getNonDeletedElementsMap();
     const { selectedPointsIndices, elementId } = appState.editingLinearElement;
     const element = LinearElementEditor.getElement(elementId, elementsMap);
 
@@ -1225,22 +1219,18 @@ export class LinearElementEditor {
       return acc;
     }, []);
 
-    scene.mutateElement(element, { points: nextPoints });
+    mutateElement(element, { points: nextPoints });
 
     // temp hack to ensure the line doesn't move when adding point to the end,
     // potentially expanding the bounding box
     if (pointAddedToEnd) {
       const lastPoint = element.points[element.points.length - 1];
-      LinearElementEditor.movePoints(
+      LinearElementEditor.movePoints(element, [
-        element,
+        {
-        scene,
+          index: element.points.length - 1,
-        new Map([
+          point: pointFrom(lastPoint[0] + 30, lastPoint[1] + 30),
-          [
+        },
-            element.points.length - 1,
+      ]);
-            { point: pointFrom(lastPoint[0] + 30, lastPoint[1] + 30) },
-          ],
-        ]),
-      );
     }
 
     return {
@@ -1254,7 +1244,6 @@ export class LinearElementEditor {
 
   static deletePoints(
     element: NonDeleted<ExcalidrawLinearElement>,
-    scene: Scene,
     pointIndices: readonly number[],
   ) {
     let offsetX = 0;
@@ -1285,41 +1274,28 @@ export class LinearElementEditor {
       return acc;
     }, []);
 
-    LinearElementEditor._updatePoints(
+    LinearElementEditor._updatePoints(element, nextPoints, offsetX, offsetY);
-      element,
-      scene,
-      nextPoints,
-      offsetX,
-      offsetY,
-    );
   }
 
   static addPoints(
     element: NonDeleted<ExcalidrawLinearElement>,
-    scene: Scene,
     targetPoints: { point: LocalPoint }[],
   ) {
     const offsetX = 0;
     const offsetY = 0;
 
     const nextPoints = [...element.points, ...targetPoints.map((x) => x.point)];
-    LinearElementEditor._updatePoints(
+    LinearElementEditor._updatePoints(element, nextPoints, offsetX, offsetY);
-      element,
-      scene,
-      nextPoints,
-      offsetX,
-      offsetY,
-    );
   }
 
   static movePoints(
     element: NonDeleted<ExcalidrawLinearElement>,
-    scene: Scene,
+    targetPoints: { index: number; point: LocalPoint; isDragging?: boolean }[],
-    pointUpdates: PointsPositionUpdates,
     otherUpdates?: {
       startBinding?: PointBinding | null;
       endBinding?: PointBinding | null;
     },
+    sceneElementsMap?: NonDeletedSceneElementsMap,
   ) {
     const { points } = element;
 
@@ -1329,7 +1305,8 @@ 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] =
-      pointUpdates.get(0)?.point ?? pointFrom<LocalPoint>(0, 0);
+      targetPoints.find(({ index }) => index === 0)?.point ??
+      pointFrom<LocalPoint>(0, 0);
     const [offsetX, offsetY] = pointFrom<LocalPoint>(
       deltaX - points[0][0],
       deltaY - points[0][1],
@@ -1337,12 +1314,12 @@ export class LinearElementEditor {
 
     const nextPoints = isElbowArrow(element)
       ? [
-          pointUpdates.get(0)?.point ?? points[0],
+          targetPoints.find((t) => t.index === 0)?.point ?? points[0],
-          pointUpdates.get(points.length - 1)?.point ??
+          targetPoints.find((t) => t.index === points.length - 1)?.point ??
             points[points.length - 1],
         ]
       : points.map((p, idx) => {
-          const current = pointUpdates.get(idx)?.point ?? p;
+          const current = targetPoints.find((t) => t.index === idx)?.point ?? p;
 
           return pointFrom<LocalPoint>(
             current[0] - offsetX,
@@ -1352,13 +1329,17 @@ export class LinearElementEditor {
 
     LinearElementEditor._updatePoints(
       element,
-      scene,
       nextPoints,
       offsetX,
       offsetY,
       otherUpdates,
       {
-        isDragging: Array.from(pointUpdates.values()).some((t) => t.isDragging),
+        isDragging: targetPoints.reduce(
+          (dragging, targetPoint): boolean =>
+            dragging || targetPoint.isDragging === true,
+          false,
+        ),
+        sceneElementsMap,
       },
     );
   }
@@ -1413,9 +1394,8 @@ export class LinearElementEditor {
     pointerCoords: PointerCoords,
     app: AppClassProperties,
     snapToGrid: boolean,
-    scene: Scene,
+    elementsMap: ElementsMap,
   ) {
-    const elementsMap = scene.getNonDeletedElementsMap();
     const element = LinearElementEditor.getElement(
       linearElementEditor.elementId,
       elementsMap,
@@ -1445,7 +1425,9 @@ export class LinearElementEditor {
       ...element.points.slice(segmentMidpoint.index!),
     ];
 
-    scene.mutateElement(element, { points });
+    mutateElement(element, {
+      points,
+    });
 
     ret.pointerDownState = {
       ...linearElementEditor.pointerDownState,
@@ -1461,7 +1443,6 @@ export class LinearElementEditor {
 
   private static _updatePoints(
     element: NonDeleted<ExcalidrawLinearElement>,
-    scene: Scene,
     nextPoints: readonly LocalPoint[],
     offsetX: number,
     offsetY: number,
@@ -1498,10 +1479,28 @@ export class LinearElementEditor {
 
       updates.points = Array.from(nextPoints);
 
-      scene.mutateElement(element, updates, {
+      if (!options?.sceneElementsMap || Scene.getScene(element)) {
-        informMutation: true,
+        mutateElement(element, updates, true, {
-        isDragging: options?.isDragging ?? false,
+          isDragging: options?.isDragging,
         });
+      } else {
+        // The element is not in the scene, so we need to use the provided
+        // scene map.
+        Object.assign(element, {
+          ...updates,
+          angle: 0 as Radians,
+
+          ...updateElbowArrowPoints(
+            element,
+            options.sceneElementsMap,
+            updates,
+            {
+              isDragging: options?.isDragging,
+            },
+          ),
+        });
+      }
+      bumpVersion(element);
     } else {
       const nextCoords = getElementPointsCoords(element, nextPoints);
       const prevCoords = getElementPointsCoords(element, element.points);
@@ -1516,7 +1515,7 @@ export class LinearElementEditor {
         pointFrom(dX, dY),
         element.angle,
       );
-      scene.mutateElement(element, {
+      mutateElement(element, {
         ...otherUpdates,
         points: nextPoints,
         x: element.x + rotated[0],
@@ -1575,7 +1574,7 @@ export class LinearElementEditor {
       elementsMap,
     );
     if (points.length < 2) {
-      mutateElement(boundTextElement, elementsMap, { isDeleted: true });
+      mutateElement(boundTextElement, { isDeleted: true });
     }
     let x = 0;
     let y = 0;
@@ -1590,14 +1589,23 @@ export class LinearElementEditor {
       y = midPoint[1] - boundTextElement.height / 2;
     } else {
       const index = element.points.length / 2 - 1;
-      const midSegmentMidpoint = LinearElementEditor.getSegmentMidPoint(
+
+      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;
     }
@@ -1773,9 +1781,8 @@ export class LinearElementEditor {
     index: number,
     x: number,
     y: number,
-    scene: Scene,
+    elementsMap: ElementsMap,
   ): LinearElementEditor {
-    const elementsMap = scene.getNonDeletedElementsMap();
     const element = LinearElementEditor.getElement(
       linearElement.elementId,
       elementsMap,
@@ -1818,7 +1825,7 @@ export class LinearElementEditor {
         .map((segment) => segment.index)
         .reduce((count, idx) => (idx < index ? count + 1 : count), 0);
 
-      scene.mutateElement(element, {
+      mutateElement(element, {
         fixedSegments: nextFixedSegments,
       });
 
@@ -1852,14 +1859,14 @@ export class LinearElementEditor {
 
   static deleteFixedSegment(
     element: ExcalidrawElbowArrowElement,
-    scene: Scene,
     index: number,
   ): void {
-    scene.mutateElement(element, {
+    mutateElement(element, {
       fixedSegments: element.fixedSegments?.filter(
         (segment) => segment.index !== index,
       ),
     });
+    mutateElement(element, {}, true);
   }
 }
 

packages/element/src/mutateElement.ts

@@ -2,8 +2,13 @@ import {
   getSizeFromPoints,
   randomInteger,
   getUpdatedTimestamp,
+  toBrandedType,
 } from "@excalidraw/common";
 
+// TODO: remove direct dependency on the scene, should be passed in or injected instead
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
+import Scene from "@excalidraw/excalidraw/scene/Scene";
+
 import type { Radians } from "@excalidraw/math";
 
 import type { Mutable } from "@excalidraw/common/utility-types";
@@ -11,42 +16,35 @@ import type { Mutable } from "@excalidraw/common/utility-types";
 import { ShapeCache } from "./ShapeCache";
 
 import { updateElbowArrowPoints } from "./elbowArrow";
-
 import { isElbowArrow } from "./typeChecks";
 
-import type {
+import type { ExcalidrawElement, NonDeletedSceneElementsMap } from "./types";
-  ElementsMap,
-  ExcalidrawElbowArrowElement,
-  ExcalidrawElement,
-  NonDeletedSceneElementsMap,
-} from "./types";
 
 export type ElementUpdate<TElement extends ExcalidrawElement> = Omit<
   Partial<TElement>,
   "id" | "version" | "versionNonce" | "updated"
 >;
 
-/**
+// This function tracks updates of text elements for the purposes for collaboration.
- * This function tracks updates of text elements for the purposes for collaboration.
+// The version is used to compare updates when more than one user is working in
- * The version is used to compare updates when more than one user is working in
+// the same drawing. Note: this will trigger the component to update. Make sure you
- * the same drawing.
+// are calling it either from a React event handler or within unstable_batchedUpdates().
- *
- * WARNING: this won't trigger the component to update, so if you need to trigger component update,
- * use `scene.mutateElement` or `ExcalidrawImperativeAPI.mutateElement` instead.
- */
 export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
   element: TElement,
-  elementsMap: ElementsMap,
   updates: ElementUpdate<TElement>,
+  informMutation = true,
   options?: {
+    // Currently only for elbow arrows.
+    // If true, the elbow arrow tries to bind to the nearest element. If false
+    // it tries to keep the same bound element, if any.
     isDragging?: boolean;
   },
-) => {
+): TElement => {
   let didChange = false;
 
   // casting to any because can't use `in` operator
   // (see https://github.com/microsoft/TypeScript/issues/21732)
-  const { points, fixedSegments, startBinding, endBinding, fileId } =
+  const { points, fixedSegments, fileId, startBinding, endBinding } =
     updates as any;
 
   if (
@@ -57,6 +55,10 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
       typeof startBinding !== "undefined" ||
       typeof endBinding !== "undefined") // manual binding to element
   ) {
+    const elementsMap = toBrandedType<NonDeletedSceneElementsMap>(
+      Scene.getScene(element)?.getNonDeletedElementsMap() ?? new Map(),
+    );
+
     updates = {
       ...updates,
       angle: 0 as Radians,
@@ -66,9 +68,16 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
           x: updates.x || element.x,
           y: updates.y || element.y,
         },
-        elementsMap as NonDeletedSceneElementsMap,
+        elementsMap,
-        updates as ElementUpdate<ExcalidrawElbowArrowElement>,
+        {
-        options,
+          fixedSegments,
+          points,
+          startBinding,
+          endBinding,
+        },
+        {
+          isDragging: options?.isDragging,
+        },
       ),
     };
   } else if (typeof points !== "undefined") {
@@ -141,6 +150,10 @@ export const mutateElement = <TElement extends Mutable<ExcalidrawElement>>(
   element.versionNonce = randomInteger();
   element.updated = getUpdatedTimestamp();
 
+  if (informMutation) {
+    Scene.getScene(element)?.triggerUpdate();
+  }
+
   return element;
 };
 

packages/element/src/newElement.ts

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

packages/element/src/renderElement.ts

@@ -351,20 +351,12 @@ const generateElementCanvas = (
 
 export const DEFAULT_LINK_SIZE = 14;
 
-const IMAGE_PLACEHOLDER_IMG =
+const IMAGE_PLACEHOLDER_IMG = document.createElement("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 =
+const IMAGE_ERROR_PLACEHOLDER_IMG = document.createElement("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

@@ -17,6 +17,8 @@ import {
 
 import type { GlobalPoint } from "@excalidraw/math";
 
+import type Scene from "@excalidraw/excalidraw/scene/Scene";
+
 import type { PointerDownState } from "@excalidraw/excalidraw/types";
 
 import type { Mutable } from "@excalidraw/common/utility-types";
@@ -30,6 +32,7 @@ import {
   getElementBounds,
 } from "./bounds";
 import { LinearElementEditor } from "./linearElementEditor";
+import { mutateElement } from "./mutateElement";
 import {
   getBoundTextElement,
   getBoundTextElementId,
@@ -57,8 +60,6 @@ import {
 
 import { isInGroup } from "./groups";
 
-import type { Scene } from "./Scene";
-
 import type { BoundingBox } from "./bounds";
 import type {
   MaybeTransformHandleType,
@@ -73,6 +74,7 @@ import type {
   ExcalidrawTextElementWithContainer,
   ExcalidrawImageElement,
   ElementsMap,
+  SceneElementsMap,
   ExcalidrawElbowArrowElement,
 } from "./types";
 
@@ -81,6 +83,7 @@ export const transformElements = (
   originalElements: PointerDownState["originalElements"],
   transformHandleType: MaybeTransformHandleType,
   selectedElements: readonly NonDeletedExcalidrawElement[],
+  elementsMap: SceneElementsMap,
   scene: Scene,
   shouldRotateWithDiscreteAngle: boolean,
   shouldResizeFromCenter: boolean,
@@ -90,31 +93,31 @@ export const transformElements = (
   centerX: number,
   centerY: number,
 ): boolean => {
-  const elementsMap = scene.getNonDeletedElementsMap();
   if (selectedElements.length === 1) {
     const [element] = selectedElements;
     if (transformHandleType === "rotation") {
       if (!isElbowArrow(element)) {
         rotateSingleElement(
           element,
+          elementsMap,
           scene,
           pointerX,
           pointerY,
           shouldRotateWithDiscreteAngle,
         );
-        updateBoundElements(element, scene);
+        updateBoundElements(element, elementsMap);
       }
     } else if (isTextElement(element) && transformHandleType) {
       resizeSingleTextElement(
         originalElements,
         element,
-        scene,
+        elementsMap,
         transformHandleType,
         shouldResizeFromCenter,
         pointerX,
         pointerY,
       );
-      updateBoundElements(element, scene);
+      updateBoundElements(element, elementsMap);
       return true;
     } else if (transformHandleType) {
       const elementId = selectedElements[0].id;
@@ -126,6 +129,8 @@ export const transformElements = (
           getNextSingleWidthAndHeightFromPointer(
             latestElement,
             origElement,
+            elementsMap,
+            originalElements,
             transformHandleType,
             pointerX,
             pointerY,
@@ -140,8 +145,8 @@ export const transformElements = (
           nextHeight,
           latestElement,
           origElement,
+          elementsMap,
           originalElements,
-          scene,
           transformHandleType,
           {
             shouldMaintainAspectRatio,
@@ -156,6 +161,7 @@ export const transformElements = (
       rotateMultipleElements(
         originalElements,
         selectedElements,
+        elementsMap,
         scene,
         pointerX,
         pointerY,
@@ -204,15 +210,13 @@ export const transformElements = (
 
 const rotateSingleElement = (
   element: NonDeletedExcalidrawElement,
+  elementsMap: ElementsMap,
   scene: Scene,
   pointerX: number,
   pointerY: number,
   shouldRotateWithDiscreteAngle: boolean,
 ) => {
-  const [x1, y1, x2, y2] = getElementAbsoluteCoords(
+  const [x1, y1, x2, y2] = getElementAbsoluteCoords(element, elementsMap);
-    element,
-    scene.getNonDeletedElementsMap(),
-  );
   const cx = (x1 + x2) / 2;
   const cy = (y1 + y2) / 2;
   let angle: Radians;
@@ -229,13 +233,13 @@ const rotateSingleElement = (
   }
   const boundTextElementId = getBoundTextElementId(element);
 
-  scene.mutateElement(element, { angle });
+  mutateElement(element, { angle });
   if (boundTextElementId) {
     const textElement =
       scene.getElement<ExcalidrawTextElementWithContainer>(boundTextElementId);
 
     if (textElement && !isArrowElement(element)) {
-      scene.mutateElement(textElement, { angle });
+      mutateElement(textElement, { angle });
     }
   }
 };
@@ -285,13 +289,12 @@ export const measureFontSizeFromWidth = (
 const resizeSingleTextElement = (
   originalElements: PointerDownState["originalElements"],
   element: NonDeleted<ExcalidrawTextElement>,
-  scene: Scene,
+  elementsMap: ElementsMap,
   transformHandleType: TransformHandleDirection,
   shouldResizeFromCenter: boolean,
   pointerX: number,
   pointerY: number,
 ) => {
-  const elementsMap = scene.getNonDeletedElementsMap();
   const [x1, y1, x2, y2, cx, cy] = getElementAbsoluteCoords(
     element,
     elementsMap,
@@ -390,7 +393,7 @@ const resizeSingleTextElement = (
     );
     const [nextX, nextY] = newTopLeft;
 
-    scene.mutateElement(element, {
+    mutateElement(element, {
       fontSize: metrics.size,
       width: nextWidth,
       height: nextHeight,
@@ -505,13 +508,14 @@ const resizeSingleTextElement = (
       autoResize: false,
     };
 
-    scene.mutateElement(element, resizedElement);
+    mutateElement(element, resizedElement);
   }
 };
 
 const rotateMultipleElements = (
   originalElements: PointerDownState["originalElements"],
   elements: readonly NonDeletedExcalidrawElement[],
+  elementsMap: SceneElementsMap,
   scene: Scene,
   pointerX: number,
   pointerY: number,
@@ -519,7 +523,6 @@ const rotateMultipleElements = (
   centerX: number,
   centerY: number,
 ) => {
-  const elementsMap = scene.getNonDeletedElementsMap();
   let centerAngle =
     (5 * Math.PI) / 2 + Math.atan2(pointerY - centerY, pointerX - centerX);
   if (shouldRotateWithDiscreteAngle) {
@@ -540,30 +543,38 @@ const rotateMultipleElements = (
         (centerAngle + origAngle - element.angle) as Radians,
       );
 
-      const updates = isElbowArrow(element)
+      if (isElbowArrow(element)) {
-        ? {
         // Needed to re-route the arrow
+        mutateElement(element, {
           points: getArrowLocalFixedPoints(element, elementsMap),
-          }
+        });
-        : {
+      } else {
+        mutateElement(
+          element,
+          {
             x: element.x + (rotatedCX - cx),
             y: element.y + (rotatedCY - cy),
             angle: normalizeRadians((centerAngle + origAngle) as Radians),
-          };
+          },
+          false,
+        );
+      }
 
-      scene.mutateElement(element, updates);
+      updateBoundElements(element, elementsMap, {
-
-      updateBoundElements(element, scene, {
         simultaneouslyUpdated: elements,
       });
 
       const boundText = getBoundTextElement(element, elementsMap);
       if (boundText && !isArrowElement(element)) {
-        scene.mutateElement(boundText, {
+        mutateElement(
+          boundText,
+          {
             x: boundText.x + (rotatedCX - cx),
             y: boundText.y + (rotatedCY - cy),
             angle: normalizeRadians((centerAngle + origAngle) as Radians),
-        });
+          },
+          false,
+        );
       }
     }
   }
@@ -808,8 +819,8 @@ export const resizeSingleElement = (
   nextHeight: number,
   latestElement: ExcalidrawElement,
   origElement: ExcalidrawElement,
+  elementsMap: ElementsMap,
   originalElementsMap: ElementsMap,
-  scene: Scene,
   handleDirection: TransformHandleDirection,
   {
     shouldInformMutation = true,
@@ -822,7 +833,6 @@ export const resizeSingleElement = (
   } = {},
 ) => {
   let boundTextFont: { fontSize?: number } = {};
-  const elementsMap = scene.getNonDeletedElementsMap();
   const boundTextElement = getBoundTextElement(latestElement, elementsMap);
 
   if (boundTextElement) {
@@ -922,7 +932,7 @@ export const resizeSingleElement = (
   }
 
   if ("scale" in latestElement && "scale" in origElement) {
-    scene.mutateElement(latestElement, {
+    mutateElement(latestElement, {
       scale: [
         // defaulting because scaleX/Y can be 0/-0
         (Math.sign(nextWidth) || origElement.scale[0]) * origElement.scale[0],
@@ -957,33 +967,32 @@ export const resizeSingleElement = (
       ...rescaledPoints,
     };
 
-    scene.mutateElement(latestElement, updates, {
+    mutateElement(latestElement, updates, shouldInformMutation);
-      informMutation: shouldInformMutation,
+
-      isDragging: false,
+    updateBoundElements(latestElement, elementsMap as SceneElementsMap, {
+      // TODO: confirm with MARK if this actually makes sense
+      newSize: { width: nextWidth, height: nextHeight },
     });
 
     if (boundTextElement && boundTextFont != null) {
-      scene.mutateElement(boundTextElement, {
+      mutateElement(boundTextElement, {
         fontSize: boundTextFont.fontSize,
       });
     }
     handleBindTextResize(
       latestElement,
-      scene,
+      elementsMap,
       handleDirection,
       shouldMaintainAspectRatio,
     );
-
-    updateBoundElements(latestElement, scene, {
-      // TODO: confirm with MARK if this actually makes sense
-      newSize: { width: nextWidth, height: nextHeight },
-    });
   }
 };
 
 const getNextSingleWidthAndHeightFromPointer = (
   latestElement: ExcalidrawElement,
   origElement: ExcalidrawElement,
+  elementsMap: ElementsMap,
+  originalElementsMap: ElementsMap,
   handleDirection: TransformHandleDirection,
   pointerX: number,
   pointerY: number,
@@ -1518,24 +1527,27 @@ export const resizeMultipleElements = (
     } of elementsAndUpdates) {
       const { width, height, angle } = update;
 
-      scene.mutateElement(element, update, {
+      mutateElement(element, update, false, {
-        informMutation: true,
         // needed for the fixed binding point udpate to take effect
         isDragging: true,
       });
 
-      updateBoundElements(element, scene, {
+      updateBoundElements(element, elementsMap as SceneElementsMap, {
         simultaneouslyUpdated: elementsToUpdate,
         newSize: { width, height },
       });
 
       const boundTextElement = getBoundTextElement(element, elementsMap);
       if (boundTextElement && boundTextFontSize) {
-        scene.mutateElement(boundTextElement, {
+        mutateElement(
+          boundTextElement,
+          {
             fontSize: boundTextFontSize,
             angle: isLinearElement(element) ? undefined : angle,
-        });
+          },
-        handleBindTextResize(element, scene, handleDirection, true);
+          false,
+        );
+        handleBindTextResize(element, elementsMap, handleDirection, true);
       }
     }
 

packages/element/src/selection.ts

@@ -1,4 +1,4 @@
-import { arrayToMap, isShallowEqual } from "@excalidraw/common";
+import { isShallowEqual } from "@excalidraw/common";
 
 import type {
   AppState,
@@ -7,20 +7,13 @@ import type {
 
 import { getElementAbsoluteCoords, getElementBounds } from "./bounds";
 import { isElementInViewport } from "./sizeHelpers";
-import {
+import { isBoundToContainer, isFrameLikeElement } from "./typeChecks";
-  isBoundToContainer,
-  isFrameLikeElement,
-  isLinearElement,
-} from "./typeChecks";
 import {
   elementOverlapsWithFrame,
   getContainingFrame,
   getFrameChildren,
 } from "./frame";
 
-import { LinearElementEditor } from "./linearElementEditor";
-import { selectGroupsForSelectedElements } from "./groups";
-
 import type {
   ElementsMap,
   ElementsMapOrArray,
@@ -169,6 +162,25 @@ 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">,
@@ -242,49 +254,3 @@ export const makeNextSelectedElementIds = (
 
   return nextSelectedElementIds;
 };
-
-const _getLinearElementEditor = (
-  targetElements: readonly ExcalidrawElement[],
-  allElements: readonly NonDeletedExcalidrawElement[],
-) => {
-  const linears = targetElements.filter(isLinearElement);
-  if (linears.length === 1) {
-    const linear = linears[0];
-    const boundElements = linear.boundElements?.map((def) => def.id) ?? [];
-    const onlySingleLinearSelected = targetElements.every(
-      (el) => el.id === linear.id || boundElements.includes(el.id),
-    );
-
-    if (onlySingleLinearSelected) {
-      return new LinearElementEditor(linear, arrayToMap(allElements));
-    }
-  }
-
-  return null;
-};
-
-export const getSelectionStateForElements = (
-  targetElements: readonly ExcalidrawElement[],
-  allElements: readonly NonDeletedExcalidrawElement[],
-  appState: AppState,
-) => {
-  return {
-    selectedLinearElement: _getLinearElementEditor(targetElements, allElements),
-    ...selectGroupsForSelectedElements(
-      {
-        editingGroupId: appState.editingGroupId,
-        selectedElementIds: excludeElementsInFramesFromSelection(
-          targetElements,
-        ).reduce((acc: Record<ExcalidrawElement["id"], true>, element) => {
-          if (!isBoundToContainer(element)) {
-            acc[element.id] = true;
-          }
-          return acc;
-        }, {}),
-      },
-      allElements,
-      appState,
-      null,
-    ),
-  };
-};

packages/element/src/sizeHelpers.ts

@@ -6,6 +6,7 @@ import {
 import type { AppState, Offsets, Zoom } from "@excalidraw/excalidraw/types";
 
 import { getCommonBounds, getElementBounds } from "./bounds";
+import { mutateElement } from "./mutateElement";
 import { isFreeDrawElement, isLinearElement } from "./typeChecks";
 
 import type { ElementsMap, ExcalidrawElement } from "./types";
@@ -169,6 +170,41 @@ export const getLockedLinearCursorAlignSize = (
   return { width, height };
 };
 
+export const resizePerfectLineForNWHandler = (
+  element: ExcalidrawElement,
+  x: number,
+  y: number,
+) => {
+  const anchorX = element.x + element.width;
+  const anchorY = element.y + element.height;
+  const distanceToAnchorX = x - anchorX;
+  const distanceToAnchorY = y - anchorY;
+  if (Math.abs(distanceToAnchorX) < Math.abs(distanceToAnchorY) / 2) {
+    mutateElement(element, {
+      x: anchorX,
+      width: 0,
+      y,
+      height: -distanceToAnchorY,
+    });
+  } else if (Math.abs(distanceToAnchorY) < Math.abs(element.width) / 2) {
+    mutateElement(element, {
+      y: anchorY,
+      height: 0,
+    });
+  } else {
+    const nextHeight =
+      Math.sign(distanceToAnchorY) *
+      Math.sign(distanceToAnchorX) *
+      element.width;
+    mutateElement(element, {
+      x,
+      y: anchorY - nextHeight,
+      width: -distanceToAnchorX,
+      height: nextHeight,
+    });
+  }
+};
+
 export const getNormalizedDimensions = (
   element: Pick<ExcalidrawElement, "width" | "height" | "x" | "y">,
 ): {

packages/element/src/store.ts

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

@@ -14,14 +14,12 @@ import type { AppState } from "@excalidraw/excalidraw/types";
 
 import type { ExtractSetType } from "@excalidraw/common/utility-types";
 
-import type { Radians } from "@excalidraw/math";
-
 import {
   resetOriginalContainerCache,
   updateOriginalContainerCache,
 } from "./containerCache";
 import { LinearElementEditor } from "./linearElementEditor";
-
+import { mutateElement } from "./mutateElement";
 import { measureText } from "./textMeasurements";
 import { wrapText } from "./textWrapping";
 import {
@@ -30,7 +28,7 @@ import {
   isTextElement,
 } from "./typeChecks";
 
-import type { Scene } from "./Scene";
+import type { Radians } from "../../math/src";
 
 import type { MaybeTransformHandleType } from "./transformHandles";
 import type {
@@ -46,10 +44,9 @@ import type {
 export const redrawTextBoundingBox = (
   textElement: ExcalidrawTextElement,
   container: ExcalidrawElement | null,
-  scene: Scene,
+  elementsMap: ElementsMap,
+  informMutation = true,
 ) => {
-  const elementsMap = scene.getNonDeletedElementsMap();
-
   let maxWidth = undefined;
 
   if (!isProdEnv()) {
@@ -109,43 +106,38 @@ export const redrawTextBoundingBox = (
         metrics.height,
         container.type,
       );
-      scene.mutateElement(container, { height: nextHeight });
+      mutateElement(container, { height: nextHeight }, informMutation);
       updateOriginalContainerCache(container.id, nextHeight);
     }
-
     if (metrics.width > maxContainerWidth) {
       const nextWidth = computeContainerDimensionForBoundText(
         metrics.width,
         container.type,
       );
-      scene.mutateElement(container, { width: nextWidth });
+      mutateElement(container, { width: nextWidth }, informMutation);
     }
-
     const updatedTextElement = {
       ...textElement,
       ...boundTextUpdates,
     } as ExcalidrawTextElementWithContainer;
-
     const { x, y } = computeBoundTextPosition(
       container,
       updatedTextElement,
       elementsMap,
     );
-
     boundTextUpdates.x = x;
     boundTextUpdates.y = y;
   }
 
-  scene.mutateElement(textElement, boundTextUpdates);
+  mutateElement(textElement, boundTextUpdates, informMutation);
 };
 
 export const handleBindTextResize = (
   container: NonDeletedExcalidrawElement,
-  scene: Scene,
+  elementsMap: ElementsMap,
   transformHandleType: MaybeTransformHandleType,
   shouldMaintainAspectRatio = false,
 ) => {
-  const elementsMap = scene.getNonDeletedElementsMap();
   const boundTextElementId = getBoundTextElementId(container);
   if (!boundTextElementId) {
     return;
@@ -198,20 +190,20 @@ export const handleBindTextResize = (
           transformHandleType === "n")
           ? container.y - diff
           : container.y;
-      scene.mutateElement(container, {
+      mutateElement(container, {
         height: containerHeight,
         y: updatedY,
       });
     }
 
-    scene.mutateElement(textElement, {
+    mutateElement(textElement, {
       text,
       width: nextWidth,
       height: nextHeight,
     });
 
     if (!isArrowElement(container)) {
-      scene.mutateElement(
+      mutateElement(
         textElement,
         computeBoundTextPosition(container, textElement, elementsMap),
       );

packages/element/src/typeChecks.ts

@@ -28,7 +28,6 @@ import type {
   PointBinding,
   FixedPointBinding,
   ExcalidrawFlowchartNodeElement,
-  ExcalidrawLinearElementSubType,
 } from "./types";
 
 export const isInitializedImageElement = (
@@ -120,20 +119,6 @@ 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 => {
@@ -286,10 +271,6 @@ export const isBoundToContainer = (
   );
 };
 
-export const isArrowBoundToElement = (element: ExcalidrawArrowElement) => {
-  return !!element.startBinding || !!element.endBinding;
-};
-
 export const isUsingAdaptiveRadius = (type: string) =>
   type === "rectangle" ||
   type === "embeddable" ||
@@ -357,18 +338,3 @@ 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,11 +296,6 @@ export type FixedPointBinding = Merge<
   }
 >;
 
-export type PointsPositionUpdates = Map<
-  number,
-  { point: LocalPoint; isDragging?: boolean }
->;
-
 export type Arrowhead =
   | "arrow"
   | "bar"
@@ -417,13 +412,3 @@ 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

@@ -2,6 +2,8 @@ import { arrayToMap, findIndex, findLastIndex } from "@excalidraw/common";
 
 import type { AppState } from "@excalidraw/excalidraw/types";
 
+import type Scene from "@excalidraw/excalidraw/scene/Scene";
+
 import { isFrameLikeElement } from "./typeChecks";
 
 import { getElementsInGroup } from "./groups";
@@ -10,8 +12,6 @@ import { syncMovedIndices } from "./fractionalIndex";
 
 import { getSelectedElements } from "./selection";
 
-import type { Scene } from "./Scene";
-
 import type { ExcalidrawElement, ExcalidrawFrameLikeElement } from "./types";
 
 const isOfTargetFrame = (element: ExcalidrawElement, frameId: string) => {

packages/element/tests/delta.test.tsx

@@ -1,149 +0,0 @@
-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/duplicate.test.tsx

@@ -1,3 +1,4 @@
+import React from "react";
 import { pointFrom } from "@excalidraw/math";
 
 import {
@@ -7,7 +8,7 @@ import {
   isPrimitive,
 } from "@excalidraw/common";
 
-import { Excalidraw, mutateElement } from "@excalidraw/excalidraw";
+import { Excalidraw } from "@excalidraw/excalidraw";
 
 import { actionDuplicateSelection } from "@excalidraw/excalidraw/actions";
 
@@ -24,6 +25,7 @@ import {
 
 import type { LocalPoint } from "@excalidraw/math";
 
+import { mutateElement } from "../src/mutateElement";
 import { duplicateElement, duplicateElements } from "../src/duplicate";
 
 import type { ExcalidrawLinearElement } from "../src/types";
@@ -61,11 +63,11 @@ describe("duplicating single elements", () => {
     // @ts-ignore
     element.__proto__ = { hello: "world" };
 
-    mutateElement(element, new Map(), {
+    mutateElement(element, {
       points: [pointFrom<LocalPoint>(1, 2), pointFrom<LocalPoint>(3, 4)],
     });
 
-    const copy = duplicateElement(null, new Map(), element, true);
+    const copy = duplicateElement(null, new Map(), element, undefined, true);
 
     assertCloneObjects(element, copy);
 
@@ -171,7 +173,7 @@ describe("duplicating multiple elements", () => {
     // -------------------------------------------------------------------------
 
     const origElements = [rectangle1, text1, arrow1, arrow2, text2] as const;
-    const { duplicatedElements } = duplicateElements({
+    const { newElements: clonedElements } = duplicateElements({
       type: "everything",
       elements: origElements,
     });
@@ -179,10 +181,10 @@ describe("duplicating multiple elements", () => {
     // generic id in-equality checks
     // --------------------------------------------------------------------------
     expect(origElements.map((e) => e.type)).toEqual(
-      duplicatedElements.map((e) => e.type),
+      clonedElements.map((e) => e.type),
     );
     origElements.forEach((origElement, idx) => {
-      const clonedElement = duplicatedElements[idx];
+      const clonedElement = clonedElements[idx];
       expect(origElement).toEqual(
         expect.objectContaining({
           id: expect.not.stringMatching(clonedElement.id),
@@ -215,12 +217,12 @@ describe("duplicating multiple elements", () => {
     });
     // --------------------------------------------------------------------------
 
-    const clonedArrows = duplicatedElements.filter(
+    const clonedArrows = clonedElements.filter(
       (e) => e.type === "arrow",
     ) as ExcalidrawLinearElement[];
 
     const [clonedRectangle, clonedText1, , clonedArrow2, clonedArrowLabel] =
-      duplicatedElements as any as typeof origElements;
+      clonedElements as any as typeof origElements;
 
     expect(clonedText1.containerId).toBe(clonedRectangle.id);
     expect(
@@ -325,10 +327,10 @@ describe("duplicating multiple elements", () => {
     // -------------------------------------------------------------------------
 
     const origElements = [rectangle1, text1, arrow1, arrow2, arrow3] as const;
-    const duplicatedElements = duplicateElements({
+    const { newElements: clonedElements } = duplicateElements({
       type: "everything",
       elements: origElements,
-    }).duplicatedElements as any as typeof origElements;
+    }) as any as { newElements: typeof origElements };
 
     const [
       clonedRectangle,
@@ -336,7 +338,7 @@ describe("duplicating multiple elements", () => {
       clonedArrow1,
       clonedArrow2,
       clonedArrow3,
-    ] = duplicatedElements;
+    ] = clonedElements;
 
     expect(clonedRectangle.boundElements).toEqual([
       { id: clonedArrow1.id, type: "arrow" },
@@ -372,12 +374,12 @@ describe("duplicating multiple elements", () => {
       });
 
       const origElements = [rectangle1, rectangle2, rectangle3] as const;
-      const { duplicatedElements } = duplicateElements({
+      const { newElements: clonedElements } = duplicateElements({
         type: "everything",
         elements: origElements,
-      });
+      }) as any as { newElements: typeof origElements };
       const [clonedRectangle1, clonedRectangle2, clonedRectangle3] =
-        duplicatedElements;
+        clonedElements;
 
       expect(rectangle1.groupIds[0]).not.toBe(clonedRectangle1.groupIds[0]);
       expect(rectangle2.groupIds[0]).not.toBe(clonedRectangle2.groupIds[0]);
@@ -397,7 +399,7 @@ describe("duplicating multiple elements", () => {
       });
 
       const {
-        duplicatedElements: [clonedRectangle1],
+        newElements: [clonedRectangle1],
       } = duplicateElements({ type: "everything", elements: [rectangle1] });
 
       expect(typeof clonedRectangle1.groupIds[0]).toBe("string");
@@ -406,117 +408,6 @@ describe("duplicating multiple elements", () => {
   });
 });
 
-describe("group-related duplication", () => {
-  beforeEach(async () => {
-    await render(<Excalidraw />);
-  });
-
-  it("action-duplicating within group", async () => {
-    const rectangle1 = API.createElement({
-      type: "rectangle",
-      x: 0,
-      y: 0,
-      groupIds: ["group1"],
-    });
-    const rectangle2 = API.createElement({
-      type: "rectangle",
-      x: 10,
-      y: 10,
-      groupIds: ["group1"],
-    });
-
-    API.setElements([rectangle1, rectangle2]);
-    API.setSelectedElements([rectangle2], "group1");
-
-    act(() => {
-      h.app.actionManager.executeAction(actionDuplicateSelection);
-    });
-
-    assertElements(h.elements, [
-      { id: rectangle1.id },
-      { id: rectangle2.id },
-      { [ORIG_ID]: rectangle2.id, selected: true, groupIds: ["group1"] },
-    ]);
-    expect(h.state.editingGroupId).toBe("group1");
-  });
-
-  it("alt-duplicating within group", async () => {
-    const rectangle1 = API.createElement({
-      type: "rectangle",
-      x: 0,
-      y: 0,
-      groupIds: ["group1"],
-    });
-    const rectangle2 = API.createElement({
-      type: "rectangle",
-      x: 10,
-      y: 10,
-      groupIds: ["group1"],
-    });
-
-    API.setElements([rectangle1, rectangle2]);
-    API.setSelectedElements([rectangle2], "group1");
-
-    Keyboard.withModifierKeys({ alt: true }, () => {
-      mouse.down(rectangle2.x + 5, rectangle2.y + 5);
-      mouse.up(rectangle2.x + 50, rectangle2.y + 50);
-    });
-
-    assertElements(h.elements, [
-      { id: rectangle1.id },
-      { id: rectangle2.id },
-      { [ORIG_ID]: rectangle2.id, selected: true, groupIds: ["group1"] },
-    ]);
-    expect(h.state.editingGroupId).toBe("group1");
-  });
-
-  it("alt-duplicating within group away outside frame", () => {
-    const frame = API.createElement({
-      type: "frame",
-      x: 0,
-      y: 0,
-      width: 100,
-      height: 100,
-    });
-    const rectangle1 = API.createElement({
-      type: "rectangle",
-      x: 0,
-      y: 0,
-      width: 50,
-      height: 50,
-      groupIds: ["group1"],
-      frameId: frame.id,
-    });
-    const rectangle2 = API.createElement({
-      type: "rectangle",
-      x: 10,
-      y: 10,
-      width: 50,
-      height: 50,
-      groupIds: ["group1"],
-      frameId: frame.id,
-    });
-
-    API.setElements([frame, rectangle1, rectangle2]);
-    API.setSelectedElements([rectangle2], "group1");
-
-    Keyboard.withModifierKeys({ alt: true }, () => {
-      mouse.down(rectangle2.x + 5, rectangle2.y + 5);
-      mouse.up(frame.x + frame.width + 50, frame.y + frame.height + 50);
-    });
-
-    // console.log(h.elements);
-
-    assertElements(h.elements, [
-      { id: frame.id },
-      { id: rectangle1.id, frameId: frame.id },
-      { id: rectangle2.id, frameId: frame.id },
-      { [ORIG_ID]: rectangle2.id, selected: true, groupIds: [], frameId: null },
-    ]);
-    expect(h.state.editingGroupId).toBe(null);
-  });
-});
-
 describe("duplication z-order", () => {
   beforeEach(async () => {
     await render(<Excalidraw />);
@@ -612,8 +503,8 @@ describe("duplication z-order", () => {
     });
 
     assertElements(h.elements, [
-      { id: rectangle1.id },
+      { [ORIG_ID]: rectangle1.id },
-      { [ORIG_ID]: rectangle1.id, selected: true },
+      { id: rectangle1.id, selected: true },
       { id: rectangle2.id },
       { id: rectangle3.id },
     ]);
@@ -647,8 +538,8 @@ describe("duplication z-order", () => {
     assertElements(h.elements, [
       { id: rectangle1.id },
       { id: rectangle2.id },
-      { id: rectangle3.id },
+      { [ORIG_ID]: rectangle3.id },
-      { [ORIG_ID]: rectangle3.id, selected: true },
+      { id: rectangle3.id, selected: true },
     ]);
   });
 
@@ -678,8 +569,8 @@ describe("duplication z-order", () => {
     });
 
     assertElements(h.elements, [
-      { id: rectangle1.id },
+      { [ORIG_ID]: rectangle1.id },
-      { [ORIG_ID]: rectangle1.id, selected: true },
+      { id: rectangle1.id, selected: true },
       { id: rectangle2.id },
       { id: rectangle3.id },
     ]);
@@ -714,19 +605,19 @@ describe("duplication z-order", () => {
     });
 
     assertElements(h.elements, [
-      { id: rectangle1.id },
+      { [ORIG_ID]: rectangle1.id },
-      { id: rectangle2.id },
+      { [ORIG_ID]: rectangle2.id },
-      { id: rectangle3.id },
+      { [ORIG_ID]: rectangle3.id },
-      { [ORIG_ID]: rectangle1.id, selected: true },
+      { id: rectangle1.id, selected: true },
-      { [ORIG_ID]: rectangle2.id, selected: true },
+      { id: rectangle2.id, selected: true },
-      { [ORIG_ID]: rectangle3.id, selected: true },
+      { id: rectangle3.id, selected: true },
     ]);
   });
 
-  it("alt-duplicating text container (in-order)", async () => {
+  it("reverse-duplicating text container (in-order)", async () => {
     const [rectangle, text] = API.createTextContainer();
     API.setElements([rectangle, text]);
-    API.setSelectedElements([rectangle]);
+    API.setSelectedElements([rectangle, text]);
 
     Keyboard.withModifierKeys({ alt: true }, () => {
       mouse.down(rectangle.x + 5, rectangle.y + 5);
@@ -734,20 +625,20 @@ describe("duplication z-order", () => {
     });
 
     assertElements(h.elements, [
-      { id: rectangle.id },
+      { [ORIG_ID]: rectangle.id },
-      { id: text.id, containerId: rectangle.id },
-      { [ORIG_ID]: rectangle.id, selected: true },
       {
         [ORIG_ID]: text.id,
         containerId: getCloneByOrigId(rectangle.id)?.id,
       },
+      { id: rectangle.id, selected: true },
+      { id: text.id, containerId: rectangle.id, selected: true },
     ]);
   });
 
-  it("alt-duplicating text container (out-of-order)", async () => {
+  it("reverse-duplicating text container (out-of-order)", async () => {
     const [rectangle, text] = API.createTextContainer();
     API.setElements([text, rectangle]);
-    API.setSelectedElements([rectangle]);
+    API.setSelectedElements([rectangle, text]);
 
     Keyboard.withModifierKeys({ alt: true }, () => {
       mouse.down(rectangle.x + 5, rectangle.y + 5);
@@ -755,21 +646,21 @@ describe("duplication z-order", () => {
     });
 
     assertElements(h.elements, [
-      { id: rectangle.id },
+      { [ORIG_ID]: rectangle.id },
-      { id: text.id, containerId: rectangle.id },
-      { [ORIG_ID]: rectangle.id, selected: true },
       {
         [ORIG_ID]: text.id,
         containerId: getCloneByOrigId(rectangle.id)?.id,
       },
+      { id: rectangle.id, selected: true },
+      { id: text.id, containerId: rectangle.id, selected: true },
     ]);
   });
 
-  it("alt-duplicating labeled arrows (in-order)", async () => {
+  it("reverse-duplicating labeled arrows (in-order)", async () => {
     const [arrow, text] = API.createLabeledArrow();
 
     API.setElements([arrow, text]);
-    API.setSelectedElements([arrow]);
+    API.setSelectedElements([arrow, text]);
 
     Keyboard.withModifierKeys({ alt: true }, () => {
       mouse.down(arrow.x + 5, arrow.y + 5);
@@ -777,24 +668,21 @@ describe("duplication z-order", () => {
     });
 
     assertElements(h.elements, [
-      { id: arrow.id },
+      { [ORIG_ID]: arrow.id },
-      { id: text.id, containerId: arrow.id },
-      { [ORIG_ID]: arrow.id, selected: true },
       {
         [ORIG_ID]: text.id,
         containerId: getCloneByOrigId(arrow.id)?.id,
       },
+      { id: arrow.id, selected: true },
+      { id: text.id, containerId: arrow.id, selected: true },
     ]);
-    expect(h.state.selectedLinearElement).toEqual(
-      expect.objectContaining({ elementId: getCloneByOrigId(arrow.id)?.id }),
-    );
   });
 
-  it("alt-duplicating labeled arrows (out-of-order)", async () => {
+  it("reverse-duplicating labeled arrows (out-of-order)", async () => {
     const [arrow, text] = API.createLabeledArrow();
 
     API.setElements([text, arrow]);
-    API.setSelectedElements([arrow]);
+    API.setSelectedElements([arrow, text]);
 
     Keyboard.withModifierKeys({ alt: true }, () => {
       mouse.down(arrow.x + 5, arrow.y + 5);
@@ -802,17 +690,17 @@ describe("duplication z-order", () => {
     });
 
     assertElements(h.elements, [
-      { id: arrow.id },
+      { [ORIG_ID]: arrow.id },
-      { id: text.id, containerId: arrow.id },
-      { [ORIG_ID]: arrow.id, selected: true },
       {
         [ORIG_ID]: text.id,
         containerId: getCloneByOrigId(arrow.id)?.id,
       },
+      { id: arrow.id, selected: true },
+      { id: text.id, containerId: arrow.id, selected: true },
     ]);
   });
 
-  it("alt-duplicating bindable element with bound arrow should keep the arrow on the duplicate", async () => {
+  it("reverse-duplicating bindable element with bound arrow should keep the arrow on the duplicate", () => {
     const rect = UI.createElement("rectangle", {
       x: 0,
       y: 0,
@@ -834,18 +722,11 @@ describe("duplication z-order", () => {
       mouse.up(15, 15);
     });
 
-    assertElements(h.elements, [
+    expect(window.h.elements).toHaveLength(3);
-      {
+
-        id: rect.id,
+    const newRect = window.h.elements[0];
-        boundElements: expect.arrayContaining([
+
-          expect.objectContaining({ id: arrow.id }),
+    expect(arrow.endBinding?.elementId).toBe(newRect.id);
-        ]),
+    expect(newRect.boundElements?.[0]?.id).toBe(arrow.id);
-      },
-      { [ORIG_ID]: rect.id, boundElements: [], selected: true },
-      {
-        id: arrow.id,
-        endBinding: expect.objectContaining({ elementId: rect.id }),
-      },
-    ]);
   });
 });

packages/element/tests/elbowArrow.test.tsx

@@ -1,7 +1,8 @@
 import { ARROW_TYPE } from "@excalidraw/common";
 import { pointFrom } from "@excalidraw/math";
-import { Excalidraw } from "@excalidraw/excalidraw";
+import { Excalidraw, mutateElement } from "@excalidraw/excalidraw";
 
+import Scene from "@excalidraw/excalidraw/scene/Scene";
 import { actionSelectAll } from "@excalidraw/excalidraw/actions";
 import { actionDuplicateSelection } from "@excalidraw/excalidraw/actions/actionDuplicateSelection";
 
@@ -22,8 +23,6 @@ import type { LocalPoint } from "@excalidraw/math";
 
 import { bindLinearElement } from "../src/binding";
 
-import { Scene } from "../src/Scene";
-
 import type {
   ExcalidrawArrowElement,
   ExcalidrawBindableElement,
@@ -143,7 +142,7 @@ describe("elbow arrow routing", () => {
       elbowed: true,
     }) as ExcalidrawElbowArrowElement;
     scene.insertElement(arrow);
-    h.app.scene.mutateElement(arrow, {
+    mutateElement(arrow, {
       points: [
         pointFrom<LocalPoint>(-45 - arrow.x, -100.1 - arrow.y),
         pointFrom<LocalPoint>(45 - arrow.x, 99.9 - arrow.y),
@@ -188,14 +187,14 @@ describe("elbow arrow routing", () => {
     scene.insertElement(rectangle1);
     scene.insertElement(rectangle2);
     scene.insertElement(arrow);
-
+    const elementsMap = scene.getNonDeletedElementsMap();
-    bindLinearElement(arrow, rectangle1, "start", scene);
+    bindLinearElement(arrow, rectangle1, "start", elementsMap);
-    bindLinearElement(arrow, rectangle2, "end", scene);
+    bindLinearElement(arrow, rectangle2, "end", elementsMap);
 
     expect(arrow.startBinding).not.toBe(null);
     expect(arrow.endBinding).not.toBe(null);
 
-    h.app.scene.mutateElement(arrow, {
+    mutateElement(arrow, {
       points: [pointFrom<LocalPoint>(0, 0), pointFrom<LocalPoint>(90, 200)],
     });
 

packages/element/tests/fractionalIndex.test.ts

@@ -7,14 +7,13 @@ import {
   syncInvalidIndices,
   syncMovedIndices,
   validateFractionalIndices,
-} from "@excalidraw/element";
+} from "@excalidraw/element/fractionalIndex";
 
-import { deepCopyElement } from "@excalidraw/element";
+import { deepCopyElement } from "@excalidraw/element/duplicate";
 
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 
 import type {
-  ElementsMap,
   ExcalidrawElement,
   FractionalIndex,
 } from "@excalidraw/element/types";
@@ -750,7 +749,7 @@ function testInvalidIndicesSync(args: {
 function prepareArguments(
   elementsLike: { id: string; index?: string }[],
   movedElementsIds?: string[],
-): [ExcalidrawElement[], ElementsMap | undefined] {
+): [ExcalidrawElement[], Map<string, ExcalidrawElement> | undefined] {
   const elements = elementsLike.map((x) =>
     API.createElement({ id: x.id, index: x.index as FractionalIndex }),
   );
@@ -765,7 +764,7 @@ function prepareArguments(
 function test(
   name: string,
   elements: ExcalidrawElement[],
-  movedElements: ElementsMap | undefined,
+  movedElements: Map<string, ExcalidrawElement> | undefined,
   expectUnchangedElements: Map<string, { id: string }>,
   expectValidInput?: boolean,
 ) {

packages/element/tests/resize.test.tsx

@@ -333,7 +333,7 @@ describe("line element", () => {
       element,
       element,
       h.app.scene.getNonDeletedElementsMap(),
-      h.app.scene,
+      h.app.scene.getNonDeletedElementsMap(),
       "ne",
     );
 
@@ -369,7 +369,7 @@ describe("line element", () => {
       element,
       element,
       h.app.scene.getNonDeletedElementsMap(),
-      h.app.scene,
+      h.app.scene.getNonDeletedElementsMap(),
       "se",
     );
 
@@ -424,7 +424,7 @@ describe("line element", () => {
       element,
       element,
       h.app.scene.getNonDeletedElementsMap(),
-      h.app.scene,
+      h.app.scene.getNonDeletedElementsMap(),
       "e",
       {
         shouldResizeFromCenter: true,

packages/element/tests/sortElements.test.ts

@@ -1,12 +1,10 @@
 import { API } from "@excalidraw/excalidraw/tests/helpers/api";
 
-import { mutateElement } from "@excalidraw/element";
+import { mutateElement } from "../src/mutateElement";
-
 import { normalizeElementOrder } from "../src/sortElements";
 
 import type { ExcalidrawElement } from "../src/types";
 
-const { h } = window;
 const assertOrder = (
   elements: readonly ExcalidrawElement[],
   expectedOrder: string[],
@@ -37,7 +35,7 @@ describe("normalizeElementsOrder", () => {
       boundElements: [],
     });
 
-    mutateElement(container, new Map(), {
+    mutateElement(container, {
       boundElements: [{ type: "text", id: boundText.id }],
     });
 
@@ -354,7 +352,7 @@ describe("normalizeElementsOrder", () => {
       containerId: container.id,
     });
 
-    h.app.scene.mutateElement(container, {
+    mutateElement(container, {
       boundElements: [
         { type: "text", id: boundText.id },
         { type: "text", id: "xxx" },
@@ -389,7 +387,7 @@ describe("normalizeElementsOrder", () => {
           boundElements: [],
           groupIds: ["C", "A"],
         });
-        h.app.scene.mutateElement(container, {
+        mutateElement(container, {
           boundElements: [{ type: "text", id: boundText.id }],
         });
 

packages/excalidraw/actions/actionAddToLibrary.ts

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

packages/excalidraw/actions/actionAlign.tsx

@@ -1,18 +1,16 @@
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { isFrameLikeElement } from "@excalidraw/element";
+import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
 
-import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
+import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element/frame";
 
 import { KEYS, arrayToMap, getShortcutKey } from "@excalidraw/common";
 
-import { alignElements } from "@excalidraw/element";
+import { alignElements } from "@excalidraw/element/align";
-
-import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
-import type { Alignment } from "@excalidraw/element";
+import type { Alignment } from "@excalidraw/element/align";
 
 import { ToolButton } from "../components/ToolButton";
 import {
@@ -27,6 +25,7 @@ import {
 import { t } from "../i18n";
 
 import { isSomeElementSelected } from "../scene";
+import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 
@@ -51,8 +50,14 @@ const alignSelectedElements = (
   alignment: Alignment,
 ) => {
   const selectedElements = app.scene.getSelectedElements(appState);
+  const elementsMap = arrayToMap(elements);
 
-  const updatedElements = alignElements(selectedElements, alignment, app.scene);
+  const updatedElements = alignElements(
+    selectedElements,
+    elementsMap,
+    alignment,
+    app.scene,
+  );
 
   const updatedElementsMap = arrayToMap(updatedElements);
 

packages/excalidraw/actions/actionBoundText.tsx

@@ -10,14 +10,14 @@ import {
   getOriginalContainerHeightFromCache,
   resetOriginalContainerCache,
   updateOriginalContainerCache,
-} from "@excalidraw/element";
+} from "@excalidraw/element/containerCache";
 
 import {
   computeBoundTextPosition,
   computeContainerDimensionForBoundText,
   getBoundTextElement,
   redrawTextBoundingBox,
-} from "@excalidraw/element";
+} from "@excalidraw/element/textElement";
 
 import {
   hasBoundTextElement,
@@ -25,15 +25,14 @@ import {
   isTextBindableContainer,
   isTextElement,
   isUsingAdaptiveRadius,
-} from "@excalidraw/element";
+} from "@excalidraw/element/typeChecks";
 
-import { measureText } from "@excalidraw/element";
+import { mutateElement } from "@excalidraw/element/mutateElement";
+import { measureText } from "@excalidraw/element/textMeasurements";
 
-import { syncMovedIndices } from "@excalidraw/element";
+import { syncMovedIndices } from "@excalidraw/element/fractionalIndex";
 
-import { newElement } from "@excalidraw/element";
+import { newElement } from "@excalidraw/element/newElement";
-
-import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type {
   ExcalidrawElement,
@@ -44,10 +43,12 @@ import type {
 
 import type { Mutable } from "@excalidraw/common/utility-types";
 
-import type { Radians } from "@excalidraw/math";
+import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 
+import type { Radians } from "../../math/src";
+
 import type { AppState } from "../types";
 
 export const actionUnbindText = register({
@@ -79,7 +80,7 @@ export const actionUnbindText = register({
           boundTextElement,
           elementsMap,
         );
-        app.scene.mutateElement(boundTextElement as ExcalidrawTextElement, {
+        mutateElement(boundTextElement as ExcalidrawTextElement, {
           containerId: null,
           width,
           height,
@@ -87,7 +88,7 @@ export const actionUnbindText = register({
           x,
           y,
         });
-        app.scene.mutateElement(element, {
+        mutateElement(element, {
           boundElements: element.boundElements?.filter(
             (ele) => ele.id !== boundTextElement.id,
           ),
@@ -152,21 +153,25 @@ export const actionBindText = register({
       textElement = selectedElements[1] as ExcalidrawTextElement;
       container = selectedElements[0] as ExcalidrawTextContainer;
     }
-    app.scene.mutateElement(textElement, {
+    mutateElement(textElement, {
       containerId: container.id,
       verticalAlign: VERTICAL_ALIGN.MIDDLE,
       textAlign: TEXT_ALIGN.CENTER,
       autoResize: true,
       angle: (isArrowElement(container) ? 0 : container?.angle ?? 0) as Radians,
     });
-    app.scene.mutateElement(container, {
+    mutateElement(container, {
       boundElements: (container.boundElements || []).concat({
         type: "text",
         id: textElement.id,
       }),
     });
     const originalContainerHeight = container.height;
-    redrawTextBoundingBox(textElement, container, app.scene);
+    redrawTextBoundingBox(
+      textElement,
+      container,
+      app.scene.getNonDeletedElementsMap(),
+    );
     // overwritting the cache with original container height so
     // it can be restored when unbind
     updateOriginalContainerCache(container.id, originalContainerHeight);
@@ -296,23 +301,27 @@ export const actionWrapTextInContainer = register({
             }
 
             if (startBinding || endBinding) {
-              app.scene.mutateElement(ele, {
+              mutateElement(ele, { startBinding, endBinding }, false);
-                startBinding,
-                endBinding,
-              });
             }
           });
         }
 
-        app.scene.mutateElement(textElement, {
+        mutateElement(
+          textElement,
+          {
             containerId: container.id,
             verticalAlign: VERTICAL_ALIGN.MIDDLE,
             boundElements: null,
             textAlign: TEXT_ALIGN.CENTER,
             autoResize: true,
-        });
+          },
-
+          false,
-        redrawTextBoundingBox(textElement, container, app.scene);
+        );
+        redrawTextBoundingBox(
+          textElement,
+          container,
+          app.scene.getNonDeletedElementsMap(),
+        );
 
         updatedElements = pushContainerBelowText(
           [...updatedElements, container],

packages/excalidraw/actions/actionCanvas.tsx

@@ -14,10 +14,8 @@ import {
 } from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
-import { newElementWith } from "@excalidraw/element";
+import { newElementWith } from "@excalidraw/element/mutateElement";
-import { getCommonBounds, type SceneBounds } from "@excalidraw/element";
+import { getCommonBounds, type SceneBounds } from "@excalidraw/element/bounds";
-
-import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawElement } from "@excalidraw/element/types";
 
@@ -41,11 +39,13 @@ import {
   ZoomResetIcon,
 } from "../components/icons";
 import { setCursor } from "../cursor";
+import { constrainScrollState } from "../scene/scrollConstraints";
 
 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";
 
@@ -137,7 +137,7 @@ export const actionZoomIn = register({
   trackEvent: { category: "canvas" },
   perform: (_elements, appState, _, app) => {
     return {
-      appState: {
+      appState: constrainScrollState({
         ...appState,
         ...getStateForZoom(
           {
@@ -148,7 +148,7 @@ export const actionZoomIn = register({
           appState,
         ),
         userToFollow: null,
-      },
+      }),
       captureUpdate: CaptureUpdateAction.EVENTUALLY,
     };
   },
@@ -178,7 +178,7 @@ export const actionZoomOut = register({
   trackEvent: { category: "canvas" },
   perform: (_elements, appState, _, app) => {
     return {
-      appState: {
+      appState: constrainScrollState({
         ...appState,
         ...getStateForZoom(
           {
@@ -189,7 +189,7 @@ export const actionZoomOut = register({
           appState,
         ),
         userToFollow: null,
-      },
+      }),
       captureUpdate: CaptureUpdateAction.EVENTUALLY,
     };
   },

packages/excalidraw/actions/actionClipboard.tsx

@@ -1,10 +1,8 @@
-import { isTextElement } from "@excalidraw/element";
+import { isTextElement } from "@excalidraw/element/typeChecks";
-import { getTextFromElements } from "@excalidraw/element";
+import { getTextFromElements } from "@excalidraw/element/textElement";
 
 import { CODES, KEYS, isFirefox } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element";
-
 import {
   copyTextToSystemClipboard,
   copyToClipboard,
@@ -17,6 +15,8 @@ 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,12 +1,11 @@
-import { isImageElement } from "@excalidraw/element";
+import { isImageElement } from "@excalidraw/element/typeChecks";
-
-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.test.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Excalidraw } from "../index";
+import { Excalidraw, mutateElement } from "../index";
 import { API } from "../tests/helpers/api";
 import { act, assertElements, render } from "../tests/test-utils";
 
@@ -56,7 +56,7 @@ describe("deleting selected elements when frame selected should keep children +
       frameId: f1.id,
     });
 
-    h.app.scene.mutateElement(r1, {
+    mutateElement(r1, {
       boundElements: [{ type: "text", id: t1.id }],
     });
 
@@ -94,7 +94,7 @@ describe("deleting selected elements when frame selected should keep children +
       frameId: null,
     });
 
-    h.app.scene.mutateElement(r1, {
+    mutateElement(r1, {
       boundElements: [{ type: "text", id: t1.id }],
     });
 
@@ -132,7 +132,7 @@ describe("deleting selected elements when frame selected should keep children +
       frameId: null,
     });
 
-    h.app.scene.mutateElement(r1, {
+    mutateElement(r1, {
       boundElements: [{ type: "text", id: t1.id }],
     });
 
@@ -170,7 +170,7 @@ describe("deleting selected elements when frame selected should keep children +
       frameId: null,
     });
 
-    h.app.scene.mutateElement(a1, {
+    mutateElement(a1, {
       boundElements: [{ type: "text", id: t1.id }],
     });
 

packages/excalidraw/actions/actionDeleteSelected.tsx

@@ -1,28 +1,30 @@
 import { KEYS, updateActiveTool } from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
-import { fixBindingsAfterDeletion } from "@excalidraw/element";
+import { fixBindingsAfterDeletion } from "@excalidraw/element/binding";
-import { LinearElementEditor } from "@excalidraw/element";
+import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
-import { newElementWith } from "@excalidraw/element";
+import {
-import { getContainerElement } from "@excalidraw/element";
+  mutateElement,
+  newElementWith,
+} from "@excalidraw/element/mutateElement";
+import { getContainerElement } from "@excalidraw/element/textElement";
 import {
   isBoundToContainer,
   isElbowArrow,
   isFrameLikeElement,
-} from "@excalidraw/element";
+} from "@excalidraw/element/typeChecks";
-import { getFrameChildren } from "@excalidraw/element";
+import { getFrameChildren } from "@excalidraw/element/frame";
 
 import {
   getElementsInGroup,
   selectGroupsForSelectedElements,
-} from "@excalidraw/element";
+} from "@excalidraw/element/groups";
-
-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";
 
@@ -92,7 +94,7 @@ const deleteSelectedElements = (
         el.boundElements.forEach((candidate) => {
           const bound = app.scene.getNonDeletedElementsMap().get(candidate.id);
           if (bound && isElbowArrow(bound)) {
-            app.scene.mutateElement(bound, {
+            mutateElement(bound, {
               startBinding:
                 el.id === bound.startBinding?.elementId
                   ? null
@@ -100,6 +102,7 @@ const deleteSelectedElements = (
               endBinding:
                 el.id === bound.endBinding?.elementId ? null : bound.endBinding,
             });
+            mutateElement(bound, { points: bound.points });
           }
         });
       }
@@ -258,11 +261,7 @@ export const actionDeleteSelected = register({
           : endBindingElement,
       };
 
-      LinearElementEditor.deletePoints(
+      LinearElementEditor.deletePoints(element, selectedPointsIndices);
-        element,
-        app.scene,
-        selectedPointsIndices,
-      );
 
       return {
         elements,

packages/excalidraw/actions/actionDistribute.tsx

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

packages/excalidraw/actions/actionDuplicateSelection.tsx

@@ -7,24 +7,32 @@ import {
 
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { LinearElementEditor } from "@excalidraw/element";
+import {
+  isBoundToContainer,
+  isLinearElement,
+} from "@excalidraw/element/typeChecks";
+
+import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
+
+import { selectGroupsForSelectedElements } from "@excalidraw/element/groups";
 
 import {
+  excludeElementsInFramesFromSelection,
   getSelectedElements,
-  getSelectionStateForElements,
+} from "@excalidraw/element/selection";
-} from "@excalidraw/element";
 
-import { syncMovedIndices } from "@excalidraw/element";
+import { syncMovedIndices } from "@excalidraw/element/fractionalIndex";
 
-import { duplicateElements } from "@excalidraw/element";
+import { duplicateElements } from "@excalidraw/element/duplicate";
 
-import { CaptureUpdateAction } from "@excalidraw/element";
+import type { ExcalidrawElement } from "@excalidraw/element/types";
 
 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";
 
@@ -44,7 +52,7 @@ export const actionDuplicateSelection = register({
       try {
         const newAppState = LinearElementEditor.duplicateSelectedPoints(
           appState,
-          app.scene,
+          app.scene.getNonDeletedElementsMap(),
         );
 
         return {
@@ -57,7 +65,8 @@ export const actionDuplicateSelection = register({
       }
     }
 
-    let { duplicatedElements, elementsWithDuplicates } = duplicateElements({
+    let { newElements: duplicatedElements, elementsWithClones: nextElements } =
+      duplicateElements({
         type: "in-place",
         elements,
         idsOfElementsToDuplicate: arrayToMap(
@@ -68,38 +77,40 @@ export const actionDuplicateSelection = register({
         ),
         appState,
         randomizeSeed: true,
-      overrides: ({ origElement, origIdToDuplicateId }) => {
+        overrides: (element) => ({
-        const duplicateFrameId =
+          x: element.x + DEFAULT_GRID_SIZE / 2,
-          origElement.frameId && origIdToDuplicateId.get(origElement.frameId);
+          y: element.y + DEFAULT_GRID_SIZE / 2,
-        return {
+        }),
-          x: origElement.x + DEFAULT_GRID_SIZE / 2,
+        reverseOrder: false,
-          y: origElement.y + DEFAULT_GRID_SIZE / 2,
-          frameId: duplicateFrameId ?? origElement.frameId,
-        };
-      },
       });
 
-    if (app.props.onDuplicate && elementsWithDuplicates) {
+    if (app.props.onDuplicate && nextElements) {
-      const mappedElements = app.props.onDuplicate(
+      const mappedElements = app.props.onDuplicate(nextElements, elements);
-        elementsWithDuplicates,
-        elements,
-      );
       if (mappedElements) {
-        elementsWithDuplicates = mappedElements;
+        nextElements = mappedElements;
       }
     }
 
     return {
-      elements: syncMovedIndices(
+      elements: syncMovedIndices(nextElements, arrayToMap(duplicatedElements)),
-        elementsWithDuplicates,
-        arrayToMap(duplicatedElements),
-      ),
       appState: {
         ...appState,
-        ...getSelectionStateForElements(
+        ...updateLinearElementEditors(duplicatedElements),
+        ...selectGroupsForSelectedElements(
+          {
+            editingGroupId: appState.editingGroupId,
+            selectedElementIds: excludeElementsInFramesFromSelection(
               duplicatedElements,
-          getNonDeletedElements(elementsWithDuplicates),
+            ).reduce((acc: Record<ExcalidrawElement["id"], true>, element) => {
+              if (!isBoundToContainer(element)) {
+                acc[element.id] = true;
+              }
+              return acc;
+            }, {}),
+          },
+          getNonDeletedElements(nextElements),
           appState,
+          null,
         ),
       },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
@@ -119,3 +130,24 @@ export const actionDuplicateSelection = register({
     />
   ),
 });
+
+const updateLinearElementEditors = (clonedElements: ExcalidrawElement[]) => {
+  const linears = clonedElements.filter(isLinearElement);
+  if (linears.length === 1) {
+    const linear = linears[0];
+    const boundElements = linear.boundElements?.map((def) => def.id) ?? [];
+    const onlySingleLinearSelected = clonedElements.every(
+      (el) => el.id === linear.id || boundElements.includes(el.id),
+    );
+
+    if (onlySingleLinearSelected) {
+      return {
+        selectedLinearElement: new LinearElementEditor(linear),
+      };
+    }
+  }
+
+  return {
+    selectedLinearElement: null,
+  };
+};

packages/excalidraw/actions/actionElementLink.ts

@@ -2,14 +2,13 @@ import {
   canCreateLinkFromElements,
   defaultGetElementLinkFromSelection,
   getLinkIdAndTypeFromSelection,
-} from "@excalidraw/element";
+} from "@excalidraw/element/elementLink";
-
-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,23 +1,18 @@
-import { KEYS, arrayToMap, randomId } from "@excalidraw/common";
+import { KEYS, arrayToMap } from "@excalidraw/common";
 
-import {
+import { newElementWith } from "@excalidraw/element/mutateElement";
-  elementsAreInSameGroup,
-  newElementWith,
-  selectGroupsFromGivenElements,
-} from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element";
+import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
 
 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);
 
@@ -28,10 +23,15 @@ 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.lock"
+      ? "labels.elementLock.lockAll"
-      : "labels.elementLock.unlock";
+      : "labels.elementLock.unlockAll";
   },
   icon: (appState, elements) => {
     const selectedElements = getSelectedElements(elements, appState);
@@ -58,84 +58,19 @@ export const actionToggleElementLock = register({
 
     const nextLockState = shouldLock(selectedElements);
     const selectedElementsMap = arrayToMap(selectedElements);
-
+    return {
-    const isAGroup =
+      elements: elements.map((element) => {
-      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;
+        return newElementWith(element, { locked: nextLockState });
-
+      }),
-      // 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,
     };
@@ -168,44 +103,18 @@ export const actionUnlockAllElements = register({
   perform: (elements, appState) => {
     const lockedElements = elements.filter((el) => el.locked);
 
-    const nextElements = elements.map((element) => {
+    return {
+      elements: elements.map((element) => {
         if (element.locked) {
-        // remove the temporary groupId if it exists
+          return newElementWith(element, { locked: false });
-        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: nextElements,
       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,8 +1,7 @@
 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,8 +7,6 @@ import {
 
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { CaptureUpdateAction } from "@excalidraw/element";
-
 import type { Theme } from "@excalidraw/element/types";
 
 import { useDevice } from "../components/App";
@@ -26,6 +24,7 @@ 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,22 +3,24 @@ import { pointFrom } from "@excalidraw/math";
 import {
   maybeBindLinearElement,
   bindOrUnbindLinearElement,
-} from "@excalidraw/element";
+} from "@excalidraw/element/binding";
-import { LinearElementEditor } from "@excalidraw/element";
+import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
-
+import { mutateElement } from "@excalidraw/element/mutateElement";
-import { isBindingElement, isLinearElement } from "@excalidraw/element";
+import {
+  isBindingElement,
+  isLinearElement,
+} from "@excalidraw/element/typeChecks";
 
 import { KEYS, arrayToMap, updateActiveTool } from "@excalidraw/common";
-import { isPathALoop } from "@excalidraw/element";
+import { isPathALoop } from "@excalidraw/element/shapes";
 
-import { isInvisiblySmallElement } from "@excalidraw/element";
+import { isInvisiblySmallElement } from "@excalidraw/element/sizeHelpers";
-
-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";
 
@@ -44,6 +46,7 @@ export const actionFinalize = register({
             element,
             startBindingElement,
             endBindingElement,
+            elementsMap,
             scene,
           );
         }
@@ -69,11 +72,7 @@ export const actionFinalize = register({
       scene.getElement(appState.pendingImageElementId);
 
     if (pendingImageElement) {
-      scene.mutateElement(
+      mutateElement(pendingImageElement, { isDeleted: true }, false);
-        pendingImageElement,
-        { isDeleted: true },
-        { informMutation: false, isDragging: false },
-      );
     }
 
     if (window.document.activeElement instanceof HTMLElement) {
@@ -97,7 +96,7 @@ export const actionFinalize = register({
           !lastCommittedPoint ||
           points[points.length - 1] !== lastCommittedPoint
         ) {
-          scene.mutateElement(multiPointElement, {
+          mutateElement(multiPointElement, {
             points: multiPointElement.points.slice(0, -1),
           });
         }
@@ -121,7 +120,7 @@ export const actionFinalize = register({
         if (isLoop) {
           const linePoints = multiPointElement.points;
           const firstPoint = linePoints[0];
-          scene.mutateElement(multiPointElement, {
+          mutateElement(multiPointElement, {
             points: linePoints.map((p, index) =>
               index === linePoints.length - 1
                 ? pointFrom(firstPoint[0], firstPoint[1])
@@ -141,7 +140,13 @@ export const actionFinalize = register({
           -1,
           arrayToMap(elements),
         );
-        maybeBindLinearElement(multiPointElement, appState, { x, y }, scene);
+        maybeBindLinearElement(
+          multiPointElement,
+          appState,
+          { x, y },
+          elementsMap,
+          elements,
+        );
       }
     }
 
@@ -197,10 +202,7 @@ export const actionFinalize = register({
         // To select the linear element when user has finished mutipoint editing
         selectedLinearElement:
           multiPointElement && isLinearElement(multiPointElement)
-            ? new LinearElementEditor(
+            ? new LinearElementEditor(multiPointElement)
-                multiPointElement,
-                arrayToMap(newElements),
-              )
             : appState.selectedLinearElement,
         pendingImageElementId: null,
       },

packages/excalidraw/actions/actionFlip.ts

@@ -2,21 +2,22 @@ import { getNonDeletedElements } from "@excalidraw/element";
 import {
   bindOrUnbindLinearElements,
   isBindingEnabled,
-} from "@excalidraw/element";
+} from "@excalidraw/element/binding";
-import { getCommonBoundingBox } from "@excalidraw/element";
+import { getCommonBoundingBox } from "@excalidraw/element/bounds";
-import { newElementWith } from "@excalidraw/element";
+import {
-import { deepCopyElement } from "@excalidraw/element";
+  mutateElement,
-import { resizeMultipleElements } from "@excalidraw/element";
+  newElementWith,
+} from "@excalidraw/element/mutateElement";
+import { deepCopyElement } from "@excalidraw/element/duplicate";
+import { resizeMultipleElements } from "@excalidraw/element/resizeElements";
 import {
   isArrowElement,
   isElbowArrow,
   isLinearElement,
-} from "@excalidraw/element";
+} from "@excalidraw/element/typeChecks";
-import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element";
+import { updateFrameMembershipOfSelectedElements } from "@excalidraw/element/frame";
 import { CODES, KEYS, arrayToMap } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element";
-
 import type {
   ExcalidrawArrowElement,
   ExcalidrawElbowArrowElement,
@@ -26,6 +27,7 @@ import type {
 } from "@excalidraw/element/types";
 
 import { getSelectedElements } from "../scene";
+import { CaptureUpdateAction } from "../store";
 
 import { flipHorizontal, flipVertical } from "../components/icons";
 
@@ -160,9 +162,11 @@ const flipElements = (
 
   bindOrUnbindLinearElements(
     selectedElements.filter(isLinearElement),
+    elementsMap,
+    app.scene.getNonDeletedElements(),
+    app.scene,
     isBindingEnabled(appState),
     [],
-    app.scene,
     appState.zoom,
   );
 
@@ -190,13 +194,13 @@ const flipElements = (
     getCommonBoundingBox(selectedElements);
   const [diffX, diffY] = [midX - newMidX, midY - newMidY];
   otherElements.forEach((element) =>
-    app.scene.mutateElement(element, {
+    mutateElement(element, {
       x: element.x + diffX,
       y: element.y + diffY,
     }),
   );
   elbowArrows.forEach((element) =>
-    app.scene.mutateElement(element, {
+    mutateElement(element, {
       x: element.x + diffX,
       y: element.y + diffY,
     }),

packages/excalidraw/actions/actionFrame.ts

@@ -1,26 +1,25 @@
 import { getNonDeletedElements } from "@excalidraw/element";
-import { mutateElement } from "@excalidraw/element";
+import { mutateElement } from "@excalidraw/element/mutateElement";
-import { newFrameElement } from "@excalidraw/element";
+import { newFrameElement } from "@excalidraw/element/newElement";
-import { isFrameLikeElement } from "@excalidraw/element";
+import { isFrameLikeElement } from "@excalidraw/element/typeChecks";
 import {
   addElementsToFrame,
   removeAllElementsFromFrame,
-} from "@excalidraw/element";
+} from "@excalidraw/element/frame";
-import { getFrameChildren } from "@excalidraw/element";
+import { getFrameChildren } from "@excalidraw/element/frame";
 
 import { KEYS, updateActiveTool } from "@excalidraw/common";
 
-import { getElementsInGroup } from "@excalidraw/element";
+import { getElementsInGroup } from "@excalidraw/element/groups";
 
-import { getCommonBounds } from "@excalidraw/element";
+import { getCommonBounds } from "@excalidraw/element/bounds";
-
-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";
 
@@ -174,9 +173,11 @@ export const actionWrapSelectionInFrame = register({
   },
   perform: (elements, appState, _, app) => {
     const selectedElements = getSelectedElements(elements, appState);
-    const elementsMap = app.scene.getNonDeletedElementsMap();
 
-    const [x1, y1, x2, y2] = getCommonBounds(selectedElements, elementsMap);
+    const [x1, y1, x2, y2] = getCommonBounds(
+      selectedElements,
+      app.scene.getNonDeletedElementsMap(),
+    );
     const PADDING = 16;
     const frame = newFrameElement({
       x: x1 - PADDING,
@@ -195,9 +196,13 @@ export const actionWrapSelectionInFrame = register({
       for (const elementInGroup of elementsInGroup) {
         const index = elementInGroup.groupIds.indexOf(appState.editingGroupId);
 
-        mutateElement(elementInGroup, elementsMap, {
+        mutateElement(
+          elementInGroup,
+          {
             groupIds: elementInGroup.groupIds.slice(0, index),
-        });
+          },
+          false,
+        );
       }
     }
 

packages/excalidraw/actions/actionGroup.tsx

@@ -1,8 +1,8 @@
 import { getNonDeletedElements } from "@excalidraw/element";
 
-import { newElementWith } from "@excalidraw/element";
+import { newElementWith } from "@excalidraw/element/mutateElement";
 
-import { isBoundToContainer } from "@excalidraw/element";
+import { isBoundToContainer } from "@excalidraw/element/typeChecks";
 
 import {
   frameAndChildrenSelectedTogether,
@@ -12,7 +12,7 @@ import {
   groupByFrameLikes,
   removeElementsFromFrame,
   replaceAllElementsInFrame,
-} from "@excalidraw/element";
+} from "@excalidraw/element/frame";
 
 import { KEYS, randomId, arrayToMap, getShortcutKey } from "@excalidraw/common";
 
@@ -24,11 +24,9 @@ import {
   addToGroup,
   removeFromSelectedGroups,
   isElementInGroup,
-} from "@excalidraw/element";
+} from "@excalidraw/element/groups";
 
-import { syncMovedIndices } from "@excalidraw/element";
+import { syncMovedIndices } from "@excalidraw/element/fractionalIndex";
-
-import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type {
   ExcalidrawElement,
@@ -42,6 +40,7 @@ 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,9 +1,5 @@
 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";
@@ -11,8 +7,10 @@ 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 { Store } from "../store";
 import type { AppClassProperties, AppState } from "../types";
 import type { Action, ActionResult } from "./types";
 
@@ -37,11 +35,7 @@ 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,
@@ -53,9 +47,9 @@ const executeHistoryAction = (
   return { captureUpdate: CaptureUpdateAction.EVENTUALLY };
 };
 
-type ActionCreator = (history: History) => Action;
+type ActionCreator = (history: History, store: Store) => Action;
 
-export const createUndoAction: ActionCreator = (history) => ({
+export const createUndoAction: ActionCreator = (history, store) => ({
   name: "undo",
   label: "buttons.undo",
   icon: UndoIcon,
@@ -63,7 +57,11 @@ export const createUndoAction: ActionCreator = (history) => ({
   viewMode: false,
   perform: (elements, appState, value, app) =>
     executeHistoryAction(app, appState, () =>
-      history.undo(arrayToMap(elements) as SceneElementsMap, appState),
+      history.undo(
+        arrayToMap(elements) as SceneElementsMap, // TODO: #7348 refactor action manager to already include `SceneElementsMap`
+        appState,
+        store.snapshot,
+      ),
     ),
   keyTest: (event) =>
     event[KEYS.CTRL_OR_CMD] && matchKey(event, KEYS.Z) && !event.shiftKey,
@@ -90,15 +88,19 @@ export const createUndoAction: ActionCreator = (history) => ({
   },
 });
 
-export const createRedoAction: ActionCreator = (history) => ({
+export const createRedoAction: ActionCreator = (history, store) => ({
   name: "redo",
   label: "buttons.redo",
   icon: RedoIcon,
   trackEvent: { category: "history" },
   viewMode: false,
-  perform: (elements, appState, __, app) =>
+  perform: (elements, appState, _, app) =>
     executeHistoryAction(app, appState, () =>
-      history.redo(arrayToMap(elements) as SceneElementsMap, appState),
+      history.redo(
+        arrayToMap(elements) as SceneElementsMap, // TODO: #7348 refactor action manager to already include `SceneElementsMap`
+        appState,
+        store.snapshot,
+      ),
     ),
   keyTest: (event) =>
     (event[KEYS.CTRL_OR_CMD] && event.shiftKey && matchKey(event, KEYS.Z)) ||

packages/excalidraw/actions/actionLinearEditor.tsx

@@ -1,10 +1,6 @@
-import { LinearElementEditor } from "@excalidraw/element";
+import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
 
-import { isElbowArrow, isLinearElement } from "@excalidraw/element";
+import { isElbowArrow, isLinearElement } from "@excalidraw/element/typeChecks";
-
-import { arrayToMap } from "@excalidraw/common";
-
-import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawLinearElement } from "@excalidraw/element/types";
 
@@ -13,6 +9,7 @@ import { ToolButton } from "../components/ToolButton";
 import { lineEditorIcon } from "../components/icons";
 
 import { t } from "../i18n";
+import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 
@@ -53,7 +50,7 @@ export const actionToggleLinearEditor = register({
     const editingLinearElement =
       appState.editingLinearElement?.elementId === selectedElement.id
         ? null
-        : new LinearElementEditor(selectedElement, arrayToMap(elements));
+        : new LinearElementEditor(selectedElement);
     return {
       appState: {
         ...appState,

packages/excalidraw/actions/actionLink.tsx

@@ -1,15 +1,14 @@
-import { isEmbeddableElement } from "@excalidraw/element";
+import { isEmbeddableElement } from "@excalidraw/element/typeChecks";
 
 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";
+import { showSelectedShapeActions } from "@excalidraw/element/showSelectedShapeActions";
-
-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,7 +1,5 @@
 import clsx from "clsx";
 
-import { CaptureUpdateAction } from "@excalidraw/element";
-
 import { getClientColor } from "../clients";
 import { Avatar } from "../components/Avatar";
 import {
@@ -10,6 +8,7 @@ import {
   microphoneMutedIcon,
 } from "../components/icons";
 import { t } from "../i18n";
+import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/actionProperties.tsx

@@ -20,7 +20,6 @@ import {
   getShortcutKey,
   tupleToCoors,
   getLineHeight,
-  reduceToCommonValue,
 } from "@excalidraw/common";
 
 import { getNonDeletedElements } from "@excalidraw/element";
@@ -31,16 +30,19 @@ import {
   calculateFixedPointForElbowArrowBinding,
   getHoveredElementForBinding,
   updateBoundElements,
-} from "@excalidraw/element";
+} from "@excalidraw/element/binding";
 
-import { LinearElementEditor } from "@excalidraw/element";
+import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
 
-import { newElementWith } from "@excalidraw/element";
+import {
+  mutateElement,
+  newElementWith,
+} from "@excalidraw/element/mutateElement";
 
 import {
   getBoundTextElement,
   redrawTextBoundingBox,
-} from "@excalidraw/element";
+} from "@excalidraw/element/textElement";
 
 import {
   isArrowElement,
@@ -49,19 +51,16 @@ import {
   isLinearElement,
   isTextElement,
   isUsingAdaptiveRadius,
-} from "@excalidraw/element";
+} from "@excalidraw/element/typeChecks";
 
-import { hasStrokeColor } from "@excalidraw/element";
+import { hasStrokeColor } from "@excalidraw/element/comparisons";
 
-import { updateElbowArrowPoints } from "@excalidraw/element";
+import { updateElbowArrowPoints } from "@excalidraw/element/elbowArrow";
-
-import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { LocalPoint } from "@excalidraw/math";
 
 import type {
   Arrowhead,
-  ElementsMap,
   ExcalidrawBindableElement,
   ExcalidrawElement,
   ExcalidrawLinearElement,
@@ -69,14 +68,11 @@ import type {
   FontFamilyValues,
   TextAlign,
   VerticalAlign,
+  NonDeletedSceneElementsMap,
 } from "@excalidraw/element/types";
 
-import type { Scene } from "@excalidraw/element";
-
-import type { CaptureUpdateActionType } from "@excalidraw/element";
-
 import { trackEvent } from "../analytics";
-import { RadioSelection } from "../components/RadioSelection";
+import { ButtonIconSelect } from "../components/ButtonIconSelect";
 import { ColorPicker } from "../components/ColorPicker/ColorPicker";
 import { FontPicker } from "../components/FontPicker/FontPicker";
 import { IconPicker } from "../components/IconPicker";
@@ -131,13 +127,16 @@ import { Fonts } from "../fonts";
 import { getLanguage, t } from "../i18n";
 import {
   canHaveArrowheads,
+  getCommonAttributeOfSelectedElements,
   getSelectedElements,
   getTargetElements,
   isSomeElementSelected,
 } from "../scene";
+import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 
+import type { CaptureUpdateActionType } from "../store";
 import type { AppClassProperties, AppState, Primitive } from "../types";
 
 const FONT_SIZE_RELATIVE_INCREASE_STEP = 0.1;
@@ -167,12 +166,12 @@ export const changeProperty = (
 
 export const getFormValue = function <T extends Primitive>(
   elements: readonly ExcalidrawElement[],
-  app: AppClassProperties,
+  appState: AppState,
   getAttribute: (element: ExcalidrawElement) => T,
   isRelevantElement: true | ((element: ExcalidrawElement) => boolean),
   defaultValue: T | ((isSomeElementSelected: boolean) => T),
 ): T {
-  const editingTextElement = app.state.editingTextElement;
+  const editingTextElement = appState.editingTextElement;
   const nonDeletedElements = getNonDeletedElements(elements);
 
   let ret: T | null = null;
@@ -182,17 +181,17 @@ export const getFormValue = function <T extends Primitive>(
   }
 
   if (!ret) {
-    const hasSelection = isSomeElementSelected(nonDeletedElements, app.state);
+    const hasSelection = isSomeElementSelected(nonDeletedElements, appState);
 
     if (hasSelection) {
-      const selectedElements = app.scene.getSelectedElements(app.state);
-      const targetElements =
-        isRelevantElement === true
-          ? selectedElements
-          : selectedElements.filter((el) => isRelevantElement(el));
-
       ret =
-        reduceToCommonValue(targetElements, getAttribute) ??
+        getCommonAttributeOfSelectedElements(
+          isRelevantElement === true
+            ? nonDeletedElements
+            : nonDeletedElements.filter((el) => isRelevantElement(el)),
+          appState,
+          getAttribute,
+        ) ??
         (typeof defaultValue === "function"
           ? defaultValue(true)
           : defaultValue);
@@ -208,12 +207,13 @@ export const getFormValue = function <T extends Primitive>(
 const offsetElementAfterFontResize = (
   prevElement: ExcalidrawTextElement,
   nextElement: ExcalidrawTextElement,
-  scene: Scene,
 ) => {
   if (isBoundToContainer(nextElement) || !nextElement.autoResize) {
     return nextElement;
   }
-  return scene.mutateElement(nextElement, {
+  return mutateElement(
+    nextElement,
+    {
       x:
         prevElement.textAlign === "left"
           ? prevElement.x
@@ -223,7 +223,9 @@ const offsetElementAfterFontResize = (
       // centering vertically is non-standard, but for Excalidraw I think
       // it makes sense
       y: prevElement.y + (prevElement.height - nextElement.height) / 2,
-  });
+    },
+    false,
+  );
 };
 
 const changeFontSize = (
@@ -249,14 +251,10 @@ const changeFontSize = (
         redrawTextBoundingBox(
           newElement,
           app.scene.getContainerElement(oldElement),
-          app.scene,
+          app.scene.getNonDeletedElementsMap(),
         );
 
-        newElement = offsetElementAfterFontResize(
+        newElement = offsetElementAfterFontResize(oldElement, newElement);
-          oldElement,
-          newElement,
-          app.scene,
-        );
 
         return newElement;
       }
@@ -266,11 +264,15 @@ const changeFontSize = (
   );
 
   // Update arrow elements after text elements have been updated
+  const updatedElementsMap = arrayToMap(updatedElements);
   getSelectedElements(elements, appState, {
     includeBoundTextElement: true,
   }).forEach((element) => {
     if (isTextElement(element)) {
-      updateBoundElements(element, app.scene);
+      updateBoundElements(
+        element,
+        updatedElementsMap as NonDeletedSceneElementsMap,
+      );
     }
   });
 
@@ -320,7 +322,7 @@ export const actionChangeStrokeColor = register({
         : CaptureUpdateAction.EVENTUALLY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app }) => (
+  PanelComponent: ({ elements, appState, updateData, appProps }) => (
     <>
       <h3 aria-hidden="true">{t("labels.stroke")}</h3>
       <ColorPicker
@@ -330,11 +332,10 @@ export const actionChangeStrokeColor = register({
         label={t("labels.stroke")}
         color={getFormValue(
           elements,
-          app,
+          appState,
           (element) => element.strokeColor,
           true,
-          (hasSelection) =>
+          appState.currentItemStrokeColor,
-            !hasSelection ? appState.currentItemStrokeColor : null,
         )}
         onChange={(color) => updateData({ currentItemStrokeColor: color })}
         elements={elements}
@@ -367,7 +368,7 @@ export const actionChangeBackgroundColor = register({
         : CaptureUpdateAction.EVENTUALLY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app }) => (
+  PanelComponent: ({ elements, appState, updateData, appProps }) => (
     <>
       <h3 aria-hidden="true">{t("labels.background")}</h3>
       <ColorPicker
@@ -377,11 +378,10 @@ export const actionChangeBackgroundColor = register({
         label={t("labels.background")}
         color={getFormValue(
           elements,
-          app,
+          appState,
           (element) => element.backgroundColor,
           true,
-          (hasSelection) =>
+          appState.currentItemBackgroundColor,
-            !hasSelection ? appState.currentItemBackgroundColor : null,
         )}
         onChange={(color) => updateData({ currentItemBackgroundColor: color })}
         elements={elements}
@@ -412,7 +412,7 @@ export const actionChangeFillStyle = register({
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app }) => {
+  PanelComponent: ({ elements, appState, updateData }) => {
     const selectedElements = getSelectedElements(elements, appState);
     const allElementsZigZag =
       selectedElements.length > 0 &&
@@ -421,8 +421,7 @@ export const actionChangeFillStyle = register({
     return (
       <fieldset>
         <legend>{t("labels.fill")}</legend>
-        <div className="buttonList">
+        <ButtonIconSelect
-          <RadioSelection
           type="button"
           options={[
             {
@@ -449,7 +448,7 @@ export const actionChangeFillStyle = register({
           ]}
           value={getFormValue(
             elements,
-              app,
+            appState,
             (element) => element.fillStyle,
             (element) => element.hasOwnProperty("fillStyle"),
             (hasSelection) =>
@@ -466,7 +465,6 @@ export const actionChangeFillStyle = register({
             updateData(nextValue);
           }}
         />
-        </div>
       </fieldset>
     );
   },
@@ -487,11 +485,10 @@ export const actionChangeStrokeWidth = register({
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app }) => (
+  PanelComponent: ({ elements, appState, updateData }) => (
     <fieldset>
       <legend>{t("labels.strokeWidth")}</legend>
-      <div className="buttonList">
+      <ButtonIconSelect
-        <RadioSelection
         group="stroke-width"
         options={[
           {
@@ -515,7 +512,7 @@ export const actionChangeStrokeWidth = register({
         ]}
         value={getFormValue(
           elements,
-            app,
+          appState,
           (element) => element.strokeWidth,
           (element) => element.hasOwnProperty("strokeWidth"),
           (hasSelection) =>
@@ -523,7 +520,6 @@ export const actionChangeStrokeWidth = register({
         )}
         onChange={(value) => updateData(value)}
       />
-      </div>
     </fieldset>
   ),
 });
@@ -544,11 +540,10 @@ export const actionChangeSloppiness = register({
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app }) => (
+  PanelComponent: ({ elements, appState, updateData }) => (
     <fieldset>
       <legend>{t("labels.sloppiness")}</legend>
-      <div className="buttonList">
+      <ButtonIconSelect
-        <RadioSelection
         group="sloppiness"
         options={[
           {
@@ -569,7 +564,7 @@ export const actionChangeSloppiness = register({
         ]}
         value={getFormValue(
           elements,
-            app,
+          appState,
           (element) => element.roughness,
           (element) => element.hasOwnProperty("roughness"),
           (hasSelection) =>
@@ -577,7 +572,6 @@ export const actionChangeSloppiness = register({
         )}
         onChange={(value) => updateData(value)}
       />
-      </div>
     </fieldset>
   ),
 });
@@ -597,11 +591,10 @@ export const actionChangeStrokeStyle = register({
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app }) => (
+  PanelComponent: ({ elements, appState, updateData }) => (
     <fieldset>
       <legend>{t("labels.strokeStyle")}</legend>
-      <div className="buttonList">
+      <ButtonIconSelect
-        <RadioSelection
         group="strokeStyle"
         options={[
           {
@@ -622,7 +615,7 @@ export const actionChangeStrokeStyle = register({
         ]}
         value={getFormValue(
           elements,
-            app,
+          appState,
           (element) => element.strokeStyle,
           (element) => element.hasOwnProperty("strokeStyle"),
           (hasSelection) =>
@@ -630,7 +623,6 @@ export const actionChangeStrokeStyle = register({
         )}
         onChange={(value) => updateData(value)}
       />
-      </div>
     </fieldset>
   ),
 });
@@ -654,8 +646,13 @@ export const actionChangeOpacity = register({
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
   },
-  PanelComponent: ({ app, updateData }) => (
+  PanelComponent: ({ elements, appState, updateData }) => (
-    <Range updateData={updateData} app={app} testId="opacity" />
+    <Range
+      updateData={updateData}
+      elements={elements}
+      appState={appState}
+      testId="opacity"
+    />
   ),
 });
 
@@ -669,8 +666,7 @@ export const actionChangeFontSize = register({
   PanelComponent: ({ elements, appState, updateData, app }) => (
     <fieldset>
       <legend>{t("labels.fontSize")}</legend>
-      <div className="buttonList">
+      <ButtonIconSelect
-        <RadioSelection
         group="font-size"
         options={[
           {
@@ -700,7 +696,7 @@ export const actionChangeFontSize = register({
         ]}
         value={getFormValue(
           elements,
-            app,
+          appState,
           (element) => {
             if (isTextElement(element)) {
               return element.fontSize;
@@ -727,7 +723,6 @@ export const actionChangeFontSize = register({
         )}
         onChange={(value) => updateData(value)}
       />
-      </div>
     </fieldset>
   ),
 });
@@ -783,7 +778,7 @@ type ChangeFontFamilyData = Partial<
   >
 > & {
   /** cache of selected & editing elements populated on opened popup */
-  cachedElements?: ElementsMap;
+  cachedElements?: Map<string, ExcalidrawElement>;
   /** flag to reset all elements to their cached versions  */
   resetAll?: true;
   /** flag to reset all containers to their cached versions */
@@ -924,7 +919,7 @@ export const actionChangeFontFamily = register({
 
               if (resetContainers && container && cachedContainer) {
                 // reset the container back to it's cached version
-                app.scene.mutateElement(container, { ...cachedContainer });
+                mutateElement(container, { ...cachedContainer }, false);
               }
 
               if (!skipFontFaceCheck) {
@@ -955,7 +950,12 @@ export const actionChangeFontFamily = register({
         // we either skip the check (have at least one font face loaded) or do the check and find out all the font faces have loaded
         for (const [element, container] of elementContainerMapping) {
           // trigger synchronous redraw
-          redrawTextBoundingBox(element, container, app.scene);
+          redrawTextBoundingBox(
+            element,
+            container,
+            app.scene.getNonDeletedElementsMap(),
+            false,
+          );
         }
       } else {
         // otherwise try to load all font faces for the given chars and redraw elements once our font faces loaded
@@ -972,7 +972,8 @@ export const actionChangeFontFamily = register({
               redrawTextBoundingBox(
                 latestElement as ExcalidrawTextElement,
                 latestContainer,
-                app.scene,
+                app.scene.getNonDeletedElementsMap(),
+                false,
               );
             }
           }
@@ -986,7 +987,7 @@ export const actionChangeFontFamily = register({
     return result;
   },
   PanelComponent: ({ elements, appState, app, updateData }) => {
-    const cachedElementsRef = useRef<ElementsMap>(new Map());
+    const cachedElementsRef = useRef<Map<string, ExcalidrawElement>>(new Map());
     const prevSelectedFontFamilyRef = useRef<number | null>(null);
     // relying on state batching as multiple `FontPicker` handlers could be called in rapid succession and we want to combine them
     const [batchedData, setBatchedData] = useState<ChangeFontFamilyData>({});
@@ -995,11 +996,11 @@ export const actionChangeFontFamily = register({
     const selectedFontFamily = useMemo(() => {
       const getFontFamily = (
         elementsArray: readonly ExcalidrawElement[],
-        elementsMap: ElementsMap,
+        elementsMap: Map<string, ExcalidrawElement>,
       ) =>
         getFormValue(
           elementsArray,
-          app,
+          appState,
           (element) => {
             if (isTextElement(element)) {
               return element.fontFamily;
@@ -1037,7 +1038,7 @@ export const actionChangeFontFamily = register({
 
       // popup props are not in sync, hence we are in the middle of an update, so keeping the previous value we've had
       return prevSelectedFontFamilyRef.current;
-    }, [batchedData.openPopup, appState, elements, app]);
+    }, [batchedData.openPopup, appState, elements, app.scene]);
 
     useEffect(() => {
       prevSelectedFontFamilyRef.current = selectedFontFamily;
@@ -1178,7 +1179,7 @@ export const actionChangeTextAlign = register({
             redrawTextBoundingBox(
               newElement,
               app.scene.getContainerElement(oldElement),
-              app.scene,
+              app.scene.getNonDeletedElementsMap(),
             );
             return newElement;
           }
@@ -1199,8 +1200,7 @@ export const actionChangeTextAlign = register({
     return (
       <fieldset>
         <legend>{t("labels.textAlign")}</legend>
-        <div className="buttonList">
+        <ButtonIconSelect<TextAlign | false>
-          <RadioSelection<TextAlign | false>
           group="text-align"
           options={[
             {
@@ -1224,7 +1224,7 @@ export const actionChangeTextAlign = register({
           ]}
           value={getFormValue(
             elements,
-              app,
+            appState,
             (element) => {
               if (isTextElement(element)) {
                 return element.textAlign;
@@ -1246,7 +1246,6 @@ export const actionChangeTextAlign = register({
           )}
           onChange={(value) => updateData(value)}
         />
-        </div>
       </fieldset>
     );
   },
@@ -1271,7 +1270,7 @@ export const actionChangeVerticalAlign = register({
             redrawTextBoundingBox(
               newElement,
               app.scene.getContainerElement(oldElement),
-              app.scene,
+              app.scene.getNonDeletedElementsMap(),
             );
             return newElement;
           }
@@ -1289,8 +1288,7 @@ export const actionChangeVerticalAlign = register({
   PanelComponent: ({ elements, appState, updateData, app }) => {
     return (
       <fieldset>
-        <div className="buttonList">
+        <ButtonIconSelect<VerticalAlign | false>
-          <RadioSelection<VerticalAlign | false>
           group="text-align"
           options={[
             {
@@ -1314,7 +1312,7 @@ export const actionChangeVerticalAlign = register({
           ]}
           value={getFormValue(
             elements,
-              app,
+            appState,
             (element) => {
               if (isTextElement(element) && element.containerId) {
                 return element.verticalAlign;
@@ -1338,7 +1336,6 @@ export const actionChangeVerticalAlign = register({
           )}
           onChange={(value) => updateData(value)}
         />
-        </div>
       </fieldset>
     );
   },
@@ -1373,7 +1370,7 @@ export const actionChangeRoundness = register({
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app }) => {
+  PanelComponent: ({ elements, appState, updateData }) => {
     const targetElements = getTargetElements(
       getNonDeletedElements(elements),
       appState,
@@ -1386,8 +1383,7 @@ export const actionChangeRoundness = register({
     return (
       <fieldset>
         <legend>{t("labels.edges")}</legend>
-        <div className="buttonList">
+        <ButtonIconSelect
-          <RadioSelection
           group="edges"
           options={[
             {
@@ -1403,13 +1399,9 @@ export const actionChangeRoundness = register({
           ]}
           value={getFormValue(
             elements,
-              app,
+            appState,
             (element) =>
-                hasLegacyRoundness
+              hasLegacyRoundness ? null : element.roundness ? "round" : "sharp",
-                  ? null
-                  : element.roundness
-                  ? "round"
-                  : "sharp",
             (element) =>
               !isArrowElement(element) && element.hasOwnProperty("roundness"),
             (hasSelection) =>
@@ -1417,7 +1409,6 @@ export const actionChangeRoundness = register({
           )}
           onChange={(value) => updateData(value)}
         />
-        </div>
       </fieldset>
     );
   },
@@ -1538,7 +1529,7 @@ export const actionChangeArrowhead = register({
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app }) => {
+  PanelComponent: ({ elements, appState, updateData }) => {
     const isRTL = getLanguage().rtl;
 
     return (
@@ -1550,7 +1541,7 @@ export const actionChangeArrowhead = register({
             options={getArrowheadOptions(!isRTL)}
             value={getFormValue<Arrowhead | null>(
               elements,
-              app,
+              appState,
               (element) =>
                 isLinearElement(element) && canHaveArrowheads(element.type)
                   ? element.startArrowhead
@@ -1567,7 +1558,7 @@ export const actionChangeArrowhead = register({
             options={getArrowheadOptions(!!isRTL)}
             value={getFormValue<Arrowhead | null>(
               elements,
-              app,
+              appState,
               (element) =>
                 isLinearElement(element) && canHaveArrowheads(element.type)
                   ? element.endArrowhead
@@ -1679,10 +1670,10 @@ export const actionChangeArrowType = register({
             newElement,
             startHoveredElement,
             "start",
-            app.scene,
+            elementsMap,
           );
         endHoveredElement &&
-          bindLinearElement(newElement, endHoveredElement, "end", app.scene);
+          bindLinearElement(newElement, endHoveredElement, "end", elementsMap);
 
         const startBinding =
           startElement && newElement.startBinding
@@ -1693,6 +1684,7 @@ export const actionChangeArrowType = register({
                   newElement,
                   startElement,
                   "start",
+                  elementsMap,
                 ),
               }
             : null;
@@ -1705,6 +1697,7 @@ export const actionChangeArrowType = register({
                   newElement,
                   endElement,
                   "end",
+                  elementsMap,
                 ),
               }
             : null;
@@ -1723,6 +1716,12 @@ export const actionChangeArrowType = register({
             fixedSegments: null,
           }),
         };
+
+        LinearElementEditor.updateEditorMidPointsCache(
+          newElement,
+          elementsMap,
+          app.state,
+        );
       } else {
         const elementsMap = app.scene.getNonDeletedElementsMap();
         if (newElement.startBinding) {
@@ -1730,7 +1729,7 @@ export const actionChangeArrowType = register({
             newElement.startBinding.elementId,
           ) as ExcalidrawBindableElement;
           if (startElement) {
-            bindLinearElement(newElement, startElement, "start", app.scene);
+            bindLinearElement(newElement, startElement, "start", elementsMap);
           }
         }
         if (newElement.endBinding) {
@@ -1738,7 +1737,7 @@ export const actionChangeArrowType = register({
             newElement.endBinding.elementId,
           ) as ExcalidrawBindableElement;
           if (endElement) {
-            bindLinearElement(newElement, endElement, "end", app.scene);
+            bindLinearElement(newElement, endElement, "end", elementsMap);
           }
         }
       }
@@ -1759,7 +1758,6 @@ export const actionChangeArrowType = register({
       if (selected) {
         newState.selectedLinearElement = new LinearElementEditor(
           selected as ExcalidrawLinearElement,
-          arrayToMap(elements),
         );
       }
     }
@@ -1770,12 +1768,11 @@ export const actionChangeArrowType = register({
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,
     };
   },
-  PanelComponent: ({ elements, appState, updateData, app }) => {
+  PanelComponent: ({ elements, appState, updateData }) => {
     return (
       <fieldset>
         <legend>{t("labels.arrowtypes")}</legend>
-        <div className="buttonList">
+        <ButtonIconSelect
-          <RadioSelection
           group="arrowtypes"
           options={[
             {
@@ -1799,7 +1796,7 @@ export const actionChangeArrowType = register({
           ]}
           value={getFormValue(
             elements,
-              app,
+            appState,
             (element) => {
               if (isArrowElement(element)) {
                 return element.elbowed
@@ -1817,7 +1814,6 @@ export const actionChangeArrowType = register({
           )}
           onChange={(value) => updateData(value)}
         />
-        </div>
       </fieldset>
     );
   },

packages/excalidraw/actions/actionSelectAll.ts

@@ -1,15 +1,15 @@
 import { getNonDeletedElements } from "@excalidraw/element";
-import { LinearElementEditor } from "@excalidraw/element";
+import { LinearElementEditor } from "@excalidraw/element/linearElementEditor";
-import { isLinearElement, isTextElement } from "@excalidraw/element";
+import { isLinearElement, isTextElement } from "@excalidraw/element/typeChecks";
 
-import { arrayToMap, KEYS } from "@excalidraw/common";
+import { KEYS } from "@excalidraw/common";
 
-import { selectGroupsForSelectedElements } from "@excalidraw/element";
+import { selectGroupsForSelectedElements } from "@excalidraw/element/groups";
-
-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";
@@ -53,7 +53,7 @@ export const actionSelectAll = register({
           // single linear element selected
           Object.keys(selectedElementIds).length === 1 &&
           isLinearElement(elements[0])
-            ? new LinearElementEditor(elements[0], arrayToMap(elements))
+            ? new LinearElementEditor(elements[0])
             : null,
       },
       captureUpdate: CaptureUpdateAction.IMMEDIATELY,

packages/excalidraw/actions/actionStyles.ts

@@ -7,7 +7,7 @@ import {
   getLineHeight,
 } from "@excalidraw/common";
 
-import { newElementWith } from "@excalidraw/element";
+import { newElementWith } from "@excalidraw/element/mutateElement";
 
 import {
   hasBoundTextElement,
@@ -17,14 +17,12 @@ import {
   isArrowElement,
   isExcalidrawElement,
   isTextElement,
-} from "@excalidraw/element";
+} from "@excalidraw/element/typeChecks";
 
 import {
   getBoundTextElement,
   redrawTextBoundingBox,
-} from "@excalidraw/element";
+} from "@excalidraw/element/textElement";
-
-import { CaptureUpdateAction } from "@excalidraw/element";
 
 import type { ExcalidrawTextElement } from "@excalidraw/element/types";
 
@@ -32,6 +30,7 @@ import { paintIcon } from "../components/icons";
 
 import { t } from "../i18n";
 import { getSelectedElements } from "../scene";
+import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 
@@ -140,8 +139,11 @@ export const actionPasteStyles = register({
                     element.id === newElement.containerId,
                 ) || null;
             }
-
+            redrawTextBoundingBox(
-            redrawTextBoundingBox(newElement, container, app.scene);
+              newElement,
+              container,
+              app.scene.getNonDeletedElementsMap(),
+            );
           }
 
           if (

packages/excalidraw/actions/actionTextAutoResize.ts

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

packages/excalidraw/actions/actionToggleGridMode.tsx

@@ -1,8 +1,7 @@
 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,8 +1,7 @@
 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,9 +5,8 @@ import {
   DEFAULT_SIDEBAR,
 } from "@excalidraw/common";
 
-import { CaptureUpdateAction } from "@excalidraw/element";
-
 import { searchIcon } from "../components/icons";
+import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 
@@ -34,6 +33,13 @@ 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

@@ -1,35 +0,0 @@
-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,8 +1,7 @@
 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,8 +1,7 @@
 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,8 +1,7 @@
 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,9 +5,7 @@ import {
   moveOneRight,
   moveAllLeft,
   moveAllRight,
-} from "@excalidraw/element";
+} from "@excalidraw/element/zindex";
-
-import { CaptureUpdateAction } from "@excalidraw/element";
 
 import {
   BringForwardIcon,
@@ -16,6 +14,7 @@ import {
   SendToBackIcon,
 } from "../components/icons";
 import { t } from "../i18n";
+import { CaptureUpdateAction } from "../store";
 
 import { register } from "./register";
 

packages/excalidraw/actions/types.ts

@@ -3,8 +3,7 @@ import type {
   OrderedExcalidrawElement,
 } from "@excalidraw/element/types";
 
-import type { CaptureUpdateActionType } from "@excalidraw/element";
+import type { CaptureUpdateActionType } from "../store";
-
 import type {
   AppClassProperties,
   AppState,
@@ -141,8 +140,7 @@ export type ActionName =
   | "linkToElement"
   | "cropEditor"
   | "wrapSelectionInFrame"
-  | "toggleLassoTool"
+  | "toggleLassoTool";
-  | "toggleShapeSwitch";
 
 export type PanelComponentProps = {
   elements: readonly ExcalidrawElement[];
@@ -197,8 +195,7 @@ export interface Action {
           | "menu"
           | "collab"
           | "hyperlink"
-          | "search_menu"
+          | "search_menu";
-          | "shape_switch";
         action?: string;
         predicate?: (
           appState: Readonly<AppState>,

packages/excalidraw/animated-trail.ts

@@ -129,6 +129,7 @@ export class AnimatedTrail implements Trail {
   }
 
   private update() {
+    this.pastTrails = [];
     this.start();
     if (this.trailAnimation) {
       this.trailAnimation.setAttribute("begin", "indefinite");

packages/excalidraw/appState.ts

@@ -20,7 +20,7 @@ const defaultExportScale = EXPORT_SCALES.includes(devicePixelRatio)
 
 export const getDefaultAppState = (): Omit<
   AppState,
-  "offsetTop" | "offsetLeft" | "width" | "height"
+  "offsetTop" | "offsetLeft" | "width" | "height" | "scrollConstraints"
 > => {
   return {
     showWelcomeScreen: false,
@@ -121,9 +121,7 @@ export const getDefaultAppState = (): Omit<
     followedBy: new Set(),
     isCropping: false,
     croppingElementId: null,
-    searchMatches: null,
+    searchMatches: [],
-    lockedMultiSelections: {},
-    activeLockedId: null,
   };
 };
 
@@ -245,11 +243,10 @@ const APP_STATE_STORAGE_CONF = (<
   objectsSnapModeEnabled: { browser: true, export: false, server: false },
   userToFollow: { browser: false, export: false, server: false },
   followedBy: { browser: false, export: false, server: false },
+  scrollConstraints: { browser: false, export: false, server: false },
   isCropping: { browser: false, export: false, server: false },
   croppingElementId: { browser: false, export: false, server: false },
   searchMatches: { browser: false, export: false, server: false },
-  lockedMultiSelections: { browser: true, export: true, server: true },
-  activeLockedId: { browser: false, export: false, server: false },
 });
 
 const _clearAppStateForStorage = <

packages/excalidraw/change.ts

@@ -5,7 +5,41 @@ 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 type { BindableProp, BindingProp } from "@excalidraw/element/binding";
+
+import type { ElementUpdate } from "@excalidraw/element/mutateElement";
 
 import type {
   ExcalidrawElement,
@@ -18,42 +52,16 @@ import type {
   SceneElementsMap,
 } from "@excalidraw/element/types";
 
-import type { DTO, SubtypeOf, ValueOf } from "@excalidraw/common/utility-types";
+import type { SubtypeOf, ValueOf } from "@excalidraw/common/utility-types";
+
+import { getObservedAppState } from "./store";
 
 import type {
   AppState,
   ObservedAppState,
   ObservedElementsAppState,
   ObservedStandaloneAppState,
-} from "@excalidraw/excalidraw/types";
+} from "./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.
@@ -64,7 +72,7 @@ import type { ElementUpdate } from "./mutateElement";
  *
  * 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> {
+class Delta<T> {
   private constructor(
     public readonly deleted: Partial<T>,
     public readonly inserted: Partial<T>,
@@ -187,12 +195,10 @@ export class Delta<T> {
       return;
     }
 
-    const isDeletedObject =
+    if (
-      deleted[property] !== null && typeof deleted[property] === "object";
+      typeof deleted[property] === "object" ||
-    const isInsertedObject =
+      typeof inserted[property] === "object"
-      inserted[property] !== null && typeof inserted[property] === "object";
+    ) {
-
-    if (isDeletedObject || isInsertedObject) {
       type RecordLike = Record<string, V | undefined>;
 
       const deletedObject: RecordLike = deleted[property] ?? {};
@@ -224,9 +230,6 @@ 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);
     }
   }
 
@@ -321,7 +324,7 @@ export class Delta<T> {
   }
 
   /**
-   * Returns sorted object1 keys that have distinct values.
+   * Returns all the object1 keys that have distinct values.
    */
   public static getLeftDifferences<T extends {}>(
     object1: T,
@@ -330,11 +333,11 @@ export class Delta<T> {
   ) {
     return Array.from(
       this.distinctKeysIterator("left", object1, object2, skipShallowCompare),
-    ).sort();
+    );
   }
 
   /**
-   * Returns sorted object2 keys that have distinct values.
+   * Returns all the object2 keys that have distinct values.
    */
   public static getRightDifferences<T extends {}>(
     object1: T,
@@ -343,7 +346,7 @@ export class Delta<T> {
   ) {
     return Array.from(
       this.distinctKeysIterator("right", object1, object2, skipShallowCompare),
-    ).sort();
+    );
   }
 
   /**
@@ -404,57 +407,51 @@ export class Delta<T> {
 }
 
 /**
- * Encapsulates a set of application-level `Delta`s.
+ * Encapsulates the modifications captured as `Delta`/s.
  */
-export interface DeltaContainer<T> {
+interface Change<T> {
   /**
-   * Inverses the `Delta`s while creating a new `DeltaContainer` instance.
+   * Inverses the `Delta`s inside while creating a new `Change`.
    */
-  inverse(): DeltaContainer<T>;
+  inverse(): Change<T>;
 
   /**
-   * Applies the `Delta`s to the previous object.
+   * Applies the `Change` 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.
+   * @returns a tuple of the next object `T` with applied change, and `boolean`, indicating whether the applied change resulted in a visible change.
    */
   applyTo(previous: T, ...options: unknown[]): [T, boolean];
 
   /**
-   * Checks whether all `Delta`s are empty.
+   * Checks whether there are actually `Delta`s.
    */
   isEmpty(): boolean;
 }
 
-export class AppStateDelta implements DeltaContainer<AppState> {
+export class AppStateChange implements Change<AppState> {
-  private constructor(public readonly delta: Delta<ObservedAppState>) {}
+  private constructor(private readonly delta: Delta<ObservedAppState>) {}
 
   public static calculate<T extends ObservedAppState>(
     prevAppState: T,
     nextAppState: T,
-  ): AppStateDelta {
+  ): AppStateChange {
     const delta = Delta.calculate(
       prevAppState,
       nextAppState,
-      // making the order of keys in deltas stable for hashing purposes
+      undefined,
-      AppStateDelta.orderAppStateKeys,
+      AppStateChange.postProcess,
-      AppStateDelta.postProcess,
     );
 
-    return new AppStateDelta(delta);
+    return new AppStateChange(delta);
-  }
-
-  public static restore(appStateDeltaDTO: DTO<AppStateDelta>): AppStateDelta {
-    const { delta } = appStateDeltaDTO;
-    return new AppStateDelta(delta);
   }
 
   public static empty() {
-    return new AppStateDelta(Delta.create({}, {}));
+    return new AppStateChange(Delta.create({}, {}));
   }
 
-  public inverse(): AppStateDelta {
+  public inverse(): AppStateChange {
     const inversedDelta = Delta.create(this.delta.inserted, this.delta.deleted);
-    return new AppStateDelta(inversedDelta);
+    return new AppStateChange(inversedDelta);
   }
 
   public applyTo(
@@ -493,7 +490,6 @@ export class AppStateDelta implements DeltaContainer<AppState> {
               nextElements.get(
                 selectedLinearElementId,
               ) as NonDeleted<ExcalidrawLinearElement>,
-              nextElements,
             )
           : null;
 
@@ -503,7 +499,6 @@ export class AppStateDelta implements DeltaContainer<AppState> {
               nextElements.get(
                 editingLinearElementId,
               ) as NonDeleted<ExcalidrawLinearElement>,
-              nextElements,
             )
           : null;
 
@@ -545,6 +540,40 @@ 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.
    *
@@ -561,13 +590,13 @@ export class AppStateDelta implements DeltaContainer<AppState> {
     const nextObservedAppState = getObservedAppState(nextAppState);
 
     const containsStandaloneDifference = Delta.isRightDifferent(
-      AppStateDelta.stripElementsProps(prevObservedAppState),
+      AppStateChange.stripElementsProps(prevObservedAppState),
-      AppStateDelta.stripElementsProps(nextObservedAppState),
+      AppStateChange.stripElementsProps(nextObservedAppState),
     );
 
     const containsElementsDifference = Delta.isRightDifferent(
-      AppStateDelta.stripStandaloneProps(prevObservedAppState),
+      AppStateChange.stripStandaloneProps(prevObservedAppState),
-      AppStateDelta.stripStandaloneProps(nextObservedAppState),
+      AppStateChange.stripStandaloneProps(nextObservedAppState),
     );
 
     if (!containsStandaloneDifference && !containsElementsDifference) {
@@ -582,8 +611,8 @@ export class AppStateDelta implements DeltaContainer<AppState> {
     if (containsElementsDifference) {
       // filter invisible changes on each iteration
       const changedElementsProps = Delta.getRightDifferences(
-        AppStateDelta.stripStandaloneProps(prevObservedAppState),
+        AppStateChange.stripStandaloneProps(prevObservedAppState),
-        AppStateDelta.stripStandaloneProps(nextObservedAppState),
+        AppStateChange.stripStandaloneProps(nextObservedAppState),
       ) as Array<keyof ObservedElementsAppState>;
 
       let nonDeletedGroupIds = new Set<string>();
@@ -600,7 +629,7 @@ export class AppStateDelta implements DeltaContainer<AppState> {
       for (const key of changedElementsProps) {
         switch (key) {
           case "selectedElementIds":
-            nextAppState[key] = AppStateDelta.filterSelectedElements(
+            nextAppState[key] = AppStateChange.filterSelectedElements(
               nextAppState[key],
               nextElements,
               visibleDifferenceFlag,
@@ -608,7 +637,7 @@ export class AppStateDelta implements DeltaContainer<AppState> {
 
             break;
           case "selectedGroupIds":
-            nextAppState[key] = AppStateDelta.filterSelectedGroups(
+            nextAppState[key] = AppStateChange.filterSelectedGroups(
               nextAppState[key],
               nonDeletedGroupIds,
               visibleDifferenceFlag,
@@ -644,7 +673,7 @@ export class AppStateDelta implements DeltaContainer<AppState> {
             break;
           case "selectedLinearElementId":
           case "editingLinearElementId":
-            const appStateKey = AppStateDelta.convertToAppStateKey(key);
+            const appStateKey = AppStateChange.convertToAppStateKey(key);
             const linearElement = nextAppState[appStateKey];
 
             if (!linearElement) {
@@ -663,24 +692,6 @@ 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,
@@ -776,8 +787,6 @@ export class AppStateDelta implements DeltaContainer<AppState> {
       editingLinearElementId,
       selectedLinearElementId,
       croppingElementId,
-      lockedMultiSelections,
-      activeLockedId,
       ...standaloneProps
     } = delta as ObservedAppState;
 
@@ -799,63 +808,6 @@ 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>;
-  }
 }
 
 type ElementPartial<T extends ExcalidrawElement = ExcalidrawElement> = Omit<
@@ -867,63 +819,50 @@ type ElementPartial<T extends ExcalidrawElement = ExcalidrawElement> = Omit<
  * 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> {
+export class ElementsChange implements Change<SceneElementsMap> {
   private constructor(
-    public readonly added: Record<string, Delta<ElementPartial>>,
+    private readonly added: Map<string, Delta<ElementPartial>>,
-    public readonly removed: Record<string, Delta<ElementPartial>>,
+    private readonly removed: Map<string, Delta<ElementPartial>>,
-    public readonly updated: Record<string, Delta<ElementPartial>>,
+    private readonly updated: Map<string, Delta<ElementPartial>>,
   ) {}
 
   public static create(
-    added: Record<string, Delta<ElementPartial>>,
+    added: Map<string, Delta<ElementPartial>>,
-    removed: Record<string, Delta<ElementPartial>>,
+    removed: Map<string, Delta<ElementPartial>>,
-    updated: Record<string, Delta<ElementPartial>>,
+    updated: Map<string, Delta<ElementPartial>>,
-    options: {
+    options = { shouldRedistribute: false },
-      shouldRedistribute: boolean;
-    } = {
-      shouldRedistribute: false,
-    },
   ) {
-    let delta: ElementsDelta;
+    let change: ElementsChange;
 
     if (options.shouldRedistribute) {
-      const nextAdded: Record<string, Delta<ElementPartial>> = {};
+      const nextAdded = new Map<string, Delta<ElementPartial>>();
-      const nextRemoved: Record<string, Delta<ElementPartial>> = {};
+      const nextRemoved = new Map<string, Delta<ElementPartial>>();
-      const nextUpdated: Record<string, Delta<ElementPartial>> = {};
+      const nextUpdated = new Map<string, Delta<ElementPartial>>();
 
-      const deltas = [
+      const deltas = [...added, ...removed, ...updated];
-        ...Object.entries(added),
-        ...Object.entries(removed),
-        ...Object.entries(updated),
-      ];
 
       for (const [id, delta] of deltas) {
         if (this.satisfiesAddition(delta)) {
-          nextAdded[id] = delta;
+          nextAdded.set(id, delta);
         } else if (this.satisfiesRemoval(delta)) {
-          nextRemoved[id] = delta;
+          nextRemoved.set(id, delta);
         } else {
-          nextUpdated[id] = delta;
+          nextUpdated.set(id, delta);
         }
       }
 
-      delta = new ElementsDelta(nextAdded, nextRemoved, nextUpdated);
+      change = new ElementsChange(nextAdded, nextRemoved, nextUpdated);
     } else {
-      delta = new ElementsDelta(added, removed, updated);
+      change = new ElementsChange(added, removed, updated);
     }
 
     if (isTestEnv() || isDevEnv()) {
-      ElementsDelta.validate(delta, "added", this.satisfiesAddition);
+      ElementsChange.validate(change, "added", this.satisfiesAddition);
-      ElementsDelta.validate(delta, "removed", this.satisfiesRemoval);
+      ElementsChange.validate(change, "removed", this.satisfiesRemoval);
-      ElementsDelta.validate(delta, "updated", this.satisfiesUpdate);
+      ElementsChange.validate(change, "updated", this.satisfiesUpdate);
     }
 
-    return delta;
+    return change;
-  }
-
-  public static restore(elementsDeltaDTO: DTO<ElementsDelta>): ElementsDelta {
-    const { added, removed, updated } = elementsDeltaDTO;
-    return ElementsDelta.create(added, removed, updated);
   }
 
   private static satisfiesAddition = ({
@@ -945,17 +884,17 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
   }: Delta<ElementPartial>) => !!deleted.isDeleted === !!inserted.isDeleted;
 
   private static validate(
-    elementsDelta: ElementsDelta,
+    change: ElementsChange,
     type: "added" | "removed" | "updated",
     satifies: (delta: Delta<ElementPartial>) => boolean,
   ) {
-    for (const [id, delta] of Object.entries(elementsDelta[type])) {
+    for (const [id, delta] of change[type].entries()) {
       if (!satifies(delta)) {
         console.error(
           `Broken invariant for "${type}" delta, element "${id}", delta:`,
           delta,
         );
-        throw new Error(`ElementsDelta invariant broken for element "${id}".`);
+        throw new Error(`ElementsChange invariant broken for element "${id}".`);
       }
     }
   }
@@ -966,19 +905,19 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
    * @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.
+   * @returns `ElementsChange` 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 {
+  ): ElementsChange {
     if (prevElements === nextElements) {
-      return ElementsDelta.empty();
+      return ElementsChange.empty();
     }
 
-    const added: Record<string, Delta<ElementPartial>> = {};
+    const added = new Map<string, Delta<ElementPartial>>();
-    const removed: Record<string, Delta<ElementPartial>> = {};
+    const removed = new Map<string, Delta<ElementPartial>>();
-    const updated: Record<string, Delta<ElementPartial>> = {};
+    const updated = new Map<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()) {
@@ -991,10 +930,10 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
         const delta = Delta.create(
           deleted,
           inserted,
-          ElementsDelta.stripIrrelevantProps,
+          ElementsChange.stripIrrelevantProps,
         );
 
-        removed[prevElement.id] = delta;
+        removed.set(prevElement.id, delta);
       }
     }
 
@@ -1011,10 +950,10 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
         const delta = Delta.create(
           deleted,
           inserted,
-          ElementsDelta.stripIrrelevantProps,
+          ElementsChange.stripIrrelevantProps,
         );
 
-        added[nextElement.id] = delta;
+        added.set(nextElement.id, delta);
 
         continue;
       }
@@ -1023,8 +962,8 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
         const delta = Delta.calculate<ElementPartial>(
           prevElement,
           nextElement,
-          ElementsDelta.stripIrrelevantProps,
+          ElementsChange.stripIrrelevantProps,
-          ElementsDelta.postProcess,
+          ElementsChange.postProcess,
         );
 
         if (
@@ -1035,9 +974,9 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
         ) {
           // notice that other props could have been updated as well
           if (prevElement.isDeleted && !nextElement.isDeleted) {
-            added[nextElement.id] = delta;
+            added.set(nextElement.id, delta);
           } else {
-            removed[nextElement.id] = delta;
+            removed.set(nextElement.id, delta);
           }
 
           continue;
@@ -1045,24 +984,24 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
 
         // making sure there are at least some changes
         if (!Delta.isEmpty(delta)) {
-          updated[nextElement.id] = delta;
+          updated.set(nextElement.id, delta);
         }
       }
     }
 
-    return ElementsDelta.create(added, removed, updated);
+    return ElementsChange.create(added, removed, updated);
   }
 
   public static empty() {
-    return ElementsDelta.create({}, {}, {});
+    return ElementsChange.create(new Map(), new Map(), new Map());
   }
 
-  public inverse(): ElementsDelta {
+  public inverse(): ElementsChange {
-    const inverseInternal = (deltas: Record<string, Delta<ElementPartial>>) => {
+    const inverseInternal = (deltas: Map<string, Delta<ElementPartial>>) => {
-      const inversedDeltas: Record<string, Delta<ElementPartial>> = {};
+      const inversedDeltas = new Map<string, Delta<ElementPartial>>();
 
-      for (const [id, delta] of Object.entries(deltas)) {
+      for (const [id, delta] of deltas.entries()) {
-        inversedDeltas[id] = Delta.create(delta.inserted, delta.deleted);
+        inversedDeltas.set(id, Delta.create(delta.inserted, delta.deleted));
       }
 
       return inversedDeltas;
@@ -1073,14 +1012,14 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
     const updated = inverseInternal(this.updated);
 
     // notice we inverse removed with added not to break the invariants
-    return ElementsDelta.create(removed, added, updated);
+    return ElementsChange.create(removed, added, updated);
   }
 
   public isEmpty(): boolean {
     return (
-      Object.keys(this.added).length === 0 &&
+      this.added.size === 0 &&
-      Object.keys(this.removed).length === 0 &&
+      this.removed.size === 0 &&
-      Object.keys(this.updated).length === 0
+      this.updated.size === 0
     );
   }
 
@@ -1091,10 +1030,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
    * @param modifierOptions defines which of the delta (`deleted` or `inserted`) will be updated
    * @returns new instance with modified delta/s
    */
-  public applyLatestChanges(
+  public applyLatestChanges(elements: SceneElementsMap): ElementsChange {
-    elements: SceneElementsMap,
-    modifierOptions: "deleted" | "inserted",
-  ): ElementsDelta {
     const modifier =
       (element: OrderedExcalidrawElement) => (partial: ElementPartial) => {
         const latestPartial: { [key: string]: unknown } = {};
@@ -1115,11 +1051,11 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
       };
 
     const applyLatestChangesInternal = (
-      deltas: Record<string, Delta<ElementPartial>>,
+      deltas: Map<string, Delta<ElementPartial>>,
     ) => {
-      const modifiedDeltas: Record<string, Delta<ElementPartial>> = {};
+      const modifiedDeltas = new Map<string, Delta<ElementPartial>>();
 
-      for (const [id, delta] of Object.entries(deltas)) {
+      for (const [id, delta] of deltas.entries()) {
         const existingElement = elements.get(id);
 
         if (existingElement) {
@@ -1127,12 +1063,12 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
             delta.deleted,
             delta.inserted,
             modifier(existingElement),
-            modifierOptions,
+            "inserted",
           );
 
-          modifiedDeltas[id] = modifiedDelta;
+          modifiedDeltas.set(id, modifiedDelta);
         } else {
-          modifiedDeltas[id] = delta;
+          modifiedDeltas.set(id, delta);
         }
       }
 
@@ -1143,16 +1079,16 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
     const removed = applyLatestChangesInternal(this.removed);
     const updated = applyLatestChangesInternal(this.updated);
 
-    return ElementsDelta.create(added, removed, updated, {
+    return ElementsChange.create(added, removed, updated, {
       shouldRedistribute: true, // redistribute the deltas as `isDeleted` could have been updated
     });
   }
 
   public applyTo(
     elements: SceneElementsMap,
-    elementsSnapshot: Map<string, OrderedExcalidrawElement>,
+    snapshot: Map<string, OrderedExcalidrawElement>,
   ): [SceneElementsMap, boolean] {
-    let nextElements = new Map(elements) as SceneElementsMap;
+    let nextElements = toBrandedType<SceneElementsMap>(new Map(elements));
     let changedElements: Map<string, OrderedExcalidrawElement>;
 
     const flags = {
@@ -1162,15 +1098,15 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
 
     // mimic a transaction by applying deltas into `nextElements` (always new instance, no mutation)
     try {
-      const applyDeltas = ElementsDelta.createApplier(
+      const applyDeltas = ElementsChange.createApplier(
         nextElements,
-        elementsSnapshot,
+        snapshot,
         flags,
       );
 
-      const addedElements = applyDeltas("added", this.added);
+      const addedElements = applyDeltas(this.added);
-      const removedElements = applyDeltas("removed", this.removed);
+      const removedElements = applyDeltas(this.removed);
-      const updatedElements = applyDeltas("updated", this.updated);
+      const updatedElements = applyDeltas(this.updated);
 
       const affectedElements = this.resolveConflicts(elements, nextElements);
 
@@ -1182,7 +1118,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
         ...affectedElements,
       ]);
     } catch (e) {
-      console.error(`Couldn't apply elements delta`, e);
+      console.error(`Couldn't apply elements change`, e);
 
       if (isTestEnv() || isDevEnv()) {
         throw e;
@@ -1196,22 +1132,19 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
     }
 
     try {
+      // TODO: #7348 refactor away mutations below, so that we couldn't end up in an incosistent state
+      ElementsChange.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 = ElementsChange.reorderElements(
         nextElements,
         changedElements,
         flags,
       );
 
-      // we don't have an up-to-date scene, as we can be just in the middle of applying history entry
-      // we also don't have a scene on the server
-      // so we are creating a temp scene just to query and mutate elements
-      const tempScene = new Scene(nextElements);
-
-      ElementsDelta.redrawTextBoundingBoxes(tempScene, changedElements);
       // Need ordered nextElements to avoid z-index binding issues
-      ElementsDelta.redrawBoundArrows(tempScene, changedElements);
+      ElementsChange.redrawBoundArrows(nextElements, changedElements);
     } catch (e) {
       console.error(
         `Couldn't mutate elements after applying elements change`,
@@ -1226,31 +1159,26 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
     }
   }
 
-  private static createApplier =
+  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(
+    const getElement = ElementsChange.createGetter(
-        type,
       nextElements,
       snapshot,
       flags,
     );
 
-      return Object.entries(deltas).reduce((acc, [id, delta]) => {
+    return (deltas: Map<string, Delta<ElementPartial>>) =>
+      Array.from(deltas.entries()).reduce((acc, [id, delta]) => {
         const element = getElement(id, delta.inserted);
 
         if (element) {
-          const newElement = ElementsDelta.applyDelta(element, delta, flags);
+          const newElement = ElementsChange.applyDelta(element, delta, flags);
           nextElements.set(newElement.id, newElement);
           acc.set(newElement.id, newElement);
         }
@@ -1261,7 +1189,6 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
 
   private static createGetter =
     (
-      type: "added" | "removed" | "updated",
       elements: SceneElementsMap,
       snapshot: Map<string, OrderedExcalidrawElement>,
       flags: {
@@ -1287,14 +1214,6 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
           ) {
             flags.containsVisibleDifference = true;
           }
-        } else {
-          // not in elements, not in snapshot? element might have been added remotely!
-          element = newElementWith(
-            { id, version: 1 } as OrderedExcalidrawElement,
-            {
-              ...partial,
-            },
-          );
         }
       }
 
@@ -1331,8 +1250,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
       });
     }
 
-    // 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
@@ -1345,12 +1263,10 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
     }
 
     if (!flags.containsVisibleDifference) {
-      // strip away fractional index, as even if it would be different, it doesn't have to result in visible change
+      // strip away fractional as even if it would be different, it doesn't have to result in visible change
       const { index, ...rest } = directlyApplicablePartial;
-      const containsVisibleDifference = ElementsDelta.checkForVisibleDifference(
+      const containsVisibleDifference =
-        element,
+        ElementsChange.checkForVisibleDifference(element, rest);
-        rest,
-      );
 
       flags.containsVisibleDifference = containsVisibleDifference;
     }
@@ -1393,8 +1309,6 @@ 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.
    *
-   * // TODO: revisit since some bound arrows seem to be often redrawn incorrectly
-   *
    * @returns all elements affected by the conflict resolution
    */
   private resolveConflicts(
@@ -1423,7 +1337,6 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
       } else {
         affectedElement = mutateElement(
           nextElement,
-          nextElements,
           updates as ElementUpdate<OrderedExcalidrawElement>,
         );
       }
@@ -1433,18 +1346,17 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
     };
 
     // 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)) {
+    for (const [id] of this.removed) {
-      ElementsDelta.unbindAffected(prevElements, nextElements, id, updater);
+      ElementsChange.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)) {
+    for (const [id] of this.added) {
-      ElementsDelta.rebindAffected(prevElements, nextElements, id, updater);
+      ElementsChange.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(
+    for (const [id] of Array.from(this.updated).filter(([_, delta]) =>
-      ([_, delta]) =>
       Object.keys({ ...delta.deleted, ...delta.inserted }).find((prop) =>
         bindingProperties.has(prop as BindingProp | BindableProp),
       ),
@@ -1455,7 +1367,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
         continue;
       }
 
-      ElementsDelta.rebindAffected(prevElements, nextElements, id, updater);
+      ElementsChange.rebindAffected(prevElements, nextElements, id, updater);
     }
 
     // filter only previous elements, which were now affected
@@ -1465,21 +1377,21 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
 
     // 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(
+    const { added, removed, updated } = ElementsChange.calculate(
       prevAffectedElements,
       nextAffectedElements,
     );
 
-    for (const [id, delta] of Object.entries(added)) {
+    for (const [id, delta] of added) {
-      this.added[id] = delta;
+      this.added.set(id, delta);
     }
 
-    for (const [id, delta] of Object.entries(removed)) {
+    for (const [id, delta] of removed) {
-      this.removed[id] = delta;
+      this.removed.set(id, delta);
     }
 
-    for (const [id, delta] of Object.entries(updated)) {
+    for (const [id, delta] of updated) {
-      this.updated[id] = delta;
+      this.updated.set(id, delta);
     }
 
     return nextAffectedElements;
@@ -1544,10 +1456,9 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
   }
 
   private static redrawTextBoundingBoxes(
-    scene: Scene,
+    elements: SceneElementsMap,
     changed: Map<string, OrderedExcalidrawElement>,
   ) {
-    const elements = scene.getNonDeletedElementsMap();
     const boxesToRedraw = new Map<
       string,
       { container: OrderedExcalidrawElement; boundText: ExcalidrawTextElement }
@@ -1587,17 +1498,17 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
         continue;
       }
 
-      redrawTextBoundingBox(boundText, container, scene);
+      redrawTextBoundingBox(boundText, container, elements, false);
     }
   }
 
   private static redrawBoundArrows(
-    scene: Scene,
+    elements: SceneElementsMap,
     changed: Map<string, OrderedExcalidrawElement>,
   ) {
     for (const element of changed.values()) {
       if (!element.isDeleted && isBindableElement(element)) {
-        updateBoundElements(element, scene, {
+        updateBoundElements(element, elements, {
           changedElements: changed,
         });
       }
@@ -1652,7 +1563,7 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
       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.`);
+      console.error(`Couldn't postprocess elements change deltas.`);
 
       if (isTestEnv() || isDevEnv()) {
         throw e;
@@ -1665,7 +1576,8 @@ export class ElementsDelta implements DeltaContainer<SceneElementsMap> {
   private static stripIrrelevantProps(
     partial: Partial<OrderedExcalidrawElement>,
   ): ElementPartial {
-    const { id, updated, version, versionNonce, ...strippedPartial } = partial;
+    const { id, updated, version, versionNonce, seed, ...strippedPartial } =
+      partial;
 
     return strippedPartial;
   }

packages/excalidraw/charts.ts

@@ -15,7 +15,7 @@ import {
   newTextElement,
   newLinearElement,
   newElement,
-} from "@excalidraw/element";
+} from "@excalidraw/element/newElement";
 
 import type { Radians } from "@excalidraw/math";
 

packages/excalidraw/clipboard.ts

@@ -7,14 +7,14 @@ import {
   isPromiseLike,
 } from "@excalidraw/common";
 
-import { mutateElement } from "@excalidraw/element";
+import { mutateElement } from "@excalidraw/element/mutateElement";
-import { deepCopyElement } from "@excalidraw/element";
+import { deepCopyElement } from "@excalidraw/element/duplicate";
 import {
   isFrameLikeElement,
   isInitializedImageElement,
-} from "@excalidraw/element";
+} from "@excalidraw/element/typeChecks";
 
-import { getContainingFrame } from "@excalidraw/element";
+import { getContainingFrame } from "@excalidraw/element/frame";
 
 import type {
   ExcalidrawElement,
@@ -172,7 +172,7 @@ export const serializeAsClipboardJSON = ({
         !framesToCopy.has(getContainingFrame(element, elementsMap)!)
       ) {
         const copiedElement = deepCopyElement(element);
-        mutateElement(copiedElement, elementsMap, {
+        mutateElement(copiedElement, {
           frameId: null,
         });
         return copiedElement;

packages/excalidraw/components/Actions.tsx

@@ -11,7 +11,7 @@ import {
 import {
   shouldAllowVerticalAlign,
   suppportsHorizontalAlign,
-} from "@excalidraw/element";
+} from "@excalidraw/element/textElement";
 
 import {
   hasBoundTextElement,
@@ -19,9 +19,9 @@ import {
   isImageElement,
   isLinearElement,
   isTextElement,
-} from "@excalidraw/element";
+} from "@excalidraw/element/typeChecks";
 
-import { hasStrokeColor, toolIsArrow } from "@excalidraw/element";
+import { hasStrokeColor, toolIsArrow } from "@excalidraw/element/comparisons";
 
 import type {
   ExcalidrawElement,
@@ -154,7 +154,7 @@ export const SelectedShapeActions = ({
     !isSingleElementBoundContainer && alignActionsPredicate(appState, app);
 
   return (
-    <div className="selected-shape-actions">
+    <div className="panelColumn">
       <div>
         {canChangeStrokeColor(appState, targetElements) &&
           renderAction("changeStrokeColor")}