@portabletext/editor 8.0.3 → 8.1.1

package/lib/index.js

@@ -1,9 +1,9 @@
-import { a as getNodeChildren, i as getChildren, l as serializePath, n as parentPath, r as getNode, t as getParent, u as isKeyedSegment } from "./get-parent-Ci5241qs.js";
-import { C as getAncestors, S as hasNode, _ as comparePoints, a as isInline, b as isEditableContainer, c as isSpanNode, d as resolveChildEntryIndex, f as isAncestorPath, g as isAfterPoint, h as isBackwardRange, i as getEnclosingBlock, l as getSibling, m as rangeEdges, n as getEnclosingContainer, o as getBlock, p as isTextBlockNode, s as isBlock, t as getPathSubSchema, u as getNodes, v as comparePaths, x as resolveContainerAt, y as isObject } from "./get-path-sub-schema-CZd9VcVM.js";
-import { _ as getAncestor, a as getTextBlock, c as pathContains, d as isRange, f as isPoint, g as isLeafObject, h as getLeaf, i as getFirstChild, l as getSpan, m as isPath, n as getUnionSchema, o as rangeIntersects, p as isObject$1, r as getLastChild, s as isBeforePoint, t as getContainer, u as getText } from "./get-container-D1nM_ww9.js";
-import { a as parseBlocks, b as childAtTextOffset, c as parseSpan, d as getSelectionEndPoint, f as isSelectionCollapsed, g as isEqualSelectionPoints, h as getBlockKeyFromSelectionPoint, i as parseBlock, l as defaultKeyGenerator, m as getBlockEndPoint, n as isListBlock, o as parseInlineObject, p as getBlockStartPoint, r as parseAnnotation, s as parseMarkDefs, u as getSelectionStartPoint, v as blockOffsetToSpanSelectionPoint, x as textOffsetOfChild } from "./util.slice-blocks-B2fZcNok.js";
-import { A as getSelectionEndPoint$1, B as getFocusBlock, C as getSelectedTextBlocks, D as getPreviousSpan, F as getSelectionEndBlock, G as rangesOverlap, H as getFocusInlineObject, I as getFragment, L as getSelectedValue, M as isSelectionCollapsed$1, N as isOverlappingSelection, O as getSelectionStartPoint$1, P as getSelectionStartBlock, R as getRootAcceptedTypes, S as getActiveDecorators, T as getMarkState, U as getFocusChild, V as getFocusSpan, a as isActiveListItem, b as getActiveAnnotations, c as getSelectionEndChild, d as getLastBlock, f as getFocusListBlock, i as isActiveStyle, j as isSelectionExpanded, k as getNextSpan, l as getPreviousBlock, m as getCaretWordSelection, n as isAtTheStartOfBlock, o as isActiveDecorator, p as getFocusBlockObject, r as isAtTheEndOfBlock, s as getSelectionStartChild, t as isSelectingEntireBlocks, u as getNextBlock, w as getActiveAnnotationsMarks, x as isActiveAnnotation, z as getFocusTextBlock } from "./selector.is-selecting-entire-blocks-DPnzucrd.js";
-import { n as isEmptyTextBlock, r as getTextBlockText, t as isEqualSelections } from "./util.is-equal-selections-N1hxVUbE.js";
+import { a as getChildren, d as isKeyedSegment, i as resolveNode, n as parentPath, o as getNodeChildren, r as getNode, t as getParent, u as serializePath } from "./get-parent-DgaKcy8-.js";
+import { C as getAncestors, S as hasNode, _ as comparePoints, a as isInline, b as isEditableContainer, c as isSpanNode, d as resolveChildEntryIndex, f as isAncestorPath, g as isAfterPoint, h as isBackwardRange, i as getEnclosingBlock, l as getSibling, m as rangeEdges, n as getEnclosingContainer, o as getBlock, p as isTextBlockNode, s as isBlock, t as getPathSubSchema, u as getNodes, v as comparePaths, x as resolveContainerAt, y as isObject } from "./get-path-sub-schema-Dd0QYZ0m.js";
+import { _ as getAncestor, a as getTextBlock, c as pathContains, d as isRange, f as isPoint, g as isLeafObject, h as getLeaf, i as getFirstChild, l as getSpan, m as isPath, n as getUnionSchema, o as rangeIntersects, p as isObject$1, r as getLastChild, s as isBeforePoint, t as getContainer, u as getText } from "./get-container-D2pN5Npr.js";
+import { a as parseBlocks, b as childAtTextOffset, c as parseSpan, d as getSelectionEndPoint, f as isSelectionCollapsed, g as isEqualSelectionPoints, h as getBlockKeyFromSelectionPoint, i as parseBlock, l as defaultKeyGenerator, m as getBlockEndPoint, n as isListBlock, o as parseInlineObject, p as getBlockStartPoint, r as parseAnnotation, s as parseMarkDefs, u as getSelectionStartPoint, v as blockOffsetToSpanSelectionPoint, x as textOffsetOfChild } from "./util.slice-blocks-_ElaB53f.js";
+import { A as getSelectionEndPoint$1, B as getFocusBlock, C as getSelectedTextBlocks, D as getPreviousSpan, F as getSelectionEndBlock, G as rangesOverlap, H as getFocusInlineObject, I as getFragment, L as getSelectedValue, M as isSelectionCollapsed$1, N as isOverlappingSelection, O as getSelectionStartPoint$1, P as getSelectionStartBlock, R as getRootAcceptedTypes, S as getActiveDecorators, T as getMarkState, U as getFocusChild, V as getFocusSpan, a as isActiveListItem, b as getActiveAnnotations, c as getSelectionEndChild, d as getLastBlock, f as getFocusListBlock, i as isActiveStyle, j as isSelectionExpanded, k as getNextSpan, l as getPreviousBlock, m as getCaretWordSelection, n as isAtTheStartOfBlock, o as isActiveDecorator, p as getFocusBlockObject, r as isAtTheEndOfBlock, s as getSelectionStartChild, t as isSelectingEntireBlocks, u as getNextBlock, w as getActiveAnnotationsMarks, x as isActiveAnnotation, z as getFocusTextBlock } from "./selector.is-selecting-entire-blocks-BFhnnkHf.js";
+import { n as isEmptyTextBlock, r as getTextBlockText, t as isEqualSelections } from "./util.is-equal-selections-BdK98okY.js";
 import { a as raise$1, i as forward, n as effect, t as defineBehavior } from "./behavior.types.behavior-BxSLb73I.js";
 import { n as EditorContext$1, t as useEditor } from "./use-editor-CwNeVwVC.js";
 import { c } from "react/compiler-runtime";
@@ -746,6 +746,40 @@ function move(editor, options = {}) {
 	}
 	editor.setSelection(props);
 }
