npm - html2canvas-pro - Versions diffs - 2.0.1 → 2.0.3 - Mend

html2canvas-pro 2.0.1 → 2.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

package/dist/html2canvas-pro.esm.js +46 -28
package/dist/html2canvas-pro.esm.js.map +1 -1
package/dist/html2canvas-pro.js +46 -28
package/dist/html2canvas-pro.js.map +1 -1
package/dist/html2canvas-pro.min.js +2 -2
package/dist/lib/css/property-descriptors/__tests__/image-rendering-integration.test.js +7 -6
package/dist/lib/css/property-descriptors/__tests__/image-rendering-integration.test.js.map +1 -1
package/dist/lib/dom/__tests__/dom-normalizer.test.js +6 -6
package/dist/lib/dom/__tests__/dom-normalizer.test.js.map +1 -1
package/dist/lib/dom/document-cloner.js +45 -27
package/dist/lib/dom/document-cloner.js.map +1 -1
package/karma.conf.cjs +6 -1
package/package.json +5 -4

package/dist/html2canvas-pro.esm.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /*!
- * html2canvas-pro 2.0.1 <https://yorickshan.github.io/html2canvas-pro/>
+ * html2canvas-pro 2.0.3 <https://yorickshan.github.io/html2canvas-pro/>
  * Copyright (c) 2024-present yorickshan and html2canvas-pro contributors
  * Released under MIT License
  */
@@ -6586,41 +6586,56 @@ class DocumentCloner {
             return iframe;
         });
         /**
-         * The baseURI of the document will be lost after documentClone.open().
-         * We save it before open() to preserve the original base URI for resource resolution.
-         * */
-        const baseUri = documentClone.baseURI;
+         * The base URI used for resolving relative URLs (e.g. background-image) in the clone.
+         * Must come from the source document: the iframe document is about:blank, so
+         * documentClone.baseURI would break getComputedStyle() for relative background URLs.
+         */
+        const baseUri = ownerDocument.baseURI;
         documentClone.open();
+        const rawHTML = serializeDoctype(document.doctype) + '<html></html>';
         try {
-            // fixing "This document requires 'TrustedHTML' assignment. The action has been blocked." error
-            // @ts-ignore
-            const policy = trustedTypes.createPolicy('my-policy', {
-                createHTML: (string) => string
-            });
-            const rawHTML = serializeDoctype(document.doctype) + '<html></html>';
-            const trustedHTML = policy.createHTML(rawHTML);
-            documentClone.write(trustedHTML);
+            // Fixing "This document requires 'TrustedHTML' assignment. The action has been blocked." error.
+            // Reuse existing policy when present (e.g. second html2canvas call) to avoid createPolicy duplicate-name throw.
+            const ownerWindow = this.referenceElement.ownerDocument?.defaultView;
+            const trustedTypesFactory = ownerWindow && ownerWindow.trustedTypes;
+            let policy = trustedTypesFactory?.getPolicy?.('html2canvas-pro');
+            if (!policy && trustedTypesFactory) {
+                policy = trustedTypesFactory.createPolicy('html2canvas-pro', {
+                    createHTML: (string) => string
+                });
+            }
+            if (policy) {
+                documentClone.write(policy.createHTML(rawHTML));
+            }
+            else {
+                documentClone.write(rawHTML);
+            }
         }
-        catch (e) {
-            // if browser does not support trustedTypes
-            documentClone.write(serializeDoctype(document.doctype) + '<html></html>');
+        catch (_e) {
+            documentClone.write(rawHTML);
         }
         // Chrome scrolls the parent document for some reason after the write to the cloned window???
         restoreOwnerScroll(this.referenceElement.ownerDocument, scrollX, scrollY);
         /**
-         * Note: adoptNode() should be called AFTER documentClone.open() and close()
+         * IMPORTANT: documentClone.close() MUST be called BEFORE adoptNode().
+         *
+         * In Chrome, calling adoptNode() while the document is still "open"
+         * (between document.open() and document.close()) causes CSS rules with
+         * uppercase characters in class names (e.g. ".MyClass") to not match
+         * correctly. Chrome's CSS engine only enters a fully-resolved matching
+         * mode once the document is closed.
          *
-         * In Chrome, calling adoptNode() before or during open/write may cause
-         * styles with uppercase characters in class names (e.g. ".MyClass") to not apply correctly.
+         * Correct order: open() → write() → close() → adoptNode() → replaceChild()
          *
-         * Fix:
-         *   - Make sure adoptNode() is called after documentClone.open() and close()
-         *   - This allows Chrome to properly match and apply all CSS rules including mixed-case class selectors.
-         * */
+         * Timing: close() queues the iframe 'load' event; because JS is single-threaded,
+         * the synchronous adoptNode() and replaceChild() below complete before that
+         * event is dispatched. iframeLoader's setInterval will therefore see the body
+         * already populated on its first tick.
+         */
+        documentClone.close();
         const adoptedNode = documentClone.adoptNode(this.documentElement);
         addBase(adoptedNode, baseUri);
         documentClone.replaceChild(adoptedNode, documentClone.documentElement);
-        documentClone.close();
         return iframeLoad;
     }
     createElementClone(node) {
@@ -7149,13 +7164,16 @@ const serializeDoctype = (doctype) => {
             str += doctype.name;
         }
         if (doctype.internalSubset) {
-            str += doctype.internalSubset;
+            str += ' ' + doctype.internalSubset.replace(/"/g, '&quot;').replace(/>/g, '&gt;');
         }
         if (doctype.publicId) {
-            str += `"${doctype.publicId}"`;
+            str += ' PUBLIC "' + doctype.publicId.replace(/"/g, '&quot;') + '"';
+            if (doctype.systemId) {
+                str += ' "' + doctype.systemId.replace(/"/g, '&quot;') + '"';
+            }
         }
-        if (doctype.systemId) {
-            str += `"${doctype.systemId}"`;
+        else if (doctype.systemId) {
+            str += ' SYSTEM "' + doctype.systemId.replace(/"/g, '&quot;') + '"';
         }
         str += '>';
     }