yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: NaN invalid CSS width issue

Browse Source
This commit is contained in:
Tom Moor
2023-04-18 19:49:56 -04:00
parent d04b15a04b
commit e4fb151a71
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
shared/editor/components/ImageZoom/Controlled.tsx
View File

@@ -574,8 +574,8 @@ class ControlledBase extends Component<
tmp.innerHTML = imgEl.outerHTML; tmp.innerHTML = imgEl.outerHTML;
const svg = tmp.firstChild as SVGSVGElement; const svg = tmp.firstChild as SVGSVGElement;
svg.style.width = `${styleModalImg.width ?? 0}px`; svg.style.width = `${styleModalImg.width || 0}px`;
svg.style.height = `${styleModalImg.height ?? 0}px`; svg.style.height = `${styleModalImg.height || 0}px`;
svg.addEventListener("click", this.handleUnzoom); svg.addEventListener("click", this.handleUnzoom);
refModalImg.current?.firstChild?.remove?.(); refModalImg.current?.firstChild?.remove?.();

8
shared/editor/components/ImageZoom/utils.ts
View File

@@ -75,8 +75,11 @@ export const getScale: GetScale = ({
offset, offset,
targetHeight, targetHeight,
targetWidth, targetWidth,
}) => }) => {
!hasScalableSrc && targetHeight && targetWidth if (!containerHeight || !containerWidth) {
return 1;
}
return !hasScalableSrc && targetHeight && targetWidth
? getScaleToWindowMax({ ? getScaleToWindowMax({
containerHeight, containerHeight,
containerWidth, containerWidth,
@@ -89,6 +92,7 @@ export const getScale: GetScale = ({
offset, offset,
width: containerWidth, width: containerWidth,
}); });
};
const URL_REGEX = /url(?:\(['"]?)(.*?)(?:['"]?\))/; const URL_REGEX = /url(?:\(['"]?)(.*?)(?:['"]?\))/;