@excalidraw/excalidraw 0.17.1-88812e0 → 0.17.1-96eeec5

package/dist/excalidraw/data/library.d.ts

@@ -1,7 +1,7 @@
-import { LibraryItems, ExcalidrawImperativeAPI, LibraryItemsSource, LibraryItems_anyVersion } from "../types";
+import type { LibraryItems, ExcalidrawImperativeAPI, LibraryItemsSource, LibraryItems_anyVersion } from "../types";
 import type App from "../components/App";
-import { ExcalidrawElement } from "../element/types";
-import { MaybePromise } from "../utility-types";
+import type { ExcalidrawElement } from "../element/types";
+import type { MaybePromise } from "../utility-types";
 export type LibraryPersistedData = {
     libraryItems: LibraryItems;
 };

package/dist/excalidraw/data/magic.d.ts

@@ -1,6 +1,6 @@
-import { Theme } from "../element/types";
-import { DataURL } from "../types";
-import { OpenAIOutput } from "./ai/types";
+import type { Theme } from "../element/types";
+import type { DataURL } from "../types";
+import type { OpenAIOutput } from "./ai/types";
 export type MagicCacheData = {
     status: "pending";
 } | {

package/dist/excalidraw/data/reconcile.d.ts

@@ -1,6 +1,6 @@
-import { OrderedExcalidrawElement } from "../element/types";
-import { AppState } from "../types";
-import { MakeBrand } from "../utility-types";
+import type { OrderedExcalidrawElement } from "../element/types";
+import type { AppState } from "../types";
+import type { MakeBrand } from "../utility-types";
 export type ReconciledExcalidrawElement = OrderedExcalidrawElement & MakeBrand<"ReconciledElement">;
 export type RemoteExcalidrawElement = OrderedExcalidrawElement & MakeBrand<"RemoteExcalidrawElement">;
 export declare const reconcileElements: (localElements: readonly OrderedExcalidrawElement[], remoteElements: readonly RemoteExcalidrawElement[], localAppState: AppState) => ReconciledExcalidrawElement[];

package/dist/excalidraw/data/resave.d.ts

@@ -1,5 +1,5 @@
-import { ExcalidrawElement } from "../element/types";
-import { AppState, BinaryFiles } from "../types";
+import type { ExcalidrawElement } from "../element/types";
+import type { AppState, BinaryFiles } from "../types";
 export declare const resaveAsImageWithScene: (elements: readonly ExcalidrawElement[], appState: AppState, files: BinaryFiles, name: string) => Promise<{
     fileHandle: import("browser-fs-access").FileSystemHandle;
 }>;

package/dist/excalidraw/data/restore.d.ts

@@ -1,6 +1,6 @@
-import { ExcalidrawElement, OrderedExcalidrawElement } from "../element/types";
-import { AppState, BinaryFiles, LibraryItem } from "../types";
-import { ImportedDataState } from "./types";
+import type { ExcalidrawElement, OrderedExcalidrawElement } from "../element/types";
+import type { AppState, BinaryFiles, LibraryItem } from "../types";
+import type { ImportedDataState } from "./types";
 type RestoredAppState = Omit<AppState, "offsetTop" | "offsetLeft" | "width" | "height">;
 export declare const AllowedExcalidrawActiveTools: Record<AppState["activeTool"]["type"], boolean>;
 export type RestoredDataState = {

package/dist/excalidraw/data/restore.js

@@ -1,5 +1,5 @@
 import { getNonDeletedElements, getNormalizedDimensions, isInvisiblySmallElement, refreshTextDimensions, } from "../element";
-import { isTextElement, isUsingAdaptiveRadius } from "../element/typeChecks";
+import { isArrowElement, isLinearElement, isTextElement, isUsingAdaptiveRadius, } from "../element/typeChecks";
 import { randomId } from "../random";
 import { DEFAULT_FONT_FAMILY, DEFAULT_TEXT_ALIGN, DEFAULT_VERTICAL_ALIGN, FONT_FAMILY, ROUNDNESS, DEFAULT_SIDEBAR, DEFAULT_ELEMENT_PROPS, } from "../constants";
 import { getDefaultAppState } from "../appState";
@@ -10,6 +10,7 @@ import { arrayToMap } from "../utils";
 import { detectLineHeight, getContainerElement, getDefaultLineHeight, } from "../element/textElement";
 import { normalizeLink } from "./url";
 import { syncInvalidIndices } from "../fractionalIndex";
+import { getSizeFromPoints } from "../points";
 export const AllowedExcalidrawActiveTools = {
     selection: true,
     text: true,
@@ -124,6 +125,7 @@ const restoreElement = (element) => {
                 verticalAlign: element.verticalAlign || DEFAULT_VERTICAL_ALIGN,
                 containerId: element.containerId ?? null,
                 originalText: element.originalText || text,
+                autoResize: element.autoResize ?? true,
                 lineHeight,
             });
             // if empty text, mark as deleted. We keep in array
@@ -177,6 +179,7 @@ const restoreElement = (element) => {
                 points,
                 x,
                 y,
+                ...getSizeFromPoints(points),
             });
         }
         // generic elements
