v2.5.5

Fixed issue introduced in v2.5.3
Aymkdn · Mar 12, 2024 · 212e42f · 212e42f
1 parent 9b1e22f
commit 212e42f
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 5 deletions.
diff --git a/browser.js b/browser.js
diff --git a/docs/browser-2.5.4.js b/docs/browser-2.5.4.js
diff --git a/docs/browser-2.5.5.js b/docs/browser-2.5.5.js
diff --git a/docs/index.html b/docs/index.html
@@ -116,7 +116,7 @@ <h1>HTML to PDFMake convertor</h1>
       <div id="pdf_ie" style="display:none;padding:3em">The PDF file is sent to you for download. Use a modern browser (like Chrome or Firefox) to display the PDF in this page.</div>
     </div>
   </div>
-  <script src="browser-2.5.4.js"></script>
+  <script src="browser-2.5.5.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/pdfmake@latest/build/pdfmake.min.js"></script>
   <script src="https://cdn.jsdelivr.net/npm/pdfmake@latest/build/vfs_fonts.js"></script>
   <script>

diff --git a/example.pdf b/example.pdf
diff --git a/index.js b/index.js
@@ -363,7 +363,7 @@ function htmlToPdfMake(htmlText, options) {
                     if ( tableHaveWidth ) {
                       // if table have defined widths we need to make a 
                       // rule of three to get cell's proportional width
-                      var cellPercentage = cellWidth === 'auto' ? tableWidth / cellsWidths.length : ( cellWidth.replace( '%', "" ) * tableWidth ) / 100;
+                      var cellPercentage = cellWidth === 'auto' ? tableWidth / row.length : ( cellWidth.replace( '%', "" ) * tableWidth ) / 100;
                       cellWidth = String(cellPercentage) + "%";
                     }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "html-to-pdfmake",
-  "version": "2.5.4",
+  "version": "2.5.5",
   "description": "Convert HTML code to PDFMake",
   "main": "index.js",
   "scripts": {

diff --git a/test/unit.js b/test/unit.js
@@ -1083,5 +1083,32 @@ test("unit tests", function(t) {
     t.finish();
   })
 
+  t.test("table (dynamic widths) 2",function(t) {
+    var html = `<table class="table table-condensed" style="width: 100%;"><thead><tr><th>ABC</th><th>DEF</th><th>GHI</th><th>KLM</th><th>NOP</th></tr></thead><tbody><tr><td>ABC1</td><td>DEF1</td><td>GHI1</td><td>50,00</td><td style="text-align: right;">17:45</td></tr><tr><td>ABC2</td><td>DEF2</td><td>GHI2</td><td>50,00</td><td style="text-align: right;">4:00</td></tr><tr><td colspan="4">Total</td><td style="text-align: right;">21:45</td></tr></tbody></table>`;
+    var ret = htmlToPdfMake(html, {
+      window:window,
+      tableAutoSize: true
+    });
+    if (debug) console.log(JSON.stringify(ret));
+    t.check(Array.isArray(ret) && ret.length===1, "return is OK");
+    ret = ret[0];
+
+    t.check(
+      ret.table &&
+      Array.isArray(ret.table.body) &&
+      ret.table.body.length === 4 &&
+      ret.table.body[0][0].text === "ABC" &&
+      ret.table.body[3][1].text === "" &&
+      ret.table.widths.length === 5 &&
+      ret.table.widths[0] === "20%" &&
+      ret.table.widths[1] === "20%" &&
+      ret.table.widths[2] === "20%" &&
+      ret.table.widths[3] === "20%" &&
+      ret.table.widths[4] === "20%",
+    "<table> (dynamic widths) 2");
+
+    t.finish();
+  })
+
   t.finish();
 })