feat(textkit): expect font array (diegomura#3104)

Author: diegomura

src/svg/layoutText.ts

@@ -10,7 +10,6 @@ import layoutEngine, {
   textDecoration,
   fromFragments,
   Fragment,
-  Font,
 } from '@react-pdf/textkit';
 
 import transformText from '../text/transformText';
@@ -64,14 +63,11 @@ const getFragments = (fontStore: FontStore, instance) => {
   // Fallback font
   fontFamilies.push('Helvetica');
 
-  // TODO: Fix multiple fonts passed
   const font = fontFamilies.map((fontFamilyName) => {
-    if (typeof fontFamilyName !== 'string') return fontFamilyName;
-
     const opts = { fontFamily: fontFamilyName, fontWeight, fontStyle };
     const obj = fontStore.getFont(opts);
-    return obj ? obj.data : fontFamilyName;
-  }) as Font[];
+    return obj?.data;
+  });
 
   const attributes = {
     font,
@@ -98,7 +94,6 @@ const getFragments = (fontStore: FontStore, instance) => {
     if (isTextInstance(child)) {
       fragments.push({
         string: transformText(child.value, textTransform),
-        // @ts-expect-error custom font substitution engine deals with multiple fonts. unify with textkit
         attributes,
       });
     } else if (child) {

src/text/getAttributedString.ts

@@ -1,5 +1,5 @@
 import * as P from '@react-pdf/primitives';
-import { Font, Fragment, fromFragments } from '@react-pdf/textkit';
+import { Fragment, fromFragments } from '@react-pdf/textkit';
 import FontStore from '@react-pdf/font';
 
 import { embedEmojis } from './emoji';
@@ -65,14 +65,11 @@ const getFragments = (
   // Fallback font
   fontFamilies.push('Helvetica');
 
-  // TODO: Fix multiple fonts passed
   const font = fontFamilies.map((fontFamilyName) => {
-    if (typeof fontFamilyName !== 'string') return fontFamilyName;
-
     const opts = { fontFamily: fontFamilyName, fontWeight, fontStyle };
     const obj = fontStore.getFont(opts);
-    return obj ? obj.data : fontFamilyName;
-  }) as Font[];
+    return obj?.data;
+  });
 
   // Don't pass main background color to textkit. Will be rendered by the render package instead
   const backgroundColor = level === 0 ? null : instance.style.backgroundColor;
@@ -111,7 +108,6 @@ const getFragments = (
     if (isImage(child)) {
       fragments.push({
         string: String.fromCharCode(0xfffc),
-        // @ts-expect-error custom font substitution engine deals with multiple fonts. unify with textkit
         attributes: {
           ...attributes,
           attachment: {
@@ -124,7 +120,6 @@ const getFragments = (
     } else if (isTextInstance(child)) {
       fragments.push({
         string: transformText(child.value, textTransform),
-        // @ts-expect-error custom font substitution engine deals with multiple fonts. unify with textkit
         attributes,
       });
     } else if (child) {

src/text/ignoreChars.ts

@@ -19,7 +19,7 @@ const buildSubsetForFont = (font: Font) =>
 
 const ignoreChars = (fragments: Fragment[]): Fragment[] =>
   fragments.map((fragment) => {
-    const charSubset = buildSubsetForFont(fragment.attributes.font);
+    const charSubset = buildSubsetForFont(fragment.attributes.font[0]);
     const subsetRegex = new RegExp(charSubset.join('|'));
 
     return {