@stll/folio-core 0.36.0 → 0.37.0

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -1,6 +1,7 @@
-import { computeListRendering } from "../../docx/numberingParser.js";
+import { computeListRendering, numberingLevelHasMarkerSlot } from "../../docx/numberingParser.js";
 import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
+import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
 //#region src/prosemirror/styles/resolvedStyleAttrs.ts
 /**
 * Shared helper for projecting a resolved paragraph style onto ProseMirror
@@ -73,42 +74,62 @@ function autospacingBaseFromResolvedParagraphFormatting(ppr) {
 function listAttrsFromResolvedStyle(resolved, numbering) {
 	const numPr = resolved.paragraphFormatting?.numPr;
 	if (!numPr || numPr.numId === void 0 || numPr.numId === 0) return null;
-	const rendering = numbering ? computeListRendering(numPr, numbering) : null;
+	const attrs = listAttrsFromNumbering({
+		numId: numPr.numId,
+		ilvl: numPr.ilvl ?? 0
+	}, numbering);
 	const level = numbering?.getLevel(numPr.numId, numPr.ilvl ?? 0);
-	const attrs = {
-		numPr: {
-			numId: numPr.numId,
-			ilvl: numPr.ilvl ?? 0
-		},
-		numPrFromStyle: {
-			numId: numPr.numId,
-			ilvl: numPr.ilvl ?? 0
-		},
+	attrs["numPrFromStyle"] = {
+		numId: numPr.numId,
+		ilvl: numPr.ilvl ?? 0
+	};
+	const ppr = resolved.paragraphFormatting;
+	if (level?.pPr) {
+		if (ppr?.indentLeft === void 0 && level.pPr.indentLeft !== void 0) attrs["indentLeft"] = level.pPr.indentLeft;
+		if (!(ppr?.indentFirstLine !== void 0 || ppr?.hangingIndent !== void 0) && numberingLevelHasMarkerSlot(level)) {
+			if (level.pPr.indentFirstLine !== void 0) attrs["indentFirstLine"] = level.pPr.indentFirstLine;
+			if (level.pPr.hangingIndent !== void 0) attrs["hangingIndent"] = level.pPr.hangingIndent;
+		}
+	}
+	return attrs;
+}
+/** Project one resolved numbering level into the complete editor attr group. */
+function listAttrsFromNumbering(numPr, numbering) {
+	const targetNumPr = {
+		numId: numPr.numId,
+		ilvl: numPr.ilvl
+	};
+	const rendering = numbering ? computeListRendering(targetNumPr, numbering) : null;
+	return {
+		...CLEARED_LIST_RENDERING_ATTRS,
+		numPr: targetNumPr,
 		listNumFmt: rendering?.numFmt ?? null,
 		listIsBullet: rendering?.isBullet ?? null,
 		listIsLegal: rendering?.isLegal ?? null,
 		listMarker: rendering?.marker ?? null,
+		listMarkerTemplate: rendering?.markerTemplate ?? null,
 		listMarkerHidden: rendering?.markerHidden ?? null,
 		listMarkerFormatting: rendering?.markerFormatting ?? null,
 		listMarkerAlignment: rendering?.markerAlignment ?? null,
 		listMarkerSuffix: rendering?.markerSuffix ?? null,
 		listMarkerAllCaps: rendering?.markerAllCaps ?? null,
-		listImplicitChildLevelAdvances: null,
-		listMarkerSecondSlotOffsetTwips: null,
 		listLevelNumFmts: rendering?.levelNumFmts ?? null,
 		listLevelStarts: rendering?.levelStarts ?? null,
 		listAbstractNumId: rendering?.abstractNumId ?? null,
 		listStartOverride: rendering?.startOverride ?? null
 	};
-	const ppr = resolved.paragraphFormatting;
-	if (level?.pPr) {
-		if (ppr?.indentLeft === void 0 && level.pPr.indentLeft !== void 0) attrs["indentLeft"] = level.pPr.indentLeft;
-		if (!(ppr?.indentFirstLine !== void 0 || ppr?.hangingIndent !== void 0)) {
-			if (level.pPr.indentFirstLine !== void 0) attrs["indentFirstLine"] = level.pPr.indentFirstLine;
-			if (level.pPr.hangingIndent !== void 0) attrs["hangingIndent"] = level.pPr.hangingIndent;
-		}
-	}
-	return attrs;
+}
+/** Recompute every level-dependent attr when a paragraph changes list level. */
+function listLevelAttrPatch(attrs, numPr, numbering) {
+	const level = numbering?.getLevel(numPr.numId, numPr.ilvl);
+	const hasMarkerSlot = level ? numberingLevelHasMarkerSlot(level) : false;
+	return {
+		...listAttrsFromNumbering(numPr, numbering),
+		listImplicitChildLevelAdvances: attrs.listImplicitChildLevelAdvances ?? null,
+		indentLeft: level?.pPr?.indentLeft ?? null,
+		indentFirstLine: hasMarkerSlot ? level?.pPr?.indentFirstLine ?? null : null,
+		hangingIndent: hasMarkerSlot ? level?.pPr?.hangingIndent ?? null : null
+	};
 }
 //#endregion
