@portabletext/editor 7.10.19 → 7.12.0

package/lib/index.js

@@ -1,10 +1,10 @@
-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-51Kzgaf9.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--2I4NJbG.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-BeXYKpoi.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-DQnr9X2s.js";
-import { A as isSelectingEntireBlocks, B as getFocusTextBlock, C as getActiveAnnotationsMarks, D as getSelectionStartPoint$1, E as getPreviousSpan, F as getSelectionStartBlock, H as getFocusSpan, I as getSelectionEndBlock, K as rangesOverlap, L as getFragment, M as isSelectionExpanded, N as isSelectionCollapsed$1, O as getNextSpan, P as isOverlappingSelection, R as getSelectedValue, S as getSelectedTextBlocks, U as getFocusInlineObject, V as getFocusBlock, W as getFocusChild, a as isActiveDecorator, b as isActiveAnnotation, c as getPreviousBlock, d as getFocusListBlock, f as getFocusBlockObject, i as isActiveListItem, j as getSelectedBlocks, k as getSelectionEndPoint$1, l as getNextBlock, n as isAtTheEndOfBlock, o as getSelectionStartChild, p as getCaretWordSelection, r as isActiveStyle, s as getSelectionEndChild, t as isAtTheStartOfBlock, u as getLastBlock, w as getMarkState, x as getActiveDecorators, y as getActiveAnnotations, z as getRootAcceptedTypes } from "./selector.is-at-the-start-of-block-gJIMWRpU.js";
-import { n as isEmptyTextBlock, r as getTextBlockText, t as isEqualSelections } from "./util.is-equal-selections-BF4WJtz5.js";
-import { a as raise$1, i as forward, n as effect, t as defineBehavior } from "./behavior.types.behavior-B_77VtQR.js";
+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 isSelectingEntireBlocks, B as getFocusTextBlock, C as getActiveAnnotationsMarks, D as getSelectionStartPoint$1, E as getPreviousSpan, F as getSelectionStartBlock, H as getFocusSpan, I as getSelectionEndBlock, K as rangesOverlap, L as getFragment, M as isSelectionExpanded, N as isSelectionCollapsed$1, O as getNextSpan, P as isOverlappingSelection, R as getSelectedValue, S as getSelectedTextBlocks, U as getFocusInlineObject, V as getFocusBlock, W as getFocusChild, a as isActiveDecorator, b as isActiveAnnotation, c as getPreviousBlock, d as getFocusListBlock, f as getFocusBlockObject, i as isActiveListItem, j as getSelectedBlocks, k as getSelectionEndPoint$1, l as getNextBlock, n as isAtTheEndOfBlock, o as getSelectionStartChild, p as getCaretWordSelection, r as isActiveStyle, s as getSelectionEndChild, t as isAtTheStartOfBlock, u as getLastBlock, w as getMarkState, x as getActiveDecorators, y as getActiveAnnotations, z as getRootAcceptedTypes } from "./selector.is-at-the-start-of-block-D0boZbDu.js";
+import { n as isEmptyTextBlock, r as getTextBlockText, t as isEqualSelections } from "./util.is-equal-selections-N1hxVUbE.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";
 import { useActorRef, useSelector } from "@xstate/react";
@@ -1993,7 +1993,7 @@ const DecorateContext = createContext({}), useDecorations = (node, path, parentD
 	$[0] === Symbol.for("react.memo_cache_sentinel") ? (t0 = /* @__PURE__ */ new Set(), $[0] = t0) : t0 = $[0];
 	let eventListeners = useRef(t0), latestDecorate = useRef(decorateProp), t1, t2;
 	$[1] === decorateProp ? (t1 = $[2], t2 = $[3]) : (t1 = () => {
-		latestDecorate.current = decorateProp, eventListeners.current.forEach(_temp$4);
+		latestDecorate.current = decorateProp, eventListeners.current.forEach(_temp$5);
 	}, t2 = [decorateProp], $[1] = decorateProp, $[2] = t1, $[3] = t2), useIsomorphicLayoutEffect(t1, t2);
 	let t3;
 	$[4] === Symbol.for("react.memo_cache_sentinel") ? (t3 = (entry) => latestDecorate.current(entry), $[4] = t3) : t3 = $[4];
@@ -2007,7 +2007,7 @@ const DecorateContext = createContext({}), useDecorations = (node, path, parentD
 		addEventListener
 	}, $[6] = t5) : t5 = $[6], t5;
 };
