pols-pdf 1.1.2 → 1.1.3

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import pdfkit from 'pdfkit';
 export type PBoundParams = number | {
     top?: number;
     bottom?: number;
@@ -154,7 +155,7 @@ export declare class PPdf {
     private static readonly lineHeightCache;
     private cursor;
     private configPage;
-    private engine;
+    engine: typeof pdfkit;
     template?: () => void;
     private currentFont;
     get title(): string;

package/dist/index.js

@@ -6,6 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PPdf = void 0;
 const pdfkit_1 = __importDefault(require("pdfkit"));
 const pols_utils_1 = require("pols-utils");
+const calculateWidth = ({ width, left, pdf }) => {
+    if (width == null || width == 'auto') {
+        return pdf.engine.page.width - pdf.engine.page.margins.right - (left ?? pdf.getCursorLeftPosition());
+    }
+    else if (width == 'full') {
+        return pdf.engine.page.width - pdf.engine.page.margins.right - pdf.engine.page.margins.left;
+    }
+    else {
+        return width;
+    }
+};
 class PPdf {
     /* Cachés de métricas de fuente, compartidas por todas las instancias: widthOfString/heightOfString
     de pdfkit son funciones puras de (fuente, carácter) — el mismo par siempre da el mismo resultado —,
@@ -168,17 +179,11 @@ class PPdf {
         return this.engine;
     }
     table(params) {
-        const width = (() => {
-            if (params.width == null || params.width == 'auto') {
-                return this.engine.page.width - this.engine.page.margins.right - (params.left ?? this.cursor.left);
-            }
-            else if (params.width == 'full') {
-                return this.engine.page.width - this.engine.page.margins.right - this.engine.page.margins.left;
-            }
-            else {
-                return params.width;
-            }
-        })();
+        const width = calculateWidth({
+            width: params.width,
+            left: params.left,
+            pdf: this,
+        });
         const left = params.left ?? this.cursor.left;
         const top = params.top ?? this.cursor.top;
         const padding = this.prepareBoundValues(params.padding);
@@ -673,7 +678,12 @@ class PPdf {
         this.setCursorTopPosition(params.top + params.height);
     }
     cell(params) {
-        let paramsToDraw = params;
+        const width = calculateWidth({
+            width: params.width,
+            left: params.left,
+            pdf: this
+        });
+        let paramsToDraw = { ...params, width };
         while (paramsToDraw) {
             const prepared = this.prepareCell(paramsToDraw);
             this.drawCell(prepared.currentPage);

package/package.json

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