@stll/folio-core 0.57.0 → 0.58.0

package/dist/ai-edits/apply.js

@@ -3,7 +3,7 @@ import { formattingEquals } from "../docx/runConsolidator.js";
 import { isStyleSourcedParagraphNumbering } from "../internal/paragraphFormattingSerialization.js";
 import { addTrackedDeletionMark } from "../prosemirror/addTrackedDeletionMark.js";
 import { deleteTextBoxesAnchoredAt, droppedTextBoxAnchorIds, endOfParagraphWithItsTextBoxes, gatherTextBoxesAfterParagraph, textBoxAnchorIdOf, textBoxAnchorIdsBetween } from "../prosemirror/anchoredTextBoxes.js";
-import { expectParagraphAttrs, expectRunPropertyChangeMarkAttrs, expectTableRowAttrs } from "../prosemirror/attrs/index.js";
+import { expectParagraphAttrs, expectRunPropertyChangeMarkAttrs, expectTableRowAttrs, mergeParagraphAttrs } from "../prosemirror/attrs/index.js";
 import { hasSerializableParagraphPropertyChange, paragraphPropertiesSnapshot } from "../prosemirror/commands/propertyChangeScope.js";
 import { resolveParagraphChangeAttrs } from "../prosemirror/commands/resolveParagraphProperties.js";
 import { addedBreakCarrierBefore, finalParagraphsOf, paragraphEndsItsContainer } from "../prosemirror/containerFinalParagraph.js";
@@ -30,7 +30,7 @@ import { RUN_FORMATTING_MARK_NAMES } from "../prosemirror/runFormattingMarkNames
 import { readAuthoredRunFormatting, reconcileRunFormattingMarks } from "../prosemirror/runFormattingReconciliation.js";
 import { paragraphRunStyleContext, paragraphRunStyleContextAt, resolveParagraphBodyRunFormatting } from "../prosemirror/runStyleFormatting.js";
 import { sectionPropertiesOf } from "../prosemirror/sectionCarrier.js";
-import { listAttrsFromNumbering, listLevelAttrPatch } from "../prosemirror/styles/resolvedStyleAttrs.js";
+import { listAttrsFromNumbering, listLevelAttrPatch, listLevelIndentRemovalPatch } from "../prosemirror/styles/resolvedStyleAttrs.js";
 import { removeRowsWithoutCellsAfterBatch } from "../prosemirror/tableGridMutation.js";
 import { isZeroWidthAnchor } from "../prosemirror/zeroWidthAnchors.js";
 import { getFolioParaIdFromBlockId } from "../types/block-id.js";
