@portabletext/editor 8.1.0 → 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";
@@ -7662,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.
 *
@@ -7697,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) {
@@ -7729,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) {
@@ -7959,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;
 	}
 	/**
@@ -7968,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;
 		}
 	}
@@ -7991,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;
 	}
 	/**
@@ -8002,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;
 		}
 	}
@@ -8013,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;
 		}
 	}
@@ -8023,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;
 		}
 	}
@@ -8063,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) {
@@ -11189,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);
@@ -11207,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++;
 		}
@@ -11245,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, () => {
@@ -11270,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();
@@ -11333,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") {
@@ -11344,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);
@@ -11353,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
@@ -11385,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);
@@ -11408,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
@@ -11429,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)}`);
@@ -11458,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 {
@@ -11477,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) {
@@ -11506,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);
@@ -11522,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) {
@@ -11637,21 +11638,31 @@ function fieldAcceptsTextBlock(editor, node, _path) {
 * `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. There
-* is no such backstop for markDefs: an unrenamed collision either loses
-* one of the two defs to last-wins replacement, or, on the `insert.block`
-* path, gets silently re-minted by `adjustFragmentKeys` (see
-* `dedupeEqualMarkDefs` below).
+* 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, dedupeEqualMarkDefs } = args, destinationChildKeys = new Set(destinationBlock.children.map((child) => child._key)), destinationMarkDefsByKey = new Map((destinationBlock.markDefs ?? []).map((markDef) => [markDef._key, markDef])), markDefKeyMap = /* @__PURE__ */ new Map(), renamedMarkDefs = mergingBlock.markDefs?.flatMap((markDef) => {
+	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 (dedupeEqualMarkDefs && isDeepEqual(markDef, destinationMarkDef)) return [];
+		if (isDeepEqual(markDef, destinationMarkDef)) return dedupedMarkDefKeys.push(markDef._key), [markDef];
 		let newKey = context.keyGenerator();
 		return markDefKeyMap.set(markDef._key, newKey), [{
 			...markDef,
@@ -11686,7 +11697,8 @@ function planMergeKeyRenames(args) {
 			...mergingBlock.markDefs ? { markDefs: renamedMarkDefs } : {}
 		},
 		childRenames,
-		markDefRenames
+		markDefRenames,
+		dedupedMarkDefKeys
 	};
 }
 /**
@@ -12022,11 +12034,10 @@ function mergeBlock(editor, startBlockPath, endBlockPath, removeEmptyStartBlock)
 		removeNodeAt(editor, startBlockPath);
 		return;
 	}
-	let { renamedBlock, childRenames, markDefRenames } = planMergeKeyRenames({
+	let { renamedBlock, childRenames, markDefRenames, dedupedMarkDefKeys } = planMergeKeyRenames({
 		context: editor.snapshot.context,
 		mergingBlock: endBlock.node,
-		destinationBlock: startBlock.node,
-		dedupeEqualMarkDefs: !0
+		destinationBlock: startBlock.node
 	});
 	for (let { markDefKey, newKey } of markDefRenames) editor.apply({
 		type: "set",
@@ -12038,13 +12049,13 @@ function mergeBlock(editor, startBlockPath, endBlockPath, removeEmptyStartBlock)
 		],
 		value: newKey
 	});
-	for (let { childKey, props } of childRenames) setNodeProperties(editor, props, [
+	for (let { childKey, props } of childRenames) applyNodeProperties(editor, props, [
 		...endBlockPath,
 		"children",
 		{ _key: childKey }
 	]);
-	let endMarkDefs = renamedBlock.markDefs;
-	Array.isArray(endMarkDefs) && endMarkDefs.length > 0 && setNodeProperties(editor, { markDefs: [...startBlock.node.markDefs ?? [], ...endMarkDefs] }, startBlockPath), applyMergeNode(editor, endBlockPath, startBlock.node.children.length);
+	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({
@@ -12733,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);
@@ -12841,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;
@@ -12854,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) ?? [];
@@ -13437,8 +13452,7 @@ function planMergeKeyRenameActions(args) {
 	let { context, mergingBlockPath, mergingBlock, destinationBlock } = args, { renamedBlock, childRenames, markDefRenames } = planMergeKeyRenames({
 		context,
 		mergingBlock,
-		destinationBlock,
-		dedupeEqualMarkDefs: !1
+		destinationBlock
 	}), renameActions = [];
 	for (let { markDefKey, newKey } of markDefRenames) renameActions.push(raise$1({
 		type: "set",
@@ -16369,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;
@@ -16404,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