Dylan/excalidraw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include arrowheads in bounds

Browse Source
This commit is contained in:
Ryan Di 2023-12-21 16:56:05 +08:00
parent 5f40a4cad4
commit 795511ee6b
2 changed files with 51 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
packages/excalidraw/element/bounds.ts
View File

@ -701,14 +701,45 @@ const getLinearElementRotatedBounds = (
return coords;
}
// first element is always the curve
const cachedShape = ShapeCache.get(element)?.[0];
const shape = cachedShape ?? generateLinearElementShape(element);
const ops = getCurvePathOps(shape);
const transformXY = (x: number, y: number) =>
rotate(element.x + x, element.y + y, cx, cy, element.angle);
const res = getMinMaxXYFromCurvePathOps(ops, transformXY);
let coords: Bounds = [res[0], res[1], res[2], res[3]];
const cachedShape =
ShapeCache.get(element) ?? ShapeCache.generateElementShape(element, null);
const [arrowCurve, ...arrowhead] = cachedShape;
let coords = getMinMaxXYFromCurvePathOps(
getCurvePathOps(arrowCurve),
(x: number, y: number) =>
rotate(element.x + x, element.y + y, cx, cy, element.angle),
);
for (const shape of arrowhead) {
let [minX, minY, maxX, maxY] = getMinMaxXYFromCurvePathOps(
getCurvePathOps(shape),
);
[minX, minY] = rotate(
minX + element.x,
minY + element.y,
cx,
cy,
element.angle,
);
[maxX, maxY] = rotate(
maxX + element.x,
maxY + element.y,
cx,
cy,
element.angle,
);
coords = [
Math.min(minX, coords[0]),
Math.min(minY, coords[1]),
Math.max(maxX, coords[2]),
Math.max(maxY, coords[3]),
];
}
const boundTextElement = getBoundTextElement(element);
if (boundTextElement) {
const coordsWithBoundText = LinearElementEditor.getMinMaxXYWithBoundText(

23
packages/excalidraw/element/linearElementEditor.ts
View File

@ -1421,10 +1421,10 @@ export class LinearElementEditor {
includeBoundText: boolean = false,
): [number, number, number, number, number, number] => {
let coords: [number, number, number, number, number, number];
let x1;
let y1;
let x2;
let y2;
let x1 = Infinity;
let y1 = Infinity;
let x2 = -Infinity;
let y2 = -Infinity;
if (element.points.length < 2 || !ShapeCache.get(element)) {
// XXX this is just a poor estimate and not very useful
const { minX, minY, maxX, maxY } = element.points.reduce(
@ -1446,14 +1446,15 @@ export class LinearElementEditor {
} else {
const shape = ShapeCache.generateElementShape(element, null);
// first element is always the curve
const ops = getCurvePathOps(shape[0]);
for (const s of shape) {
const ops = getCurvePathOps(s);
const [minX, minY, maxX, maxY] = getMinMaxXYFromCurvePathOps(ops);
x1 = minX + element.x;
y1 = minY + element.y;
x2 = maxX + element.x;
y2 = maxY + element.y;
const [minX, minY, maxX, maxY] = getMinMaxXYFromCurvePathOps(ops);
x1 = Math.min(minX + element.x, x1);
y1 = Math.min(minY + element.y, y1);
x2 = Math.max(maxX + element.x, x2);
y2 = Math.max(maxY + element.y, y2);
}
}
const cx = (x1 + x2) / 2;
const cy = (y1 + y2) / 2;