npm - html2canvas-pro - Versions diffs - 2.1.0 → 2.2.0 - Mend

html2canvas-pro 2.1.0 → 2.2.0

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 (266) hide show

package/dist/html2canvas-pro.esm.js +10226 -10526
package/dist/html2canvas-pro.esm.js.map +1 -1
package/dist/html2canvas-pro.js +10869 -11171
package/dist/html2canvas-pro.js.map +1 -1
package/dist/html2canvas-pro.min.js +8 -8
package/dist/lib/config.js +0 -22
package/dist/lib/core/cache-storage.js +3 -40
package/dist/lib/core/constants.js +25 -0
package/dist/lib/core/context.js +1 -0
package/dist/lib/core/features.js +3 -2
package/dist/lib/core/validator.js +3 -3
package/dist/lib/css/grouped/background-styles.js +36 -0
package/dist/lib/css/grouped/border-styles.js +75 -0
package/dist/lib/css/grouped/font-styles.js +93 -0
package/dist/lib/css/grouped/layout-styles.js +127 -0
package/dist/lib/css/index.js +74 -46
package/dist/lib/css/layout/text.js +7 -6
package/dist/lib/css/property-descriptors/background-blend-mode.js +41 -0
package/dist/lib/css/property-descriptors/border-image-repeat.js +42 -0
package/dist/lib/css/property-descriptors/border-image-slice.js +45 -0
package/dist/lib/css/property-descriptors/border-image-source.js +21 -0
package/dist/lib/css/property-descriptors/border-radius.js +1 -1
package/dist/lib/css/property-descriptors/box-decoration-break.js +18 -0
package/dist/lib/css/property-descriptors/counter-increment.js +17 -12
package/dist/lib/css/property-descriptors/counter-reset.js +4 -12
package/dist/lib/css/property-descriptors/filter.js +76 -0
package/dist/lib/css/property-descriptors/font-variant-ligatures.js +34 -0
package/dist/lib/css/property-descriptors/object-fit.js +1 -1
package/dist/lib/css/property-descriptors/object-position.js +42 -0
package/dist/lib/css/property-descriptors/visibility.js +1 -1
package/dist/lib/css/property-descriptors/zoom.js +18 -0
package/dist/lib/css/syntax/parser.js +0 -1
package/dist/lib/css/types/color.js +5 -1
package/dist/lib/css/types/functions/repeating-linear-gradient.js +9 -0
package/dist/lib/css/types/image.js +12 -2
package/dist/lib/css/types/length-percentage.js +6 -2
package/dist/lib/css/types/safe-eval.js +80 -0
package/dist/lib/dom/document-cloner.js +23 -163
package/dist/lib/dom/slot-cloner.js +176 -0
package/dist/lib/index.js +1 -17
package/dist/lib/render/canvas/background-renderer.js +169 -30
package/dist/lib/render/canvas/border-image-renderer.js +153 -0
package/dist/lib/render/canvas/canvas-renderer.js +39 -190
package/dist/lib/render/canvas/content-renderer.js +202 -0
package/dist/lib/render/canvas/effects-renderer.js +3 -0
package/dist/lib/render/canvas/foreignobject-renderer.js +5 -1
package/dist/lib/render/canvas/text/text-decoration-renderer.js +99 -0
package/dist/lib/render/canvas/text-renderer.js +100 -224
package/dist/lib/render/effects.js +38 -3
package/dist/lib/render/object-fit.js +19 -15
package/dist/lib/render/stacking-context.js +11 -0
package/dist/types/config.d.ts +0 -10
package/dist/types/core/cache-storage.d.ts +0 -24
package/dist/types/core/constants.d.ts +22 -0
package/dist/types/core/context.d.ts +3 -0
package/dist/types/core/performance-monitor.d.ts +4 -4
package/dist/types/core/validator.d.ts +6 -8
package/dist/types/css/grouped/background-styles.d.ts +16 -0
package/dist/types/css/grouped/border-styles.d.ts +31 -0
package/dist/types/css/grouped/font-styles.d.ts +35 -0
package/dist/types/css/grouped/layout-styles.d.ts +46 -0
package/dist/types/css/index.d.ts +30 -0
package/dist/types/css/property-descriptors/background-blend-mode.d.ts +23 -0
package/dist/types/css/property-descriptors/border-image-repeat.d.ts +12 -0
package/dist/types/css/property-descriptors/border-image-slice.d.ts +10 -0
package/dist/types/css/property-descriptors/border-image-source.d.ts +4 -0
package/dist/types/css/property-descriptors/box-decoration-break.d.ts +6 -0
package/dist/types/css/property-descriptors/counter-increment.d.ts +3 -0
package/dist/types/css/property-descriptors/filter.d.ts +3 -0
package/dist/types/css/property-descriptors/font-variant-ligatures.d.ts +14 -0
package/dist/types/css/property-descriptors/object-position.d.ts +4 -0
package/dist/types/css/property-descriptors/zoom.d.ts +3 -0
package/dist/types/css/types/functions/repeating-linear-gradient.d.ts +4 -0
package/dist/types/css/types/image.d.ts +4 -2
package/dist/types/css/types/safe-eval.d.ts +8 -0
package/dist/types/dom/document-cloner.d.ts +3 -44
package/dist/types/dom/slot-cloner.d.ts +66 -0
package/dist/types/index.d.ts +3 -7
package/dist/types/options.d.ts +11 -0
package/dist/types/render/canvas/background-renderer.d.ts +23 -0
package/dist/types/render/canvas/border-image-renderer.d.ts +18 -0
package/dist/types/render/canvas/canvas-renderer.d.ts +1 -0
package/dist/types/render/canvas/content-renderer.d.ts +44 -0
package/dist/types/render/canvas/text/text-decoration-renderer.d.ts +18 -0
package/dist/types/render/canvas/text-renderer.d.ts +12 -1
package/dist/types/render/effects.d.ts +12 -2
package/dist/types/render/object-fit.d.ts +2 -1
package/dist/types/render/renderer-interface.d.ts +11 -9
package/package.json +7 -20
package/dist/lib/dom/replaced-elements/pseudo-elements.js +0 -0
package/dist/lib/invariant.js +0 -9
package/dist/types/dom/replaced-elements/pseudo-elements.d.ts +0 -0
package/dist/types/invariant.d.ts +0 -1
package/src/__tests__/index.ts +0 -99
package/src/config.ts +0 -107
package/src/core/__mocks__/cache-storage.ts +0 -1
package/src/core/__mocks__/context.ts +0 -19
package/src/core/__mocks__/features.ts +0 -8
package/src/core/__mocks__/logger.ts +0 -17
package/src/core/__tests__/cache-storage.test.ts +0 -205
package/src/core/__tests__/cache-storage.ts +0 -278
package/src/core/__tests__/logger.ts +0 -29
package/src/core/__tests__/validator.ts +0 -359
package/src/core/bitwise.ts +0 -1
package/src/core/cache-storage.ts +0 -315
package/src/core/context.ts +0 -31
package/src/core/debugger.ts +0 -32
package/src/core/features.ts +0 -222
package/src/core/logger.ts +0 -64
package/src/core/origin-checker.ts +0 -57
package/src/core/performance-monitor.ts +0 -241
package/src/core/render-element.ts +0 -272
package/src/core/util.ts +0 -1
package/src/core/validator.ts +0 -593
package/src/css/index.ts +0 -427
package/src/css/layout/__mocks__/bounds.ts +0 -6
package/src/css/layout/bounds.ts +0 -79
package/src/css/layout/text.ts +0 -161
package/src/css/property-descriptor.ts +0 -49
package/src/css/property-descriptors/__tests__/background-tests.ts +0 -65
package/src/css/property-descriptors/__tests__/clip-path.test.ts +0 -280
package/src/css/property-descriptors/__tests__/font-family.ts +0 -25
package/src/css/property-descriptors/__tests__/image-rendering-integration.test.ts +0 -153
package/src/css/property-descriptors/__tests__/image-rendering-performance.test.ts +0 -175
package/src/css/property-descriptors/__tests__/image-rendering.test.ts +0 -72
package/src/css/property-descriptors/__tests__/paint-order.ts +0 -87
package/src/css/property-descriptors/__tests__/text-shadow.ts +0 -94
package/src/css/property-descriptors/__tests__/transform-tests.ts +0 -18
package/src/css/property-descriptors/background-clip.ts +0 -30
package/src/css/property-descriptors/background-color.ts +0 -9
package/src/css/property-descriptors/background-image.ts +0 -27
package/src/css/property-descriptors/background-origin.ts +0 -31
package/src/css/property-descriptors/background-position.ts +0 -38
package/src/css/property-descriptors/background-repeat.ts +0 -44
package/src/css/property-descriptors/background-size.ts +0 -27
package/src/css/property-descriptors/border-color.ts +0 -13
package/src/css/property-descriptors/border-radius.ts +0 -19
package/src/css/property-descriptors/border-style.ts +0 -34
package/src/css/property-descriptors/border-width.ts +0 -20
package/src/css/property-descriptors/box-shadow.ts +0 -60
package/src/css/property-descriptors/clip-path.ts +0 -271
package/src/css/property-descriptors/color.ts +0 -9
package/src/css/property-descriptors/content.ts +0 -26
package/src/css/property-descriptors/counter-increment.ts +0 -43
package/src/css/property-descriptors/counter-reset.ts +0 -36
package/src/css/property-descriptors/direction.ts +0 -23
package/src/css/property-descriptors/display.ts +0 -117
package/src/css/property-descriptors/duration.ts +0 -14
package/src/css/property-descriptors/float.ts +0 -29
package/src/css/property-descriptors/font-family.ts +0 -38
package/src/css/property-descriptors/font-size.ts +0 -9
package/src/css/property-descriptors/font-style.ts +0 -25
package/src/css/property-descriptors/font-variant.ts +0 -12
package/src/css/property-descriptors/font-weight.ts +0 -26
package/src/css/property-descriptors/image-rendering.ts +0 -33
package/src/css/property-descriptors/letter-spacing.ts +0 -25
package/src/css/property-descriptors/line-break.ts +0 -22
package/src/css/property-descriptors/line-height.ts +0 -22
package/src/css/property-descriptors/list-style-image.ts +0 -19
package/src/css/property-descriptors/list-style-position.ts +0 -22
package/src/css/property-descriptors/list-style-type.ts +0 -179
package/src/css/property-descriptors/margin.ts +0 -13
package/src/css/property-descriptors/mix-blend-mode.ts +0 -35
package/src/css/property-descriptors/object-fit.ts +0 -39
package/src/css/property-descriptors/opacity.ts +0 -15
package/src/css/property-descriptors/overflow-wrap.ts +0 -22
package/src/css/property-descriptors/overflow.ts +0 -34
package/src/css/property-descriptors/padding.ts +0 -14
package/src/css/property-descriptors/paint-order.ts +0 -42
package/src/css/property-descriptors/position.ts +0 -30
package/src/css/property-descriptors/quotes.ts +0 -57
package/src/css/property-descriptors/rotate.ts +0 -34
package/src/css/property-descriptors/text-align.ts +0 -26
package/src/css/property-descriptors/text-decoration-color.ts +0 -9
package/src/css/property-descriptors/text-decoration-line.ts +0 -38
package/src/css/property-descriptors/text-decoration-style.ts +0 -32
package/src/css/property-descriptors/text-decoration-thickness.ts +0 -30
package/src/css/property-descriptors/text-overflow.ts +0 -23
package/src/css/property-descriptors/text-shadow.ts +0 -52
package/src/css/property-descriptors/text-transform.ts +0 -27
package/src/css/property-descriptors/text-underline-offset.ts +0 -27
package/src/css/property-descriptors/transform-origin.ts +0 -29
package/src/css/property-descriptors/transform.ts +0 -74
package/src/css/property-descriptors/visibility.ts +0 -25
package/src/css/property-descriptors/webkit-line-clamp.ts +0 -30
package/src/css/property-descriptors/webkit-text-stroke-color.ts +0 -8
package/src/css/property-descriptors/webkit-text-stroke-width.ts +0 -15
package/src/css/property-descriptors/word-break.ts +0 -25
package/src/css/property-descriptors/writing-mode.ts +0 -37
package/src/css/property-descriptors/z-index.ts +0 -27
package/src/css/syntax/__tests__/tokernizer-tests.ts +0 -29
package/src/css/syntax/parser.ts +0 -188
package/src/css/syntax/tokenizer.ts +0 -822
package/src/css/type-descriptor.ts +0 -7
package/src/css/types/__tests__/color-tests.ts +0 -147
package/src/css/types/__tests__/image-tests.ts +0 -239
package/src/css/types/angle.ts +0 -86
package/src/css/types/color-math.ts +0 -22
package/src/css/types/color-spaces/a98.ts +0 -86
package/src/css/types/color-spaces/p3.ts +0 -92
package/src/css/types/color-spaces/pro-photo.ts +0 -87
package/src/css/types/color-spaces/rec2020.ts +0 -90
package/src/css/types/color-spaces/srgb.ts +0 -87
package/src/css/types/color-utilities.ts +0 -452
package/src/css/types/color.ts +0 -485
package/src/css/types/functions/-prefix-linear-gradient.ts +0 -35
package/src/css/types/functions/-prefix-radial-gradient.ts +0 -106
package/src/css/types/functions/-webkit-gradient.ts +0 -69
package/src/css/types/functions/__tests__/radial-gradient.ts +0 -69
package/src/css/types/functions/counter.ts +0 -511
package/src/css/types/functions/gradient.ts +0 -206
package/src/css/types/functions/linear-gradient.ts +0 -28
package/src/css/types/functions/radial-gradient.ts +0 -101
package/src/css/types/image.ts +0 -120
package/src/css/types/index.ts +0 -1
package/src/css/types/length-percentage.ts +0 -137
package/src/css/types/length.ts +0 -7
package/src/css/types/time.ts +0 -20
package/src/dom/__mocks__/document-cloner.ts +0 -22
package/src/dom/__tests__/dom-normalizer.test.ts +0 -133
package/src/dom/__tests__/element-container.test.ts +0 -129
package/src/dom/document-cloner.ts +0 -929
package/src/dom/dom-normalizer.ts +0 -133
package/src/dom/element-container.ts +0 -75
package/src/dom/elements/li-element-container.ts +0 -10
package/src/dom/elements/ol-element-container.ts +0 -12
package/src/dom/elements/select-element-container.ts +0 -10
package/src/dom/elements/textarea-element-container.ts +0 -9
package/src/dom/node-parser.ts +0 -177
package/src/dom/node-type-guards.ts +0 -70
package/src/dom/replaced-elements/canvas-element-container.ts +0 -15
package/src/dom/replaced-elements/iframe-element-container.ts +0 -55
package/src/dom/replaced-elements/image-element-container.ts +0 -16
package/src/dom/replaced-elements/index.ts +0 -5
package/src/dom/replaced-elements/input-element-container.ts +0 -105
package/src/dom/replaced-elements/pseudo-elements.ts +0 -0
package/src/dom/replaced-elements/svg-element-container.ts +0 -23
package/src/dom/text-container.ts +0 -42
package/src/global.d.ts +0 -19
package/src/index.ts +0 -82
package/src/invariant.ts +0 -5
package/src/options.ts +0 -55
package/src/render/__tests__/object-fit.test.ts +0 -85
package/src/render/background.ts +0 -298
package/src/render/bezier-curve.ts +0 -47
package/src/render/border.ts +0 -165
package/src/render/bound-curves.ts +0 -388
package/src/render/box-sizing.ts +0 -31
package/src/render/canvas/__tests__/background-renderer.test.ts +0 -72
package/src/render/canvas/__tests__/border-renderer.test.ts +0 -24
package/src/render/canvas/__tests__/effects-renderer.test.ts +0 -32
package/src/render/canvas/__tests__/text-renderer.test.ts +0 -471
package/src/render/canvas/background-renderer.ts +0 -271
package/src/render/canvas/border-renderer.ts +0 -224
package/src/render/canvas/canvas-path.ts +0 -31
package/src/render/canvas/canvas-renderer.ts +0 -641
package/src/render/canvas/effects-renderer.ts +0 -130
package/src/render/canvas/foreignobject-renderer.ts +0 -53
package/src/render/canvas/text-renderer.ts +0 -700
package/src/render/effects.ts +0 -75
package/src/render/font-metrics.ts +0 -72
package/src/render/object-fit.ts +0 -100
package/src/render/path.ts +0 -37
package/src/render/renderer-interface.ts +0 -28
package/src/render/stacking-context.ts +0 -386
package/src/render/vector.ts +0 -19

