html2canvas-pro 2.3.3 → 2.3.5

package/dist/lib/css/index.js

@@ -258,7 +258,14 @@ class CSSParsedCounterDeclaration {
 exports.CSSParsedCounterDeclaration = CSSParsedCounterDeclaration;
 const parseCache = new Map();
 const parse = (context, descriptor, style) => {
-    const rawValue = style !== null && typeof style !== 'undefined' ? style.toString() : descriptor.initialValue;
+    let rawValue = style !== null && typeof style !== 'undefined' ? style.toString() : descriptor.initialValue;
+    // A whitespace-only (or empty) computed value makes the tokenizer emit only an
+    // EOF token, which parseComponentValue() turns into a "unexpected EOF" SyntaxError.
+    // Some browsers produce such values for web-component shadow styles (see #225);
+    // fall back to the descriptor's initialValue so capture never crashes on them.
+    if (rawValue.trim() === '') {
+        rawValue = descriptor.initialValue;
+    }
     let valueCache = parseCache.get(descriptor);
     if (valueCache) {
         const cached = valueCache.get(rawValue);

package/dist/lib/css/syntax/parser.js

@@ -112,11 +112,12 @@ const parseFunctionArgs = (tokens) => {
     let arg = [];
     tokens.forEach((token) => {
         if (token.type === 4 /* TokenType.COMMA_TOKEN */) {
-            if (arg.length === 0) {
-                throw new Error(`Error parsing function args, zero tokens for arg`);
+            // Skip empty arguments (e.g. "1px,,2px") instead of throwing —
+            // real-world computed styles can produce them.
+            if (arg.length) {
+                args.push(arg);
+                arg = [];
             }
-            args.push(arg);
-            arg = [];
             return;
         }
         if (token.type !== 31 /* TokenType.WHITESPACE_TOKEN */) {

package/dist/lib/dom/node-parser.js

@@ -18,37 +18,49 @@ const LIST_OWNERS = ['OL', 'UL', 'MENU'];
 const parseNodeTree = (context, node, parent, root) => {
     for (let childNode = node.firstChild, nextNode; childNode; childNode = nextNode) {
         nextNode = childNode.nextSibling;
-        // Fixes #2238 #1624 - Fix the issue of TextNode content being overlooked in rendering due to being perceived as blank by trim().
-        if ((0, node_type_guards_1.isTextNode)(childNode) && childNode.data.length > 0) {
-            parent.textNodes.push(new text_container_1.TextContainer(context, childNode, parent.styles));
+        parseChildNode(context, childNode, parent, root);
+    }
+};
+/**
+ * Parse a single node as a child of `parent`.
+ *
+ * Separated from the tree walk so that nodes assigned to a `<slot>` (including
+ * bare text nodes, which have no child nodes) can be parsed directly. Without
+ * this, slotted shadow-DOM content such as web component labels was silently
+ * dropped because `parseNodeTree` only iterates `node.firstChild` (issue #226).
+ */
+const parseChildNode = (context, childNode, parent, root) => {
+    // Fixes #2238 #1624 - Fix the issue of TextNode content being overlooked in rendering due to being perceived as blank by trim().
+    if ((0, node_type_guards_1.isTextNode)(childNode) && childNode.data.length > 0) {
+        parent.textNodes.push(new text_container_1.TextContainer(context, childNode, parent.styles));
+    }
+    else if ((0, node_type_guards_1.isElementNode)(childNode)) {
+        if ((0, node_type_guards_1.isSlotElement)(childNode) && childNode.assignedNodes) {
+            // Slotted content is laid out at the slot's position: parse each
+            // assigned node (text or element) as a direct child of the slot's
+            // parent container.
+            childNode
+                .assignedNodes()
+                .forEach((assignedNode) => parseChildNode(context, assignedNode, parent, root));
         }
-        else if ((0, node_type_guards_1.isElementNode)(childNode)) {
-            if ((0, node_type_guards_1.isSlotElement)(childNode) && childNode.assignedNodes) {
-                childNode
-                    .assignedNodes()
-                    .forEach((assignedNode) => parseNodeTree(context, assignedNode, parent, root));
-            }
-            else {
-                const container = createContainer(context, childNode);
-                if (container.styles.isVisible()) {
-                    if (createsRealStackingContext(childNode, container, root)) {
-                        container.createsRealStackingContext = true;
-                    }
-                    else if (createsStackingContext(container.styles)) {
-                        container.createsStackingContext = true;
-                    }
-                    if (LIST_OWNERS.indexOf(childNode.tagName) !== -1) {
-                        container.isListOwner = true;
-                    }
-                    parent.elements.push(container);
-                    if (childNode.shadowRoot) {
-                        parseNodeTree(context, childNode.shadowRoot, container, root);
-                    }
-                    else if (!(0, node_type_guards_1.isTextareaElement)(childNode) &&
-                        !(0, node_type_guards_1.isSVGElement)(childNode) &&
-                        !(0, node_type_guards_1.isSelectElement)(childNode)) {
-                        parseNodeTree(context, childNode, container, root);
-                    }
+        else {
+            const container = createContainer(context, childNode);
+            if (container.styles.isVisible()) {
+                if (createsRealStackingContext(childNode, container, root)) {
+                    container.createsRealStackingContext = true;
+                }
+                else if (createsStackingContext(container.styles)) {
+                    container.createsStackingContext = true;
+                }
+                if (LIST_OWNERS.indexOf(childNode.tagName) !== -1) {
+                    container.isListOwner = true;
+                }
+                parent.elements.push(container);
+                if (childNode.shadowRoot) {
+                    parseNodeTree(context, childNode.shadowRoot, container, root);
+                }
+                else if (!(0, node_type_guards_1.isTextareaElement)(childNode) && !(0, node_type_guards_1.isSVGElement)(childNode) && !(0, node_type_guards_1.isSelectElement)(childNode)) {
+                    parseNodeTree(context, childNode, container, root);
                 }
             }
         }

package/package.json

@@ -19,7 +19,7 @@
       "default": "./dist/html2canvas-pro.esm.js"
     }
   },
-  "version": "2.3.3",
+  "version": "2.3.5",
   "author": {
     "name": "yorickshan",
     "email": "yorickshan@gmail.com",