Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[web] Fix scale #3031

Merged
merged 2 commits into from
Aug 7, 2024
Merged

[web] Fix scale #3031

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b82a94
Fix scales crash
m-bert Aug 6, 2024
26a19eb
Merge branch 'main' into @mbert/fix-scale-crash
m-bert Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions src/web/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,30 @@ export function calculateViewScale(view: HTMLElement) {
scaleY: 1,
};

const scales = styles.scale.split(' ');
// Get scales from scale property
if (styles.scale !== undefined && styles.scale !== 'none') {
const scales = styles.scale.split(' ');

if (scales[0] !== 'none') {
resultScales.scaleX = parseFloat(scales[0]);
}
if (scales[0]) {
j-piasecki marked this conversation as resolved.
Show resolved Hide resolved
resultScales.scaleX = parseFloat(scales[0]);
}

if (scales[1]) {
resultScales.scaleY = parseFloat(scales[1]);
resultScales.scaleY = scales[1]
j-piasecki marked this conversation as resolved.
Show resolved Hide resolved
? parseFloat(scales[1])
: parseFloat(scales[0]);
}

// Get scales from transform property
const matrixElements = new RegExp(/matrix\((.+)\)/).exec(
styles.transform
)?.[1];

if (!matrixElements) {
return resultScales;
}

const matrixElementsArray = matrixElements.split(', ');
if (matrixElements) {
const matrixElementsArray = matrixElements.split(', ');

resultScales.scaleX *= parseFloat(matrixElementsArray[0]);
resultScales.scaleY *= parseFloat(matrixElementsArray[3]);
resultScales.scaleX *= parseFloat(matrixElementsArray[0]);
resultScales.scaleY *= parseFloat(matrixElementsArray[3]);
}

return resultScales;
}
Loading