@pdfme/schemas 5.3.3-dev.5 → 5.3.3

package/src/multiVariableText/uiRender.ts

@@ -1,4 +1,4 @@
-import { getDefaultFont, UIRenderProps } from '@pdfme/common';
+import { UIRenderProps } from '@pdfme/common';
 import { MultiVariableTextSchema } from './types';
 import {
   uiRender as parentUiRender,
@@ -6,7 +6,6 @@ import {
   makeElementPlainTextContentEditable
 } from '../text/uiRender';
 import { isEditable } from '../utils';
-import { getFontKitFont } from '../text/helper';
 import { substituteVariables } from './helper';
 
 export const uiRender = async (arg: UIRenderProps<MultiVariableTextSchema>) => {
@@ -66,8 +65,6 @@ const formUiRender = async (arg: UIRenderProps<MultiVariableTextSchema>) => {
     onChange,
     stopEditing,
     theme,
-    _cache,
-    options,
   } = arg;
   const rawText = schema.text;
 
@@ -79,10 +76,8 @@ const formUiRender = async (arg: UIRenderProps<MultiVariableTextSchema>) => {
   const variables: Record<string, string> = JSON.parse(value) || {}
   const variableIndices = getVariableIndices(rawText);
   const substitutedText = substituteVariables(rawText, variables);
-  const font = options?.font || getDefaultFont();
-  const fontKitFont = await getFontKitFont(schema.fontName, font, _cache);
 
-  const textBlock = buildStyledTextContainer(arg, fontKitFont, substitutedText);
+  const textBlock = await buildStyledTextContainer(arg, substitutedText);
 
   // Construct content-editable spans for each variable within the string
   let inVarString = false;

package/src/shapes/rectAndEllipse.ts

@@ -1,7 +1,6 @@
 import { Plugin, Schema, mm2pt } from '@pdfme/common';
 import { HEX_COLOR_PATTERN } from '../constants.js';
 import { hex2PrintingColor, convertForPdfLayoutProps, createSvgStr } from '../utils.js';
-import { toRadians } from '@pdfme/pdf-lib';
 import { Circle, Square } from 'lucide';
 
 interface ShapeSchema extends Schema {
@@ -58,8 +57,8 @@ const shape: Plugin<ShapeSchema> = {
       });
     } else if (schema.type === 'rectangle') {
       page.drawRectangle({
-        x: position.x + borderWidth * ((1 - Math.sin(toRadians(rotate))) / 2) + Math.tan(toRadians(rotate)) * (Math.PI ** 2),
-        y: position.y + borderWidth * ((1 + Math.sin(toRadians(rotate))) / 2) + Math.tan(toRadians(rotate)) * (Math.PI ** 2),
+        x: position.x + borderWidth / 2,
+        y: position.y + borderWidth / 2,
         width: width - borderWidth,
         height: height - borderWidth,
         ...drawOptions,

package/src/text/helper.ts

@@ -221,16 +221,18 @@ 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 = ({
+export const calculateDynamicFontSize = async ({
   textSchema,
-  fontKitFont,
+  font,
   value,
   startingFontSize,
+  _cache,
 }: {
   textSchema: TextSchema;
-  fontKitFont: FontKitFont;
+  font: Font;
   value: string;
   startingFontSize?: number | undefined;
+  _cache: Map<any, any>;
 }) => {
   const {
     fontSize: schemaFontSize,
@@ -245,6 +247,7 @@ export const calculateDynamicFontSize = ({
   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,5 +1,4 @@
 import { PDFFont, PDFDocument } from '@pdfme/pdf-lib';
-import type { Font as FontKitFont } from 'fontkit';
 import type { TextSchema } from './types';
 import {
   PDFRenderProps,
@@ -61,19 +60,21 @@ const embedAndGetFontObj = async (arg: {
   return fontObj;
 };
 
-const getFontProp = ({
+const getFontProp = async ({
   value,
-  fontKitFont,
+  font,
   schema,
   colorType,
+  _cache,
 }: {
   value: string;
-  fontKitFont: FontKitFont;
+  font: Font;
   colorType?: ColorType;
   schema: TextSchema;
+  _cache: Map<any, any>;
 }) => {
   const fontSize = schema.dynamicFontSize
-    ? calculateDynamicFontSize({ textSchema: schema, fontKitFont, value })
+    ? await calculateDynamicFontSize({ textSchema: schema, font, value, _cache })
     : schema.fontSize ?? DEFAULT_FONT_SIZE;
   const color = hex2PrintingColor(schema.fontColor || DEFAULT_FONT_COLOR, colorType);
 
@@ -93,11 +94,11 @@ export const pdfRender = async (arg: PDFRenderProps<TextSchema>) => {
 
   const { font = getDefaultFont(), colorType } = options;
 
-  const [pdfFontObj, fontKitFont] = await Promise.all([
+  const [pdfFontObj, fontKitFont, fontProp] = 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,8 +69,10 @@ export const uiRender = async (arg: UIRenderProps<TextSchema>) => {
     return text;
   };
   const font = options?.font || getDefaultFont();
-  const fontKitFont = await getFontKitFont(schema.fontName, font, _cache);
-  const textBlock = buildStyledTextContainer(arg, fontKitFont, usePlaceholder ? placeholder : value);
+  const [fontKitFont, textBlock] = await Promise.all([
+    getFontKitFont(schema.fontName, font, _cache),
+    buildStyledTextContainer(arg, usePlaceholder ? placeholder : value),
+  ]);
 
   const processedText = replaceUnsupportedChars(value, fontKitFont);
 
@@ -98,16 +100,19 @@ 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 = calculateDynamicFontSize({
+          dynamicFontSize = await calculateDynamicFontSize({
             textSchema: schema,
-            fontKitFont,
+            font,
             value: getText(textBlock),
             startingFontSize: dynamicFontSize,
+            _cache,
           });
           textBlock.style.fontSize = `${dynamicFontSize}pt`;
 
@@ -150,21 +155,23 @@ export const uiRender = async (arg: UIRenderProps<TextSchema>) => {
   }
 };
 
-export const buildStyledTextContainer = (arg: UIRenderProps<TextSchema>, fontKitFont: FontKitFont, value: string) => {
+export const buildStyledTextContainer = async (arg: UIRenderProps<TextSchema>, value: string) => {
   const { schema, rootElement, mode, options, _cache } = arg;
   const font = options?.font || getDefaultFont();
 
   let dynamicFontSize: undefined | number = undefined;
 
   if (schema.dynamicFontSize && value) {
-    dynamicFontSize = calculateDynamicFontSize({
+    dynamicFontSize = await calculateDynamicFontSize({
       textSchema: schema,
-      fontKitFont,
+      font,
       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(