@@ -187,7 +187,7 @@ const paragraphPropertiesPatch = ({ node, properties, resolvedFormattingFromStyl
 	const resolvedIndentationFromStyle = paragraphIndentationFromFormatting(resolvedFormattingFromStyle);
 	const resolvedSpacingFromStyle = paragraphSpacingFromFormatting(resolvedFormattingFromStyle);
 	const patch = {};
-	let originalFormatting = attrs._originalFormatting === void 0 || attrs._originalFormatting === null ? void 0 : { ...attrs._originalFormatting };
+	let originalFormatting = withDirectParagraphIndentation(attrs._originalFormatting, currentDirectIndentation);
 	let originalFormattingChanged = false;
 	const nextStyleId = properties.styleId;
 	const styleChanged = nextStyleId !== void 0 && (attrs.styleId ?? null) !== nextStyleId;
@@ -227,11 +227,18 @@ const paragraphPropertiesPatch = ({ node, properties, resolvedFormattingFromStyl
 	}
 	const numPrFromStyle = styleChanged ? readParagraphNumberingAttr(patch["numPrFromStyle"]) : attrs.numPrFromStyle;
 	if (properties.numbering !== void 0) if (properties.numbering === null) {
+		Object.assign(patch, listLevelIndentRemovalPatch(mergeParagraphAttrs(node, {
+			...attrs,
+			_styleResolvedFormatting: styleResolvedParagraphFormatting(resolvedFormattingFromStyle)
+		}), numbering));
 		patch["numPr"] = removedNumberingAttr(numPrFromStyle);
 		Object.assign(patch, CLEARED_LIST_RENDERING_ATTRS);
 	} else {
 		const listReference = concreteListReference(properties.numbering);
-		Object.assign(patch, listLevelAttrPatch(attrs, {
+		Object.assign(patch, listLevelAttrPatch(mergeParagraphAttrs(node, {
+			...attrs,
+			_styleResolvedFormatting: styleResolvedParagraphFormatting(resolvedFormattingFromStyle)
+		}), {
 			numId: listReference.numId,
 			ilvl: listReference.level
 		}, numbering));
@@ -241,6 +248,10 @@ const paragraphPropertiesPatch = ({ node, properties, resolvedFormattingFromStyl
 		}
 	}
 	else if (properties.listLevel !== void 0) if (properties.listLevel === null) {
+		Object.assign(patch, listLevelIndentRemovalPatch(mergeParagraphAttrs(node, {
+			...attrs,
+			_styleResolvedFormatting: styleResolvedParagraphFormatting(resolvedFormattingFromStyle)
+		}), numbering));
 		patch["numPr"] = removedNumberingAttr(numPrFromStyle);
 		Object.assign(patch, CLEARED_LIST_RENDERING_ATTRS);
 	} else {
@@ -251,7 +262,10 @@ const paragraphPropertiesPatch = ({ node, properties, resolvedFormattingFromStyl
 				ilvl: properties.listLevel
 			});
 			Object.assign(patch, CLEARED_LIST_RENDERING_ATTRS);
-		} else Object.assign(patch, listLevelAttrPatch(attrs, {
+		} else Object.assign(patch, listLevelAttrPatch(mergeParagraphAttrs(node, {
+			...attrs,
+			_styleResolvedFormatting: styleResolvedParagraphFormatting(resolvedFormattingFromStyle)
+		}), {
 			numId,
 			ilvl: properties.listLevel
 		}, numbering));
@@ -283,6 +297,28 @@ const paragraphPropertiesPatch = ({ node, properties, resolvedFormattingFromStyl
 		originalFormattingChanged = true;
 	}
 	if (originalFormattingChanged) patch["_originalFormatting"] = originalFormatting && Object.keys(originalFormatting).length > 0 ? originalFormatting : null;
+	if (styleChanged || properties.numbering !== void 0 || properties.listLevel !== void 0 || properties.indentation !== void 0) {
+		const nextNumbering = patch["numPr"] === void 0 ? attrs.numPr : readParagraphNumberingAttr(patch["numPr"]);
+		if (nextNumbering?.kind === "reference") {
+			const direct = properties.indentation === void 0 ? currentDirectIndentation : properties.indentation ?? void 0;
+			Object.assign(patch, listLevelAttrPatch(mergeParagraphAttrs(node, {
+				numPr: nextNumbering,
+				_styleResolvedFormatting: styleResolvedParagraphFormatting(resolvedFormattingFromStyle),
+				numPrFromStyle: numPrFromStyle ?? void 0,
+				listImplicitChildLevelAdvances: attrs.listImplicitChildLevelAdvances,
+				_originalFormatting: withDirectParagraphIndentation(originalFormatting, direct),
+				_resolvedFormatting: withDirectParagraphIndentation(styleChanged ? styleResolvedParagraphFormatting(resolvedFormattingFromStyle) : attrs._resolvedFormatting, resolvedIndentationFromStyle),
+				indentLeft: direct?.indentLeft ?? resolvedFormattingFromStyle?.indentLeft ?? void 0,
+				indentRight: direct?.indentRight ?? resolvedFormattingFromStyle?.indentRight ?? void 0,
+				indentFirstLine: direct?.indentFirstLine ?? resolvedFormattingFromStyle?.indentFirstLine ?? void 0,
+				hangingIndent: direct?.hangingIndent ?? resolvedFormattingFromStyle?.hangingIndent ?? false
+			}), {
+				numId: nextNumbering.numId,
+				ilvl: nextNumbering.ilvl ?? 0
+			}, numbering));
+			patch["numPr"] = nextNumbering;
+		}
+	}
 	return Object.keys(patch).length > 0 ? patch : null;
 };
 const REVISION_MARK_NAMES = /* @__PURE__ */ new Set(["insertion", "deletion"]);
@@ -2009,10 +2045,17 @@ const buildInsertedParagraphs = ({ item, schema, formattingFromStyle, mode, auth
 		const listLevel = operation.listLevel;
 		if (formatsParagraph) {
 			if (explicitNumbering === null) {
+				Object.assign(attrs, listLevelIndentRemovalPatch(mergeParagraphAttrs(schema.node("paragraph"), {
+					...operation.inheritFormatting === false ? {} : expectParagraphAttrs(item.blockNode),
+					_styleResolvedFormatting: styleResolvedParagraphFormatting(formattingFromStyle)
+				}), numbering));
 				attrs["numPr"] = removedNumberingAttr(readParagraphNumberingAttr(attrs["numPrFromStyle"]));
 				Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
 			} else if (explicitNumbering !== void 0) {
-				Object.assign(attrs, listLevelAttrPatch(operation.inheritFormatting === false ? {} : expectParagraphAttrs(item.blockNode), {
+				Object.assign(attrs, listLevelAttrPatch(mergeParagraphAttrs(schema.node("paragraph"), {
+					...operation.inheritFormatting === false ? {} : expectParagraphAttrs(item.blockNode),
+					_styleResolvedFormatting: styleResolvedParagraphFormatting(formattingFromStyle)
+				}), {
 					numId: explicitNumbering.numId,
 					ilvl: explicitNumbering.level
 				}, numbering));
@@ -2021,6 +2064,10 @@ const buildInsertedParagraphs = ({ item, schema, formattingFromStyle, mode, auth
 					attrs["numPrFromStyle"] = null;
 				}
 			} else if (listLevel === null) {
+				Object.assign(attrs, listLevelIndentRemovalPatch(mergeParagraphAttrs(schema.node("paragraph"), {
+					...operation.inheritFormatting === false ? {} : expectParagraphAttrs(item.blockNode),
+					_styleResolvedFormatting: styleResolvedParagraphFormatting(formattingFromStyle)
+				}), numbering));
 				attrs["numPr"] = removedNumberingAttr(readParagraphNumberingAttr(attrs["numPrFromStyle"]));
 				Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
 			} else if (typeof listLevel === "number") {
@@ -2031,7 +2078,10 @@ const buildInsertedParagraphs = ({ item, schema, formattingFromStyle, mode, auth
 						ilvl: listLevel
 					});
 					Object.assign(attrs, CLEARED_LIST_RENDERING_ATTRS);
-				} else Object.assign(attrs, listLevelAttrPatch(operation.inheritFormatting === false ? {} : expectParagraphAttrs(item.blockNode), {
+				} else Object.assign(attrs, listLevelAttrPatch(mergeParagraphAttrs(schema.node("paragraph"), {
+					...operation.inheritFormatting === false ? {} : expectParagraphAttrs(item.blockNode),
+					_styleResolvedFormatting: styleResolvedParagraphFormatting(formattingFromStyle)
+				}), {
 					numId,
 					ilvl: listLevel
 				}, numbering));
@@ -2083,7 +2133,7 @@ const buildInsertedParagraphs = ({ item, schema, formattingFromStyle, mode, auth
 				else originalFormatting.alignment = directAlignment;
 			}
 			if (operation.spacing !== void 0) originalFormatting = withDirectParagraphSpacing(originalFormatting, directSpacing);
-			if (operation.indentation !== void 0) originalFormatting = withDirectParagraphIndentation(originalFormatting, directIndentation);
+			originalFormatting = withDirectParagraphIndentation(originalFormatting, directIndentation);
 			if (operation.styleId !== void 0 || operation.spacing !== void 0) Object.assign(attrs, paragraphSpacingAttrPatch({
 				direct: directSpacing,
 				inherited: paragraphSpacingFromFormatting(formattingFromStyle)
@@ -2093,6 +2143,25 @@ const buildInsertedParagraphs = ({ item, schema, formattingFromStyle, mode, auth
 				inherited: paragraphIndentationFromFormatting(formattingFromStyle)
 			}));
 			attrs["_originalFormatting"] = originalFormatting && Object.keys(originalFormatting).length > 0 ? originalFormatting : null;
+			const finalNumbering = readParagraphNumberingAttr(attrs["numPr"]);
+			if (finalNumbering?.kind === "reference") {
+				Object.assign(attrs, listLevelAttrPatch(mergeParagraphAttrs(schema.node("paragraph"), {
+					numPr: finalNumbering,
+					_styleResolvedFormatting: styleResolvedParagraphFormatting(formattingFromStyle),
+					numPrFromStyle: readParagraphNumberingAttr(attrs["numPrFromStyle"]) ?? void 0,
+					listImplicitChildLevelAdvances: operation.inheritFormatting === false ? void 0 : expectParagraphAttrs(item.blockNode).listImplicitChildLevelAdvances,
+					_originalFormatting: originalFormatting,
+					_resolvedFormatting: styleResolvedParagraphFormatting(formattingFromStyle),
+					indentLeft: directIndentation?.indentLeft ?? formattingFromStyle?.indentLeft ?? void 0,
+					indentRight: directIndentation?.indentRight ?? formattingFromStyle?.indentRight ?? void 0,
+					indentFirstLine: directIndentation?.indentFirstLine ?? formattingFromStyle?.indentFirstLine ?? void 0,
+					hangingIndent: directIndentation?.hangingIndent ?? formattingFromStyle?.hangingIndent ?? false
+				}), {
+					numId: finalNumbering.numId,
+					ilvl: finalNumbering.ilvl ?? 0
+				}, numbering));
+				attrs["numPr"] = finalNumbering;
+			}
 		}
 		if (formatsParagraph && operation.styleId !== void 0 && formattingFromStyle?.numPr?.kind === "reference" && operation.numbering === void 0 && operation.listLevel === void 0) {
 			const { numId, ilvl = 0 } = formattingFromStyle.numPr;

package/dist/controller/canonicalClipboard.d.ts

@@ -4,6 +4,8 @@ import { Slice } from "prosemirror-model";
 import { EditorState } from "prosemirror-state";
 import { Result } from "better-result";
 //#region src/controller/canonicalClipboard.d.ts
+/** Imported comments and notes require copying their source story parts. */
+declare const canonicalClipboardStoryPartRefusal: (paragraph: document_d_exports.Paragraph) => CanonicalSessionError | undefined;
 /** Clipboard slices are input payloads; their paragraph identities and private captures are not owners. */
 type PrepareCanonicalPasteOptions = {
   session: CanonicalSession;
@@ -20,4 +22,4 @@ type PrepareCanonicalPasteOptions = {
 };
 declare const prepareCanonicalPaste: ({ session, state, slice, plain, moveTarget, pasteTarget, sourceDocument, moveSource }: PrepareCanonicalPasteOptions) => Result<CanonicalCommit, CanonicalSessionError>;
 //#endregion
-export { prepareCanonicalPaste };
+export { canonicalClipboardStoryPartRefusal, prepareCanonicalPaste };

package/dist/controller/canonicalClipboard.js

@@ -3,6 +3,7 @@ import { copyParagraphIndentationProjection } from "../docx/paragraphPropertySou
 import { visitInlineContentSlots, visitParagraphRuns } from "../docx/paragraphTraversal.js";
 import { captureVerbatimXml } from "../docx/verbatimCapture.js";
 import { OFFICE_RELATIONSHIP_NAMESPACE_URIS, OOXML_NAMESPACE_SCOPE, findAttributeByNamespaceUri, getLocalName, parseXml } from "../docx/xmlParser.js";
+import { canonicalSelectionRange } from "../prosemirror/canonicalSelectionRange.js";
 import { proseDocToBlocks } from "../prosemirror/conversion/fromProseDoc.js";
 import { completeNumberingForDoc } from "../prosemirror/listInstanceReferences.js";
 import { marksToTextFormatting } from "../prosemirror/runFormattingFromMarks.js";
@@ -174,6 +175,22 @@ const importNumbering = ({ destination, source, paragraphs, mode, sourceKind, ex
 		numIds: nums
 	});
 };
+/** Imported comments and notes require copying their source story parts. */
+const canonicalClipboardStoryPartRefusal = (paragraph) => {
+	let requiresStory = false;
+	visitInlineContentSlots(paragraph, ({ item }) => {
+		if (item.type === "commentRangeStart" || item.type === "commentRangeEnd" || item.type === "commentReference") requiresStory = true;
+	});
+	visitParagraphRuns(paragraph, (run) => {
+		if (run.content.some((item) => item.type === "footnoteRef" || item.type === "endnoteRef")) requiresStory = true;
+	});
+	if (!requiresStory) return void 0;
+	return new CanonicalSessionError({
+		gap: CANONICAL_GAP.dispatch,
+		reason: "refused",
+		message: "Clipboard comments and note references require importing their source story parts."
+	});
+};
 const prepareCanonicalPaste = ({ session, state, slice, plain = false, moveTarget, pasteTarget, sourceDocument, moveSource }) => {
 	if (session.isComposing) return refuse("Composition must finish before using the clipboard.");
 	if (slice.content.size === 0) return Result.err(new CanonicalSessionError({
@@ -212,9 +229,10 @@ const prepareCanonicalPaste = ({ session, state, slice, plain = false, moveTarge
 		paragraphs.push(paragraph);
 	}
 	if (moveTarget === void 0 && (plain || sourceDocument === void 0)) flattenClipboardStyleReferences(paragraphs);
-	const from = session.projection.addressAt(pasteTarget ?? moveSource?.from ?? state.selection.from);
+	const selectionRange = canonicalSelectionRange(state);
+	const from = session.projection.addressAt(pasteTarget ?? moveSource?.from ?? selectionRange.from);
 	if (from.isErr()) return from;
-	const to = session.projection.addressAt(pasteTarget ?? moveSource?.to ?? state.selection.to);
+	const to = session.projection.addressAt(pasteTarget ?? moveSource?.to ?? selectionRange.to);
 	if (to.isErr()) return to;
 	let styles = session.document.package.styles;
 	let styleIds;
@@ -315,14 +333,8 @@ const prepareCanonicalPaste = ({ session, state, slice, plain = false, moveTarge
 	};
 	for (const paragraph of paragraphs) {
 		if (moveTarget === void 0) {
-			let requiresStory = false;
-			visitInlineContentSlots(paragraph, ({ item }) => {
-				if (item.type === "commentRangeStart" || item.type === "commentRangeEnd" || item.type === "commentReference") requiresStory = true;
-			});
-			visitParagraphRuns(paragraph, (run) => {
-				if (run.content.some((item) => item.type === "footnoteRef" || item.type === "endnoteRef")) requiresStory = true;
-			});
-			if (requiresStory) return refuse("Clipboard comments and note references require importing their source story parts.");
+			const storyPartRefusal = canonicalClipboardStoryPartRefusal(paragraph);
+			if (storyPartRefusal !== void 0) return Result.err(storyPartRefusal);
 			const links = [];
 			visitInlineContentSlots(paragraph, ({ item }) => {
 				if (item.type === "hyperlink") links.push(item);
@@ -341,7 +353,7 @@ const prepareCanonicalPaste = ({ session, state, slice, plain = false, moveTarge
 		const runs = [];
 		visitParagraphRuns(paragraph, (run) => runs.push(run));
 		for (const item of runs) {
-			if (plain) item.formatting = marksToTextFormatting(state.storedMarks ?? state.doc.resolve(pasteTarget ?? moveSource?.from ?? state.selection.from).marks());
+			if (plain) item.formatting = marksToTextFormatting(state.storedMarks ?? state.doc.resolve(pasteTarget ?? moveSource?.from ?? selectionRange.from).marks());
 			for (const child of item.content) {
 				if (child.type !== "drawing") continue;
 				if (child.rawXmlMode !== void 0) return refuse("Opaque drawings and embedded objects require their source package parts.");
@@ -479,4 +491,4 @@ const prepareCanonicalPaste = ({ session, state, slice, plain = false, moveTarge
 	});
 };
 //#endregion
-export { prepareCanonicalPaste };
+export { canonicalClipboardStoryPartRefusal, prepareCanonicalPaste };

package/dist/controller/canonicalComposition.d.ts

@@ -13,18 +13,27 @@ type CompositionOptions = {
   }) => void;
   refuse: (reason: string) => void;
 };
+type CompositionCompletionEvidence = "provisional" | "explicitFinal";
+type CompositionPhase = {
+  type: "active";
+  completion: CompositionCompletionEvidence;
+} | {
+  type: "ended";
+  data: string | null;
+  completion: CompositionCompletionEvidence;
+};
 type CompositionState = {
   type: "committed";
 } | {
   type: "provisional";
   baseline: EditorState;
   view: EditorView;
-  phase: "active" | "ended";
+  phase: CompositionPhase;
 } | {
   type: "refused";
   baseline: EditorState;
   view: EditorView;
-  phase: "active" | "ended";
+  phase: CompositionPhase;
   text: string | null;
 };
 type CompositionFinish = {
@@ -42,11 +51,11 @@ declare const createCanonicalComposition: (options: CompositionOptions) => {
     to: number;
   }) => boolean;
   start: (view: EditorView) => void;
-  ended: (view: EditorView) => void;
+  ended: (view: EditorView, data: string | null) => void;
   forgetCompleted: () => void;
   readonly pendingFinal: boolean;
   authorizeLateFinal: (view: EditorView, text: string | null) => boolean;
-  authorizeNative: (view: EditorView) => void;
+  authorizeNative: (view: EditorView, completion: CompositionCompletionEvidence) => void;
   flushed: (view: EditorView) => void;
   recover: (view: EditorView) => CompositionFinish;
   cancel: (view: EditorView) => CompositionFinish;

package/dist/controller/canonicalComposition.js

@@ -1,10 +1,52 @@
 import { splitsSurrogatePair } from "../ai-edits/character-boundaries.js";
+import { RUN_IDENTITY_MARK_NAME } from "../prosemirror/runIdentity.js";
 import { CANONICAL_GAP } from "../types/canonicalCapabilities.js";
 import { setCanonicalInputTimer } from "./canonicalInputTimer.js";
 import { CanonicalSessionError } from "./canonicalSession.js";
 import { Result } from "better-result";
 import { EditorState, TextSelection } from "prosemirror-state";
 //#region src/controller/canonicalComposition.ts
+const matchesNativeReplacement = ({ baseline, proposed, from, to, text }) => {
+	const expected = baseline.tr.insertText(text, from, to);
+	if (expected.doc.eq(proposed.doc)) return true;
+	if (!baseline.doc.resolve(from).sameParent(baseline.doc.resolve(to))) return false;
+	if (expected.doc.content.size !== proposed.doc.content.size) return false;
+	const markType = baseline.schema.marks[RUN_IDENTITY_MARK_NAME];
+	if (markType === void 0) return false;
+	const position = expected.doc.resolve(from);
+	const paragraph = position.parent;
+	const start = position.start();
+	const native = proposed.doc.nodeAt(start - 1);
+	if (native === null || native.type !== paragraph.type) return false;
+	let index = 0;
+	let offset = 0;
+	const missing = [];
+	native.forEach((node, nodeOffset) => {
+		const end = nodeOffset + node.nodeSize;
+		let cursor = nodeOffset;
+		while (cursor < end && index < paragraph.childCount) {
+			const authored = paragraph.child(index);
+			const authoredEnd = offset + authored.nodeSize;
+			const overlapEnd = Math.min(end, authoredEnd);
+			if (node.isText && authored.isText && markType.isInSet(authored.marks) !== void 0 && markType.isInSet(node.marks) === void 0) {
+				const previous = missing.at(-1);
+				if (previous?.to === start + cursor) previous.to = start + overlapEnd;
+				else missing.push({
+					type: "omittedRunIdentity",
+					from: start + cursor,
+					to: start + overlapEnd
+				});
+			}
+			cursor = overlapEnd;
+			if (cursor === authoredEnd) {
+				offset = authoredEnd;
+				index += 1;
+			}
+		}
+	});
+	for (const range of missing) expected.removeMark(range.from, range.to, markType);
+	return expected.doc.eq(proposed.doc);
+};
 /** Native IME owns the provisional view; the captured canonical projection stays unchanged. */
 const createCanonicalComposition = (options) => {
 	let state = { type: "committed" };
@@ -25,7 +67,13 @@ const createCanonicalComposition = (options) => {
 	const selectedReplacement = (baseline, proposed) => {
 		const { from, to } = baseline.selection;
 		const text = selectedText(baseline, proposed);
-		if (text === null || !baseline.tr.insertText(text, from, to).doc.eq(proposed.doc)) return null;
+		if (text === null || !matchesNativeReplacement({
+			baseline,
+			proposed,
+			from,
+			to,
+			text
+		})) return null;
 		return {
 			from,
 			to,
@@ -87,7 +135,13 @@ const createCanonicalComposition = (options) => {
 		const inserted = next.content.cut(from, newEnd);
 		const text = inserted.textBetween(0, inserted.size, "", "");
 		if (removed.textBetween(0, removed.size, "", "").length !== removed.size || text.length !== inserted.size) return null;
-		if (!baseline.tr.insertText(text, start + from, start + oldEnd).doc.eq(proposed.doc)) return null;
+		if (!matchesNativeReplacement({
+			baseline,
+			proposed,
+			from: start + from,
+			to: start + oldEnd,
+			text
+		})) return null;
 		return {
 			from: start + from,
 			to: start + oldEnd,
@@ -119,7 +173,7 @@ const createCanonicalComposition = (options) => {
 			view.updateState(pending.baseline);
 		}
 		options.end();
-		if (!commit || view.isDestroyed) return { type: "cancelled" };
+		if (!commit || view.isDestroyed || pending.phase.type === "ended" && pending.phase.data === "" && pending.phase.completion === "provisional" && committedText === "") return { type: "cancelled" };
 		if (pending.type === "refused") return {
 			type: "refused",
 			text: pending.text
@@ -178,10 +232,13 @@ const createCanonicalComposition = (options) => {
 				type: "provisional",
 				baseline: view.state,
 				view,
-				phase: "active"
+				phase: {
+					type: "active",
+					completion: "provisional"
+				}
 			};
 		},
-		ended: (view) => {
+		ended: (view, data) => {
 			if (state.type === "committed") return;
 			switch (state.type) {
 				case "provisional":
@@ -189,7 +246,11 @@ const createCanonicalComposition = (options) => {
 						type: "provisional",
 						baseline: state.baseline,
 						view: state.view,
-						phase: "ended"
+						phase: {
+							type: "ended",
+							data,
+							completion: state.phase.completion
+						}
 					};
 					break;
 				case "refused":
@@ -197,7 +258,11 @@ const createCanonicalComposition = (options) => {
 						type: "refused",
 						baseline: state.baseline,
 						view: state.view,
-						phase: "ended",
+						phase: {
+							type: "ended",
+							data,
+							completion: state.phase.completion
+						},
 						text: state.text
 					};
 					break;
@@ -225,15 +290,23 @@ const createCanonicalComposition = (options) => {
 			};
 			return true;
 		},
-		authorizeNative: (view) => {
+		authorizeNative: (view, completion) => {
 			authorizedNativeState = view.state;
+			if (state.type !== "committed" && completion === "explicitFinal") state.phase = state.phase.type === "active" ? {
+				type: "active",
+				completion
+			} : {
+				type: "ended",
+				data: state.phase.data,
+				completion
+			};
 		},
 		flushed: (view) => {
 			const authorized = authorizedNativeState;
 			queueMicrotask(() => {
 				if (authorizedNativeState === authorized) authorizedNativeState = null;
 			});
-			if (state.type !== "committed" && state.phase === "ended") schedule(view);
+			if (state.type !== "committed" && state.phase.type === "ended") schedule(view);
 		},
 		recover: (view) => finish(view, true),
 		cancel: (view) => finish(view, false),

package/dist/controller/canonicalInput.d.ts

@@ -36,7 +36,7 @@ declare const createCanonicalInputBoundary: (options: CanonicalInputOptions) =>
   handleDOMEvents: {
     keydown: (view: EditorView, event: KeyboardEvent) => boolean;
     compositionstart: (view: EditorView) => boolean;
-    compositionend: (view: EditorView) => boolean;
+    compositionend: (view: EditorView, event: Event) => boolean;
     mousedown: (view: EditorView) => boolean;
     blur: (view: EditorView) => boolean;
     beforeinput: (view: EditorView, event: InputEvent) => boolean;

package/dist/controller/canonicalInput.js

@@ -209,8 +209,8 @@ const createCanonicalInputBoundary = (options) => {
 				composition.start(view);
 				return false;
 			},
-			compositionend: (view) => {
-				composition.ended(view);
+			compositionend: (view, event) => {
+				composition.ended(view, event instanceof CompositionEvent && typeof event.data === "string" ? event.data : null);
 				return false;
 			},
 			mousedown: (view) => {
@@ -230,7 +230,7 @@ const createCanonicalInputBoundary = (options) => {
 				beginGesture(event.inputType === "insertFromComposition" ? "compositionFinal" : "new");
 				if (event.isComposing || CANONICAL_COMPOSITION_INPUT_TYPES.some((inputType) => inputType === event.inputType)) {
 					if (composition.active) {
-						composition.authorizeNative(view);
+						composition.authorizeNative(view, event.inputType === "insertFromComposition" ? "explicitFinal" : "provisional");
 						return false;
 					}
 					if (event.inputType === "insertFromComposition" && composition.authorizeLateFinal(view, event.data)) return false;
@@ -248,6 +248,7 @@ const createCanonicalInputBoundary = (options) => {
 					}
 					const nativeFinal = view.composing && (event.inputType === "insertText" || event.inputType === "insertReplacementText");
 					const nativeStillComposing = view.composing;
+					if (nativeFinal) composition.authorizeNative(view, "explicitFinal");
 					const recovered = composition.recover(view);
 					composition.forgetCompleted();
 					proposal = { type: "idle" };

package/dist/controller/canonicalSelection.js

@@ -1,9 +1,18 @@
 import { panic } from "better-result";
-import { AllSelection, TextSelection } from "prosemirror-state";
+import { AllSelection, NodeSelection, TextSelection } from "prosemirror-state";
 //#region src/controller/canonicalSelection.ts
 /** Restore the admitted selection kind after a canonical projection changes. */
 const restoreCanonicalSelection = ({ transaction, projection, selection, unavailable }) => {
 	switch (selection.type) {
+		case "inlineNode": {
+			const anchor = projection.positionAt(selection.anchor);
+			const head = projection.positionAt(selection.head);
+			if (anchor.isErr() || head.isErr()) return false;
+			const node = transaction.doc.nodeAt(anchor.value);
+			if (!node?.isInline || !node.isAtom || !NodeSelection.isSelectable(node) || anchor.value + node.nodeSize !== head.value) return false;
+			transaction.setSelection(NodeSelection.create(transaction.doc, anchor.value));
+			return true;
+		}
 		case "all":
 			transaction.setSelection(new AllSelection(transaction.doc));
 			return true;

package/dist/controller/canonicalSession.d.ts

@@ -14,7 +14,7 @@ declare class CanonicalSessionError extends CanonicalSessionError_base<{
   reason: "refused" | "noChange";
 }> {}
 type CanonicalSelection = {
-  type: "text" | "all";
+  type: "text" | "inlineNode" | "all";
   anchor: TextPosition;
   head: TextPosition;
 };