@pdfme/schemas 5.3.3-dev.4 → 5.3.3-dev.5

package/src/text/helper.ts

@@ -221,18 +221,16 @@ export const getSplittedLines = (textLine: string, calcValues: FontWidthCalcValu
  * Calculating space usage involves splitting lines where they exceed
  * the box width based on the proposed size.
  */
-export const calculateDynamicFontSize = async ({
+export const calculateDynamicFontSize = ({
   textSchema,
-  font,
+  fontKitFont,
   value,
   startingFontSize,
-  _cache,
 }: {
   textSchema: TextSchema;
-  font: Font;
+  fontKitFont: FontKitFont;
   value: string;
   startingFontSize?: number | undefined;
-  _cache: Map<any, any>;
 }) => {
   const {
     fontSize: schemaFontSize,
@@ -247,7 +245,6 @@ export const calculateDynamicFontSize = async ({
   if (dynamicFontSizeSetting.max < dynamicFontSizeSetting.min) return fontSize;
 
   const characterSpacing = schemaCharacterSpacing ?? DEFAULT_CHARACTER_SPACING;
-  const fontKitFont = await getFontKitFont(textSchema.fontName, font, _cache);
   const paragraphs = value.split('\n');
 
   let dynamicFontSize = fontSize;

package/src/text/pdfRender.ts

@@ -1,4 +1,5 @@
 import { PDFFont, PDFDocument } from '@pdfme/pdf-lib';
+import type { Font as FontKitFont } from 'fontkit';
 import type { TextSchema } from './types';
 import {
   PDFRenderProps,
@@ -60,21 +61,19 @@ const embedAndGetFontObj = async (arg: {
   return fontObj;
 };
 
-const getFontProp = async ({
+const getFontProp = ({
   value,
-  font,
+  fontKitFont,
   schema,
   colorType,
-  _cache,
 }: {
   value: string;
-  font: Font;
+  fontKitFont: FontKitFont;
   colorType?: ColorType;
   schema: TextSchema;
-  _cache: Map<any, any>;
 }) => {
   const fontSize = schema.dynamicFontSize
-    ? await calculateDynamicFontSize({ textSchema: schema, font, value, _cache })
+    ? calculateDynamicFontSize({ textSchema: schema, fontKitFont, value })
     : schema.fontSize ?? DEFAULT_FONT_SIZE;
   const color = hex2PrintingColor(schema.fontColor || DEFAULT_FONT_COLOR, colorType);
 
@@ -94,11 +93,11 @@ export const pdfRender = async (arg: PDFRenderProps<TextSchema>) => {
 
   const { font = getDefaultFont(), colorType } = options;
 
-  const [pdfFontObj, fontKitFont, fontProp] = await Promise.all([
+  const [pdfFontObj, fontKitFont] = await Promise.all([
     embedAndGetFontObj({ pdfDoc, font, _cache }),
     getFontKitFont(schema.fontName, font, _cache),
-    getFontProp({ value, font, schema, _cache, colorType }),
   ]);
+  const fontProp = getFontProp({ value, fontKitFont, schema, colorType });
 
   const { fontSize, color, alignment, verticalAlignment, lineHeight, characterSpacing } = fontProp;
 

package/src/text/uiRender.ts

@@ -69,10 +69,8 @@ export const uiRender = async (arg: UIRenderProps<TextSchema>) => {
     return text;
   };
   const font = options?.font || getDefaultFont();
-  const [fontKitFont, textBlock] = await Promise.all([
-    getFontKitFont(schema.fontName, font, _cache),
-    buildStyledTextContainer(arg, usePlaceholder ? placeholder : value),
-  ]);
+  const fontKitFont = await getFontKitFont(schema.fontName, font, _cache);
+  const textBlock = buildStyledTextContainer(arg, fontKitFont, usePlaceholder ? placeholder : value);
 
   const processedText = replaceUnsupportedChars(value, fontKitFont);
 
@@ -100,19 +98,16 @@ export const uiRender = async (arg: UIRenderProps<TextSchema>) => {
 
   if (schema.dynamicFontSize) {
     let dynamicFontSize: undefined | number = undefined;
-    const font = options?.font || getDefaultFont();
-    const fontKitFont = await getFontKitFont(schema.fontName, font, _cache);
 
     textBlock.addEventListener('keyup', () => {
       setTimeout(() => {
         void (async () => {
           if (!textBlock.textContent) return;
-          dynamicFontSize = await calculateDynamicFontSize({
+          dynamicFontSize = calculateDynamicFontSize({
             textSchema: schema,
-            font,
+            fontKitFont,
             value: getText(textBlock),
             startingFontSize: dynamicFontSize,
-            _cache,
           });
           textBlock.style.fontSize = `${dynamicFontSize}pt`;
 
@@ -155,23 +150,21 @@ export const uiRender = async (arg: UIRenderProps<TextSchema>) => {
   }
 };
 
-export const buildStyledTextContainer = async (arg: UIRenderProps<TextSchema>, value: string) => {
+export const buildStyledTextContainer = (arg: UIRenderProps<TextSchema>, fontKitFont: FontKitFont, value: string) => {
   const { schema, rootElement, mode, options, _cache } = arg;
   const font = options?.font || getDefaultFont();
 
   let dynamicFontSize: undefined | number = undefined;
 
   if (schema.dynamicFontSize && value) {
-    dynamicFontSize = await calculateDynamicFontSize({
+    dynamicFontSize = calculateDynamicFontSize({
       textSchema: schema,
-      font,
+      fontKitFont,
       value,
       startingFontSize: dynamicFontSize,
-      _cache,
     });
   }
 
-  const fontKitFont = await getFontKitFont(schema.fontName, font, _cache);
   // Depending on vertical alignment, we need to move the top or bottom of the font to keep
   // it within it's defined box and align it with the generated pdf.
   const { topAdj, bottomAdj } = getBrowserVerticalFontAdjustments(