averello/mailspring-mirror
1
0
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-12-12 20:36:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sentry fix: Add null checks around clientHeight calculations in attachment-items

Browse Source
This commit is contained in:
Ben Gotow
2025-07-15 10:17:24 -05:00
parent d34468a0b9
commit 24129524a1
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/components/attachment-items.tsx
View File

@@ -400,7 +400,7 @@ export class ImageAttachmentItem extends Component<ImageAttachmentItemProps> {
held: false,
ratio: { wh: 0, hw: 0 },
};
private _editor = () => document.querySelector('.compose-body') as HTMLDivElement;
private _editor = () => document.querySelector('.compose-body') as HTMLDivElement | null;
private _resizeImage = (
ev: (
@@ -436,12 +436,14 @@ export class ImageAttachmentItem extends Component<ImageAttachmentItemProps> {
img.style.height = `${newHeight}px`;
}
const firstChild = editor.children[0] as HTMLDivElement;
if (Number.parseInt(editor.style.flexBasis) < firstChild.offsetHeight) {
editor.style.flexBasis = `${firstChild.offsetHeight}px`;
}
if (editor) {
const firstChild = editor.children[0] as HTMLDivElement;
if (Number.parseInt(editor.style.flexBasis) < firstChild.offsetHeight) {
editor.style.flexBasis = `${firstChild.offsetHeight}px`;
}
this._pData = { x: ev.x, y: ev.y, eH: editor.clientHeight };
this._pData = { x: ev.x, y: ev.y, eH: editor.clientHeight };
}
};
private _resizeImageKeyPress = (ev: KeyboardEvent) => {
@@ -491,8 +493,12 @@ export class ImageAttachmentItem extends Component<ImageAttachmentItemProps> {
private _resizeEnd = (ev: MouseEvent) => {
ev.preventDefault();
const editor = this._editor(),
target = editor.querySelector('.image-attachment-item[data-resizing]') as HTMLDivElement;
const editor = this._editor();
if (!editor) {
return;
}
const target = editor.querySelector('.image-attachment-item[data-resizing]') as HTMLDivElement;
if (editor.clientHeight == this._pData.eH && target) {
delete target.dataset.resizing;