@stll/folio-core 0.48.0 → 0.49.0

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -5,6 +5,7 @@ import { isInlineSdtContent, isSimpleFieldContent } from "../../docx/inlineWrapp
 import { paragraphNumberingReferenceId as paragraphNumberingReferenceId$1, sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "../../docx/numberingReference.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, ParagraphPropertySourceValidationError, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, isParagraphPropertySourceToken, linkParagraphPropertySourceCandidate, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceTokenMatchesContract, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings } from "../../docx/paragraphPropertySource.js";
 import { BLOCK_TREE_DESCENT, visitBlockTreeRecords, visitDocxParagraphs } from "../../docx/paragraphTraversal.js";
+import { refingerprintShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
 import { DATE_UTC_ATTRIBUTE } from "../../docx/trackedChangeInfo.js";
 import { copiedWrapPolygon } from "../../docx/wrapPolygon.js";
 import { isStyleSourcedParagraphNumbering, modelParagraphFormattingEmission } from "../../internal/paragraphFormattingSerialization.js";
@@ -15,12 +16,14 @@ import { canonicalJson } from "../../utils/canonicalJson.js";
 import { normalizeHorizontalScalePercent } from "../../utils/horizontalScale.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels, emuToStrokePixels, pixelsToEmu } from "../../utils/units.js";
+import { unchangedAlternateContentXml } from "../alternateContentAttrs.js";
 import { expectBlockSdtAttrs, expectCharacterSpacingMarkAttrs, expectCharacterStyleMarkAttrs, expectCommentMarkAttrs, expectEmphasisMarkAttrs, expectFieldAttrs, expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectFootnoteRefMarkAttrs, expectHardBreakAttrs, expectHighlightMarkAttrs, expectHyperlinkMarkAttrs, expectImageAttrs, expectInlineWrapperMarkAttrs, expectLanguageMarkAttrs, expectMathAttrs, expectPageBreakRunAttrs, expectParagraphAttrs, expectPreservedBlockAttrs, expectPreservedXmlAttrs, expectRunFormattingOverrideMarkAttrs, expectRunIdentityMarkAttrs, expectRunPropertyChangeMarkAttrs, expectRunShadingMarkAttrs, expectSdtAttrs, expectShapeAttrs, expectStrikeMarkAttrs, expectSymbolAttrs, expectTabAttrs, expectTableAttrs, expectTableCellAttrs, expectTableRowAttrs, expectTextBoxAttrs, expectTextColorMarkAttrs, expectTextEffectMarkAttrs, expectTrackedChangeMarkAttrs, expectUnderlineMarkAttrs } from "../attrs/index.js";
 import { readAuthoredTransform } from "../authoredTransformAttrs.js";
 import { autospacingMatchesBase, hasAutospacingBaseSide } from "../autospacingBase.js";
 import { bookmarkMarkerFromAttrs, expectBookmarkBoundaryAttrs } from "../bookmarkBoundaryAttrs.js";
 import { paragraphRejectAttrPatch, paragraphRejectOriginalFormatting, removeParagraphPropertyChanges } from "../commands/propertyChangeScope.js";
 import { expectCommentReferenceAttrs } from "../commentReferenceAttrs.js";
+import { enclosingRevisionIds } from "../contentControlRevisions.js";
 import { INLINE_WRAPPER_MARK_NAME } from "../extensions/marks/InlineWrapperExtension.js";
 import { applyRunFormattingOverrideAttrs, buildRunFormattingOverrideAttrs } from "../extensions/marks/RunFormattingOverrideExtension.js";
 import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
@@ -31,7 +34,7 @@ import { listRenderingFromAttrs as listRenderingFromAttrs$1 } from "../listRende
 import { expectMoveRangeBoundaryAttrs } from "../moveRangeBoundaryAttrs.js";
 import { resolveNumberedRefFields } from "../numberedRefFields.js";
 import { directParagraphAlignment } from "../paragraphAlignment.js";
-import { directionToBidi } from "../paragraphDirection.js";
+import { directionToAuthoredBidi } from "../paragraphDirection.js";
 import { directParagraphSpacing } from "../paragraphSpacing.js";
 import { expectRangeAnchorAttrs } from "../rangeAnchorAttrs.js";
 import { RUN_FORMATTING_MARK_NAMES } from "../runFormattingMarkNames.js";
@@ -1050,7 +1053,7 @@ function paragraphAttrsToFormatting(attrs) {
 		assignBooleanToggle(result, attrs, orig, "suppressAutoHyphens");
 		if (attrs.spacingExplicit !== orig.spacingExplicit) if (attrs.spacingExplicit) result.spacingExplicit = attrs.spacingExplicit;
 		else delete result.spacingExplicit;
-		const bidi = authoredParagraphValue("bidi", directionToBidi(attrs.direction), orig, attrs._resolvedFormatting);
+		const bidi = authoredParagraphValue("bidi", directionToAuthoredBidi(attrs.direction), orig, attrs._resolvedFormatting);
 		if (bidi !== (orig.bidi ?? void 0)) if (bidi === void 0) delete result.bidi;
 		else result.bidi = bidi;
 		return result;
@@ -1058,7 +1061,7 @@ function paragraphAttrsToFormatting(attrs) {
 	const resolved = attrs._resolvedFormatting;
 	const authored = (field, value) => authoredParagraphValue(field, value ?? void 0, void 0, resolved);
 	const outlineLevel = authored("outlineLevel", Reflect.get(attrs, "outlineLevel"));
-	const bidi = authored("bidi", directionToBidi(attrs.direction));
+	const bidi = authored("bidi", directionToAuthoredBidi(attrs.direction));
 	const snapToGrid = authored("snapToGrid", attrs.snapToGrid);
 	const indentLeft = authored("indentLeft", attrs.indentLeft);
 	const indentRight = authored("indentRight", attrs.indentRight);
@@ -1350,6 +1353,7 @@ function extractParagraphContent(paragraph, _documentCounts, emptyHyperlinks, te
 		}
 	};
 	const appendDirectRun = (node, run, coalescePlainText = false) => {
+		if (currentHyperlink) flushCurrentInline();
 		const marksKey = getMarksKey(node.marks);
 		const ownerId = runIdentityId(node);
 		const currentOwnerId = currentRun ? sourceRunOwners.get(currentRun) : void 0;
@@ -2262,6 +2266,7 @@ function createFieldFromNode(node, { baseParagraphFormatting, inheritedFormattin
 		};
 		if (attrs.fldLock !== void 0) complex.fldLock = attrs.fldLock;
 		if (attrs.dirty !== void 0) complex.dirty = attrs.dirty;
+		if (attrs.fieldResultIsFallback !== void 0) complex.fieldResultIsFallback = attrs.fieldResultIsFallback;
 		return complex;
 	}
 	const simple = {
@@ -2324,21 +2329,21 @@ function createMathFromNode(node) {
 	return math;
 }
 /**
-* A revision covering every child of a control, written around the control.
+* A revision that encloses a control, written around the control.
 *
 * `w:ins > w:sdt` and `w:sdt > w:ins` reach the editor as the same revision
-* mark on the same leaves, so the save leg has to pick one and writes the
-* canonical order: the revision outermost, as it already is around a hyperlink
-* and around a transparent wrapper. Outermost is also the only form in which
-* accepting or rejecting the change is an operation over the whole control —
-* the reader who inserted a bound field inserted the field, not its text.
+* mark on the same leaves; the control's enclosing-revision record says which
+* one it was (`contentControlRevisions.ts`). A revision it names that still
+* covers every child goes outermost, the only form in which accepting or
+* rejecting the change is an operation over the whole control: the reader who
+* inserted a bound field inserted the field, not its text.
 *
-* A revision that covers only part of the content has no such form and stays
-* where the editor holds it, per child.
+* Any other revision, including one over all of the content, revises the
+* content and stays where the editor holds it, per child.
 */
-const hoistUniformRevision = (sdt) => {
+const hoistUniformRevision = (sdt, enclosingIds) => {
 	const only = sdt.content.length === 1 ? sdt.content.at(0) : void 0;
-	if (only === void 0 || !isRevisionWrapper(only)) return sdt;
+	if (only === void 0 || !isRevisionWrapper(only) || !enclosingIds.includes(only.info.id)) return sdt;
 	const admitted = only.content.filter(isInlineSdtContent);
 	if (admitted.length !== only.content.length) return sdt;
 	return {
@@ -2359,7 +2364,7 @@ function createInlineSdtFromNode(node, textBoxAnchorMarkers, formattingContext)
 		type: "inlineSdt",
 		properties,
 		content
-	});
+	}, enclosingRevisionIds(node));
 }
 /**
 * Create a Run containing an image
@@ -2488,6 +2493,17 @@ const drawingFromImageAttrs = (image, attrs) => {
 		default: return mode;
 	}
 };
+const shapeContentFromNode = ({ node, shape, captured }) => {
+	const xml = unchangedAlternateContentXml(node, captured);
+	return xml === void 0 ? {
+		type: "shape",
+		shape
+	} : {
+		type: "shape",
+		shape,
+		alternateContent: refingerprintShapeAlternateContent(shape, xml)
+	};
+};
 /**
 * Create a Run from a ProseMirror shape node
 */
@@ -2557,10 +2573,11 @@ function createShapeRun(node) {
 		if (attrs.outlineColor) shapeOutline.color = attrs.outlineColorValue ?? { rgb: attrs.outlineColor.replace("#", "") };
 		shape.outline = shapeOutline;
 	}
-	const shapeContent = {
-		type: "shape",
-		shape
-	};
+	const shapeContent = shapeContentFromNode({
+		node,
+		shape,
+		captured: attrs._docxAlternateContent
+	});
 	const run = {
 		type: "run",
 		...carriedRunFormatting(attrs._docxRunFormatting),
@@ -3583,6 +3600,7 @@ function convertPMTextBox(node, styleResolver = null) {
 		type: "solid",
 		color: { rgb: attrs.fillColor.replace("#", "") }
 	};
+	else if (attrs.gradientFill?.gradient) shape.fill = structuredClone(attrs.gradientFill);
 	if (attrs.outlineStyle !== "none" && attrs.outlineWidth && attrs.outlineWidth > 0) {
 		const tbOutline = {
 			width: emuFromPixels(attrs.outlineWidth, "outlineWidth", authoredEmu, emuToStrokePixels),
@@ -3597,12 +3615,18 @@ function convertPMTextBox(node, styleResolver = null) {
 	if (position) shape.position = position;
 	const anchor = restoredDrawingAnchor(attrs.anchor);
 	if (anchor) shape.anchor = anchor;
+	if (attrs._docxGroupChild) shape.groupChild = {
+		path: [...attrs._docxGroupChild.path],
+		group: attrs._docxGroupChild.group,
+		content: attrs._docxGroupChild.content
+	};
 	const run = {
 		type: "run",
-		content: [{
-			type: "shape",
-			shape
-		}]
+		content: [shapeContentFromNode({
+			node,
+			shape,
+			captured: attrs._docxAlternateContent
+		})]
 	};
 	const trackedChange = attrs._docxTrackedChange;
 	const inlineSdts = attrs._docxInlineSdts ?? [];

package/dist/prosemirror/conversion/toProseDoc.js

@@ -4,6 +4,7 @@ import { isInlineSdtContent, isTrackedChangeWrapperChild } from "../../docx/inli
 import { mergeParagraphNumbering as mergeParagraphNumbering$1, paragraphNumberingReferenceId as paragraphNumberingReferenceId$1 } from "../../docx/numberingReference.js";
 import { PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, createProseParagraphWithPropertySource, getDocumentParagraphPropertySourceContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithParagraphPropertySource, transportTableCellsWithParagraphPropertySources } from "../../docx/paragraphPropertySource.js";
 import { isBaselineVertAlign } from "../../docx/runParser.js";
+import { replayableShapeAlternateContent } from "../../docx/shapeAlternateContent.js";
 import { resolveTableLook } from "../../docx/tableLook.js";
 import { isCellMergeContinuation } from "../../docx/tableParser.js";
 import { copiedWrapPolygon } from "../../docx/wrapPolygon.js";
@@ -16,9 +17,11 @@ import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/pa
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels, emuToStrokePixels } from "../../utils/units.js";
+import { withAlternateContent } from "../alternateContentAttrs.js";
 import { expectInlineWrapperMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
 import { authoredTransformAttrs } from "../authoredTransformAttrs.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
+import { withEnclosingRevision } from "../contentControlRevisions.js";
 import { planEmptyRanges } from "../emptyRangeAnchor.js";
 import { INLINE_WRAPPER_MARK_NAME } from "../extensions/marks/InlineWrapperExtension.js";
 import { textFormattingToMarks } from "../extensions/marks/markUtils.js";
@@ -34,6 +37,7 @@ import { directionFromBidi } from "../paragraphDirection.js";
 import { styleResolvedParagraphFormatting } from "../paragraphFormattingProvenance.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
 import { RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs } from "../runIdentity.js";
+import { continueRunIdentitiesAcrossRevisions } from "../runIdentityAcrossRevisions.js";
 import { getParagraphMarkSuppressionOverrides, hasDirectRunFormatting, resolveParagraphBodyRunFormatting, stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting, suppressParagraphMarkFormatting } from "../runStyleFormatting.js";
 import { schema } from "../schema/index.js";
 import { PRESERVED_XML_LEVELS } from "../schema/nodes.js";
@@ -86,7 +90,7 @@ const runIdentityMark = (run, nextRunIdentityId) => {
 	const payload = {
 		preservedAttributes: run.preservedAttributes,
 		preserved: run.formatting?.preserved,
-		emptyFormatting: run.formatting !== void 0 && Object.keys(run.formatting).length === 0 ? true : void 0
+		emptyFormatting: run.formatting !== void 0 && Object.keys(run.formatting).length === 0 && (run.propertyChanges?.length ?? 0) === 0 ? true : void 0
 	};
 	if (!runHasPageBreakContent(run) && !runHasMixedContent(run) && !hasRunIdentityPayload(payload)) return null;
 	return schema.mark(RUN_IDENTITY_MARK_NAME, runIdentityAttrs(nextRunIdentityId(), payload));
@@ -577,7 +581,7 @@ function convertParagraph(paragraph, styleResolver, context, extraRunFormatting,
 	if (emptyHyperlinks) attrs._emptyHyperlinks = emptyHyperlinks;
 	return createProseParagraphWithPropertySource(schema.nodes["paragraph"], paragraph, {
 		attrs,
-		content: inlineNodes
+		content: continueRunIdentitiesAcrossRevisions(inlineNodes)
 	});
 }
 /**
@@ -609,16 +613,20 @@ function anchorPointComment(nodes, commentId) {
 * One node of a revision's content with the revision recorded on it.
 *
 * An inline content control is an `inline*` node rather than an atom, so it is
-* not a run carrier: the revision goes on the leaves it holds. That is what
-* makes `w:ins > w:sdt` and `w:sdt > w:ins` the same marks on the same leaves,
-* and it is what lets the save leg hoist a revision covering all of them back
-* around the control instead of losing it.
+* not a run carrier: the revision goes on the leaves it holds, and the control
+* records that the revision encloses it. The leaves alone would read the same
+* for `w:ins > w:sdt` and `w:sdt > w:ins`; the record is what lets the save leg
+* write the revision back around the control, and resolving it remove the
+* control, only for the first.
 */
 const withTrackedRunMark = (node, mark, ancestor) => {
 	if (node.type.name === "sdt") {
 		const marked = [];
 		for (let index = 0; index < node.childCount; index += 1) marked.push(withTrackedRunMark(node.child(index), mark, ancestor));
-		return recreateProseNodeWithParagraphPropertySource(node, { content: marked });
+		return recreateProseNodeWithParagraphPropertySource(node, {
+			attrs: withEnclosingRevision(node, ancestor.revisionId) ?? node.attrs,
+			content: marked
+		});
 	}
 	const nestedMark = node.marks.find(({ type }) => type.name === "insertion" || type.name === "deletion");
 	if (nestedMark) {
@@ -1547,7 +1555,8 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 		displayText,
 		fieldKind: field.type === "simpleField" ? "simple" : "complex",
 		fldLock: field.fldLock ?? null,
-		dirty: field.dirty ?? null
+		dirty: field.dirty ?? null,
+		fieldResultIsFallback: field.type === "complexField" ? field.fieldResultIsFallback ?? null : null
 	}, createStructuredField ? inlineNodes : void 0, marks);
 }
 /**
@@ -2163,7 +2172,7 @@ function convertRunContent(content, marks, formatting, textBoxAnchors, authoredF
 				const anchorId = textBoxAnchors?.get(shp);
 				return anchorId ? [schema.node("textBoxAnchor", { anchorId }).mark(marks)] : [];
 			}
-			return [withRunBoundaryMarks(convertShape(shp, carriedRunFormatting(authoredFormatting)), marks)];
+			return [withRunBoundaryMarks(withAlternateContent(convertShape(shp, carriedRunFormatting(authoredFormatting)), replayableShapeAlternateContent(content)), marks)];
 		}
 		case "footnoteRef": {
 			const footnoteMark = schema.mark("footnoteRef", {
@@ -2214,6 +2223,12 @@ function withRunBoundaryMarks(node, marks) {
 */
 const authoredEmuAttrs = (values) => Object.values(values).some((value) => value !== void 0) ? values : void 0;
 /**
+* A text box's gradient fill, copied for the reason {@link copiedDrawingAnchor}
+* is: ProseMirror keeps object-valued attrs by reference. Any other fill is
+* stated by `fillColor`, or not at all.
+*/
+const copiedGradientFill = (fill) => fill?.type === "gradient" && fill.gradient !== void 0 ? structuredClone(fill) : void 0;
+/**
 * A copy of the anchor record: ProseMirror keeps object-valued attrs by
 * reference, so sharing it with the source would let a mutation of either reach
 * the other outside a transaction.
@@ -2535,16 +2550,19 @@ function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, c
 	const keepWrapperParagraph = isEmptyAfterExtraction && (preserveEmptyWrapper === true || hasParagraphBoundaryPayload(block, pmParagraph));
 	if (!isEmptyAfterExtraction || keepWrapperParagraph) nodes.push(pmParagraph);
 	const standalone = isEmptyAfterExtraction && !keepWrapperParagraph;
-	for (const [index, { textBox, anchorId, trackedChange, inlineSdts }] of textBoxes.entries()) nodes.push(convertTextBox(textBox, styleResolver, {
-		placement: standalone ? "standalone" : "inlineWithPrevious",
-		groupId: textBoxGroupId,
-		anchorId,
-		context,
-		trackedChange,
-		inlineSdts,
-		...standalone && index === 0 && block.preservedAttributes ? { hostPreservedAttributes: block.preservedAttributes } : {},
-		...standalone && index === 0 ? { hostParagraph: hostParagraphAttrs(pmParagraph.attrs) } : {}
-	}));
+	for (const [index, { textBox, alternateContentXml, anchorId, trackedChange, inlineSdts }] of textBoxes.entries()) {
+		const textBoxNode = convertTextBox(textBox, styleResolver, {
+			placement: standalone ? "standalone" : "inlineWithPrevious",
+			groupId: textBoxGroupId,
+			anchorId,
+			context,
+			trackedChange,
+			inlineSdts,
+			...standalone && index === 0 && block.preservedAttributes ? { hostPreservedAttributes: block.preservedAttributes } : {},
+			...standalone && index === 0 ? { hostParagraph: hostParagraphAttrs(pmParagraph.attrs) } : {}
+		});
+		nodes.push(withAlternateContent(textBoxNode, alternateContentXml));
+	}
 	return nodes;
 }
 /**
@@ -2602,6 +2620,7 @@ function extractTextBoxes(paragraph, textBoxGroupId) {
 			textBoxAnchors.set(runContent.shape, anchorId);
 			textBoxes.push({
 				textBox: textBoxFromShape(runContent.shape, runContent.shape.textBody),
+				alternateContentXml: replayableShapeAlternateContent(runContent),
 				anchorId,
 				trackedChange: context.trackedChange,
 				inlineSdts: context.inlineSdts
@@ -2694,6 +2713,7 @@ function textBoxFromShape(shape, textBody) {
 	if (textBody.textWrap) textBox.textWrap = textBody.textWrap;
 	if (textBody.anchor) textBox.verticalAlign = textBody.anchor;
 	if (textBody.wordArt) textBox.wordArt = textBody.wordArt;
+	if (shape.groupChild) textBox.groupChild = shape.groupChild;
 	return textBox;
 }
 /**
@@ -2706,6 +2726,7 @@ function convertTextBox(textBox, styleResolver, options) {
 	const heightPx = textBoxSize?.height ? emuToPixels(textBoxSize.height) : void 0;
 	let fillColor;
 	if (textBox.fill?.color?.rgb) fillColor = `#${textBox.fill.color.rgb}`;
+	const gradientFill = copiedGradientFill(textBox.fill);
 	let outlineWidth;
 	let outlineColor;
 	let outlineStyle;
@@ -2796,6 +2817,7 @@ function convertTextBox(textBox, styleResolver, options) {
 		alt: textBox.alt,
 		title: textBox.title,
 		fillColor,
+		gradientFill,
 		outlineWidth,
 		outlineColor,
 		outlineStyle,
@@ -2816,6 +2838,7 @@ function convertTextBox(textBox, styleResolver, options) {
 		_docxPlacement: options.placement,
 		_docxGroupId: options.groupId,
 		_docxAnchorId: options.anchorId,
+		_docxGroupChild: textBox.groupChild,
 		_docxTextBodyContentState: textBox.content.length === 0 ? { type: "source-empty" } : { type: "authored" },
 		_docxTrackedChange: options.trackedChange,
 		_docxInlineSdts: options.inlineSdts.length > 0 ? options.inlineSdts : void 0,

package/dist/prosemirror/extensions/features/AutoBidiDetectionExtension.d.ts

@@ -8,13 +8,13 @@ declare const autoBidiDetectionKey: PluginKey<any>;
  * fire for the initial document, so seeded content needs this pass.
  *
  * Like the paraId allocator this is `ignoreTrackedChanges`, so a normalized
- * paragraph the user never edits is not in `changedParaIds`. Full save (the
- * default; and the only path for Markdown/template/new docs, which have no
- * original buffer) serializes the whole PM doc, so the flag is written. The
- * selective-save path (dark `selectiveSave` flag) intentionally preserves
- * untouched original paragraphs byte-for-byte, so an imported DOCX whose Arabic
- * arrived without `w:bidi` and is saved without any edit keeps the original
- * bytes; editing the paragraph tracks it and the patch then includes `w:bidi`.
+ * paragraph the user never edits is not in `changedParaIds`. An imported DOCX
+ * whose Arabic arrived without `w:bidi` gets `{ source: "auto" }` here purely
+ * for rendering; because `directionToAuthoredBidi` treats `"auto"` the same
+ * as undecided, neither a full-repack save nor the selective-save path (dark
+ * `selectiveSave` flag) writes `w:bidi` for it when the paragraph is not
+ * otherwise edited. A manual toggle, or a paragraph whose `w:bidi` the source
+ * document already carried, is unaffected — it always round-trips.
  */
 declare const ensureBaseDirectionInState: (state: EditorState) => EditorState;
 declare const AutoBidiDetectionExtension: (options?: Partial<{}> | undefined) => Extension;

package/dist/prosemirror/extensions/features/AutoBidiDetectionExtension.js

@@ -80,13 +80,13 @@ const applyBidiUpdates = (state, updates) => {
 * fire for the initial document, so seeded content needs this pass.
 *
 * Like the paraId allocator this is `ignoreTrackedChanges`, so a normalized
-* paragraph the user never edits is not in `changedParaIds`. Full save (the
-* default; and the only path for Markdown/template/new docs, which have no
-* original buffer) serializes the whole PM doc, so the flag is written. The
-* selective-save path (dark `selectiveSave` flag) intentionally preserves
-* untouched original paragraphs byte-for-byte, so an imported DOCX whose Arabic
-* arrived without `w:bidi` and is saved without any edit keeps the original
-* bytes; editing the paragraph tracks it and the patch then includes `w:bidi`.
+* paragraph the user never edits is not in `changedParaIds`. An imported DOCX
+* whose Arabic arrived without `w:bidi` gets `{ source: "auto" }` here purely
+* for rendering; because `directionToAuthoredBidi` treats `"auto"` the same
+* as undecided, neither a full-repack save nor the selective-save path (dark
+* `selectiveSave` flag) writes `w:bidi` for it when the paragraph is not
+* otherwise edited. A manual toggle, or a paragraph whose `w:bidi` the source
+* document already carried, is unaffected — it always round-trips.
 */
 const ensureBaseDirectionInState = (state) => {
 	if (!autoBidiDetectionKey.get(state)) return state;

package/dist/prosemirror/extensions/nodes/FieldExtension.js

@@ -9,7 +9,8 @@ const createFieldAttrs = () => ({
 	_numberedRefBaseline: { default: void 0 },
 	fieldKind: { default: "simple" },
 	fldLock: { default: null },
-	dirty: { default: null }
+	dirty: { default: null },
+	fieldResultIsFallback: { default: null }
 });
 /** A `data-` flag a pasted field carried: absent states nothing. */
 const statedFlag = (value) => value === void 0 ? null : value === "true";
@@ -19,10 +20,11 @@ const readFieldDomAttrs = (dom) => ({
 	displayText: dom.textContent ?? "",
 	fieldKind: dom.dataset["fieldKind"] ?? "simple",
 	fldLock: statedFlag(dom.dataset["fldLock"]),
-	dirty: statedFlag(dom.dataset["dirty"])
+	dirty: statedFlag(dom.dataset["dirty"]),
+	fieldResultIsFallback: statedFlag(dom.dataset["fieldResultIsFallback"])
 });
 const getFieldDomAttrs = (node) => {
-	const { fieldType, instruction, fieldKind, fldLock, dirty } = expectFieldAttrs(node);
+	const { fieldType, instruction, fieldKind, fldLock, dirty, fieldResultIsFallback } = expectFieldAttrs(node);
 	return {
 		class: `docx-field docx-field-${fieldType.toLowerCase()}`,
 		"data-field-type": fieldType,
@@ -30,6 +32,7 @@ const getFieldDomAttrs = (node) => {
 		"data-field-kind": fieldKind,
 		...fldLock === void 0 ? {} : { "data-fld-lock": String(fldLock) },
 		...dirty === void 0 ? {} : { "data-dirty": String(dirty) },
+		...fieldResultIsFallback === void 0 ? {} : { "data-field-result-is-fallback": String(fieldResultIsFallback) },
 		style: "outline: 1px solid var(--doc-field-outline, rgba(200,200,200,0.4)); padding: 0 1px; border-radius: 2px;"
 	};
 };

package/dist/prosemirror/extensions/nodes/SdtExtension.js

@@ -54,7 +54,13 @@ const SdtExtension = createNodeExtension({
 			* `w:sdtEndPr` as a record, so a control the editor rebuilds still
 			* writes its end mark once the captured bytes are gone.
 			*/
-			endProperties: { default: null }
+			endProperties: { default: null },
+			/**
+			* The revisions whose element encloses the control (`w:ins > w:sdt`),
+			* as opposed to revising the content inside it (`w:sdt > w:ins`). Both
+			* put the same marks on the leaves; see `contentControlRevisions.ts`.
+			*/
+			_docxEnclosingRevisionIds: { default: null }
 		},
 		parseDOM: [{
 			tag: "span.docx-sdt",
@@ -78,7 +84,8 @@ const SdtExtension = createNodeExtension({
 					checked: onOffFromDataset(el.dataset["checked"]),
 					_preserved: null,
 					rawEndPropertiesXml: null,
-					endProperties: null
+					endProperties: null,
+					_docxEnclosingRevisionIds: null
 				};
 			}
 		}],

package/dist/prosemirror/extensions/nodes/ShapeExtension.js

@@ -370,6 +370,7 @@ const ShapeExtension = createNodeExtension({
 			shapeType: { default: "rect" },
 			geometryAdjustments: { default: null },
 			_docxRunFormatting: { default: null },
+			_docxAlternateContent: { default: null },
 			shapeId: { default: null },
 			shapeName: { default: null },
 			alt: { default: null },

package/dist/prosemirror/extensions/nodes/TextBoxExtension.js

@@ -86,6 +86,7 @@ const TextBoxExtension = createNodeExtension({
 			alt: { default: null },
 			title: { default: null },
 			fillColor: { default: null },
+			gradientFill: { default: null },
 			outlineWidth: { default: null },
 			outlineColor: { default: null },
 			outlineStyle: { default: null },
@@ -111,9 +112,11 @@ const TextBoxExtension = createNodeExtension({
 			wrapDistanceSlots: { default: null },
 			wrapEffectExtentSlots: { default: null },
 			wrapPolygon: { default: null },
+			_docxAlternateContent: { default: null },
 			_docxPlacement: { default: null },
 			_docxGroupId: { default: null },
 			_docxAnchorId: { default: null },
+			_docxGroupChild: { default: null },
 			_docxTextBodyContentState: { default: { type: "authored" } },
 			_docxTrackedChange: { default: null },
 			_docxInlineSdts: { default: null },

package/dist/prosemirror/listMarker.js

@@ -1,4 +1,4 @@
-import { convertBulletToUnicode } from "../docx/bulletMarkers.js";
+import { bulletMarkerFontName, convertBulletToUnicode } from "../docx/bulletMarkers.js";
 import { paragraphNumberingLevel, paragraphNumberingReferenceId, sameStatedParagraphNumbering } from "../docx/numberingReference.js";
 import { formatOoxmlCounter } from "../docx/ooxmlCounterFormatter.js";
 import { isListNumPr } from "../layout-engine/types.js";
@@ -205,7 +205,7 @@ function advanceListMarker(attrs, state) {
 			fromStyle: false,
 			numId: null
 		};
-		return convertBulletToUnicode(attrs.listMarker ?? markerTemplate ?? "");
+		return convertBulletToUnicode(attrs.listMarker ?? markerTemplate ?? "", bulletMarkerFontName(attrs.listMarkerFormatting));
 	}
 	const firstInstanceEncounter = !state.counters.has(numId);
 	let counters = state.counters.get(numId) ?? Array.from({ length: 9 }, () => NaN);

package/dist/prosemirror/paragraphDirection.d.ts

@@ -15,6 +15,17 @@
  * The persisted/serialized model keeps the flat OOXML tri-state
  * (`ParagraphFormatting.bidi: boolean | undefined`); `directionToBidi` /
  * `directionFromBidi` bridge the two at the conversion boundary.
+ *
+ * `source: "auto"` is a *rendering* decision only — it makes the layout
+ * painter and the editor's DOM shape the paragraph RTL, so newly typed or
+ * pasted directional text displays correctly before the user ever makes an
+ * explicit choice. It must never reach the saved package on its own: a
+ * paragraph that arrived without `w:bidi` and was never touched by the user
+ * must save without `w:bidi` too, no matter how many auto-detection passes
+ * ran over it on load. Only `source: "manual"` (an explicit user toggle, or
+ * a `w:bidi` the source document already carried) is authored content and
+ * belongs in `w:pPr`. Use `directionToBidi` for layout/rendering and
+ * `directionToAuthoredBidi` for anything that gets serialized.
  */
 type ParagraphDirection = {
   source: "auto";
@@ -29,8 +40,24 @@ declare const directionIsRtl: (direction: ParagraphDirection | null | undefined)
  * AutoBidiDetection may (re-)evaluate. A manual decision is left untouched.
  */
 declare const directionIsAutoManaged: (direction: ParagraphDirection | null | undefined) => boolean;
-/** Map a direction to the serialized OOXML `w:bidi` tri-state. */
+/**
+ * Map a direction to the OOXML `w:bidi` tri-state for layout/rendering: an
+ * auto-detected direction lays out RTL exactly like a manual one. Do not use
+ * this to decide what gets written to the saved package — see
+ * `directionToAuthoredBidi`.
+ */
 declare const directionToBidi: (direction: ParagraphDirection | null | undefined) => boolean | undefined;
+/**
+ * Map a direction to the OOXML `w:bidi` tri-state as *authored* content, for
+ * serialization. Only a manual decision (explicit user toggle, or a `w:bidi`
+ * the source document already carried) is ever written: `undefined` here
+ * means "the paragraph does not state its own direction," which keeps
+ * `w:pPr` free of a flag the user never asked for. An auto-detected
+ * direction (`source: "auto"`) resolves to `undefined` — same as undecided —
+ * regardless of which way detection currently leans, so it stays a view-only
+ * aid until the user makes it explicit.
+ */
+declare const directionToAuthoredBidi: (direction: ParagraphDirection | null | undefined) => boolean | undefined;
 /**
  * Reconstruct a direction from a model `bidi` value (DOCX import / load): an
  * explicit `true`/`false` is a manual decision, absence is undecided.
@@ -39,4 +66,4 @@ declare const directionFromBidi: (bidi: boolean | null | undefined) => Paragraph
 /** Runtime guard for the PM attribute validator. */
 declare const isParagraphDirection: (value: unknown) => value is ParagraphDirection;
 //#endregion
-export { ParagraphDirection, directionFromBidi, directionIsAutoManaged, directionIsRtl, directionToBidi, isParagraphDirection };
+export { ParagraphDirection, directionFromBidi, directionIsAutoManaged, directionIsRtl, directionToAuthoredBidi, directionToBidi, isParagraphDirection };

package/dist/prosemirror/paragraphDirection.js

@@ -6,13 +6,32 @@ const directionIsRtl = (direction) => direction?.source === "auto" || direction?
 * AutoBidiDetection may (re-)evaluate. A manual decision is left untouched.
 */
 const directionIsAutoManaged = (direction) => direction == null || direction.source === "auto";
-/** Map a direction to the serialized OOXML `w:bidi` tri-state. */
+/**
+* Map a direction to the OOXML `w:bidi` tri-state for layout/rendering: an
+* auto-detected direction lays out RTL exactly like a manual one. Do not use
+* this to decide what gets written to the saved package — see
+* `directionToAuthoredBidi`.
+*/
 const directionToBidi = (direction) => {
 	if (direction == null) return;
 	if (direction.source === "auto") return true;
 	return direction.value === "rtl";
 };
 /**
+* Map a direction to the OOXML `w:bidi` tri-state as *authored* content, for
+* serialization. Only a manual decision (explicit user toggle, or a `w:bidi`
+* the source document already carried) is ever written: `undefined` here
+* means "the paragraph does not state its own direction," which keeps
+* `w:pPr` free of a flag the user never asked for. An auto-detected
+* direction (`source: "auto"`) resolves to `undefined` — same as undecided —
+* regardless of which way detection currently leans, so it stays a view-only
+* aid until the user makes it explicit.
+*/
+const directionToAuthoredBidi = (direction) => {
+	if (direction == null || direction.source === "auto") return;
+	return direction.value === "rtl";
+};
+/**
 * Reconstruct a direction from a model `bidi` value (DOCX import / load): an
 * explicit `true`/`false` is a manual decision, absence is undecided.
 */
@@ -30,4 +49,4 @@ const isParagraphDirection = (value) => {
 	return value.source === "manual" && "value" in value && (value.value === "rtl" || value.value === "ltr");
 };
 //#endregion
-export { directionFromBidi, directionIsAutoManaged, directionIsRtl, directionToBidi, isParagraphDirection };
+export { directionFromBidi, directionIsAutoManaged, directionIsRtl, directionToAuthoredBidi, directionToBidi, isParagraphDirection };