Virtual whiteboard for sketching hand-drawn like diagrams
fix: Unify binding update options for `updateBoundElements()` (#8832)
Márk Tolmács2db5bbcb29e2
diff --git a/packages/excalidraw/components/App.tsx b/packages/excalidraw/components/App.tsxindex 5723a0602a..611634dad3 100644--- a/packages/excalidraw/components/App.tsx+++ b/packages/excalidraw/components/App.tsx@@ -10237,7 +10237,7 @@ class App extends React.Component<AppProps, AppState> {croppingElement,this.scene.getNonDeletedElementsMap(),{- oldSize: {+ newSize: {width: croppingElement.width,height: croppingElement.height,},diff --git a/packages/excalidraw/components/Stats/MultiDimension.tsx b/packages/excalidraw/components/Stats/MultiDimension.tsxindex 0d1a65e915..257642e984 100644--- a/packages/excalidraw/components/Stats/MultiDimension.tsx+++ b/packages/excalidraw/components/Stats/MultiDimension.tsx@@ -69,7 +69,6 @@ const resizeElementInGroup = (originalElementsMap: ElementsMap,) => {const updates = getResizedUpdates(anchorX, anchorY, scale, origElement);- const { width: oldWidth, height: oldHeight } = latestElement;mutateElement(latestElement, updates, false);const boundTextElement = getBoundTextElement(@@ -79,7 +78,7 @@ const resizeElementInGroup = (if (boundTextElement) {const newFontSize = boundTextElement.fontSize * scale;updateBoundElements(latestElement, elementsMap, {- oldSize: { width: oldWidth, height: oldHeight },+ newSize: { width: updates.width, height: updates.height },});const latestBoundTextElement = elementsMap.get(boundTextElement.id);if (latestBoundTextElement && isTextElement(latestBoundTextElement)) {diff --git a/packages/excalidraw/components/Stats/utils.ts b/packages/excalidraw/components/Stats/utils.tsindex a6a443b9b6..3fcbc11c7f 100644--- a/packages/excalidraw/components/Stats/utils.ts+++ b/packages/excalidraw/components/Stats/utils.ts@@ -151,8 +151,6 @@ export const resizeElement = (nextHeight = Math.max(nextHeight, minHeight);}- const { width: oldWidth, height: oldHeight } = latestElement;-mutateElement(latestElement,{@@ -201,7 +199,7 @@ export const resizeElement = (}updateBoundElements(latestElement, elementsMap, {- oldSize: { width: oldWidth, height: oldHeight },+ newSize: { width: nextWidth, height: nextHeight },});if (boundTextElement && boundTextFont) {diff --git a/packages/excalidraw/element/binding.ts b/packages/excalidraw/element/binding.tsindex d0faa4269d..3c4869fe46 100644--- a/packages/excalidraw/element/binding.ts+++ b/packages/excalidraw/element/binding.ts@@ -576,11 +576,11 @@ export const updateBoundElements = (elementsMap: NonDeletedSceneElementsMap | SceneElementsMap,options?: {simultaneouslyUpdated?: readonly ExcalidrawElement[];- oldSize?: { width: number; height: number };+ newSize?: { width: number; height: number };changedElements?: Map<string, OrderedExcalidrawElement>;},) => {- const { oldSize, simultaneouslyUpdated, changedElements } = options ?? {};+ const { newSize, simultaneouslyUpdated, changedElements } = options ?? {};const simultaneouslyUpdatedElementIds = getSimultaneouslyUpdatedElementIds(simultaneouslyUpdated,);@@ -603,12 +603,12 @@ export const updateBoundElements = (startBinding: maybeCalculateNewGapWhenScaling(changedElement,element.startBinding,- oldSize,+ newSize,),endBinding: maybeCalculateNewGapWhenScaling(changedElement,element.endBinding,- oldSize,+ newSize,),};diff --git a/packages/excalidraw/element/resizeElements.ts b/packages/excalidraw/element/resizeElements.tsindex 1fea04371d..dab5ffa1c8 100644--- a/packages/excalidraw/element/resizeElements.ts+++ b/packages/excalidraw/element/resizeElements.ts@@ -739,9 +739,9 @@ export const resizeSingleElement = (mutateElement(element, resizedElement);updateBoundElements(element, elementsMap, {- oldSize: {- width: stateAtResizeStart.width,- height: stateAtResizeStart.height,+ newSize: {+ width: resizedElement.width,+ height: resizedElement.height,},});@@ -999,14 +999,13 @@ export const resizeMultipleElements = (element,update: { boundTextFontSize, ...update },} of elementsAndUpdates) {- const { angle } = update;- const { width: oldWidth, height: oldHeight } = element;+ const { angle, width: newWidth, height: newHeight } = update;mutateElement(element, update, false);updateBoundElements(element, elementsMap, {simultaneouslyUpdated: elementsToUpdate,- oldSize: { width: oldWidth, height: oldHeight },+ newSize: { width: newWidth, height: newHeight },});const boundTextElement = getBoundTextElement(element, elementsMap);diff --git a/packages/excalidraw/tests/cropElement.test.tsx b/packages/excalidraw/tests/cropElement.test.tsxindex f2cb297f29..9b03c5261c 100644--- a/packages/excalidraw/tests/cropElement.test.tsx+++ b/packages/excalidraw/tests/cropElement.test.tsx@@ -156,8 +156,8 @@ describe("Crop an image", () => {[-initialWidth / 3, 0],true,);- expect(image.width).toBe(resizedWidth);- expect(image.height).toBe(resizedHeight);+ expect(image.width).toBeCloseTo(resizedWidth, 10);+ expect(image.height).toBeCloseTo(resizedHeight, 10);// re-crop to initial stateUI.crop(image, "w", naturalWidth, naturalHeight, [-initialWidth / 3, 0]);diff --git a/packages/excalidraw/tests/linearElementEditor.test.tsx b/packages/excalidraw/tests/linearElementEditor.test.tsxindex 3341d2da31..a6abfcdc94 100644--- a/packages/excalidraw/tests/linearElementEditor.test.tsx+++ b/packages/excalidraw/tests/linearElementEditor.test.tsx@@ -1235,8 +1235,7 @@ describe("Test Linear Elements", () => {mouse.downAt(rect.x, rect.y);mouse.moveTo(200, 0);mouse.upAt(200, 0);-- expect(arrow.width).toBe(205);+ expect(arrow.width).toBe(200);expect(rect.x).toBe(200);expect(rect.y).toBe(0);expect(handleBindTextResizeSpy).toHaveBeenCalledWith(diff --git a/packages/excalidraw/tests/resize.test.tsx b/packages/excalidraw/tests/resize.test.tsxindex 05f8627a83..abf99bcf6e 100644--- a/packages/excalidraw/tests/resize.test.tsx+++ b/packages/excalidraw/tests/resize.test.tsx@@ -882,11 +882,11 @@ describe("multiple selection", () => {expect(leftBoundArrow.x).toBeCloseTo(-110);expect(leftBoundArrow.y).toBeCloseTo(50);- expect(leftBoundArrow.width).toBeCloseTo(137.5, 0);+ expect(leftBoundArrow.width).toBeCloseTo(140, 0);expect(leftBoundArrow.height).toBeCloseTo(7, 0);expect(leftBoundArrow.angle).toEqual(0);expect(leftBoundArrow.startBinding).toBeNull();- expect(leftBoundArrow.endBinding?.gap).toBeCloseTo(12.352);+ expect(leftBoundArrow.endBinding?.gap).toBeCloseTo(10);expect(leftBoundArrow.endBinding?.elementId).toBe(leftArrowBinding.elementId,);