-export { listAttrsFromResolvedStyle, paragraphAttrsFromResolvedStyle };
+export { listAttrsFromNumbering, listAttrsFromResolvedStyle, listLevelAttrPatch, paragraphAttrsFromResolvedStyle };

package/dist/prosemirror/styles/styleResolver.d.ts

@@ -10,21 +10,18 @@ type ResolvedParagraphStyle = {
   runFormatting?: document_d_exports.TextFormatting;
 };
 /**
- * Paragraph-spacing fields sourced from the table style enclosing a cell
- * paragraph: the table style's own `w:pPr`, then the applicable
+ * Paragraph fields sourced from the table style enclosing a cell paragraph:
+ * the table style's own `w:pPr`, then the applicable
  * `w:tblStylePr` conditional region's `w:pPr` layered on top (already merged
  * by the caller — see `resolveTableBaseStyle`/`resolveTableStyleConditional`
  * in toProseDoc.ts).
  *
- * Deliberately narrower than the full {@link ParagraphFormatting}: this is
- * the layer-2 overlay described on {@link StyleResolver.resolveParagraphStyleInTable}
- * and is scoped to the spacing fields responsible for folio's table-row
- * height bug (table styles like Word's `TableGrid` zero these out relative
- * to `docDefaults`). Alignment, indentation, borders, etc. are out of scope
- * here — applying the whole `pPr` would risk regressing unrelated cell
- * layout that isn't part of this fix.
+ * Deliberately narrower than the full {@link ParagraphFormatting}: spacing
+ * affects table-row height, while `frame` participates in lossless page-break
+ * ownership checks. Other fields remain out of scope until their table-style
+ * projection is modeled end to end.
  */
-type TableCellParagraphSpacingOverlay = Pick<document_d_exports.ParagraphFormatting, "spaceBefore" | "spaceAfter" | "lineSpacing" | "lineSpacingRule" | "contextualSpacing">;
+type TableCellParagraphSpacingOverlay = Pick<document_d_exports.ParagraphFormatting, "spaceBefore" | "spaceAfter" | "lineSpacing" | "lineSpacingRule" | "contextualSpacing" | "frame">;
 /**
  * StyleResolver provides efficient access to resolved style properties
  */
