@stll/folio-core 0.66.1 → 0.66.2

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

@@ -124,6 +124,7 @@ const EMPTY_SPAN = new RegExp(`<span(?:\\s${TAG_TAIL})?><\\/span>`, "gi");
 const MAX_EMPTY_SPAN_PASSES = 5;
 const INTERNAL_CLIPBOARD_ATTR_PATTERN = /\s+data-docx-internal-clipboard(?:="([^"]*)"|='([^']*)'|=([^\s>]+))?/gi;
 const TEXTBOX_ANCHOR_ATTR = /\s+data-docx-textbox-anchor(?:="[^"]*"|='[^']*')?/gi;
+const HYPHEN_ELEMENT_ATTR = /\s+data-docx-hyphen-element(?:="[^"]*"|='[^']*'|=[^\s>]+)?/gi;
 const BOOKMARK_BOUNDARY_ATTR = /\s+data-docx-bookmark-(?:boundary|id|name|col-first|col-last)(?:="[^"]*"|='[^']*'|=[^\s>]+)?/gi;
 const RANGE_ANCHOR_ATTR = /\s+data-docx-range-anchor(?:="[^"]*"|='[^']*'|=[^\s>]+)?/gi;
 const COMMENT_RANGE_BOUNDARY_ATTR = /\s+data-docx-comment-range-boundary(?:="[^"]*"|='[^']*'|=[^\s>]+)?/gi;
@@ -145,6 +146,10 @@ function stripForeignTextBoxAnchors(html, internal) {
 	if (internal) return html;
 	return html.replace(TEXTBOX_ANCHOR_ATTR, "");
 }
