@postermywall/fabricjs-2 7.1.0-pmw-69 → 7.4.0-pmw-71

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## [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.1.0-pmw-69";
+	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;
@@ -15862,7 +15864,26 @@
 	var TextSVGExportMixin = class extends FabricObjectSVGExportMixin {
 		_toSVG() {
 			const offsets = this._getSVGLeftTopOffsets(), textAndBg = this._getSVGTextAndBg(offsets.textTop, offsets.textLeft);
-			return this._wrapSVGTextAndBg(textAndBg);
+			return [...this._getStyledCharFillerMarkup(), ...this._wrapSVGTextAndBg(textAndBg)];
+		}
+		/**
+		* *PMW* The gradient definitions of per-character fills. The object-level fill is written by
+		* _createBaseSVGMarkup, but a styled character's gradient only ever appeared as a `url(#id)`
+		* reference, so the text rendered black in any SVG consumer.
+		*/
+		_getStyledCharFillerMarkup() {
+			const seen = /* @__PURE__ */ new Set(), markup = [];
+			Object.values(this.styles).forEach((line) => {
+				Object.values(line).forEach((declaration) => {
+					var _declaration$fill;
+					const fill = (_declaration$fill = declaration.fill) !== null && _declaration$fill !== void 0 ? _declaration$fill : null;
+					if (isFiller(fill) && !seen.has(String(fill.id))) {
+						seen.add(String(fill.id));
+						markup.push(fill.toSVG(this));
+					}
+				});
+			});
+			return markup;
 		}
 		toSVG(reviver) {
 			const textSvg = this._createBaseSVGMarkup(this._toSVG(), {
@@ -15918,6 +15939,7 @@
 				lineOffset = this._getLineLeftOffset(i);
 				if (this.direction === "rtl") lineOffset += this.width;
 				if (this.textBackgroundColor || this.styleHas("textBackgroundColor", i)) this._setSVGTextLineBg(textBgRects, i, textLeftOffset + lineOffset, height);
+				this._setSVGListMarker(textSpans, i, textLeftOffset + lineOffset, height);
 				this._setSVGTextLineText(textSpans, i, textLeftOffset + lineOffset, height);
 				height += this.getHeightOfLine(i);
 			}
@@ -15942,6 +15964,21 @@
 			}
 			return `<tspan x="${toFixed(left, numFractionDigit)}" y="${toFixed(top, numFractionDigit)}" ${dySpan}${angleAttr}${fillStyles}>${escapeXml(char)}</tspan>`;
 		}
+		/**
+		* *PMW* The list marker of a visual row as its own span, placed exactly where the canvas
+		* render draws it ({@link FabricText#_getListMarkerPlacement}): the row's text start is the
+		* span's left offset and the row's bottom is its top offset plus the line height.
+		*/
+		_setSVGListMarker(textSpans, lineIndex, textLeftOffset, textTopOffset) {
+			const placed = this._getListMarkerPlacement(lineIndex, textLeftOffset, textTopOffset + this.getHeightOfLineImpl(lineIndex));
+			if (!placed) return;
+			const styleProps = this.getSvgSpanStyles({
+				fontFamily: placed.fontFamily,
+				fontSize: placed.fontSize,
+				fill: placed.fill
+			}, true);
+			textSpans.push(`<tspan x="${toFixed(placed.left, config.NUM_FRACTION_DIGITS)}" y="${toFixed(placed.baseline, config.NUM_FRACTION_DIGITS)}" style="${styleProps}">${escapeXml(placed.marker)}</tspan>`);
+		}
 		_setSVGTextLineText(textSpans, lineIndex, textLeftOffset, textTopOffset) {
 			const lineHeight = this.getHeightOfLine(lineIndex), isJustify = this.textAlign.includes(JUSTIFY), line = this._textLines[lineIndex];
 			let actualStyle, nextStyle, charsToRender = "", charBox, style, boxWidth = 0, timeToRender;
@@ -16090,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}
 	*/
@@ -16293,7 +16336,8 @@
 		/**
 		* *PMW* Walks every measured grapheme: horizontally, its ink left of the line start and
 		* right of the box edge, both after the line's alignment offset (a right-to-left line lays
-		* its graphemes out mirrored, so it takes no offset credit and reads conservatively);
+		* its graphemes out mirrored, so it counts each glyph's reach past its own advance box
+		* instead, with no alignment credit, and reads conservatively);
 		* vertically, the first line's ink above its baseline and the last line's ink below the
 		* box bottom. A stroke paints half its width outside the outline on every side.
 		* @private
@@ -16307,20 +16351,20 @@
 			let horizontal = 0, vertical = 0, lineTop = 0;
 			for (let lineIndex = 0; lineIndex < lineCount; lineIndex++) {
 				this.getLineWidth(lineIndex);
-				const bounds = this.__charBounds[lineIndex], isRtl = this.direction === "rtl", leftOffset = isRtl ? 0 : this._getLineLeftOffset(lineIndex), rightEdge = isRtl ? this.getLineWidth(lineIndex) : this.width - leftOffset, baselineFromTop = lineTop + this.getHeightOfLineImpl(lineIndex) * (1 - this._fontSizeFraction), roomBelowBaseline = this.height - baselineFromTop;
+				const bounds = this.__charBounds[lineIndex], isRtl = this.direction === "rtl", leftOffset = this._getLineLeftOffset(lineIndex), rightEdge = this.width - leftOffset, baselineFromTop = lineTop + this.getHeightOfLineImpl(lineIndex) * (1 - this._fontSizeFraction), roomBelowBaseline = this.height - baselineFromTop;
 				for (let charIndex = 0; bounds && charIndex < this._textLines[lineIndex].length; charIndex++) {
 					const box = bounds[charIndex], ink = box.ink;
 					if (!ink) continue;
-					horizontal = 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)
 			};
 		}
 		/**
@@ -16651,6 +16695,7 @@
 		* @param {Number} lineIndex index of line to calculate
 		* @return {Number}
 		*/
+		/** *PMW* also read by the SVG export mixin, which is a separate class */
 		getHeightOfLineImpl(lineIndex) {
 			const lh = this.__lineHeights;
 			if (lh[lineIndex]) return lh[lineIndex];
@@ -17056,27 +17101,50 @@
 		* @private
 		*/
 		_renderListMarker(ctx, visualLineIndex, lineDrawLeft, lineDrawTop) {
-			var _this$lineStyles$real2, _this$lineStyles$real3;
-			if (!this._isStartOfRealLine(visualLineIndex)) return;
-			const realLineIndex = this._getRealLineIndex(visualLineIndex);
-			const marker = (_this$lineStyles$real2 = this.lineStyles[realLineIndex]) === null || _this$lineStyles$real2 === void 0 ? void 0 : _this$lineStyles$real2.listMarker;
-			if (!marker) return;
-			const { fontSize, fontFamily, fill } = this._getListMarkerStyle(realLineIndex);
-			const gap = LIST_MARKER_GAP_FACTOR * fontSize;
-			const markerLeft = this.direction === "rtl" ? lineDrawLeft + gap : lineDrawLeft - gap - this._measureListMarkerWidth(realLineIndex);
+			const placed = this._getListMarkerPlacement(visualLineIndex, lineDrawLeft, lineDrawTop);
+			if (!placed) return;
 			ctx.save();
 			ctx.direction = "ltr";
 			ctx.textAlign = LEFT;
 			ctx.font = this._getFontDeclaration({
-				fontSize,
-				fontFamily
+				fontSize: placed.fontSize,
+				fontFamily: placed.fontFamily
 			});
-			ctx.fillStyle = fill;
-			const unorderedMarkerRaise = ((_this$lineStyles$real3 = this.lineStyles[realLineIndex]) === null || _this$lineStyles$real3 === void 0 ? void 0 : _this$lineStyles$real3.listMarkerFontFamily) ? fontSize / UNORDERED_MARKER_RAISE_FACTOR : 0;
-			ctx.fillText(String(marker), markerLeft, lineDrawTop - this.getHeightOfLineImpl(visualLineIndex) * this._fontSizeFraction - unorderedMarkerRaise);
+			ctx.fillStyle = placed.fill;
+			ctx.fillText(placed.marker, placed.left, placed.baseline);
 			ctx.restore();
 		}
 		/**
+		* *PMW* Where a visual row's list marker is drawn, in text units, given the row's own draw
+		* anchors (`lineDrawLeft` is the row's text start, `lineDrawTop` its bottom). Shared by the
+		* canvas render and the SVG export so both put the marker in the same place. Null when the
+		* row does not start a listed real line.
+		*
+		* LTR: right-aligned in the LEFT gutter (like the legacy bullets textbox) — the marker's
+		* right edge sits a fixed gap from the text column, so ordinal periods line up and digits
+		* grow left. RTL mirrors: the gutter (and the marker) sit RIGHT of the text, whose draw
+		* anchor is its right edge there. An unordered glyph is raised a little above the baseline.
+		* @private
+		*/
+		_getListMarkerPlacement(visualLineIndex, lineDrawLeft, lineDrawTop) {
+			var _this$lineStyles$real2, _this$lineStyles$real3;
+			if (!this._isStartOfRealLine(visualLineIndex)) return null;
+			const realLineIndex = this._getRealLineIndex(visualLineIndex);
+			const marker = (_this$lineStyles$real2 = this.lineStyles[realLineIndex]) === null || _this$lineStyles$real2 === void 0 ? void 0 : _this$lineStyles$real2.listMarker;
+			if (!marker) return null;
+			const { fontSize, fontFamily, fill } = this._getListMarkerStyle(realLineIndex);
+			const gap = LIST_MARKER_GAP_FACTOR * fontSize;
+			const unorderedMarkerRaise = ((_this$lineStyles$real3 = this.lineStyles[realLineIndex]) === null || _this$lineStyles$real3 === void 0 ? void 0 : _this$lineStyles$real3.listMarkerFontFamily) ? fontSize / UNORDERED_MARKER_RAISE_FACTOR : 0;
+			return {
+				marker: String(marker),
+				fontSize,
+				fontFamily,
+				fill,
+				left: this.direction === "rtl" ? lineDrawLeft + gap : lineDrawLeft - gap - this._measureListMarkerWidth(realLineIndex),
+				baseline: lineDrawTop - this.getHeightOfLineImpl(visualLineIndex) * this._fontSizeFraction - unorderedMarkerRaise
+			};
+		}
+		/**
 		* *PMW* Sets or clears (align undefined) one real line's alignment override.
 		*/
 		setLineAlignment(realLineIndex, align) {