@@ -311,6 +314,18 @@ localElements, opts) => {
         if (opts.refreshDimensions && isTextElement(element)) {
             Object.assign(element, refreshTextDimensions(element, getContainerElement(element, restoredElementsMap), restoredElementsMap));
         }
+        if (isLinearElement(element)) {
+            if (element.startBinding &&
+                (!restoredElementsMap.has(element.startBinding.elementId) ||
+                    !isArrowElement(element))) {
+                element.startBinding = null;
+            }
+            if (element.endBinding &&
+                (!restoredElementsMap.has(element.endBinding.elementId) ||
+                    !isArrowElement(element))) {
+                element.endBinding = null;
+            }
+        }
     }
     return restoredElements;
 };

package/dist/excalidraw/data/transform.d.ts

@@ -1,6 +1,6 @@
-import { ElementConstructorOpts } from "../element/newElement";
-import { ExcalidrawBindableElement, ExcalidrawElement, ExcalidrawFrameElement, ExcalidrawFreeDrawElement, ExcalidrawGenericElement, ExcalidrawIframeLikeElement, ExcalidrawImageElement, ExcalidrawLinearElement, ExcalidrawMagicFrameElement, ExcalidrawSelectionElement, ExcalidrawTextElement, FileId, FontFamilyValues, TextAlign, VerticalAlign } from "../element/types";
-import { MarkOptional } from "../utility-types";
+import type { ElementConstructorOpts } from "../element/newElement";
+import type { ExcalidrawBindableElement, ExcalidrawElement, ExcalidrawFrameElement, ExcalidrawFreeDrawElement, ExcalidrawGenericElement, ExcalidrawIframeLikeElement, ExcalidrawImageElement, ExcalidrawLinearElement, ExcalidrawMagicFrameElement, ExcalidrawSelectionElement, ExcalidrawTextElement, FileId, FontFamilyValues, TextAlign, VerticalAlign } from "../element/types";
+import type { MarkOptional } from "../utility-types";
 export type ValidLinearElement = {
     type: "arrow" | "line";
     x: number;

package/dist/excalidraw/data/types.d.ts

@@ -1,7 +1,7 @@
-import { ExcalidrawElement } from "../element/types";
-import { AppState, BinaryFiles, LibraryItems, LibraryItems_anyVersion } from "../types";
+import type { ExcalidrawElement } from "../element/types";
+import type { AppState, BinaryFiles, LibraryItems, LibraryItems_anyVersion } from "../types";
 import type { cleanAppStateForExport } from "../appState";
-import { VERSIONS } from "../constants";
+import type { VERSIONS } from "../constants";
 export interface ExportedDataState {
     type: string;
     version: number;

package/dist/excalidraw/element/ElementCanvasButtons.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ElementsMap, NonDeletedExcalidrawElement } from "./types";
+import type { ElementsMap, NonDeletedExcalidrawElement } from "./types";
 import "./ElementCanvasButtons.scss";
 export declare const ElementCanvasButtons: ({ children, element, elementsMap, }: {
     children: React.ReactNode;

package/dist/excalidraw/element/binding.d.ts

@@ -1,7 +1,6 @@
-import * as GA from "../ga";
-import { ExcalidrawBindableElement, ExcalidrawElement, ExcalidrawRectangleElement, ExcalidrawDiamondElement, ExcalidrawEllipseElement, ExcalidrawImageElement, ExcalidrawFrameLikeElement, ExcalidrawIframeLikeElement, NonDeleted, ExcalidrawLinearElement, NonDeletedExcalidrawElement, ElementsMap, NonDeletedSceneElementsMap, ExcalidrawTextElement } from "./types";
-import { AppClassProperties, AppState, Point } from "../types";
-import { ElementUpdate } from "./mutateElement";
+import type { ExcalidrawBindableElement, ExcalidrawElement, NonDeleted, ExcalidrawLinearElement, NonDeletedExcalidrawElement, ElementsMap, NonDeletedSceneElementsMap } from "./types";
+import type { AppState } from "../types";
+import type { ElementUpdate } from "./mutateElement";
 export type SuggestedBinding = NonDeleted<ExcalidrawBindableElement> | SuggestedPointBinding;
 export type SuggestedPointBinding = [
     NonDeleted<ExcalidrawLinearElement>,
@@ -11,18 +10,18 @@ export type SuggestedPointBinding = [
 export declare const shouldEnableBindingForPointerEvent: (event: React.PointerEvent<HTMLElement>) => boolean;
 export declare const isBindingEnabled: (appState: AppState) => boolean;
 export declare const bindOrUnbindLinearElement: (linearElement: NonDeleted<ExcalidrawLinearElement>, startBindingElement: ExcalidrawBindableElement | null | "keep", endBindingElement: ExcalidrawBindableElement | null | "keep", elementsMap: NonDeletedSceneElementsMap) => void;
-export declare const bindOrUnbindSelectedElements: (selectedElements: NonDeleted<ExcalidrawElement>[], app: AppClassProperties) => void;
+export declare const bindOrUnbindLinearElements: (selectedElements: NonDeleted<ExcalidrawLinearElement>[], elementsMap: NonDeletedSceneElementsMap, isBindingEnabled: boolean, draggingPoints: readonly number[] | null) => void;
+export declare const getSuggestedBindingsForArrows: (selectedElements: NonDeleted<ExcalidrawElement>[], elementsMap: NonDeletedSceneElementsMap) => SuggestedBinding[];
 export declare const maybeBindLinearElement: (linearElement: NonDeleted<ExcalidrawLinearElement>, appState: AppState, pointerCoords: {
     x: number;
     y: number;
-}, app: AppClassProperties) => void;
+}, elementsMap: NonDeletedSceneElementsMap) => void;
 export declare const bindLinearElement: (linearElement: NonDeleted<ExcalidrawLinearElement>, hoveredElement: ExcalidrawBindableElement, startOrEnd: "start" | "end", elementsMap: NonDeletedSceneElementsMap) => void;
 export declare const isLinearElementSimpleAndAlreadyBound: (linearElement: NonDeleted<ExcalidrawLinearElement>, alreadyBoundToId: ExcalidrawBindableElement["id"] | undefined, bindableElement: ExcalidrawBindableElement) => boolean;
-export declare const unbindLinearElements: (elements: readonly NonDeleted<ExcalidrawElement>[], elementsMap: NonDeletedSceneElementsMap) => void;
 export declare const getHoveredElementForBinding: (pointerCoords: {
     x: number;
     y: number;
-}, app: AppClassProperties) => NonDeleted<ExcalidrawBindableElement> | null;
+}, elementsMap: NonDeletedSceneElementsMap) => NonDeleted<ExcalidrawBindableElement> | null;
 export declare const updateBoundElements: (changedElement: NonDeletedExcalidrawElement, elementsMap: ElementsMap, options?: {
     simultaneouslyUpdated?: readonly ExcalidrawElement[];
     newSize?: {
@@ -30,22 +29,9 @@ export declare const updateBoundElements: (changedElement: NonDeletedExcalidrawE
         height: number;
     };
 }) => void;
-export declare const getEligibleElementsForBinding: (selectedElements: NonDeleted<ExcalidrawElement>[], app: AppClassProperties) => SuggestedBinding[];
 export declare const fixBindingsAfterDuplication: (sceneElements: readonly ExcalidrawElement[], oldElements: readonly ExcalidrawElement[], oldIdToDuplicatedId: Map<ExcalidrawElement["id"], ExcalidrawElement["id"]>, duplicatesServeAsOld?: "duplicatesServeAsOld" | undefined) => void;
 export declare const fixBindingsAfterDeletion: (sceneElements: readonly ExcalidrawElement[], deletedElements: readonly ExcalidrawElement[]) => void;
-export declare const bindingBorderTest: (element: NonDeleted<ExcalidrawBindableElement>, { x, y }: {
-    x: number;
-    y: number;
-}, app: AppClassProperties) => boolean;
 export declare const maxBindingGap: (element: ExcalidrawElement, elementWidth: number, elementHeight: number) => number;
-export declare const distanceToBindableElement: (element: ExcalidrawBindableElement, point: readonly [number, number], elementsMap: ElementsMap) => number;
-export declare const distanceToEllipse: (element: ExcalidrawEllipseElement, point: readonly [number, number], elementsMap: ElementsMap) => number;
-export declare const determineFocusDistance: (element: ExcalidrawBindableElement, a: readonly [number, number], b: readonly [number, number], elementsMap: ElementsMap) => number;
-export declare const determineFocusPoint: (element: ExcalidrawBindableElement, focus: number, adjecentPoint: readonly [number, number], elementsMap: ElementsMap) => readonly [number, number];
-export declare const intersectElementWithLine: (element: ExcalidrawBindableElement, a: readonly [number, number], b: readonly [number, number], gap: number | undefined, elementsMap: ElementsMap) => Point[];
-export declare const getCircleIntersections: (center: readonly [number, number, number, number, number, number, number, number], radius: number, line: readonly [number, number, number, number, number, number, number, number]) => GA.Point[];
-export declare const findFocusPointForEllipse: (ellipse: ExcalidrawEllipseElement, relativeDistance: number, point: readonly [number, number, number, number, number, number, number, number]) => readonly [number, number, number, number, number, number, number, number];
-export declare const findFocusPointForRectangulars: (element: ExcalidrawRectangleElement | ExcalidrawImageElement | ExcalidrawDiamondElement | ExcalidrawTextElement | ExcalidrawIframeLikeElement | ExcalidrawFrameLikeElement, relativeDistance: number, point: readonly [number, number, number, number, number, number, number, number]) => readonly [number, number, number, number, number, number, number, number];
 export declare const bindingProperties: Set<BindableProp | BindingProp>;
 export type BindableProp = "boundElements";
 export type BindingProp = "frameId" | "containerId" | "startBinding" | "endBinding";

package/dist/excalidraw/element/binding.js

@@ -13,6 +13,7 @@ import { LinearElementEditor } from "./linearElementEditor";
 import { arrayToMap, tupleToCoors } from "../utils";
 import { KEYS } from "../keys";
 import { getBoundTextElement, handleBindTextResize } from "./textElement";
+import { getElementShape } from "../shapes";
 export const shouldEnableBindingForPointerEvent = (event) => {
     return !event[KEYS.CTRL_OR_CMD];
 };
@@ -46,51 +47,125 @@ const bindOrUnbindLinearElementEdge = (linearElement, bindableElement, otherEdge
 boundToElementIds, 
 // Is mutated
 unboundFromElementIds, elementsMap) => {
-    if (bindableElement !== "keep") {
-        if (bindableElement != null) {
-            // Don't bind if we're trying to bind or are already bound to the same
-            // element on the other edge already ("start" edge takes precedence).
-            if (otherEdgeBindableElement == null ||
-                (otherEdgeBindableElement === "keep"
-                    ? !isLinearElementSimpleAndAlreadyBoundOnOppositeEdge(linearElement, bindableElement, startOrEnd)
-                    : startOrEnd === "start" ||
-                        otherEdgeBindableElement.id !== bindableElement.id)) {
-                bindLinearElement(linearElement, bindableElement, startOrEnd, elementsMap);
-                boundToElementIds.add(bindableElement.id);
-            }
+    // "keep" is for method chaining convenience, a "no-op", so just bail out
+    if (bindableElement === "keep") {
+        return;
+    }
+    // null means break the bind, so nothing to consider here
+    if (bindableElement === null) {
+        const unbound = unbindLinearElement(linearElement, startOrEnd);
+        if (unbound != null) {
+            unboundFromElementIds.add(unbound);
         }
-        else {
-            const unbound = unbindLinearElement(linearElement, startOrEnd);
-            if (unbound != null) {
-                unboundFromElementIds.add(unbound);
-            }
+        return;
+    }
+    // While complext arrows can do anything, simple arrow with both ends trying
+    // to bind to the same bindable should not be allowed, start binding takes
+    // precedence
+    if (isLinearElementSimple(linearElement)) {
+        if (otherEdgeBindableElement == null ||
+            (otherEdgeBindableElement === "keep"
+                ? // TODO: Refactor - Needlessly complex
+                    !isLinearElementSimpleAndAlreadyBoundOnOppositeEdge(linearElement, bindableElement, startOrEnd)
+                : startOrEnd === "start" ||
+                    otherEdgeBindableElement.id !== bindableElement.id)) {
+            bindLinearElement(linearElement, bindableElement, startOrEnd, elementsMap);
+            boundToElementIds.add(bindableElement.id);
         }
     }
+    else {
+        bindLinearElement(linearElement, bindableElement, startOrEnd, elementsMap);
+        boundToElementIds.add(bindableElement.id);
+    }
 };
-export const bindOrUnbindSelectedElements = (selectedElements, app) => {
-    selectedElements.forEach((selectedElement) => {
-        if (isBindingElement(selectedElement)) {
-            bindOrUnbindLinearElement(selectedElement, getElligibleElementForBindingElement(selectedElement, "start", app), getElligibleElementForBindingElement(selectedElement, "end", app), app.scene.getNonDeletedElementsMap());
-        }
-        else if (isBindableElement(selectedElement)) {
-            maybeBindBindableElement(selectedElement, app.scene.getNonDeletedElementsMap(), app);
+const getOriginalBindingIfStillCloseOfLinearElementEdge = (linearElement, edge, elementsMap) => {
+    const coors = getLinearElementEdgeCoors(linearElement, edge, elementsMap);
+    const elementId = edge === "start"
+        ? linearElement.startBinding?.elementId
+        : linearElement.endBinding?.elementId;
+    if (elementId) {
+        const element = elementsMap.get(elementId);
+        if (isBindableElement(element) &&
+            bindingBorderTest(element, coors, elementsMap)) {
+            return element;
         }
+    }
+    return null;
+};
+const getOriginalBindingsIfStillCloseToArrowEnds = (linearElement, elementsMap) => ["start", "end"].map((edge) => getOriginalBindingIfStillCloseOfLinearElementEdge(linearElement, edge, elementsMap));
+const getBindingStrategyForDraggingArrowEndpoints = (selectedElement, isBindingEnabled, draggingPoints, elementsMap) => {
+    const startIdx = 0;
+    const endIdx = selectedElement.points.length - 1;
+    const startDragged = draggingPoints.findIndex((i) => i === startIdx) > -1;
+    const endDragged = draggingPoints.findIndex((i) => i === endIdx) > -1;
+    const start = startDragged
+        ? isBindingEnabled
+            ? getElligibleElementForBindingElement(selectedElement, "start", elementsMap)
+            : null // If binding is disabled and start is dragged, break all binds
+        : // We have to update the focus and gap of the binding, so let's rebind
+            getElligibleElementForBindingElement(selectedElement, "start", elementsMap);
+    const end = endDragged
+        ? isBindingEnabled
+            ? getElligibleElementForBindingElement(selectedElement, "end", elementsMap)
+            : null // If binding is disabled and end is dragged, break all binds
+        : // We have to update the focus and gap of the binding, so let's rebind
+            getElligibleElementForBindingElement(selectedElement, "end", elementsMap);
+    return [start, end];
+};
+const getBindingStrategyForDraggingArrowOrJoints = (selectedElement, elementsMap, isBindingEnabled) => {
+    const [startIsClose, endIsClose] = getOriginalBindingsIfStillCloseToArrowEnds(selectedElement, elementsMap);
+    const start = startIsClose
+        ? isBindingEnabled
+            ? getElligibleElementForBindingElement(selectedElement, "start", elementsMap)
+            : null
+        : null;
+    const end = endIsClose
+        ? isBindingEnabled
+            ? getElligibleElementForBindingElement(selectedElement, "end", elementsMap)
+            : null
+        : null;
+    return [start, end];
+};
+export const bindOrUnbindLinearElements = (selectedElements, elementsMap, isBindingEnabled, draggingPoints) => {
+    selectedElements.forEach((selectedElement) => {
+        const [start, end] = draggingPoints?.length
+            ? // The arrow edge points are dragged (i.e. start, end)
+                getBindingStrategyForDraggingArrowEndpoints(selectedElement, isBindingEnabled, draggingPoints ?? [], elementsMap)
+            : // The arrow itself (the shaft) or the inner joins are dragged
+                getBindingStrategyForDraggingArrowOrJoints(selectedElement, elementsMap, isBindingEnabled);
+        bindOrUnbindLinearElement(selectedElement, start, end, elementsMap);
     });
 };
-const maybeBindBindableElement = (bindableElement, elementsMap, app) => {
-    getElligibleElementsForBindableElementAndWhere(bindableElement, app).forEach(([linearElement, where]) => bindOrUnbindLinearElement(linearElement, where === "end" ? "keep" : bindableElement, where === "start" ? "keep" : bindableElement, elementsMap));
-};
-export const maybeBindLinearElement = (linearElement, appState, pointerCoords, app) => {
+export const getSuggestedBindingsForArrows = (selectedElements, elementsMap) => {
+    // HOT PATH: Bail out if selected elements list is too large
+    if (selectedElements.length > 50) {
+        return [];
+    }
+    return (selectedElements
+        .filter(isLinearElement)
+        .flatMap((element) => getOriginalBindingsIfStillCloseToArrowEnds(element, elementsMap))
+        .filter((element) => element !== null)
+        // Filter out bind candidates which are in the
+        // same selection / group with the arrow
+        //
+        // TODO: Is it worth turning the list into a set to avoid dupes?
+        .filter((element) => selectedElements.filter((selected) => selected.id === element?.id)
+        .length === 0));
+};
+export const maybeBindLinearElement = (linearElement, appState, pointerCoords, elementsMap) => {
     if (appState.startBoundElement != null) {
-        bindLinearElement(linearElement, appState.startBoundElement, "start", app.scene.getNonDeletedElementsMap());
+        bindLinearElement(linearElement, appState.startBoundElement, "start", elementsMap);
     }
-    const hoveredElement = getHoveredElementForBinding(pointerCoords, app);
+    const hoveredElement = getHoveredElementForBinding(pointerCoords, elementsMap);
     if (hoveredElement != null &&
         !isLinearElementSimpleAndAlreadyBoundOnOppositeEdge(linearElement, hoveredElement, "end")) {
-        bindLinearElement(linearElement, hoveredElement, "end", app.scene.getNonDeletedElementsMap());
+        bindLinearElement(linearElement, hoveredElement, "end", elementsMap);
     }
 };
 export const bindLinearElement = (linearElement, hoveredElement, startOrEnd, elementsMap) => {
+    if (!isArrowElement(linearElement)) {
+        return;
+    }
     mutateElement(linearElement, {
         [startOrEnd === "start" ? "startBinding" : "endBinding"]: {
             elementId: hoveredElement.id,
@@ -113,20 +188,10 @@ const isLinearElementSimpleAndAlreadyBoundOnOppositeEdge = (linearElement, binda
     return isLinearElementSimpleAndAlreadyBound(linearElement, otherBinding?.elementId, bindableElement);
 };
 export const isLinearElementSimpleAndAlreadyBound = (linearElement, alreadyBoundToId, bindableElement) => {
-    return (alreadyBoundToId === bindableElement.id && linearElement.points.length < 3);
-};
-export const unbindLinearElements = (elements, elementsMap) => {
-    elements.forEach((element) => {
-        if (isBindingElement(element)) {
-            if (element.startBinding !== null && element.endBinding !== null) {
-                bindOrUnbindLinearElement(element, null, null, elementsMap);
-            }
-            else {
-                bindOrUnbindLinearElement(element, element.startBinding ? "keep" : null, element.endBinding ? "keep" : null, elementsMap);
-            }
-        }
-    });
+    return (alreadyBoundToId === bindableElement.id &&
+        isLinearElementSimple(linearElement));
 };
+const isLinearElementSimple = (linearElement) => linearElement.points.length < 3;
 const unbindLinearElement = (linearElement, startOrEnd) => {
     const field = startOrEnd === "start" ? "startBinding" : "endBinding";
     const binding = linearElement[field];
@@ -136,9 +201,9 @@ const unbindLinearElement = (linearElement, startOrEnd) => {
     mutateElement(linearElement, { [field]: null });
     return binding.elementId;
 };
-export const getHoveredElementForBinding = (pointerCoords, app) => {
-    const hoveredElement = getElementAtPosition(app.scene.getNonDeletedElements(), (element) => isBindableElement(element, false) &&
-        bindingBorderTest(element, pointerCoords, app));
+export const getHoveredElementForBinding = (pointerCoords, elementsMap) => {
+    const hoveredElement = getElementAtPosition([...elementsMap].map(([_, value]) => value), (element) => isBindableElement(element, false) &&
+        bindingBorderTest(element, pointerCoords, elementsMap));
     return hoveredElement;
 };
 const calculateFocusAndGap = (linearElement, hoveredElement, startOrEnd, elementsMap) => {
@@ -247,55 +312,13 @@ const maybeCalculateNewGapWhenScaling = (changedElement, currentBinding, newSize
     const newGap = Math.max(1, Math.min(maxBindingGap(changedElement, newWidth, newHeight), gap * (newWidth < newHeight ? newWidth / width : newHeight / height)));
     return { elementId, gap: newGap, focus };
 };
-// TODO: this is a bottleneck, optimise
-export const getEligibleElementsForBinding = (selectedElements, app) => {
-    const includedElementIds = new Set(selectedElements.map(({ id }) => id));
-    return selectedElements.flatMap((selectedElement) => isBindingElement(selectedElement, false)
-        ? getElligibleElementsForBindingElement(selectedElement, app).filter((element) => !includedElementIds.has(element.id))
-        : isBindableElement(selectedElement, false)
-            ? getElligibleElementsForBindableElementAndWhere(selectedElement, app).filter((binding) => !includedElementIds.has(binding[0].id))
-            : []);
-};
-const getElligibleElementsForBindingElement = (linearElement, app) => {
-    return [
-        getElligibleElementForBindingElement(linearElement, "start", app),
-        getElligibleElementForBindingElement(linearElement, "end", app),
-    ].filter((element) => element != null);
-};
-const getElligibleElementForBindingElement = (linearElement, startOrEnd, app) => {
-    return getHoveredElementForBinding(getLinearElementEdgeCoors(linearElement, startOrEnd, app.scene.getNonDeletedElementsMap()), app);
+const getElligibleElementForBindingElement = (linearElement, startOrEnd, elementsMap) => {
+    return getHoveredElementForBinding(getLinearElementEdgeCoors(linearElement, startOrEnd, elementsMap), elementsMap);
 };
 const getLinearElementEdgeCoors = (linearElement, startOrEnd, elementsMap) => {
     const index = startOrEnd === "start" ? 0 : -1;
     return tupleToCoors(LinearElementEditor.getPointAtIndexGlobalCoordinates(linearElement, index, elementsMap));
 };
-const getElligibleElementsForBindableElementAndWhere = (bindableElement, app) => {
-    const scene = Scene.getScene(bindableElement);
-    return scene
-        .getNonDeletedElements()
-        .map((element) => {
-        if (!isBindingElement(element, false)) {
-            return null;
-        }
-        const canBindStart = isLinearElementEligibleForNewBindingByBindable(element, "start", bindableElement, scene.getNonDeletedElementsMap(), app);
-        const canBindEnd = isLinearElementEligibleForNewBindingByBindable(element, "end", bindableElement, scene.getNonDeletedElementsMap(), app);
-        if (!canBindStart && !canBindEnd) {
-            return null;
-        }
-        return [
-            element,
-            canBindStart && canBindEnd ? "both" : canBindStart ? "start" : "end",
-            bindableElement,
-        ];
-    })
-        .filter((maybeElement) => maybeElement != null);
-};
-const isLinearElementEligibleForNewBindingByBindable = (linearElement, startOrEnd, bindableElement, elementsMap, app) => {
-    const existingBinding = linearElement[startOrEnd === "start" ? "startBinding" : "endBinding"];
-    return (existingBinding == null &&
-        !isLinearElementSimpleAndAlreadyBoundOnOppositeEdge(linearElement, bindableElement, startOrEnd) &&
-        bindingBorderTest(bindableElement, getLinearElementEdgeCoors(linearElement, startOrEnd, elementsMap), app));
-};
 // We need to:
 // 1: Update elements not selected to point to duplicated elements
 // 2: Update duplicated elements to point to other duplicated elements
@@ -310,6 +333,7 @@ duplicatesServeAsOld) => {
     const allBoundElementIds = new Set();
     const allBindableElementIds = new Set();
     const shouldReverseRoles = duplicatesServeAsOld === "duplicatesServeAsOld";
+    const duplicateIdToOldId = new Map([...oldIdToDuplicatedId].map(([key, value]) => [value, key]));
     oldElements.forEach((oldElement) => {
         const { boundElements } = oldElement;
         if (boundElements != null && boundElements.length > 0) {
@@ -350,7 +374,8 @@ duplicatesServeAsOld) => {
     sceneElements
         .filter(({ id }) => allBindableElementIds.has(id))
         .forEach((bindableElement) => {
-        const { boundElements } = bindableElement;
+        const oldElementId = duplicateIdToOldId.get(bindableElement.id);
+        const { boundElements } = sceneElements.find(({ id }) => id === oldElementId);
         if (boundElements != null && boundElements.length > 0) {
             mutateElement(bindableElement, {
                 boundElements: boundElements.map((boundElement) => oldIdToDuplicatedId.has(boundElement.id)
@@ -389,9 +414,9 @@ const newBoundElements = (boundElements, idsToRemove, elementsToAdd = []) => {
     nextBoundElements.push(...elementsToAdd.map((x) => ({ id: x.id, type: x.type })));
     return nextBoundElements;
 };
-export const bindingBorderTest = (element, { x, y }, app) => {
+const bindingBorderTest = (element, { x, y }, elementsMap) => {
     const threshold = maxBindingGap(element, element.width, element.height);
-    const shape = app.getElementShape(element);
+    const shape = getElementShape(element, elementsMap);
     return isPointOnShape([x, y], shape, threshold);
 };
 export const maxBindingGap = (element, elementWidth, elementHeight) => {
@@ -401,7 +426,7 @@ export const maxBindingGap = (element, elementWidth, elementHeight) => {
     // We make the bindable boundary bigger for bigger elements
     return Math.max(16, Math.min(0.25 * smallerDimension, 32));
 };
-export const distanceToBindableElement = (element, point, elementsMap) => {
+const distanceToBindableElement = (element, point, elementsMap) => {
     switch (element.type) {
         case "rectangle":
         case "image":
@@ -426,7 +451,7 @@ const distanceToDiamond = (element, point, elementsMap) => {
     const side = GALine.equation(hheight, hwidth, -hheight * hwidth);
     return GAPoint.distanceToLine(pointRel, side);
 };
-export const distanceToEllipse = (element, point, elementsMap) => {
+const distanceToEllipse = (element, point, elementsMap) => {
     const [pointRel, tangent] = ellipseParamsForTest(element, point, elementsMap);
     return -GALine.sign(tangent) * GAPoint.distanceToLine(pointRel, tangent);
 };
@@ -504,7 +529,7 @@ const coordsCenter = (x1, y1, x2, y2) => {
 // all focus points lie, so it's a number between -1 and 1.
 // The line going through `a` and `b` is a tangent to the "focus image"
 // of the element.
-export const determineFocusDistance = (element, 
+const determineFocusDistance = (element, 
 // Point on the line, in absolute coordinates
 a, 
 // Another point on the line, in absolute coordinates (closer to element)
@@ -541,7 +566,7 @@ b, elementsMap) => {
     }
     return ret || 0;
 };
-export const determineFocusPoint = (element, 
+const determineFocusPoint = (element, 
 // The oriented, relative distance from the center of `element` of the
 // returned focusPoint
 focus, adjecentPoint, elementsMap) => {
@@ -573,7 +598,7 @@ focus, adjecentPoint, elementsMap) => {
 };
 // Returns 2 or 0 intersection points between line going through `a` and `b`
 // and the `element`, in ascending order of distance from `a`.
-export const intersectElementWithLine = (element, 
+const intersectElementWithLine = (element, 
 // Point on the line, in absolute coordinates
 a, 
 // Another point on the line, in absolute coordinates
@@ -688,7 +713,7 @@ const getEllipseIntersections = (element, gap, line) => {
         GA.point((xn - a * b * n * discrRoot) / squares, (yn + a * b * m * discrRoot) / squares),
     ];
 };
-export const getCircleIntersections = (center, radius, line) => {
+const getCircleIntersections = (center, radius, line) => {
     if (radius === 0) {
         return GAPoint.distanceToLine(line, center) === 0 ? [center] : [];
     }
@@ -712,7 +737,7 @@ export const getCircleIntersections = (center, radius, line) => {
 };
 // The focus point is the tangent point of the "focus image" of the
 // `element`, where the tangent goes through `point`.
-export const findFocusPointForEllipse = (ellipse, 
+const findFocusPointForEllipse = (ellipse, 
 // Between -1 and 1 (not 0) the relative size of the "focus image" of
 // the element on which the focus point lies
 relativeDistance, 
@@ -739,7 +764,7 @@ point) => {
     const x = -(a ** 2 * m) / (n ** 2 * b ** 2 + m ** 2 * a ** 2);
     return GA.point(x, (-m * x - 1) / n);
 };
-export const findFocusPointForRectangulars = (element, 
+const findFocusPointForRectangulars = (element, 
 // Between -1 and 1 for how far away should the focus point be relative
 // to the size of the element. Sign determines orientation.
 relativeDistance, 

package/dist/excalidraw/element/bounds.d.ts

@@ -1,6 +1,6 @@
-import { ExcalidrawElement, ExcalidrawLinearElement, Arrowhead, ExcalidrawFreeDrawElement, NonDeleted, ElementsMap } from "./types";
-import { Drawable, Op } from "roughjs/bin/core";
-import { AppState, Point } from "../types";
+import type { ExcalidrawElement, ExcalidrawLinearElement, Arrowhead, ExcalidrawFreeDrawElement, NonDeleted, ElementsMap } from "./types";
+import type { Drawable, Op } from "roughjs/bin/core";
+import type { AppState, Point } from "../types";
 export type RectangleBox = {
     x: number;
     y: number;

package/dist/excalidraw/element/collision.d.ts

@@ -1,6 +1,6 @@
-import { ElementsMap, ExcalidrawElement } from "./types";
-import { FrameNameBounds } from "../types";
-import { GeometricShape } from "../../utils/geometry/shape";
+import type { ElementsMap, ExcalidrawElement } from "./types";
+import type { FrameNameBounds } from "../types";
+import type { GeometricShape } from "../../utils/geometry/shape";
 export declare const shouldTestInside: (element: ExcalidrawElement) => boolean;
 export type HitTestArgs = {
     x: number;

package/dist/excalidraw/element/collision.js

@@ -1,6 +1,6 @@
 import { isPathALoop, isPointWithinBounds } from "../math";
 import { getElementBounds } from "./bounds";
-import { getPolygonShape, } from "../../utils/geometry/shape";
+import { getPolygonShape } from "../../utils/geometry/shape";
 import { isPointInShape, isPointOnShape } from "../../utils/collision";
 import { isTransparent } from "../utils";
 import { hasBoundTextElement, isIframeLikeElement, isImageElement, isTextElement, } from "./typeChecks";

package/dist/excalidraw/element/containerCache.d.ts

@@ -1,4 +1,4 @@
-import { ExcalidrawTextContainer } from "./types";
+import type { ExcalidrawTextContainer } from "./types";
 export declare const originalContainerCache: {
     [id: ExcalidrawTextContainer["id"]]: {
         height: ExcalidrawTextContainer["height"];

package/dist/excalidraw/element/dragElements.d.ts

@@ -1,6 +1,6 @@
-import { NonDeletedExcalidrawElement } from "./types";
-import { AppState, PointerDownState } from "../types";
-import Scene from "../scene/Scene";
+import type { NonDeletedExcalidrawElement } from "./types";
+import type { AppState, NormalizedZoomValue, PointerDownState } from "../types";
+import type Scene from "../scene/Scene";
 export declare const dragSelectedElements: (pointerDownState: PointerDownState, selectedElements: NonDeletedExcalidrawElement[], offset: {
     x: number;
     y: number;
@@ -9,7 +9,7 @@ export declare const dragSelectedElements: (pointerDownState: PointerDownState,
     y: number;
 }, gridSize: AppState["gridSize"]) => void;
 export declare const getDragOffsetXY: (selectedElements: NonDeletedExcalidrawElement[], x: number, y: number) => [number, number];
-export declare const dragNewElement: (draggingElement: NonDeletedExcalidrawElement, elementType: AppState["activeTool"]["type"], originX: number, originY: number, x: number, y: number, width: number, height: number, shouldMaintainAspectRatio: boolean, shouldResizeFromCenter: boolean, widthAspectRatio?: number | null, originOffset?: {
+export declare const dragNewElement: (draggingElement: NonDeletedExcalidrawElement, elementType: AppState["activeTool"]["type"], originX: number, originY: number, x: number, y: number, width: number, height: number, shouldMaintainAspectRatio: boolean, shouldResizeFromCenter: boolean, zoom: NormalizedZoomValue, widthAspectRatio?: number | null, originOffset?: {
     x: number;
     y: number;
 } | null) => void;