+function stripForeignHyphenElements(html, internal) {
+	if (internal) return html;
+	return html.replace(HYPHEN_ELEMENT_ATTR, "");
+}
 function stripForeignBookmarkBoundaries(html, internal) {
 	if (internal) return html;
 	return html.replace(BOOKMARK_BOUNDARY_ATTR, "");
@@ -187,6 +192,7 @@ function cleanPastedHtml(html, options = {}) {
 		cleaned = stripMsoStyles(cleaned);
 		cleaned = stripEmptySpans(cleaned, internal);
 		cleaned = stripForeignTextBoxAnchors(cleaned, internal);
+		cleaned = stripForeignHyphenElements(cleaned, internal);
 		cleaned = stripForeignBookmarkBoundaries(cleaned, internal);
 		cleaned = stripForeignRangeCarriers(cleaned, internal);
 		cleaned = stripForeignStructuredFields(cleaned, internal);

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

@@ -1,4 +1,5 @@
 import { mintListInstance } from "../../../docx/listNumberingInstances.js";
+import { NO_NUMBERING_IDS_IN_USE } from "../../../docx/numberingIds.js";
 import { createNumberingMap } from "../../../docx/numberingParser.js";
 import { expectParagraphAttrs } from "../../attrs/index.js";
 import { completeNumberingForDoc } from "../../listInstanceReferences.js";
@@ -93,7 +94,7 @@ const numberPastedHtmlLists = (slice, view) => {
 					const minted = mintListInstance(definitions, {
 						kind: hint.kind,
 						...hint.start === void 0 ? {} : { start: hint.start }
-					});
+					}, NO_NUMBERING_IDS_IN_USE);
 					definitions = minted.definitions;
 					numbering = createNumberingMap(definitions);
 					group = {

package/dist/prosemirror/extensions/markRegistry.d.ts

@@ -1,4 +1,5 @@
 import { MarkExtension } from "./types.js";
+import { HyphenElementExtension } from "./marks/HyphenElementExtension.js";
 export declare const MARK_EXTENSIONS: {
   readonly bold: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
   readonly italic: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
@@ -27,6 +28,7 @@ export declare const MARK_EXTENSIONS: {
   readonly textEffect: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
   readonly runFormattingOverride: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
   readonly characterStyle: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
+  readonly hyphenElement: typeof HyphenElementExtension;
   readonly runIdentity: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
   readonly comment: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
   readonly insertion: (options?: Partial<Record<string, unknown>> | undefined) => MarkExtension;
@@ -56,4 +58,4 @@ export type SchemaMarkName = keyof typeof MARK_EXTENSIONS;
  * own in OOXML, so the save leg ranks it against nothing and its place here is
  * a presentation decision.
  */
-export declare const MARK_NESTING_ORDER: readonly ["bold", "italic", "underline", "strike", "textColor", "runShading", "highlight", "fontSize", "fontFamily", "language", "superscript", "subscript", "allCaps", "smallCaps", "footnoteRef", "characterSpacing", "emboss", "imprint", "hidden", "textShadow", "emphasisMark", "textOutline", "rtl", "textEffect", "runFormattingOverride", "characterStyle", "comment", "inlineWrapper", "insertion", "deletion", "hyperlink", "runPropertyChange", "runIdentity"];
+export declare const MARK_NESTING_ORDER: readonly ["bold", "italic", "underline", "strike", "textColor", "runShading", "highlight", "fontSize", "fontFamily", "language", "superscript", "subscript", "allCaps", "smallCaps", "footnoteRef", "characterSpacing", "emboss", "imprint", "hidden", "textShadow", "emphasisMark", "textOutline", "rtl", "textEffect", "runFormattingOverride", "characterStyle", "hyphenElement", "comment", "inlineWrapper", "insertion", "deletion", "hyperlink", "runPropertyChange", "runIdentity"];

package/dist/prosemirror/extensions/markRegistry.js

@@ -9,6 +9,7 @@ import { FootnoteRefExtension } from "./marks/FootnoteRefExtension.js";
 import { HiddenTextExtension } from "./marks/HiddenTextExtension.js";
 import { HighlightExtension } from "./marks/HighlightExtension.js";
 import { HyperlinkExtension } from "./marks/HyperlinkExtension.js";
+import { HyphenElementExtension } from "./marks/HyphenElementExtension.js";
 import { InlineWrapperExtension } from "./marks/InlineWrapperExtension.js";
 import { ItalicExtension } from "./marks/ItalicExtension.js";
 import { LanguageExtension } from "./marks/LanguageExtension.js";
@@ -67,6 +68,7 @@ const MARK_EXTENSIONS = {
 	textEffect: TextEffectExtension,
 	runFormattingOverride: RunFormattingOverrideExtension,
 	characterStyle: CharacterStyleExtension,
+	hyphenElement: HyphenElementExtension,
 	runIdentity: RunIdentityExtension,
 	comment: CommentExtension,
 	insertion: InsertionExtension,
@@ -123,6 +125,7 @@ const MARK_NESTING_ORDER = markNestingOrder([
 	"textEffect",
 	"runFormattingOverride",
 	"characterStyle",
+	"hyphenElement",
 	"comment",
 	"inlineWrapper",
 	"insertion",

package/dist/prosemirror/extensions/marks/HyphenElementExtension.d.ts

@@ -0,0 +1,6 @@
+import { MarkExtension } from "../types.js";
+type HyphenElementOptions = {
+  getInternalClipboardToken?: () => string;
+};
+export declare const HyphenElementExtension: (options?: Partial<HyphenElementOptions> | undefined) => MarkExtension;
+export {};

package/dist/prosemirror/extensions/marks/HyphenElementExtension.js

@@ -0,0 +1,54 @@
+import { HYPHEN_ELEMENT_MARK_NAME } from "../../conversion/hyphenTextCarriers.js";
+import { expectHyphenElementMarkAttrs } from "../../hyphenElementAttrs.js";
+import { createMarkExtension } from "../create.js";
+// src/prosemirror/extensions/marks/HyphenElementExtension.ts
+/**
+* Marks the native text that stands for a `w:softHyphen` or `w:noBreakHyphen`
+* run child (ECMA-376 Part 1, 17.3.3.29 and 17.3.3.18).
+*
+* The editor renders both elements as their Unicode characters so line
+* breaking and measurement treat them as text. The same characters may also be
+* authored inside `w:t`, so without this mark the save leg could not tell
+* which of the two the source held. Nothing is painted for it.
+*
+* Not inclusive, and each carrier in a paragraph has its own `id`: ProseMirror
+* keeps a non-inclusive mark only where both neighbours hold an equal mark, so
+* distinct ids mean a character typed beside or between carriers is text. The
+* ids only tell neighbours apart. They can repeat after a paste beside the
+* source or a paragraph join, which `hyphenElementRunContent` describes.
+*
+* External HTML must not be able to claim the element: `cleanPastedHtml` strips
+* the attribute unless the slice carries the internal clipboard capability, so
+* `toDOM` stamps that capability on every carrier it writes.
+*/
+const HYPHEN_ELEMENT_ATTRIBUTE = "data-docx-hyphen-element";
+const CANONICAL_HYPHEN_ELEMENT_ID = /^(?:0|[1-9]\d*)$/u;
+const HyphenElementExtension = createMarkExtension({
+	name: HYPHEN_ELEMENT_MARK_NAME,
+	schemaMarkName: HYPHEN_ELEMENT_MARK_NAME,
+	markSpec: (options) => ({
+		attrs: { id: {} },
+		inclusive: false,
+		parseDOM: [{
+			tag: `span[${HYPHEN_ELEMENT_ATTRIBUTE}]`,
+			getAttrs(dom) {
+				const rawId = dom.getAttribute(HYPHEN_ELEMENT_ATTRIBUTE);
+				if (rawId === null || !CANONICAL_HYPHEN_ELEMENT_ID.test(rawId)) return false;
+				const id = Number(rawId);
+				return Number.isSafeInteger(id) ? { id } : false;
+			}
+		}],
+		toDOM(mark) {
+			const { id } = expectHyphenElementMarkAttrs(mark);
+			return [
+				"span",
+				{
+					[HYPHEN_ELEMENT_ATTRIBUTE]: String(id),
+					...options.getInternalClipboardToken ? { "data-docx-internal-clipboard": options.getInternalClipboardToken() } : {}
+				},
+				0
+			];
+		}
+	})
+});
+export { HyphenElementExtension };

package/dist/prosemirror/fieldRepresentation.js

@@ -1,3 +1,4 @@
+import "./conversion/hyphenTextCarriers.js";
 import "./extensions/marks/InlineWrapperExtension.js";
 import { getInlineDisplayText } from "./inlineDisplayText.js";
 import "./runIdentity.js";
@@ -11,7 +12,7 @@ const fieldCommentCoverage = (fieldKind) => FIELD_COMMENT_COVERAGE[fieldKind];
 /** Current children alone decide whether a field needs editable structural content. */
 const fieldRequiresStructuredContent = (children) => {
 	const first = children.at(0);
-	return children.some((child) => !child.isText || first !== void 0 && !Mark.sameSet(first.marks, child.marks) || child.marks.some((mark) => mark.type.name === "runIdentity" || mark.type.name === "footnoteRef" || mark.type.name === "hyperlink" || mark.type.name === "inlineWrapper" || mark.type.name === "insertion" || mark.type.name === "deletion"));
+	return children.some((child) => !child.isText || first !== void 0 && !Mark.sameSet(first.marks, child.marks) || child.marks.some((mark) => mark.type.name === "runIdentity" || mark.type.name === "hyphenElement" || mark.type.name === "footnoteRef" || mark.type.name === "hyperlink" || mark.type.name === "inlineWrapper" || mark.type.name === "insertion" || mark.type.name === "deletion"));
 };
 /** Resolution collapses a field only when the atom can retain its result. */
 const canonicalFieldNode = (node) => {

package/dist/prosemirror/hyphenElementAttrs.d.ts

@@ -0,0 +1,10 @@
+import { ReadProseMirrorAttrsResult } from "../internal/prosemirrorAttrBoundary.js";
+import "./attrs/index.js";
+import { Mark } from "prosemirror-model";
+type HyphenElementMarkAttrs = {
+  /** Tells this carrier from its neighbours. Monotonic within one paragraph. */
+  id: number;
+};
+export declare const readHyphenElementMarkAttrs: (mark: Mark) => ReadProseMirrorAttrsResult<HyphenElementMarkAttrs>;
+export declare const expectHyphenElementMarkAttrs: (mark: Mark) => HyphenElementMarkAttrs;
+export {};

package/dist/prosemirror/hyphenElementAttrs.js

@@ -0,0 +1,32 @@
+import { panic } from "better-result";
+// src/prosemirror/hyphenElementAttrs.ts
+const readHyphenElementMarkAttrs = (mark) => {
+	const id = mark.attrs["id"];
+	if (mark.type.name !== "hyphenElement") return {
+		ok: false,
+		issues: [{
+			path: "mark.type.name",
+			message: `Expected hyphenElement, got ${mark.type.name}.`
+		}]
+	};
+	if (typeof id !== "number" || !Number.isSafeInteger(id) || id < 0) return {
+		ok: false,
+		issues: [{
+			path: "hyphenElement.attrs.id",
+			message: "Expected a non-negative safe integer."
+		}]
+	};
+	return {
+		ok: true,
+		value: { id }
+	};
+};
+const expectHyphenElementMarkAttrs = (mark) => {
+	const result = readHyphenElementMarkAttrs(mark);
+	if (!result.ok) {
+		const details = result.issues.map((issue) => `${issue.path}: ${issue.message}`).join("\n");
+		panic(`Invalid ProseMirror hyphen element attrs:\n${details}`);
+	}
+	return result.value;
+};
+export { expectHyphenElementMarkAttrs, readHyphenElementMarkAttrs };

package/dist/prosemirror/keptRangeBoundaries.d.ts

@@ -6,6 +6,8 @@ import { Transaction } from "prosemirror-state";
 type BoundaryItem = Extract<document_d_exports.ParagraphContent, {
   type: "bookmarkStart" | "bookmarkEnd" | "commentRangeStart" | "commentRangeEnd" | "moveFromRangeStart" | "moveFromRangeEnd" | "moveToRangeStart" | "moveToRangeEnd";
 }>;
+/** The marks that say a node is in a revision: its wrappers, in the engine. */
+export declare const REVISION_MARK_NAMES: ReadonlySet<string>;
 /** The range boundaries `node` carries; none for any other node. */
 export declare const rangeBoundaryItemsOf: (node: Node) => readonly BoundaryItem[];
 /** Range boundary nodes, as the nodes that stand for them between blocks. */

package/dist/prosemirror/keptRangeBoundaries.js

@@ -377,4 +377,4 @@ const removeResolvedSubtree = (node, selection) => {
 	if (selection.mode === "reject") visit(node);
 	return { kept };
 };
-export { blockBoundariesOf, carriesCommentAnchor, inlineBoundariesOf, isBlockBoundaryNode, normalizeKeptRangeBoundaries, paragraphRemainsOf, rangeBoundaryItemsOf, removeResolvedSubtree, revisionLayerRemovesContent };
+export { REVISION_MARK_NAMES, blockBoundariesOf, carriesCommentAnchor, inlineBoundariesOf, isBlockBoundaryNode, normalizeKeptRangeBoundaries, paragraphRemainsOf, rangeBoundaryItemsOf, removeResolvedSubtree, revisionLayerRemovesContent };

package/dist/prosemirror/listNumbering.js

@@ -1,4 +1,5 @@
 import { mintListInstance, restartListInstance } from "../docx/listNumberingInstances.js";
+import { NO_NUMBERING_IDS_IN_USE } from "../docx/numberingIds.js";
 import { createNumberingMap, isBulletLevel } from "../docx/numberingParser.js";
 import { paragraphNumberingReferenceId } from "../docx/numberingReference.js";
 import { expectParagraphAttrs } from "./attrs/index.js";
@@ -179,7 +180,7 @@ const resolveListTarget = ({ numbering, $from, $to, requests }) => {
 		ilvl: 0,
 		numbering
 	};
-	const minted = mintListInstance(numbering?.definitions, first);
+	const minted = mintListInstance(numbering?.definitions, first, NO_NUMBERING_IDS_IN_USE);
 	return {
 		numId: minted.numId,
 		ilvl: 0,
@@ -289,7 +290,7 @@ const setNumberingValue = (value) => withCanonicalCommand((state, dispatch) => {
 		abstractNumId,
 		ilvl: selected.membership.ilvl,
 		start: value
-	});
+	}, NO_NUMBERING_IDS_IN_USE);
 	dispatch(moveItems({
 		state,
 		items: itemsFrom(state, selected.membership.numId, selected.pos),

package/dist/prosemirror/paragraphIndentation.js

@@ -1,3 +1,4 @@
+import { hangingFirstLineIndent } from "../utils/units.js";
 import { effectiveParagraphNumberingReference, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
 import { panic } from "better-result";
 // src/prosemirror/paragraphIndentation.ts
@@ -70,7 +71,7 @@ const directParagraphIndentation = (attrs) => {
 	if (indentation.indentFirstLine !== void 0) {
 		const hanging = attrs.hangingIndent === true;
 		indentation.hangingIndent = hanging;
-		if (hanging) indentation.indentFirstLine = -Math.abs(indentation.indentFirstLine);
+		if (hanging) indentation.indentFirstLine = hangingFirstLineIndent(indentation.indentFirstLine);
 	} else if (original?.hangingIndent !== void 0 && original.indentFirstLine === void 0 && typeof attrs.hangingIndent === "boolean") indentation.hangingIndent = attrs.hangingIndent;
 	return Object.keys(indentation).length > 0 ? indentation : void 0;
 };

package/dist/prosemirror/paragraphPropertyCarry.d.ts

@@ -3,7 +3,6 @@ import { NumberingMap } from "../docx/numberingParser.js";
 import { RunStyleResolver } from "./runStyleFormatting.js";
 import { Node } from "prosemirror-model";
 import { Transaction } from "prosemirror-state";
-type RecordedFormatting = NonNullable<ParagraphPropertyChangeAttrs["previousFormatting"]>;
 type CarryParagraphPropertiesOptions = {
   tr: Transaction;
   /** The paragraph that takes the properties. */
@@ -14,14 +13,7 @@ type CarryParagraphPropertiesOptions = {
   numbering: NumberingMap | null;
   /** Records the change as a tracked property change; applied directly when omitted. */
   revision?: ParagraphPropertyChangeAttrs["info"];
-  /** Properties the paragraph keeps its own values of: ones its own batch set. */
-  keep?: ReadonlySet<string>;
 };
-type CarriedParagraphPropertiesOptions = Pick<CarryParagraphPropertiesOptions, "source" | "keep"> & {
-  target: Node;
-};
-/** The exact formatting transfer, shared with pre-mutation capacity checks. */
-export declare const carriedParagraphProperties: ({ source, target, keep }: CarriedParagraphPropertiesOptions) => RecordedFormatting;
 /**
  * Give a paragraph another one's properties: the pPr a property change
  * covers. Its identity, mark, mark run properties and section stay its own,
@@ -29,7 +21,7 @@ export declare const carriedParagraphProperties: ({ source, target, keep }: Carr
  * change now records what it had: a paragraph holds one, and a pending one
  * already records it.
  */
-export declare const carryParagraphProperties: ({ tr, position, source, styleResolver, numbering, revision, keep }: CarryParagraphPropertiesOptions) => {
+export declare const carryParagraphProperties: ({ tr, position, source, styleResolver, numbering, revision }: CarryParagraphPropertiesOptions) => {
   tr: Transaction;
   changed: boolean;
   tracked: boolean;
@@ -60,9 +52,4 @@ export declare const recordReplacedParagraphProperties: ({ tr, position, replace
   replaced: Node;
   revision: ParagraphPropertyChangeAttrs["info"];
 }) => boolean;
-/**
- * The properties a batch's own property change set on a paragraph: the ones
- * whose value differs from what that change records as before.
- */
-export declare const propertiesSetInBatch: (node: Node, batchRevisionIds: ReadonlySet<number>) => ReadonlySet<string>;
 export {};

package/dist/prosemirror/paragraphPropertyCarry.js

@@ -18,8 +18,6 @@ import { panic } from "better-result";
 * revision, so accepting reads as the direct edit and rejecting restores the
 * second's own.
 */
-/** The exact formatting transfer, shared with pre-mutation capacity checks. */
-const carriedParagraphProperties = ({ source, target, keep }) => Object.fromEntries([...Object.entries(paragraphPropertiesSnapshot(source)).filter(([key]) => !keep?.has(key)), ...Object.entries(paragraphPropertiesSnapshot(target)).filter(([key]) => keep?.has(key))]);
 /**
 * Give a paragraph another one's properties: the pPr a property change
 * covers. Its identity, mark, mark run properties and section stay its own,
@@ -27,7 +25,7 @@ const carriedParagraphProperties = ({ source, target, keep }) => Object.fromEntr
 * change now records what it had: a paragraph holds one, and a pending one
 * already records it.
 */
-const carryParagraphProperties = ({ tr, position, source, styleResolver, numbering, revision, keep }) => {
+const carryParagraphProperties = ({ tr, position, source, styleResolver, numbering, revision }) => {
 	const target = tr.doc.nodeAt(position);
 	if (!target || target.type !== source.type) return {
 		tr,
@@ -35,11 +33,7 @@ const carryParagraphProperties = ({ tr, position, source, styleResolver, numberi
 		tracked: false
 	};
 	const previousFormatting = paragraphPropertiesSnapshot(target);
-	const formatting = carriedParagraphProperties({
-		source,
-		target,
-		...keep === void 0 ? {} : { keep }
-	});
+	const formatting = paragraphPropertiesSnapshot(source);
 	if (JSON.stringify(previousFormatting) === JSON.stringify(formatting)) return {
 		tr,
 		changed: false,
@@ -74,7 +68,7 @@ const carryParagraphProperties = ({ tr, position, source, styleResolver, numberi
 	}] : []];
 	tr.setNodeMarkup(position, void 0, {
 		...carried,
-		...carriedNumberingProvenance(source, target, keep),
+		numPrFromStyle: expectParagraphAttrs(source).numPrFromStyle,
 		_sectionProperties: target.attrs["_sectionProperties"],
 		_propertyChanges: changes.length > 0 ? changes : null
 	});
@@ -91,12 +85,6 @@ const carryParagraphProperties = ({ tr, position, source, styleResolver, numberi
 	};
 };
 /**
-* Whether the carried numbering is the paragraph's own or its style's: the
-* record holds only stated numbering, and a style's numbering
-* stays the style's rather than becoming the paragraph's own `w:numPr`.
-*/
-const carriedNumberingProvenance = (source, target, keep) => ({ numPrFromStyle: expectParagraphAttrs(keep?.has("numPr") ? target : source).numPrFromStyle });
-/**
 * The paragraph left once the break of the paragraph at `paragraphPos` goes:
 * the next one, or, when its own break is pending deletion too, the first
 * paragraph after it whose break stays. Null when no paragraph follows.
@@ -143,16 +131,4 @@ const recordReplacedParagraphProperties = ({ tr, position, replaced, revision })
 	}]);
 	return true;
 };
-/**
-* The properties a batch's own property change set on a paragraph: the ones
-* whose value differs from what that change records as before.
-*/
-const propertiesSetInBatch = (node, batchRevisionIds) => {
-	const changes = expectParagraphAttrs(node)._propertyChanges;
-	const change = Array.isArray(changes) ? changes.find(({ info }) => batchRevisionIds.has(info.id)) : void 0;
-	if (change === void 0) return /* @__PURE__ */ new Set();
-	const before = change.previousFormatting ?? {};
-	const now = paragraphPropertiesSnapshot(node);
-	return new Set([.../* @__PURE__ */ new Set([...Object.keys(before), ...Object.keys(now)])].filter((key) => JSON.stringify(before[key]) !== JSON.stringify(now[key])));
-};
-export { carriedParagraphProperties, carryParagraphProperties, paragraphLeftAfter, propertiesSetInBatch, recordReplacedParagraphProperties };
+export { carryParagraphProperties, paragraphLeftAfter, recordReplacedParagraphProperties };

package/dist/prosemirror/plugins/suggestionMode.js

@@ -531,6 +531,17 @@ function applySuggestionInsert(view, from, to, text, pluginState) {
 	if (selectsAll) {
 		from = Math.max(from, Selection.atStart(view.state.doc).from);
 		to = Math.min(to, Selection.atEnd(view.state.doc).to);
+	} else if (typesOverSelection && selection instanceof CellSelection) {
+		const cellDeletion = view.state.schema.marks["deletion"];
+		if (cellDeletion) {
+			const ranges = selection.ranges.toSorted((a, b) => b.$from.pos - a.$from.pos);
+			for (const range of ranges) markRangeAsDeleted(tr, view.state.doc, range.$from.pos, range.$to.pos, cellDeletion, pluginState, view.state);
+		}
+		const last = Selection.findFrom(view.state.doc.resolve(to), -1, true);
+		if (last && last.to >= from) {
+			from = last.to;
+			to = last.to;
+		}
 	}
 	const replacedFormatting = selectsAll ? (view.state.doc.resolve(from).nodeAfter?.marks ?? []).filter(({ type }) => RUN_FORMATTING_MARK_NAMES.has(type.name)) : null;
 	const insertAttrs = findAdjacentRevision(view.state.doc, from, "insertion", pluginState.author) || makeMarkAttrs(pluginState);
@@ -545,16 +556,18 @@ function applySuggestionInsert(view, from, to, text, pluginState) {
 		to
 	});
 	if (formattingMarks !== void 0) tr.setStoredMarks(formattingMarks);
+	const typedFrom = tr.doc.resolve(insertAt).parent.inlineContent ? insertAt : insertAt + 1;
+	const typedTo = typedFrom + text.length;
 	tr.insertText(text, insertAt, insertAt);
 	const deletionType = view.state.schema.marks["deletion"];
-	if (deletionType) tr.removeMark(insertAt, insertAt + text.length, deletionType);
-	tr.addMark(insertAt, insertAt + text.length, insertionType.create(insertAttrs));
+	if (deletionType) tr.removeMark(typedFrom, typedTo, deletionType);
+	tr.addMark(typedFrom, typedTo, insertionType.create(insertAttrs));
 	if (replacedFormatting) {
-		for (const mark of tr.doc.resolve(insertAt).nodeAfter?.marks ?? []) if (RUN_FORMATTING_MARK_NAMES.has(mark.type.name)) tr.removeMark(insertAt, insertAt + text.length, mark.type);
-		for (const mark of replacedFormatting) tr.addMark(insertAt, insertAt + text.length, mark);
+		for (const mark of tr.doc.resolve(typedFrom).nodeAfter?.marks ?? []) if (RUN_FORMATTING_MARK_NAMES.has(mark.type.name)) tr.removeMark(typedFrom, typedTo, mark.type);
+		for (const mark of replacedFormatting) tr.addMark(typedFrom, typedTo, mark);
 	}
-	separateSplitStretch(tr, insertAt, insertAt + text.length, insertAttrs.revisionId);
-	if (typesOverSelection) tr.setSelection(TextSelection.create(tr.doc, insertAt + text.length));
+	separateSplitStretch(tr, typedFrom, typedTo, insertAttrs.revisionId);
+	if (typesOverSelection) tr.setSelection(TextSelection.create(tr.doc, typedTo));
 	view.dispatch(tr.scrollIntoView());
 	return true;
 }

package/dist/prosemirror/replacedAnnotations.d.ts

@@ -12,6 +12,7 @@ export declare const NON_INCLUSIVE_MARK_DISPOSITION: {
   readonly hyperlink: "carry";
   readonly footnoteRef: "followsTheText";
   readonly runIdentity: "followsTheText";
+  readonly hyphenElement: "followsTheText";
   readonly insertion: "followsTheText";
   readonly deletion: "followsTheText";
   readonly runPropertyChange: "followsTheText";

package/dist/prosemirror/replacedAnnotations.js

@@ -84,6 +84,7 @@ const NON_INCLUSIVE_MARK_DISPOSITION = {
 	hyperlink: "carry",
 	footnoteRef: "followsTheText",
 	runIdentity: "followsTheText",
+	hyphenElement: "followsTheText",
 	insertion: "followsTheText",
 	deletion: "followsTheText",
 	runPropertyChange: "followsTheText",

package/dist/prosemirror/sectionCarrier.d.ts

@@ -14,6 +14,14 @@ export type SectionBreakType = (typeof SECTION_BREAK_TYPES)[number];
 export declare const parseSectionBreakType: (value: unknown) => SectionBreakType | null;
 /** The section record a paragraph holds, or `null` when it ends no section. */
 export declare const sectionPropertiesOf: (paragraph: Node) => document_d_exports.SectionProperties | null;
+/**
+ * The positions of paragraphs that hold only a copy of a section record: every
+ * carrier of a record but its last. The from-leg writes the record on the last
+ * carrier alone (`keepTheSectionBreakOnTheLastParagraphThatCarriesIt`), so a
+ * resolution that lets the last carrier's mark go must not leave a copy to
+ * inherit the section a saved package no longer has.
+ */
+export declare const sectionRecordCopyPositions: (doc: Node) => number[];
 /**
  * The break type a section record states, or `null` when it states none.
  *

package/dist/prosemirror/sectionCarrier.js

@@ -19,6 +19,34 @@ const parseSectionBreakType = (value) => isSectionBreakType(value) ? value : nul
 /** The section record a paragraph holds, or `null` when it ends no section. */
 const sectionPropertiesOf = (paragraph) => paragraph.attrs["_sectionProperties"] ?? null;
 /**
+* The positions of paragraphs that hold only a copy of a section record: every
+* carrier of a record but its last. The from-leg writes the record on the last
+* carrier alone (`keepTheSectionBreakOnTheLastParagraphThatCarriesIt`), so a
+* resolution that lets the last carrier's mark go must not leave a copy to
+* inherit the section a saved package no longer has.
+*/
+const sectionRecordCopyPositions = (doc) => {
+	const lastCarrier = /* @__PURE__ */ new Map();
+	const copies = [];
+	const visit = (parent, parentStart) => {
+		parent.forEach((node, offset) => {
+			const position = parentStart + offset;
+			if (!node.isTextblock) {
+				if (!node.isLeaf) visit(node, position + 1);
+				return;
+			}
+			if (node.type.name !== "paragraph") return;
+			const record = sectionPropertiesOf(node);
+			if (record === null) return;
+			const earlier = lastCarrier.get(record);
+			if (earlier !== void 0) copies.push(earlier);
+			lastCarrier.set(record, position);
+		});
+	};
+	visit(doc, 0);
+	return copies;
+};
+/**
 * The break type a section record states, or `null` when it states none.
 *
 * The single derivation every reader goes through. Every producer of a record
@@ -36,4 +64,4 @@ const sectionBreakTypeOf = (properties) => properties?.sectionStart ?? null;
 * package does with a `w:sectPr` that omits them.
 */
 const mintSectionProperties = (breakType) => ({ sectionStart: breakType });
-export { SECTION_BREAK_TYPES, mintSectionProperties, parseSectionBreakType, sectionBreakTypeOf, sectionPropertiesOf };
+export { SECTION_BREAK_TYPES, mintSectionProperties, parseSectionBreakType, sectionBreakTypeOf, sectionPropertiesOf, sectionRecordCopyPositions };

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

@@ -13,6 +13,16 @@ export type ParagraphCascadeResolver = Pick<StyleEngine, "getStyle" | "getDocDef
  */
 type ParagraphDefaultFormattingResolver = Pick<StyleEngine, "getStyle" | "getDocDefaults" | "getDefaultParagraphStyle" | "getDefaultCharacterStyle" | "getRunStyleOwnProperties">;
 export declare function resolveRunFormattingWithoutDefaults(formatting: document_d_exports.TextFormatting | undefined, styleResolver: ParagraphDefaultFormattingResolver | null): document_d_exports.TextFormatting | undefined;
+/**
+ * What a paragraph's mark lends its body runs: nothing when the paragraph has a
+ * style, and never the font or the mark-only decorations. One rule for a
+ * document read and for a paragraph whose properties a review restores.
+ */
+export declare const inheritableParagraphMarkFormatting: ({ runProperties, styleId, styleResolver }: {
+  runProperties: document_d_exports.TextFormatting | undefined;
+  styleId: string | undefined;
+  styleResolver: Parameters<typeof resolveRunFormattingWithoutDefaults>[1];
+}) => document_d_exports.TextFormatting | undefined;
 /** @internal Recompute a paragraph's inherited run defaults from authored package state. */
 export declare function resolveParagraphDefaultTextFormatting(styleId: string | undefined, formatting: document_d_exports.Paragraph["formatting"] | undefined, styleResolver: ParagraphDefaultFormattingResolver, options?: {
   includeParagraphMarkRunProperties?: boolean;

package/dist/prosemirror/styles/paragraphStyleCascade.js

@@ -5,7 +5,7 @@ import { paragraphNumberingAttr } from "../numberingAttr.js";
 import { directionFromBidi } from "../paragraphDirection.js";
 import { styleResolvedParagraphFormatting } from "../paragraphFormattingProvenance.js";
 import { lineSpacingProvenanceFromSpacing } from "../paragraphSpacing.js";
-import { stripParagraphMarkOnlyFormatting } from "../runStyleFormatting.js";
+import { stripParagraphMarkFormattingForBodyRuns, stripParagraphMarkOnlyFormatting } from "../runStyleFormatting.js";
 import { cascadeStyleTextFormatting } from "./styleToggleCascade.js";
 // src/prosemirror/styles/paragraphStyleCascade.ts
 /**
@@ -30,6 +30,16 @@ function resolveRunFormattingWithoutDefaults(formatting, styleResolver) {
 		type: "direct"
 	}]).formatting;
 }
+/**
+* What a paragraph's mark lends its body runs: nothing when the paragraph has a
+* style, and never the font or the mark-only decorations. One rule for a
+* document read and for a paragraph whose properties a review restores.
+*/
+const inheritableParagraphMarkFormatting = ({ runProperties, styleId, styleResolver }) => {
+	if (styleId !== void 0) return void 0;
+	const formatting = resolveRunFormattingWithoutDefaults(runProperties, styleResolver);
+	return formatting ? stripParagraphMarkFormattingForBodyRuns(formatting) : void 0;
+};
 /** @internal Recompute a paragraph's inherited run defaults from authored package state. */
 function resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, options = {}) {
 	const style = styleId ? styleResolver.getStyle(styleId) ?? styleResolver.getDefaultParagraphStyle() : styleResolver.getDefaultParagraphStyle();
@@ -155,4 +165,4 @@ function tableCellParagraphOverlay(styleResolver, tableStyleId, regions) {
 	}
 	return overlay;
 }
-export { extractTableParagraphOverlay, paragraphStyleCascadeAttrs, resolveParagraphDefaultTextFormatting, resolveRunFormattingWithoutDefaults, tableCellParagraphOverlay };
+export { extractTableParagraphOverlay, inheritableParagraphMarkFormatting, paragraphStyleCascadeAttrs, resolveParagraphDefaultTextFormatting, resolveRunFormattingWithoutDefaults, tableCellParagraphOverlay };

package/dist/prosemirror/tableRunIn.d.ts

@@ -1,20 +1,26 @@
 import { RunStyleResolver } from "./runStyleFormatting.js";
 import { ParagraphPropertySourceTransfer } from "../docx/paragraphPropertySource.js";
-import { MarkType, Node } from "prosemirror-model";
+import { Node } from "prosemirror-model";
 import { StepMap, Transform } from "prosemirror-transform";
+type ResolutionMode = "accept" | "reject";
 /**
  * Whether the cell a paragraph's words would run into is itself pending: its
  * row or the cell (through nested tables' first cells) is inserted, deleted
- * or merged, so resolving may not keep it. Pending rows or cells elsewhere in
- * the table leave that cell where it is.
+ * or merged, so resolving may not keep it. A deletion is not pending for a
+ * rejection of every change. Pending rows or cells elsewhere in the table leave
+ * that cell where it is.
  */
-export declare const runInCellPending: (table: Node) => boolean;
+export declare const runInCellPending: (table: Node, everyChange?: ResolutionMode) => boolean;
 type RunParagraphIntoTableOptions = {
   tr: Transform;
   paragraphPos: number;
   styleResolver: RunStyleResolver | null;
-  /** Content a resolution in progress removes: it does not count as words left. */
-  removedMark?: MarkType | undefined;
+  /**
+   * Set when every change of the story resolves this way, not only some: what
+   * it removes does not count as words left, and a rejection takes a deleted
+   * row as staying.
+   */
+  everyChange?: ResolutionMode | undefined;
 };
 /**
  * Run the paragraph at `paragraphPos` on into the table right after it.
@@ -22,7 +28,7 @@ type RunParagraphIntoTableOptions = {
  * paragraph-property source it hands over, or null when it did not run in and
  * the caller keeps its own handling.
  */
-export declare const runParagraphIntoTable: ({ tr, paragraphPos, styleResolver, removedMark }: RunParagraphIntoTableOptions) => {
+export declare const runParagraphIntoTable: ({ tr, paragraphPos, styleResolver, everyChange }: RunParagraphIntoTableOptions) => {
   position: number;
   map: StepMap;
   transfer: ParagraphPropertySourceTransfer;
@@ -34,8 +40,17 @@ export declare const runParagraphIntoTable: ({ tr, paragraphPos, styleResolver,
 type RunsIntoFollowingTableOptions = {
   parent: Node;
   index: number;
-  mode: "accept" | "reject";
+  mode: ResolutionMode;
 };
+/**
+ * Whether what stands right after a paragraph whose mark goes is itself removed
+ * by this resolution, so the paragraph runs on into what stands after that, as
+ * it would had the removed block never been there: a table it removes, or, when
+ * rejecting, an inserted paragraph it empties with a table after it. (Accepted,
+ * a deleted paragraph did stand there, and the join ended at it. Paragraphs join
+ * among themselves without help.)
+ */
+export declare const paragraphBeforeRemovedBlock: ({ parent, index, mode }: RunsIntoFollowingTableOptions) => boolean;
 export declare const runsIntoFollowingTable: ({ parent, index, mode }: RunsIntoFollowingTableOptions) => boolean;
 /**
  * Before every change in a story is resolved: run each paragraph whose mark
@@ -43,7 +58,7 @@ export declare const runsIntoFollowingTable: ({ parent, index, mode }: RunsIntoF
  * paragraph that took words (its position after the step count given) and
  * the paragraph-property sources handed over.
  */
-export declare const runParagraphsIntoTables: (tr: Transform, mode: "accept" | "reject", styleResolver: RunStyleResolver | null) => {
+export declare const runParagraphsIntoTables: (tr: Transform, mode: ResolutionMode, styleResolver: RunStyleResolver | null) => {
   targets: {
     position: number;
     step: number;