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.

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

perf: embed only used fonts #476

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 34 additions & 4 deletions src/embed-webfonts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,16 +202,46 @@
return getWebFontRules(cssRules)
}

function normalizeFontFamily(font: string) {
return font.trim().replace(/["']/g, '')
}

function getUsedFonts(node: HTMLElement) {
const fonts = new Set<string>()
function traverse(node: HTMLElement) {
const fontFamily =
node.style.fontFamily || getComputedStyle(node).fontFamily
fontFamily.split(',').forEach((font) => {
fonts.add(normalizeFontFamily(font))
})

Array.from(node.children).forEach((child) => {
if (child instanceof HTMLElement) {
traverse(child)
}
})
}
traverse(node)
return fonts
}

export async function getWebFontCSS<T extends HTMLElement>(
node: T,
options: Options,
): Promise<string> {
const rules = await parseWebFontRules(node, options)
const usedFonts = getUsedFonts(node)
const cssTexts = await Promise.all(
rules.map((rule) => {
const baseUrl = rule.parentStyleSheet ? rule.parentStyleSheet.href : null
return embedResources(rule.cssText, baseUrl, options)
}),
rules
.filter((rule) =>
usedFonts.has(normalizeFontFamily(rule.style.fontFamily)),
)

Check warning on line 238 in src/embed-webfonts.ts

View check run for this annotation

Codecov / codecov/patch

src/embed-webfonts.ts#L238

Added line #L238 was not covered by tests
.map((rule) => {
const baseUrl = rule.parentStyleSheet
? rule.parentStyleSheet.href
: null
return embedResources(rule.cssText, baseUrl, options)
}),
)

return cssTexts.join('\n')
Expand Down
1 change: 1 addition & 0 deletions test/resources/fonts/web-fonts/empty.html
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<div style="font-family: Font1"></div>
Copy link
Author

@tuhm1 tuhm1 Sep 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added this line because we must use the font which will be tested in:

it('should embed only the preferred font', (done) => {
bootstrap('fonts/web-fonts/empty.html', 'fonts/web-fonts/remote.css')
.then((node) => toSvg(node, { preferredFontFormat: 'woff2' }))
.then(getSvgDocument)
.then((doc) => {
const [style] = Array.from(doc.getElementsByTagName('style'))
expect(style.textContent).toMatch(/url\([^)]+\) format\("woff2"\)/)
expect(style.textContent).not.toMatch(/url\([^)]+\) format\("woff"\)/)
})
.then(done)
.catch(done)
})

107 changes: 107 additions & 0 deletions test/spec/webfont.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
import * as htmlToImage from '../../src'
import { getSvgDocument } from './helper'

describe('font embedding', () => {
describe('should embed only used fonts', () => {
it('should embed 1 font when use 1', async () => {
const root = document.createElement('div')
document.body.append(root)
try {
root.innerHTML = `
<style>
@font-face {
font-family: 'Font 0';
src: url('https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2');
}
@font-face {
font-family: 'Font 1';
src: url('https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2');
}
@font-face {
font-family: 'Font 2';
src: url('https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2');
}
</style>
<p style="font-family: 'Font 1'">Hello world</p>
`
const svg = await htmlToImage.toSvg(root)
const doc = await getSvgDocument(svg)
const [style] = Array.from(doc.getElementsByTagName('style'))
expect(style.textContent).toContain('Font 1')
expect(style.textContent).not.toContain('Font 0')
expect(style.textContent).not.toContain('Font 2')
} finally {
root.remove()
}
})
it('should embed 2 fonts when use 2', async () => {
const root = document.createElement('div')
document.body.append(root)
try {
root.innerHTML = `
<style>
@font-face {
font-family: 'Font 0';
src: url('https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2');
}
@font-face {
font-family: 'Font 1';
src: url('https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2');
}
@font-face {
font-family: 'Font 2';
src: url('https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2');
}
</style>
<p style="font-family: 'Font 0'">Hello world</p>
<p style="font-family: 'Font 2'">Hello world</p>
`
const svg = await htmlToImage.toSvg(root)
const doc = await getSvgDocument(svg)
const [style] = Array.from(doc.getElementsByTagName('style'))
expect(style.textContent).toContain('Font 0')
expect(style.textContent).toContain('Font 2')
expect(style.textContent).not.toContain('Font 1')
} finally {
root.remove()
}
})
it('should embed font used by deeply nested child', async () => {
const root = document.createElement('div')
document.body.append(root)
try {
root.innerHTML = `
<style>
@font-face {
font-family: 'Font 0';
src: url('https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2');
}
@font-face {
font-family: 'Font 1';
src: url('https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2');
}
@font-face {
font-family: 'Font 2';
src: url('https://fonts.gstatic.com/s/roboto/v30/KFOmCnqEu92Fr1Mu72xKKTU1Kvnz.woff2');
}
</style>
<div>
<div>
<div>
<div style="font-family: 'Font 1'">Hello world</div>
</div>
</div>
</div>
`
const svg = await htmlToImage.toSvg(root)
const doc = await getSvgDocument(svg)
const [style] = Array.from(doc.getElementsByTagName('style'))
expect(style.textContent).toContain('Font 1')
expect(style.textContent).not.toContain('Font 0')
expect(style.textContent).not.toContain('Font 2')
} finally {
root.remove()
}
})
})
})
Loading