@portabletext/editor 7.0.5 → 7.1.0

package/lib/index.js

@@ -2,15 +2,15 @@ import { jsx, jsxs, Fragment } from "react/jsx-runtime";
 import { c } from "react/compiler-runtime";
 import { useSelector, useActorRef } from "@xstate/react";
 import React, { createContext, useContext, useRef, useEffect, useLayoutEffect, useState, useReducer, useCallback, memo, forwardRef, useMemo, Component, useSyncExternalStore, startTransition } from "react";
-import { isKeyedSegment, getAncestor, isObjectNode, getNode, getChildren, getAncestors, getNodeChildren } from "./_chunks-es/get-node.js";
-import { isTextBlockNode, hasNode, getNodes, isAncestorPath, getSibling, isInline, parentPath, isSpanNode, isBlock, getEnclosingBlock, getPathSubSchema, getBlock, resolveContainerAt, getParent, getEnclosingContainer } from "./_chunks-es/get-path-sub-schema.js";
-import { getLeaf, getSpanNode, getText, getTextBlockNode, getUnionSchema, isLeaf, getFirstChild } from "./_chunks-es/get-first-child.js";
-import { rangeEdges, isEditableContainer, isBackwardRange, comparePoints, rangesOverlap, isAfterPoint, comparePaths, isSelectionCollapsed as isSelectionCollapsed$1, getFocusInlineObject, getFocusTextBlock, getFocusSpan, getFragment, isSelectionExpanded, getSelectionStartBlock, getSelectionEndBlock, isOverlappingSelection, getFocusBlock, getSelectedBlocks, isSelectingEntireBlocks, getSelectedValue, isActiveAnnotation, getActiveAnnotationsMarks, getActiveDecorators, getCaretWordSelection, getSelectionStartChild, getSelectionEndChild, getPreviousSpan, getNextSpan, getSelectionStartPoint, getSelectionEndPoint, getFocusBlockObject, getLastBlock, getFirstBlock, isAtTheEndOfBlock, isAtTheStartOfBlock, getMarkState, getFocusListBlock, getNextBlock, getPreviousBlock, getSelectedTextBlocks, getRootAcceptedTypes, isActiveDecorator, getFocusChild, getActiveAnnotations, isActiveListItem, isActiveStyle } from "./_chunks-es/selector.is-at-the-start-of-block.js";
+import { isKeyedSegment, getNode, getParent, parentPath, getChildren, getNodeChildren } from "./_chunks-es/get-parent.js";
+import { getLeaf, isLeafObject, getAncestor, getSpan, getText, getTextBlock, getUnionSchema, getFirstChild } from "./_chunks-es/get-first-child.js";
+import { isTextBlockNode, hasNode, getNodes, isAncestorPath, isEditableContainer, getSibling, isInline, isObject as isObject$1, isSpanNode, isBlock, getEnclosingBlock, getAncestors, getPathSubSchema, getBlock, resolveContainerAt, getEnclosingContainer } from "./_chunks-es/get-path-sub-schema.js";
+import { rangeEdges, isBackwardRange, comparePoints, rangesOverlap, isAfterPoint, comparePaths, isSelectionCollapsed as isSelectionCollapsed$1, getFocusInlineObject, getFocusTextBlock, getFocusSpan, getFragment, isSelectionExpanded, getSelectionStartBlock, getSelectionEndBlock, isOverlappingSelection, getFocusBlock, getSelectedBlocks, isSelectingEntireBlocks, getSelectedValue, isActiveAnnotation, getActiveAnnotationsMarks, getActiveDecorators, getCaretWordSelection, getSelectionStartChild, getSelectionEndChild, getPreviousSpan, getNextSpan, getSelectionStartPoint, getSelectionEndPoint, getFocusBlockObject, getLastBlock, getFirstBlock, isAtTheEndOfBlock, isAtTheStartOfBlock, getMarkState, getFocusListBlock, getNextBlock, getPreviousBlock, getSelectedTextBlocks, getRootAcceptedTypes, isActiveDecorator, getFocusChild, getActiveAnnotations, isActiveListItem, isActiveStyle } from "./_chunks-es/selector.is-at-the-start-of-block.js";
 import { isSpan, isTextBlock, compileSchema } from "@portabletext/schema";
 import { defineSchema } from "@portabletext/schema";
 import scrollIntoView from "scroll-into-view-if-needed";
-import { getAncestorTextBlock, isEqualSelectionPoints, blockOffsetToSpanSelectionPoint, getBlockKeyFromSelectionPoint, getBlockEndPoint, getBlockStartPoint, isSelectionCollapsed, defaultKeyGenerator, parseBlocks, parseBlock, isListBlock, getSelectionStartPoint as getSelectionStartPoint$1, getSelectionEndPoint as getSelectionEndPoint$1, parseAnnotation, parseMarkDefs, parseSpan, parseInlineObject, isEqualPathSegments } from "./_chunks-es/util.slice-blocks.js";
 import { createKeyboardShortcut, undo, redo, code, underline, italic as italic$1, bold as bold$1 } from "@portabletext/keyboard-shortcuts";
+import { isEqualSelectionPoints, blockOffsetToSpanSelectionPoint, getBlockKeyFromSelectionPoint, getBlockEndPoint, getBlockStartPoint, isSelectionCollapsed, defaultKeyGenerator, parseBlocks, parseBlock, isListBlock, getSelectionStartPoint as getSelectionStartPoint$1, getSelectionEndPoint as getSelectionEndPoint$1, parseAnnotation, parseMarkDefs, parseSpan, parseInlineObject, isEqualPathSegments } from "./_chunks-es/util.slice-blocks.js";
 import rawDebug from "debug";
 import { isEmptyTextBlock, getTextBlockText } from "./_chunks-es/util.is-empty-text-block.js";
 import { setup, fromCallback, assign, and, assertEvent, enqueueActions, emit, not, raise as raise$1, createActor } from "xstate";
@@ -197,18 +197,6 @@ function safeParse(text) {
     return console.error(error), "JSON.parse failed";
   }
 }
-function getAncestorObjectNode(snapshot, path2) {
-  const result = getAncestor(snapshot, path2, (node) => isObjectNode({
-    schema: snapshot.context.schema
-  }, node));
-  if (result && isObjectNode({
-    schema: snapshot.context.schema
-  }, result.node))
-    return {
-      node: result.node,
-      path: result.path
-    };
-}
 function commonPath(path2, another) {
   const common = [];
   for (let i = 0; i < path2.length && i < another.length; i++) {
@@ -314,11 +302,6 @@ function start(editor, at) {
     edge: "start"
   });
 }
