Skip to content

fixed issue with @font-face fonts downloaded every time even if they … #472

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed issue with @font-face fonts downloaded every time even if they … #472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 43 additions & 16 deletions src/dom-to-image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@
}

function embedFonts(node) {
return fontFaces.resolveAll()

return fontFaces.resolveAll(node)
.then(function (cssText) {
var styleNode = document.createElement('style');
node.appendChild(styleNode);
Expand Down Expand Up @@ -643,8 +644,8 @@
}
};

function resolveAll() {
return readAll(document)
function resolveAll(node) {
return readAll(node)
.then(function (webFonts) {
return Promise.all(
webFonts.map(function (webFont) {
Expand All @@ -657,14 +658,19 @@
});
}

function readAll() {
return Promise.resolve(util.asArray(document.styleSheets))
function readAll(node) {
return Promise.resolve(util.asArray(document.styleSheets))
.then(getCssRules)
.then(selectWebFontRules)
.then(function (rules) {
return rules.map(newWebFont);
});
return Promise.resolve(getAllFontFamilies(node)).then(function (nodeFonts){
return rules.filter(function (rule) {
return nodeFonts.includes(rule.style.fontFamily);
}).map(newWebFont);

})
});
}
function selectWebFontRules(cssRules) {
return cssRules
.filter(function (rule) {
Expand All @@ -688,17 +694,38 @@
}

function newWebFont(webFontRule) {
return {
resolve: function resolve() {
var baseUrl = (webFontRule.parentStyleSheet || {}).href;
return inliner.inlineAll(webFontRule.cssText, baseUrl);
},
src: function () {
return webFontRule.style.getPropertyValue('src');
return {
resolve: function resolve() {
var baseUrl = (webFontRule.parentStyleSheet || {}).href;
return inliner.inlineAll(webFontRule.cssText, baseUrl);
},
src: function () {
return webFontRule.style.getPropertyValue('src');
}
};
}

function getAllFontFamilies(node) {
const fontFamilies = new Set();

// Recursive function to traverse the node's descendants
function traverse(node) {
if (node.nodeType === Node.ELEMENT_NODE) {
const fontFamily = node.style.fontFamily
if (fontFamily) {
// Split the font-family property to handle multiple fonts in a declaration
const families = fontFamily.split(',').map(family => family.trim().replace(/['"]/g, ''));
families.forEach(family => fontFamilies.add(family));
}
// Recursively call the function for child nodes
for (let i = 0; i < node.childNodes.length; i++) {
traverse(node.childNodes[i]);
}
}
};
}
traverse(node);
return Array.from(fontFamilies);
}
}
}

function newImages() {
Expand Down