@postermywall/fabricjs-2 7.4.0-pmw-70 → 7.4.0-pmw-71

package/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [next]
 
+- fix(text): an SVG `letter-spacing: normal` (Office exports) reads as no extra spacing instead of the raw string, and a non-finite glyph reach can no longer size a text cache canvas to 0 and crash the render with `drawImage ... width or height of 0` (pmw-71)
 - feat(text): export list markers as SVG spans where the canvas draws them, write the gradient definitions of per-character fills, and read a right-to-left line's glyph reach by each glyph's own ink (pmw-70)
 - feat(text): measure each glyph's ink reach and size the text and group caches from it, so swashes and descenders of any font are not cut (pmw-69)
 - Upgrade 7.4.0 [#4](https://github.com/fabricjs/fabric.js/pull/4)

package/dist/index.js

@@ -452,7 +452,7 @@
 	const cache = new Cache();
 	//#endregion
 	//#region src/constants.ts
-	const VERSION = "7.4.0-pmw-70";
+	const VERSION = "7.4.0-pmw-71";
 	function noop() {}
 	const halfPI = Math.PI / 2;
 	const quarterPI = Math.PI / 4;
@@ -8745,8 +8745,10 @@
 			ouputValue = parseFloat(value);
 			if (parentAttributes && typeof parentAttributes.opacity !== "undefined") ouputValue *= parentAttributes.opacity;
 		} else if (attr === "textAnchor") ouputValue = value === "start" ? LEFT : value === "end" ? RIGHT : CENTER;
-		else if (attr === "charSpacing" || attr === "textDecorationThickness") parsed = parseUnit(value, fontSize) / fontSize * 1e3;
-		else if (attr === "paintFirst") {
+		else if (attr === "charSpacing" || attr === "textDecorationThickness") {
+			parsed = parseUnit(value, fontSize) / fontSize * 1e3;
+			if (attr === "charSpacing" && !Number.isFinite(parsed)) parsed = 0;
+		} else if (attr === "paintFirst") {
 			const fillIndex = value.indexOf(FILL);
 			const strokeIndex = value.indexOf(STROKE);
 			ouputValue = FILL;
@@ -16125,6 +16127,12 @@
 	/** Peak rise = (period / 2) × this factor: 6.75 text units at the reference size. */
 	const SQUIGGLY_LINE_WAVE_RISE_FACTOR = 5 * .45;
 	/**
+	* *PMW* `Math.max` over the finite candidates only. A NaN or infinite reach (a character
+	* bound poisoned by bad input) must never size a cache canvas: `canvas.width = NaN` is 0 and
+	* the next `drawImage` of that canvas throws.
+	*/
+	const maxFinite = (current, ...candidates) => candidates.reduce((max, candidate) => Number.isFinite(candidate) ? Math.max(max, candidate) : max, current);
+	/**
 	* Text class
 	* @see {@link http://fabric5.fabricjs.com/fabric-intro-part-2#text}
 	*/
@@ -16347,16 +16355,16 @@
 				for (let charIndex = 0; bounds && charIndex < this._textLines[lineIndex].length; charIndex++) {
 					const box = bounds[charIndex], ink = box.ink;
 					if (!ink) continue;
-					horizontal = isRtl ? Math.max(horizontal, ink.left, ink.right - box.width) : Math.max(horizontal, ink.left - box.left - leftOffset, box.left + ink.right - rightEdge);
-					if (lineIndex === 0) vertical = Math.max(vertical, ink.ascent - box.deltaY - baselineFromTop);
-					if (lineIndex === lineCount - 1) vertical = Math.max(vertical, ink.descent + box.deltaY - roomBelowBaseline);
+					horizontal = isRtl ? maxFinite(horizontal, ink.left, ink.right - box.width) : maxFinite(horizontal, ink.left - box.left - leftOffset, box.left + ink.right - rightEdge);
+					if (lineIndex === 0) vertical = maxFinite(vertical, ink.ascent - box.deltaY - baselineFromTop);
+					if (lineIndex === lineCount - 1) vertical = maxFinite(vertical, ink.descent + box.deltaY - roomBelowBaseline);
 				}
 				lineTop += this.getHeightOfLine(lineIndex);
 			}
 			const strokeReach = this.stroke ? this.strokeWidth / 2 : 0;
 			return {
-				horizontal: Math.max(0, horizontal + strokeReach),
-				vertical: Math.max(0, vertical + strokeReach)
+				horizontal: maxFinite(0, horizontal + strokeReach),
+				vertical: maxFinite(0, vertical + strokeReach)
 			};
 		}
 		/**