@stll/folio-core 0.61.0 → 0.62.0

package/dist/i18n/messages/he.gen.js

@@ -362,6 +362,7 @@ const messages = { "folio": {
 		"previous": "ההתאמה הקודמת",
 		"previousShortcut": "ההתאמה הקודמת (Shift+Enter)",
 		"replaceAll": "החלף הכל",
+		"replaceAllSummary": "הוחלפו {replacedCount}, דולגו {skippedCount}",
 		"replaceCurrent": "החלף את התוצאה הנוכחית",
 		"replacePlaceholder": "טקסט חלופי...",
 		"replaceText": "טקסט חלופי",

package/dist/i18n/messages/hi.gen.js

@@ -362,6 +362,7 @@ const messages = { "folio": {
 		"previous": "पिछला मिलान",
 		"previousShortcut": "पिछला मिलान (Shift+Enter)",
 		"replaceAll": "सभी बदलें",
+		"replaceAllSummary": "{replacedCount} बदले गए, {skippedCount} छोड़े गए",
 		"replaceCurrent": "वर्तमान मिलान को बदलें",
 		"replacePlaceholder": "बदलने वाला पाठ...",
 		"replaceText": "बदलने वाला पाठ",

package/dist/i18n/messages/hu.gen.js

@@ -362,6 +362,7 @@ const messages = { "folio": {
 		"previous": "Előző találat",
 		"previousShortcut": "Előző találat (Shift+Enter)",
 		"replaceAll": "Összes cseréje",
+		"replaceAllSummary": "Cserélve: {replacedCount}, kihagyva: {skippedCount}",
 		"replaceCurrent": "Jelenlegi találat cseréje",
 		"replacePlaceholder": "Csereszöveg…",
 		"replaceText": "Csereszöveg",

package/dist/i18n/messages/lt.gen.js

@@ -362,6 +362,7 @@ const messages = { "folio": {
 		"previous": "Ankstesnis atitikmuo",
 		"previousShortcut": "Ankstesnis atitikmuo (Shift+Enter)",
 		"replaceAll": "Pakeisti viską",
+		"replaceAllSummary": "Pakeista: {replacedCount}, praleista: {skippedCount}",
 		"replaceCurrent": "Pakeisti dabartinį atitikmenį",
 		"replacePlaceholder": "Pakeičiantysis tekstas…",
 		"replaceText": "Pakeičiantysis tekstas",

package/dist/i18n/messages/lv.gen.js

@@ -362,6 +362,7 @@ const messages = { "folio": {
 		"previous": "Iepriekšējā atbilstība",
 		"previousShortcut": "Iepriekšējā atbilstība (Shift+Enter)",
 		"replaceAll": "Aizstāt visu",
+		"replaceAllSummary": "Aizstāti: {replacedCount}, izlaisti: {skippedCount}",
 		"replaceCurrent": "Aizstāt pašreizējo atbilstību",
 		"replacePlaceholder": "Aizstājējteksts…",
 		"replaceText": "Aizstājējteksts",

package/dist/i18n/messages/messages.gen.d.ts

@@ -363,6 +363,7 @@ type Messages = {
       "previous": "Previous match";
       "previousShortcut": "Previous match (Shift+Enter)";
       "replaceAll": "Replace all";
+      "replaceAllSummary": "{replacedCount} replaced, {skippedCount} skipped";
       "replaceCurrent": "Replace current match";
       "replacePlaceholder": "Replacement text...";
       "replaceText": "Replacement text";

package/dist/i18n/messages/pl.gen.js

@@ -362,6 +362,7 @@ const messages = { "folio": {
 		"previous": "Poprzednie wystąpienie",
 		"previousShortcut": "Poprzednie wystąpienie (Shift+Enter)",
 		"replaceAll": "Zamień wszystko",
+		"replaceAllSummary": "Zastąpiono: {replacedCount}, pominięto: {skippedCount}",
 		"replaceCurrent": "Zamień bieżące wystąpienie",
 		"replacePlaceholder": "Tekst zamienny...",
 		"replaceText": "Tekst zamienny",

package/dist/i18n/messages/pt-BR.gen.js

@@ -362,6 +362,7 @@ const messages = { "folio": {
 		"previous": "Ocorrência anterior",
 		"previousShortcut": "Ocorrência anterior (Shift+Enter)",
 		"replaceAll": "Substituir tudo",
+		"replaceAllSummary": "{replacedCount} substituídos, {skippedCount} ignorados",
 		"replaceCurrent": "Substituir correspondência atual",
 		"replacePlaceholder": "Texto de substituição...",
 		"replaceText": "Texto de substituição",

package/dist/i18n/messages/sk.gen.js

@@ -362,6 +362,7 @@ const messages = { "folio": {
 		"previous": "Predchádzajúci výskyt",
 		"previousShortcut": "Predchádzajúci výskyt (Shift+Enter)",
 		"replaceAll": "Nahradiť všetko",
+		"replaceAllSummary": "Nahradené: {replacedCount}, preskočené: {skippedCount}",
 		"replaceCurrent": "Nahradiť aktuálny výskyt",
 		"replacePlaceholder": "Text náhrady...",
 		"replaceText": "Text náhrady",

package/dist/i18n/messages/tr.gen.js

@@ -362,6 +362,7 @@ const messages = { "folio": {
 		"previous": "Önceki eşleşme",
 		"previousShortcut": "Önceki eşleşme (Shift+Enter)",
 		"replaceAll": "Tümünü değiştir",
+		"replaceAllSummary": "{replacedCount} değiştirildi, {skippedCount} atlandı",
 		"replaceCurrent": "Mevcut eşleşmeyi değiştir",
 		"replacePlaceholder": "Yeni metin...",
 		"replaceText": "Yeni metin",

package/dist/i18n/messages/zh-CN.gen.js

@@ -362,6 +362,7 @@ const messages = { "folio": {
 		"previous": "上一个匹配项",
 		"previousShortcut": "上一个匹配项 (Shift+Enter)",
 		"replaceAll": "全部替换",
+		"replaceAllSummary": "已替换 {replacedCount} 项，已跳过 {skippedCount} 项",
 		"replaceCurrent": "替换当前匹配项",
 		"replacePlaceholder": "替换为...",
 		"replaceText": "替换文本",

package/dist/layout-bridge/convert/endnoteLayout.d.ts

@@ -1,7 +1,7 @@
 import { document_d_exports } from "../../types/document.js";
+import { NoteStoryKey } from "../../types/editor-story.js";
 import { FlowBlock, Measure, NoteAreaLayout } from "../../layout-engine/types.js";
 import { ConvertFootnoteOptions, MeasureBlocksFn } from "./footnoteLayout.js";
-import { NoteStoryKey } from "../../types/editor-story.js";
 //#region src/layout-bridge/convert/endnoteLayout.d.ts
 /** One endnote area and the body position it follows. */
 type EndnoteArea = {

package/dist/layout-bridge/convert/endnoteLayout.js

@@ -58,7 +58,6 @@ function prepareEndnoteAreas(input) {
 		notesBySection.set(section, noteIds);
 	}
 	const separatorBlockIds = /* @__PURE__ */ new Map();
-	const contentBlockIds = /* @__PURE__ */ new Set();
 	const noteStoryByBlockId = /* @__PURE__ */ new Map();
 	const areas = [];
 	for (const [section, noteIds] of [...notesBySection].sort(([left], [right]) => left - right)) {
@@ -82,7 +81,6 @@ function prepareEndnoteAreas(input) {
 				const id = `endnote-${String(noteId)}-${String(index)}`;
 				blocks.push(withId(stripFlowBlockPmAnchors(block), id));
 				measures.push(content.measures[index]);
-				contentBlockIds.add(id);
 				noteStoryByBlockId.set(id, {
 					kind: "endnote",
 					noteId
@@ -101,7 +99,7 @@ function prepareEndnoteAreas(input) {
 		areas,
 		noteAreas: {
 			separatorBlockIds,
-			contentBlockIds,
+			noteStoryByBlockId,
 			continuationSeparator
 		},
 		noteStoryByBlockId

package/dist/layout-engine/index.js

@@ -4,7 +4,7 @@ import { layoutImage } from "./imageLayout.js";
 import { calculateChainHeight, computeKeepNextChains, getMidChainIndices, hasKeepLines, hasPageBreakBefore } from "./keep-together.js";
 import "./layoutFlowShared.js";
 import { measuredLineAdvance } from "./lineFlow.js";
-import { annotateNoteSeparators, continuesNoteArea, createNoteAreaContinuation } from "./noteAreaFlow.js";
+import { annotateNoteAreas, continuesNoteArea, createNoteAreaContinuation } from "./noteAreaFlow.js";
 import { createPaginator } from "./paginator.js";
 import { layoutParagraph } from "./paragraphLayout.js";
 import { paragraphsShareStyle, resolveEffectiveParagraphSpacingTree } from "./paragraphSpacing.js";
@@ -63,7 +63,7 @@ function applyContextualSpacing(blocks) {
 */
 function layoutDocument(blocks, measures, options) {
 	const initialLayout = layoutDocumentPass(blocks, measures, options);
-	return annotateNoteSeparators(applySectionVerticalAlignment(options.footnoteHeightById ? reflowFootnoteColumns({
+	return annotateNoteAreas(applySectionVerticalAlignment(options.footnoteHeightById ? reflowFootnoteColumns({
 		initialLayout,
 		...options.footnoteReservedHeights ? { initialReserveFloors: options.footnoteReservedHeights } : {},
 		runLayout: (reserveFloors) => layoutDocumentPass(blocks, measures, {

package/dist/layout-engine/noteAreaFlow.d.ts

@@ -10,10 +10,10 @@ declare function createNoteAreaContinuation(noteAreas: NoteAreaLayout | undefine
 /** Whether laying out `block` continues a note area onto any page it opens. */
 declare function continuesNoteArea(noteAreas: NoteAreaLayout | undefined, block: FlowBlock): boolean;
 /**
- * Record where each separator mark landed. A rule is centred on the first line
- * of the separator paragraph: a `w:separator` spans part of the column and a
+ * Record note identities and where each separator mark landed. A rule is centred
+ * on the first line of the separator paragraph: a `w:separator` spans part of the column and a
  * `w:continuationSeparator` all of it.
  */
-declare function annotateNoteSeparators(layout: Layout, blocks: readonly FlowBlock[], measures: readonly Measure[], noteAreas: NoteAreaLayout | undefined): Layout;
+declare function annotateNoteAreas(layout: Layout, blocks: readonly FlowBlock[], measures: readonly Measure[], noteAreas: NoteAreaLayout | undefined): Layout;
 //#endregion
-export { annotateNoteSeparators, continuesNoteArea, createNoteAreaContinuation };
+export { annotateNoteAreas, continuesNoteArea, createNoteAreaContinuation };

package/dist/layout-engine/noteAreaFlow.js

@@ -39,15 +39,15 @@ function createNoteAreaContinuation(noteAreas, paginator) {
 }
 /** Whether laying out `block` continues a note area onto any page it opens. */
 function continuesNoteArea(noteAreas, block) {
-	return noteAreas?.contentBlockIds.has(String(block.id)) === true;
+	return noteAreas?.noteStoryByBlockId.has(String(block.id)) === true;
 }
 /**
-* Record where each separator mark landed. A rule is centred on the first line
-* of the separator paragraph: a `w:separator` spans part of the column and a
+* Record note identities and where each separator mark landed. A rule is centred
+* on the first line of the separator paragraph: a `w:separator` spans part of the column and a
 * `w:continuationSeparator` all of it.
 */
-function annotateNoteSeparators(layout, blocks, measures, noteAreas) {
-	if (noteAreas === void 0 || noteAreas.separatorBlockIds.size === 0) return layout;
+function annotateNoteAreas(layout, blocks, measures, noteAreas) {
+	if (noteAreas === void 0) return layout;
 	const measureById = /* @__PURE__ */ new Map();
 	for (const [index, block] of blocks.entries()) {
 		const measure = measures[index];
@@ -56,6 +56,12 @@ function annotateNoteSeparators(layout, blocks, measures, noteAreas) {
 	const continuation = noteAreas.continuationSeparator;
 	if (continuation !== void 0) measureById.set(String(continuation.block.id), continuation.measure);
 	for (const page of layout.pages) {
+		const endnoteIds = /* @__PURE__ */ new Set();
+		for (const fragment of page.fragments) {
+			const story = noteAreas.noteStoryByBlockId.get(String(fragment.blockId));
+			if (story?.kind === "endnote") endnoteIds.add(story.noteId);
+		}
+		if (endnoteIds.size > 0) page.endnoteIds = [...endnoteIds];
 		const rules = [];
 		for (const fragment of page.fragments) {
 			if (fragment.kind !== "paragraph" || fragment.fromLine !== 0) continue;
@@ -80,4 +86,4 @@ function separatorWidthFraction(kind) {
 	}
 }
 //#endregion
-export { annotateNoteSeparators, continuesNoteArea, createNoteAreaContinuation };
+export { annotateNoteAreas, continuesNoteArea, createNoteAreaContinuation };

package/dist/layout-engine/types.d.ts

@@ -1,4 +1,5 @@
 import { OutlineStyleAttr } from "../types/documentEnumValues.js";
+import { NoteStoryKey } from "../types/editor-story.js";
 import { CssBorderStyle } from "../utils/borderCss.js";
 import { ImagePosition, ImageWrap, InlineWrapper, NumberFormat, OutlineLevel, ParagraphNumberingOverride, PreviewDescriptor, SdtProperties, SdtType, SectionStart, ShapeTextBody, TableCellFormatting, TableWidthType, UnderlineStyle, VerticalAlign } from "@stll/docx-core/model";
 declare namespace types_d_exports {
@@ -1268,6 +1269,8 @@ type Page = {
   headerFooterRefs?: PageHeaderFooterRefs;
   /** Footnote IDs that appear on this page (for rendering). */
   footnoteIds?: number[];
+  /** Endnote IDs whose content fragments appear on this page. */
+  endnoteIds?: number[];
   /** Height reserved for the footnote area at page bottom (pixels). */
   footnoteReservedHeight?: number;
   /**
@@ -1436,10 +1439,10 @@ type NoteAreaLayout = {
    */
   separatorBlockIds: ReadonlyMap<string, NoteSeparatorKind>;
   /**
-   * Note content blocks. A page opened while one of them is laid out
+   * Note identities keyed by content block. A page opened while one is laid out
    * continues the area, so it starts with the continuation separator.
    */
-  contentBlockIds: ReadonlySet<string>;
+  noteStoryByBlockId: ReadonlyMap<string, NoteStoryKey>;
   /** The `w:continuationSeparator` story's first paragraph, already measured. */
   continuationSeparator?: {
     block: ParagraphBlock;

package/dist/layout-painter/index.d.ts

@@ -1,5 +1,5 @@
-import { FlowBlock, Layout, Measure } from "../layout-engine/types.js";
 import { NoteStoryKey } from "../types/editor-story.js";
+import { FlowBlock, Layout, Measure } from "../layout-engine/types.js";
 import { RenderContext } from "./renderUtils.js";
 import { BlockFor, FeatureDispatchInput, FeatureFallback, FeatureModule, FeatureRenderInput, FragmentFor, MeasureFor } from "./registry/types.js";
 import { FeatureRegistry, createFeatureRegistry } from "./registry/registry.js";

package/dist/managers/FindReplaceManager.d.ts

@@ -1,5 +1,7 @@
 import { document_d_exports } from "../types/document.js";
+import { ReplaceAllSummary, ReplaceEligibility } from "../utils/findReplace.js";
 import { FindMatchPosition } from "../prosemirror/findReplaceSelection.js";
+import { OpStory } from "@stll/docx-core/ops";
 //#region src/managers/FindReplaceManager.d.ts
 type FindDirection = "next" | "previous";
 type FindReplaceResult<TMatch> = {
@@ -7,16 +9,21 @@ type FindReplaceResult<TMatch> = {
   totalCount: number;
   currentIndex: number;
 };
-type ReplaceAllOutcome = {
+type ReplaceAllOutcome = ReplaceAllSummary & {
   document: document_d_exports.Document;
-  replacedCount: number;
 };
 /**
  * The cursor index after stepping `direction` over `totalCount` matches,
  * wrapping at both ends. Returns 0 when there are no matches.
  */
 declare const getAdjacentFindIndex: (currentIndex: number, totalCount: number, direction: FindDirection) => number;
-declare class FindReplaceManager<TMatch extends FindMatchPosition> {
+type ReplaceableFindPosition = FindMatchPosition & {
+  story?: OpStory;
+  textBoxIndex?: number;
+  commentId?: number;
+  replacement: ReplaceEligibility;
+};
+declare class FindReplaceManager<TMatch extends ReplaceableFindPosition> {
   private result;
   /** The active find result, or null when there is no active search. */
   getResult(): FindReplaceResult<TMatch> | null;
@@ -27,7 +34,7 @@ declare class FindReplaceManager<TMatch extends FindMatchPosition> {
    * first match. The result is kept even when `matches` is empty so callers can
    * surface a "no results" state.
    */
-  setMatches(matches: TMatch[]): FindReplaceResult<TMatch>;
+  setMatches(matches: TMatch[], currentIndex?: number): FindReplaceResult<TMatch>;
   /**
    * Step the cursor and return the now-current match with its index, or null
    * when there are no matches to navigate.
@@ -51,8 +58,8 @@ declare class FindReplaceManager<TMatch extends FindMatchPosition> {
   replaceCurrent(document: document_d_exports.Document, replaceText: string): document_d_exports.Document | null;
   /**
    * Replace every match. Matches are replaced from the end of the document
-   * backwards so earlier offsets stay valid as the text shifts. Clears the
-   * active result and returns the new document plus the match count, or null
+   * backwards so earlier offsets stay valid as the text shifts. Ineligible
+   * matches are skipped and counted. Clears the active result, or returns null
    * when there is nothing to replace.
    */
   replaceAll(document: document_d_exports.Document, matches: readonly TMatch[], replaceText: string): ReplaceAllOutcome | null;

package/dist/managers/FindReplaceManager.js

@@ -1,3 +1,4 @@
+import { replaceEligibility } from "../utils/findReplace.js";
 import { replaceTextInDocument } from "../utils/replaceText.js";
 //#region src/managers/FindReplaceManager.ts
 /**
@@ -34,11 +35,11 @@ var FindReplaceManager = class {
 	* first match. The result is kept even when `matches` is empty so callers can
 	* surface a "no results" state.
 	*/
-	setMatches(matches) {
+	setMatches(matches, currentIndex = 0) {
 		this.result = {
 			matches,
 			totalCount: matches.length,
-			currentIndex: 0
+			currentIndex: Math.max(0, Math.min(currentIndex, matches.length - 1))
 		};
 		return this.result;
 	}
@@ -86,7 +87,7 @@ var FindReplaceManager = class {
 		const result = this.result;
 		if (!result || result.matches.length === 0) return null;
 		const match = result.matches[result.currentIndex];
-		if (!match) return null;
+		if (!match || replaceEligibility(match).status === "blocked") return null;
 		try {
 			return replaceTextInDocument(document, toReplaceRange(match), replaceText);
 		} catch {
@@ -95,26 +96,31 @@ var FindReplaceManager = class {
 	}
 	/**
 	* Replace every match. Matches are replaced from the end of the document
-	* backwards so earlier offsets stay valid as the text shifts. Clears the
-	* active result and returns the new document plus the match count, or null
+	* backwards so earlier offsets stay valid as the text shifts. Ineligible
+	* matches are skipped and counted. Clears the active result, or returns null
 	* when there is nothing to replace.
 	*/
 	replaceAll(document, matches, replaceText) {
 		if (matches.length === 0) return null;
-		const sortedMatches = [...matches].toSorted((a, b) => {
+		const eligibleMatches = matches.filter((match) => replaceEligibility(match).status === "allowed");
+		let skippedCount = matches.length - eligibleMatches.length;
+		let replacedCount = 0;
+		const sortedMatches = [...eligibleMatches].toSorted((a, b) => {
 			if (a.paragraphIndex !== b.paragraphIndex) return b.paragraphIndex - a.paragraphIndex;
 			return b.startOffset - a.startOffset;
 		});
 		let nextDocument = document;
 		for (const match of sortedMatches) try {
 			nextDocument = replaceTextInDocument(nextDocument, toReplaceRange(match), replaceText);
+			replacedCount++;
 		} catch {
-			continue;
+			skippedCount++;
 		}
-		this.result = null;
+		if (replacedCount > 0) this.result = null;
 		return {
 			document: nextDocument,
-			replacedCount: matches.length
+			replacedCount,
+			skippedCount
 		};
 	}
 };

package/dist/paged-layout/editorScrollRoot.d.ts

@@ -8,8 +8,10 @@ type ScrollEditorElementOptions = {
   behavior?: ScrollBehavior;
   /** Space to leave between the target and the visible root edge. */
   margin?: number;
+  /** Measured target range when only part of the element should be revealed. */
+  rect?: DOMRectReadOnly;
 };
 /** Scroll only the marked root, including when the target is inside a scaled viewport. */
-declare const scrollEditorElementIntoView: (element: HTMLElement | null, { block, behavior, margin }?: ScrollEditorElementOptions) => void;
+declare const scrollEditorElementIntoView: (element: HTMLElement | null, { block, behavior, margin, rect }?: ScrollEditorElementOptions) => void;
 //#endregion
 export { getEditorScrollRoot, scrollEditorBy, scrollEditorElementIntoView, scrollEditorTo };

package/dist/paged-layout/editorScrollRoot.js

@@ -25,10 +25,10 @@ const nearestScrollOffset = ({ targetStart, targetEnd, viewportStart, viewportEn
 	return 0;
 };
 /** Scroll only the marked root, including when the target is inside a scaled viewport. */
-const scrollEditorElementIntoView = (element, { block = "center", behavior = prefersReducedMotionBehavior(), margin = 0 } = {}) => {
+const scrollEditorElementIntoView = (element, { block = "center", behavior = prefersReducedMotionBehavior(), margin = 0, rect } = {}) => {
 	const root = getEditorScrollRoot(element);
 	if (!root || !element) return;
-	const targetRect = element.getBoundingClientRect();
+	const targetRect = rect ?? element.getBoundingClientRect();
 	const rootRect = root.getBoundingClientRect();
 	const visibleTop = rootRect.top + root.clientTop;
 	const targetTop = targetRect.top - visibleTop + root.scrollTop;

package/dist/pdf/images.js

@@ -566,6 +566,7 @@ const decodeImage = (source) => {
 	switch (source.format) {
 		case "png": return decodePng(source.bytes);
 		case "jpeg": return decodeJpeg(source.bytes);
+		case "svg": return Result.err(new PdfImageError({ message: "SVG images are not supported in PDF" }));
 		default: {
 			const unreachable = source.format;
 			return Result.err(new PdfImageError({ message: `unsupported image format ${String(unreachable)}` }));

package/dist/prosemirror/commentRangeInlineAtoms.d.ts

@@ -0,0 +1,40 @@
+import { Node } from "prosemirror-model";
+//#region src/prosemirror/commentRangeInlineAtoms.d.ts
+/**
+ * Whether an inline atom extends a comment range it sits in.
+ *
+ * - `extends`: a comment mark on the atom keeps the comment's range alive.
+ * - `inert`: the atom is invisible to the reader, so a comment mark on it would
+ *   be a ghost range nobody can see or select. Comment integrity strips the mark
+ *   and never counts the atom as range content.
+ *
+ * This is separate from revision ownership: a cached rendered page break must
+ * stay inside its tracked-change wrapper, but it can never hold a comment on
+ * its own.
+ */
+type CommentRangeInlineAtomParticipation = "extends" | "inert";
+/** Keyed by the tracked-run atom set, which the fixed-point test binds to the schema. */
+declare const COMMENT_RANGE_INLINE_ATOM_PARTICIPATION: Readonly<{
+  readonly bookmarkBoundary: "extends";
+  readonly commentReference: "inert";
+  readonly field: "extends";
+  readonly hardBreak: "extends";
+  readonly image: "extends";
+  readonly math: "extends";
+  readonly moveRangeBoundary: "extends";
+  readonly noteMarker: "extends";
+  readonly pageBreakRun: "extends";
+  readonly preservedXml: "extends";
+  readonly rangeAnchor: "inert";
+  readonly renderedPageBreak: "inert";
+  readonly shape: "extends";
+  readonly structuredField: "extends";
+  readonly symbol: "extends";
+  readonly tab: "extends";
+  readonly text: "extends";
+  readonly textBoxAnchor: "extends";
+}>;
+/** Whether a node is an inline atom that must never carry or extend a comment range. */
+declare const isCommentRangeInertAtom: (node: Node) => boolean;
+//#endregion
+export { COMMENT_RANGE_INLINE_ATOM_PARTICIPATION, CommentRangeInlineAtomParticipation, isCommentRangeInertAtom };

package/dist/prosemirror/commentRangeInlineAtoms.js

@@ -0,0 +1,33 @@
+import { panic } from "better-result";
+//#region src/prosemirror/commentRangeInlineAtoms.ts
+/** Keyed by the tracked-run atom set, which the fixed-point test binds to the schema. */
+const COMMENT_RANGE_INLINE_ATOM_PARTICIPATION = Object.freeze({
+	bookmarkBoundary: "extends",
+	commentReference: "inert",
+	field: "extends",
+	hardBreak: "extends",
+	image: "extends",
+	math: "extends",
+	moveRangeBoundary: "extends",
+	noteMarker: "extends",
+	pageBreakRun: "extends",
+	preservedXml: "extends",
+	rangeAnchor: "inert",
+	renderedPageBreak: "inert",
+	shape: "extends",
+	structuredField: "extends",
+	symbol: "extends",
+	tab: "extends",
+	text: "extends",
+	textBoxAnchor: "extends"
+});
+const participationByName = new Map(Object.entries(COMMENT_RANGE_INLINE_ATOM_PARTICIPATION));
+/** Whether a node is an inline atom that must never carry or extend a comment range. */
+const isCommentRangeInertAtom = (node) => {
+	if (!node.isInline || !node.isAtom) return false;
+	const participation = participationByName.get(node.type.name);
+	if (!participation) panic(`Inline atom ${JSON.stringify(node.type.name)} has no comment-range participation`);
+	return participation === "inert";
+};
+//#endregion
+export { COMMENT_RANGE_INLINE_ATOM_PARTICIPATION, isCommentRangeInertAtom };

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -17,6 +17,7 @@ import { createStyleEngine } from "../../style-engine/styleEngine.js";
 import { normalizeShapeTextAnchor, presetDashForOutlineAttr } from "../../types/documentEnumValues.js";
 import { presetDashForCssBorderStyle } from "../../utils/borderCss.js";
 import { canonicalJson } from "../../utils/canonicalJson.js";
+import { getFindParagraphText } from "../../utils/findReplace.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { emuToPixels, emuToStrokePixels, pixelsToEmu } from "../../utils/units.js";
 import { unchangedAlternateContentXml } from "../alternateContentAttrs.js";
@@ -2615,7 +2616,10 @@ const reconcileEmptyFieldResultRuns = (runs, displayRun) => {
 	return reconciled;
 };
 const synchronizeFieldDisplayText = (content, displayText, fallbackRun) => {
-	let currentText = "";
+	const currentText = getFindParagraphText({
+		type: "paragraph",
+		content
+	});
 	const visitRunsIn = (items, visit) => {
 		for (const child of items) {
 			if (child.type === "run") {
@@ -2628,9 +2632,6 @@ const synchronizeFieldDisplayText = (content, displayText, fallbackRun) => {
 	const visitRuns = (visit) => {
 		visitRunsIn(content, visit);
 	};
-	visitRuns((run) => {
-		for (const runContent of run.content) if (runContent.type === "text") currentText += runContent.text;
-	});
 	if (currentText === displayText) return content;
 	let replacedText = false;
 	visitRuns((run) => {

package/dist/prosemirror/conversion/toProseDoc.js

@@ -31,6 +31,7 @@ import { MOVE_RANGE_BOUNDARY_NODE_NAME } from "../extensions/nodes/MoveRangeBoun
 import { RANGE_ANCHOR_NODE_NAME } from "../extensions/nodes/RangeAnchorExtension.js";
 import "../extensions/nodes/SdtExtension.js";
 import { fieldRequiresStructuredContent } from "../fieldRepresentation.js";
+import { getInlineDisplayText } from "../inlineDisplayText.js";
 import { inlineWrapperLayer } from "../inlineWrapperStack.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
 import { listRenderingFor } from "../listRendering.js";
@@ -1368,27 +1369,24 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 	});
 }
 function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyperlinkInstanceIndex, runScope, textBoxAnchors }) {
-	let displayText = "";
 	let fieldFormatting;
 	let fieldPropertyChanges;
 	const inlineNodes = [];
-	const hasStructuredSourceContent = fieldResultHasPageBreakContent(field) || field.type === "simpleField" && field.content.some((content) => content.type === "hyperlink" || content.type === "preservedInline" || content.type === "inlineWrapper" || content.type === "insertion" || content.type === "deletion" || content.type === "moveFrom" || content.type === "moveTo");
+	const hasPageBreakContent = fieldResultHasPageBreakContent(field);
+	const resultRuns = field.type === "complexField" ? field.fieldResult : field.content.flatMap((content) => content.type === "run" ? [content] : []);
 	const appendRun = (run, into) => {
-		for (const content of run.content) if (content.type === "text") displayText += content.text;
 		fieldFormatting ??= run.formatting;
 		fieldPropertyChanges ??= run.propertyChanges;
-		if (field.type !== "simpleField" && !hasStructuredSourceContent) return;
 		into.push(...convertRun(run, getInheritedRunFormatting(run.formatting, field.fieldType), runScope, styleResolver, textBoxAnchors));
 	};
-	const collectDisplay = (items) => {
+	const collectFormatting = (items) => {
 		for (const item of items) switch (item.type) {
 			case "run":
-				for (const child of item.content) if (child.type === "text") displayText += child.text;
 				fieldFormatting ??= item.formatting;
 				fieldPropertyChanges ??= item.propertyChanges;
 				break;
 			case "hyperlink":
-				collectDisplay(item.children);
+				collectFormatting(item.children);
 				break;
 			case "inlineWrapper":
 			case "inlineSdt":
@@ -1396,20 +1394,16 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 			case "deletion":
 			case "moveFrom":
 			case "moveTo":
-				collectDisplay(item.content);
+				collectFormatting(item.content);
 				break;
 			case "simpleField":
-				collectDisplay(item.content);
+				collectFormatting(item.content);
 				break;
 			case "complexField":
-				collectDisplay(item.fieldResult);
+				collectFormatting(item.fieldResult);
 				break;
 			case "preservedInline":
-				displayText += item.text;
-				break;
-			case "mathEquation":
-				displayText += item.plainText ?? "";
-				break;
+			case "mathEquation": break;
 			case "bookmarkStart":
 			case "bookmarkEnd":
 			case "commentRangeStart":
@@ -1433,7 +1427,6 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 				break;
 			case "hyperlink":
 				for (const { content: child } of withInlineWrapperStacks(content.children)) if (child.type === "run") {
-					for (const runContent of child.content) if (runContent.type === "text") displayText += runContent.text;
 					fieldFormatting ??= child.formatting;
 					fieldPropertyChanges ??= child.propertyChanges;
 				}
@@ -1449,7 +1442,7 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 			case "deletion":
 			case "moveFrom":
 			case "moveTo":
-				collectDisplay(content.content);
+				collectFormatting(content.content);
 				itemNodes.push(...convertTrackedChange(content, content.type === "insertion" || content.type === "moveTo" ? "insertion" : "deletion", nextHyperlinkInstanceIndex, runScope, {
 					current: getInheritedRunFormatting,
 					historical: getInheritedRunFormatting
@@ -1468,8 +1461,8 @@ function convertField(field, { getInheritedRunFormatting, styleResolver, nextHyp
 		styleResolver,
 		createMark: runScope.createMark
 	});
-	const createStructuredField = fieldRequiresStructuredContent(inlineNodes);
-	const resultRuns = field.type === "simpleField" ? field.content.flatMap((content) => content.type === "run" ? [content] : []) : field.fieldResult;
+	const createStructuredField = (field.type === "simpleField" || hasPageBreakContent) && fieldRequiresStructuredContent(inlineNodes);
+	const displayText = getInlineDisplayText(schema.node("paragraph", null, inlineNodes));
 	const emptyResultRuns = displayText === "" && resultRuns.length > 0 && (field.type === "complexField" || field.content.length === resultRuns.length) && resultRuns.every((run) => run.content.every((item) => item.type === "text" && item.text === "")) ? resultRuns : void 0;
 	const resultPropertyChanges = emptyResultRuns ? emptyFieldRunPropertyChanges(emptyResultRuns) : fieldPropertyChanges;
 	if (!createStructuredField && resultPropertyChanges && resultPropertyChanges.length > 0) marks.push(schema.mark("runPropertyChange", { changes: [...resultPropertyChanges] }));

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

@@ -1,7 +1,7 @@
+import { isCommentRangeInertAtom } from "../../commentRangeInlineAtoms.js";
 import { readCommentReferenceAttrs } from "../../commentReferenceAttrs.js";
 import { planCommentReferenceRepairs } from "../../commentReferenceIntegrity.js";
 import { readRangeAnchorAttrs } from "../../rangeAnchorAttrs.js";
-import { trackedRunInlineAtomDisposition } from "../../trackedRunInlineAtoms.js";
 import { createNodeExtension } from "../create.js";
 import "./RangeAnchorExtension.js";
 import { Plugin } from "prosemirror-state";
@@ -13,8 +13,8 @@ const surveyCommentReferences = (doc) => {
 	const markEnds = /* @__PURE__ */ new Map();
 	const unanchoredMarks = [];
 	doc.descendants((node, position) => {
-		const transparent = trackedRunInlineAtomDisposition(node) === "transparent";
-		if (transparent) {
+		const inert = isCommentRangeInertAtom(node);
+		if (inert) {
 			for (const mark of node.marks) if (mark.type.name === "comment") unanchoredMarks.push({
 				position,
 				size: node.nodeSize,
@@ -43,7 +43,7 @@ const surveyCommentReferences = (doc) => {
 			}
 			return false;
 		}
-		if (transparent) return false;
+		if (inert) return false;
 		if (!node.isInline) return true;
 		for (const mark of node.marks) {
 			if (mark.type.name !== "comment") continue;