smig/excalidraw
1
0
Fork 0
mirror of https://github.com/excalidraw/excalidraw.git synced 2025-05-03 10:00:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Incorrect point offsetting in LinearElementEditor.movePoints() (#8145)

Browse source 
The LinearElementEditor.movePoints() function incorrectly calculates the offset for local linear element points when multiple targetPoints are provided, one of those target points is index === 0 AND the other points are moved in the negative direction, and ending up with negative local coordinates.

Signed-off-by: Mark Tolmacs <mark@lazycat.hu>
This commit is contained in:
Márk Tolmács 2024-06-28 12:23:10 +02:00 • committed by GitHub
parent 744b3e5d09
commit ba8c09d529
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 37 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
packages/excalidraw/element/linearElementEditor.ts
View file

@ -1165,7 +1165,7 @@ export class LinearElementEditor {
const nextPoints = points.map((point, idx) => { const nextPoints = points.map((point, idx) => {
const selectedPointData = targetPoints.find((p) => p.index === idx); const selectedPointData = targetPoints.find((p) => p.index === idx);
if (selectedPointData) { if (selectedPointData) {
if (selectedOriginPoint) { if (selectedPointData.index === 0) {
return point; return point;
} }
@ -1174,7 +1174,10 @@ export class LinearElementEditor {
const deltaY = const deltaY =
selectedPointData.point[1] - points[selectedPointData.index][1]; selectedPointData.point[1] - points[selectedPointData.index][1];
return [point[0] + deltaX, point[1] + deltaY] as const; return [
point[0] + deltaX - offsetX,
point[1] + deltaY - offsetY,
] as const;
} }
return offsetX || offsetY return offsetX || offsetY
? ([point[0] - offsetX, point[1] - offsetY] as const) ? ([point[0] - offsetX, point[1] - offsetY] as const)

40
packages/excalidraw/tests/linearElementEditor.test.tsx
View file

@ -27,6 +27,7 @@ import * as textElementUtils from "../element/textElement";
import { ROUNDNESS, VERTICAL_ALIGN } from "../constants"; import { ROUNDNESS, VERTICAL_ALIGN } from "../constants";
import { vi } from "vitest"; import { vi } from "vitest";
import { arrayToMap } from "../utils"; import { arrayToMap } from "../utils";
import React from "react";
const renderInteractiveScene = vi.spyOn( const renderInteractiveScene = vi.spyOn(
InteractiveCanvas, InteractiveCanvas,
@ -972,10 +973,10 @@ describe("Test Linear Elements", () => {
]); ]);
expect((h.elements[1] as ExcalidrawTextElementWithContainer).text) expect((h.elements[1] as ExcalidrawTextElementWithContainer).text)
.toMatchInlineSnapshot(` .toMatchInlineSnapshot(`
"Online whiteboard "Online whiteboard
collaboration made collaboration made
easy" easy"
`); `);
}); });
it("should bind text to arrow when clicked on arrow and enter pressed", async () => { it("should bind text to arrow when clicked on arrow and enter pressed", async () => {
@ -1006,10 +1007,10 @@ describe("Test Linear Elements", () => {
]); ]);
expect((h.elements[1] as ExcalidrawTextElementWithContainer).text) expect((h.elements[1] as ExcalidrawTextElementWithContainer).text)
.toMatchInlineSnapshot(` .toMatchInlineSnapshot(`
"Online whiteboard "Online whiteboard
collaboration made collaboration made
easy" easy"
`); `);
}); });
it("should not bind text to line when double clicked", async () => { it("should not bind text to line when double clicked", async () => {
@ -1349,4 +1350,27 @@ describe("Test Linear Elements", () => {
expect(label.y).toBe(0); expect(label.y).toBe(0);
}); });
}); });
describe("Test moving linear element points", () => {
it("should move the endpoint in the negative direction correctly when the start point is also moved in the positive direction", async () => {
const line = createThreePointerLinearElement("arrow");
const [origStartX, origStartY] = [line.x, line.y];
LinearElementEditor.movePoints(line, [
{ index: 0, point: [line.points[0][0] + 10, line.points[0][1] + 10] },
{
index: line.points.length - 1,
point: [
line.points[line.points.length - 1][0] - 10,
line.points[line.points.length - 1][1] - 10,
],
},
]);
expect(line.x).toBe(origStartX + 10);
expect(line.y).toBe(origStartY + 10);
expect(line.points[line.points.length - 1][0]).toBe(20);
expect(line.points[line.points.length - 1][1]).toBe(-20);
});
});
}); });