+function subscribeToOperations(editor, listener, options) {
+	let phase = options?.phase ?? "after";
+	return editor.operationListeners[phase] = [...editor.operationListeners[phase], listener], () => {
+		let listeners = editor.operationListeners[phase], index = listeners.indexOf(listener);
+		index !== -1 && (editor.operationListeners[phase] = [...listeners.slice(0, index), ...listeners.slice(index + 1)]);
+	};
+}
+/**
+* Captures the operation together with the engine state that `after`
+* listeners can no longer read once the operation has been applied. All
+* engine flags are stable for the duration of a single apply call, so
+* capturing them at entry is equivalent to reading them at any point during
+* the apply.
+*/
+function createOperationEvent(editor, operation) {
+	let isNormalizingNode = !!editor.isNormalizingNode, isProcessingRemoteChanges = !!editor.isProcessingRemoteChanges, isUndoing = !!editor.isUndoing, isRedoing = !!editor.isRedoing;
+	return {
+		operation,
+		beforeValue: editor.snapshot.context.value,
+		beforeSelection: editor.snapshot.context.selection,
+		operationsInProgress: editor.operations.length > 0,
+		isNormalizingNode,
+		isPatching: !!editor.isPatching,
+		isProcessingRemoteChanges,
+		isUndoing,
+		isRedoing,
+		withHistory: !!editor.withHistory,
+		undoStepId: editor.undoStepId,
+		origin: isProcessingRemoteChanges ? "remote" : isUndoing ? "undo" : isRedoing ? "redo" : isNormalizingNode ? "normalization" : "local"
+	};
+}
+function emitOperationEvent(listeners, event) {
+	for (let index = 0; index < listeners.length; index++) listeners[index]?.(event);
+}
 const bold$1 = createKeyboardShortcut({
 	default: [{
 		key: "B",
@@ -2789,9 +2823,12 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({ children }) => /* @__PU
 	editor.forceRender = forceRender, editor.readOnly = readOnly;
 	let state = useMemo(() => ({
 		isUpdatingSelection: !1,
-		latestElement: null
+		latestElement: null,
+		localContentChangePending: !1
 	}), []);
-	useEffect(() => {
+	useEffect(() => subscribeToOperations(editor, (event) => {
+		event.operation.type !== "set.selection" && (event.origin === "local" || event.origin === "undo" || event.origin === "redo") && (state.localContentChangePending = !0);
+	}), [editor, state]), useEffect(() => {
 		ref.current && autoFocus && ref.current.focus();
 	}, [autoFocus]);
 	/**
@@ -2846,6 +2883,8 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({ children }) => /* @__PU
 		onDOMSelectionChange,
 		scheduleOnDOMSelectionChange
 	}), useIsomorphicLayoutEffect(() => {
+		let hadPendingLocalContentChange = state.localContentChangePending;
+		state.localContentChangePending = !1;
 		let window = null;
 		ref.current && (window = getDefaultView(ref.current)) && (editor.domWindow = window, editor.domElement = ref.current);
 		let { selection } = editor.snapshot.context, root = DOMEditor.findDocumentOrShadowRoot(editor), domSelection = getSelection(root);
@@ -2864,7 +2903,13 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({ children }) => /* @__PU
 					exactMatch: !0,
 					suppressThrow: !0
 				});
-				if (editorSelection && rangeEquals(editorSelection, selection)) return;
+				if (editorSelection && rangeEquals(editorSelection, selection)) {
+					if (hadPendingLocalContentChange) try {
+						let domRange = DOMEditor.toDOMRange(editor, selection);
+						scrollSelectionIntoView(editor, domRange);
+					} catch {}
+					return;
+				}
 			}
 			if (selection && !DOMEditor.hasRange(editor, selection)) {
 				let fallbackRange = DOMEditor.toEditorSelection(editor, domSelection, {
@@ -4116,40 +4161,6 @@ function performHotkey({ editorActor, editor, portableTextEditor, hotkeys, event
 		}
 	});
 }
-function subscribeToOperations(editor, listener, options) {
-	let phase = options?.phase ?? "after";
-	return editor.operationListeners[phase] = [...editor.operationListeners[phase], listener], () => {
-		let listeners = editor.operationListeners[phase], index = listeners.indexOf(listener);
-		index !== -1 && (editor.operationListeners[phase] = [...listeners.slice(0, index), ...listeners.slice(index + 1)]);
-	};
-}
-/**
-* Captures the operation together with the engine state that `after`
-* listeners can no longer read once the operation has been applied. All
-* engine flags are stable for the duration of a single apply call, so
-* capturing them at entry is equivalent to reading them at any point during
-* the apply.
-*/
-function createOperationEvent(editor, operation) {
-	let isNormalizingNode = !!editor.isNormalizingNode, isProcessingRemoteChanges = !!editor.isProcessingRemoteChanges, isUndoing = !!editor.isUndoing, isRedoing = !!editor.isRedoing;
-	return {
-		operation,
-		beforeValue: editor.snapshot.context.value,
-		beforeSelection: editor.snapshot.context.selection,
-		operationsInProgress: editor.operations.length > 0,
-		isNormalizingNode,
-		isPatching: !!editor.isPatching,
-		isProcessingRemoteChanges,
-		isUndoing,
-		isRedoing,
-		withHistory: !!editor.withHistory,
-		undoStepId: editor.undoStepId,
-		origin: isProcessingRemoteChanges ? "remote" : isUndoing ? "undo" : isRedoing ? "redo" : isNormalizingNode ? "normalization" : "local"
-	};
-}
-function emitOperationEvent(listeners, event) {
-	for (let index = 0; index < listeners.length; index++) listeners[index]?.(event);
-}
 function isForwardRange(range, root) {
 	return !isBackwardRange(range, root);
 }
@@ -4192,7 +4203,12 @@ const engineOperationCallback = ({ input, sendBack }) => subscribeToOperations(i
 		operation: event.operation,
 		origin: event.origin
 	});
-}, { phase: "before" }), rangeDecorationsMachine = setup({
+}, { phase: "before" });
+function mergeRangeDecoration(leaf, decoration) {
+	let { rangeDecoration } = decoration;
+	leaf.rangeDecorations = [...leaf.rangeDecorations ?? [], rangeDecoration];
+}
+const rangeDecorationsMachine = setup({
 	types: {
 		context: {},
 		input: {},
@@ -4213,6 +4229,7 @@ const engineOperationCallback = ({ input, sendBack }) => subscribeToOperations(i
 				}
 				rangeDecorationState.push({
 					rangeDecoration,
+					merge: mergeRangeDecoration,
 					...rangeDecoration.selection
 				});
 			}
@@ -4232,6 +4249,7 @@ const engineOperationCallback = ({ input, sendBack }) => subscribeToOperations(i
 				}
 				rangeDecorationState.push({
 					rangeDecoration,
+					merge: mergeRangeDecoration,
 					...rangeDecoration.selection
 				});
 			}
@@ -4260,7 +4278,8 @@ const engineOperationCallback = ({ input, sendBack }) => subscribeToOperations(i
 					rangeDecoration: {
 						...decoratedRange.rangeDecoration,
 						selection: newRange || currentSelection
-					}
+					},
+					merge: mergeRangeDecoration
 				});
 			}
 			context.editorEngine.decoratedRanges = rangeDecorationState;
