html2canvas-pro 2.4.1 → 2.4.3

package/dist/html2canvas-pro.cjs

@@ -1,5 +1,5 @@
 /*!
-* html2canvas-pro 2.4.1 <https://yorickshan.github.io/html2canvas-pro/>
+* html2canvas-pro 2.4.3 <https://yorickshan.github.io/html2canvas-pro/>
 * Copyright (c) 2024-present yorickshan and html2canvas-pro contributors
 * Released under MIT License
 */
@@ -5328,10 +5328,15 @@ const fontFamily = {
 	parse: (_context, tokens) => {
 		const accumulator = [];
 		const results = [];
+		const quoted = [];
+		let isQuoted = false;
 		tokens.forEach((token) => {
 			switch (token.type) {
 				case 20:
+					accumulator.push(token.value);
+					break;
 				case 0:
+					isQuoted = true;
 					accumulator.push(token.value);
 					break;
 				case 17:
@@ -5339,12 +5344,17 @@ const fontFamily = {
 					break;
 				case 4:
 					results.push(accumulator.join(" "));
+					quoted.push(isQuoted);
+					isQuoted = false;
 					accumulator.length = 0;
 					break;
 			}
 		});
-		if (accumulator.length) results.push(accumulator.join(" "));
-		return results.map((result) => result.indexOf(" ") === -1 ? result : `'${result}'`);
+		if (accumulator.length) {
+			results.push(accumulator.join(" "));
+			quoted.push(isQuoted);
+		}
+		return results.map((result, index) => quoted[index] || result.indexOf(" ") !== -1 ? `'${result.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/\n/g, "\\a ").replace(/\r/g, "\\d ").replace(/\f/g, "\\c ")}'` : result);
 	}
 };
 //#endregion
@@ -9733,21 +9743,20 @@ var BackgroundRenderer = class {
 		}
 		if (rx > 0 && ry > 0) {
 			const cacheKey = `rg|${Math.round(x)}x${Math.round(y)}|${Math.round(rx)}x${Math.round(ry)}|${JSON.stringify(backgroundImage.stops)}`;
+			const stops = processColorStops(backgroundImage.stops, rx * 2);
+			const lastStop = stops[stops.length - 1];
 			let pattern = this.patternCache.get(cacheKey);
 			if (!pattern) {
-				const ownerDocument = this.canvas.ownerDocument ?? document;
-				const size = Math.ceil(Math.max(rx, ry) * 2);
-				const offscreen = ownerDocument.createElement("canvas");
-				offscreen.width = size;
-				offscreen.height = size;
+				const offscreen = (this.canvas.ownerDocument ?? document).createElement("canvas");
+				offscreen.width = Math.ceil(rx * 2);
+				offscreen.height = Math.ceil(ry * 2);
 				const offCtx = offscreen.getContext("2d");
 				if (offCtx) {
-					const offRadius = Math.max(rx, ry);
-					const gradient = offCtx.createRadialGradient(offRadius, offRadius, 0, offRadius, offRadius, offRadius);
-					processColorStops(backgroundImage.stops, offRadius * 2).forEach((s) => gradient.addColorStop(s.stop, asString(s.color)));
+					const gradient = offCtx.createRadialGradient(rx, rx, 0, rx, rx, rx);
+					stops.forEach((s) => gradient.addColorStop(s.stop, asString(s.color)));
 					offCtx.fillStyle = gradient;
 					if (rx !== ry) offCtx.scale(1, ry / rx);
-					offCtx.fillRect(0, 0, offRadius * 2, offRadius * 2);
+					offCtx.fillRect(0, 0, rx * 2, rx * 2);
 					pattern = this.ctx.createPattern(offscreen, "no-repeat");
 					this.patternCache.set(cacheKey, pattern);
 				}
@@ -9756,9 +9765,13 @@ var BackgroundRenderer = class {
 				this.path(path);
 				this.ctx.save();
 				this.ctx.clip();
-				this.ctx.translate(left + x - Math.max(rx, ry), top + y - Math.max(rx, ry));
+				if (lastStop) {
+					this.ctx.fillStyle = asString(lastStop.color);
+					this.ctx.fill();
+				}
+				this.ctx.translate(left + x - rx, top + y - ry);
 				this.ctx.fillStyle = pattern;
-				this.ctx.fillRect(0, 0, Math.max(rx, ry) * 2, Math.max(rx, ry) * 2);
+				this.ctx.fillRect(0, 0, rx * 2, ry * 2);
 				this.ctx.restore();
 			}
 		}