@pdfme/ui 6.2.1-dev.13 → 6.2.1

package/dist/index.js

@@ -86113,7 +86113,7 @@ var getDynamicLayoutForTable = async (value, args) => {
 	};
 };
 //#endregion
-//#region ../schemas/dist/utils-BhkbT1F9.js
+//#region ../schemas/dist/utils-CPYF2FY_.js
 var convertForPdfLayoutProps = ({ schema, pageHeight, applyRotateTranslate = true }) => {
 	const { width: mmWidth, height: mmHeight, position, rotate, opacity } = schema;
 	const { x: mmX, y: mmY } = position;
@@ -86153,26 +86153,7 @@ var rotatePoint = (point, pivot, angleDegrees) => {
 	};
 };
 var isEditable = (mode, schema) => mode === "designer" || mode === "form" && schema.readOnly !== true;
-var splitHexAlpha = (hexColor) => {
-	if (!hexColor.startsWith("#")) return {
-		color: hexColor,
-		alpha: 1
-	};
-	const hex = hexColor.slice(1);
-	if (!/^(?:[0-9a-f]{4}|[0-9a-f]{8})$/i.test(hex)) return {
-		color: hexColor,
-		alpha: 1
-	};
-	const rgbLength = hex.length === 4 ? 3 : 6;
-	const alphaHex = hex.slice(rgbLength);
-	return {
-		color: `#${hex.slice(0, rgbLength)}`,
-		alpha: parseInt(alphaHex.length === 1 ? alphaHex.repeat(2) : alphaHex, 16) / 255
-	};
-};
-var applyAlphaToOpacity = (opacity, alpha) => alpha === 1 ? opacity : (opacity ?? 1) * alpha;
 var hex2rgb = (hex) => {
-	hex = splitHexAlpha(hex).color;
 	if (hex.slice(0, 1) === "#") hex = hex.slice(1);
 	if (hex.length === 3) hex = hex.slice(0, 1) + hex.slice(0, 1) + hex.slice(1, 2) + hex.slice(1, 2) + hex.slice(2, 3) + hex.slice(2, 3);
 	return [
@@ -86181,6 +86162,11 @@ var hex2rgb = (hex) => {
 		hex.slice(4, 6)
 	].map((str) => parseInt(str, 16));
 };
+var getHexOpacity = (hex) => {
+	const normalized = hex.startsWith("#") ? hex.slice(1) : hex;
+	const opacityHex = normalized.length === 4 ? normalized.slice(3, 4).repeat(2) : normalized.length === 8 ? normalized.slice(6, 8) : "";
+	return opacityHex ? parseInt(opacityHex, 16) / 255 : 1;
+};
 var rgbColorToCmykColor = ({ red, green, blue }) => {
 	const key = 1 - Math.max(red, green, blue);
 	return cmyk(key === 1 ? 0 : (1 - red - key) / (1 - key), key === 1 ? 0 : (1 - green - key) / (1 - key), key === 1 ? 0 : (1 - blue - key) / (1 - key), key);
@@ -86195,7 +86181,11 @@ var hex2RgbColor = (hexString) => {
 var hex2CmykColor = (hexString) => {
 	if (hexString) {
 		if (!isHexValid(hexString)) throw new Error(`Invalid hex color value ${hexString}`);
-		const [r, g, b] = hex2rgb(hexString).map((value) => value / 255);
+		let [r, g, b] = hex2rgb(hexString).map((value) => value / 255);
+		const opacity = getHexOpacity(hexString);
+		r = r * opacity + (1 - opacity);
+		g = g * opacity + (1 - opacity);
+		b = b * opacity + (1 - opacity);
 		return rgbColorToCmykColor(rgb(r, g, b));
 	}
 };
@@ -86416,7 +86406,7 @@ var Underline = [["path", { d: "M6 4v6a6 6 0 0 0 12 0V4" }], ["line", {
 	y2: "20"
 }]];
 //#endregion
-//#region ../schemas/dist/builtins-BEweDprE.js
+//#region ../schemas/dist/builtins-C-2wyB_3.js
 var addUriLinkAnnotation = (arg) => {
 	const { pdfDoc, page, uri, rect, borderWidth = 0 } = arg;
 	const safeUri = normalizeSafeLinkUri(uri);
@@ -86524,7 +86514,7 @@ var getLinkAnnotationRect = (arg) => {
 	});
 };
 var drawRun = (arg) => {
-	const { page, pdfLib, run, pdfFont, x, y, rotate, pivotPoint, fontSize, lineHeight, color, opacity, textOpacity, colorType, characterSpacing, strikethrough, underline } = arg;
+	const { page, pdfLib, run, pdfFont, x, y, rotate, pivotPoint, fontSize, lineHeight, color, opacity, colorType, characterSpacing, strikethrough, underline } = arg;
 	const runWidth = getRunWidth(run, fontSize, characterSpacing);
 	const codePadding = run.code ? CODE_HORIZONTAL_PADDING : 0;
 	const textX = x + codePadding;
@@ -86559,7 +86549,7 @@ var drawRun = (arg) => {
 		pivotPoint,
 		fontSize,
 		color,
-		opacity: textOpacity
+		opacity
 	});
 	if (underline && runWidth > 0) drawDecorationLine({
 		page,
@@ -86570,7 +86560,7 @@ var drawRun = (arg) => {
 		pivotPoint,
 		fontSize,
 		color,
-		opacity: textOpacity
+		opacity
 	});
 	const drawAt = (drawX) => {
 		const point = rotate.angle === 0 ? {
@@ -86588,7 +86578,7 @@ var drawRun = (arg) => {
 			color,
 			lineHeight: lineHeight * fontSize,
 			font: pdfFont,
-			opacity: textOpacity,
+			opacity,
 			...run.syntheticItalic ? { ySkew: pdfLib.degrees(12) } : {}
 		});
 	};
@@ -86599,8 +86589,7 @@ var drawRun = (arg) => {
 	}
 };
 var renderInlineMarkdownText = async (arg) => {
-	const { value, schema, font, embedPdfFont, fontKitFont, pdfDoc, page, pdfLib, _cache, colorType, fontSize, color, alignment, verticalAlignment, lineHeight, characterSpacing, x, y, width, height, pivotPoint, rotate, opacity, colorAlpha } = arg;
-	const textOpacity = applyAlphaToOpacity(opacity, colorAlpha);
+	const { value, schema, font, embedPdfFont, fontKitFont, pdfDoc, page, pdfLib, _cache, colorType, fontSize, color, alignment, verticalAlignment, lineHeight, characterSpacing, x, y, width, height, pivotPoint, rotate, opacity } = arg;
 	const lines = applyTextLineRange(layoutRichTextLines({
 		runs: await resolveRichTextRuns({
 			runs: parseInlineMarkdown(value),
@@ -86646,7 +86635,7 @@ var renderInlineMarkdownText = async (arg) => {
 				pivotPoint,
 				fontSize,
 				color,
-				opacity: textOpacity
+				opacity
 			});
 			if (schema.underline) drawDecorationLine({
 				page,
@@ -86657,7 +86646,7 @@ var renderInlineMarkdownText = async (arg) => {
 				pivotPoint,
 				fontSize,
 				color,
-				opacity: textOpacity
+				opacity
 			});
 		}
 		line.runs.reduce((currentX, run, runIndex) => {
@@ -86676,7 +86665,6 @@ var renderInlineMarkdownText = async (arg) => {
 				lineHeight,
 				color,
 				opacity,
-				textOpacity,
 				colorType,
 				characterSpacing: spacing,
 				strikethrough: Boolean(run.strikethrough),
@@ -86729,14 +86717,13 @@ var embedAndGetFont = (arg) => {
 	const pdfFontCache = getPdfFontCache(_cache);
 	const cachedFont = pdfFontCache[fontName];
 	if (cachedFont) return cachedFont;
+	const fontValue = font[fontName];
+	if (!fontValue) return Promise.reject(/* @__PURE__ */ new Error(`[@pdfme/schemas] Font "${fontName}" is not found.`));
 	const pdfFontPromise = (async () => {
-		const fontValue = font[fontName];
-		if (!fontValue) throw new Error(`[@pdfme/schemas] Font "${fontName}" is not found.`);
 		let fontData = fontValue.data;
 		if (typeof fontData === "string" && fontData.startsWith("http")) fontData = await fetchRemoteFontData(fontData);
 		return pdfDoc.embedFont(fontData, { subset: typeof fontValue.subset === "undefined" ? true : fontValue.subset });
 	})();
-	pdfFontPromise.catch(() => {});
 	pdfFontCache[fontName] = pdfFontPromise;
 	return pdfFontPromise;
 };
@@ -86746,16 +86733,14 @@ var getFontProp = ({ value, fontKitFont, schema, basePdf, colorType, fontSize: r
 		fontKitFont,
 		value
 	}) : schema.fontSize ?? 13);
-	const { color: fontColorHex, alpha: colorAlpha } = splitHexAlpha(schema.fontColor || "#000000");
-	const color = hex2PrintingColor(fontColorHex, colorType);
+	const color = hex2PrintingColor(schema.fontColor || "#000000", colorType);
 	return {
 		alignment: schema.alignment ?? "left",
 		verticalAlignment: schema.verticalAlignment ?? "top",
 		lineHeight: schema.lineHeight ?? 1,
 		characterSpacing: schema.characterSpacing ?? 0,
 		fontSize,
-		color,
-		colorAlpha
+		color
 	};
 };
 var pdfRender = async (arg) => {
@@ -86797,7 +86782,7 @@ var pdfRender = async (arg) => {
 		_cache
 	});
 	const fontKitFont = await getFontKitFont(schema.fontName, font, _cache);
-	const { fontSize, color, colorAlpha, alignment, verticalAlignment, lineHeight, characterSpacing } = getFontProp({
+	const { fontSize, color, alignment, verticalAlignment, lineHeight, characterSpacing } = getFontProp({
 		value: enableInlineMarkdown ? stripInlineMarkdown(value) : value,
 		fontKitFont,
 		schema,
@@ -86810,7 +86795,6 @@ var pdfRender = async (arg) => {
 			_cache
 		}) : void 0
 	});
-	const textOpacity = applyAlphaToOpacity(opacity, colorAlpha);
 	if (enableInlineMarkdown) {
 		await renderInlineMarkdownText({
 			value,
@@ -86840,8 +86824,7 @@ var pdfRender = async (arg) => {
 			height: contentHeight,
 			pivotPoint,
 			rotate,
-			opacity,
-			colorAlpha
+			opacity
 		});
 		return;
 	}
@@ -86893,7 +86876,7 @@ var pdfRender = async (arg) => {
 				}, pivotPoint, rotate.angle),
 				thickness: 1 / 12 * fontSize,
 				color,
-				opacity: textOpacity
+				opacity
 			});
 		}
 		if (schema.underline && textWidth > 0) {
@@ -86910,7 +86893,7 @@ var pdfRender = async (arg) => {
 				}, pivotPoint, rotate.angle),
 				thickness: 1 / 12 * fontSize,
 				color,
-				opacity: textOpacity
+				opacity
 			});
 		}
 		if (rotate.angle !== 0) {
@@ -86930,7 +86913,7 @@ var pdfRender = async (arg) => {
 			color,
 			lineHeight: lineHeight * fontSize,
 			font: pdfFontValue,
-			opacity: textOpacity
+			opacity
 		});
 	});
 };