@@ -5168,29 +5187,33 @@ const PLACEHOLDER_STYLE = {
 	right: 0
 };
 function RenderLeaf(props) {
-	let $ = c(12), schema = props.schema;
+	let $ = c(16), schema = props.schema;
 	if (props.leaf._type !== schema.span.name) return props.children;
 	let t0;
 	$[0] === props ? t0 = $[1] : (t0 = /* @__PURE__ */ jsx(RenderSpan, { ...props }), $[0] = props, $[1] = t0);
-	let renderedSpan = t0;
-	if (props.renderPlaceholder && props.leaf.placeholder && props.text.text === "") {
-		let t1;
-		$[2] === props.renderPlaceholder ? t1 = $[3] : (t1 = props.renderPlaceholder(), $[2] = props.renderPlaceholder, $[3] = t1);
-		let t2;
-		$[4] === t1 ? t2 = $[5] : (t2 = /* @__PURE__ */ jsx("span", {
-			style: PLACEHOLDER_STYLE,
-			contentEditable: !1,
-			children: t1
-		}), $[4] = t1, $[5] = t2);
-		let t3;
-		return $[6] !== renderedSpan || $[7] !== t2 ? (t3 = /* @__PURE__ */ jsxs(Fragment, { children: [t2, renderedSpan] }), $[6] = renderedSpan, $[7] = t2, $[8] = t3) : t3 = $[8], t3;
-	}
-	let rangeDecoration = props.leaf.rangeDecoration;
-	if (rangeDecoration) {
-		let t1;
-		$[9] !== rangeDecoration || $[10] !== renderedSpan ? (t1 = rangeDecoration.component({ children: renderedSpan }), $[9] = rangeDecoration, $[10] = renderedSpan, $[11] = t1) : t1 = $[11], renderedSpan = t1;
-	}
-	return renderedSpan;
+	let renderedSpan, t1;
+	if ($[2] !== props.leaf.placeholder || $[3] !== props.leaf.rangeDecorations || $[4] !== props.renderPlaceholder || $[5] !== props.text || $[6] !== t0) {
+		t1 = Symbol.for("react.early_return_sentinel");
+		bb0: {
+			if (renderedSpan = t0, props.renderPlaceholder && props.leaf.placeholder && props.text.text === "") {
+				let t2;
+				$[9] === props.renderPlaceholder ? t2 = $[10] : (t2 = props.renderPlaceholder(), $[9] = props.renderPlaceholder, $[10] = t2);
+				let t3;
+				$[11] === t2 ? t3 = $[12] : (t3 = /* @__PURE__ */ jsx("span", {
+					style: PLACEHOLDER_STYLE,
+					contentEditable: !1,
+					children: t2
+				}), $[11] = t2, $[12] = t3);
+				let t4;
+				$[13] !== renderedSpan || $[14] !== t3 ? (t4 = /* @__PURE__ */ jsxs(Fragment, { children: [t3, renderedSpan] }), $[13] = renderedSpan, $[14] = t3, $[15] = t4) : t4 = $[15], t1 = t4;
+				break bb0;
+			}
+			let rangeDecorations = props.leaf.rangeDecorations;
+			if (rangeDecorations) for (let rangeDecoration of [...rangeDecorations].reverse()) renderedSpan = rangeDecoration.component({ children: renderedSpan });
+		}
+		$[2] = props.leaf.placeholder, $[3] = props.leaf.rangeDecorations, $[4] = props.renderPlaceholder, $[5] = props.text, $[6] = t0, $[7] = renderedSpan, $[8] = t1;
+	} else renderedSpan = $[7], t1 = $[8];
+	return t1 === Symbol.for("react.early_return_sentinel") ? renderedSpan : t1;
 }
 function RenderText(props) {
 	let $ = c(3), t0;
@@ -7543,8 +7566,7 @@ function applyMergeNode(editor, path, position) {
 				if (!prevEntry || !isTextBlock({ schema: editor.snapshot.context.schema }, prevEntry.node)) return;
 				let prevChildren = prevEntry.node.children, lastInsertedKey = prevChildren.length > 0 ? prevChildren[prevChildren.length - 1]._key : void 0;
 				for (let i = 0; i < node.children.length; i++) {
-					let child = node.children[i];
-					lastInsertedKey === void 0 ? editor.apply({
+					let child = node.children[i], operation = lastInsertedKey === void 0 ? {
 						type: "insert",
 						path: [
 							...prevPath,
@@ -7553,7 +7575,7 @@ function applyMergeNode(editor, path, position) {
 						],
 						node: child,
 						position: "before"
-					}) : editor.apply({
+					} : {
 						type: "insert",
 						path: [
 							...prevPath,
@@ -7562,7 +7584,8 @@ function applyMergeNode(editor, path, position) {
 						],
 						node: child,
 						position: "after"
-					}), lastInsertedKey = child._key;
+					};
+					editor.apply(operation), lastInsertedKey = operation.node._key;
 				}
 				editor.apply({
 					type: "unset",
@@ -7639,33 +7662,6 @@ function transformPointForMerge(point, mergePath, prevKey, position) {
 	};
 }
 /**
-* Create a placeholder text block -- the empty initial block used when the
-* editor value is empty or when a container needs a default child.
-*
-* When `path` is provided and points into a container, the placeholder
-* uses the container's default style. Without `path`, or at root depth,
-* falls back to the root schema's first style.
-*/
-function createPlaceholderBlock(snapshot, path) {
-	let style = resolveDefaultStyle(snapshot, path);
-	return {
-		_type: snapshot.context.schema.block.name,
-		_key: snapshot.context.keyGenerator(),
-		style,
-		markDefs: [],
-		children: [{
-			_type: snapshot.context.schema.span.name,
-			_key: snapshot.context.keyGenerator(),
-			text: "",
-			marks: []
-		}]
-	};
-}
-function resolveDefaultStyle(snapshot, path) {
-	let rootFallback = snapshot.context.schema.styles[0]?.name ?? "normal";
-	return path ? getPathSubSchema(snapshot, path).styles[0]?.name ?? rootFallback : rootFallback;
-}
-/**
 * Apply property changes at a known path using primitive `set` and `unset`
 * operations.
 *
@@ -7674,10 +7670,11 @@ function resolveDefaultStyle(snapshot, path) {
 * downstream patch consumers see the key change before any property
 * mutations that reference the new key.
 */
-function setNodeProperties(editor, props, path) {
-	let nodeEntry = getNode(editor.snapshot, path);
-	if (!nodeEntry) return;
-	let nodeRecord = nodeEntry.node, propsRecord = props, keys = Object.keys(propsRecord), keyIndex = keys.indexOf("_key");
+function applyNodeProperties(editor, props, path) {
+	let result = resolveNode(editor.snapshot, path);
+	if (result.status === "unreachable") throw Error(`Unable to apply properties at structurally unreachable path ${safeStringify(path)}`);
+	if (result.status === "missing") return;
+	let nodeRecord = result.entry.node, propsRecord = props, keys = Object.keys(propsRecord), keyIndex = keys.indexOf("_key");
 	keyIndex !== -1 && (keys.splice(keyIndex, 1), keys.unshift("_key"));
 	let currentPath = path;
 	for (let key of keys) if (propsRecord[key] !== nodeRecord[key]) if (propsRecord[key] != null) {
@@ -7706,6 +7703,33 @@ function setNodeProperties(editor, props, path) {
 	});
 }
 /**
+* Create a placeholder text block -- the empty initial block used when the
+* editor value is empty or when a container needs a default child.
+*
+* When `path` is provided and points into a container, the placeholder
+* uses the container's default style. Without `path`, or at root depth,
+* falls back to the root schema's first style.
+*/
+function createPlaceholderBlock(snapshot, path) {
+	let style = resolveDefaultStyle(snapshot, path);
+	return {
+		_type: snapshot.context.schema.block.name,
+		_key: snapshot.context.keyGenerator(),
+		style,
+		markDefs: [],
+		children: [{
+			_type: snapshot.context.schema.span.name,
+			_key: snapshot.context.keyGenerator(),
+			text: "",
+			marks: []
+		}]
+	};
+}
+function resolveDefaultStyle(snapshot, path) {
+	let rootFallback = snapshot.context.schema.styles[0]?.name ?? "normal";
+	return path ? getPathSubSchema(snapshot, path).styles[0]?.name ?? rootFallback : rootFallback;
+}
+/**
 * Read the `_type` from a pre-resolved `of` entry.
 */
 function entryType(entry) {
@@ -7936,7 +7960,7 @@ const normalizeNode = (editor, entry) => {
 	* Add missing .markDefs to text block nodes
 	*/
 	if (!editor.isProcessingRemoteChanges && isTextBlockNode({ schema: editor.snapshot.context.schema }, node) && !Array.isArray(node.markDefs)) {
-		debug.normalization("adding .markDefs to block node"), setNodeProperties(editor, { markDefs: [] }, path);
+		debug.normalization("adding .markDefs to block node"), applyNodeProperties(editor, { markDefs: [] }, path);
 		return;
 	}
 	/**
@@ -7945,7 +7969,7 @@ const normalizeNode = (editor, entry) => {
 	if (!editor.isProcessingRemoteChanges && isTextBlockNode({ schema: editor.snapshot.context.schema }, node) && node.style === void 0) {
 		let defaultStyle = getPathSubSchema(editor.snapshot, path).styles.at(0)?.name;
 		if (defaultStyle) {
-			debug.normalization("adding .style to block node"), setNodeProperties(editor, { style: defaultStyle }, path);
+			debug.normalization("adding .style to block node"), applyNodeProperties(editor, { style: defaultStyle }, path);
 			return;
 		}
 	}
@@ -7968,7 +7992,7 @@ const normalizeNode = (editor, entry) => {
 	* Add missing .marks to span nodes
 	*/
 	if (!editor.isProcessingRemoteChanges && isSpan({ schema: editor.snapshot.context.schema }, node) && !Array.isArray(node.marks)) {
-		debug.normalization("Adding .marks to span node"), setNodeProperties(editor, { marks: [] }, path);
+		debug.normalization("Adding .marks to span node"), applyNodeProperties(editor, { marks: [] }, path);
 		return;
 	}
 	/**
@@ -7979,7 +8003,7 @@ const normalizeNode = (editor, entry) => {
 		if (!blockEntry) return;
 		let annotations = node.marks?.filter((mark) => blockEntry.node.markDefs?.some((markDef) => markDef._key === mark));
 		if (node.text === "" && annotations && annotations.length > 0) {
-			debug.normalization("removing annotations from empty span node"), setNodeProperties(editor, { marks: node.marks?.filter((mark) => !annotations.includes(mark)) }, path);
+			debug.normalization("removing annotations from empty span node"), applyNodeProperties(editor, { marks: node.marks?.filter((mark) => !annotations.includes(mark)) }, path);
 			return;
 		}
 	}
@@ -7990,7 +8014,7 @@ const normalizeNode = (editor, entry) => {
 		let markDefs = node.markDefs ?? [], markDefKeys = /* @__PURE__ */ new Set(), newMarkDefs = [];
 		for (let markDef of markDefs) markDefKeys.has(markDef._key) || (markDefKeys.add(markDef._key), newMarkDefs.push(markDef));
 		if (markDefs.length !== newMarkDefs.length) {
-			debug.normalization("removing duplicate markDefs"), setNodeProperties(editor, { markDefs: newMarkDefs }, path);
+			debug.normalization("removing duplicate markDefs"), applyNodeProperties(editor, { markDefs: newMarkDefs }, path);
 			return;
 		}
 	}
@@ -8000,7 +8024,7 @@ const normalizeNode = (editor, entry) => {
 	if (!editor.isProcessingRemoteChanges && isTextBlock({ schema: editor.snapshot.context.schema }, node)) {
 		let newMarkDefs = (node.markDefs || []).filter((def) => node.children.find((child) => isSpan({ schema: editor.snapshot.context.schema }, child) && Array.isArray(child.marks) && child.marks.includes(def._key)));
 		if (node.markDefs && !isEqualMarkDefs(newMarkDefs, node.markDefs)) {
-			debug.normalization("removing markDef not in use"), setNodeProperties(editor, { markDefs: newMarkDefs }, path);
+			debug.normalization("removing markDef not in use"), applyNodeProperties(editor, { markDefs: newMarkDefs }, path);
 			return;
 		}
 	}
@@ -8040,11 +8064,11 @@ const normalizeNode = (editor, entry) => {
 					_type: firstChildType.type === "object" && "name" in firstChildType ? firstChildType.name : firstChildType.type,
 					_key: editor.snapshot.context.keyGenerator()
 				}), needsField && childNode) {
-					setNodeProperties(editor, { [arrayField.name]: [childNode] }, path);
+					applyNodeProperties(editor, { [arrayField.name]: [childNode] }, path);
 					return;
 				}
 				if (needsField) {
-					setNodeProperties(editor, { [arrayField.name]: [] }, path);
+					applyNodeProperties(editor, { [arrayField.name]: [] }, path);
 					return;
 				}
 				if (childNode) {
@@ -11166,7 +11190,7 @@ const addAnnotationOperationImplementation = ({ snapshot, operation }) => {
 		for (let { node: block, path: blockPath } of selectedBlocks) {
 			if (!isTextBlock({ schema: editor.snapshot.context.schema }, block) || block.children.length === 0 || block.children.length === 1 && block.children[0]?.text === "" || !getPathSubSchema(snapshot, blockPath).annotations.some((annotation) => annotation.name === parsedAnnotation._type)) continue;
 			let annotationKey = blockIndex === 0 ? parsedAnnotation._key : context.keyGenerator(), markDefs = block.markDefs ?? [];
-			markDefs.find((markDef) => markDef._type === parsedAnnotation._type && markDef._key === annotationKey) === void 0 && setNodeProperties(editor, { markDefs: [...markDefs, {
+			markDefs.find((markDef) => markDef._type === parsedAnnotation._type && markDef._key === annotationKey) === void 0 && applyNodeProperties(editor, { markDefs: [...markDefs, {
 				...parsedAnnotation,
 				_key: annotationKey
 			}] }, blockPath);
@@ -11184,7 +11208,7 @@ const addAnnotationOperationImplementation = ({ snapshot, operation }) => {
 			for (let { node: span, path: spanPath } of children) {
 				if (!isSpan({ schema: editor.snapshot.context.schema }, span) || !selectionRange || !rangeIntersects(editor.snapshot, selectionRange, spanPath)) continue;
 				let marks = span.marks ?? [];
-				setNodeProperties(editor, { marks: [...marks, annotationKey] }, spanPath);
+				applyNodeProperties(editor, { marks: [...marks, annotationKey] }, spanPath);
 			}
 			blockIndex++;
 		}
@@ -11222,7 +11246,7 @@ const removeAnnotationOperationImplementation = ({ snapshot, operation }) => {
 			...previousSpansWithSameAnnotation,
 			[selectedChild, selectedChildPath],
 			...nextSpansWithSameAnnotation
-		]) setNodeProperties(editor, { marks: child.marks?.filter((mark) => mark !== annotationToRemove) }, childPath);
+		]) applyNodeProperties(editor, { marks: child.marks?.filter((mark) => mark !== annotationToRemove) }, childPath);
 	} else {
 		let ref = at ? rangeRef(editor, at, { affinity: "inward" }) : null;
 		withoutNormalizing(editor, () => {
@@ -11247,7 +11271,7 @@ const removeAnnotationOperationImplementation = ({ snapshot, operation }) => {
 				for (let { node: child, path: childPath } of children) {
 					if (!isSpan({ schema: editor.snapshot.context.schema }, child) || !selectionRange || !rangeIntersects(editor.snapshot, selectionRange, childPath)) continue;
 					let markDefs = block.markDefs ?? [], marks = child.marks ?? [], marksWithoutAnnotation = marks.filter((mark) => markDefs.find((markDef) => markDef._key === mark)?._type !== operation.annotation.name);
-					marksWithoutAnnotation.length !== marks.length && setNodeProperties(editor, { marks: marksWithoutAnnotation }, childPath);
+					marksWithoutAnnotation.length !== marks.length && applyNodeProperties(editor, { marks: marksWithoutAnnotation }, childPath);
 				}
 			}
 		}), ref?.unref();
@@ -11310,7 +11334,7 @@ const blockSetOperationImplementation = ({ snapshot, operation }) => {
 			}
 			context.schema.block.fields?.some((field) => field.name === key) && (filteredProps[key] = operation.props[key]);
 		}
-		setNodeProperties(operation.editor, filteredProps, blockEntry.path);
+		applyNodeProperties(operation.editor, filteredProps, blockEntry.path);
 	} else {
 		let schemaDefinition = getBlockObjectSchema(snapshot, engineBlock, blockEntry.path), filteredProps = {};
 		for (let key of Object.keys(operation.props)) if (key !== "_type") {
@@ -11321,7 +11345,7 @@ const blockSetOperationImplementation = ({ snapshot, operation }) => {
 			schemaDefinition?.fields?.some((field) => field.name === key) && (filteredProps[key] = operation.props[key]);
 		}
 		let patches = Object.entries(filteredProps).map(([key, value]) => set(value, [key])), updatedEngineBlock = applyAll(engineBlock, patches);
-		setNodeProperties(operation.editor, updatedEngineBlock, blockEntry.path);
+		applyNodeProperties(operation.editor, updatedEngineBlock, blockEntry.path);
 	}
 }, blockUnsetOperationImplementation = ({ snapshot, operation }) => {
 	let { context } = snapshot, blockEntry = getNode(operation.editor.snapshot, operation.at);
@@ -11330,12 +11354,12 @@ const blockSetOperationImplementation = ({ snapshot, operation }) => {
 	if (isTextBlockNode(context, engineBlock)) {
 		let propsToRemove = operation.props.filter((prop) => prop !== "_type" && prop !== "_key"), unsetProps = {};
 		for (let prop of propsToRemove) unsetProps[prop] = null;
-		setNodeProperties(operation.editor, unsetProps, blockEntry.path), operation.props.includes("_key") && setNodeProperties(operation.editor, { _key: context.keyGenerator() }, blockEntry.path);
+		applyNodeProperties(operation.editor, unsetProps, blockEntry.path), operation.props.includes("_key") && applyNodeProperties(operation.editor, { _key: context.keyGenerator() }, blockEntry.path);
 		return;
 	}
 	let unsetProps = {};
 	for (let key of operation.props) key !== "_type" && (key === "_key" ? unsetProps._key = context.keyGenerator() : unsetProps[key] = null);
-	setNodeProperties(operation.editor, unsetProps, blockEntry.path);
+	applyNodeProperties(operation.editor, unsetProps, blockEntry.path);
 };
 /**
 * Compute the canonical path that a new node will have when inserted as a
@@ -11362,7 +11386,7 @@ const childSetOperationImplementation = ({ snapshot, operation }) => {
 	let { node: child, path: childPath } = childEntry;
 	if (isSpan({ schema: operation.editor.snapshot.context.schema }, child)) {
 		let { _type, text, ...rest } = operation.props;
-		setNodeProperties(operation.editor, {
+		applyNodeProperties(operation.editor, {
 			...child,
 			...rest
 		}, childPath);
@@ -11385,7 +11409,7 @@ const childSetOperationImplementation = ({ snapshot, operation }) => {
 		if (!definition) return;
 		let { _type, _key, ...rest } = operation.props;
 		for (let prop in rest) definition.fields.some((field) => field.name === prop) || delete rest[prop];
-		setNodeProperties(operation.editor, {
+		applyNodeProperties(operation.editor, {
 			...child,
 			_key: typeof _key == "string" ? _key : child._key,
 			...rest
@@ -11406,13 +11430,13 @@ const childSetOperationImplementation = ({ snapshot, operation }) => {
 			}
 			newNode[prop] = null;
 		}
-		setNodeProperties(operation.editor, newNode, childPath);
+		applyNodeProperties(operation.editor, newNode, childPath);
 		return;
 	}
 	if (isObject(operation.editor.snapshot, child)) {
 		let unsetProps = {};
 		for (let prop of operation.props) prop !== "_type" && (prop === "_key" ? unsetProps._key = context.keyGenerator() : unsetProps[prop] = null);
-		setNodeProperties(operation.editor, unsetProps, childPath);
+		applyNodeProperties(operation.editor, unsetProps, childPath);
 		return;
 	}
 	throw Error(`Unable to determine the type of child at ${safeStringify(operation.at)}`);
@@ -11435,7 +11459,7 @@ const childSetOperationImplementation = ({ snapshot, operation }) => {
 					let blockPath = parentPath(spanPath);
 					if (!getPathSubSchema(snapshot, blockPath).decorators.some((decorator) => decorator.name === mark)) continue;
 					let marks = [...(Array.isArray(node.marks) ? node.marks : []).filter((eMark) => eMark !== mark), mark];
-					setNodeProperties(editor, { marks }, spanPath);
+					applyNodeProperties(editor, { marks }, spanPath);
 				}
 			});
 		} else {
@@ -11454,7 +11478,7 @@ const childSetOperationImplementation = ({ snapshot, operation }) => {
 				for (let { path: spanPath } of Array.from(getNodes(editor.snapshot, {
 					at: blockPath,
 					match: (node) => isSpan({ schema: editor.snapshot.context.schema }, node)
-				}))) setNodeProperties(editor, { marks: newMarks }, spanPath);
+				}))) applyNodeProperties(editor, { marks: newMarks }, spanPath);
 			} else editor.snapshot.decoratorState[mark] = !0;
 		}
 		if (editor.snapshot.context.selection) {
@@ -11483,7 +11507,7 @@ const childSetOperationImplementation = ({ snapshot, operation }) => {
 					for (let { node, path: nodePath } of splitTextNodes) {
 						if (!isSpan({ schema: editor.snapshot.context.schema }, node)) continue;
 						let blockPath = parentPath(nodePath), block = getNode(editor.snapshot, blockPath)?.node;
-						isTextBlock({ schema: editor.snapshot.context.schema }, block) && block.children.includes(node) && setNodeProperties(editor, {
+						isTextBlock({ schema: editor.snapshot.context.schema }, block) && block.children.includes(node) && applyNodeProperties(editor, {
 							marks: (Array.isArray(node.marks) ? node.marks : []).filter((eMark) => eMark !== mark),
 							_type: context.schema.span.name
 						}, nodePath);
@@ -11499,7 +11523,7 @@ const childSetOperationImplementation = ({ snapshot, operation }) => {
 				for (let { path: spanPath } of Array.from(getNodes(editor.snapshot, {
 					at: blockPath,
 					match: (node) => isSpan({ schema: editor.snapshot.context.schema }, node)
-				}))) setNodeProperties(editor, { marks: existingMarksWithoutDecorator }, spanPath);
+				}))) applyNodeProperties(editor, { marks: existingMarksWithoutDecorator }, spanPath);
 			} else editor.snapshot.decoratorState[mark] = !1;
 		}
 		if (editor.snapshot.context.selection) {
@@ -11610,6 +11634,74 @@ function fieldAcceptsTextBlock(editor, node, _path) {
 	return container ? container.field.of.some((member) => member.type === editor.snapshot.context.schema.block.name) : !1;
 }
 /**
+* A block merge folds `mergingBlock`'s children (and markDefs) into
+* `destinationBlock` by key. Any child key the merging block shares with
+* the destination has to be renamed before the merge, or the engine's own
+* collision handling mints a fresh key for it, which reads on the wire as
+* that node being destroyed and a new one created instead of moved.
+*
+* A colliding markDef that is deeply equal to the destination's is left
+* unrenamed and reported in `dedupedMarkDefKeys` instead: the merge keeps
+* a single copy under the original `_key` rather than duplicating
+* identical content under two keys. A colliding markDef that differs gets
+* renamed like a child would.
+*
+* `renamedBlock` keeps every deduped def in its own `markDefs`, even
+* though the destination already carries it: `renamedBlock` feeds
+* `insert.block` on some callers' paths, and that path parses the block
+* standalone, stripping any mark that doesn't resolve in the block's own
+* `markDefs`. A caller that appends `renamedBlock.markDefs` onto the
+* destination's must skip the keys listed in `dedupedMarkDefKeys`, or the
+* def duplicates.
+*
+* Pure: computes the renames and the block they produce without touching
+* an editor. Callers raise or apply the renames themselves, ahead of the
+* merge, against the still-living `mergingBlock`.
+*/
+function planMergeKeyRenames(args) {
+	let { context, mergingBlock, destinationBlock } = args, destinationChildKeys = new Set(destinationBlock.children.map((child) => child._key)), destinationMarkDefsByKey = new Map((destinationBlock.markDefs ?? []).map((markDef) => [markDef._key, markDef])), markDefKeyMap = /* @__PURE__ */ new Map(), dedupedMarkDefKeys = [], renamedMarkDefs = mergingBlock.markDefs?.flatMap((markDef) => {
+		let destinationMarkDef = destinationMarkDefsByKey.get(markDef._key);
+		if (!destinationMarkDef) return [markDef];
+		if (isDeepEqual(markDef, destinationMarkDef)) return dedupedMarkDefKeys.push(markDef._key), [markDef];
+		let newKey = context.keyGenerator();
+		return markDefKeyMap.set(markDef._key, newKey), [{
+			...markDef,
+			_key: newKey
+		}];
+	}), markDefRenames = [];
+	for (let markDef of mergingBlock.markDefs ?? []) {
+		let newKey = markDefKeyMap.get(markDef._key);
+		newKey && markDefRenames.push({
+			markDefKey: markDef._key,
+			newKey
+		});
+	}
+	let childRenames = [], renamedChildren = mergingBlock.children.map((child) => {
+		let currentMarks = isSpan(context, child) ? child.marks : void 0, remappedMarks = currentMarks?.map((mark) => markDefKeyMap.get(mark) ?? mark), marksChanged = !!(remappedMarks && !isEqualMarks(remappedMarks, currentMarks)), newKey = destinationChildKeys.has(child._key) ? context.keyGenerator() : child._key, props = {};
+		return newKey !== child._key && (props._key = newKey), marksChanged && (props.marks = remappedMarks), Object.keys(props).length > 0 && childRenames.push({
+			childKey: child._key,
+			props
+		}), marksChanged ? {
+			...child,
+			_key: newKey,
+			marks: remappedMarks
+		} : {
+			...child,
+			_key: newKey
+		};
+	});
+	return {
+		renamedBlock: {
+			...mergingBlock,
+			children: renamedChildren,
+			...mergingBlock.markDefs ? { markDefs: renamedMarkDefs } : {}
+		},
+		childRenames,
+		markDefRenames,
+		dedupedMarkDefKeys
+	};
+}
+/**
 * Indic scripts whose grapheme clusters span multiple code points. Backward
 * character delete on these scripts removes one code point at a time instead
 * of the entire cluster. Besides the script ranges, the class lists the BMP
@@ -11942,12 +12034,28 @@ function mergeBlock(editor, startBlockPath, endBlockPath, removeEmptyStartBlock)
 		removeNodeAt(editor, startBlockPath);
 		return;
 	}
-	let endMarkDefs = endBlock.node.markDefs;
-	if (Array.isArray(endMarkDefs) && endMarkDefs.length > 0) {
-		let oldDefs = startBlock.node.markDefs ?? [];
-		setNodeProperties(editor, { markDefs: [...new Map([...oldDefs, ...endMarkDefs].map((def) => [def._key, def])).values()] }, startBlockPath);
-	}
-	applyMergeNode(editor, endBlockPath, startBlock.node.children.length);
+	let { renamedBlock, childRenames, markDefRenames, dedupedMarkDefKeys } = planMergeKeyRenames({
+		context: editor.snapshot.context,
+		mergingBlock: endBlock.node,
+		destinationBlock: startBlock.node
+	});
+	for (let { markDefKey, newKey } of markDefRenames) editor.apply({
+		type: "set",
+		path: [
+			...endBlockPath,
+			"markDefs",
+			{ _key: markDefKey },
+			"_key"
+		],
+		value: newKey
+	});
+	for (let { childKey, props } of childRenames) applyNodeProperties(editor, props, [
+		...endBlockPath,
+		"children",
+		{ _key: childKey }
+	]);
+	let endMarkDefs = renamedBlock.markDefs?.filter((markDef) => !dedupedMarkDefKeys.includes(markDef._key));
+	Array.isArray(endMarkDefs) && endMarkDefs.length > 0 && applyNodeProperties(editor, { markDefs: [...startBlock.node.markDefs ?? [], ...endMarkDefs] }, startBlockPath), applyMergeNode(editor, endBlockPath, startBlock.node.children.length);
 }
 function removeNodeAt(editor, path) {
 	getNode(editor.snapshot, path) && editor.apply({
@@ -12636,7 +12744,7 @@ function mergeTextBlockFragment(args) {
 		block,
 		endBlock
 	});
-	setNodeProperties(editor, { markDefs: [...endBlock.markDefs ?? [], ...adjustedMarkDefs ?? []] }, endBlockPath);
+	applyNodeProperties(editor, { markDefs: [...endBlock.markDefs ?? [], ...adjustedMarkDefs ?? []] }, endBlockPath);
 	let atPathRef = pathRef(editor, at.path), atBlockStart = pointEquals(at, start(editor, endBlockPath)), firstInsertedKey = insertFragmentChildren(editor, adjustedBlock, at), resolvedAtPath = atPathRef.unref();
 	if (select === "none") {
 		(wasCrossBlock || !atBlockStart) && applySelect(editor, at);
@@ -12744,8 +12852,12 @@ function resolveChildIndex(children, segment) {
 }
 /**
 * Reassign keys on spans, inline objects and markDefs that collide with the
-* end block's existing keys. Returns the adjusted block and the adjusted
-* markDefs (to be merged into the end block).
+* end block's existing keys. A colliding markDef that is deeply equal to
+* the end block's is left out of the returned `adjustedMarkDefs` instead
+* of renamed, since the end block already carries it; its key isn't
+* remapped, so the fragment's marks keep pointing at it unchanged. The
+* caller must merge the returned `adjustedMarkDefs` into the end block's
+* own `markDefs`, or the deduped defs are lost.
 */
 function adjustFragmentKeys(args) {
 	let { context, block, endBlock } = args;
@@ -12757,15 +12869,15 @@ function adjustFragmentKeys(args) {
 		adjustedBlock: block,
 		adjustedMarkDefs: block.markDefs
 	};
-	let endBlockChildKeys = endBlock.children.map((child) => child._key), endBlockMarkDefsKeys = endBlock.markDefs?.map((markDef) => markDef._key) ?? [], markDefKeyMap = /* @__PURE__ */ new Map(), adjustedMarkDefs = block.markDefs?.map((markDef) => {
-		if (endBlockMarkDefsKeys.includes(markDef._key)) {
-			let newKey = context.keyGenerator();
-			return markDefKeyMap.set(markDef._key, newKey), {
-				...markDef,
-				_key: newKey
-			};
-		}
-		return markDef;
+	let endBlockChildKeys = endBlock.children.map((child) => child._key), endBlockMarkDefsByKey = new Map((endBlock.markDefs ?? []).map((markDef) => [markDef._key, markDef])), markDefKeyMap = /* @__PURE__ */ new Map(), adjustedMarkDefs = block.markDefs?.flatMap((markDef) => {
+		let endBlockMarkDef = endBlockMarkDefsByKey.get(markDef._key);
+		if (!endBlockMarkDef) return [markDef];
+		if (isDeepEqual(markDef, endBlockMarkDef)) return [];
+		let newKey = context.keyGenerator();
+		return markDefKeyMap.set(markDef._key, newKey), [{
+			...markDef,
+			_key: newKey
+		}];
 	}), adjustedChildren = block.children.map((child) => {
 		if (isSpan(context, child)) {
 			let marks = child.marks?.map((mark) => markDefKeyMap.get(mark) ?? mark) ?? [];
@@ -13138,7 +13250,7 @@ const abstractAnnotationBehaviors = [
 			}, previousBlockEndPoint = getBlockEndPoint({
 				context: snapshot.context,
 				block: previousBlock
-			}), { renamedBlock, renameActions } = planMergeKeyRenames({
+			}), { renamedBlock, renameActions } = planMergeKeyRenameActions({
 				context: snapshot.context,
 				mergingBlockPath: focusTextBlock.path,
 				mergingBlock: focusTextBlock.node,
@@ -13236,7 +13348,7 @@ const abstractAnnotationBehaviors = [
 			if (!focusTextBlock) return !1;
 			let nextSibling = getSibling(adjustedSnapshot, focusTextBlock.path, { direction: "next" });
 			if (!nextSibling || !isAtTheEndOfBlock(focusTextBlock)(adjustedSnapshot) || !isTextBlock(snapshot.context, nextSibling.node)) return !1;
-			let { renamedBlock, renameActions } = planMergeKeyRenames({
+			let { renamedBlock, renameActions } = planMergeKeyRenameActions({
 				context: snapshot.context,
 				mergingBlockPath: nextSibling.path,
 				mergingBlock: nextSibling.node,
@@ -13332,65 +13444,37 @@ const abstractAnnotationBehaviors = [
 	})
 ];
 /**
-* A block merge folds `mergingBlock`'s children (and markDefs) into
-* `destinationBlock` by key. Any key the merging block shares with the
-* destination has to be renamed before the merge, or `insert.block`'s own
-* collision handling mints a fresh key for it, which reads on the wire as
-* that node being destroyed and a new one created instead of moved.
-*
-* Renames are raised as `set`/`child.set` events against the still-living
-* `mergingBlock`, so they land on the wire before the merge's `unset`.
-* `renamedBlock` mirrors the same renames applied to the value the caller
-* already captured, since raising the rename events now doesn't change
-* that captured value.
+* Raise the child/markDef renames `planMergeKeyRenames` computed as
+* `set`/`child.set` events against the still-living `mergingBlock`, so
+* they land on the wire before the merge's `unset`.
 */
-function planMergeKeyRenames(args) {
-	let { context, mergingBlockPath, mergingBlock, destinationBlock } = args, destinationChildKeys = new Set(destinationBlock.children.map((child) => child._key)), destinationMarkDefKeys = new Set((destinationBlock.markDefs ?? []).map((markDef) => markDef._key)), markDefKeyMap = /* @__PURE__ */ new Map(), renamedMarkDefs = mergingBlock.markDefs?.map((markDef) => {
-		if (!destinationMarkDefKeys.has(markDef._key)) return markDef;
-		let newKey = context.keyGenerator();
-		return markDefKeyMap.set(markDef._key, newKey), {
-			...markDef,
-			_key: newKey
-		};
+function planMergeKeyRenameActions(args) {
+	let { context, mergingBlockPath, mergingBlock, destinationBlock } = args, { renamedBlock, childRenames, markDefRenames } = planMergeKeyRenames({
+		context,
+		mergingBlock,
+		destinationBlock
 	}), renameActions = [];
-	for (let markDef of mergingBlock.markDefs ?? []) {
-		let newKey = markDefKeyMap.get(markDef._key);
-		newKey && renameActions.push(raise$1({
-			type: "set",
-			at: [
-				...mergingBlockPath,
-				"markDefs",
-				{ _key: markDef._key },
-				"_key"
-			],
-			value: newKey
-		}));
-	}
-	let renamedChildren = mergingBlock.children.map((child) => {
-		let currentMarks = isSpan(context, child) ? child.marks : void 0, remappedMarks = currentMarks?.map((mark) => markDefKeyMap.get(mark) ?? mark), marksChanged = !!(remappedMarks && !isEqualMarks(remappedMarks, currentMarks)), newKey = destinationChildKeys.has(child._key) ? context.keyGenerator() : child._key, props = {};
-		return newKey !== child._key && (props._key = newKey), marksChanged && (props.marks = remappedMarks), Object.keys(props).length > 0 && renameActions.push(raise$1({
-			type: "child.set",
-			at: [
-				...mergingBlockPath,
-				"children",
-				{ _key: child._key }
-			],
-			props
-		})), marksChanged ? {
-			...child,
-			_key: newKey,
-			marks: remappedMarks
-		} : {
-			...child,
-			_key: newKey
-		};
-	});
+	for (let { markDefKey, newKey } of markDefRenames) renameActions.push(raise$1({
+		type: "set",
+		at: [
+			...mergingBlockPath,
+			"markDefs",
+			{ _key: markDefKey },
+			"_key"
+		],
+		value: newKey
+	}));
+	for (let { childKey, props } of childRenames) renameActions.push(raise$1({
+		type: "child.set",
+		at: [
+			...mergingBlockPath,
+			"children",
+			{ _key: childKey }
+		],
+		props
+	}));
 	return {
-		renamedBlock: {
-			...mergingBlock,
-			children: renamedChildren,
-			...mergingBlock.markDefs ? { markDefs: renamedMarkDefs } : {}
-		},
+		renamedBlock,
 		renameActions
 	};
 }
@@ -16299,13 +16383,13 @@ function replaceBlock({ context, editorEngine, block, index }) {
 }
 function updateBlock({ context, editorEngine, oldEngineBlock, block, index: _index }) {
 	let engineBlock = toEngineBlock(block, { schemaTypes: context.schema }), { children: _children, ...blockProps } = engineBlock;
-	setNodeProperties(editorEngine, blockProps, [{ _key: oldEngineBlock._key }]);
+	applyNodeProperties(editorEngine, blockProps, [{ _key: oldEngineBlock._key }]);
 	let oldRecord = oldEngineBlock, newRecord = engineBlock, removedProperties = {};
 	for (let key of Object.keys(oldRecord)) key !== "children" && key !== "text" && (newRecord.hasOwnProperty(key) || (removedProperties[key] = null));
-	if (Object.keys(removedProperties).length > 0 && setNodeProperties(editorEngine, removedProperties, [{ _key: oldEngineBlock._key }]), isTextBlock({ schema: editorEngine.snapshot.context.schema }, engineBlock) && isTextBlock({ schema: editorEngine.snapshot.context.schema }, oldEngineBlock)) {
+	if (Object.keys(removedProperties).length > 0 && applyNodeProperties(editorEngine, removedProperties, [{ _key: oldEngineBlock._key }]), isTextBlock({ schema: editorEngine.snapshot.context.schema }, engineBlock) && isTextBlock({ schema: editorEngine.snapshot.context.schema }, oldEngineBlock)) {
 		let oldKeys = oldEngineBlock.children.map((c) => c._key), newKeys = engineBlock.children.map((c) => c._key), oldKeySet = new Set(oldKeys), hasSharedKeys = newKeys.some((key) => oldKeySet.has(key));
 		if (oldKeys.length === newKeys.length && oldKeys.length > 0 && oldKeySet.size === oldKeys.length && oldKeys.some((key, i) => key !== newKeys[i]) && newKeys.every((key) => oldKeySet.has(key)) || newKeys.length > 0 && !hasSharedKeys) {
-			debug.syncValue("Replacing children via set"), setNodeProperties(editorEngine, { children: engineBlock.children }, [{ _key: oldEngineBlock._key }]), editorEngine.onChange();
+			debug.syncValue("Replacing children via set"), applyNodeProperties(editorEngine, { children: engineBlock.children }, [{ _key: oldEngineBlock._key }]), editorEngine.onChange();
 			return;
 		}
 		let oldBlockChildrenLength = oldEngineBlock.children.length;
@@ -16334,7 +16418,7 @@ function updateBlock({ context, editorEngine, oldEngineBlock, block, index: _ind
 				if (currentBlockChild._key === oldBlockChild?._key && currentBlockChild._type === oldBlockChild?._type) {
 					debug.syncValue("Updating changed child", currentBlockChild, oldBlockChild);
 					let isSpanNode = isSpan({ schema: context.schema }, currentBlockChild) && isSpan({ schema: context.schema }, oldBlockChild), childProps = { ...currentBlockChild };
-					isSpanNode && delete childProps.text, setNodeProperties(editorEngine, childProps, path), isSpanNode && isTextChanged ? (oldBlockChild.text.length > 0 && deleteRange(editorEngine, {
+					isSpanNode && delete childProps.text, applyNodeProperties(editorEngine, childProps, path), isSpanNode && isTextChanged ? (oldBlockChild.text.length > 0 && deleteRange(editorEngine, {
 						focus: {
 							path,
 							offset: 0
@@ -16542,7 +16626,8 @@ function createActors(config) {
 	return config.subscriptions.push(mutationBatcher.subscribe), config.subscriptions.push(() => subscribeToOperations(config.editorEngine, (event) => {
 		isPublicOperation(event.operation) && config.relay.send({
 			type: "operation",
-			operation: event.operation
+			operation: event.operation,
+			origin: event.origin === "remote" ? "remote" : "local"
 		});
 	})), config.subscriptions.push(() => {
 		let subscription = syncActor.on("*", (event) => {