2.4.15

Aymkdn · Jan 24, 2023 · 9c4a5a2 · 9c4a5a2
1 parent 5ea1b13
commit 9c4a5a2
Show file tree

Hide file tree

Showing 8 changed files with 911 additions and 890 deletions.
diff --git a/browser.js b/browser.js
diff --git a/docs/browser-2.4.14.js b/docs/browser-2.4.14.js
diff --git a/docs/browser-2.4.15.js b/docs/browser-2.4.15.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.4.14.js"></script>
+  <script src="browser-2.4.15.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
@@ -456,20 +456,26 @@ function htmlToPdfMake(htmlText, options) {
             break;
           }
           case "A": {
-            // the link must be applied to the deeper `text`
+            // the link must be applied to the deeper `text` or stacked element (e.g. `image`)
             var setLink = function(pointer, href) {
               pointer = pointer || {text:''}; // for link without any text
               if (Array.isArray(pointer.text)) {
                 return setLink(pointer.text[0], href);
+              } else if (Array.isArray(pointer.stack)) {
+                // if we have a more complex layer
+                pointer.stack = pointer.stack.map(function(stack) {
+                  return setLink(stack, href);
+                });
+                return pointer;
               }
               // if 'href' starts with '#' then it's an internal link
               if (href.indexOf('#') === 0) pointer.linkToDestination=href.slice(1);
               else pointer.link = href;
-              pointer.nodeName = "A";
               return pointer;
             }
             if (element.getAttribute("href")) {
               ret = setLink(ret, element.getAttribute("href"));
+              ret.nodeName = "A";
             }
             break;
           }

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