pols-pdf 1.1.0 → 1.1.2

package/dist/index.d.ts

@@ -4,24 +4,12 @@ export type PBoundParams = number | {
     left?: number;
     right?: number;
 };
-export type PBound = {
-    top: number;
-    bottom: number;
-    left: number;
-    right: number;
-};
 export type PRadiusParams = number | {
     leftTop?: number;
     rightTop?: number;
     rightBottom?: number;
     leftBottom?: number;
 };
-export type PRadius = {
-    leftTop: number;
-    rightTop: number;
-    rightBottom: number;
-    leftBottom: number;
-};
 export type PBorderParams = boolean | {
     leftTop?: boolean;
     top?: boolean;
@@ -32,16 +20,6 @@ export type PBorderParams = boolean | {
     leftBottom?: boolean;
     left?: boolean;
 };
-export type PBorder = {
-    leftTop: boolean;
-    top: boolean;
-    rightTop: boolean;
-    right: boolean;
-    rightBottom: boolean;
-    bottom: boolean;
-    leftBottom: boolean;
-    left: boolean;
-};
 export type PBorderColorParams = string | {
     top?: string;
     rightTop?: string;
@@ -52,16 +30,6 @@ export type PBorderColorParams = string | {
     left?: string;
     leftTop?: string;
 };
-export type PBorderColor = {
-    top: string;
-    rightTop: string;
-    right: string;
-    rightBottom: string;
-    bottom: string;
-    leftBottom: string;
-    left: string;
-    leftTop: string;
-};
 export type PPage = {
     size: 'A4' | 'LETTER';
     layout: 'portrait' | 'landscape';
@@ -119,31 +87,6 @@ export type PTextParams = {
     chars: string;
     font?: Partial<PFontParams>;
 };
-type PLetter = {
-    char: string;
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-    font: PFont;
-};
-export type PCell = {
-    letters: PLetter[];
-    left: number;
-    top: number;
-    height: number;
-    width: number;
-    padding: PBound;
-    border: PBorder;
-    radius: PRadius;
-    stroke?: {
-        width?: number;
-        color?: PBorderColorParams;
-    };
-    fillColor?: string;
-    hAlign?: 'left' | 'center' | 'right';
-    vAlign?: 'top' | 'center' | 'bottom';
-};
 export type PCellParams = {
     text: null | undefined | number | string | PTextParams | PTextParams[];
     left?: number;
@@ -165,24 +108,8 @@ export type PCellParams = {
 } & ({
     height: number;
 } | {
-    autojump: true | undefined;
+    autojump?: boolean;
 });
-export type PRow = {
-    cells: Omit<PCell, 'autojump'>[];
-    gap?: number;
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-    padding: PBound;
-    border: PBorder;
-    radius: PRadius;
-    stroke?: {
-        width?: number;
-        color?: PBorderColorParams;
-    };
-    fillColor?: string;
-};
 export type PRowParams = {
     cells: (Omit<PCellParams, 'width' | 'left' | 'top' | 'height' | 'autojump'> & ({
         width: number;
@@ -222,22 +149,6 @@ export type PTableParams = {
     width?: 'full' | 'auto' | number;
     autojump?: boolean;
 };
-export type PTable = {
-    rows: PRow[];
-    gap?: number;
-    left: number;
-    top: number;
-    width: number;
-    height: number;
-    padding: PBound;
-    border: PBorder;
-    radius: PRadius;
-    stroke?: {
-        width?: number;
-        color?: PBorderColorParams;
-    };
-    fillColor?: string;
-};
 export declare class PPdf {
     private static readonly charWidthCache;
     private static readonly lineHeightCache;
@@ -290,5 +201,4 @@ export declare class PPdf {
     private prepareBorderValues;
     private prepareBorderColorValues;
 }
-export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -204,8 +204,8 @@ class PPdf {
                 left: left + padding.left,
                 top: cursorTop,
                 width: usefulWidth,
-                font: params.font,
-                autojump: (params.autojump ?? true) ? true : undefined
+                font: { ...params.font, ...rowToDraw.font },
+                autojump: params.autojump ?? true
             });
             if (preparedRow.currentPage.cells.some(cell => cell.letters?.length)) {
                 buffer.rows.push(preparedRow.currentPage);
@@ -304,8 +304,8 @@ class PPdf {
                 left: cursorLeft,
                 top: top + padding.top,
                 width: cellWidth,
-                font: cell.font ?? params.font,
-                autojump: (params.autojump ?? true) ? true : undefined,
+                font: { ...params.font, ...cell.font },
+                autojump: params.autojump ?? true,
                 complete: params.complete
             });
             response.currentPage.cells.push(preparedCell.currentPage);
@@ -578,7 +578,7 @@ class PPdf {
             if (!firstLetterOfLine)
                 continue;
             /* Si la letra se desborda, se crea un nuevo párrafo */
-            if ('autojump' in params && currentParagraph != 'nextPage' && firstLetterOfLine.top + firstLetterOfLine.height + padding.bottom > (this.engine.page.height - this.engine.page.margins.bottom)) {
+            if (!('height' in params) && (params.autojump ?? true) && currentParagraph != 'nextPage' && firstLetterOfLine.top + firstLetterOfLine.height + padding.bottom > (this.engine.page.height - this.engine.page.margins.bottom)) {
                 if (params.complete) {
                     paragraphs.nextPage = paragraphs.currentPage;
                     paragraphs.currentPage = [];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pols-pdf",
-	"version": "1.1.0",
+	"version": "1.1.2",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
 	"scripts": {