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: bound text scaling when resizing

Browse source
This commit is contained in:
Alex Kim 2023-02-16 21:03:46 +03:00
parent 61d86b88eb
commit 42002279e0
No known key found for this signature in database
GPG key ID: CEE74CFA44D238D7
1 changed files with 10 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

53
src/element/resizeElements.ts
View file

@ -697,7 +697,7 @@ export const resizeMultipleElements = (
points?: Point[];
fontSize?: number;
baseline?: number;
scale?: [-1 | 1, -1 | 1];
scale?: [number, number];
} = {
width,
height,
@ -709,56 +709,23 @@ export const resizeMultipleElements = (
if (isImageElement(element) && targetElements.length === 1) {
update.scale = [
(element.scale[0] * flipFactorX) as -1 | 1,
(element.scale[1] * flipFactorY) as -1 | 1,
element.scale[0] * flipFactorX,
element.scale[1] * flipFactorY,
];
}
let boundTextUpdates: {
angle: number;
fontSize: number;
baseline: number;
} | null = null;
const boundTextElement = getBoundTextElement(latestElement);
if (boundTextElement || isTextElement(element)) {
const optionalPadding = getBoundTextElementOffset(boundTextElement) * 2;
const textMeasurements = measureFontSizeFromWH(
boundTextElement ?? (element as ExcalidrawTextElement),
width - optionalPadding,
height - optionalPadding,
);
if (!textMeasurements) {
return; // FIXME
}
if (isTextElement(element)) {
update.fontSize = textMeasurements.size;
update.baseline = textMeasurements.baseline;
}
if (boundTextElement) {
if (isArrowElement(element)) {
const { angle, fontSize, baseline } = boundTextElement;
boundTextUpdates = { angle, fontSize, baseline };
} else {
boundTextUpdates = {
angle,
fontSize: textMeasurements.size,
baseline: textMeasurements.baseline,
};
}
}
if (isTextElement(element)) {
const textMeasurements = measureFontSizeFromWH(element, width, height);
update.fontSize = textMeasurements?.size ?? element.fontSize;
update.baseline = textMeasurements?.baseline ?? element.baseline;
}
updateBoundElements(latestElement, { newSize: { width, height } });
mutateElement(latestElement, update);
if (boundTextElement && boundTextUpdates) {
mutateElement(boundTextElement, boundTextUpdates);
const boundTextElement = getBoundTextElement(latestElement);
if (boundTextElement) {
mutateElement(boundTextElement, { angle });
handleBindTextResize(latestElement, transformHandleType);
}
});