-function _temp$4(listener) {
+function _temp$5(listener) {
 	listener();
 }
 const rtlRange = "֑-߿יִ-﷽ﹰ-ﻼ", ltrRange = "A-Za-zÀ-ÖØ-öø-ʸ̀-֐ࠀ-῿‎Ⰰ-﬜︀-﹯﻽-￿", rtl = RegExp(`^[^${ltrRange}]*[${rtlRange}]`), ltr = RegExp(`^[^${rtlRange}]*[${ltrRange}]`);
@@ -2554,7 +2554,7 @@ const useChildren = (props) => {
 * selector re-runs on its component's renders and when a renderer
 * registration map is swapped, not on document or selection changes.
 * Only for selectors that read the registration maps
-* (`engine.containers/spans/textBlocks/blockObjects/inlineObjects`)
+* (`engine.containers/spans/textBlocks/blockObjects/inlineObjects/decorators/annotations`)
 * exclusively; those maps are mutated only in
 * `register-node-on-engine.ts`, which arms this channel.
 */
@@ -4057,7 +4057,7 @@ const DropPositionStoreContext = createContext({
 * gaining or losing the indicator. Mirrors `SelectionStateProvider`.
 */
 function DropPositionStateProvider(t0) {
-	let $ = c(6), { children } = t0, editorActor = useContext(EditorActorContext), [initialSubscribers] = useState(_temp$3), subscribersRef = useRef(initialSubscribers), stateRef = useRef(void 0), t1, t2;
+	let $ = c(6), { children } = t0, editorActor = useContext(EditorActorContext), [initialSubscribers] = useState(_temp$4), subscribersRef = useRef(initialSubscribers), stateRef = useRef(void 0), t1, t2;
 	$[0] === editorActor ? (t1 = $[1], t2 = $[2]) : (t1 = () => {
 		let behaviorConfigs = createDropPositionBehaviorsConfig({ setDropPosition: (next) => {
 			let prev = stateRef.current;
@@ -4095,7 +4095,7 @@ function DropPositionStateProvider(t0) {
 * when no drag is hovering this block. Re-renders only when this block's slice
 * flips, not when the position moves between other blocks.
 */
-function _temp$3() {
+function _temp$4() {
 	return /* @__PURE__ */ new Set();
 }
 function useElementDropPosition(path) {
@@ -4526,14 +4526,40 @@ function findBlockPositionalOverride(parentConfig, type) {
 * for a matching `_type`.
 */
 function findInlinePositionalOverride(parentTextBlock, type) {
-	return parentTextBlock?.of ? parentTextBlock.of.find((entry) => "span" in entry ? entry.span.type === type : entry.inlineObject.type === type) || parentTextBlock.of.find((entry) => "span" in entry ? entry.span.type === "*" : entry.inlineObject.type === "*") : void 0;
+	return parentTextBlock?.of ? parentTextBlock.of.find((entry) => isMatchingSpanOrInlineObject(entry, type)) || parentTextBlock.of.find((entry) => isMatchingSpanOrInlineObject(entry, "*")) : void 0;
+}
+function isMatchingSpanOrInlineObject(entry, type) {
+	return "span" in entry ? entry.span.type === type : "inlineObject" in entry && entry.inlineObject.type === type;
+}
+/**
+* Decorator positional override lookup. Walks the immediate parent
+* text block's `of` array (decorator kind) for a matching decorator
+* name: exact first, then a `'*'` entry.
+*/
+function findPositionalDecoratorOverride(parentTextBlock, decorator) {
+	return parentTextBlock?.of ? parentTextBlock.of.find((entry) => isMatchingDecorator(entry, decorator)) || parentTextBlock.of.find((entry) => isMatchingDecorator(entry, "*")) : void 0;
+}
+function isMatchingDecorator(entry, decorator) {
+	return "decorator" in entry && entry.decorator.type === decorator;
+}
+/**
+* Annotation positional override lookup. Walks the immediate parent
+* text block's `of` array (annotation kind) for a matching annotation
+* `_type`: exact first, then a `'*'` entry.
+*/
+function findPositionalAnnotationOverride(parentTextBlock, type) {
+	return parentTextBlock?.of ? parentTextBlock.of.find((entry) => isMatchingAnnotation(entry, type)) || parentTextBlock.of.find((entry) => isMatchingAnnotation(entry, "*")) : void 0;
+}
+function isMatchingAnnotation(entry, type) {
+	return "annotation" in entry && entry.annotation.type === type;
 }
 /**
 * The active text block's resolved config at this render position.
 * Provided by the text-block render branch in `render.element.tsx`;
 * consumed by inline-level dispatch (`useSpanConfig` + the
-* inline-object branch of `render.element.tsx`) for positional
-* override lookup.
+* inline-object branch of `render.element.tsx`) for positional span/
+* inline-object override lookup, and directly by `RenderSpan` for
+* positional decorator/annotation override lookup.
 *
 * Separate from `ParentContainerContext` so inline subscribers only
 * re-render on text-block `of` changes, and block subscribers only
@@ -4574,6 +4600,24 @@ function renderDefaultSpan(props) {
 	});
 }
 /**
+* Engine-default wrapper for Decorator marks: identity. The engine
+* applies no decorator markup of its own; a decorator's whole visual
+* effect comes from its `render`.
+*/
+function renderDefaultDecorator(props) {
+	return props.children;
+}
+/**
+* Engine-default wrapper for Annotation marks: identity. The engine
+* always anchors the annotated text in a `<span ref>` outside this
+* render, kept for structural parity with the legacy `renderAnnotation`
+* path (which hands that anchor to consumers as `editorElementRef`);
+* the render itself owns no markup by default.
+*/
+function renderDefaultAnnotation(props) {
+	return props.children;
+}
+/**
 * Engine-default wrapper for void block objects. Renders the zero-width
 * editor children plus a non-editable `[_type: _key]` placeholder so the
 * object is visible before a consumer provides a custom `render`.
@@ -4816,7 +4860,7 @@ function SelectionStateProvider(t0) {
 			blockIndexMap: editorEngine.blockIndexMap
 		}, selection);
 	}, $[0] = editorEngine.blockIndexMap, $[1] = editorEngine.snapshot, $[2] = t1) : t1 = $[2];
-	let computeCurrent = t1, [seed] = useState(computeCurrent), stateRef = useRef(seed), [initialSubscribers] = useState(_temp$2), subscribersRef = useRef(initialSubscribers), t2, t3;
+	let computeCurrent = t1, [seed] = useState(computeCurrent), stateRef = useRef(seed), [initialSubscribers] = useState(_temp$3), subscribersRef = useRef(initialSubscribers), t2, t3;
 	$[3] !== computeCurrent || $[4] !== editorActor ? (t2 = () => {
 		let next = computeCurrent();
 		if (!selectionStatesEqual(stateRef.current, next)) {
@@ -4850,7 +4894,7 @@ function SelectionStateProvider(t0) {
 * focused. Re-renders only when this boolean flips - not when other
 * containers' focused state changes.
 */
-function _temp$2() {
+function _temp$3() {
 	return /* @__PURE__ */ new Set();
 }
 function useIsFocusedContainer(serializedPath) {
@@ -5626,8 +5670,43 @@ function useSpanConfig(node, _path) {
 	let [globalSpan, globalSpanCatchAll] = useRegistrationsSelector(t1, tupleRefEqual);
 	return positional && "span" in positional ? positional.span.render === void 0 ? globalSpan ?? globalSpanCatchAll : positional : globalSpan ?? globalSpanCatchAll;
 }
+/**
+* Hook: the engine's registered GLOBAL decorator map. Positional
+* (in-parent) decorator overrides are a separate layer: the caller
+* resolves them from `ParentTextBlockContext` via
+* `findPositionalDecoratorOverride` and combines that result with
+* this map's.
+*
+* The per-mark exact-then-`'*'` lookup against this map happens as a
+* plain `Map` read rather than as one hook call per mark: a span
+* carries a variable number of decorator marks, and hooks cannot be
+* called a variable number of times.
+*/
+function useDecoratorConfigs() {
+	return useRegistrationsSelector(_temp$2);
+}
+/**
+* Hook: the engine's registered GLOBAL annotation map. Positional
+* (in-parent) annotation overrides are a separate layer: the caller
+* resolves them from `ParentTextBlockContext` via
+* `findPositionalAnnotationOverride` and combines that result with
+* this map's.
+*
+* Same plain-`Map`-read reasoning as {@link useDecoratorConfigs}: a
+* span's marks resolve to a variable number of annotation `markDef`s
+* per render.
+*/
+function _temp$2(engine) {
+	return engine.decorators;
+}
+function useAnnotationConfigs() {
+	return useRegistrationsSelector(_temp2$1);
+}
+function _temp2$1(engine) {
+	return engine.annotations;
+}
 function RenderSpan(props) {
-	let $ = c(41), schema = props.schema, spanRef = useRef(null), t0;
+	let $ = c(33), schema = props.schema, spanRef = useRef(null), t0;
 	$[0] === Symbol.for("react.memo_cache_sentinel") ? (t0 = [], $[0] = t0) : t0 = $[0];
 	let t1;
 	$[1] === schema.span.name ? t1 = $[2] : (t1 = {
@@ -5636,88 +5715,119 @@ function RenderSpan(props) {
 	}, $[1] = schema.span.name, $[2] = t1);
 	let schemaType = t1, parent = props.children.props.parent, block = parent && isTextBlock({ schema }, parent) ? parent : void 0, t2;
 	$[3] !== block?.children || $[4] !== props.leaf._key ? (t2 = block?.children.find((_child) => _child._key === props.leaf._key), $[3] = block?.children, $[4] = props.leaf._key, $[5] = t2) : t2 = $[5];
-	let child = t2, subSchema = useBlockSubSchema(props.path), spanConfig = useSpanConfig(child ?? props.leaf, props.path), isInNewPipeline = useContext(NewPipelineContext), t3;
+	let child = t2, subSchema = useBlockSubSchema(props.path), spanConfig = useSpanConfig(child ?? props.leaf, props.path), decoratorConfigs = useDecoratorConfigs(), annotationConfigs = useAnnotationConfigs(), parentTextBlock = useContext(ParentTextBlockContext), isInNewPipeline = useContext(NewPipelineContext), t3;
 	$[6] === props.path ? t3 = $[7] : (t3 = serializePath(props.path), $[6] = props.path, $[7] = t3);
-	let serializedPath = t3, focused = useIsFocusedLeaf(serializedPath), selected = useIsSelectedLeaf(serializedPath), annotationMarkDefs, children;
-	if ($[8] !== block || $[9] !== focused || $[10] !== props.children || $[11] !== props.leaf.marks || $[12] !== props.path || $[13] !== props.renderAnnotation || $[14] !== props.renderDecorator || $[15] !== selected || $[16] !== subSchema.annotations || $[17] !== subSchema.decorators) {
-		let decoratorSchemaTypes = subSchema.decorators.map(_temp$1), decorators = [...new Set((props.leaf.marks ?? []).filter((mark) => decoratorSchemaTypes.includes(mark)))];
-		annotationMarkDefs = (props.leaf.marks ?? []).flatMap((mark_0) => {
-			if (decoratorSchemaTypes.includes(mark_0)) return [];
-			let markDef_0 = block?.markDefs?.find((markDef) => markDef._key === mark_0);
-			return markDef_0 ? [markDef_0] : [];
-		}), children = props.children;
-		for (let mark_1 of decorators) {
-			let decoratorSchemaType = subSchema.decorators.find((dec) => dec.name === mark_1);
-			decoratorSchemaType && props.renderDecorator && (children = /* @__PURE__ */ jsx(RenderDecorator, {
-				renderDecorator: props.renderDecorator,
+	let serializedPath = t3, focused = useIsFocusedLeaf(serializedPath), selected = useIsSelectedLeaf(serializedPath), t4 = subSchema.decorators, children, t5;
+	if ($[8] !== annotationConfigs || $[9] !== block || $[10] !== child || $[11] !== decoratorConfigs || $[12] !== focused || $[13] !== isInNewPipeline || $[14] !== parentTextBlock || $[15] !== props.attributes || $[16] !== props.children || $[17] !== props.leaf || $[18] !== props.path || $[19] !== props.readOnly || $[20] !== props.renderAnnotation || $[21] !== props.renderChild || $[22] !== props.renderDecorator || $[23] !== schemaType || $[24] !== selected || $[25] !== spanConfig || $[26] !== subSchema.annotations || $[27] !== subSchema.decorators) {
+		t5 = Symbol.for("react.early_return_sentinel");
+		bb0: {
+			let decoratorSchemaTypes = t4.map(_temp$1), decorators = [...new Set((props.leaf.marks ?? []).filter((mark) => decoratorSchemaTypes.includes(mark)))], annotationMarkDefs = (props.leaf.marks ?? []).flatMap((mark_0) => {
+				if (decoratorSchemaTypes.includes(mark_0)) return [];
+				let markDef_0 = block?.markDefs?.find((markDef) => markDef._key === mark_0);
+				return markDef_0 ? [markDef_0] : [];
+			});
+			children = props.children;
+			for (let mark_1 of decorators) {
+				let decoratorSchemaType = subSchema.decorators.find((dec) => dec.name === mark_1);
+				if (!decoratorSchemaType) continue;
+				let globalDecoratorConfig = decoratorConfigs.get(mark_1) ?? decoratorConfigs.get("*"), positionalDecorator = findPositionalDecoratorOverride(parentTextBlock, mark_1), decoratorConfig = positionalDecorator ? positionalDecorator.decorator.render === void 0 ? globalDecoratorConfig : positionalDecorator : globalDecoratorConfig;
+				if (decoratorConfig) {
+					let render = decoratorConfig.decorator.render, renderProps = {
+						children,
+						decorator: mark_1,
+						focused,
+						path: props.path,
+						readOnly: props.readOnly,
+						renderDefault: renderDefaultDecorator,
+						selected
+					};
+					children = render ? render(renderProps) : renderDefaultDecorator(renderProps);
+					continue;
+				}
+				props.renderDecorator && (children = /* @__PURE__ */ jsx(RenderDecorator, {
+					renderDecorator: props.renderDecorator,
+					editorElementRef: spanRef,
+					focused,
+					path: props.path,
+					selected,
+					schemaType: decoratorSchemaType,
+					value: mark_1,
+					children
+				}));
+			}
+			for (let annotationMarkDef of annotationMarkDefs) {
+				let annotationSchemaType = subSchema.annotations.find((t) => t.name === annotationMarkDef._type);
+				if (annotationSchemaType) {
+					let globalAnnotationConfig = annotationConfigs.get(annotationMarkDef._type) ?? annotationConfigs.get("*"), positionalAnnotation = findPositionalAnnotationOverride(parentTextBlock, annotationMarkDef._type), annotationConfig = positionalAnnotation ? positionalAnnotation.annotation.render === void 0 ? globalAnnotationConfig : positionalAnnotation : globalAnnotationConfig;
+					if (annotationConfig) {
+						let render_0 = annotationConfig.annotation.render, renderProps_0 = {
+							children,
+							focused,
+							annotation: annotationMarkDef,
+							path: props.path,
+							readOnly: props.readOnly,
+							renderDefault: renderDefaultAnnotation,
+							selected
+						};
+						children = /* @__PURE__ */ jsx("span", {
+							ref: spanRef,
+							children: render_0 ? render_0(renderProps_0) : renderDefaultAnnotation(renderProps_0)
+						});
+						continue;
+					}
+					children = block && props.renderAnnotation ? /* @__PURE__ */ jsx("span", {
+						ref: spanRef,
+						children: /* @__PURE__ */ jsx(RenderAnnotation, {
+							renderAnnotation: props.renderAnnotation,
+							block,
+							editorElementRef: spanRef,
+							focused,
+							path: props.path,
+							selected,
+							schemaType: annotationSchemaType,
+							value: annotationMarkDef,
+							children
+						})
+					}) : /* @__PURE__ */ jsx("span", {
+						ref: spanRef,
+						children
+					});
+				}
+			}
+			if (block && props.renderChild && child && !spanConfig && !isInNewPipeline && (children = /* @__PURE__ */ jsx(RenderChild, {
+				renderChild: props.renderChild,
+				annotations: annotationMarkDefs,
 				editorElementRef: spanRef,
 				focused,
 				path: props.path,
+				schemaType,
 				selected,
-				schemaType: decoratorSchemaType,
-				value: mark_1,
+				value: child,
 				children
-			}));
-		}
-		for (let annotationMarkDef of annotationMarkDefs) {
-			let annotationSchemaType = subSchema.annotations.find((t) => t.name === annotationMarkDef._type);
-			annotationSchemaType && (children = block && props.renderAnnotation ? /* @__PURE__ */ jsx("span", {
-				ref: spanRef,
-				children: /* @__PURE__ */ jsx(RenderAnnotation, {
-					renderAnnotation: props.renderAnnotation,
-					block,
-					editorElementRef: spanRef,
+			})), spanConfig) {
+				let render_1 = spanConfig.span.render, renderProps_1 = {
+					attributes: props.attributes,
+					children,
 					focused,
+					node: child ?? props.leaf,
 					path: props.path,
-					selected,
-					schemaType: annotationSchemaType,
-					value: annotationMarkDef,
-					children
-				})
-			}) : /* @__PURE__ */ jsx("span", {
-				ref: spanRef,
-				children
-			}));
+					readOnly: props.readOnly,
+					renderDefault: renderDefaultSpan,
+					selected
+				};
+				t5 = render_1 ? render_1(renderProps_1) : renderDefaultSpan(renderProps_1);
+				break bb0;
+			}
 		}
-		$[8] = block, $[9] = focused, $[10] = props.children, $[11] = props.leaf.marks, $[12] = props.path, $[13] = props.renderAnnotation, $[14] = props.renderDecorator, $[15] = selected, $[16] = subSchema.annotations, $[17] = subSchema.decorators, $[18] = annotationMarkDefs, $[19] = children;
-	} else annotationMarkDefs = $[18], children = $[19];
-	if (block && props.renderChild && child && !spanConfig && !isInNewPipeline) {
-		let t4;
-		$[20] !== annotationMarkDefs || $[21] !== child || $[22] !== children || $[23] !== focused || $[24] !== props.path || $[25] !== props.renderChild || $[26] !== schemaType || $[27] !== selected ? (t4 = /* @__PURE__ */ jsx(RenderChild, {
-			renderChild: props.renderChild,
-			annotations: annotationMarkDefs,
-			editorElementRef: spanRef,
-			focused,
-			path: props.path,
-			schemaType,
-			selected,
-			value: child,
-			children
-		}), $[20] = annotationMarkDefs, $[21] = child, $[22] = children, $[23] = focused, $[24] = props.path, $[25] = props.renderChild, $[26] = schemaType, $[27] = selected, $[28] = t4) : t4 = $[28], children = t4;
-	}
-	if (spanConfig) {
-		let render = spanConfig.span.render, t4 = child ?? props.leaf, t5;
-		if ($[29] !== children || $[30] !== focused || $[31] !== props.attributes || $[32] !== props.path || $[33] !== props.readOnly || $[34] !== render || $[35] !== selected || $[36] !== t4) {
-			let renderProps = {
-				attributes: props.attributes,
-				children,
-				focused,
-				node: t4,
-				path: props.path,
-				readOnly: props.readOnly,
-				renderDefault: renderDefaultSpan,
-				selected
-			};
-			t5 = render ? render(renderProps) : renderDefaultSpan(renderProps), $[29] = children, $[30] = focused, $[31] = props.attributes, $[32] = props.path, $[33] = props.readOnly, $[34] = render, $[35] = selected, $[36] = t4, $[37] = t5;
-		} else t5 = $[37];
-		return t5;
-	}
-	let t4;
-	return $[38] !== children || $[39] !== props.attributes ? (t4 = /* @__PURE__ */ jsx("span", {
+		$[8] = annotationConfigs, $[9] = block, $[10] = child, $[11] = decoratorConfigs, $[12] = focused, $[13] = isInNewPipeline, $[14] = parentTextBlock, $[15] = props.attributes, $[16] = props.children, $[17] = props.leaf, $[18] = props.path, $[19] = props.readOnly, $[20] = props.renderAnnotation, $[21] = props.renderChild, $[22] = props.renderDecorator, $[23] = schemaType, $[24] = selected, $[25] = spanConfig, $[26] = subSchema.annotations, $[27] = subSchema.decorators, $[28] = children, $[29] = t5;
+	} else children = $[28], t5 = $[29];
+	if (t5 !== Symbol.for("react.early_return_sentinel")) return t5;
+	let t6;
+	return $[30] !== children || $[31] !== props.attributes ? (t6 = /* @__PURE__ */ jsx("span", {
 		...props.attributes,
 		ref: spanRef,
 		children
-	}), $[38] = children, $[39] = props.attributes, $[40] = t4) : t4 = $[40], t4;
+	}), $[30] = children, $[31] = props.attributes, $[32] = t6) : t6 = $[32], t6;
 }
 function _temp$1(decorator) {
 	return decorator.name;
@@ -10329,7 +10439,7 @@ function createEditorEngine(config) {
 			value: [placeholderBlock]
 		},
 		decoratorState: {}
-	}, editor.containers = /* @__PURE__ */ new Map(), editor.blockObjects = /* @__PURE__ */ new Map(), editor.inlineObjects = /* @__PURE__ */ new Map(), editor.spans = /* @__PURE__ */ new Map(), editor.textBlocks = /* @__PURE__ */ new Map(), editor.decoratedRanges = [], editor.blockIndexMap = blockIndexMap, editor.history = {
+	}, editor.containers = /* @__PURE__ */ new Map(), editor.annotations = /* @__PURE__ */ new Map(), editor.blockObjects = /* @__PURE__ */ new Map(), editor.decorators = /* @__PURE__ */ new Map(), editor.inlineObjects = /* @__PURE__ */ new Map(), editor.spans = /* @__PURE__ */ new Map(), editor.textBlocks = /* @__PURE__ */ new Map(), editor.decoratedRanges = [], editor.blockIndexMap = blockIndexMap, editor.history = {
 		undos: [],
 		redos: []
 	}, editor.listIndexMap = /* @__PURE__ */ new Map(), editor.listIndexMapDirty = !1, editor.selectorChannelsPending = {
@@ -11185,6 +11295,7 @@ const coreDndBehaviors = [
 			};
 		},
 		actions: [(_, { draggingEntireBlocks, draggedNodes, dragOrigin, dropPosition, originEvent, fittedBlocks, movedInlineObjectKey }) => {
+			if (fittedBlocks.length === 0) return [];
 			let movedInlineObjectPath = movedInlineObjectKey ? [
 				...dropPosition.anchor.path.slice(0, -2),
 				"children",
@@ -15414,7 +15525,7 @@ function describeContainerFailure(failure, container) {
 * (if present) for inline-content positional overrides.
 */
 function resolveTextBlockConfig(textBlock) {
-	let resolvedOf = textBlock.of ? textBlock.of.flatMap((entry) => entry.kind === "span" ? [{ span: entry }] : [{ inlineObject: entry }]) : void 0;
+	let resolvedOf = textBlock.of ? textBlock.of.flatMap((entry) => entry.kind === "span" ? [{ span: entry }] : entry.kind === "inlineObject" ? [{ inlineObject: entry }] : entry.kind === "decorator" ? [{ decorator: entry }] : [{ annotation: entry }]) : void 0;
 	return {
 		textBlock,
 		...resolvedOf ? { of: resolvedOf } : {}
@@ -15506,9 +15617,27 @@ function registerNodeOnEngine(engine, node) {
 		blockObjects.set(node.type, { blockObject: node }), engine.blockObjects = blockObjects, notifyRegistrationsChanged(engine);
 		return;
 	}
-	if (isTypeAlreadyRegistered(engine, "inlineObject", node.type)) return;
-	let inlineObjects = new Map(engine.inlineObjects);
-	inlineObjects.set(node.type, { inlineObject: node }), engine.inlineObjects = inlineObjects, notifyRegistrationsChanged(engine);
+	if (node.kind === "inlineObject") {
+		if (isTypeAlreadyRegistered(engine, "inlineObject", node.type)) return;
+		let inlineObjects = new Map(engine.inlineObjects);
+		inlineObjects.set(node.type, { inlineObject: node }), engine.inlineObjects = inlineObjects, notifyRegistrationsChanged(engine);
+		return;
+	}
+	if (node.kind === "decorator") {
+		if (engine.decorators.has(node.type)) {
+			console.warn(`registerNode: type "${node.type}" is already registered as a decorator. Registration skipped.`);
+			return;
+		}
+		let decorators = new Map(engine.decorators);
+		decorators.set(node.type, { decorator: node }), engine.decorators = decorators, notifyRegistrationsChanged(engine);
+		return;
+	}
+	if (engine.annotations.has(node.type)) {
+		console.warn(`registerNode: type "${node.type}" is already registered as an annotation. Registration skipped.`);
+		return;
+	}
+	let annotations = new Map(engine.annotations);
+	annotations.set(node.type, { annotation: node }), engine.annotations = annotations, notifyRegistrationsChanged(engine);
 }
 /**
 * Mutate the engine's registration maps to remove a registered node.
@@ -15536,8 +15665,18 @@ function unregisterNodeOnEngine(engine, node) {
 		blockObjects.delete(node.type), engine.blockObjects = blockObjects, notifyRegistrationsChanged(engine);
 		return;
 	}
-	let inlineObjects = new Map(engine.inlineObjects);
-	inlineObjects.delete(node.type), engine.inlineObjects = inlineObjects, notifyRegistrationsChanged(engine);
+	if (node.kind === "inlineObject") {
+		let inlineObjects = new Map(engine.inlineObjects);
+		inlineObjects.delete(node.type), engine.inlineObjects = inlineObjects, notifyRegistrationsChanged(engine);
+		return;
+	}
+	if (node.kind === "decorator") {
+		let decorators = new Map(engine.decorators);
+		decorators.delete(node.type), engine.decorators = decorators, notifyRegistrationsChanged(engine);
+		return;
+	}
+	let annotations = new Map(engine.annotations);
+	annotations.delete(node.type), engine.annotations = annotations, notifyRegistrationsChanged(engine);
 }
 /**
 * The registration maps are mutated only in this module, so the React
@@ -17279,7 +17418,7 @@ const usePortableTextEditorSelection = () => {
 	}, t1 = [editorActor], $[0] = editorActor, $[1] = t0, $[2] = t1), useEffect(t0, t1), selection;
 };
 /**
-* @alpha
+* @public
 *
 * Define a container renderer. The returned registration is mounted via
 * the `<NodePlugin>` component at the top level, or nested inside
@@ -17317,7 +17456,7 @@ function defineContainer(config) {
 	};
 }
 /**
-* @alpha
+* @public
 *
 * Define a span renderer. The returned registration is mounted via the
 * `<NodePlugin>` component at the top level, or nested inside a
@@ -17345,7 +17484,61 @@ function defineSpan(config) {
 	};
 }
 /**
-* @alpha
+* @public
+*
+* Define a decorator renderer for a decorator name declared in the
+* schema's `decorators` array, or `'*'` to match every decorator.
+* The returned registration is mounted via the `<NodePlugin>`
+* component.
+*
+* Decorator names live in a different namespace than node
+* `_type`s, so `type` has no forbidden values here (unlike
+* `defineSpan`/`defineTextBlock`).
+*
+* @example
+* ```ts
+* defineDecorator({
+*   type: 'strong',
+*   render: ({children}) => <strong>{children}</strong>,
+* })
+* ```
+*/
+function defineDecorator(config) {
+	return {
+		kind: "decorator",
+		...config
+	};
+}
+/**
+* @public
+*
+* Define an annotation renderer for a `_type` declared in the
+* schema's `annotations` array, or `'*'` to match every annotation
+* type. The returned registration is mounted via the `<NodePlugin>`
+* component.
+*
+* Annotation `_type`s live in a different namespace than node
+* `_type`s, so `type` has no forbidden values here (unlike
+* `defineInlineObject`/`defineBlockObject`).
+*
+* @example
+* ```ts
+* defineAnnotation({
+*   type: 'link',
+*   render: ({annotation, children}) => (
+*     <a href={(annotation as {href?: string}).href}>{children}</a>
+*   ),
+* })
+* ```
+*/
+function defineAnnotation(config) {
+	return {
+		kind: "annotation",
+		...config
+	};
+}
+/**
+* @public
 *
 * Define a non-editable block-level object renderer for a `_type`
 * declared in the schema's `blockObjects` array.
@@ -17375,7 +17568,7 @@ function defineBlockObject(config) {
 	};
 }
 /**
-* @alpha
+* @public
 *
 * Define a non-editable inline object renderer for a `_type` declared
 * in the schema's `inlineObjects` array.
@@ -17405,7 +17598,7 @@ function defineInlineObject(config) {
 	};
 }
 /**
-* @alpha
+* @public
 *
 * Define a text block renderer. The returned registration is mounted
 * via the `<NodePlugin>` component, or nested inside a container's
@@ -17432,6 +17625,6 @@ function defineTextBlock(config) {
 		...config
 	};
 }
-export { EditorProvider, PortableTextEditable, PortableTextEditor, defineBlockObject, defineContainer, defineInlineObject, defineSchema, defineSpan, defineTextBlock, defaultKeyGenerator as keyGenerator, resolveContainerAt, useEditor, useEditorSelector, usePortableTextEditor, usePortableTextEditorSelection };
+export { EditorProvider, PortableTextEditable, PortableTextEditor, defineAnnotation, defineBlockObject, defineContainer, defineDecorator, defineInlineObject, defineSchema, defineSpan, defineTextBlock, defaultKeyGenerator as keyGenerator, resolveContainerAt, useEditor, useEditorSelector, usePortableTextEditor, usePortableTextEditorSelection };
 
 //# sourceMappingURL=index.js.map