@pdfme/schemas 5.3.13 → 5.3.14-dev.2

package/src/shapes/line.ts

@@ -1,4 +1,4 @@
-import type { Schema, Plugin, PDFRenderProps, UIRenderProps } from '@pdfme/common';
+import type { Schema, Plugin } from '@pdfme/common';
 import {
   rotatePoint,
   convertForPdfLayoutProps,
@@ -15,7 +15,7 @@ interface LineSchema extends Schema {
 }
 
 const lineSchema: Plugin<LineSchema> = {
-  pdf: (arg: PDFRenderProps<LineSchema>) => {
+  pdf: (arg) => {
     const { page, schema, options } = arg;
     if (schema.width === 0 || schema.height === 0 || !schema.color) return;
     const { colorType } = options;
@@ -36,7 +36,7 @@ const lineSchema: Plugin<LineSchema> = {
       opacity: opacity,
     });
   },
-  ui: (arg: UIRenderProps<LineSchema>) => {
+  ui: (arg) => {
     const { schema, rootElement } = arg;
     const div = document.createElement('div');
     div.style.backgroundColor = schema.color ?? 'transparent';

package/src/shapes/rectAndEllipse.ts

@@ -1,4 +1,4 @@
-import { Plugin, Schema, mm2pt, UIRenderProps, PDFRenderProps } from '@pdfme/common';
+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';
@@ -9,10 +9,11 @@ interface ShapeSchema extends Schema {
   borderWidth: number;
   borderColor: string;
   color: string;
+  radius?: number;
 }
 
 const shape: Plugin<ShapeSchema> = {
-  ui: (arg: UIRenderProps<ShapeSchema>) => {
+  ui: (arg) => {
     const { schema, rootElement } = arg;
     const div = document.createElement('div');
     div.style.width = '100%';
@@ -20,6 +21,8 @@ const shape: Plugin<ShapeSchema> = {
     div.style.boxSizing = 'border-box';
     if (schema.type === 'ellipse') {
       div.style.borderRadius = '50%';
+    } else if (schema.radius && schema.radius > 0) {
+      div.style.borderRadius = `${schema.radius}mm`;
     }
     div.style.borderWidth = `${schema.borderWidth ?? 0}mm`;
     div.style.borderStyle = schema.borderWidth && schema.borderColor ? 'solid' : 'none';
@@ -28,7 +31,7 @@ const shape: Plugin<ShapeSchema> = {
 
     rootElement.appendChild(div);
   },
-  pdf: (arg: PDFRenderProps<ShapeSchema>) => {
+  pdf: (arg) => {
     const { schema, page, options } = arg;
     if (!schema.color && !schema.borderColor) return;
     const { colorType } = options;
@@ -57,6 +60,8 @@ const shape: Plugin<ShapeSchema> = {
         ...drawOptions,
       });
     } else if (schema.type === 'rectangle') {
+      const radius = schema.radius ?? 0;
+      
       page.drawRectangle({
         x:
           position.x +
@@ -68,6 +73,7 @@ const shape: Plugin<ShapeSchema> = {
           Math.tan(toRadians(rotate)) * Math.PI ** 2,
         width: width - borderWidth,
         height: height - borderWidth,
+        ...(radius ? { radius: mm2pt(radius) } : {}),
         ...drawOptions,
       });
     }
@@ -78,8 +84,8 @@ const shape: Plugin<ShapeSchema> = {
         title: i18n('schemas.borderWidth'),
         type: 'number',
         widget: 'inputNumber',
-        props: { min: 0 },
-        step: 1,
+        props: { min: 0, step: 1 },
+        span: 12,
       },
       borderColor: {
         title: i18n('schemas.borderColor'),
@@ -89,6 +95,7 @@ const shape: Plugin<ShapeSchema> = {
           disabledAlpha: true,
         },
         rules: [{ pattern: HEX_COLOR_PATTERN, message: i18n('validation.hexColor') }],
+        span: 12,
       },
       color: {
         title: i18n('schemas.color'),
@@ -99,6 +106,13 @@ const shape: Plugin<ShapeSchema> = {
         },
         rules: [{ pattern: HEX_COLOR_PATTERN, message: i18n('validation.hexColor') }],
       },
+      radius: {
+        title: i18n('schemas.radius'),
+        type: 'number',
+        widget: 'inputNumber',
+        props: { min: 0, step: 1 },
+        span: 12,
+      },
     }),
     defaultSchema: {
       name: '',
@@ -112,6 +126,7 @@ const shape: Plugin<ShapeSchema> = {
       borderColor: '#000000',
       color: '',
       readOnly: true,
+      radius: 0,
     },
   },
 };

package/src/tables/cell.ts

@@ -1,10 +1,4 @@
-import {
-  DEFAULT_FONT_NAME,
-  Plugin,
-  PDFRenderProps,
-  UIRenderProps,
-  getFallbackFontName,
-} from '@pdfme/common';
+import { DEFAULT_FONT_NAME, Plugin, PDFRenderProps, getFallbackFontName } from '@pdfme/common';
 import { uiRender as textUiRender } from '../text/uiRender.js';
 import { pdfRender as textPdfRender } from '../text/pdfRender.js';
 import line from '../shapes/line.js';
@@ -60,7 +54,7 @@ const createLineDiv = (
 };
 
 const cellSchema: Plugin<CellSchema> = {
-  pdf: async (arg: PDFRenderProps<CellSchema>) => {
+  pdf: async (arg) => {
     const { schema } = arg;
     const { position, width, height, borderWidth, padding } = schema;
 
@@ -115,7 +109,7 @@ const cellSchema: Plugin<CellSchema> = {
       },
     });
   },
-  ui: async (arg: UIRenderProps<CellSchema>) => {
+  ui: async (arg) => {
     const { schema, rootElement } = arg;
     const { borderWidth, width, height, borderColor, backgroundColor } = schema;
     rootElement.style.backgroundColor = backgroundColor;