@pdfme/schemas 6.1.1-dev.12 → 6.1.1-dev.14

package/dist/index.js

@@ -246,16 +246,6 @@ var uiRender$3 = async (arg) => {
 	const renderResolvedValue = schema.readOnly === true && mode !== "designer";
 	const renderValue = renderResolvedValue ? value : isInlineMarkdownTextSchema(schema) ? substituteVariablesAsInlineMarkdownLiterals(text, value) : substituteVariables(text, value);
 	if (mode === "form" && numVariables > 0 && !renderResolvedValue) {
-		if (getTextLineRange(schema) && isInlineMarkdownTextSchema(schema)) {
-			await uiRender$4({
-				value: renderValue,
-				schema,
-				mode: "viewer",
-				rootElement,
-				...rest
-			});
-			return;
-		}
 		await formUiRender(arg);
 		return;
 	}
@@ -305,18 +295,20 @@ var formUiRender = async (arg) => {
 	const textBlock = buildStyledTextContainer(arg, await getFontKitFont(schema.fontName, font, _cache), inlineMarkdownRuns ? getInlineMarkdownFormDisplayText(inlineMarkdownRuns, variables) : substitutedText);
 	if (getTextLineRange(schema)) {
 		const { lines } = await measureTextLines({
-			value: substitutedText,
+			value: inlineMarkdownRuns ? substituteVariablesAsInlineMarkdownLiterals(rawText, variables) : substitutedText,
 			schema,
 			font,
 			_cache,
 			ignoreDynamicFontSize: true
 		});
-		renderSplitPlainVariableSpans({
+		renderSplitVariableSpans({
 			textBlock,
 			lines,
+			runs: inlineMarkdownRuns,
 			rawText,
 			variables,
 			schema,
+			font,
 			theme,
 			onChange,
 			stopEditing
@@ -371,11 +363,12 @@ var formUiRender = async (arg) => {
 		}
 	}
 };
-var renderSplitPlainVariableSpans = (arg) => {
-	const { textBlock, lines, rawText, variables, schema, theme, onChange, stopEditing } = arg;
+var renderSplitVariableSpans = (arg) => {
+	const { textBlock, lines, runs, rawText, variables, schema, font, theme, onChange, stopEditing } = arg;
 	const lineRange = getTextLineRange(schema);
-	const lineSegments = getSplitPlainLineSegments({
+	const lineSegments = getSplitLineSegments({
 		lines,
+		runs,
 		rawText,
 		variables,
 		start: lineRange?.start ?? 0,
@@ -389,6 +382,8 @@ var renderSplitPlainVariableSpans = (arg) => {
 					textBlock,
 					segment,
 					variables,
+					schema,
+					font,
 					theme,
 					onChange,
 					stopEditing
@@ -398,14 +393,20 @@ var renderSplitPlainVariableSpans = (arg) => {
 			const span = document.createElement("span");
 			span.style.letterSpacing = lineIndex === lineSegments.length - 1 ? "0" : "inherit";
 			span.textContent = segment.text;
+			if (segment.run) applyInlineMarkdownStyle({
+				element: span,
+				run: segment.run,
+				schema,
+				font
+			});
 			textBlock.appendChild(span);
 		});
 		if (lineIndex < lineSegments.length - 1) textBlock.appendChild(document.createElement("br"));
 	});
 };
-var getSplitPlainLineSegments = (arg) => {
-	const { lines, rawText, variables, start, end } = arg;
-	return consumeMeasuredLineSegments(lines, buildResolvedPlainChars(rawText, variables)).slice(start, end);
+var getSplitLineSegments = (arg) => {
+	const { lines, runs, rawText, variables, start, end } = arg;
+	return consumeMeasuredLineSegments(lines, runs ? buildResolvedInlineMarkdownChars(runs, variables) : buildResolvedPlainChars(rawText, variables), { dropUnmappedTargets: Boolean(runs) }).slice(start, end);
 };
 var buildResolvedPlainChars = (rawText, variables) => {
 	const chars = [];
@@ -423,10 +424,32 @@ var buildResolvedPlainChars = (rawText, variables) => {
 	appendTextChars(chars, rawText.slice(lastIndex));
 	return chars;
 };
-var appendTextChars = (chars, text) => {
-	for (let i = 0; i < text.length; i += 1) chars.push({ char: text[i] });
+var buildResolvedInlineMarkdownChars = (runs, variables) => {
+	const chars = [];
+	runs.forEach((run) => {
+		let lastIndex = 0;
+		visitVariables(run.text, ({ name, startIndex, endIndex }) => {
+			appendTextChars(chars, run.text.slice(lastIndex, startIndex), run);
+			const value = variables[name] ?? "";
+			for (let i = 0; i < value.length; i += 1) chars.push({
+				char: value[i],
+				variableName: name,
+				variableOffset: i,
+				run
+			});
+			lastIndex = endIndex + 1;
+		});
+		appendTextChars(chars, run.text.slice(lastIndex), run);
+	});
+	return chars;
+};
+var appendTextChars = (chars, text, run) => {
+	for (let i = 0; i < text.length; i += 1) chars.push({
+		char: text[i],
+		run
+	});
 };
-var consumeMeasuredLineSegments = (lines, resolvedChars) => {
+var consumeMeasuredLineSegments = (lines, resolvedChars, options = {}) => {
 	const lineSegments = [];
 	let cursor = 0;
 	lines.forEach((line) => {
@@ -436,6 +459,7 @@ var consumeMeasuredLineSegments = (lines, resolvedChars) => {
 			const target = lineText[i];
 			while (cursor < resolvedChars.length && resolvedChars[cursor].char !== target && isWhitespaceChar(resolvedChars[cursor].char) && !isWhitespaceChar(target)) cursor += 1;
 			if (cursor >= resolvedChars.length) {
+				if (options.dropUnmappedTargets) continue;
 				appendSegment(segments, { char: target });
 				continue;
 			}
@@ -443,7 +467,10 @@ var consumeMeasuredLineSegments = (lines, resolvedChars) => {
 			if (sourceChar.char === target) {
 				appendSegment(segments, sourceChar);
 				cursor += 1;
-			} else appendSegment(segments, { char: target });
+			} else {
+				if (options.dropUnmappedTargets) continue;
+				appendSegment(segments, { char: target });
+			}
 		}
 		cursor = absorbHiddenTrailingWhitespace(segments, resolvedChars, cursor);
 		if (line.endsWith("\r\n") || line.endsWith("\n") || line.endsWith("\r")) {
@@ -459,7 +486,7 @@ var absorbHiddenTrailingWhitespace = (segments, resolvedChars, cursor) => {
 	while (nextCursor < resolvedChars.length && isHorizontalWhitespaceChar(resolvedChars[nextCursor].char)) {
 		const sourceChar = resolvedChars[nextCursor];
 		const lastSegment = segments.at(-1);
-		if (lastSegment && lastSegment.variableName === sourceChar.variableName && lastSegment.variableEnd === sourceChar.variableOffset && sourceChar.variableOffset !== void 0) lastSegment.variableEnd = sourceChar.variableOffset + 1;
+		if (lastSegment && lastSegment.variableName === sourceChar.variableName && lastSegment.variableEnd === sourceChar.variableOffset && lastSegment.run === sourceChar.run && sourceChar.variableOffset !== void 0) lastSegment.variableEnd = sourceChar.variableOffset + 1;
 		nextCursor += 1;
 	}
 	return nextCursor;
@@ -477,7 +504,7 @@ var isWhitespaceChar = (value) => value === " " || value === "	" || value === "\
 var isHorizontalWhitespaceChar = (value) => value === " " || value === "	" || value === "\f" || value === "\v";
 var appendSegment = (segments, sourceChar) => {
 	const lastSegment = segments.at(-1);
-	if (lastSegment && lastSegment.variableName === sourceChar.variableName && lastSegment.variableEnd === sourceChar.variableOffset) {
+	if (lastSegment && lastSegment.variableName === sourceChar.variableName && lastSegment.variableEnd === sourceChar.variableOffset && lastSegment.run === sourceChar.run) {
 		lastSegment.text += sourceChar.char;
 		if (sourceChar.variableOffset !== void 0) lastSegment.variableEnd = sourceChar.variableOffset + 1;
 		return;
@@ -486,14 +513,21 @@ var appendSegment = (segments, sourceChar) => {
 		text: sourceChar.char,
 		variableName: sourceChar.variableName,
 		variableStart: sourceChar.variableOffset,
-		variableEnd: sourceChar.variableOffset === void 0 ? void 0 : sourceChar.variableOffset + 1
+		variableEnd: sourceChar.variableOffset === void 0 ? void 0 : sourceChar.variableOffset + 1,
+		run: sourceChar.run
 	});
 };
 var appendRangedVariableSpan = (arg) => {
-	const { textBlock, segment, variables, theme, onChange, stopEditing } = arg;
+	const { textBlock, segment, variables, schema, font, theme, onChange, stopEditing } = arg;
 	if (!segment.variableName) return;
 	const span = document.createElement("span");
 	span.style.outline = `${theme.colorPrimary} dashed 1px`;
+	if (segment.run) applyInlineMarkdownStyle({
+		element: span,
+		run: segment.run,
+		schema,
+		font
+	});
 	makeElementPlainTextContentEditable(span);
 	span.textContent = segment.text;
 	span.addEventListener("blur", (e) => {