@portabletext/editor 7.0.6 → 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: {
@@ -7091,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
@@ -8259,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 = {
@@ -8269,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) {
@@ -9257,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 = {});
@@ -9461,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);
@@ -9485,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 ?? "";
@@ -9970,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) {
@@ -10003,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) {
@@ -10057,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);
@@ -10093,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();
@@ -10148,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;
@@ -10168,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--;
@@ -10180,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--;
@@ -10188,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)) {
@@ -10207,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++;
@@ -10222,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++;
@@ -10731,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
@@ -10751,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
@@ -10796,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: [({
@@ -10830,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: [({
@@ -10855,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)) {
@@ -10896,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
@@ -10950,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",
@@ -10969,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);
@@ -11009,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 = {
@@ -11461,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);
@@ -11518,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);
@@ -12069,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)) {
@@ -12112,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 {
@@ -12172,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)) {
@@ -12361,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);
@@ -12412,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);
@@ -12471,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 {
@@ -12519,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)) {
@@ -12554,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 {
@@ -12594,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;
@@ -12639,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"
@@ -12674,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) {
@@ -12748,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;
@@ -12780,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);
@@ -12801,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;
@@ -12831,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);
@@ -12843,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);
@@ -12857,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,
@@ -12866,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;
@@ -12895,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) {
@@ -12936,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({
@@ -12975,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",
@@ -13022,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);
   }
@@ -13130,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
 }) => {
@@ -13142,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);
@@ -13169,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;
     }
@@ -13627,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);
@@ -13647,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, {
@@ -13705,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) {
@@ -13755,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",
@@ -13825,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))
@@ -13863,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;
@@ -13891,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,
@@ -13925,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,
@@ -13965,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
@@ -14255,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 = {
@@ -14320,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({
@@ -14368,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,
@@ -15366,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);
@@ -15487,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
@@ -15515,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
@@ -15587,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;
@@ -15609,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;
@@ -15721,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({