fix: available Font Family Regression (#2731)

diegomura · Apr 29, 2024 · ee126d6 · ee126d6 · TomasSalas · May 15, 2024
1 parent 6bf9d99
commit ee126d6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/packages/examples/src/fontFamilyFallback/index.jsx b/packages/examples/src/fontFamilyFallback/index.jsx
@@ -16,8 +16,13 @@ const styles = StyleSheet.create({
   },
   regular: {
     fontFamily: ['Roboto', 'NotoSansArabic'],
+    fontSize: '14',
     fontWeight: 900,
   },
+  default: {
+    fontFamily: ['Courier-Bold', 'NotoSansArabic'],
+    fontSize: '14',
+  },
 });
 
 Font.register({
@@ -43,7 +48,19 @@ Font.register({
 const MyDoc = () => {
   return (
     <Page style={styles.body}>
-      <Text style={styles.regular}>Test امتحان</Text>
+      <Text style={{ fontFamily: 'Courier', marginBottom: '10px' }}>
+        This font is default Courier
+      </Text>
+      <Text style={{ fontSize: 10 }}>
+        The following is partially Roboto and Noto Sans Arabic
+      </Text>
+      <Text style={[styles.regular, { marginBottom: '10px' }]}>
+        Roboto / امتحان
+      </Text>
+      <Text style={{ fontSize: 10 }}>
+        The following is partially Courier-Bold and Noto Sans Arabic
+      </Text>
+      <Text style={styles.default}>Courier-Bold / امتحان</Text>
     </Page>
   );
 };

diff --git a/packages/layout/src/text/fontSubstitution.js b/packages/layout/src/text/fontSubstitution.js
@@ -51,10 +51,9 @@ const fontSubstitution =
     for (let i = 0; i < runs.length; i += 1) {
       const run = runs[i];
 
-      const defaultFont =
-        typeof run.attributes.font === 'string'
-          ? getOrCreateFont(run.attributes.font)
-          : run.attributes.font;
+      const defaultFont = run.attributes.font.map((font) =>
+        typeof font === 'string' ? getOrCreateFont(font) : font,
+      );
 
       if (string.length === 0) {
         res.push({ start: 0, end: 0, attributes: { font: defaultFont } });
@@ -67,11 +66,7 @@ const fontSubstitution =
         const char = chars[j];
         const codePoint = char.codePointAt();
         // If the default font does not have a glyph and the fallback font does, we use it
-        const font = pickFontFromFontStack(
-          codePoint,
-          run.attributes.font,
-          lastFont,
-        );
+        const font = pickFontFromFontStack(codePoint, defaultFont, lastFont);
         const fontSize = getFontSize(run);
 
         // If anything that would impact res has changed, update it