refactor(pdfkit): remove encode glyphs font methods (#3333)

Author: diegomura

.changeset/sixty-jeans-hug.md

@@ -0,0 +1,6 @@
+---
+"@react-pdf/pdfkit": major
+"@react-pdf/render": patch
+---
+
+refactor(pdfkit): remove encode glyphs font methods

packages/pdfkit/src/font/embedded.js

@@ -117,24 +117,6 @@ const createEmbeddedFont = (PDFFont) =>
       return [res, positions];
     }
 
-    encodeGlyphs(glyphs) {
-      const res = [];
-      for (let i = 0; i < glyphs.length; i++) {
-        const glyph = glyphs[i];
-        const gid = this.subset.includeGlyph(glyph.id);
-        res.push(`0000${gid.toString(16)}`.slice(-4));
-
-        if (this.widths[gid] == null) {
-          this.widths[gid] = glyph.advanceWidth * this.scale;
-        }
-        if (this.unicode[gid] == null) {
-          this.unicode[gid] = glyph.codePoints;
-        }
-      }
-
-      return res;
-    }
-
     widthOfString(string, size, features) {
       const width = this.layout(string, features, true).advanceWidth;
       const scale = size / 1000;

packages/pdfkit/src/font/standard.js

@@ -50,16 +50,6 @@ const createStandardFont = (PDFFont) =>
       return [encoded, positions];
     }
 
-    encodeGlyphs(glyphs) {
-      const res = [];
-
-      for (let glyph of Array.from(glyphs)) {
-        res.push(`00${glyph.id.toString(16)}`.slice(-2));
-      }
-
-      return res;
-    }
-
     widthOfString(string, size) {
       const glyphs = this.font.glyphsForString(`${string}`);
       const advances = this.font.advancesForGlyphs(glyphs);

packages/render/src/operations/encodeGlyphs.ts

@@ -0,0 +1,35 @@
+import { Glyph } from '@react-pdf/textkit';
+
+const encodeGlyphs = (font: any, glyphs: Glyph[]) => {
+  // Embedded font path (has font subset)
+  if (font.subset) {
+    const res: string[] = [];
+
+    for (let i = 0; i < glyphs.length; i++) {
+      const glyph = glyphs[i];
+      const gid = font.subset.includeGlyph(glyph.id);
+      res.push(`0000${gid.toString(16)}`.slice(-4));
+
+      if (font.widths[gid] == null) {
+        font.widths[gid] = glyph.advanceWidth * font.scale;
+      }
+
+      if (font.unicode[gid] == null) {
+        font.unicode[gid] = glyph.codePoints;
+      }
+    }
+
+    return res;
+  }
+
+  // Standard font path
+  const res: string[] = [];
+
+  for (const glyph of glyphs) {
+    res.push(`00${glyph.id.toString(16)}`.slice(-2));
+  }
+
+  return res;
+};
+
+export default encodeGlyphs;

packages/render/src/primitives/renderGlyphs.ts

@@ -2,6 +2,7 @@
 
 import { Glyph, Position } from '@react-pdf/textkit';
 import { Context } from '../types';
+import encodeGlyphs from '../operations/encodeGlyphs';
 
 const number = (n: number) => {
   if (n > -1e21 && n < 1e21) {
@@ -13,7 +14,7 @@ const number = (n: number) => {
 
 const _renderGlyphs = (
   ctx: Context,
-  encoded: Glyph[],
+  encoded: string[],
   positions: Position[],
   x: number,
   y: number,
@@ -122,7 +123,7 @@ const renderGlyphs = (
   const advanceWidthScale = 1000 / unitsPerEm;
 
   // Glyph encoding and positioning
-  const encodedGlyphs = ctx._font.encodeGlyphs(glyphs);
+  const encodedGlyphs = encodeGlyphs(ctx._font, glyphs);
   const encodedPositions = positions.map((pos, i) => ({
     xAdvance: pos.xAdvance * scale,
     yAdvance: pos.yAdvance * scale,