Skip to content

fix: font face descriptors in chrome 38 #490

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

Merged
merged 4 commits into from
Jan 23, 2025
Merged

fix: font face descriptors in chrome 38 #490

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fbdfe5
fix: font face descriptors in chrome 38
pecoram Jan 21, 2025
23b4c2b
fix: var
pecoram Jan 22, 2025
c561874
fix: compatibily
pecoram Jan 23, 2025
e23e750
Merge branch 'main' into fix/font-face-chrome38
wouterlucas Jan 23, 2025
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
11 changes: 8 additions & 3 deletions src/core/text-rendering/font-face-types/WebTrFontFace.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export class WebTrFontFace extends TrFontFace {
const determinedDescriptors = this.descriptors;

// Convert TrFontFaceDescriptors to CSS FontFaceDescriptors
const cssDescriptors: FontFaceDescriptors = {
let cssDescriptors: FontFaceDescriptors = {
style: determinedDescriptors.style,
weight:
typeof determinedDescriptors.weight === 'number'
Expand All @@ -61,6 +61,13 @@ export class WebTrFontFace extends TrFontFace {
display: determinedDescriptors.display,
};

for (const k in cssDescriptors) {
const key = k as keyof FontFaceDescriptors;
if (cssDescriptors[key] === undefined) {
delete cssDescriptors[key];
}
}

const fontFace = new FontFace(
fontFamily,
`url(${fontUrlWithoutParentheses})`,
Expand All @@ -71,14 +78,12 @@ export class WebTrFontFace extends TrFontFace {
fontFace
.load()
.then(() => {
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
(this.loaded as boolean) = true;
this.emit('loaded');
})
.catch(console.error);
} else {
// Default font
// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
(this.loaded as boolean) = true;
this.emit('loaded');
}
Expand Down
Loading