@@ -86954,24 +86937,21 @@ var drawTextBoxDecoration = (arg) => {
 			height: rect.height,
 			rotate,
 			color: rect.color,
-			opacity: opacity * rect.alpha
+			opacity
 		});
 	};
 	if (schema.backgroundColor) {
-		const { color: bgHex, alpha } = splitHexAlpha(schema.backgroundColor);
-		const color = hex2PrintingColor(bgHex, colorType);
+		const color = hex2PrintingColor(schema.backgroundColor, colorType);
 		if (color) drawRectangle({
 			x,
 			y,
 			width,
 			height,
-			color,
-			alpha
+			color
 		});
 	}
 	if (!schema.borderColor || !hasBoxDimension(schema.borderWidth)) return;
-	const { color: borderHex, alpha } = splitHexAlpha(schema.borderColor);
-	const color = hex2PrintingColor(borderHex, colorType);
+	const color = hex2PrintingColor(schema.borderColor, colorType);
 	if (!color) return;
 	const top = mm2pt(borderWidth.top);
 	const right = mm2pt(borderWidth.right);
@@ -86982,32 +86962,28 @@ var drawTextBoxDecoration = (arg) => {
 		y: y + height - top,
 		width,
 		height: top,
-		color,
-		alpha
+		color
 	});
 	drawRectangle({
 		x: x + width - right,
 		y,
 		width: right,
 		height,
-		color,
-		alpha
+		color
 	});
 	drawRectangle({
 		x,
 		y,
 		width,
 		height: bottom,
-		color,
-		alpha
+		color
 	});
 	drawRectangle({
 		x,
 		y,
 		width: left,
 		height,
-		color,
-		alpha
+		color
 	});
 };
 var TextStrikethroughIcon = createSvgStr(Strikethrough);