@@ -52,7 +49,7 @@ declare class StyleResolver {
   resolveParagraphStyle(styleId: string | undefined | null): ResolvedParagraphStyle;
   /**
    * Resolve paragraph style properties for a paragraph inside a table cell,
-   * layering the enclosing table style's paragraph-spacing fields into the
+   * layering the modeled enclosing-table paragraph fields into the
    * cascade between docDefaults and the paragraph's own style chain.
    *
    * Per ECMA-376 §17.7.2, a cell paragraph's properties resolve in this
@@ -68,10 +65,10 @@ declare class StyleResolver {
    * paragraph style still wins over the table for any field it sets.
    *
    * @param styleId - The paragraph's style ID (e.g., 'Heading1', 'Normal')
-   * @param tableParagraphOverlay - Paragraph-spacing fields from the
+   * @param tableParagraphOverlay - Modeled paragraph fields from the
    *   enclosing table style (base `pPr` merged with the applicable
    *   conditional region), or `undefined` when the paragraph isn't in a
-   *   table cell, the table has no style, or the style sets no spacing.
+   *   table cell, the table has no style, or the style sets none of them.
    * @returns Resolved paragraph and run formatting
    */
   resolveParagraphStyleInTable(styleId: string | undefined | null, tableParagraphOverlay: TableCellParagraphSpacingOverlay | undefined): ResolvedParagraphStyle;

package/dist/prosemirror/styles/styleResolver.js

@@ -74,7 +74,7 @@ var StyleResolver = class {
 	}
 	/**
 	* Resolve paragraph style properties for a paragraph inside a table cell,
-	* layering the enclosing table style's paragraph-spacing fields into the
+	* layering the modeled enclosing-table paragraph fields into the
 	* cascade between docDefaults and the paragraph's own style chain.
 	*
 	* Per ECMA-376 §17.7.2, a cell paragraph's properties resolve in this
@@ -90,10 +90,10 @@ var StyleResolver = class {
 	* paragraph style still wins over the table for any field it sets.
 	*
 	* @param styleId - The paragraph's style ID (e.g., 'Heading1', 'Normal')
-	* @param tableParagraphOverlay - Paragraph-spacing fields from the
+	* @param tableParagraphOverlay - Modeled paragraph fields from the
 	*   enclosing table style (base `pPr` merged with the applicable
 	*   conditional region), or `undefined` when the paragraph isn't in a
-	*   table cell, the table has no style, or the style sets no spacing.
+	*   table cell, the table has no style, or the style sets none of them.
 	* @returns Resolved paragraph and run formatting
 	*/
 	resolveParagraphStyleInTable(styleId, tableParagraphOverlay) {

package/dist/prosemirror/styles/styleToggleCascade.d.ts

@@ -23,6 +23,13 @@ type StyleToggleCascadeOptions = {
   /** Existing ordinary-property merge whose toggle fields this cascade replaces. */
   ordinaryFormatting: document_d_exports.TextFormatting | undefined;
 };
+type CascadeStyleFromResolvedBaseOptions = {
+  baseFormatting: document_d_exports.TextFormatting | undefined;
+  defaultsActiveProperties: readonly StyleToggleKey[] | undefined;
+  styleFormatting: document_d_exports.TextFormatting | undefined;
+};
+/** Continue a style cascade from a compact resolved paragraph snapshot. */
+declare const cascadeStyleFromResolvedBase: ({ baseFormatting, defaultsActiveProperties, styleFormatting }: CascadeStyleFromResolvedBaseOptions) => document_d_exports.TextFormatting | undefined;
 /**
  * Resolve run formatting across OOXML style hierarchy levels.
  *
@@ -34,4 +41,4 @@ type StyleToggleCascadeOptions = {
  */
 declare function cascadeStyleTextFormatting(levels: readonly StyleToggleLevel[], options?: StyleToggleCascadeOptions): StyleTextFormattingCascade;
 //#endregion
-export { cascadeStyleTextFormatting };
+export { StyleToggleKey, cascadeStyleFromResolvedBase, cascadeStyleTextFormatting };

package/dist/prosemirror/styles/styleToggleCascade.js

@@ -1,5 +1,28 @@
 import { STYLE_TOGGLE_KEYS, mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 //#region src/prosemirror/styles/styleToggleCascade.ts
+/** Continue a style cascade from a compact resolved paragraph snapshot. */
+const cascadeStyleFromResolvedBase = ({ baseFormatting, defaultsActiveProperties, styleFormatting }) => {
+	const defaultsActive = new Set(defaultsActiveProperties);
+	const toggleStates = /* @__PURE__ */ new Map();
+	for (const key of STYLE_TOGGLE_KEYS) {
+		const value = baseFormatting?.[key];
+		if (value !== void 0) toggleStates.set(key, {
+			value,
+			defaultsActive: defaultsActive.has(key)
+		});
+	}
+	return cascadeStyleTextFormatting([{
+		cascade: {
+			formatting: baseFormatting,
+			toggleStates,
+			type: "styleToggleCascade"
+		},
+		type: "carried"
+	}, {
+		formatting: styleFormatting,
+		type: "style"
+	}]).formatting;
+};
 /**
 * Resolve run formatting across OOXML style hierarchy levels.
 *
@@ -49,4 +72,4 @@ function cascadeStyleTextFormatting(levels, options) {
 	};
 }
 //#endregion
-export { cascadeStyleTextFormatting };
+export { cascadeStyleFromResolvedBase, cascadeStyleTextFormatting };

package/dist/prosemirror/tableGridMutation.d.ts

@@ -0,0 +1,20 @@
+import { Transaction } from "prosemirror-state";
+import { Node } from "prosemirror-model";
+//#region src/prosemirror/tableGridMutation.d.ts
+type ReconcileTableGridAfterColumnRemovalOptions = {
+  tr: Transaction;
+  tablePosition: number;
+  previousTable: Node;
+  removedColumn: number;
+};
+/**
+ * Keep the editable table grid aligned with a physical column removal.
+ *
+ * `prosemirror-tables` owns cell topology, but Folio separately retains the
+ * authored `w:tblGrid` widths and source XML on the table node. A topology
+ * edit that leaves those attrs untouched serializes a new row shape against
+ * the old grid; reopening then has to interpret surviving cells as spans.
+ */
+declare const reconcileTableGridAfterColumnRemoval: ({ tr, tablePosition, previousTable, removedColumn }: ReconcileTableGridAfterColumnRemovalOptions) => void;
+//#endregion
+export { reconcileTableGridAfterColumnRemoval };

package/dist/prosemirror/tableGridMutation.js

@@ -0,0 +1,30 @@
+import { expectTableAttrs, mergeTableAttrs } from "./attrs/index.js";
+import { TableMap } from "prosemirror-tables";
+//#region src/prosemirror/tableGridMutation.ts
+/**
+* Keep the editable table grid aligned with a physical column removal.
+*
+* `prosemirror-tables` owns cell topology, but Folio separately retains the
+* authored `w:tblGrid` widths and source XML on the table node. A topology
+* edit that leaves those attrs untouched serializes a new row shape against
+* the old grid; reopening then has to interpret surviving cells as spans.
+*/
+const reconcileTableGridAfterColumnRemoval = ({ tr, tablePosition, previousTable, removedColumn }) => {
+	const previousColumnCount = TableMap.get(previousTable).width;
+	const table = tr.doc.nodeAt(tablePosition);
+	if (!table || table.type.spec["tableRole"] !== "table") return;
+	const columnCount = TableMap.get(table).width;
+	if (columnCount >= previousColumnCount) return;
+	const removedColumnCount = previousColumnCount - columnCount;
+	const previousWidths = expectTableAttrs(previousTable).columnWidths;
+	const columnWidths = previousWidths?.length === previousColumnCount ? previousWidths.toSpliced(removedColumn, removedColumnCount) : void 0;
+	const formatting = expectTableAttrs(table)._originalFormatting;
+	const originalFormatting = formatting ? { ...formatting } : void 0;
+	if (originalFormatting) delete originalFormatting.gridSourceXml;
+	tr.setNodeMarkup(tablePosition, void 0, mergeTableAttrs(table, {
+		columnWidths: columnWidths?.length === columnCount ? columnWidths : void 0,
+		_originalFormatting: originalFormatting
+	}));
+};
+//#endregion
+export { reconcileTableGridAfterColumnRemoval };

package/dist/prosemirror/trackedRunInlineAtoms.d.ts

@@ -0,0 +1,31 @@
+import { Node } from "prosemirror-model";
+//#region src/prosemirror/trackedRunInlineAtoms.d.ts
+type TrackedRunInlineAtomDisposition = "carry" | "field-carrier" | "outside-wrapper" | "page-break-carrier" | "text-carrier" | "transparent";
+/**
+ * How every inline atom in the editor schema participates in an OOXML
+ * run-level tracked-change wrapper.
+ *
+ * The schema is assembled at runtime, so the fixed-point test binds this map
+ * to its complete inline-atom set. The lookup also panics on a missing entry:
+ * a new atom cannot silently lose revision ownership before that test runs.
+ */
+declare const TRACKED_RUN_INLINE_ATOM_DISPOSITIONS: Readonly<{
+  readonly bookmarkBoundary: "carry";
+  readonly field: "field-carrier";
+  readonly hardBreak: "carry";
+  readonly image: "carry";
+  readonly math: "outside-wrapper";
+  readonly pageBreakRun: "page-break-carrier";
+  readonly renderedPageBreak: "transparent";
+  readonly shape: "carry";
+  readonly structuredField: "carry";
+  readonly symbol: "carry";
+  readonly tab: "carry";
+  readonly text: "text-carrier";
+  readonly textBoxAnchor: "carry";
+}>;
+declare const trackedRunInlineAtomDisposition: (node: Node) => TrackedRunInlineAtomDisposition | null;
+/** Whether an editor node can own an insertion/deletion mark as one run carrier. */
+declare const canCarryTrackedRunMark: (node: Node) => boolean;
+//#endregion
+export { TRACKED_RUN_INLINE_ATOM_DISPOSITIONS, TrackedRunInlineAtomDisposition, canCarryTrackedRunMark, trackedRunInlineAtomDisposition };

package/dist/prosemirror/trackedRunInlineAtoms.js

@@ -0,0 +1,39 @@
+import { panic } from "better-result";
+//#region src/prosemirror/trackedRunInlineAtoms.ts
+/**
+* How every inline atom in the editor schema participates in an OOXML
+* run-level tracked-change wrapper.
+*
+* The schema is assembled at runtime, so the fixed-point test binds this map
+* to its complete inline-atom set. The lookup also panics on a missing entry:
+* a new atom cannot silently lose revision ownership before that test runs.
+*/
+const TRACKED_RUN_INLINE_ATOM_DISPOSITIONS = Object.freeze({
+	bookmarkBoundary: "carry",
+	field: "field-carrier",
+	hardBreak: "carry",
+	image: "carry",
+	math: "outside-wrapper",
+	pageBreakRun: "page-break-carrier",
+	renderedPageBreak: "transparent",
+	shape: "carry",
+	structuredField: "carry",
+	symbol: "carry",
+	tab: "carry",
+	text: "text-carrier",
+	textBoxAnchor: "carry"
+});
+const dispositionsByName = new Map(Object.entries(TRACKED_RUN_INLINE_ATOM_DISPOSITIONS));
+const trackedRunInlineAtomDisposition = (node) => {
+	if (!node.isInline || !node.isAtom) return null;
+	const disposition = dispositionsByName.get(node.type.name);
+	if (!disposition) panic(`Inline atom ${JSON.stringify(node.type.name)} has no tracked-run disposition`);
+	return disposition;
+};
+/** Whether an editor node can own an insertion/deletion mark as one run carrier. */
+const canCarryTrackedRunMark = (node) => {
+	const disposition = trackedRunInlineAtomDisposition(node);
+	return disposition === "carry" || disposition === "field-carrier" || disposition === "text-carrier" || disposition === "page-break-carrier";
+};
+//#endregion
+export { TRACKED_RUN_INLINE_ATOM_DISPOSITIONS, canCarryTrackedRunMark, trackedRunInlineAtomDisposition };

package/dist/prosemirror/utils/visualLineNavigation.js

@@ -1,3 +1,5 @@
+import { findBodyEmptyRuns, findBodyPmSpans } from "../../layout-bridge/dom/findBodyPmSpans.js";
+import { createTextStreamRange, descendantTextNodes, totalTextLength } from "../../layout-bridge/dom/textStreamDom.js";
 import { findVerticalScrollParent } from "../../utils/findVerticalScrollParent.js";
 import { TextSelection } from "prosemirror-state";
 //#region src/prosemirror/utils/visualLineNavigation.ts
@@ -33,28 +35,21 @@ function scrollIntoViewIfNeeded(el) {
 }
 /** @internal */
 function getCaretClientX(container, pmPos) {
-	const spans = container.querySelectorAll("span[data-pm-start][data-pm-end]");
-	for (const span of Array.from(spans)) {
-		const spanEl = span;
+	for (const spanEl of findBodyPmSpans(container)) {
 		const pmStart = Number(spanEl.dataset["pmStart"]);
 		const pmEnd = Number(spanEl.dataset["pmEnd"]);
 		if (spanEl.classList.contains("layout-run-tab")) {
 			if (pmPos >= pmStart && pmPos < pmEnd) return spanEl.getBoundingClientRect().left;
 			continue;
 		}
-		if (pmPos >= pmStart && pmPos <= pmEnd && span.firstChild?.nodeType === Node.TEXT_NODE) {
-			const textNode = span.firstChild;
-			const charIndex = Math.min(pmPos - pmStart, textNode.length);
-			const ownerDoc = spanEl.ownerDocument;
-			if (!ownerDoc) continue;
-			const range = ownerDoc.createRange();
-			range.setStart(textNode, charIndex);
-			range.setEnd(textNode, charIndex);
-			return range.getBoundingClientRect().left;
+		if (pmPos >= pmStart && pmPos <= pmEnd) {
+			const textNodes = descendantTextNodes(spanEl);
+			const charIndex = Math.min(pmPos - pmStart, totalTextLength(textNodes));
+			const range = createTextStreamRange(spanEl, charIndex, charIndex);
+			if (range) return range.getBoundingClientRect().left;
 		}
 	}
-	const emptyRuns = container.querySelectorAll(".layout-empty-run");
-	for (const emptyRun of Array.from(emptyRuns)) {
+	for (const emptyRun of findBodyEmptyRuns(container)) {
 		const paragraph = emptyRun.closest(".layout-paragraph");
 		if (!paragraph) continue;
 		const pmStart = Number(paragraph.dataset["pmStart"]);
@@ -91,6 +86,13 @@ function findLineElementAtPosition(container, pmPos) {
 /** @internal */
 function findPositionOnLineAtClientX(lineEl, clientX) {
 	const spans = lineEl.querySelectorAll("span[data-pm-start][data-pm-end]");
+	const emptyRun = lineEl.querySelector(".layout-empty-run");
+	if (emptyRun) {
+		const emptyRunStart = emptyRun.dataset["pmStart"];
+		if (emptyRunStart !== void 0) return Number(emptyRunStart);
+		const paragraphStart = emptyRun.closest(".layout-paragraph")?.dataset["pmStart"];
+		return paragraphStart === void 0 ? null : Number(paragraphStart) + 1;
+	}
 	if (spans.length === 0) {
 		const paragraph = lineEl.closest(".layout-paragraph");
 		if (paragraph?.dataset["pmStart"]) return Number(paragraph.dataset["pmStart"]) + 1;
@@ -106,29 +108,23 @@ function findPositionOnLineAtClientX(lineEl, clientX) {
 			continue;
 		}
 		if (clientX >= rect.left && clientX <= rect.right) {
-			const textNode = spanEl.firstChild;
-			if (!textNode || textNode.nodeType !== Node.TEXT_NODE) return pmStart;
-			const text = textNode;
-			const ownerDoc = spanEl.ownerDocument;
-			if (!ownerDoc) return pmStart;
+			const textLength = totalTextLength(descendantTextNodes(spanEl));
+			if (textLength === 0) return pmStart;
 			let lo = 0;
-			let hi = text.length;
+			let hi = textLength;
 			while (lo < hi) {
 				const mid = Math.floor((lo + hi) / 2);
-				const r = ownerDoc.createRange();
-				r.setStart(text, mid);
-				r.setEnd(text, mid);
+				const r = createTextStreamRange(spanEl, mid, mid);
+				if (!r) return pmStart;
 				if (clientX < r.getBoundingClientRect().left) hi = mid;
 				else lo = mid + 1;
 			}
-			if (lo > 0 && lo <= text.length) {
-				const r = ownerDoc.createRange();
-				r.setStart(text, lo - 1);
-				r.setEnd(text, lo - 1);
-				const leftX = r.getBoundingClientRect().left;
-				r.setStart(text, Math.min(lo, text.length));
-				r.setEnd(text, Math.min(lo, text.length));
-				const rightX = r.getBoundingClientRect().left;
+			if (lo > 0 && lo <= textLength) {
+				const left = createTextStreamRange(spanEl, lo - 1, lo - 1);
+				const right = createTextStreamRange(spanEl, Math.min(lo, textLength), Math.min(lo, textLength));
+				if (!left || !right) return pmStart;
+				const leftX = left.getBoundingClientRect().left;
+				const rightX = right.getBoundingClientRect().left;
 				if (Math.abs(clientX - leftX) < Math.abs(clientX - rightX)) return pmStart + (lo - 1);
 			}
 			return pmStart + Math.min(lo, pmEnd - pmStart);

package/dist/prosemirror/validation.js

@@ -1,4 +1,4 @@
-import { readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs } from "./attrs/index.js";
+import { readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readPageBreakRunAttrs, readPageBreakRunOwnerMarkAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs } from "./attrs/index.js";
 import { readBookmarkBoundaryAttrs } from "./bookmarkBoundaryAttrs.js";
 import { readTextBoxAnchorAttrs } from "./textBoxAnchorAttrs.js";
 //#region src/prosemirror/validation.ts
@@ -151,6 +151,9 @@ const validateNodeAttrs = (node, path, issues) => {
 		case "hardBreak":
 			appendAttrIssues(path, readHardBreakAttrs(node), issues);
 			return;
+		case "pageBreakRun":
+			appendAttrIssues(path, readPageBreakRunAttrs(node), issues);
+			return;
 		case "paragraph":
 			appendAttrIssues(path, readParagraphAttrs(node), issues);
 			return;
@@ -180,18 +183,31 @@ const validateNodeAttrs = (node, path, issues) => {
 				appendAttrIssues(path, fieldAttrs, issues);
 				if (fieldAttrs.ok) {
 					const hasStructuredHyperlink = node.content.content.some((child) => child.marks.some((mark) => mark.type.name === "hyperlink"));
-					if (fieldAttrs.value.fieldKind === "complex") issues.push({
+					const hasPageBreakCarrier = node.content.content.some((child) => child.type.name === "pageBreakRun");
+					if (fieldAttrs.value.fieldKind === "complex" && !hasPageBreakCarrier) issues.push({
 						path: `${path}.content`,
 						message: "Complex fields cannot contain structured result children."
 					});
-					else if (!hasStructuredHyperlink) issues.push({
+					else if (fieldAttrs.value.fieldKind === "complex" && hasStructuredHyperlink) issues.push({
+						path: `${path}.content`,
+						message: "Complex field results cannot contain hyperlink content."
+					});
+					else if (!hasStructuredHyperlink && !hasPageBreakCarrier) issues.push({
 						path: `${path}.content`,
 						message: "Structured simple fields require hyperlink content."
 					});
 					node.forEach((child, _offset, index) => {
 						const childPath = `${path}.content[${index}]`;
 						const hasHyperlink = child.marks.some((mark) => mark.type.name === "hyperlink");
-						if (child.type.name === "bookmarkBoundary" && !hasHyperlink) issues.push({
+						if (fieldAttrs.value.fieldKind === "complex" && child.type.name === "textBoxAnchor") issues.push({
+							path: childPath,
+							message: "Complex field results cannot contain text-box anchors."
+						});
+						else if (fieldAttrs.value.fieldKind === "complex" && child.type.name === "bookmarkBoundary") issues.push({
+							path: childPath,
+							message: "Complex field results cannot contain bookmark boundaries."
+						});
+						else if (child.type.name === "bookmarkBoundary" && !hasHyperlink) issues.push({
 							path: childPath,
 							message: "Bookmark boundaries inside fields require a hyperlink parent."
 						});
@@ -289,6 +305,9 @@ const validateMarks = (marks, path, issues) => {
 			case "runPropertyChange":
 				appendAttrIssues(markPath, readRunPropertyChangeMarkAttrs(mark), issues);
 				continue;
+			case "pageBreakRunOwner":
+				appendAttrIssues(markPath, readPageBreakRunOwnerMarkAttrs(mark), issues);
+				continue;
 			case "runFormattingOverride":
 				appendAttrIssues(markPath, readRunFormattingOverrideMarkAttrs(mark), issues);
 				continue;

package/dist/render-dom/HeaderFooterSelectionOverlay.js

@@ -1,9 +1,9 @@
 import { findHfCaretSpan, findHfPmSpans } from "../layout-bridge/dom/findHfPmSpans.js";
+import { createTextStreamRange, descendantTextNodes, totalTextLength } from "../layout-bridge/dom/textStreamDom.js";
 //#region src/render-dom/HeaderFooterSelectionOverlay.ts
 const CARET_CLASS = "folio-hf-selection-caret";
 const RANGE_CLASS = "folio-hf-selection-rect";
 const OWNED_SELECTOR = `.${CARET_CLASS}, .${RANGE_CLASS}`;
-const TEXT_NODE_TYPE = 3;
 const relativeRect = (rect, containerRect, zoom) => ({
 	x: (rect.left - containerRect.left) / zoom,
 	y: (rect.top - containerRect.top) / zoom,
@@ -27,17 +27,17 @@ const resolveHeaderFooterSelectionGeometry = (pagesContainer, selection, zoom) =
 		let height = anchorRect.height || 16;
 		const pmStart = Number.parseInt(hit.element.dataset["pmStart"] ?? "", 10);
 		const pmEnd = Number.parseInt(hit.element.dataset["pmEnd"] ?? "", 10);
-		const textNode = hit.element.firstChild;
-		if (textNode?.nodeType === TEXT_NODE_TYPE && Number.isFinite(pmStart) && Number.isFinite(pmEnd)) {
-			const offset = Math.min(Math.max(0, selection.from - pmStart), textNode.textContent?.length ?? 0);
-			const range = hit.element.ownerDocument.createRange();
-			range.setStart(textNode, offset);
-			range.setEnd(textNode, offset);
-			const rangeRect = range.getBoundingClientRect();
-			if (rangeRect.height > 0 || rangeRect.width > 0 || rangeRect.left > 0) {
-				left = rangeRect.left;
-				top = rangeRect.top;
-				height = rangeRect.height || height;
+		const textNodes = descendantTextNodes(hit.element);
+		if (textNodes.length > 0 && Number.isFinite(pmStart) && Number.isFinite(pmEnd)) {
+			const offset = Math.min(Math.max(0, selection.from - pmStart), totalTextLength(textNodes));
+			const range = createTextStreamRange(hit.element, offset, offset);
+			if (range) {
+				const rangeRect = range.getBoundingClientRect();
+				if (rangeRect.height > 0 || rangeRect.width > 0 || rangeRect.left > 0) {
+					left = rangeRect.left;
+					top = rangeRect.top;
+					height = rangeRect.height || height;
+				}
 			}
 		}
 		return {
@@ -57,17 +57,17 @@ const resolveHeaderFooterSelectionGeometry = (pagesContainer, selection, zoom) =
 		const spanEnd = Number.parseInt(span.dataset["pmEnd"] ?? "", 10);
 		if (!Number.isFinite(spanStart) || !Number.isFinite(spanEnd)) continue;
 		if (spanEnd <= from || spanStart >= to) continue;
-		const textNode = span.firstChild;
-		if (textNode?.nodeType === TEXT_NODE_TYPE) {
-			const length = textNode.textContent?.length ?? 0;
+		const textNodes = descendantTextNodes(span);
+		if (textNodes.length > 0) {
+			const length = totalTextLength(textNodes);
 			const startOffset = Math.max(0, from - spanStart);
 			const endOffset = Math.min(length, to - spanStart);
 			if (startOffset < endOffset) {
-				const range = span.ownerDocument.createRange();
-				range.setStart(textNode, startOffset);
-				range.setEnd(textNode, endOffset);
-				for (const rect of Array.from(range.getClientRects())) ranges.push(relativeRect(rect, containerRect, zoomDivisor));
-				continue;
+				const range = createTextStreamRange(span, startOffset, endOffset);
+				if (range) {
+					for (const rect of Array.from(range.getClientRects())) ranges.push(relativeRect(rect, containerRect, zoomDivisor));
+					continue;
+				}
 			}
 		}
 		ranges.push(relativeRect(span.getBoundingClientRect(), containerRect, zoomDivisor));