fix: cssRule.style.fontFamily null safe (close #14)

qq15725 · Mar 18, 2023 · b8ca4d4 · b8ca4d4 · vercel · Mar 18, 2023
1 parent 13247fc
commit b8ca4d4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/clone-node.ts b/src/clone-node.ts
@@ -97,9 +97,10 @@ export async function cloneNode<T extends Node>(
       applyCssStyleWithOptions(cloneStyle, context)
     }
 
-    if (cloneStyle.fontFamily) {
-      cloneStyle.fontFamily.split(',').forEach(val => fontFamilies.add(val))
-    }
+    cloneStyle.getPropertyValue('font-family')
+      .split(',')
+      .filter(Boolean)
+      .forEach(val => fontFamilies.add(val))
 
     copyPseudoContent(node, clone, ownerWindow)
 

diff --git a/src/embed-web-font.ts b/src/embed-web-font.ts
@@ -78,7 +78,10 @@ export async function embedWebFont<T extends Element>(
       .filter(cssRule => (
         isCssFontFaceRule(cssRule)
         && hasCssUrl(cssRule.style.getPropertyValue('src'))
-        && cssRule.style.fontFamily.split(',').some(val => fontFamilies.has(val))
+        && cssRule.style.getPropertyValue('font-family')
+          .split(',')
+          .filter(Boolean)
+          .some(val => fontFamilies.has(val))
       ))
       .forEach((value) => {
         const rule = value as CSSFontFaceRule