fix: don’t call hasGlyphForCodePoint if font is null (#1270)

diegomura · May 22, 2021 · eb1a20a · eb1a20a
1 parent 235dc0a
commit eb1a20a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/layout/src/text/fontSubstitution.js b/packages/layout/src/text/fontSubstitution.js
@@ -20,9 +20,9 @@ const getOrCreateFont = name => {
 const getFallbackFont = () => getOrCreateFont('Helvetica');
 
 const shouldFallbackToFont = (codePoint, font) =>
-  !IGNORED_CODE_POINTS.includes(codePoint) &&
+  !font || (!IGNORED_CODE_POINTS.includes(codePoint) &&
   !font.hasGlyphForCodePoint(codePoint) &&
-  getFallbackFont().hasGlyphForCodePoint(codePoint);
+  getFallbackFont().hasGlyphForCodePoint(codePoint));
 
 const fontSubstitution = () => ({ string, runs }) => {
   let lastFont = null;

diff --git a/packages/layout/src/text/ignoreChars.js b/packages/layout/src/text/ignoreChars.js
@@ -5,7 +5,7 @@ const IGNORABLE_CODEPOINTS = [
 
 const buildSubsetForFont = font =>
   IGNORABLE_CODEPOINTS.reduce((acc, codePoint) => {
-    if (font.hasGlyphForCodePoint && font.hasGlyphForCodePoint(codePoint)) {
+    if (font && font.hasGlyphForCodePoint && font.hasGlyphForCodePoint(codePoint)) {
       return acc;
     }
     return [...acc, String.fromCharCode(codePoint)];