sambruk/excalidraw
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: resize sometimes throwing on missing null-checks (#6013)

Browse Source
This commit is contained in:
David Luzar 2022-12-18 23:06:01 +01:00 committed by GitHub
parent 95d669390f
commit 539505affd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/element/resizeElements.ts
View File

@ -162,11 +162,12 @@ const rotateSingleElement = (
mutateElement(element, { angle });
if (boundTextElementId) {
const textElement = Scene.getScene(element)!.getElement(
boundTextElementId,
) as ExcalidrawTextElementWithContainer;
const textElement =
Scene.getScene(element)?.getElement<ExcalidrawTextElementWithContainer>(
boundTextElementId,
);
if (!isArrowElement(element)) {
if (textElement && !isArrowElement(element)) {
mutateElement(textElement, { angle });
}
}
@ -201,8 +202,10 @@ const measureFontSizeFromWH = (
const hasContainer = isBoundToContainer(element);
if (hasContainer) {
const container = getContainerElement(element)!;
width = getMaxContainerWidth(container);
const container = getContainerElement(element);
if (container) {
width = getMaxContainerWidth(container);
}
}
const nextFontSize = element.fontSize * (nextWidth / width);
if (nextFontSize < MIN_FONT_SIZE) {
@ -211,7 +214,7 @@ const measureFontSizeFromWH = (
const metrics = measureText(
element.text,
getFontString({ fontSize: nextFontSize, fontFamily: element.fontFamily }),
hasContainer ? width : null,
element.containerId ? width : null,
);
return {
size: nextFontSize,
@ -765,10 +768,11 @@ const rotateMultipleElements = (
});
const boundTextElementId = getBoundTextElementId(element);
if (boundTextElementId) {
const textElement = Scene.getScene(element)!.getElement(
boundTextElementId,
) as ExcalidrawTextElementWithContainer;
if (!isArrowElement(element)) {
const textElement =
Scene.getScene(element)?.getElement<ExcalidrawTextElementWithContainer>(
boundTextElementId,
);
if (textElement && !isArrowElement(element)) {
mutateElement(textElement, {
x: textElement.x + (rotatedCX - cx),
y: textElement.y + (rotatedCY - cy),