-function isVoidNode(snapshot, node, path2) {
-  return isObjectNode({
-    schema: snapshot.context.schema
-  }, node) && !isEditableContainer(snapshot, node, path2);
-}
 function pathEquals(path2, another) {
   if (path2.length !== another.length)
     return !1;
@@ -429,7 +412,7 @@ typeof globalThis < "u" && globalThis.InputEvent && typeof globalThis.InputEvent
     if (!el)
       throw new Error(`Cannot find a DOM node for editor path: ${point2.path}`);
     let domPoint;
-    if (nodeEntry && isVoidNode(editor, nodeEntry.node, point2.path)) {
+    if (nodeEntry && isLeafObject(editor, nodeEntry.node, point2.path)) {
       const spacer = el.querySelector("[data-pt-zero-width]");
       if (spacer) {
         const domText = spacer.childNodes[0];
@@ -444,8 +427,10 @@ typeof globalThis < "u" && globalThis.InputEvent && typeof globalThis.InputEvent
       }
       return [el, 0];
     }
-    const pointPath = path(editor, point2), pointEntry = getNode(editor, pointPath), pointObjectNode = pointEntry && isVoidNode(editor, pointEntry.node, pointPath) ? pointEntry : getAncestorObjectNode(editor, point2.path);
-    pointObjectNode && isVoidNode(editor, pointObjectNode.node, pointObjectNode.path) && (point2 = {
+    const pointPath = path(editor, point2), pointEntry = getNode(editor, pointPath), pointObjectNode = pointEntry && isLeafObject(editor, pointEntry.node, pointPath) ? pointEntry : getAncestor(editor, point2.path, {
+      match: (node, ancestorPath) => isLeafObject(editor, node, ancestorPath)
+    });
+    pointObjectNode && isLeafObject(editor, pointObjectNode.node, pointObjectNode.path) && (point2 = {
       path: point2.path,
       offset: 0
     });
@@ -599,7 +584,7 @@ typeof globalThis < "u" && globalThis.InputEvent && typeof globalThis.InputEvent
     }
     if (path2.length > 1) {
       const parentPath2 = path2.slice(0, -1), parentEntry = getNode(editor, parentPath2);
-      if (parentEntry && isVoidNode(editor, parentEntry.node, parentPath2))
+      if (parentEntry && isLeafObject(editor, parentEntry.node, parentPath2))
         return {
           path: parentPath2,
           offset: 0
@@ -659,9 +644,6 @@ typeof globalThis < "u" && globalThis.InputEvent && typeof globalThis.InputEvent
     } : null;
   }
 };
-function getVoidAncestor(snapshot, path2) {
-  return getAncestor(snapshot, path2, (node, ancestorPath) => isVoidNode(snapshot, node, ancestorPath));
-}
 function collapse(editor, options = {}) {
   const {
     edge = "anchor"
@@ -848,7 +830,7 @@ function* positions(editor, options = {}) {
       }
       isNewBlock = !0;
     }
-    if (isVoidNode(editor, node, nodePath)) {
+    if (isLeafObject(editor, node, nodePath)) {
       yield {
         path: nodePath,
         offset: 0
@@ -1424,16 +1406,18 @@ function verifyDiffState(editor, textDiff) {
   } = textDiff;
   if (!hasNode(editor, path2))
     return !1;
-  const nodeEntry = getSpanNode(editor, path2);
+  const nodeEntry = getSpan(editor, path2);
   if (!nodeEntry)
     return !1;
   const node = nodeEntry.node;
   if (diff2.start !== node.text.length || diff2.text.length === 0)
     return node.text.slice(diff2.start, diff2.start + diff2.text.length) === diff2.text;
-  const nextSibling = getSibling(editor, path2, "next");
+  const nextSibling = getSibling(editor, path2, {
+    direction: "next"
+  });
   if (!nextSibling)
     return !1;
-  const nextNodeEntry = getSpanNode(editor, nextSibling.path);
+  const nextNodeEntry = getSpan(editor, nextSibling.path);
   return !!nextNodeEntry && nextNodeEntry.node.text.startsWith(diff2.text);
 }
 function applyStringDiff(text, ...diffs) {
@@ -1496,11 +1480,15 @@ function normalizePoint(editor, point2) {
   } = point2;
   if (!hasNode(editor, path2))
     return null;
-  const leafEntry = getSpanNode(editor, path2);
+  const leafEntry = getSpan(editor, path2);
   if (!leafEntry)
     return null;
   let leaf = leafEntry.node;
-  const parentBlock = getAncestorTextBlock(editor, path2);
+  const parentBlock = getParent(editor, path2, {
+    match: (node) => isTextBlock({
+      schema: editor.schema
+    }, node)
+  });
   if (!parentBlock)
     return null;
   for (; offset > leaf.text.length; ) {
@@ -1707,7 +1695,7 @@ function createAndroidInputManager({
   }, handleCompositionStart = (_event) => {
     editor.composing = !0, compositionEndTimeoutId && (clearTimeout(compositionEndTimeoutId), compositionEndTimeoutId = null);
   }, storeDiff = (path2, diff2) => {
-    const pendingDiffs = editor.pendingDiffs, targetEntry = getSpanNode(editor, path2);
+    const pendingDiffs = editor.pendingDiffs, targetEntry = getSpan(editor, path2);
     if (!targetEntry)
       return;
     const target = targetEntry.node, idx = pendingDiffs.findIndex((change) => pathEquals(change.path, path2));
@@ -1761,7 +1749,7 @@ function createAndroidInputManager({
       let [start2, end2] = rangeEdges(targetRange2, editor);
       const leafNodeEntry = getNode(editor, start2.path), leafResult = leafNodeEntry && (isSpan({
         schema: editor.schema
-      }, leafNodeEntry.node) || isVoidNode(editor, leafNodeEntry.node, start2.path)) ? leafNodeEntry : void 0;
+      }, leafNodeEntry.node) || isLeafObject(editor, leafNodeEntry.node, start2.path)) ? leafNodeEntry : void 0;
       if (!leafResult)
         return scheduleAction(() => editorActor.send({
           type: "behavior event",
@@ -1857,7 +1845,7 @@ function createAndroidInputManager({
           anchor
         } = targetRange2;
         if (canStoreDiff && isCollapsedRange(targetRange2)) {
-          const targetNodeEntry = getSpanNode(editor, anchor.path);
+          const targetNodeEntry = getSpan(editor, anchor.path);
           if (targetNodeEntry && anchor.offset < targetNodeEntry.node.text.length)
             return storeDiff(anchor.path, {
               text: "",
@@ -2842,9 +2830,7 @@ const useChildren = (props) => {
     schema: editor.schema
   }, node))
     children = node.children;
-  else if (isObjectNode({
-    schema: editor.schema
-  }, node)) {
+  else if (isObject$1(editor, node)) {
     const containerConfig = resolveContainerForNode(editor, parentContainer, node);
     if (containerConfig) {
       const fieldValue = node[containerConfig.field.name];
@@ -2889,9 +2875,7 @@ const useChildren = (props) => {
       }
       return !1;
     }
-    if (isObjectNode({
-      schema: editor.schema
-    }, n)) {
+    if (isObject$1(editor, n)) {
       if (textBlockParent !== void 0)
         return !1;
       if (editor.blockObjects.has(n._type))
@@ -2915,9 +2899,7 @@ const useChildren = (props) => {
       schema: editor.schema
     }, n))
       return null;
-    if (isObjectNode({
-      schema: editor.schema
-    }, n))
+    if (isObject$1(editor, n))
       return resolveContainerForNode(editor, childContainer, n) ? wrapNewPipeline(renderElementComponent(n, i, !0), !0, n._key) : wrapNewPipeline(renderObjectNodeComponent(n, i), isInNewPipelineForChild(n), n._key);
     if (isSpan({
       schema: editor.schema
@@ -3298,7 +3280,11 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
           lastText === node && lastText.textContent?.length === offset && (native = !1);
         }
         if (native && node.parentElement && window2?.getComputedStyle(node.parentElement)?.whiteSpace === "pre") {
-          const block = getAncestorTextBlock(editor, anchor.path);
+          const block = getParent(editor, anchor.path, {
+            match: (node2) => isTextBlock({
+              schema: editor.schema
+            }, node2)
+          });
           block && getText(editor, block.path)?.includes("	") && (native = !1);
         }
       }
@@ -3589,7 +3575,7 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
               const relatedNodeEntry = getNode(editor, relatedPath), relatedNode = relatedNodeEntry ? relatedNodeEntry.node : void 0;
               if (relatedNode && (isTextBlockNode({
                 schema: editor.schema
-              }, relatedNode) || isVoidNode(editor, relatedNode, relatedPath)))
+              }, relatedNode) || isLeafObject(editor, relatedNode, relatedPath)))
                 return;
             }
           }
@@ -3609,14 +3595,22 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
             let blockPath = path2;
             isTextBlockNode({
               schema: editor.schema
-            }, node) || (blockPath = getAncestorTextBlock(editor, path2)?.path ?? path2.slice(0, 1));
+            }, node) || (blockPath = getParent(editor, path2, {
+              match: (node2) => isTextBlock({
+                schema: editor.schema
+              }, node2)
+            })?.path ?? path2.slice(0, 1));
             const range$1 = range(editor, blockPath);
             editor.select(range$1);
             return;
           }
           if (readOnly)
             return;
-          const start$1 = start(editor, path2), end$1 = end(editor, path2), startEntry = getNode(editor, start$1.path), startVoidNode = startEntry && isVoidNode(editor, startEntry.node, start$1.path) ? startEntry : getVoidAncestor(editor, start$1.path), endEntry = getNode(editor, end$1.path), endVoidNode = endEntry && isVoidNode(editor, endEntry.node, end$1.path) ? endEntry : getVoidAncestor(editor, end$1.path);
+          const start$1 = start(editor, path2), end$1 = end(editor, path2), startEntry = getNode(editor, start$1.path), startVoidNode = startEntry && isLeafObject(editor, startEntry.node, start$1.path) ? startEntry : getAncestor(editor, start$1.path, {
+            match: (node2, ancestorPath) => isLeafObject(editor, node2, ancestorPath)
+          }), endEntry = getNode(editor, end$1.path), endVoidNode = endEntry && isLeafObject(editor, endEntry.node, end$1.path) ? endEntry : getAncestor(editor, end$1.path, {
+            match: (node2, ancestorPath) => isLeafObject(editor, node2, ancestorPath)
+          });
           if (startVoidNode && endVoidNode && pathEquals(startVoidNode.path, endVoidNode.path)) {
             const range$1 = range(editor, start$1);
             editor.select(range$1);
@@ -3758,7 +3752,7 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
           if (HAS_BEFORE_INPUT_SUPPORT) {
             if ((IS_CHROME || IS_WEBKIT) && selection && (Hotkeys.isDeleteBackward(nativeEvent) || Hotkeys.isDeleteForward(nativeEvent)) && isCollapsedRange(selection)) {
               const currentNodeEntry = getNode(editor, selection.anchor.path);
-              if (currentNodeEntry && isVoidNode(editor, currentNodeEntry.node, selection.anchor.path)) {
+              if (currentNodeEntry && isLeafObject(editor, currentNodeEntry.node, selection.anchor.path)) {
                 event.preventDefault(), editorActor.send({
                   type: "behavior event",
                   behaviorEvent: {
@@ -4785,32 +4779,6 @@ function DropIndicator() {
     zIndex: 5
   }, children: /* @__PURE__ */ jsx("span", {}) }), $[0] = t0) : t0 = $[0], t0;
 }
-function defaultCompare(a, b) {
-  return a === b;
-}
-function useEditorSelector(editor, selector, t0) {
-  return useSelector(editor, selector, t0 === void 0 ? defaultCompare : t0);
-}
-function getEditorSnapshot({
-  editorActorSnapshot,
-  editorEngineInstance
-}) {
-  return {
-    blockIndexMap: editorEngineInstance.blockIndexMap,
-    context: {
-      containers: editorEngineInstance.publicContainers,
-      converters: editorActorSnapshot.context.converters,
-      keyGenerator: editorActorSnapshot.context.keyGenerator,
-      readOnly: editorActorSnapshot.matches({
-        "edit mode": "read only"
-      }),
-      schema: editorActorSnapshot.context.schema,
-      selection: editorEngineInstance.selection,
-      value: editorEngineInstance.children
-    },
-    decoratorState: editorEngineInstance.decoratorState
-  };
-}
 const emptySet$1 = /* @__PURE__ */ new Set(), emptyState = {
   focusedLeafPath: void 0,
   selectedLeafPaths: emptySet$1,
@@ -4885,15 +4853,12 @@ const defaultStore = {
   getSnapshot: () => defaultSelectionState
 }, SelectionStateStoreContext = createContext(defaultStore);
 function SelectionStateProvider(t0) {
-  const $ = c(10), {
+  const $ = c(11), {
     children
   } = t0, editorActor = useContext(EditorActorContext), editorEngine = useEngineStatic();
   let t1;
-  $[0] !== editorActor || $[1] !== editorEngine ? (t1 = () => {
-    const actorSnapshot = editorActor.getSnapshot(), snapshot = getEditorSnapshot({
-      editorActorSnapshot: actorSnapshot,
-      editorEngineInstance: editorEngine
-    }), selection = snapshot.context.selection ? {
+  $[0] !== editorEngine.blockIndexMap || $[1] !== editorEngine.publicContainers || $[2] !== editorEngine.snapshot ? (t1 = () => {
+    const snapshot = editorEngine.snapshot, selection = snapshot.context.selection ? {
       anchorPath: snapshot.context.selection.anchor.path,
       focusPath: snapshot.context.selection.focus.path,
       backward: snapshot.context.selection.backward ?? !1,
@@ -4907,10 +4872,10 @@ function SelectionStateProvider(t0) {
       },
       blockIndexMap: editorEngine.blockIndexMap
     }, selection);
-  }, $[0] = editorActor, $[1] = editorEngine, $[2] = t1) : t1 = $[2];
+  }, $[0] = editorEngine.blockIndexMap, $[1] = editorEngine.publicContainers, $[2] = editorEngine.snapshot, $[3] = t1) : t1 = $[3];
   const computeCurrent = t1, [seed] = useState(computeCurrent), stateRef = useRef(seed), [initialSubscribers] = useState(_temp$2), subscribersRef = useRef(initialSubscribers);
   let t2, t3;
-  $[3] !== computeCurrent || $[4] !== editorActor ? (t2 = () => {
+  $[4] !== computeCurrent || $[5] !== editorActor ? (t2 = () => {
     const next = computeCurrent();
     if (!selectionStatesEqual(stateRef.current, next)) {
       stateRef.current = next;
@@ -4930,17 +4895,17 @@ function SelectionStateProvider(t0) {
       }));
     });
     return () => subscription.unsubscribe();
-  }, t3 = [editorActor, computeCurrent], $[3] = computeCurrent, $[4] = editorActor, $[5] = t2, $[6] = t3) : (t2 = $[5], t3 = $[6]), useEffect(t2, t3);
+  }, t3 = [editorActor, computeCurrent], $[4] = computeCurrent, $[5] = editorActor, $[6] = t2, $[7] = t3) : (t2 = $[6], t3 = $[7]), useEffect(t2, t3);
   let t4;
-  $[7] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (t4 = {
+  $[8] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (t4 = {
     subscribe: (callback) => (subscribersRef.current.add(callback), () => {
       subscribersRef.current.delete(callback);
     }),
     getSnapshot: () => stateRef.current
-  }, $[7] = t4) : t4 = $[7];
+  }, $[8] = t4) : t4 = $[8];
   const store = t4;
   let t5;
-  return $[8] !== children ? (t5 = /* @__PURE__ */ jsx(SelectionStateStoreContext.Provider, { value: store, children }), $[8] = children, $[9] = t5) : t5 = $[9], t5;
+  return $[9] !== children ? (t5 = /* @__PURE__ */ jsx(SelectionStateStoreContext.Provider, { value: store, children }), $[9] = children, $[10] = t5) : t5 = $[10], t5;
 }
 function _temp$2() {
   return /* @__PURE__ */ new Set();
@@ -5355,7 +5320,7 @@ function resolveElementDropPosition(dropPosition, elementPath) {
     return dropPosition.position;
 }
 function tupleRefEqual(previous, next) {
-  if (previous.length !== next.length)
+  if (previous === null || previous.length !== next.length)
     return !1;
   for (let i = 0; i < previous.length; i++)
     if (!Object.is(previous[i], next[i]))
@@ -5363,7 +5328,7 @@ function tupleRefEqual(previous, next) {
   return !0;
 }
 function RenderElement(props) {
-  const $ = c(84), editorActor = useContext(EditorActorContext), parentContainer = useContext(ParentContainerContext), parentTextBlock = useContext(ParentTextBlockContext), isInNewPipeline = useContext(NewPipelineContext), engineStatic = useEngineStatic(), schema = props.schema, type = props.element._type;
+  const $ = c(84), parentContainer = useContext(ParentContainerContext), parentTextBlock = useContext(ParentTextBlockContext), isInNewPipeline = useContext(NewPipelineContext), engineStatic = useEngineStatic(), schema = props.schema, type = props.element._type;
   let t0;
   $[0] !== parentContainer || $[1] !== type ? (t0 = findBlockPositionalOverride(parentContainer, type), $[0] = parentContainer, $[1] = type, $[2] = t0) : t0 = $[2];
   const blockPositionalOverride = t0;
@@ -5371,8 +5336,8 @@ function RenderElement(props) {
   $[3] !== parentTextBlock || $[4] !== type ? (t1 = findInlinePositionalOverride(parentTextBlock, type), $[3] = parentTextBlock, $[4] = type, $[5] = t1) : t1 = $[5];
   const inlinePositionalOverride = t1;
   let t2;
-  $[6] !== type ? (t2 = (state) => [state.context.containers.get(type), state.context.blockObjects.get(type), state.context.inlineObjects.get(type), state.context.textBlocks.get(type)], $[6] = type, $[7] = t2) : t2 = $[7];
-  const [globalContainerConfig, globalBlockObjectConfig, globalInlineObjectConfig, textBlockConfig] = useSelector(editorActor, t2, tupleRefEqual);
+  $[6] !== type ? (t2 = (engine) => [engine.containers.get(type), engine.blockObjects.get(type), engine.inlineObjects.get(type), engine.textBlocks.get(type)], $[6] = type, $[7] = t2) : t2 = $[7];
+  const [globalContainerConfig, globalBlockObjectConfig, globalInlineObjectConfig, textBlockConfig] = useEngineSelector(t2, tupleRefEqual);
   let t3;
   bb0: {
     if (blockPositionalOverride && "container" in blockPositionalOverride) {
@@ -5564,13 +5529,13 @@ function RenderTextBlockConfig(props) {
   }), $[2] = focused, $[3] = props.attributes, $[4] = props.children, $[5] = props.node, $[6] = props.path, $[7] = props.readOnly, $[8] = props.render, $[9] = selected, $[10] = t1) : t1 = $[10], t1;
 }
 function useSpanConfig(node, _path) {
-  const $ = c(5), editorActor = useContext(EditorActorContext), parentTextBlock = useContext(ParentTextBlockContext);
+  const $ = c(5), parentTextBlock = useContext(ParentTextBlockContext);
   let t0;
   $[0] !== node._type || $[1] !== parentTextBlock ? (t0 = findInlinePositionalOverride(parentTextBlock, node._type), $[0] = node._type, $[1] = parentTextBlock, $[2] = t0) : t0 = $[2];
   const positional = t0;
   let t1;
-  $[3] !== node._type ? (t1 = (state) => state.context.spans.get(node._type), $[3] = node._type, $[4] = t1) : t1 = $[4];
-  const globalSpan = useSelector(editorActor, t1);
+  $[3] !== node._type ? (t1 = (engine) => engine.spans.get(node._type), $[3] = node._type, $[4] = t1) : t1 = $[4];
+  const globalSpan = useEngineSelector(t1);
   return positional && "span" in positional ? positional.span.render === void 0 ? globalSpan : positional : globalSpan;
 }
 function RenderSpan(props) {
@@ -6025,7 +5990,7 @@ function validateSelection(editorEngine, editorElement) {
   }
 }
 const PortableTextEditable = forwardRef(function(props, forwardedRef) {
-  const $ = c(183);
+  const $ = c(180);
   let hotkeys, onBeforeInput, onBlur, onClick, onCopy, onCut, onDrag, onDragEnd, onDragEnter, onDragLeave, onDragOver, onDragStart, onDrop, onFocus, onPaste, propsSelection, rangeDecorations, renderAnnotation, renderBlock, renderChild, renderDecorator, renderListItem, renderPlaceholder, renderStyle, restProps, scrollSelectionIntoView;
   $[0] !== props ? ({
     hotkeys,
@@ -6055,65 +6020,62 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
     scrollSelectionIntoView,
     ...restProps
   } = props, $[0] = props, $[1] = hotkeys, $[2] = onBeforeInput, $[3] = onBlur, $[4] = onClick, $[5] = onCopy, $[6] = onCut, $[7] = onDrag, $[8] = onDragEnd, $[9] = onDragEnter, $[10] = onDragLeave, $[11] = onDragOver, $[12] = onDragStart, $[13] = onDrop, $[14] = onFocus, $[15] = onPaste, $[16] = propsSelection, $[17] = rangeDecorations, $[18] = renderAnnotation, $[19] = renderBlock, $[20] = renderChild, $[21] = renderDecorator, $[22] = renderListItem, $[23] = renderPlaceholder, $[24] = renderStyle, $[25] = restProps, $[26] = scrollSelectionIntoView) : (hotkeys = $[1], onBeforeInput = $[2], onBlur = $[3], onClick = $[4], onCopy = $[5], onCut = $[6], onDrag = $[7], onDragEnd = $[8], onDragEnter = $[9], onDragLeave = $[10], onDragOver = $[11], onDragStart = $[12], onDrop = $[13], onFocus = $[14], onPaste = $[15], propsSelection = $[16], rangeDecorations = $[17], renderAnnotation = $[18], renderBlock = $[19], renderChild = $[20], renderDecorator = $[21], renderListItem = $[22], renderPlaceholder = $[23], renderStyle = $[24], restProps = $[25], scrollSelectionIntoView = $[26]);
-  const portableTextEditor = usePortableTextEditor(), [hasInvalidValue, setHasInvalidValue] = useState(!1), editorActor = useContext(EditorActorContext), relayActor = useContext(RelayActorContext);
+  const portableTextEditor = usePortableTextEditor(), [hasInvalidValue, setHasInvalidValue] = useState(!1), editorActor = useContext(EditorActorContext), relayActor = useContext(RelayActorContext), editorEngine = useEngine(), schema = editorEngine.schema, readOnly = useSelector(editorActor, _temp);
   let t0;
-  $[27] !== editorActor ? (t0 = editorActor.getSnapshot(), $[27] = editorActor, $[28] = t0) : t0 = $[28];
-  const schema = t0.context.schema, readOnly = useSelector(editorActor, _temp), editorEngine = useEngine();
-  let t1;
-  $[29] !== editorEngine ? (t1 = {
+  $[27] !== editorEngine ? (t0 = {
     input: {
       editorEngine
     }
-  }, $[29] = editorEngine, $[30] = t1) : t1 = $[30];
-  const validateSelectionActor = useActorRef(validateSelectionMachine, t1);
+  }, $[27] = editorEngine, $[28] = t0) : t0 = $[28];
+  const validateSelectionActor = useActorRef(validateSelectionMachine, t0);
+  let t1;
+  $[29] !== rangeDecorations ? (t1 = rangeDecorations ?? [], $[29] = rangeDecorations, $[30] = t1) : t1 = $[30];
   let t2;
-  $[31] !== rangeDecorations ? (t2 = rangeDecorations ?? [], $[31] = rangeDecorations, $[32] = t2) : t2 = $[32];
-  let t3;
-  $[33] !== editorActor ? (t3 = editorActor.getSnapshot().matches({
+  $[31] !== editorActor ? (t2 = editorActor.getSnapshot().matches({
     setup: "setting up"
-  }), $[33] = editorActor, $[34] = t3) : t3 = $[34];
-  const t4 = !t3;
-  let t5;
-  $[35] !== editorEngine || $[36] !== readOnly || $[37] !== schema || $[38] !== t2 || $[39] !== t4 ? (t5 = {
+  }), $[31] = editorActor, $[32] = t2) : t2 = $[32];
+  const t3 = !t2;
+  let t4;
+  $[33] !== editorEngine || $[34] !== readOnly || $[35] !== schema || $[36] !== t1 || $[37] !== t3 ? (t4 = {
     input: {
-      rangeDecorations: t2,
+      rangeDecorations: t1,
       readOnly,
       schema,
       editorEngine,
-      skipSetup: t4
+      skipSetup: t3
     }
-  }, $[35] = editorEngine, $[36] = readOnly, $[37] = schema, $[38] = t2, $[39] = t4, $[40] = t5) : t5 = $[40];
-  const rangeDecorationsActor = useActorRef(rangeDecorationsMachine, t5), decorate = useSelector(rangeDecorationsActor, _temp2), dropPosition = useDropPosition();
-  let t6, t7;
-  $[41] !== rangeDecorationsActor || $[42] !== readOnly ? (t6 = () => {
+  }, $[33] = editorEngine, $[34] = readOnly, $[35] = schema, $[36] = t1, $[37] = t3, $[38] = t4) : t4 = $[38];
+  const rangeDecorationsActor = useActorRef(rangeDecorationsMachine, t4), decorate = useSelector(rangeDecorationsActor, _temp2), dropPosition = useDropPosition();
+  let t5, t6;
+  $[39] !== rangeDecorationsActor || $[40] !== readOnly ? (t5 = () => {
     rangeDecorationsActor.send({
       type: "update read only",
       readOnly
     });
-  }, t7 = [rangeDecorationsActor, readOnly], $[41] = rangeDecorationsActor, $[42] = readOnly, $[43] = t6, $[44] = t7) : (t6 = $[43], t7 = $[44]), useEffect(t6, t7);
-  let t8, t9;
-  $[45] !== rangeDecorations || $[46] !== rangeDecorationsActor ? (t8 = () => {
+  }, t6 = [rangeDecorationsActor, readOnly], $[39] = rangeDecorationsActor, $[40] = readOnly, $[41] = t5, $[42] = t6) : (t5 = $[41], t6 = $[42]), useEffect(t5, t6);
+  let t7, t8;
+  $[43] !== rangeDecorations || $[44] !== rangeDecorationsActor ? (t7 = () => {
     rangeDecorationsActor.send({
       type: "range decorations updated",
       rangeDecorations: rangeDecorations ?? []
     });
-  }, t9 = [rangeDecorationsActor, rangeDecorations], $[45] = rangeDecorations, $[46] = rangeDecorationsActor, $[47] = t8, $[48] = t9) : (t8 = $[47], t9 = $[48]), useEffect(t8, t9);
-  let t10;
-  $[49] !== renderBlock || $[50] !== renderChild || $[51] !== renderListItem || $[52] !== renderStyle ? (t10 = {
+  }, t8 = [rangeDecorationsActor, rangeDecorations], $[43] = rangeDecorations, $[44] = rangeDecorationsActor, $[45] = t7, $[46] = t8) : (t7 = $[45], t8 = $[46]), useEffect(t7, t8);
+  let t9;
+  $[47] !== renderBlock || $[48] !== renderChild || $[49] !== renderListItem || $[50] !== renderStyle ? (t9 = {
     renderBlock,
     renderChild,
     renderListItem,
     renderStyle
-  }, $[49] = renderBlock, $[50] = renderChild, $[51] = renderListItem, $[52] = renderStyle, $[53] = t10) : t10 = $[53];
-  const legacy = t10;
+  }, $[47] = renderBlock, $[48] = renderChild, $[49] = renderListItem, $[50] = renderStyle, $[51] = t9) : t9 = $[51];
+  const legacy = t9;
+  let t10;
+  $[52] !== dropPosition || $[53] !== legacy || $[54] !== readOnly || $[55] !== schema ? (t10 = (eProps) => /* @__PURE__ */ jsx(RenderElement, { ...eProps, dropPosition, legacy, readOnly, schema }), $[52] = dropPosition, $[53] = legacy, $[54] = readOnly, $[55] = schema, $[56] = t10) : t10 = $[56];
+  const renderElement = t10;
   let t11;
-  $[54] !== dropPosition || $[55] !== legacy || $[56] !== readOnly || $[57] !== schema ? (t11 = (eProps) => /* @__PURE__ */ jsx(RenderElement, { ...eProps, dropPosition, legacy, readOnly, schema }), $[54] = dropPosition, $[55] = legacy, $[56] = readOnly, $[57] = schema, $[58] = t11) : t11 = $[58];
-  const renderElement = t11;
+  $[57] !== readOnly || $[58] !== renderAnnotation || $[59] !== renderChild || $[60] !== renderDecorator || $[61] !== renderPlaceholder || $[62] !== schema ? (t11 = (leafProps) => /* @__PURE__ */ jsx(RenderLeaf, { ...leafProps, readOnly, renderAnnotation, renderChild, renderDecorator, renderPlaceholder, schema }), $[57] = readOnly, $[58] = renderAnnotation, $[59] = renderChild, $[60] = renderDecorator, $[61] = renderPlaceholder, $[62] = schema, $[63] = t11) : t11 = $[63];
+  const renderLeaf = t11, renderText = _temp3;
   let t12;
-  $[59] !== readOnly || $[60] !== renderAnnotation || $[61] !== renderChild || $[62] !== renderDecorator || $[63] !== renderPlaceholder || $[64] !== schema ? (t12 = (leafProps) => /* @__PURE__ */ jsx(RenderLeaf, { ...leafProps, readOnly, renderAnnotation, renderChild, renderDecorator, renderPlaceholder, schema }), $[59] = readOnly, $[60] = renderAnnotation, $[61] = renderChild, $[62] = renderDecorator, $[63] = renderPlaceholder, $[64] = schema, $[65] = t12) : t12 = $[65];
-  const renderLeaf = t12, renderText = _temp3;
-  let t13;
-  $[66] !== editorActor || $[67] !== editorEngine || $[68] !== propsSelection ? (t13 = () => {
+  $[64] !== editorActor || $[65] !== editorEngine || $[66] !== propsSelection ? (t12 = () => {
     if (propsSelection) {
       debug.selection.enabled && debug.selection(`Selection from props ${safeStringify(propsSelection)}`);
       const resolvedSelection = resolveSelection(editorEngine, propsSelection);
@@ -6122,10 +6084,10 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         selection: resolvedSelection
       }), editorEngine.onChange());
     }
-  }, $[66] = editorActor, $[67] = editorEngine, $[68] = propsSelection, $[69] = t13) : t13 = $[69];
-  const restoreSelectionFromProps = t13;
-  let t14, t15;
-  $[70] !== editorActor || $[71] !== rangeDecorationsActor || $[72] !== restoreSelectionFromProps ? (t14 = () => {
+  }, $[64] = editorActor, $[65] = editorEngine, $[66] = propsSelection, $[67] = t12) : t12 = $[67];
+  const restoreSelectionFromProps = t12;
+  let t13, t14;
+  $[68] !== editorActor || $[69] !== rangeDecorationsActor || $[70] !== restoreSelectionFromProps ? (t13 = () => {
     const onReady = editorActor.on("ready", () => {
       rangeDecorationsActor.send({
         type: "ready"
@@ -6138,13 +6100,13 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
     return () => {
       onReady.unsubscribe(), onInvalidValue.unsubscribe(), onValueChanged.unsubscribe();
     };
-  }, t15 = [rangeDecorationsActor, editorActor, restoreSelectionFromProps], $[70] = editorActor, $[71] = rangeDecorationsActor, $[72] = restoreSelectionFromProps, $[73] = t14, $[74] = t15) : (t14 = $[73], t15 = $[74]), useEffect(t14, t15);
-  let t16, t17;
-  $[75] !== hasInvalidValue || $[76] !== propsSelection || $[77] !== restoreSelectionFromProps ? (t16 = () => {
+  }, t14 = [rangeDecorationsActor, editorActor, restoreSelectionFromProps], $[68] = editorActor, $[69] = rangeDecorationsActor, $[70] = restoreSelectionFromProps, $[71] = t13, $[72] = t14) : (t13 = $[71], t14 = $[72]), useEffect(t13, t14);
+  let t15, t16;
+  $[73] !== hasInvalidValue || $[74] !== propsSelection || $[75] !== restoreSelectionFromProps ? (t15 = () => {
     propsSelection && !hasInvalidValue && restoreSelectionFromProps();
-  }, t17 = [hasInvalidValue, propsSelection, restoreSelectionFromProps], $[75] = hasInvalidValue, $[76] = propsSelection, $[77] = restoreSelectionFromProps, $[78] = t16, $[79] = t17) : (t16 = $[78], t17 = $[79]), useEffect(t16, t17);
-  let t18;
-  $[80] !== editorActor || $[81] !== editorEngine || $[82] !== onCopy ? (t18 = (event) => {
+  }, t16 = [hasInvalidValue, propsSelection, restoreSelectionFromProps], $[73] = hasInvalidValue, $[74] = propsSelection, $[75] = restoreSelectionFromProps, $[76] = t15, $[77] = t16) : (t15 = $[76], t16 = $[77]), useEffect(t15, t16);
+  let t17;
+  $[78] !== editorActor || $[79] !== editorEngine || $[80] !== onCopy ? (t17 = (event) => {
     if (DOMEditor.hasSelectableTarget(editorEngine, event.target)) {
       if (onCopy)
         onCopy(event) !== void 0 && event.preventDefault();
@@ -6171,16 +6133,16 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         });
       }
     }
-  }, $[80] = editorActor, $[81] = editorEngine, $[82] = onCopy, $[83] = t18) : t18 = $[83];
-  const handleCopy = t18;
-  let t19;
-  $[84] !== editorActor || $[85] !== editorEngine || $[86] !== onCut ? (t19 = (event_0) => {
+  }, $[78] = editorActor, $[79] = editorEngine, $[80] = onCopy, $[81] = t17) : t17 = $[81];
+  const handleCopy = t17;
+  let t18;
+  $[82] !== editorActor || $[83] !== editorEngine || $[84] !== onCut ? (t18 = (event_0) => {
     if (DOMEditor.hasSelectableTarget(editorEngine, event_0.target)) {
       if (onCut)
         onCut(event_0) !== void 0 && event_0.preventDefault();
       else if (event_0.nativeEvent.clipboardData) {
         event_0.stopPropagation(), event_0.preventDefault();
-        const selection_0 = editorActor.getSnapshot().context.selection, position_0 = selection_0 ? {
+        const selection_0 = editorEngine.selection, position_0 = selection_0 ? {
           selection: selection_0
         } : void 0;
         if (!position_0) {
@@ -6201,10 +6163,10 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         });
       }
     }
-  }, $[84] = editorActor, $[85] = editorEngine, $[86] = onCut, $[87] = t19) : t19 = $[87];
-  const handleCut = t19;
-  let t20;
-  $[88] !== editorActor || $[89] !== editorEngine || $[90] !== onPaste || $[91] !== portableTextEditor || $[92] !== relayActor ? (t20 = (event_1) => {
+  }, $[82] = editorActor, $[83] = editorEngine, $[84] = onCut, $[85] = t18) : t18 = $[85];
+  const handleCut = t18;
+  let t19;
+  $[86] !== editorActor || $[87] !== editorEngine || $[88] !== onPaste || $[89] !== portableTextEditor || $[90] !== relayActor ? (t19 = (event_1) => {
     const value = editorEngine.children, path2 = editorEngine.selection?.focus.path || [], onPasteResult = onPaste?.({
       event: event_1,
       value,
@@ -6217,7 +6179,7 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
       }), Promise.resolve(onPasteResult).then((result_1) => {
         if (debug.behaviors("Custom paste function from client resolved", result_1), !result_1 || !result_1.insert) {
           debug.behaviors("No result from custom paste handler, pasting normally");
-          const selection_1 = editorActor.getSnapshot().context.selection, position_1 = selection_1 ? {
+          const selection_1 = editorEngine.selection, position_1 = selection_1 ? {
             selection: selection_1
           } : void 0;
           if (!position_1) {
@@ -6242,8 +6204,8 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
             behaviorEvent: {
               type: "insert.blocks",
               blocks: parseBlocks({
-                keyGenerator: editorActor.getSnapshot().context.keyGenerator,
-                schema: editorActor.getSnapshot().context.schema,
+                keyGenerator: editorEngine.keyGenerator,
+                schema: editorEngine.schema,
                 blocks: result_1.insert,
                 options: {
                   normalize: !1,
@@ -6262,7 +6224,7 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
       });
     else if (event_1.nativeEvent.clipboardData) {
       event_1.preventDefault(), event_1.stopPropagation();
-      const selection_2 = editorActor.getSnapshot().context.selection, position_2 = selection_2 ? {
+      const selection_2 = editorEngine.selection, position_2 = selection_2 ? {
         selection: selection_2
       } : void 0;
       if (!position_2) {
@@ -6283,18 +6245,18 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
       });
     }
     debug.behaviors("No result from custom paste handler, pasting normally");
-  }, $[88] = editorActor, $[89] = editorEngine, $[90] = onPaste, $[91] = portableTextEditor, $[92] = relayActor, $[93] = t20) : t20 = $[93];
-  const handlePaste = t20;
-  let t21;
-  $[94] !== editorActor || $[95] !== editorEngine || $[96] !== onFocus || $[97] !== relayActor ? (t21 = (event_2) => {
+  }, $[86] = editorActor, $[87] = editorEngine, $[88] = onPaste, $[89] = portableTextEditor, $[90] = relayActor, $[91] = t19) : t19 = $[91];
+  const handlePaste = t19;
+  let t20;
+  $[92] !== editorEngine || $[93] !== onFocus || $[94] !== relayActor ? (t20 = (event_2) => {
     onFocus && onFocus(event_2), event_2.isDefaultPrevented() || (relayActor.send({
       type: "focused",
       event: event_2
-    }), !editorEngine.selection && editorEngine.children.length === 1 && isEmptyTextBlock(editorActor.getSnapshot().context, editorEngine.children.at(0)) && (editorEngine.select(start(editorEngine, [])), editorEngine.onChange()));
-  }, $[94] = editorActor, $[95] = editorEngine, $[96] = onFocus, $[97] = relayActor, $[98] = t21) : t21 = $[98];
-  const handleOnFocus = t21;
-  let t22;
-  $[99] !== editorActor || $[100] !== editorEngine || $[101] !== onClick ? (t22 = (event_3) => {
+    }), !editorEngine.selection && editorEngine.children.length === 1 && isEmptyTextBlock(editorEngine, editorEngine.children.at(0)) && (editorEngine.select(start(editorEngine, [])), editorEngine.onChange()));
+  }, $[92] = editorEngine, $[93] = onFocus, $[94] = relayActor, $[95] = t20) : t20 = $[95];
+  const handleOnFocus = t20;
+  let t21;
+  $[96] !== editorActor || $[97] !== editorEngine || $[98] !== onClick ? (t21 = (event_3) => {
     if (onClick && onClick(event_3), event_3.isDefaultPrevented() || event_3.isPropagationStopped())
       return;
     const position_3 = getEventPosition({
@@ -6311,23 +6273,23 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
       editor: editorEngine,
       nativeEvent: event_3
     });
-  }, $[99] = editorActor, $[100] = editorEngine, $[101] = onClick, $[102] = t22) : t22 = $[102];
-  const handleClick = t22;
-  let t23;
-  $[103] !== onBlur || $[104] !== relayActor ? (t23 = (event_4) => {
+  }, $[96] = editorActor, $[97] = editorEngine, $[98] = onClick, $[99] = t21) : t21 = $[99];
+  const handleClick = t21;
+  let t22;
+  $[100] !== onBlur || $[101] !== relayActor ? (t22 = (event_4) => {
     onBlur && onBlur(event_4), event_4.isPropagationStopped() || relayActor.send({
       type: "blurred",
       event: event_4
     });
-  }, $[103] = onBlur, $[104] = relayActor, $[105] = t23) : t23 = $[105];
-  const handleOnBlur = t23;
-  let t24;
-  $[106] !== onBeforeInput ? (t24 = (event_5) => {
+  }, $[100] = onBlur, $[101] = relayActor, $[102] = t22) : t22 = $[102];
+  const handleOnBlur = t22;
+  let t23;
+  $[103] !== onBeforeInput ? (t23 = (event_5) => {
     onBeforeInput && onBeforeInput(event_5);
-  }, $[106] = onBeforeInput, $[107] = t24) : t24 = $[107];
-  const handleOnBeforeInput = t24;
-  let t25;
-  $[108] !== editorActor || $[109] !== editorEngine || $[110] !== hotkeys || $[111] !== portableTextEditor || $[112] !== props ? (t25 = (event_6) => {
+  }, $[103] = onBeforeInput, $[104] = t23) : t23 = $[104];
+  const handleOnBeforeInput = t23;
+  let t24;
+  $[105] !== editorActor || $[106] !== editorEngine || $[107] !== hotkeys || $[108] !== portableTextEditor || $[109] !== props ? (t24 = (event_6) => {
     props.onKeyDown && props.onKeyDown(event_6), event_6.isDefaultPrevented() || performHotkey({
       editorActor,
       editor: editorEngine,
@@ -6350,10 +6312,10 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
       editor: editorEngine,
       nativeEvent: event_6
     });
-  }, $[108] = editorActor, $[109] = editorEngine, $[110] = hotkeys, $[111] = portableTextEditor, $[112] = props, $[113] = t25) : t25 = $[113];
-  const handleKeyDown = t25;
-  let t26;
-  $[114] !== editorActor || $[115] !== editorEngine || $[116] !== props ? (t26 = (event_7) => {
+  }, $[105] = editorActor, $[106] = editorEngine, $[107] = hotkeys, $[108] = portableTextEditor, $[109] = props, $[110] = t24) : t24 = $[110];
+  const handleKeyDown = t24;
+  let t25;
+  $[111] !== editorActor || $[112] !== editorEngine || $[113] !== props ? (t25 = (event_7) => {
     props.onKeyUp && props.onKeyUp(event_7), event_7.isDefaultPrevented() || editorActor.send({
       type: "behavior event",
       behaviorEvent: {
@@ -6370,26 +6332,26 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
       editor: editorEngine,
       nativeEvent: event_7
     });
-  }, $[114] = editorActor, $[115] = editorEngine, $[116] = props, $[117] = t26) : t26 = $[117];
-  const handleKeyUp = t26;
-  let t27;
+  }, $[111] = editorActor, $[112] = editorEngine, $[113] = props, $[114] = t25) : t25 = $[114];
+  const handleKeyUp = t25;
+  let t26;
   bb0: {
     if (scrollSelectionIntoView === void 0) {
-      t27 = void 0;
+      t26 = void 0;
       break bb0;
     }
     if (scrollSelectionIntoView === null) {
-      t27 = noop;
+      t26 = noop;
       break bb0;
     }
-    let t282;
-    $[118] !== portableTextEditor || $[119] !== scrollSelectionIntoView ? (t282 = (_editor, domRange) => {
+    let t272;
+    $[115] !== portableTextEditor || $[116] !== scrollSelectionIntoView ? (t272 = (_editor, domRange) => {
       scrollSelectionIntoView(portableTextEditor, domRange);
-    }, $[118] = portableTextEditor, $[119] = scrollSelectionIntoView, $[120] = t282) : t282 = $[120], t27 = t282;
+    }, $[115] = portableTextEditor, $[116] = scrollSelectionIntoView, $[117] = t272) : t272 = $[117], t26 = t272;
   }
-  const scrollSelectionIntoViewToEngine = t27;
-  let t28, t29;
-  $[121] !== editorActor || $[122] !== editorEngine ? (t28 = () => {
+  const scrollSelectionIntoViewToEngine = t26;
+  let t27, t28;
+  $[118] !== editorActor || $[119] !== editorEngine ? (t27 = () => {
     const window2 = DOMEditor.getWindow(editorEngine), onDragEnd_0 = () => {
       editorActor.send({
         type: "dragend"
@@ -6402,9 +6364,9 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
     return window2.document.addEventListener("dragend", onDragEnd_0), window2.document.addEventListener("drop", onDrop_0), () => {
       window2.document.removeEventListener("dragend", onDragEnd_0), window2.document.removeEventListener("drop", onDrop_0);
     };
-  }, t29 = [editorEngine, editorActor], $[121] = editorActor, $[122] = editorEngine, $[123] = t28, $[124] = t29) : (t28 = $[123], t29 = $[124]), useEffect(t28, t29);
-  let t30;
-  $[125] !== editorActor || $[126] !== editorEngine || $[127] !== onDragStart || $[128] !== readOnly ? (t30 = (event_8) => {
+  }, t28 = [editorEngine, editorActor], $[118] = editorActor, $[119] = editorEngine, $[120] = t27, $[121] = t28) : (t27 = $[120], t28 = $[121]), useEffect(t27, t28);
+  let t29;
+  $[122] !== editorActor || $[123] !== editorEngine || $[124] !== onDragStart || $[125] !== readOnly ? (t29 = (event_8) => {
     if (readOnly || !DOMEditor.hasTarget(editorEngine, event_8.target) || (onDragStart?.(event_8), event_8.isDefaultPrevented() || event_8.isPropagationStopped()))
       return;
     const position_4 = getEventPosition({
@@ -6432,10 +6394,10 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
       },
       editor: editorEngine
     }), !0;
-  }, $[125] = editorActor, $[126] = editorEngine, $[127] = onDragStart, $[128] = readOnly, $[129] = t30) : t30 = $[129];
-  const handleDragStart = t30;
-  let t31;
-  $[130] !== editorActor || $[131] !== editorEngine || $[132] !== onDrag ? (t31 = (event_9) => {
+  }, $[122] = editorActor, $[123] = editorEngine, $[124] = onDragStart, $[125] = readOnly, $[126] = t29) : t29 = $[126];
+  const handleDragStart = t29;
+  let t30;
+  $[127] !== editorActor || $[128] !== editorEngine || $[129] !== onDrag ? (t30 = (event_9) => {
     if (onDrag?.(event_9), !(event_9.isDefaultPrevented() || event_9.isPropagationStopped() || !getEventPosition({
       editorActor,
       editorEngine,
@@ -6451,10 +6413,10 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         },
         editor: editorEngine
       }), !0;
-  }, $[130] = editorActor, $[131] = editorEngine, $[132] = onDrag, $[133] = t31) : t31 = $[133];
-  const handleDrag = t31;
-  let t32;
-  $[134] !== editorActor || $[135] !== editorEngine || $[136] !== onDragEnd ? (t32 = (event_10) => {
+  }, $[127] = editorActor, $[128] = editorEngine, $[129] = onDrag, $[130] = t30) : t30 = $[130];
+  const handleDrag = t30;
+  let t31;
+  $[131] !== editorActor || $[132] !== editorEngine || $[133] !== onDragEnd ? (t31 = (event_10) => {
     if (onDragEnd?.(event_10), !(event_10.isDefaultPrevented() || event_10.isPropagationStopped()))
       return editorActor.send({
         type: "behavior event",
@@ -6466,10 +6428,10 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         },
         editor: editorEngine
       }), !0;
-  }, $[134] = editorActor, $[135] = editorEngine, $[136] = onDragEnd, $[137] = t32) : t32 = $[137];
-  const handleDragEnd = t32;
-  let t33;
-  $[138] !== editorActor || $[139] !== editorEngine || $[140] !== onDragEnter ? (t33 = (event_11) => {
+  }, $[131] = editorActor, $[132] = editorEngine, $[133] = onDragEnd, $[134] = t31) : t31 = $[134];
+  const handleDragEnd = t31;
+  let t32;
+  $[135] !== editorActor || $[136] !== editorEngine || $[137] !== onDragEnter ? (t32 = (event_11) => {
     if (onDragEnter?.(event_11), event_11.isDefaultPrevented() || event_11.isPropagationStopped())
       return;
     const position_6 = getEventPosition({
@@ -6489,10 +6451,10 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         },
         editor: editorEngine
       }), !0;
-  }, $[138] = editorActor, $[139] = editorEngine, $[140] = onDragEnter, $[141] = t33) : t33 = $[141];
-  const handleDragEnter = t33;
-  let t34;
-  $[142] !== editorActor || $[143] !== editorEngine || $[144] !== onDragOver ? (t34 = (event_12) => {
+  }, $[135] = editorActor, $[136] = editorEngine, $[137] = onDragEnter, $[138] = t32) : t32 = $[138];
+  const handleDragEnter = t32;
+  let t33;
+  $[139] !== editorActor || $[140] !== editorEngine || $[141] !== onDragOver ? (t33 = (event_12) => {
     if (onDragOver?.(event_12), event_12.isDefaultPrevented() || event_12.isPropagationStopped())
       return;
     const position_7 = getEventPosition({
@@ -6514,10 +6476,10 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         editor: editorEngine,
         nativeEvent: event_12
       }), !0;
-  }, $[142] = editorActor, $[143] = editorEngine, $[144] = onDragOver, $[145] = t34) : t34 = $[145];
-  const handleDragOver = t34;
-  let t35;
-  $[146] !== editorActor || $[147] !== editorEngine || $[148] !== onDrop ? (t35 = (event_13) => {
+  }, $[139] = editorActor, $[140] = editorEngine, $[141] = onDragOver, $[142] = t33) : t33 = $[142];
+  const handleDragOver = t33;
+  let t34;
+  $[143] !== editorActor || $[144] !== editorEngine || $[145] !== onDrop ? (t34 = (event_13) => {
     if (onDrop?.(event_13), event_13.isDefaultPrevented() || event_13.isPropagationStopped())
       return;
     const position_8 = getEventPosition({
@@ -6542,10 +6504,10 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
       editor: editorEngine,
       nativeEvent: event_13
     }), !0;
-  }, $[146] = editorActor, $[147] = editorEngine, $[148] = onDrop, $[149] = t35) : t35 = $[149];
-  const handleDrop = t35;
-  let t36;
-  $[150] !== editorActor || $[151] !== editorEngine || $[152] !== onDragLeave ? (t36 = (event_14) => {
+  }, $[143] = editorActor, $[144] = editorEngine, $[145] = onDrop, $[146] = t34) : t34 = $[146];
+  const handleDrop = t34;
+  let t35;
+  $[147] !== editorActor || $[148] !== editorEngine || $[149] !== onDragLeave ? (t35 = (event_14) => {
     if (onDragLeave?.(event_14), !(event_14.isDefaultPrevented() || event_14.isPropagationStopped() || !getEventPosition({
       editorActor,
       editorEngine,
@@ -6561,10 +6523,10 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         },
         editor: editorEngine
       }), !0;
-  }, $[150] = editorActor, $[151] = editorEngine, $[152] = onDragLeave, $[153] = t36) : t36 = $[153];
-  const handleDragLeave = t36;
-  let t37;
-  $[154] !== forwardedRef || $[155] !== validateSelectionActor ? (t37 = (editorElement) => {
+  }, $[147] = editorActor, $[148] = editorEngine, $[149] = onDragLeave, $[150] = t35) : t35 = $[150];
+  const handleDragLeave = t35;
+  let t36;
+  $[151] !== forwardedRef || $[152] !== validateSelectionActor ? (t36 = (editorElement) => {
     if (typeof forwardedRef == "function" ? forwardedRef(editorElement) : forwardedRef && (forwardedRef.current = editorElement), editorElement) {
       const mutationObserver = new MutationObserver(() => {
         validateSelectionActor.send({
@@ -6582,12 +6544,12 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         mutationObserver.disconnect();
       };
     }
-  }, $[154] = forwardedRef, $[155] = validateSelectionActor, $[156] = t37) : t37 = $[156];
-  const callbackRef = t37;
+  }, $[151] = forwardedRef, $[152] = validateSelectionActor, $[153] = t36) : t36 = $[153];
+  const callbackRef = t36;
   if (!portableTextEditor)
     return null;
-  let t38;
-  return $[157] !== callbackRef || $[158] !== decorate || $[159] !== editorActor || $[160] !== handleClick || $[161] !== handleCopy || $[162] !== handleCut || $[163] !== handleDrag || $[164] !== handleDragEnd || $[165] !== handleDragEnter || $[166] !== handleDragLeave || $[167] !== handleDragOver || $[168] !== handleDragStart || $[169] !== handleDrop || $[170] !== handleKeyDown || $[171] !== handleKeyUp || $[172] !== handleOnBeforeInput || $[173] !== handleOnBlur || $[174] !== handleOnFocus || $[175] !== handlePaste || $[176] !== hasInvalidValue || $[177] !== readOnly || $[178] !== renderElement || $[179] !== renderLeaf || $[180] !== restProps || $[181] !== scrollSelectionIntoViewToEngine ? (t38 = hasInvalidValue ? null : /* @__PURE__ */ jsx(SelectionStateProvider, { children: /* @__PURE__ */ jsx(Editable, { ...restProps, ref: callbackRef, editorActor, "data-read-only": readOnly, autoFocus: !1, className: restProps.className || "pt-editable", decorate, onBlur: handleOnBlur, onCopy: handleCopy, onCut: handleCut, onClick: handleClick, onDOMBeforeInput: handleOnBeforeInput, onDragStart: handleDragStart, onDrag: handleDrag, onDragEnd: handleDragEnd, onDragEnter: handleDragEnter, onDragOver: handleDragOver, onDrop: handleDrop, onDragLeave: handleDragLeave, onFocus: handleOnFocus, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, onPaste: handlePaste, readOnly, renderElement, renderLeaf, renderText, scrollSelectionIntoView: scrollSelectionIntoViewToEngine }) }), $[157] = callbackRef, $[158] = decorate, $[159] = editorActor, $[160] = handleClick, $[161] = handleCopy, $[162] = handleCut, $[163] = handleDrag, $[164] = handleDragEnd, $[165] = handleDragEnter, $[166] = handleDragLeave, $[167] = handleDragOver, $[168] = handleDragStart, $[169] = handleDrop, $[170] = handleKeyDown, $[171] = handleKeyUp, $[172] = handleOnBeforeInput, $[173] = handleOnBlur, $[174] = handleOnFocus, $[175] = handlePaste, $[176] = hasInvalidValue, $[177] = readOnly, $[178] = renderElement, $[179] = renderLeaf, $[180] = restProps, $[181] = scrollSelectionIntoViewToEngine, $[182] = t38) : t38 = $[182], t38;
+  let t37;
+  return $[154] !== callbackRef || $[155] !== decorate || $[156] !== editorActor || $[157] !== handleClick || $[158] !== handleCopy || $[159] !== handleCut || $[160] !== handleDrag || $[161] !== handleDragEnd || $[162] !== handleDragEnter || $[163] !== handleDragLeave || $[164] !== handleDragOver || $[165] !== handleDragStart || $[166] !== handleDrop || $[167] !== handleKeyDown || $[168] !== handleKeyUp || $[169] !== handleOnBeforeInput || $[170] !== handleOnBlur || $[171] !== handleOnFocus || $[172] !== handlePaste || $[173] !== hasInvalidValue || $[174] !== readOnly || $[175] !== renderElement || $[176] !== renderLeaf || $[177] !== restProps || $[178] !== scrollSelectionIntoViewToEngine ? (t37 = hasInvalidValue ? null : /* @__PURE__ */ jsx(SelectionStateProvider, { children: /* @__PURE__ */ jsx(Editable, { ...restProps, ref: callbackRef, editorActor, "data-read-only": readOnly, autoFocus: !1, className: restProps.className || "pt-editable", decorate, onBlur: handleOnBlur, onCopy: handleCopy, onCut: handleCut, onClick: handleClick, onDOMBeforeInput: handleOnBeforeInput, onDragStart: handleDragStart, onDrag: handleDrag, onDragEnd: handleDragEnd, onDragEnter: handleDragEnter, onDragOver: handleDragOver, onDrop: handleDrop, onDragLeave: handleDragLeave, onFocus: handleOnFocus, onKeyDown: handleKeyDown, onKeyUp: handleKeyUp, onPaste: handlePaste, readOnly, renderElement, renderLeaf, renderText, scrollSelectionIntoView: scrollSelectionIntoViewToEngine }) }), $[154] = callbackRef, $[155] = decorate, $[156] = editorActor, $[157] = handleClick, $[158] = handleCopy, $[159] = handleCut, $[160] = handleDrag, $[161] = handleDragEnd, $[162] = handleDragEnter, $[163] = handleDragLeave, $[164] = handleDragOver, $[165] = handleDragStart, $[166] = handleDrop, $[167] = handleKeyDown, $[168] = handleKeyUp, $[169] = handleOnBeforeInput, $[170] = handleOnBlur, $[171] = handleOnFocus, $[172] = handlePaste, $[173] = hasInvalidValue, $[174] = readOnly, $[175] = renderElement, $[176] = renderLeaf, $[177] = restProps, $[178] = scrollSelectionIntoViewToEngine, $[179] = t37) : t37 = $[179], t37;
 });
 PortableTextEditable.displayName = "ForwardRef(PortableTextEditable)";
 function noop() {
@@ -6993,17 +6955,11 @@ function createEditableAPI(editor, editorActor) {
       });
     },
     isMarkActive: (mark) => {
-      const snapshot = getEditorSnapshot({
-        editorActorSnapshot: editorActor.getSnapshot(),
-        editorEngineInstance: editor
-      });
+      const snapshot = editor.snapshot;
       return getActiveDecorators(snapshot).includes(mark);
     },
     marks: () => {
-      const snapshot = getEditorSnapshot({
-        editorActorSnapshot: editorActor.getSnapshot(),
-        editorEngineInstance: editor
-      }), activeAnnotations = getActiveAnnotationsMarks(snapshot), activeDecorators = getActiveDecorators(snapshot);
+      const snapshot = editor.snapshot, activeAnnotations = getActiveAnnotationsMarks(snapshot), activeDecorators = getActiveDecorators(snapshot);
       return [...activeAnnotations, ...activeDecorators];
     },
     undo: () => {
@@ -7093,7 +7049,7 @@ function createEditableAPI(editor, editorActor) {
       }
     },
     isVoid: (element) => {
-      const schema = editorActor.getSnapshot().context.schema;
+      const schema = editor.schema;
       return ![schema.block.name, schema.span.name].includes(element._type);
     },
     findByPath: (path2) => {
@@ -7129,7 +7085,7 @@ function createEditableAPI(editor, editorActor) {
           node: span,
           path: spanPath
         } of spans) {
-          const blockEntry = getTextBlockNode(editor, parentPath(spanPath));
+          const blockEntry = getTextBlock(editor, parentPath(spanPath));
           blockEntry && blockEntry.node.markDefs?.forEach((def) => {
             isSpan({
               schema: editor.schema
@@ -7142,17 +7098,11 @@ function createEditableAPI(editor, editorActor) {
       }
     },
     isAnnotationActive: (annotationType) => {
-      const snapshot = getEditorSnapshot({
-        editorActorSnapshot: editorActor.getSnapshot(),
-        editorEngineInstance: editor
-      });
+      const snapshot = editor.snapshot;
       return isActiveAnnotation(annotationType)(snapshot);
     },
     addAnnotation: (type, value) => {
-      const snapshotBefore = getEditorSnapshot({
-        editorActorSnapshot: editorActor.getSnapshot(),
-        editorEngineInstance: editor
-      }), selectedValueBefore = getSelectedValue(snapshotBefore), focusSpanBefore = getFocusSpan(snapshotBefore), markDefsBefore = selectedValueBefore.flatMap((block) => isTextBlock(snapshotBefore.context, block) ? block.markDefs ?? [] : []);
+      const snapshotBefore = editor.snapshot, selectedValueBefore = getSelectedValue(snapshotBefore), focusSpanBefore = getFocusSpan(snapshotBefore), markDefsBefore = selectedValueBefore.flatMap((block) => isTextBlock(snapshotBefore.context, block) ? block.markDefs ?? [] : []);
       editorActor.send({
         type: "behavior event",
         behaviorEvent: {
@@ -7164,10 +7114,7 @@ function createEditableAPI(editor, editorActor) {
         },
         editor
       });
-      const snapshotAfter = getEditorSnapshot({
-        editorActorSnapshot: editorActor.getSnapshot(),
-        editorEngineInstance: editor
-      }), selectedValueAfter = getSelectedValue(snapshotAfter), focusBlockAfter = getFocusBlock(snapshotAfter), focusSpanAfter = getFocusSpan(snapshotAfter), focusSpanDecorators = focusSpanAfter ? getPathSubSchema(snapshotAfter, focusSpanAfter.path).decorators.map((decorator) => decorator.name) : snapshotAfter.context.schema.decorators.map((decorator) => decorator.name), newMarkDefKeysOnFocusSpan = focusSpanAfter?.node.marks?.filter((mark) => !focusSpanBefore?.node.marks?.includes(mark) && !focusSpanDecorators.includes(mark)), markDefs = selectedValueAfter.flatMap((block) => isTextBlock(snapshotAfter.context, block) ? block.markDefs?.map((markDef2) => ({
+      const snapshotAfter = editor.snapshot, selectedValueAfter = getSelectedValue(snapshotAfter), focusBlockAfter = getFocusBlock(snapshotAfter), focusSpanAfter = getFocusSpan(snapshotAfter), focusSpanDecorators = focusSpanAfter ? getPathSubSchema(snapshotAfter, focusSpanAfter.path).decorators.map((decorator) => decorator.name) : snapshotAfter.context.schema.decorators.map((decorator) => decorator.name), newMarkDefKeysOnFocusSpan = focusSpanAfter?.node.marks?.filter((mark) => !focusSpanBefore?.node.marks?.includes(mark) && !focusSpanDecorators.includes(mark)), markDefs = selectedValueAfter.flatMap((block) => isTextBlock(snapshotAfter.context, block) ? block.markDefs?.map((markDef2) => ({
         markDef: markDef2,
         path: [{
           _key: block._key
@@ -7219,10 +7166,7 @@ function createEditableAPI(editor, editorActor) {
       });
     },
     getFragment: () => {
-      const snapshot = getEditorSnapshot({
-        editorActorSnapshot: editorActor.getSnapshot(),
-        editorEngineInstance: editor
-      });
+      const snapshot = editor.snapshot;
       return getFragment(snapshot).map((entry) => entry.node);
     },
     isSelectionsOverlapping: (selectionA, selectionB) => !selectionA || !selectionB ? !1 : rangeIncludes(selectionA, selectionB, editor)
@@ -8309,7 +8253,7 @@ function unsetPatch(editor, patch) {
   }), !0;
 }
 function textPatch(snapshot, operation, beforeValue) {
-  const span = getSpanNode(snapshot, operation.path);
+  const span = getSpan(snapshot, operation.path);
   if (!span)
     return [];
   const beforeSnapshot = {
@@ -8319,7 +8263,7 @@ function textPatch(snapshot, operation, beforeValue) {
       value: beforeValue
     },
     blockIndexMap: /* @__PURE__ */ new Map()
-  }, prevSpan = getSpanNode(beforeSnapshot, operation.path), patch = diffMatchPatch$1(prevSpan?.node.text ?? "", span.node.text, [...operation.path, "text"]);
+  }, prevSpan = getSpan(beforeSnapshot, operation.path), patch = diffMatchPatch$1(prevSpan?.node.text ?? "", span.node.text, [...operation.path, "text"]);
   return patch.value.length ? [patch] : [];
 }
 function insertNodePatch(operation) {
@@ -9307,10 +9251,14 @@ const apply = (editor, op) => {
         focus: op.newProperties.focus
       });
       if (previousSelectionIsCollapsed && newSelectionIsCollapsed) {
-        const focusSpan = getSpanNode(editor, op.properties.focus.path)?.node, newFocusSpan = getSpanNode(editor, op.newProperties.focus.path)?.node, sameParent = pathEquals(parentPath(op.properties.focus.path), parentPath(op.newProperties.focus.path));
+        const focusSpan = getSpan(editor, op.properties.focus.path)?.node, newFocusSpan = getSpan(editor, op.newProperties.focus.path)?.node, sameParent = pathEquals(parentPath(op.properties.focus.path), parentPath(op.newProperties.focus.path));
         let movedToNextSpan = !1, movedToPreviousSpan = !1;
         if (sameParent && focusSpan && newFocusSpan) {
-          const nextSibling = getSibling(editor, op.properties.focus.path, "next"), previousSibling = getSibling(editor, op.properties.focus.path, "previous");
+          const nextSibling = getSibling(editor, op.properties.focus.path, {
+            direction: "next"
+          }), previousSibling = getSibling(editor, op.properties.focus.path, {
+            direction: "previous"
+          });
           movedToNextSpan = nextSibling !== void 0 && pathEquals(nextSibling.path, op.newProperties.focus.path) && focusSpan.text.length === op.properties.focus.offset && op.newProperties.focus.offset === 0, movedToPreviousSpan = previousSibling !== void 0 && pathEquals(previousSibling.path, op.newProperties.focus.path) && op.properties.focus.offset === 0 && newFocusSpan.text.length === op.newProperties.focus.offset;
         }
         !movedToNextSpan && !movedToPreviousSpan && (editor.decoratorState = {});
@@ -9511,9 +9459,7 @@ function applyInsertNodeAtPoint(editor, node, at) {
       schema: editor.schema
     }, n) : (n) => isSpan({
       schema: editor.schema
-    }, n) || isObjectNode({
-      schema: editor.schema
-    }, n), nodeEntry = getNode(editor, at.path), entry = nodeEntry && match2(nodeEntry.node) ? nodeEntry : void 0;
+    }, n) || isObject$1(editor, n), nodeEntry = getNode(editor, at.path), entry = nodeEntry && match2(nodeEntry.node) ? nodeEntry : void 0;
     if (!entry)
       return;
     const matchPath = entry.path, ref = pathRef(editor, matchPath), isAtEnd = isEnd(editor, at, matchPath);
@@ -9535,7 +9481,9 @@ function applyMergeNode(editor, path2, position) {
   const nodeEntry = getNode(editor, path2);
   if (!nodeEntry)
     return;
-  const node = nodeEntry.node, prevSibling = getSibling(editor, path2, "previous");
+  const node = nodeEntry.node, prevSibling = getSibling(editor, path2, {
+    direction: "previous"
+  });
   if (!prevSibling)
     return;
   const prevPath = prevSibling.path, prevKey = prevSibling.node._key ?? "";
@@ -10020,7 +9968,7 @@ const normalizeNode = (editor, entry) => {
     schema: editor.schema
   }, node)) {
     const blockPath = parentPath(path2);
-    if (!getTextBlockNode(editor, blockPath))
+    if (!getTextBlock(editor, blockPath))
       return;
     const decorators = getPathSubSchema(editor, path2).decorators.map((decorator) => decorator.name), annotations = node.marks?.filter((mark) => !decorators.includes(mark));
     if (node.text === "" && annotations && annotations.length > 0) {
@@ -10053,7 +10001,7 @@ const normalizeNode = (editor, entry) => {
   if (isSpan({
     schema: editor.schema
   }, node)) {
-    const blockPath = parentPath(path2), blockEntry2 = getTextBlockNode(editor, blockPath);
+    const blockPath = parentPath(path2), blockEntry2 = getTextBlock(editor, blockPath);
     if (blockEntry2) {
       const block = blockEntry2.node, decorators = getPathSubSchema(editor, path2).decorators.map((decorator) => decorator.name), marks = node.marks ?? [], orphanedAnnotations = marks.filter((mark) => !decorators.includes(mark) && !block.markDefs?.find((def) => def._key === mark));
       if (orphanedAnnotations.length > 0) {
@@ -10107,9 +10055,7 @@ const normalizeNode = (editor, entry) => {
     }
     return;
   }
-  if (isObjectNode({
-    schema: editor.schema
-  }, node)) {
+  if (isObject$1(editor, node)) {
     const resolved = resolveContainerByPath(editor, path2, node), arrayField = resolved && "container" in resolved ? resolved.field : void 0;
     if (arrayField) {
       const fieldValue = node[arrayField.name], needsField = !Array.isArray(fieldValue);
@@ -10143,9 +10089,7 @@ const normalizeNode = (editor, entry) => {
       }
     }
   }
-  if (isObjectNode({
-    schema: editor.schema
-  }, node)) {
+  if (isObject$1(editor, node)) {
     const children = [...getChildren(editor, path2)];
     if (children.length > 1) {
       const seen = /* @__PURE__ */ new Map();
@@ -10198,7 +10142,7 @@ const normalizeNode = (editor, entry) => {
         node: child,
         position: "before"
       });
-      const refetched = getTextBlockNode(editor, path2)?.node;
+      const refetched = getTextBlock(editor, path2)?.node;
       if (!refetched)
         return;
       element = refetched;
@@ -10218,7 +10162,7 @@ const normalizeNode = (editor, entry) => {
               type: "unset",
               path: childPath
             });
-            const refetched = getTextBlockNode(editor, path2)?.node;
+            const refetched = getTextBlock(editor, path2)?.node;
             if (!refetched)
               return;
             element = refetched, n--;
@@ -10230,7 +10174,7 @@ const normalizeNode = (editor, entry) => {
               type: "unset",
               path: prevPath
             });
-            const refetched = getTextBlockNode(editor, path2)?.node;
+            const refetched = getTextBlock(editor, path2)?.node;
             if (!refetched)
               return;
             element = refetched, n--;
@@ -10238,15 +10182,13 @@ const normalizeNode = (editor, entry) => {
             loose: !0
           })) {
             applyMergeNode(editor, childPath, prev.text.length);
-            const refetched = getTextBlockNode(editor, path2)?.node;
+            const refetched = getTextBlock(editor, path2)?.node;
             if (!refetched)
               return;
             element = refetched, n--;
           }
         }
-      } else if (isObjectNode({
-        schema: editor.schema
-      }, child)) {
+      } else if (isObject$1(editor, child)) {
         if (prev == null || !isSpan({
           schema: editor.schema
         }, prev)) {
@@ -10257,7 +10199,7 @@ const normalizeNode = (editor, entry) => {
             node: newChild,
             position: "before"
           });
-          const refetched = getTextBlockNode(editor, path2)?.node;
+          const refetched = getTextBlock(editor, path2)?.node;
           if (!refetched)
             return;
           element = refetched, n++;
@@ -10272,7 +10214,7 @@ const normalizeNode = (editor, entry) => {
             node: newChild,
             position: "after"
           });
-          const refetched = getTextBlockNode(editor, path2)?.node;
+          const refetched = getTextBlock(editor, path2)?.node;
           if (!refetched)
             return;
           element = refetched, n++;
@@ -10391,56 +10333,43 @@ const shouldNormalize = (_editor, {
     onContextChange && onContextChange(options), onChange(options);
   }, e;
 };
-function buildPublicContainers(resolved) {
-  const projected = /* @__PURE__ */ new Map();
-  for (const [type, config] of resolved)
-    projected.set(type, toRegisteredContainer(config));
-  return projected;
+function defaultCompare(a, b) {
+  return a === b;
 }
-function toRegisteredContainer(config) {
+function useEditorSelector(editor, selector, t0) {
+  return useSelector(editor, selector, t0 === void 0 ? defaultCompare : t0);
+}
+function getEditorSnapshot({
+  editorEngineInstance
+}) {
   return {
-    kind: "container",
-    type: config.container.type,
-    field: config.field,
-    ...config.of ? {
-      of: config.of.map(toRegisteredOfEntry).filter(isDefined)
-    } : {}
+    blockIndexMap: editorEngineInstance.blockIndexMap,
+    context: {
+      containers: editorEngineInstance.publicContainers,
+      converters: editorEngineInstance.converters,
+      keyGenerator: editorEngineInstance.keyGenerator,
+      readOnly: editorEngineInstance.readOnly,
+      schema: editorEngineInstance.schema,
+      selection: editorEngineInstance.selection,
+      value: editorEngineInstance.children
+    },
+    decoratorState: editorEngineInstance.decoratorState
   };
 }
-function toRegisteredOfEntry(entry) {
-  if ("container" in entry)
-    return toRegisteredContainer(entry);
-  if ("span" in entry)
-    return {
-      kind: "span",
-      type: entry.span.type
-    };
-  if ("blockObject" in entry)
-    return {
-      kind: "blockObject",
-      type: entry.blockObject.type
-    };
-  if ("inlineObject" in entry)
-    return {
-      kind: "inlineObject",
-      type: entry.inlineObject.type
-    };
-}
-function isDefined(value) {
-  return value !== void 0;
-}
 function createEditorEngine(config) {
   debug.setup("creating new editor engine instance");
   const context = config.editorActor.getSnapshot().context, placeholderBlock = createPlaceholderBlock({
     context: {
       schema: context.schema,
-      containers: buildPublicContainers(context.containers),
+      // No containers registered at engine-init time. NodePlugin
+      // registrations run later, after the engine is attached.
+      containers: /* @__PURE__ */ new Map(),
       value: [],
       keyGenerator: context.keyGenerator
     },
     blockIndexMap: /* @__PURE__ */ new Map()
   }), editor = createEditor();
-  editor.schema = context.schema, editor.keyGenerator = context.keyGenerator, editor.containers = /* @__PURE__ */ new Map(), editor.publicContainers = /* @__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.decoratorState = {}, editor.blockIndexMap = /* @__PURE__ */ new Map(), editor.history = {
+  editor.schema = context.schema, editor.keyGenerator = context.keyGenerator, editor.converters = context.initialConverters, editor.readOnly = context.initialReadOnly, editor.containers = /* @__PURE__ */ new Map(), editor.publicContainers = /* @__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.decoratorState = {}, editor.blockIndexMap = /* @__PURE__ */ new Map(), editor.history = {
     undos: [],
     redos: []
   }, editor.listIndexMap = /* @__PURE__ */ new Map(), editor.remotePatches = [], editor.undoStepId = void 0, editor.children = [placeholderBlock], editor.isDeferringMutations = !1, editor.isNormalizingNode = !1, editor.isPatching = !0, editor.isPerformingBehaviorOperation = !1, editor.isProcessingRemoteChanges = !1, editor.isRedoing = !1, editor.isUndoing = !1, editor.withHistory = !0;
@@ -10455,6 +10384,17 @@ function createEditorEngine(config) {
   }, {
     blockIndexMap: editorEngine.blockIndexMap,
     listIndexMap: editorEngine.listIndexMap
+  }), editorEngine.snapshot = getEditorSnapshot({
+    editorEngineInstance: editorEngine
+  }), config.subscriptions.push(() => {
+    const subscription = config.editorActor.subscribe(() => {
+      editorEngine.snapshot = getEditorSnapshot({
+        editorEngineInstance: editorEngine
+      });
+    });
+    return () => {
+      subscription.unsubscribe();
+    };
   }), editorEngine;
 }
 function createEditorDom(sendBack, editorEngine) {
@@ -10783,7 +10723,9 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
     if (!defaultKeyboardShortcuts.arrowDown.guard(event.originEvent) || !isSelectionCollapsed$1(snapshot))
       return !1;
     const focusedBlockObject = getFocusBlockObject(snapshot);
-    return focusedBlockObject ? !getSibling(snapshot, focusedBlockObject.path, "next") : !1;
+    return focusedBlockObject ? !getSibling(snapshot, focusedBlockObject.path, {
+      direction: "next"
+    }) : !1;
   },
   actions: [({
     snapshot
@@ -10803,7 +10745,9 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
     if (!defaultKeyboardShortcuts.arrowUp.guard(event.originEvent) || !isSelectionCollapsed$1(snapshot))
       return !1;
     const focusedBlockObject = getFocusBlockObject(snapshot);
-    return focusedBlockObject ? !getSibling(snapshot, focusedBlockObject.path, "previous") : !1;
+    return focusedBlockObject ? !getSibling(snapshot, focusedBlockObject.path, {
+      direction: "previous"
+    }) : !1;
   },
   actions: [({
     snapshot
@@ -10848,7 +10792,9 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
     }, focusedBlockObject = getFocusBlockObject(positionSnapshot);
     if (!focusedBlockObject)
       return !1;
-    const previousSibling = getSibling(snapshot, focusedBlockObject.path, "previous");
+    const previousSibling = getSibling(snapshot, focusedBlockObject.path, {
+      direction: "previous"
+    });
     return (event.position.isEditor || event.position.isContainer) && event.position.block === "start" && !previousSibling;
   },
   actions: [({
@@ -10882,7 +10828,9 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
     }, focusedBlockObject = getFocusBlockObject(positionSnapshot);
     if (!focusedBlockObject)
       return !1;
-    const nextSibling = getSibling(snapshot, focusedBlockObject.path, "next");
+    const nextSibling = getSibling(snapshot, focusedBlockObject.path, {
+      direction: "next"
+    });
     return (event.position.isEditor || event.position.isContainer) && event.position.block === "end" && !nextSibling;
   },
   actions: [({
@@ -10907,7 +10855,9 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
     const focusedTextBlock = getFocusTextBlock(snapshot), selectionCollapsed = isSelectionCollapsed$1(snapshot);
     if (!focusedTextBlock || !selectionCollapsed)
       return !1;
-    const previousSibling = getSibling(snapshot, focusedTextBlock.path, "previous");
+    const previousSibling = getSibling(snapshot, focusedTextBlock.path, {
+      direction: "previous"
+    });
     if (!previousSibling || isListBlock(snapshot.context, focusedTextBlock.node))
       return !1;
     if (isEmptyTextBlock(snapshot.context, focusedTextBlock.node) && !isTextBlockNode(snapshot.context, previousSibling.node)) {
@@ -10948,7 +10898,9 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
     const focusedTextBlock = getFocusTextBlock(snapshot), selectionCollapsed = isSelectionCollapsed$1(snapshot);
     if (!focusedTextBlock || !selectionCollapsed)
       return !1;
-    const nextSibling = getSibling(snapshot, focusedTextBlock.path, "next");
+    const nextSibling = getSibling(snapshot, focusedTextBlock.path, {
+      direction: "next"
+    });
     return nextSibling && isEmptyTextBlock(snapshot.context, focusedTextBlock.node) && !isTextBlockNode(snapshot.context, nextSibling.node) ? {
       focusedTextBlock,
       nextSibling
@@ -11002,11 +10954,15 @@ function isAtContainerDeadEnd(snapshot, edge) {
   const focusTextBlock = getFocusTextBlock(snapshot);
   if (!focusTextBlock)
     return !1;
-  const container = getAncestor(snapshot, focusTextBlock.path, (node, path2) => isEditableContainer(snapshot, node, path2));
+  const container = getAncestor(snapshot, focusTextBlock.path, {
+    match: (node, path2) => isEditableContainer(snapshot, node, path2)
+  });
   if (!container)
     return !1;
   const edgeBlock = edge === "end" ? getLastBlock(snapshot) : getFirstBlock(snapshot);
-  return !edgeBlock || !pathEquals(edgeBlock.path, focusTextBlock.path) || !(edge === "end" ? isAtTheEndOfBlock(focusTextBlock)(snapshot) : isAtTheStartOfBlock(focusTextBlock)(snapshot)) ? !1 : getSibling(snapshot, container.path, edge === "end" ? "next" : "previous") === void 0;
+  return !edgeBlock || !pathEquals(edgeBlock.path, focusTextBlock.path) || !(edge === "end" ? isAtTheEndOfBlock(focusTextBlock)(snapshot) : isAtTheStartOfBlock(focusTextBlock)(snapshot)) ? !1 : getSibling(snapshot, container.path, {
+    direction: edge === "end" ? "next" : "previous"
+  }) === void 0;
 }
 const breakingOutOfContainer = defineBehavior({
   on: "insert.break",
@@ -11021,7 +10977,9 @@ const breakingOutOfContainer = defineBehavior({
     const lastBlock = getLastBlock(snapshot);
     if (!lastBlock || !pathEquals(lastBlock.path, focusTextBlock.path) || !isEmptyTextBlock(snapshot.context, focusTextBlock.node))
       return !1;
-    const previousBlock = getSibling(snapshot, focusTextBlock.path, "previous");
+    const previousBlock = getSibling(snapshot, focusTextBlock.path, {
+      direction: "previous"
+    });
     if (!previousBlock || !isEmptyTextBlock(snapshot.context, previousBlock.node))
       return !1;
     const escapeAfter = getEscapeTarget(snapshot, focusTextBlock.path);
@@ -11061,11 +11019,13 @@ const breakingOutOfContainer = defineBehavior({
   })]]
 });
 function getEscapeTarget(snapshot, path2) {
-  return getAncestor(snapshot, path2, (node, ancestorPath) => {
-    if (!isEditableContainer(snapshot, node, ancestorPath))
-      return !1;
-    const enclosing = getEnclosingContainer(snapshot, ancestorPath);
-    return enclosing ? enclosing.of.some((member) => member.type === snapshot.context.schema.block.name) : !0;
+  return getAncestor(snapshot, path2, {
+    match: (node, ancestorPath) => {
+      if (!isEditableContainer(snapshot, node, ancestorPath))
+        return !1;
+      const enclosing = getEnclosingContainer(snapshot, ancestorPath);
+      return enclosing ? enclosing.of.some((member) => member.type === snapshot.context.schema.block.name) : !0;
+    }
   })?.path;
 }
 const coreContainerBehaviors = {
@@ -11513,7 +11473,7 @@ const coreDndBehaviors = [
       for (const entry of getNodes(snapshot, {
         from: selectionStartBlock.path,
         to: selectionEndBlock.path,
-        match: (_node, path2) => isBlock(snapshot, path2)
+        match: (_, path2) => isBlock(snapshot, path2)
       })) {
         const block = getBlock(snapshot, entry.path);
         block && selectedBlocks.push(block);
@@ -11570,7 +11530,11 @@ function isAtTheBeginningOfBlock({
 }) {
   if (!isTextBlock(snapshot.context, block) || !snapshot.context.selection || !isSelectionCollapsed(snapshot.context.selection))
     return !1;
-  const focusPath = snapshot.context.selection.focus.path, ancestorTextBlock = getAncestorTextBlock(snapshot, focusPath);
+  const focusPath = snapshot.context.selection.focus.path, ancestorTextBlock = getParent(snapshot, focusPath, {
+    match: (node) => isTextBlock({
+      schema: snapshot.context.schema
+    }, node)
+  });
   if (!ancestorTextBlock || ancestorTextBlock.node._key !== block._key)
     return !1;
   const lastSegment = focusPath.at(-1);
@@ -12121,7 +12085,7 @@ const addAnnotationOperationImplementation = ({
       }, blockPath);
       const splitRange = at ?? editor.selection;
       if (splitRange && isRange(splitRange)) {
-        const splitLeafEntry = getNode(editor, splitRange.anchor.path), splitLeaf = splitLeafEntry && isLeaf(editor, splitLeafEntry.path) ? splitLeafEntry.node : void 0;
+        const splitLeaf = getNode(editor, splitRange.anchor.path)?.node;
         if (!(splitLeaf && isCollapsedRange(splitRange) && isSpan({
           schema: editor.schema
         }, splitLeaf) && splitLeaf.text.length > 0)) {
@@ -12164,7 +12128,11 @@ const removeAnnotationOperationImplementation = ({
   const editor = operation.editor, at = operation.at ? resolveSelection(operation.editor, operation.at) : null, effectiveSelection = at ?? editor.selection;
   if (effectiveSelection)
     if (isCollapsedRange(effectiveSelection)) {
-      const blockEntry = getAncestorTextBlock(snapshot, effectiveSelection.focus.path);
+      const blockEntry = getParent(snapshot, effectiveSelection.focus.path, {
+        match: (node) => isTextBlock({
+          schema: editor.schema
+        }, node)
+      });
       if (!blockEntry)
         return;
       const {
@@ -12224,7 +12192,7 @@ const removeAnnotationOperationImplementation = ({
       withoutNormalizing(editor, () => {
         const splitRange = at ?? editor.selection;
         if (splitRange && isRange(splitRange)) {
-          const splitLeafEntry = getNode(editor, splitRange.anchor.path), splitLeaf = splitLeafEntry && isLeaf(editor, splitLeafEntry.path) ? splitLeafEntry.node : void 0;
+          const splitLeaf = getNode(editor, splitRange.anchor.path)?.node;
           if (!(splitLeaf && isCollapsedRange(splitRange) && isSpan({
             schema: editor.schema
           }, splitLeaf) && splitLeaf.text.length > 0)) {
@@ -12413,9 +12381,7 @@ const childSetOperationImplementation = ({
     }));
     return;
   }
-  if (isObjectNode({
-    schema: operation.editor.schema
-  }, child)) {
+  if (isObject$1(operation.editor, child)) {
     const blockPath = parentPath(childPath), {
       inlineObjects
     } = getPathSubSchema(snapshot, blockPath), definition = inlineObjects.find((definition2) => definition2.name === child._type);
@@ -12464,9 +12430,7 @@ const childSetOperationImplementation = ({
     setNodeProperties(operation.editor, newNode, childPath);
     return;
   }
-  if (isObjectNode({
-    schema: operation.editor.schema
-  }, child)) {
+  if (isObject$1(operation.editor, child)) {
     const unsetProps = {};
     for (const prop of operation.props)
       prop !== "_type" && (prop === "_key" ? unsetProps._key = context.keyGenerator() : unsetProps[prop] = null);
@@ -12523,7 +12487,11 @@ const childSetOperationImplementation = ({
         }, node)
       }))?.at(0))
         return;
-      const blockEntry = getAncestorTextBlock(snapshot, at.focus.path);
+      const blockEntry = getParent(snapshot, at.focus.path, {
+        match: (node) => isTextBlock({
+          schema: snapshot.context.schema
+        }, node)
+      });
       if (!blockEntry)
         return;
       const {
@@ -12571,7 +12539,7 @@ const childSetOperationImplementation = ({
         affinity: "inward"
       });
       withoutNormalizing(editor, () => {
-        const decoratorLeafEntry = getNode(editor, at.anchor.path), decoratorLeaf = decoratorLeafEntry && isLeaf(editor, decoratorLeafEntry.path) ? decoratorLeafEntry.node : void 0;
+        const decoratorLeaf = getNode(editor, at.anchor.path)?.node;
         if (!(decoratorLeaf && isCollapsedRange(at) && isSpan({
           schema: editor.schema
         }, decoratorLeaf) && decoratorLeaf.text.length > 0)) {
@@ -12606,7 +12574,11 @@ const childSetOperationImplementation = ({
         }
       });
     } else {
-      const textBlockEntry = getAncestorTextBlock(snapshot, at.focus.path);
+      const textBlockEntry = getParent(snapshot, at.focus.path, {
+        match: (node) => isTextBlock({
+          schema: editor.schema
+        }, node)
+      });
       if (!textBlockEntry)
         return;
       const {
@@ -12646,15 +12618,21 @@ function unhangRange(snapshot, range2) {
   let [start2, end2] = rangeEdges(range2, {
     children: context.value
   });
-  if (start2.offset !== 0 || end2.offset !== 0 || isCollapsedRange(range2) || getSibling(snapshot, end2.path, "previous") !== void 0)
+  if (start2.offset !== 0 || end2.offset !== 0 || isCollapsedRange(range2) || getSibling(snapshot, end2.path, {
+    direction: "previous"
+  }) !== void 0)
     return range2;
-  const endBlock = getAncestorTextBlock(snapshot, end2.path), blockPath = endBlock ? endBlock.path : [];
+  const endBlock = getParent(snapshot, end2.path, {
+    match: (node) => isTextBlock({
+      schema: snapshot.context.schema
+    }, node)
+  }), blockPath = endBlock ? endBlock.path : [];
   for (const {
     path: path2
   } of getNodes(snapshot, {
     from: start2.path,
     to: end2.path,
-    match: (candidate, candidatePath) => isVoidNode(snapshot, candidate, candidatePath) || isEditableContainer(snapshot, candidate, candidatePath)
+    match: (candidate, candidatePath) => isLeafObject(snapshot, candidate, candidatePath) || isEditableContainer(snapshot, candidate, candidatePath)
   }))
     if (!isAncestorPath(path2, start2.path) && !isAncestorPath(path2, end2.path))
       return range2;
@@ -12691,23 +12669,6 @@ function unhangRange(snapshot, range2) {
     focus: end2
   };
 }
-function getHighestObjectNode(snapshot, path2) {
-  const ancestors = getAncestors(snapshot, path2);
-  for (let i = ancestors.length - 1; i >= 0; i--) {
-    const ancestor = ancestors[i];
-    if (ancestor && isVoidNode(snapshot, ancestor.node, ancestor.path))
-      return {
-        node: ancestor.node,
-        path: ancestor.path
-      };
-  }
-  const entry = getNode(snapshot, path2);
-  if (entry && isVoidNode(snapshot, entry.node, entry.path))
-    return {
-      node: entry.node,
-      path: entry.path
-    };
-}
 function pointRef(editor, point2, options = {}) {
   const {
     affinity = "forward"
@@ -12726,8 +12687,12 @@ function pointRef(editor, point2, options = {}) {
 function getFullyCoveredContainers(editor, range2) {
   const [start2, end2] = rangeEdges(range2, editor);
   return {
-    start: getAncestor(editor, start2.path, (node, path2) => isFullyCovered(editor, node, path2, start2, end2))?.path,
-    end: getAncestor(editor, end2.path, (node, path2) => isFullyCovered(editor, node, path2, start2, end2))?.path
+    start: getAncestor(editor, start2.path, {
+      match: (node, path2) => isFullyCovered(editor, node, path2, start2, end2)
+    })?.path,
+    end: getAncestor(editor, end2.path, {
+      match: (node, path2) => isFullyCovered(editor, node, path2, start2, end2)
+    })?.path
   };
 }
 function isFullyCovered(editor, node, path2, rangeStart2, rangeEnd2) {
@@ -12800,21 +12765,23 @@ function deleteSameBlockRange(editor, start2, end2, capture) {
   if (pathEquals(start2.path, end2.path))
     return removeTextRange(editor, start2.path, start2.offset, end2.offset, capture);
   const startEntry = getNode(editor, start2.path);
-  if (startEntry && isVoidNode(editor, startEntry.node, start2.path))
+  if (startEntry && isLeafObject(editor, startEntry.node, start2.path))
     return editor.apply({
       type: "unset",
       path: start2.path
     }), null;
   const removed = removeTextFromOffset(editor, start2.path, start2.offset, capture);
   removeChildrenBetween(editor, start2.path, end2.path);
-  const adjustedEnd = getSibling(editor, start2.path, "next");
-  return adjustedEnd ? isVoidNode(editor, adjustedEnd.node, adjustedEnd.path) ? (editor.apply({
+  const adjustedEnd = getSibling(editor, start2.path, {
+    direction: "next"
+  });
+  return adjustedEnd ? isLeafObject(editor, adjustedEnd.node, adjustedEnd.path) ? (editor.apply({
     type: "unset",
     path: adjustedEnd.path
   }), removed) : (removeTextUpToOffset(editor, adjustedEnd.path, end2.offset), removed) : removed;
 }
 function deleteSameParentCrossBlockRange(editor, startBlockPath, endBlockPath, start2, end2, removeEmptyStartBlock) {
-  const startBlockNode = getNode(editor, startBlockPath), endBlockNode = getNode(editor, endBlockPath), startIsVoid = startBlockNode != null && isVoidNode(editor, startBlockNode.node, startBlockPath), endIsVoid = endBlockNode != null && isVoidNode(editor, endBlockNode.node, endBlockPath);
+  const startBlockNode = getNode(editor, startBlockPath), endBlockNode = getNode(editor, endBlockPath), startIsVoid = startBlockNode != null && isLeafObject(editor, startBlockNode.node, startBlockPath), endIsVoid = endBlockNode != null && isLeafObject(editor, endBlockNode.node, endBlockPath);
   if (startIsVoid || (pathEquals(start2.path, startBlockPath) ? removeAllChildren(editor, startBlockPath) : (removeTextFromOffset(editor, start2.path, start2.offset, !1), removeTrailingChildren(editor, start2.path))), removeBlocksBetween(editor, startBlockPath, endBlockPath), startIsVoid && endIsVoid) {
     removeNodeAt(editor, endBlockPath), removeNodeAt(editor, startBlockPath);
     return;
@@ -12832,7 +12799,9 @@ function deleteSameParentCrossBlockRange(editor, startBlockPath, endBlockPath, s
     removeNodeAt(editor, endBlockPath);
     return;
   }
-  const adjustedEndBlockPath = getSibling(editor, startBlockPath, "next")?.path ?? startBlockPath;
+  const adjustedEndBlockPath = getSibling(editor, startBlockPath, {
+    direction: "next"
+  })?.path ?? startBlockPath;
   if (!pathEquals(end2.path, endBlockPath)) {
     removeLeadingChildrenOf(editor, adjustedEndBlockPath, end2.path);
     const firstChild = getFirstChild(editor, adjustedEndBlockPath);
@@ -12853,10 +12822,14 @@ function deleteCrossParentRange(editor, startBlockPath, endBlockPath, start2, en
   if (!lcaContainer || lcaContainer.of.some((member) => member.type === editor.schema.block.name))
     removeChildrenBetween(editor, startBranchRoot, endBranchRoot);
   else {
-    let cursor = getSibling(editor, startBranchRoot, "next");
+    let cursor = getSibling(editor, startBranchRoot, {
+      direction: "next"
+    });
     for (; cursor && !pathEquals(cursor.path, endBranchRoot); ) {
       const cursorPath = cursor.path;
-      clearContainerContents(editor, cursorPath), cursor = getSibling(editor, cursorPath, "next");
+      clearContainerContents(editor, cursorPath), cursor = getSibling(editor, cursorPath, {
+        direction: "next"
+      });
     }
   }
   let endLevel = endBlockPath;
@@ -12883,7 +12856,7 @@ function deleteCrossParentRange(editor, startBlockPath, endBlockPath, start2, en
   });
 }
 function removeTextRange(editor, path2, startOffset, endOffset, capture) {
-  const span = getSpanNode(editor, path2);
+  const span = getSpan(editor, path2);
   if (!span)
     return null;
   const text = span.node.text.slice(startOffset, endOffset);
@@ -12895,7 +12868,7 @@ function removeTextRange(editor, path2, startOffset, endOffset, capture) {
   }), capture ? text : null);
 }
 function removeTextFromOffset(editor, path2, offset, capture) {
-  const span = getSpanNode(editor, path2);
+  const span = getSpan(editor, path2);
   if (!span || offset >= span.node.text.length)
     return null;
   const text = span.node.text.slice(offset);
@@ -12909,7 +12882,7 @@ function removeTextFromOffset(editor, path2, offset, capture) {
 function removeTextUpToOffset(editor, path2, offset) {
   if (offset <= 0)
     return;
-  const span = getSpanNode(editor, path2);
+  const span = getSpan(editor, path2);
   span && editor.apply({
     type: "remove_text",
     path: path2,
@@ -12918,9 +12891,13 @@ function removeTextUpToOffset(editor, path2, offset) {
   });
 }
 function removeChildrenBetween(editor, startChildPath, endChildPath) {
-  let cursor = getSibling(editor, startChildPath, "next");
+  let cursor = getSibling(editor, startChildPath, {
+    direction: "next"
+  });
   for (; cursor && !pathEquals(cursor.path, endChildPath); )
-    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startChildPath, "next");
+    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startChildPath, {
+      direction: "next"
+    });
 }
 function clearContainerContents(editor, containerPath) {
   const node = getNode(editor, containerPath)?.node;
@@ -12947,27 +12924,43 @@ function clearContainerContents(editor, containerPath) {
     clearContainerContents(editor, child.path);
 }
 function removeTrailingChildren(editor, startChildPath) {
-  let cursor = getSibling(editor, startChildPath, "next");
+  let cursor = getSibling(editor, startChildPath, {
+    direction: "next"
+  });
   for (; cursor; )
-    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startChildPath, "next");
+    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startChildPath, {
+      direction: "next"
+    });
 }
 function clearTrailingSiblings(editor, startChildPath) {
-  let cursor = getSibling(editor, startChildPath, "next");
+  let cursor = getSibling(editor, startChildPath, {
+    direction: "next"
+  });
   for (; cursor; ) {
     const cursorPath = cursor.path;
-    clearContainerContents(editor, cursorPath), cursor = getSibling(editor, cursorPath, "next");
+    clearContainerContents(editor, cursorPath), cursor = getSibling(editor, cursorPath, {
+      direction: "next"
+    });
   }
 }
 function removePrecedingSiblings(editor, startChildPath) {
-  let cursor = getSibling(editor, startChildPath, "previous");
+  let cursor = getSibling(editor, startChildPath, {
+    direction: "previous"
+  });
   for (; cursor; )
-    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startChildPath, "previous");
+    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startChildPath, {
+      direction: "previous"
+    });
 }
 function clearPrecedingSiblings(editor, startChildPath) {
-  let cursor = getSibling(editor, startChildPath, "previous");
+  let cursor = getSibling(editor, startChildPath, {
+    direction: "previous"
+  });
   for (; cursor; ) {
     const cursorPath = cursor.path;
-    clearContainerContents(editor, cursorPath), cursor = getSibling(editor, cursorPath, "previous");
+    clearContainerContents(editor, cursorPath), cursor = getSibling(editor, cursorPath, {
+      direction: "previous"
+    });
   }
 }
 function parentAcceptsTextBlock(editor, path2) {
@@ -12988,14 +12981,18 @@ function removeLeadingChildrenOf(editor, blockPath, endChildPath) {
     removeNodeAt(editor, firstChild.path), firstChild = getFirstChild(editor, blockPath);
 }
 function removeBlocksBetween(editor, startBlockPath, endBlockPath) {
-  let cursor = getSibling(editor, startBlockPath, "next");
+  let cursor = getSibling(editor, startBlockPath, {
+    direction: "next"
+  });
   for (; cursor && !pathEquals(cursor.path, endBlockPath); )
-    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startBlockPath, "next");
+    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startBlockPath, {
+      direction: "next"
+    });
 }
 function mergeBlock(editor, startBlockPath, endBlockPath, removeEmptyStartBlock) {
   if (pathEquals(startBlockPath, endBlockPath))
     return;
-  const startBlock = getTextBlockNode(editor, startBlockPath), endBlock = getTextBlockNode(editor, endBlockPath);
+  const startBlock = getTextBlock(editor, startBlockPath), endBlock = getTextBlock(editor, endBlockPath);
   if (!startBlock || !endBlock)
     return;
   if (removeEmptyStartBlock && isEmptyTextBlock({
@@ -13027,7 +13024,10 @@ function removeNodeAt(editor, path2) {
 }
 function deleteCollapsed(editor, point2, options) {
   withoutNormalizing(editor, () => {
-    const furthestObjectNode = getHighestObjectNode(editor, point2.path);
+    const pointEntry = getNode(editor, point2.path), furthestObjectNode = pointEntry && isLeafObject(editor, pointEntry.node, point2.path) ? pointEntry : getAncestor(editor, point2.path, {
+      match: (node, ancestorPath) => isLeafObject(editor, node, ancestorPath),
+      mode: "highest"
+    });
     if (furthestObjectNode) {
       editor.apply({
         type: "unset",
@@ -13074,11 +13074,19 @@ function resolveExplicitRange(editor, at) {
     return null;
   const [start2, end2] = rangeEdges(at, editor), startBlock = getEnclosingBlock(editor, start2.path), endBlock = getEnclosingBlock(editor, end2.path);
   let clampedStart = start2, clampedEnd = end2;
-  if (getHighestObjectNode(editor, start2.path) && startBlock) {
+  const startEntry = getNode(editor, start2.path);
+  if ((startEntry && isLeafObject(editor, startEntry.node, start2.path) ? startEntry : getAncestor(editor, start2.path, {
+    match: (node, ancestorPath) => isLeafObject(editor, node, ancestorPath),
+    mode: "highest"
+  })) && startBlock) {
     const beforePoint = before(editor, start2);
     beforePoint && isAncestorPath(startBlock.path, beforePoint.path) && (clampedStart = beforePoint);
   }
-  if (getHighestObjectNode(editor, end2.path) && endBlock) {
+  const endEntry = getNode(editor, end2.path);
+  if ((endEntry && isLeafObject(editor, endEntry.node, end2.path) ? endEntry : getAncestor(editor, end2.path, {
+    match: (node, ancestorPath) => isLeafObject(editor, node, ancestorPath),
+    mode: "highest"
+  })) && endBlock) {
     const afterPoint = after(editor, end2);
     afterPoint && isAncestorPath(endBlock.path, afterPoint.path) && (clampedEnd = afterPoint);
   }
@@ -13182,10 +13190,6 @@ function transformPoint(point2, innerPrefix) {
     offset: point2.offset
   } : point2;
 }
-function isEmptyContainer(snapshot, path2) {
-  const children = getChildren(snapshot, path2);
-  return children.length === 1 && isEmptyTextBlock(snapshot.context, children[0].node);
-}
 const deleteOperationImplementation = ({
   operation
 }) => {
@@ -13194,19 +13198,27 @@ const deleteOperationImplementation = ({
     throw new Error("Unable to delete without a selection");
   const [start2, end2] = rangeEdges(at, operation.editor);
   if (operation.unit === "block") {
-    unsetMatchedNodesInRange(operation.editor, start2.path, end2.path, (_node, path2) => isBlock(operation.editor, path2));
+    unsetMatchedNodesInRange(operation.editor, start2.path, end2.path, (_, path2) => isBlock(operation.editor, path2));
     return;
   }
   if (operation.unit === "child") {
-    unsetMatchedNodesInRange(operation.editor, start2.path, end2.path, (_node, path2) => isInline(operation.editor, path2));
+    unsetMatchedNodesInRange(operation.editor, start2.path, end2.path, (_, path2) => isInline(operation.editor, path2));
     return;
   }
   if (operation.direction === "backward" && operation.unit === "line") {
-    const parentBlockEntry = pathEquals(at.anchor.path, at.focus.path) ? getAncestorTextBlock(operation.editor, at.anchor.path) : (() => {
+    const parentBlockEntry = pathEquals(at.anchor.path, at.focus.path) ? getParent(operation.editor, at.anchor.path, {
+      match: (node) => isTextBlock({
+        schema: operation.editor.schema
+      }, node)
+    }) : (() => {
       const fromPath = commonPath(at.anchor.path, at.focus.path), nodeEntry = getNode(operation.editor, fromPath);
       return nodeEntry && isTextBlockNode({
         schema: operation.editor.schema
-      }, nodeEntry.node) ? nodeEntry : getAncestorTextBlock(operation.editor, fromPath);
+      }, nodeEntry.node) ? nodeEntry : getParent(operation.editor, fromPath, {
+        match: (node) => isTextBlock({
+          schema: operation.editor.schema
+        }, node)
+      });
     })();
     if (parentBlockEntry) {
       const parentElementRange = range(operation.editor, parentBlockEntry.path, at.anchor), currentLineRange = findCurrentLineRange(operation.editor, parentElementRange);
@@ -13221,8 +13233,10 @@ const deleteOperationImplementation = ({
   }
   const direction = operation.direction === "backward" ? "backward" : "forward", selection = operation.at ? "preserve" : "collapse-to-start";
   if (isCollapsedRange(at)) {
-    const enclosingContainer = getAncestor(operation.editor, at.anchor.path, (node, path2) => isObjectNode(operation.editor, node) && isEditableContainer(operation.editor, node, path2));
-    if (enclosingContainer && isEmptyContainer(operation.editor, enclosingContainer.path)) {
+    const enclosingContainer = getAncestor(operation.editor, at.anchor.path, {
+      match: (node, path2) => isObject$1(operation.editor, node) && isEditableContainer(operation.editor, node, path2)
+    }), enclosingContainerChildren = enclosingContainer ? getChildren(operation.editor, enclosingContainer.path) : void 0, [firstChild] = enclosingContainerChildren ?? [];
+    if (enclosingContainer && enclosingContainerChildren?.length === 1 && firstChild && isEmptyTextBlock(operation.editor.context, firstChild.node)) {
       unwrapContainer(operation.editor, enclosingContainer.path, operation.direction === "backward" ? "before" : "after");
       return;
     }
@@ -13679,10 +13693,10 @@ function splitBlockAndInsert(editor, block, blockPath, splitAt) {
     affinity: "backward"
   });
   if (splitAt.offset > 0) {
-    const spanEntry = getSpanNode(editor, splitAt.path);
+    const spanEntry = getSpan(editor, splitAt.path);
     spanEntry && splitAt.offset < spanEntry.node.text.length && applySplitNode(editor, splitAt.path, splitAt.offset);
   }
-  const currentBlockPath = blockPathRef.current ?? blockPath, blockEntry = getTextBlockNode(editor, currentBlockPath);
+  const currentBlockPath = blockPathRef.current ?? blockPath, blockEntry = getTextBlock(editor, currentBlockPath);
   if (blockEntry) {
     const childSegment = splitAt.path[blockPath.length + 1], childIndex = resolveChildIndex(blockEntry.node.children, childSegment), splitAtIndex = splitAt.offset > 0 ? childIndex + 1 : childIndex;
     splitAtIndex > 0 && splitAtIndex < blockEntry.node.children.length && applySplitNode(editor, currentBlockPath, splitAtIndex);
@@ -13699,7 +13713,7 @@ function mergeTextBlockFragment(args) {
     endBlockPath,
     select: select2,
     wasCrossBlock
-  } = args, endBlockEntry = getTextBlockNode(editor, endBlockPath);
+  } = args, endBlockEntry = getTextBlock(editor, endBlockPath);
   if (!endBlockEntry)
     return;
   const endBlock = endBlockEntry.node, {
@@ -13757,7 +13771,11 @@ function executeDeleteThenInsert(args) {
   const collapsedRange = collapsedRangeRef.unref() ?? editor.selection, collapsedPoint = collapsedRange ? rangeStart(collapsedRange, editor) : void 0;
   if (!collapsedPoint)
     return;
-  const resolvedBlock = getAncestorTextBlock(editor, collapsedPoint.path), blockIsText = isTextBlock({
+  const resolvedBlock = getParent(editor, collapsedPoint.path, {
+    match: (node) => isTextBlock({
+      schema: editor.schema
+    }, node)
+  }), blockIsText = isTextBlock({
     schema: editor.schema
   }, block), postDeleteSelection = select2 === "none" ? collapsedRange : selectionAtEntry;
   if (blockIsText && resolvedBlock) {
@@ -13807,7 +13825,9 @@ function removeAdjacentEmptyTextBlock(args) {
     insertedPath
   } = args;
   for (const direction of ["next", "previous"]) {
-    const sibling = getSibling(editor, insertedPath, direction);
+    const sibling = getSibling(editor, insertedPath, {
+      direction
+    });
     if (sibling && isEmptyTextBlock(context, sibling.node)) {
       editor.apply({
         type: "unset",
@@ -13877,11 +13897,11 @@ function insertFragmentChildren(editor, block, at) {
     schema: editor.schema
   }, block))
     return;
-  at.offset > 0 && getSpanNode(editor, at.path) && applySplitNode(editor, at.path, at.offset);
+  at.offset > 0 && getSpan(editor, at.path) && applySplitNode(editor, at.path, at.offset);
   const parent = parentPath(at.path);
   let firstInsertedKey;
   if (at.offset === 0 && block.children.length === 1) {
-    const firstChild = block.children[0], existingEntry = getSpanNode(editor, at.path);
+    const firstChild = block.children[0], existingEntry = getSpan(editor, at.path);
     if (existingEntry && isSpan({
       schema: editor.schema
     }, firstChild))
@@ -13915,7 +13935,11 @@ const insertChildOperationImplementation = ({
   } = snapshot, focus = operation.editor.selection?.focus;
   if (!focus)
     throw new Error("Unable to insert child without a focus");
-  const focusBlockEntry = getAncestorTextBlock(operation.editor, focus.path);
+  const focusBlockEntry = getParent(operation.editor, focus.path, {
+    match: (node) => isTextBlock({
+      schema: operation.editor.schema
+    }, node)
+  });
   if (!focusBlockEntry)
     throw new Error("Unable to insert child without a focus block");
   const focusBlock = focusBlockEntry.node;
@@ -13943,7 +13967,9 @@ const insertChildOperationImplementation = ({
     }, focusSpanEntry.node) && focusSpanEntry.node)
       applyInsertNodeAtPoint(operation.editor, span, focus);
     else {
-      const nextSibling = getSibling(operation.editor, focusChildPath, "next");
+      const nextSibling = getSibling(operation.editor, focusChildPath, {
+        direction: "next"
+      });
       nextSibling ? applyInsertNodeAtPath(operation.editor, span, nextSibling.path) : operation.editor.apply({
         type: "insert",
         path: focusChildPath,
@@ -13977,7 +14003,9 @@ const insertChildOperationImplementation = ({
     }, focusSpanEntry.node) && focusSpanEntry.node)
       applyInsertNodeAtPoint(operation.editor, inlineNode, focus);
     else {
-      const nextSibling = getSibling(operation.editor, focusChildPath, "next");
+      const nextSibling = getSibling(operation.editor, focusChildPath, {
+        direction: "next"
+      });
       nextSibling ? applyInsertNodeAtPath(operation.editor, inlineNode, nextSibling.path) : operation.editor.apply({
         type: "insert",
         path: focusChildPath,
@@ -14017,12 +14045,12 @@ const insertChildOperationImplementation = ({
   if (!nodeEntry)
     return;
   const node = nodeEntry.node;
-  if (isLeaf(editor, nodeEntry.path) && !isSpan({
-    schema: editor.schema
-  }, node)) {
-    const nextSibling = getSibling(editor, nodeEntry.path, "next");
+  if (isLeafObject(editor, node, nodeEntry.path)) {
+    const nextSibling = getSibling(editor, nodeEntry.path, {
+      direction: "next"
+    });
     if (nextSibling)
-      if (getSpanNode(editor, nextSibling.path))
+      if (getSpan(editor, nextSibling.path))
         path2 = nextSibling.path, offset = 0, applySelect(editor, {
           path: path2,
           offset
@@ -14307,7 +14335,9 @@ const abstractAnnotationBehaviors = [defineBehavior({
     }, focusTextBlock = getFocusTextBlock(adjustedSnapshot);
     if (!focusTextBlock)
       return !1;
-    const previousSibling = getSibling(adjustedSnapshot, focusTextBlock.path, "previous");
+    const previousSibling = getSibling(adjustedSnapshot, focusTextBlock.path, {
+      direction: "previous"
+    });
     if (!previousSibling || !isAtTheStartOfBlock(focusTextBlock)(adjustedSnapshot) || !isTextBlock(snapshot.context, previousSibling.node))
       return !1;
     const previousBlock = {
@@ -14372,7 +14402,9 @@ const abstractAnnotationBehaviors = [defineBehavior({
     }, focusTextBlock = getFocusTextBlock(adjustedSnapshot);
     if (!focusTextBlock)
       return !1;
-    const nextSibling = getSibling(adjustedSnapshot, focusTextBlock.path, "next");
+    const nextSibling = getSibling(adjustedSnapshot, focusTextBlock.path, {
+      direction: "next"
+    });
     if (!nextSibling || !isEmptyTextBlock(snapshot.context, focusTextBlock.node) || !isTextBlock(snapshot.context, nextSibling.node))
       return !1;
     const nextBlockStartPoint = getBlockStartPoint({
@@ -14420,7 +14452,9 @@ const abstractAnnotationBehaviors = [defineBehavior({
     }, focusTextBlock = getFocusTextBlock(adjustedSnapshot);
     if (!focusTextBlock)
       return !1;
-    const nextSibling = getSibling(adjustedSnapshot, focusTextBlock.path, "next");
+    const nextSibling = getSibling(adjustedSnapshot, focusTextBlock.path, {
+      direction: "next"
+    });
     return !nextSibling || !isAtTheEndOfBlock(focusTextBlock)(adjustedSnapshot) || !isTextBlockNode(snapshot.context, nextSibling.node) ? !1 : {
       nextBlock: {
         node: nextSibling.node,
@@ -15418,7 +15452,9 @@ const abstractInsertBehaviors = [
       const focusTextBlock = getFocusTextBlock(snapshot);
       if (!focusTextBlock)
         return !1;
-      const previousSibling = getSibling(snapshot, focusTextBlock.path, "previous");
+      const previousSibling = getSibling(snapshot, focusTextBlock.path, {
+        direction: "previous"
+      });
       if (!previousSibling)
         return !1;
       const previousBlock = getBlock(snapshot, previousSibling.path);
@@ -15539,7 +15575,9 @@ const abstractInsertBehaviors = [
     snapshot,
     event
   }) => {
-    const previousSibling = getSibling(snapshot, event.at, "previous");
+    const previousSibling = getSibling(snapshot, event.at, {
+      direction: "previous"
+    });
     return previousSibling ? {
       previousSibling,
       savedSelection: snapshot.context.selection
@@ -15567,7 +15605,9 @@ const abstractInsertBehaviors = [
     snapshot,
     event
   }) => {
-    const nextSibling = getSibling(snapshot, event.at, "next");
+    const nextSibling = getSibling(snapshot, event.at, {
+      direction: "next"
+    });
     return nextSibling ? {
       nextSibling,
       savedSelection: snapshot.context.selection
@@ -15639,7 +15679,9 @@ const abstractInsertBehaviors = [
     const focusBlockPath = getFocusBlock(snapshot)?.path;
     if (!focusBlockPath)
       return !1;
-    const previousSibling = getSibling(snapshot, focusBlockPath, "previous");
+    const previousSibling = getSibling(snapshot, focusBlockPath, {
+      direction: "previous"
+    });
     return previousSibling ? {
       previousBlock: previousSibling
     } : !1;
@@ -15661,7 +15703,9 @@ const abstractInsertBehaviors = [
     const focusBlockPath = getFocusBlock(snapshot)?.path;
     if (!focusBlockPath)
       return !1;
-    const nextSibling = getSibling(snapshot, focusBlockPath, "next");
+    const nextSibling = getSibling(snapshot, focusBlockPath, {
+      direction: "next"
+    });
     return nextSibling ? {
       nextBlock: nextSibling
     } : !1;
@@ -15773,7 +15817,15 @@ const abstractInsertBehaviors = [
       const startPoint = getSelectionStartPoint$1(selection), endPoint = getSelectionEndPoint$1(selection);
       if (!startPoint || !endPoint)
         return !1;
-      const startBlock = getAncestorTextBlock(snapshot, startPoint.path), endBlock = getAncestorTextBlock(snapshot, endPoint.path);
+      const startBlock = getParent(snapshot, startPoint.path, {
+        match: (node) => isTextBlock({
+          schema: snapshot.context.schema
+        }, node)
+      }), endBlock = getParent(snapshot, endPoint.path, {
+        match: (node) => isTextBlock({
+          schema: snapshot.context.schema
+        }, node)
+      });
       if (!startBlock || !endBlock)
         return !1;
       const startBlockStartPoint = getBlockStartPoint({
@@ -16191,6 +16243,51 @@ function sortByPriority(items) {
     result.includes(item) || result.push(item);
   return [...result, ...itemsWithoutPriority];
 }
+function pathsOverlap(pathA, pathB) {
+  const minLength = Math.min(pathA.length, pathB.length);
+  for (let i = 0; i < minLength; i++)
+    if (!isEqualPathSegments(pathA[i], pathB[i]))
+      return !1;
+  return !0;
+}
+function buildPublicContainers(resolved) {
+  const projected = /* @__PURE__ */ new Map();
+  for (const [type, config] of resolved)
+    projected.set(type, toRegisteredContainer(config));
+  return projected;
+}
+function toRegisteredContainer(config) {
+  return {
+    kind: "container",
+    type: config.container.type,
+    field: config.field,
+    ...config.of ? {
+      of: config.of.map(toRegisteredOfEntry).filter(isDefined)
+    } : {}
+  };
+}
+function toRegisteredOfEntry(entry) {
+  if ("container" in entry)
+    return toRegisteredContainer(entry);
+  if ("span" in entry)
+    return {
+      kind: "span",
+      type: entry.span.type
+    };
+  if ("blockObject" in entry)
+    return {
+      kind: "blockObject",
+      type: entry.blockObject.type
+    };
+  if ("inlineObject" in entry)
+    return {
+      kind: "inlineObject",
+      type: entry.inlineObject.type
+    };
+}
+function isDefined(value) {
+  return value !== void 0;
+}
 const PRIMITIVE_TYPES = /* @__PURE__ */ new Set(["string", "number", "boolean"]);
 function isChildArrayField(field) {
   return field.type === "array" && "of" in field && Array.isArray(field.of);
@@ -16299,13 +16396,6 @@ function resolveTextBlockConfig(textBlock) {
     } : {}
   };
 }
-function pathsOverlap(pathA, pathB) {
-  const minLength = Math.min(pathA.length, pathB.length);
-  for (let i = 0; i < minLength; i++)
-    if (!isEqualPathSegments(pathA[i], pathB[i]))
-      return !1;
-  return !0;
-}
 function isTypeAlreadyRegistered(maps, attempting, type) {
   const claimedAs = (kind) => {
     switch (kind) {
@@ -16333,6 +16423,77 @@ function isTypeAlreadyRegistered(maps, attempting, type) {
   }
   return !1;
 }
+function registerNodeOnEngine(engine, node) {
+  if (node.kind === "container") {
+    if (isTypeAlreadyRegistered(engine, "container", node.type))
+      return;
+    const containerConfig = resolveNestedContainer(engine.schema, node);
+    if (!containerConfig)
+      return;
+    const containers = new Map(engine.containers);
+    containers.set(node.type, containerConfig), engine.containers = containers, engine.publicContainers = buildPublicContainers(containers), normalize(engine, {
+      force: !0
+    }), engine.onChange();
+    return;
+  }
+  if (node.kind === "textBlock") {
+    if (isTypeAlreadyRegistered(engine, "textBlock", node.type))
+      return;
+    const textBlocks = new Map(engine.textBlocks);
+    textBlocks.set(node.type, resolveTextBlockConfig(node)), engine.textBlocks = textBlocks, engine.onChange();
+    return;
+  }
+  if (node.kind === "span") {
+    if (isTypeAlreadyRegistered(engine, "span", node.type))
+      return;
+    const spans = new Map(engine.spans);
+    spans.set(node.type, {
+      span: node
+    }), engine.spans = spans, engine.onChange();
+    return;
+  }
+  if (node.kind === "blockObject") {
+    if (isTypeAlreadyRegistered(engine, "blockObject", node.type))
+      return;
+    const blockObjects = new Map(engine.blockObjects);
+    blockObjects.set(node.type, {
+      blockObject: node
+    }), engine.blockObjects = blockObjects, engine.onChange();
+    return;
+  }
+  if (isTypeAlreadyRegistered(engine, "inlineObject", node.type))
+    return;
+  const inlineObjects = new Map(engine.inlineObjects);
+  inlineObjects.set(node.type, {
+    inlineObject: node
+  }), engine.inlineObjects = inlineObjects, engine.onChange();
+}
+function unregisterNodeOnEngine(engine, node) {
+  if (node.kind === "container") {
+    const containers = new Map(engine.containers);
+    containers.delete(node.type), engine.containers = containers, engine.publicContainers = buildPublicContainers(containers), normalize(engine, {
+      force: !0
+    }), engine.onChange();
+    return;
+  }
+  if (node.kind === "textBlock") {
+    const textBlocks = new Map(engine.textBlocks);
+    textBlocks.delete(node.type), engine.textBlocks = textBlocks, engine.onChange();
+    return;
+  }
+  if (node.kind === "span") {
+    const spans = new Map(engine.spans);
+    spans.delete(node.type), engine.spans = spans, engine.onChange();
+    return;
+  }
+  if (node.kind === "blockObject") {
+    const blockObjects = new Map(engine.blockObjects);
+    blockObjects.delete(node.type), engine.blockObjects = blockObjects, engine.onChange();
+    return;
+  }
+  const inlineObjects = new Map(engine.inlineObjects);
+  inlineObjects.delete(node.type), engine.inlineObjects = inlineObjects, engine.onChange();
+}
 function rerouteExternalBehaviorEvent({
   event,
   editorEngine
@@ -16397,105 +16558,38 @@ const editorMachine = setup({
         event
       }) => event.type === "add editor engine" ? event.editor : context.editorEngine
     }),
-    register: assign(({
+    register: ({
       context,
       event
     }) => {
-      assertEvent(event, "register");
-      const node = event.node;
-      if (node.kind === "container") {
-        if (isTypeAlreadyRegistered(context, "container", node.type))
-          return {};
-        const containerConfig = resolveNestedContainer(context.schema, node);
-        if (!containerConfig)
-          return {};
-        const containers = new Map(context.containers);
-        return containers.set(node.type, containerConfig), context.editorEngine && (context.editorEngine.containers = containers, context.editorEngine.publicContainers = buildPublicContainers(containers), normalize(context.editorEngine, {
-          force: !0
-        }), context.editorEngine.onChange()), {
-          containers
-        };
-      }
-      if (node.kind === "textBlock") {
-        if (isTypeAlreadyRegistered(context, "textBlock", node.type))
-          return {};
-        const textBlocks = new Map(context.textBlocks);
-        return textBlocks.set(node.type, resolveTextBlockConfig(node)), context.editorEngine && (context.editorEngine.textBlocks = textBlocks, context.editorEngine.onChange()), {
-          textBlocks
-        };
-      }
-      if (node.kind === "span") {
-        if (isTypeAlreadyRegistered(context, "span", node.type))
-          return {};
-        const spans = new Map(context.spans);
-        return spans.set(node.type, {
-          span: node
-        }), context.editorEngine && (context.editorEngine.spans = spans, context.editorEngine.onChange()), {
-          spans
-        };
-      }
-      if (node.kind === "blockObject") {
-        if (isTypeAlreadyRegistered(context, "blockObject", node.type))
-          return {};
-        const blockObjects = new Map(context.blockObjects);
-        return blockObjects.set(node.type, {
-          blockObject: node
-        }), context.editorEngine && (context.editorEngine.blockObjects = blockObjects, context.editorEngine.onChange()), {
-          blockObjects
-        };
+      if (assertEvent(event, "register"), !context.editorEngine) {
+        context.pendingRegistrations.push(event.node);
+        return;
       }
-      if (isTypeAlreadyRegistered(context, "inlineObject", node.type))
-        return {};
-      const inlineObjects = new Map(context.inlineObjects);
-      return inlineObjects.set(node.type, {
-        inlineObject: node
-      }), context.editorEngine && (context.editorEngine.inlineObjects = inlineObjects, context.editorEngine.onChange()), {
-        inlineObjects
-      };
-    }),
-    unregister: assign(({
+      registerNodeOnEngine(context.editorEngine, event.node);
+    },
+    unregister: ({
       context,
       event
     }) => {
-      assertEvent(event, "unregister");
-      const node = event.node;
-      if (node.kind === "container") {
-        const containers = new Map(context.containers);
-        return containers.delete(node.type), context.editorEngine && (context.editorEngine.containers = containers, context.editorEngine.publicContainers = buildPublicContainers(containers), normalize(context.editorEngine, {
-          force: !0
-        }), context.editorEngine.onChange()), {
-          containers
-        };
-      }
-      if (node.kind === "textBlock") {
-        const textBlocks = new Map(context.textBlocks);
-        return textBlocks.delete(node.type), context.editorEngine && (context.editorEngine.textBlocks = textBlocks, context.editorEngine.onChange()), {
-          textBlocks
-        };
-      }
-      if (node.kind === "span") {
-        const spans = new Map(context.spans);
-        return spans.delete(node.type), context.editorEngine && (context.editorEngine.spans = spans, context.editorEngine.onChange()), {
-          spans
-        };
-      }
-      if (node.kind === "blockObject") {
-        const blockObjects = new Map(context.blockObjects);
-        return blockObjects.delete(node.type), context.editorEngine && (context.editorEngine.blockObjects = blockObjects, context.editorEngine.onChange()), {
-          blockObjects
-        };
+      if (assertEvent(event, "unregister"), !context.editorEngine) {
+        const index = context.pendingRegistrations.indexOf(event.node);
+        index >= 0 && context.pendingRegistrations.splice(index, 1);
+        return;
       }
-      const inlineObjects = new Map(context.inlineObjects);
-      return inlineObjects.delete(node.type), context.editorEngine && (context.editorEngine.inlineObjects = inlineObjects, context.editorEngine.onChange()), {
-        inlineObjects
-      };
-    }),
+      unregisterNodeOnEngine(context.editorEngine, event.node);
+    },
     "attach maps to editor engine": ({
       context
     }) => {
-      context.editorEngine && (context.editorEngine.containers = context.containers, context.editorEngine.publicContainers = buildPublicContainers(context.containers), context.editorEngine.blockObjects = context.blockObjects, context.editorEngine.inlineObjects = context.inlineObjects, context.editorEngine.spans = context.spans, context.editorEngine.textBlocks = context.textBlocks, normalize(context.editorEngine, {
+      if (!context.editorEngine)
+        return;
+      const engine = context.editorEngine;
+      for (const node of context.pendingRegistrations)
+        registerNodeOnEngine(engine, node);
+      context.pendingRegistrations.length = 0, normalize(engine, {
         force: !0
-      }), context.editorEngine.onChange());
+      }), engine.onChange();
     },
     "emit patch event": emit(({
       event
@@ -16503,11 +16597,21 @@ const editorMachine = setup({
     "emit mutation event": emit(({
       event
     }) => (assertEvent(event, "mutation"), event)),
-    "emit read only": emit({
-      type: "read only"
+    "emit read only": enqueueActions(({
+      context,
+      enqueue
+    }) => {
+      context.editorEngine && (context.editorEngine.readOnly = !0, context.editorEngine.onChange()), enqueue.emit({
+        type: "read only"
+      });
     }),
-    "emit editable": emit({
-      type: "editable"
+    "emit editable": enqueueActions(({
+      context,
+      enqueue
+    }) => {
+      context.editorEngine && (context.editorEngine.readOnly = !1, context.editorEngine.onChange()), enqueue.emit({
+        type: "editable"
+      });
     }),
     "defer event": assign({
       pendingEvents: ({
@@ -16597,12 +16701,10 @@ const editorMachine = setup({
           remainingEventBehaviors: behaviors,
           event: event.behaviorEvent,
           editor: event.editor,
-          converters: context.converters,
-          keyGenerator: context.keyGenerator,
-          schema: context.schema,
-          readOnly: self.getSnapshot().matches({
-            "edit mode": "read only"
-          }),
+          converters: event.editor.converters,
+          keyGenerator: event.editor.keyGenerator,
+          schema: event.editor.schema,
+          readOnly: event.editor.readOnly,
           nativeEvent: event.nativeEvent,
           sendBack: (eventSentBack) => {
             if (eventSentBack.type === "set drag ghost") {
@@ -16641,17 +16743,12 @@ const editorMachine = setup({
   }) => ({
     behaviors: new Set(coreBehaviorsConfig),
     behaviorsSorted: !1,
-    containers: /* @__PURE__ */ new Map(),
-    blockObjects: /* @__PURE__ */ new Map(),
-    inlineObjects: /* @__PURE__ */ new Map(),
-    spans: /* @__PURE__ */ new Map(),
-    textBlocks: /* @__PURE__ */ new Map(),
-    converters: input.converters ?? [],
+    initialConverters: input.converters ?? [],
     keyGenerator: input.keyGenerator,
     pendingEvents: [],
     pendingIncomingPatchesEvents: [],
+    pendingRegistrations: [],
     schema: input.schema,
-    selection: null,
     initialReadOnly: input.readOnly ?? !1,
     initialValue: input.initialValue
   }),
@@ -16672,11 +16769,7 @@ const editorMachine = setup({
       actions: ["unregister"]
     },
     "update selection": {
-      actions: [assign({
-        selection: ({
-          event
-        }) => event.selection
-      }), emit(({
+      actions: [emit(({
         event
       }) => ({
         ...event,
@@ -18284,10 +18377,7 @@ function createInternalEditor(config) {
     subscriptions
   }), editor = {
     dom: createEditorDom((event) => editorActor.send(event), editorEngine),
-    getSnapshot: () => getEditorSnapshot({
-      editorActorSnapshot: editorActor.getSnapshot(),
-      editorEngineInstance: editorEngine
-    }),
+    getSnapshot: () => editorEngine.snapshot,
     registerBehavior: (behaviorConfig) => {
       const priority = createEditorPriority({
         name: "custom",
@@ -18914,12 +19004,9 @@ function EditorProvider(props) {
   return $[23] !== internalEditor_0.editor || $[24] !== t7 ? (t8 = /* @__PURE__ */ jsx(EditorContext$1.Provider, { value: internalEditor_0.editor, children: t7 }), $[23] = internalEditor_0.editor, $[24] = t7, $[25] = t8) : t8 = $[25], t8;
 }
 const usePortableTextEditorSelection = () => {
-  const $ = c(5), editorActor = useContext(EditorActorContext);
-  let t0;
-  $[0] !== editorActor ? (t0 = editorActor.getSnapshot(), $[0] = editorActor, $[1] = t0) : t0 = $[1];
-  const [selection, setSelection2] = useState(t0.context.selection);
-  let t1, t2;
-  return $[2] !== editorActor ? (t1 = () => {
+  const $ = c(3), editorActor = useContext(EditorActorContext), editorEngine = useEngineStatic(), [selection, setSelection2] = useState(editorEngine.selection);
+  let t0, t1;
+  return $[0] !== editorActor ? (t0 = () => {
     const subscription = editorActor.on("selection", (event) => {
       startTransition(() => {
         setSelection2(event.selection);
@@ -18928,7 +19015,7 @@ const usePortableTextEditorSelection = () => {
     return () => {
       subscription.unsubscribe();
     };
-  }, t2 = [editorActor], $[2] = editorActor, $[3] = t1, $[4] = t2) : (t1 = $[3], t2 = $[4]), useEffect(t1, t2), selection;
+  }, t1 = [editorActor], $[0] = editorActor, $[1] = t0, $[2] = t1) : (t0 = $[1], t1 = $[2]), useEffect(t0, t1), selection;
 };
 function defineContainer(config) {
   return {