package/dist/lib/dom/document-cloner.js CHANGED Viewed

@@ -9,7 +9,7 @@ const list_style_type_1 = require("../css/property-descriptors/list-style-type")
 const index_1 = require("../css/index");
 const quotes_1 = require("../css/property-descriptors/quotes");
 const debugger_1 = require("../core/debugger");
-const IGNORE_ATTRIBUTE = 'data-html2canvas-ignore';
+const slot_cloner_1 = require("./slot-cloner");
 /**
  * Find the parent ShadowRoot of an element, if any
  * @param element - The element to check
@@ -39,6 +39,7 @@ class DocumentCloner {
         this.referenceElement = element;
         this.counters = new counter_1.CounterState();
         this.quoteDepth = 0;
+        this.slotCloner = new slot_cloner_1.SlotCloner((node, copyStyles) => this.cloneNode(node, copyStyles), { ignoreElements: options.ignoreElements, copyStyles: options.copyStyles ?? true }, context);
         if (!element.ownerDocument) {
             throw new Error('Cloned element does not have an owner document');
         }
@@ -98,26 +99,26 @@ class DocumentCloner {
          */
         const baseUri = ownerDocument.baseURI;
         documentClone.open();
+        // rawHTML is always a static, internally-generated string:
+        // serializeDoctype(document.doctype) + '<html></html>'
+        // No user-controlled input — safe for document.write in the sandbox iframe.
         const rawHTML = serializeDoctype(document.doctype) + '<html></html>';
         try {
-            // 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
+                    createHTML: (s) => s
                 });
             }
