html2canvas-pro 2.3.3 → 2.3.5

package/dist/html2canvas-pro.js

@@ -1,5 +1,5 @@
 /*!
-* html2canvas-pro 2.3.3 <https://yorickshan.github.io/html2canvas-pro/>
+* html2canvas-pro 2.3.5 <https://yorickshan.github.io/html2canvas-pro/>
 * Copyright (c) 2024-present yorickshan and html2canvas-pro contributors
 * Released under MIT License
 */
@@ -1734,9 +1734,10 @@
 		let arg = [];
 		tokens.forEach((token) => {
 			if (token.type === 4) {
-				if (arg.length === 0) throw new Error(`Error parsing function args, zero tokens for arg`);
-				args.push(arg);
-				arg = [];
+				if (arg.length) {
+					args.push(arg);
+					arg = [];
+				}
 				return;
 			}
 			if (token.type !== 31) arg.push(token);
@@ -6735,7 +6736,8 @@
 	};
 	const parseCache = /* @__PURE__ */ 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;
+		if (rawValue.trim() === "") rawValue = descriptor.initialValue;
 		let valueCache = parseCache.get(descriptor);
 		if (valueCache) {
 			const cached = valueCache.get(rawValue);
@@ -8184,18 +8186,29 @@
 	const parseNodeTree = (context, node, parent, root) => {
 		for (let childNode = node.firstChild, nextNode; childNode; childNode = nextNode) {
 			nextNode = childNode.nextSibling;
-			if (isTextNode(childNode) && childNode.data.length > 0) parent.textNodes.push(new TextContainer(context, childNode, parent.styles));
-			else if (isElementNode(childNode)) if (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 (!isTextareaElement(childNode) && !isSVGElement(childNode) && !isSelectElement(childNode)) parseNodeTree(context, childNode, container, root);
-				}
+			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) => {
+		if (isTextNode(childNode) && childNode.data.length > 0) parent.textNodes.push(new TextContainer(context, childNode, parent.styles));
+		else if (isElementNode(childNode)) if (isSlotElement(childNode) && childNode.assignedNodes) childNode.assignedNodes().forEach((assignedNode) => parseChildNode(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 (!isTextareaElement(childNode) && !isSVGElement(childNode) && !isSelectElement(childNode)) parseNodeTree(context, childNode, container, root);
 			}
 		}
 	};