-            if (policy) {
-                documentClone.write(policy.createHTML(rawHTML));
-            }
-            else {
-                documentClone.write(rawHTML);
-            }
+            // Prefer Trusted Types when available; fallback is the same static HTML.
+            const html = policy ? policy.createHTML(rawHTML) : rawHTML;
+            // CodeQL:no - rawHTML is a static internal string, never user-controlled
+            documentClone.write(html);
         }
         catch (_e) {
+            // CodeQL:no - rawHTML is a static internal string, never user-controlled
             documentClone.write(rawHTML);
         }
         // Chrome scrolls the parent document for some reason after the write to the cloned window???
@@ -284,162 +285,14 @@ class DocumentCloner {
         return blankCanvas;
     }
     appendChildNode(clone, child, copyStyles) {
-        this.safeAppendClonedChild(clone, child, copyStyles);
-    }
-    /**
-     * Check if a child node should be cloned based on filtering rules
-     * Filters out: scripts, ignored elements, and optionally styles
-     */
-    shouldCloneChild(child) {
-        return (!(0, node_parser_1.isElementNode)(child) ||
-            (!(0, node_parser_1.isScriptElement)(child) &&
-                !child.hasAttribute(IGNORE_ATTRIBUTE) &&
-                (typeof this.options.ignoreElements !== 'function' || !this.options.ignoreElements(child))));
-    }
-    /**
-     * Check if a style element should be cloned based on copyStyles option
-     */
-    shouldCloneStyleElement(child) {
-        return !this.options.copyStyles || !(0, node_parser_1.isElementNode)(child) || !(0, node_parser_1.isStyleElement)(child);
-    }
-    /**
-     * Safely append a cloned child to a target, applying all filtering rules
-     */
-    safeAppendClonedChild(target, child, copyStyles) {
-        if (this.shouldCloneChild(child) && this.shouldCloneStyleElement(child)) {
-            target.appendChild(this.cloneNode(child, copyStyles));
-        }
-    }
-    /**
-     * Clone assigned nodes from a slot element to the target
-     */
-    cloneAssignedNodes(assignedNodes, target, copyStyles) {
-        assignedNodes.forEach((node) => {
-            this.safeAppendClonedChild(target, node, copyStyles);
-        });
-    }
-    /**
-     * Clone fallback content from a slot element when no nodes are assigned
-     */
-    cloneSlotFallbackContent(slot, target, copyStyles) {
-        for (let child = slot.firstChild; child; child = child.nextSibling) {
-            this.safeAppendClonedChild(target, child, copyStyles);
-        }
-    }
-    /**
-     * Handle cloning of a slot element, including assigned nodes or fallback content
-     */
-    cloneSlotElement(slot, targetShadowRoot, copyStyles) {
-        if (!(0, node_parser_1.isSlotElement)(slot)) {
-            return;
-        }
-        const slotElement = slot;
-        // Defensive check: ensure assignedNodes method exists
-        if (typeof slotElement.assignedNodes !== 'function') {
-            this.context.logger.warn('HTMLSlotElement.assignedNodes is not available', slot);
-            this.cloneSlotFallbackContent(slot, targetShadowRoot, copyStyles);
-            return;
-        }
-        const assignedNodes = slotElement.assignedNodes();
-        // Defensive check: ensure assignedNodes returns an array
-        if (!assignedNodes || !Array.isArray(assignedNodes)) {
-            this.context.logger.warn('assignedNodes() did not return a valid array', slot);
-            this.cloneSlotFallbackContent(slot, targetShadowRoot, copyStyles);
-            return;
-        }
-        if (assignedNodes.length > 0) {
-            // Clone assigned nodes
-            this.cloneAssignedNodes(assignedNodes, targetShadowRoot, copyStyles);
-        }
-        else {
-            // Clone fallback content
-            this.cloneSlotFallbackContent(slot, targetShadowRoot, copyStyles);
-        }
-    }
-    /**
-     * Clone shadow DOM children to the target shadow root
-     */
-    cloneShadowDOMChildren(shadowRoot, targetShadowRoot, copyStyles) {
-        for (let child = shadowRoot.firstChild; child; child = child.nextSibling) {
-            if ((0, node_parser_1.isElementNode)(child) && (0, node_parser_1.isSlotElement)(child)) {
-                // Handle slot elements specially
-                this.cloneSlotElement(child, targetShadowRoot, copyStyles);
-            }
-            else {
-                // Clone regular elements
-                this.safeAppendClonedChild(targetShadowRoot, child, copyStyles);
-            }
-        }
-    }
-    /**
-     * Clone light DOM children to the target element
-     */
-    cloneLightDOMChildren(node, clone, copyStyles) {
-        for (let child = node.firstChild; child; child = child.nextSibling) {
-            this.appendChildNode(clone, child, copyStyles);
-        }
+        this.slotCloner.appendChildNode(clone, child, copyStyles);
     }
     /**
-     * Clone slot element as light DOM when shadow root creation failed
-     */
-    cloneSlotElementAsLightDOM(slot, clone, copyStyles) {
-        if (!(0, node_parser_1.isSlotElement)(slot)) {
-            return;
-        }
-        const slotElement = slot;
-        if (typeof slotElement.assignedNodes !== 'function') {
-            // Fallback: clone slot's children
-            for (let child = slot.firstChild; child; child = child.nextSibling) {
-                this.appendChildNode(clone, child, copyStyles);
-            }
-            return;
-        }
-        const assignedNodes = slotElement.assignedNodes();
-        if (assignedNodes && Array.isArray(assignedNodes) && assignedNodes.length > 0) {
-            // Clone assigned nodes as light DOM
-            assignedNodes.forEach((node) => this.appendChildNode(clone, node, copyStyles));
-        }
-        else {
-            // Clone fallback content as light DOM
-            for (let child = slot.firstChild; child; child = child.nextSibling) {
-                this.appendChildNode(clone, child, copyStyles);
-            }
-        }
-    }
-    /**
-     * Clone shadow DOM content as light DOM when shadow root creation failed
-     * This is a fallback mechanism to ensure content is not lost
-     */
-    cloneShadowDOMAsLightDOM(shadowRoot, clone, copyStyles) {
-        for (let child = shadowRoot.firstChild; child; child = child.nextSibling) {
-            if ((0, node_parser_1.isElementNode)(child) && (0, node_parser_1.isSlotElement)(child)) {
-                this.cloneSlotElementAsLightDOM(child, clone, copyStyles);
-            }
-            else {
-                this.appendChildNode(clone, child, copyStyles);
-            }
-        }
-    }
-    /**
-     * Clone child nodes from source element to clone element
-     * Handles shadow DOM, slots, and light DOM appropriately
+     * Clone child nodes from source element to clone element.
+     * Delegates to SlotCloner which handles shadow DOM, slots, and light DOM.
      */
     cloneChildNodes(node, clone, copyStyles) {
-        if (node.shadowRoot && clone.shadowRoot) {
-            // Both original and clone have shadow roots - clone shadow DOM content
-            this.cloneShadowDOMChildren(node.shadowRoot, clone.shadowRoot, copyStyles);
-            // Also clone light DOM (slot content sources)
-            this.cloneLightDOMChildren(node, clone, copyStyles);
-        }
-        else if (node.shadowRoot && !clone.shadowRoot) {
-            // Original has shadow root but clone doesn't (creation failed)
-            // Fallback: clone shadow DOM content as light DOM to preserve content
-            this.cloneShadowDOMAsLightDOM(node.shadowRoot, clone, copyStyles);
-        }
-        else {
-            // No shadow DOM - just clone light DOM children
-            this.cloneLightDOMChildren(node, clone, copyStyles);
-        }
+        this.slotCloner.cloneChildNodes(node, clone, copyStyles);
     }
     cloneNode(node, copyStyles) {
         if ((0, node_parser_1.isTextNode)(node)) {
@@ -606,7 +459,7 @@ const createIFrameContainer = (ownerDocument, bounds, customContainer) => {
     cloneIframeContainer.width = bounds.width.toString();
     cloneIframeContainer.height = bounds.height.toString();
     cloneIframeContainer.scrolling = 'no'; // ios won't scroll without it
-    cloneIframeContainer.setAttribute(IGNORE_ATTRIBUTE, 'true');
+    cloneIframeContainer.setAttribute(slot_cloner_1.IGNORE_ATTRIBUTE, 'true');
     // Use custom container if provided, otherwise use body
     const container = customContainer || ownerDocument.body;
     container.appendChild(cloneIframeContainer);
@@ -638,11 +491,18 @@ const iframeLoader = (iframe) => {
         const documentClone = cloneWindow.document;
         cloneWindow.onload = iframe.onload = () => {
             cloneWindow.onload = iframe.onload = null;
+            const MAX_POLL_ATTEMPTS = 600; // 30 seconds at 50ms intervals
+            let attempts = 0;
             const interval = setInterval(() => {
+                attempts++;
                 if (documentClone.body.childNodes.length > 0 && documentClone.readyState === 'complete') {
                     clearInterval(interval);
                     resolve(iframe);
                 }
+                else if (attempts >= MAX_POLL_ATTEMPTS) {
+                    clearInterval(interval);
+                    resolve(iframe); // resolve anyway to avoid hanging
+                }
             }, 50);
         };
     });

package/dist/lib/dom/slot-cloner.js ADDED Viewed

@@ -0,0 +1,176 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SlotCloner = exports.IGNORE_ATTRIBUTE = void 0;
+const node_parser_1 = require("./node-parser");
+/** Exported for reuse in document-cloner.ts */
+exports.IGNORE_ATTRIBUTE = 'data-html2canvas-ignore';
+/**
+ * Handles shadow DOM child cloning, slot assignment, and light DOM traversal.
+ * Extracted from DocumentCloner to reduce file size and improve separation of concerns.
+ */
+class SlotCloner {
+    constructor(cloneNodeFn, options, context) {
+        this.cloneNodeFn = cloneNodeFn;
+        this.options = options;
+        this.context = context;
+    }
+    appendChildNode(clone, child, copyStyles) {
+        this.safeAppendClonedChild(clone, child, copyStyles);
+    }
+    /**
+     * Clone child nodes from source element to clone element.
+     * Handles shadow DOM, slots, and light DOM appropriately.
+     */
+    cloneChildNodes(node, clone, copyStyles) {
+        if (node.shadowRoot && clone.shadowRoot) {
+            // Both original and clone have shadow roots - clone shadow DOM content
+            this.cloneShadowDOMChildren(node.shadowRoot, clone.shadowRoot, copyStyles);
+            // Also clone light DOM (slot content sources)
+            this.cloneLightDOMChildren(node, clone, copyStyles);
+        }
+        else if (node.shadowRoot && !clone.shadowRoot) {
+            // Original has shadow root but clone doesn't (creation failed)
+            // Fallback: clone shadow DOM content as light DOM to preserve content
+            this.cloneShadowDOMAsLightDOM(node.shadowRoot, clone, copyStyles);
+        }
+        else {
+            // No shadow DOM - just clone light DOM children
+            this.cloneLightDOMChildren(node, clone, copyStyles);
+        }
+    }
+    /**
+     * Check if a child node should be cloned based on filtering rules.
+     * Filters out: scripts, ignored elements, and optionally styles.
+     */
+    shouldCloneChild(child) {
+        return (!(0, node_parser_1.isElementNode)(child) ||
+            (!(0, node_parser_1.isScriptElement)(child) &&
+                !child.hasAttribute(exports.IGNORE_ATTRIBUTE) &&
+                (typeof this.options.ignoreElements !== 'function' || !this.options.ignoreElements(child))));
+    }
+    /**
+     * Check if a style element should be cloned based on copyStyles option.
+     */
+    shouldCloneStyleElement(child) {
+        return !this.options.copyStyles || !(0, node_parser_1.isElementNode)(child) || !(0, node_parser_1.isStyleElement)(child);
+    }
+    /**
+     * Safely append a cloned child to a target, applying all filtering rules.
+     */
+    safeAppendClonedChild(target, child, copyStyles) {
+        if (this.shouldCloneChild(child) && this.shouldCloneStyleElement(child)) {
+            target.appendChild(this.cloneNodeFn(child, copyStyles));
+        }
+    }
+    /**
+     * Clone assigned nodes from a slot element to the target.
+     */
+    cloneAssignedNodes(assignedNodes, target, copyStyles) {
+        assignedNodes.forEach((node) => {
+            this.safeAppendClonedChild(target, node, copyStyles);
+        });
+    }
+    /**
+     * Clone fallback content from a slot element when no nodes are assigned.
+     */
+    cloneSlotFallbackContent(slot, target, copyStyles) {
+        for (let child = slot.firstChild; child; child = child.nextSibling) {
+            this.safeAppendClonedChild(target, child, copyStyles);
+        }
+    }
+    /**
+     * Handle cloning of a slot element, including assigned nodes or fallback content.
+     */
+    cloneSlotElement(slot, targetShadowRoot, copyStyles) {
+        if (!(0, node_parser_1.isSlotElement)(slot)) {
+            return;
+        }
+        const slotElement = slot;
+        // Defensive check: ensure assignedNodes method exists
+        if (typeof slotElement.assignedNodes !== 'function') {
+            this.context.logger.warn('HTMLSlotElement.assignedNodes is not available', slot);
+            this.cloneSlotFallbackContent(slot, targetShadowRoot, copyStyles);
+            return;
+        }
+        const assignedNodes = slotElement.assignedNodes();
+        // Defensive check: ensure assignedNodes returns an array
+        if (!assignedNodes || !Array.isArray(assignedNodes)) {
+            this.context.logger.warn('assignedNodes() did not return a valid array', slot);
+            this.cloneSlotFallbackContent(slot, targetShadowRoot, copyStyles);
+            return;
+        }
+        if (assignedNodes.length > 0) {
+            // Clone assigned nodes
+            this.cloneAssignedNodes(assignedNodes, targetShadowRoot, copyStyles);
+        }
+        else {
+            // Clone fallback content
+            this.cloneSlotFallbackContent(slot, targetShadowRoot, copyStyles);
+        }
+    }
+    /**
+     * Clone shadow DOM children to the target shadow root.
+     */
+    cloneShadowDOMChildren(shadowRoot, targetShadowRoot, copyStyles) {
+        for (let child = shadowRoot.firstChild; child; child = child.nextSibling) {
+            if ((0, node_parser_1.isElementNode)(child) && (0, node_parser_1.isSlotElement)(child)) {
+                // Handle slot elements specially
+                this.cloneSlotElement(child, targetShadowRoot, copyStyles);
+            }
+            else {
+                // Clone regular elements
+                this.safeAppendClonedChild(targetShadowRoot, child, copyStyles);
+            }
+        }
+    }
+    /**
+     * Clone light DOM children to the target element.
+     */
+    cloneLightDOMChildren(node, clone, copyStyles) {
+        for (let child = node.firstChild; child; child = child.nextSibling) {
+            this.appendChildNode(clone, child, copyStyles);
+        }
+    }
+    /**
+     * Clone slot element as light DOM when shadow root creation failed.
+     */
+    cloneSlotElementAsLightDOM(slot, clone, copyStyles) {
+        if (!(0, node_parser_1.isSlotElement)(slot)) {
+            return;
+        }
+        const slotElement = slot;
+        if (typeof slotElement.assignedNodes !== 'function') {
+            // Fallback: clone slot's children
+            for (let child = slot.firstChild; child; child = child.nextSibling) {
+                this.appendChildNode(clone, child, copyStyles);
+            }
+            return;
+        }
+        const assignedNodes = slotElement.assignedNodes();
+        if (assignedNodes && Array.isArray(assignedNodes) && assignedNodes.length > 0) {
+            // Clone assigned nodes as light DOM
+            assignedNodes.forEach((node) => this.appendChildNode(clone, node, copyStyles));
+        }
+        else {
+            // Clone fallback content as light DOM
+            for (let child = slot.firstChild; child; child = child.nextSibling) {
+                this.appendChildNode(clone, child, copyStyles);
+            }
+        }
+    }
+    /**
+     * Clone shadow DOM content as light DOM when shadow root creation failed.
+     * This is a fallback mechanism to ensure content is not lost.
+     */
+    cloneShadowDOMAsLightDOM(shadowRoot, clone, copyStyles) {
+        for (let child = shadowRoot.firstChild; child; child = child.nextSibling) {
+            if ((0, node_parser_1.isElementNode)(child) && (0, node_parser_1.isSlotElement)(child)) {
+                this.cloneSlotElementAsLightDOM(child, clone, copyStyles);
+            }
+            else {
+                this.appendChildNode(clone, child, copyStyles);
+            }
+        }
+    }
+}
+exports.SlotCloner = SlotCloner;

package/dist/lib/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.IMAGE_RENDERING = exports.PerformanceMonitor = exports.createDefaultValidator = exports.Validator = exports.Html2CanvasConfig = exports.html2canvas = void 0;
+exports.PerformanceMonitor = exports.createDefaultValidator = exports.Validator = exports.Html2CanvasConfig = exports.html2canvas = void 0;
 const config_1 = require("./config");
 Object.defineProperty(exports, "Html2CanvasConfig", { enumerable: true, get: function () { return config_1.Html2CanvasConfig; } });
 const validator_1 = require("./core/validator");
@@ -46,20 +46,4 @@ const html2canvas = (element, options = {}, config) => {
     return (0, render_element_1.renderElement)(element, options, finalConfig);
 };
 exports.html2canvas = html2canvas;
-/**
- * Set CSP nonce for inline styles.
- *
- * @deprecated Since 2.0.0. Pass `cspNonce` in options instead:
- *             `html2canvas(element, { cspNonce: '...' })`
- */
-const setCspNonce = (nonce) => {
-    console.warn('[html2canvas-pro] setCspNonce is deprecated. ' +
-        'Pass cspNonce in options instead: html2canvas(element, { cspNonce: "..." })');
-    if (typeof window !== 'undefined') {
-        (0, config_1.setDefaultConfig)(new config_1.Html2CanvasConfig({ window, cspNonce: nonce }));
-    }
-};
-html2canvas.setCspNonce = setCspNonce;
 exports.default = html2canvas;
-var image_rendering_1 = require("./css/property-descriptors/image-rendering");
-Object.defineProperty(exports, "IMAGE_RENDERING", { enumerable: true, get: function () { return image_rendering_1.IMAGE_RENDERING; } });