@portabletext/editor 7.1.1 → 7.2.0

package/lib/index.js

@@ -3,14 +3,14 @@ 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, 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 { isPath, getLeaf, isRange, isPoint, isObject, isLeafObject, getAncestor, pathContains, getSpan, isBeforePoint, getText, rangeIntersects, getTextBlock, getUnionSchema, getFirstChild } from "./_chunks-es/get-first-child.js";
+import { rangeEdges, isTextBlockNode, isBackwardRange, hasNode, getNodes, isAncestorPath, isEditableContainer, getSibling, isInline, isObject as isObject$1, isSpanNode, isBlock, getEnclosingBlock, getAncestors, getPathSubSchema, getBlock, resolveContainerAt, comparePaths, getEnclosingContainer, comparePoints$1 as comparePoints, isAfterPoint } from "./_chunks-es/get-path-sub-schema.js";
 import { isSpan, isTextBlock, compileSchema } from "@portabletext/schema";
 import { defineSchema } from "@portabletext/schema";
 import scrollIntoView from "scroll-into-view-if-needed";
 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 { rangesOverlap, 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 { isEqualSelectionPoints, blockOffsetToSpanSelectionPoint, getBlockKeyFromSelectionPoint, getBlockEndPoint, getBlockStartPoint, isSelectionCollapsed, defaultKeyGenerator, parseBlocks, parseBlock, isListBlock, getSelectionStartPoint as getSelectionStartPoint$1, getSelectionEndPoint as getSelectionEndPoint$1, parseAnnotation, parseMarkDefs, parseSpan, parseInlineObject } 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";
@@ -214,16 +214,6 @@ function commonPath(path2, another) {
   }
   return common;
 }
-function isPath(value) {
-  return Array.isArray(value) && (value.length === 0 || typeof value[0] == "number" || typeof value[0] == "string" || isKeyedSegment(value[0]));
-}
-const isObject = (value) => typeof value == "object" && value !== null;
-function isPoint(value) {
-  return isObject(value) && typeof value.offset == "number" && isPath(value.path);
-}
-function isRange(value) {
-  return isObject(value) && isPoint(value.anchor) && isPoint(value.focus);
-}
 function rangeEnd(range2, root) {
   const [, end2] = rangeEdges(range2, root);
   return end2;
@@ -238,12 +228,12 @@ function path(editor, at, options = {}) {
     edge
   } = options;
   if (isPath(at) && (edge === "start" || edge === "end")) {
-    const leaf = getLeaf(editor, at, {
+    const leaf = getLeaf(editor.snapshot, at, {
       edge
     });
     leaf && (at = leaf.path);
   }
-  return isRange(at) && (edge === "start" ? at = rangeStart(at, editor) : edge === "end" ? at = rangeEnd(at, editor) : at = commonPath(at.anchor.path, at.focus.path)), isPoint(at) && (at = at.path), depth != null && (at = sliceToNodeDepth(at, depth)), at;
+  return isRange(at) && (edge === "start" ? at = rangeStart(at, editor.snapshot.context) : edge === "end" ? at = rangeEnd(at, editor.snapshot.context) : at = commonPath(at.anchor.path, at.focus.path)), isPoint(at) && (at = at.path), depth != null && (at = sliceToNodeDepth(at, depth)), at;
 }
 function sliceToNodeDepth(nodePath, depth) {
   let nodeCount = 0;
@@ -264,7 +254,7 @@ function point(editor, at, options = {}) {
   } = options;
   if (isPath(at)) {
     let path2;
-    const deepest = getLeaf(editor, at, {
+    const deepest = getLeaf(editor.snapshot, at, {
       edge: edge === "end" ? "end" : "start"
     });
     if (!deepest)
@@ -274,16 +264,16 @@ function point(editor, at, options = {}) {
       path: nodePath
     } = deepest;
     if (path2 = nodePath, !isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node) && !isTextBlockNode({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node) && !isEditor(node))
       return {
         path: path2,
         offset: 0
       };
     if (!isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node))
       throw new Error(`Cannot get the ${edge} point in the node at path [${at}] because it has no ${edge} text node.`);
     return {
@@ -292,7 +282,7 @@ function point(editor, at, options = {}) {
     };
   }
   if (isRange(at)) {
-    const [start2, end2] = rangeEdges(at, editor);
+    const [start2, end2] = rangeEdges(at, editor.snapshot.context);
     return edge === "start" ? start2 : end2;
   }
   return at;
@@ -359,14 +349,14 @@ typeof globalThis < "u" && globalThis.InputEvent && typeof globalThis.InputEvent
       throw new Error("Cannot resolve a DOM node: editor is not mounted");
     const root = DOMEditor.findDocumentOrShadowRoot(editor);
     if (root.activeElement !== el) {
-      if (editor.selection && root instanceof Document) {
-        const domSelection = getSelection(root), domRange = DOMEditor.toDOMRange(editor, editor.selection);
+      if (editor.snapshot.context.selection && root instanceof Document) {
+        const domSelection = getSelection(root), domRange = DOMEditor.toDOMRange(editor, editor.snapshot.context.selection);
         domSelection?.removeAllRanges(), domSelection?.addRange(domRange);
       }
-      if (editor.selection || editor.select(start(editor, [])), editor.focused = !0, el.focus({
+      if (editor.snapshot.context.selection || editor.select(start(editor, [])), editor.focused = !0, el.focus({
         preventScroll: !0
-      }), editor.selection && root instanceof Document) {
-        const domSelection = getSelection(root), domRange = DOMEditor.toDOMRange(editor, editor.selection);
+      }), editor.snapshot.context.selection && root instanceof Document) {
+        const domSelection = getSelection(root), domRange = DOMEditor.toDOMRange(editor, editor.snapshot.context.selection);
         domSelection?.removeAllRanges(), domSelection?.addRange(domRange);
       }
     }
@@ -402,17 +392,17 @@ typeof globalThis < "u" && globalThis.InputEvent && typeof globalThis.InputEvent
       anchor,
       focus
     } = range2;
-    return hasNode(editor, anchor.path) && hasNode(editor, focus.path);
+    return hasNode(editor.snapshot, anchor.path) && hasNode(editor.snapshot, focus.path);
   },
   hasSelectableTarget: (editor, target) => DOMEditor.hasEditableTarget(editor, target) || DOMEditor.isTargetInsideNonReadonlyVoid(editor, target),
   hasTarget: (editor, target) => isDOMNode(target) && DOMEditor.hasDOMNode(editor, target),
   isTargetInsideNonReadonlyVoid: (editor, target) => editor.readOnly || !DOMEditor.hasTarget(editor, target) ? !1 : !!(isDOMElement(target) ? target : target.parentElement)?.closest('[data-pt-block="object"], [data-pt-inline="object"]'),
   toDOMPoint: (editor, point2) => {
-    const nodeEntry = getNode(editor, point2.path), el = getDomNode(editor, point2.path);
+    const nodeEntry = getNode(editor.snapshot, point2.path), el = getDomNode(editor, point2.path);
     if (!el)
       throw new Error(`Cannot find a DOM node for editor path: ${point2.path}`);
     let domPoint;
-    if (nodeEntry && isLeafObject(editor, nodeEntry.node, point2.path)) {
+    if (nodeEntry && isLeafObject(editor.snapshot, nodeEntry.node, point2.path)) {
       const spacer = el.querySelector("[data-pt-zero-width]");
       if (spacer) {
         const domText = spacer.childNodes[0];
@@ -427,10 +417,10 @@ typeof globalThis < "u" && globalThis.InputEvent && typeof globalThis.InputEvent
       }
       return [el, 0];
     }
-    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)
+    const pointPath = path(editor, point2), pointEntry = getNode(editor.snapshot, pointPath), pointObjectNode = pointEntry && isLeafObject(editor.snapshot, pointEntry.node, pointPath) ? pointEntry : getAncestor(editor.snapshot, point2.path, {
+      match: (node, ancestorPath) => isLeafObject(editor.snapshot, node, ancestorPath)
     });
-    pointObjectNode && isLeafObject(editor, pointObjectNode.node, pointObjectNode.path) && (point2 = {
+    pointObjectNode && isLeafObject(editor.snapshot, pointObjectNode.node, pointObjectNode.path) && (point2 = {
       path: point2.path,
       offset: 0
     });
@@ -458,7 +448,7 @@ typeof globalThis < "u" && globalThis.InputEvent && typeof globalThis.InputEvent
     const {
       anchor,
       focus
-    } = range2, isBackward = isBackwardRange(range2, editor), domAnchor = DOMEditor.toDOMPoint(editor, anchor), domFocus = isCollapsedRange(range2) ? domAnchor : DOMEditor.toDOMPoint(editor, focus), domRange = DOMEditor.getWindow(editor).document.createRange(), [startNode, startOffset] = isBackward ? domFocus : domAnchor, [endNode, endOffset] = isBackward ? domAnchor : domFocus, isStartAtZeroWidth = !!(isDOMElement(startNode) ? startNode : startNode.parentElement).getAttribute("data-pt-zero-width"), isEndAtZeroWidth = !!(isDOMElement(endNode) ? endNode : endNode.parentElement).getAttribute("data-pt-zero-width");
+    } = range2, isBackward = isBackwardRange(range2, editor.snapshot.context), domAnchor = DOMEditor.toDOMPoint(editor, anchor), domFocus = isCollapsedRange(range2) ? domAnchor : DOMEditor.toDOMPoint(editor, focus), domRange = DOMEditor.getWindow(editor).document.createRange(), [startNode, startOffset] = isBackward ? domFocus : domAnchor, [endNode, endOffset] = isBackward ? domAnchor : domFocus, isStartAtZeroWidth = !!(isDOMElement(startNode) ? startNode : startNode.parentElement).getAttribute("data-pt-zero-width"), isEndAtZeroWidth = !!(isDOMElement(endNode) ? endNode : endNode.parentElement).getAttribute("data-pt-zero-width");
     return domRange.setStart(startNode, isStartAtZeroWidth ? 1 : startOffset), domRange.setEnd(endNode, isEndAtZeroWidth ? 1 : endOffset), domRange;
   },
   toSelectionPoint: (editor, domPoint, options) => {
@@ -583,8 +573,8 @@ typeof globalThis < "u" && globalThis.InputEvent && typeof globalThis.InputEvent
       throw new Error(`Cannot map DOM position to an editor location: ${domPoint}`);
     }
     if (path2.length > 1) {
-      const parentPath2 = path2.slice(0, -1), parentEntry = getNode(editor, parentPath2);
-      if (parentEntry && isLeafObject(editor, parentEntry.node, parentPath2))
+      const parentPath2 = path2.slice(0, -1), parentEntry = getNode(editor.snapshot, parentPath2);
+      if (parentEntry && isLeafObject(editor.snapshot, parentEntry.node, parentPath2))
         return {
           path: parentPath2,
           offset: 0
@@ -647,27 +637,23 @@ typeof globalThis < "u" && globalThis.InputEvent && typeof globalThis.InputEvent
 function collapse(editor, options = {}) {
   const {
     edge = "anchor"
-  } = options, {
-    selection
-  } = editor;
+  } = options, selection = editor.snapshot.context.selection;
   if (selection) {
     if (edge === "anchor")
       editor.select(selection.anchor);
     else if (edge === "focus")
       editor.select(selection.focus);
     else if (edge === "start") {
-      const [start2] = rangeEdges(selection, editor);
+      const [start2] = rangeEdges(selection, editor.snapshot.context);
       editor.select(start2);
     } else if (edge === "end") {
-      const [, end2] = rangeEdges(selection, editor);
+      const [, end2] = rangeEdges(selection, editor.snapshot.context);
       editor.select(end2);
     }
   } else return;
 }
 function deselect(editor) {
-  const {
-    selection
-  } = editor;
+  const selection = editor.snapshot.context.selection;
   selection && editor.apply({
     type: "set_selection",
     properties: selection,
@@ -790,39 +776,39 @@ function range(editor, at, to) {
 }
 function* positions(editor, options = {}) {
   const {
-    at = editor.selection,
+    at = editor.snapshot.context.selection,
     unit = "offset",
     reverse = !1
   } = options;
   if (!at)
     return;
-  const editorRange = range(editor, at), [start$1, end$1] = rangeEdges(editorRange, editor), first = reverse ? end$1 : start$1;
+  const editorRange = range(editor, at), [start$1, end$1] = rangeEdges(editorRange, editor.snapshot.context), first = reverse ? end$1 : start$1;
   let isNewBlock = !1, blockText = "", distance = 0, leafTextRemaining = 0, leafTextOffset = 0;
   for (const {
     node,
     path: nodePath
-  } of getNodes(editor, {
+  } of getNodes(editor.snapshot, {
     from: start$1.path,
     to: end$1.path,
     reverse
   })) {
     if (isTextBlockNode({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node)) {
       const e = isAncestorPath(nodePath, end$1.path) ? end$1 : end(editor, nodePath), s = isAncestorPath(nodePath, start$1.path) ? start$1 : start(editor, nodePath);
       blockText = "";
       for (const {
         node: spanNode,
         path: spanPath
-      } of getNodes(editor, {
+      } of getNodes(editor.snapshot, {
         from: s.path,
         to: e.path,
         match: (n) => isSpan({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, n)
       })) {
         if (!isSpan({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, spanNode))
           continue;
         let spanText = spanNode.text;
@@ -830,7 +816,7 @@ function* positions(editor, options = {}) {
       }
       isNewBlock = !0;
     }
-    if (isLeafObject(editor, node, nodePath)) {
+    if (isLeafObject(editor.snapshot, node, nodePath)) {
       yield {
         path: nodePath,
         offset: 0
@@ -838,11 +824,11 @@ function* positions(editor, options = {}) {
       continue;
     }
     if (!isTextBlockNode({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node) && !isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node)) {
-      if (isEditableContainer(editor, node, nodePath))
+      if (isEditableContainer(editor.snapshot, node, nodePath))
         continue;
       yield {
         path: nodePath,
@@ -851,7 +837,7 @@ function* positions(editor, options = {}) {
       continue;
     }
     if (isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node)) {
       const isFirst = pathEquals(nodePath, first.path);
       for (isFirst ? (leafTextRemaining = reverse ? first.offset : node.text.length - first.offset, leafTextOffset = first.offset) : (leafTextRemaining = node.text.length, leafTextOffset = reverse ? leafTextRemaining : 0), (isFirst || isNewBlock || unit === "offset") && (yield {
@@ -920,9 +906,7 @@ function before(editor, at, options = {}) {
   return target;
 }
 function move(editor, options = {}) {
-  const {
-    selection
-  } = editor, {
+  const selection = editor.snapshot.context.selection, {
     distance = 1,
     unit = "character",
     reverse = !1
@@ -932,7 +916,7 @@ function move(editor, options = {}) {
   } = options;
   if (!selection)
     return;
-  edge === "start" && (edge = isBackwardRange(selection, editor) ? "focus" : "anchor"), edge === "end" && (edge = isBackwardRange(selection, editor) ? "anchor" : "focus");
+  edge === "start" && (edge = isBackwardRange(selection, editor.snapshot.context) ? "focus" : "anchor"), edge === "end" && (edge = isBackwardRange(selection, editor.snapshot.context) ? "anchor" : "focus");
   const {
     anchor,
     focus
@@ -1338,7 +1322,7 @@ function transformPath(path2, operation) {
         const {
           path: operationPath
         } = operation;
-        if (pathEquals(operationPath, path2) || isAncestorPath(operationPath, path2))
+        if (pathContains(operationPath, path2))
           return null;
       }
       break;
@@ -1387,7 +1371,7 @@ function transformPoint$1(point2, op, options = {}) {
     case "unset": {
       const lastSegment = op.path[op.path.length - 1];
       if (isKeyedSegment(lastSegment))
-        return pathEquals(op.path, point2.path) || isAncestorPath(op.path, point2.path) ? null : point2;
+        return pathContains(op.path, point2.path) ? null : point2;
       const propertyName = lastSegment, nodePath = op.path.slice(0, -1);
       return propertyName === "text" && pathEquals(nodePath, point2.path) && point2.offset !== 0 ? {
         path: point2.path,
@@ -1404,20 +1388,20 @@ function verifyDiffState(editor, textDiff) {
     path: path2,
     diff: diff2
   } = textDiff;
-  if (!hasNode(editor, path2))
+  if (!hasNode(editor.snapshot, path2))
     return !1;
-  const nodeEntry = getSpan(editor, path2);
+  const nodeEntry = getSpan(editor.snapshot, 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, {
+  const nextSibling = getSibling(editor.snapshot, path2, {
     direction: "next"
   });
   if (!nextSibling)
     return !1;
-  const nextNodeEntry = getSpan(editor, nextSibling.path);
+  const nextNodeEntry = getSpan(editor.snapshot, nextSibling.path);
   return !!nextNodeEntry && nextNodeEntry.node.text.startsWith(diff2.text);
 }
 function applyStringDiff(text, ...diffs) {
@@ -1478,28 +1462,28 @@ function normalizePoint(editor, point2) {
     path: path2,
     offset
   } = point2;
-  if (!hasNode(editor, path2))
+  if (!hasNode(editor.snapshot, path2))
     return null;
-  const leafEntry = getSpan(editor, path2);
+  const leafEntry = getSpan(editor.snapshot, path2);
   if (!leafEntry)
     return null;
   let leaf = leafEntry.node;
-  const parentBlock = getParent(editor, path2, {
+  const parentBlock = getParent(editor.snapshot, path2, {
     match: (node) => isTextBlock({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node)
   });
   if (!parentBlock)
     return null;
   for (; offset > leaf.text.length; ) {
-    const afterPoint = after(editor, path2), [nextEntry] = afterPoint ? getNodes(editor, {
+    const afterPoint = after(editor, path2), [nextEntry] = afterPoint ? getNodes(editor.snapshot, {
       from: afterPoint.path,
       match: (n) => isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, n)
     }) : [];
     if (!nextEntry || !isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, nextEntry.node) || !isDescendantPath(nextEntry.path, parentBlock.path))
       return null;
     offset -= leaf.text.length, leaf = nextEntry.node, path2 = nextEntry.path;
@@ -1637,7 +1621,7 @@ function createAndroidInputManager({
     if (editor.pendingSelection = null, pendingSelection) {
       const {
         selection
-      } = editor, normalized = normalizeRange(editor, pendingSelection);
+      } = editor.snapshot.context, normalized = normalizeRange(editor, pendingSelection);
       normalized && (!selection || !rangeEquals(normalized, selection)) && editor.select(normalized);
     }
   }, performAction = () => {
@@ -1648,7 +1632,7 @@ function createAndroidInputManager({
         if (!target)
           return;
         const targetRange2 = range(editor, target);
-        (!editor.selection || !rangeEquals(editor.selection, targetRange2)) && editor.select(target);
+        (!editor.snapshot.context.selection || !rangeEquals(editor.snapshot.context.selection, targetRange2)) && editor.select(target);
       }
       action.run();
     }
@@ -1658,13 +1642,13 @@ function createAndroidInputManager({
       return;
     }
     flushing || (flushing = !0, setTimeout(() => flushing = !1)), hasPendingAction() && (flushing = "action");
-    const selectionRef = editor.selection && rangeRef(editor, editor.selection, {
+    const selectionRef = editor.snapshot.context.selection && rangeRef(editor, editor.snapshot.context.selection, {
       affinity: "forward"
     });
     let scheduleSelectionChange = hasPendingDiffs(), diff2;
     for (; diff2 = editor.pendingDiffs?.[0]; ) {
       const range2 = targetRange(diff2);
-      (!editor.selection || !rangeEquals(editor.selection, range2)) && editor.select(range2), diff2.diff.text ? editorActor.send({
+      (!editor.snapshot.context.selection || !rangeEquals(editor.snapshot.context.selection, range2)) && editor.select(range2), diff2.diff.text ? editorActor.send({
         type: "behavior event",
         behaviorEvent: {
           type: "insert.text",
@@ -1683,7 +1667,7 @@ function createAndroidInputManager({
       }) => id !== diff2.id), verifyDiffState(editor, diff2) || (scheduleSelectionChange = !1, editor.pendingAction = null, flushing = "action", editor.pendingSelection = null, scheduleOnDOMSelectionChange.cancel(), onDOMSelectionChange.cancel(), selectionRef?.unref());
     }
     const selection = selectionRef?.unref();
-    if (selection && !editor.pendingSelection && (!editor.selection || !rangeEquals(selection, editor.selection)) && editor.select(selection), hasPendingAction()) {
+    if (selection && !editor.pendingSelection && (!editor.snapshot.context.selection || !rangeEquals(selection, editor.snapshot.context.selection)) && editor.select(selection), hasPendingAction()) {
       performAction();
       return;
     }
@@ -1695,7 +1679,7 @@ function createAndroidInputManager({
   }, handleCompositionStart = (_event) => {
     editor.composing = !0, compositionEndTimeoutId && (clearTimeout(compositionEndTimeoutId), compositionEndTimeoutId = null);
   }, storeDiff = (path2, diff2) => {
-    const pendingDiffs = editor.pendingDiffs, targetEntry = getSpan(editor, path2);
+    const pendingDiffs = editor.pendingDiffs, targetEntry = getSpan(editor.snapshot, path2);
     if (!targetEntry)
       return;
     const target = targetEntry.node, idx = pendingDiffs.findIndex((change) => pathEquals(change.path, path2));
@@ -1741,15 +1725,15 @@ function createAndroidInputManager({
     if (!targetRange2 && domSelection && (nativeTargetRange = domSelection, targetRange2 = DOMEditor.toEditorSelection(editor, domSelection, {
       exactMatch: !1,
       suppressThrow: !0
-    })), targetRange2 = targetRange2 ?? editor.selection, !targetRange2)
+    })), targetRange2 = targetRange2 ?? editor.snapshot.context.selection, !targetRange2)
       return;
     let canStoreDiff = !0;
     if (type.startsWith("delete")) {
       const direction = type.endsWith("Backward") ? "backward" : "forward";
-      let [start2, end2] = rangeEdges(targetRange2, editor);
-      const leafNodeEntry = getNode(editor, start2.path), leafResult = leafNodeEntry && (isSpan({
-        schema: editor.schema
-      }, leafNodeEntry.node) || isLeafObject(editor, leafNodeEntry.node, start2.path)) ? leafNodeEntry : void 0;
+      let [start2, end2] = rangeEdges(targetRange2, editor.snapshot.context);
+      const leafNodeEntry = getNode(editor.snapshot, start2.path), leafResult = leafNodeEntry && (isSpan({
+        schema: editor.snapshot.context.schema
+      }, leafNodeEntry.node) || isLeafObject(editor.snapshot, leafNodeEntry.node, start2.path)) ? leafNodeEntry : void 0;
       if (!leafResult)
         return scheduleAction(() => editorActor.send({
           type: "behavior event",
@@ -1763,7 +1747,7 @@ function createAndroidInputManager({
         });
       let leaf = leafResult.node, path2 = leafResult.path;
       if (!isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, leaf))
         return scheduleAction(() => editorActor.send({
           type: "behavior event",
@@ -1776,14 +1760,14 @@ function createAndroidInputManager({
           at: targetRange2
         });
       if (isExpandedRange(targetRange2) && leaf.text.length === start2.offset && end2.offset === 0) {
-        const afterPoint = after(editor, start2.path), [nextEntry] = afterPoint ? getNodes(editor, {
+        const afterPoint = after(editor, start2.path), [nextEntry] = afterPoint ? getNodes(editor.snapshot, {
           from: afterPoint.path,
           match: (n) => isSpan({
-            schema: editor.schema
+            schema: editor.snapshot.context.schema
           }, n)
         }) : [];
         nextEntry && isSpan({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, nextEntry.node) && pathEquals(nextEntry.path, end2.path) && (direction === "backward" ? (targetRange2 = {
           anchor: end2,
           focus: end2
@@ -1793,7 +1777,7 @@ function createAndroidInputManager({
         }, end2 = start2));
       }
       if (!isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, leaf))
         return;
       const diff2 = {
@@ -1845,7 +1829,7 @@ function createAndroidInputManager({
           anchor
         } = targetRange2;
         if (canStoreDiff && isCollapsedRange(targetRange2)) {
-          const targetNodeEntry = getSpan(editor, anchor.path);
+          const targetNodeEntry = getSpan(editor.snapshot, anchor.path);
           if (targetNodeEntry && anchor.offset < targetNodeEntry.node.text.length)
             return storeDiff(anchor.path, {
               text: "",
@@ -2036,7 +2020,7 @@ function createAndroidInputManager({
             at: targetRange2
           });
         if (pathEquals(targetRange2.anchor.path, targetRange2.focus.path)) {
-          const [start2, end2] = rangeEdges(targetRange2, editor), diff2 = {
+          const [start2, end2] = rangeEdges(targetRange2, editor.snapshot.context), diff2 = {
             start: start2.offset,
             end: end2.offset,
             text
@@ -2049,7 +2033,7 @@ function createAndroidInputManager({
             text: insertPositionHint.text + text
           } : insertPositionHint = !1 : insertPositionHint = !1;
           if (canStoreDiff) {
-            const currentSelection = editor.selection;
+            const currentSelection = editor.snapshot.context.selection;
             if (storeDiff(start2.path, diff2), currentSelection) {
               const newPoint = {
                 path: start2.path,
@@ -2083,7 +2067,7 @@ function createAndroidInputManager({
     editor.pendingSelection = range2, flushTimeoutId && (clearTimeout(flushTimeoutId), flushTimeoutId = null);
     const {
       selection
-    } = editor;
+    } = editor.snapshot.context;
     if (!range2)
       return;
     const pathChanged = !selection || !pathEquals(selection.anchor.path, range2.anchor.path), parentPathChanged = !selection || !pathEquals(selection.anchor.path.slice(0, -1), range2.anchor.path.slice(0, -1));
@@ -2133,9 +2117,6 @@ const MUTATION_OBSERVER_CONFIG$1 = {
 function useParentContainer() {
   return useContext(ParentContainerContext);
 }
-function isBeforePoint(point2, another, root) {
-  return comparePoints(point2, another, root) === -1;
-}
 function rangeIntersection(range2, another, root) {
   if (!rangesOverlap(range2, another, root))
     return null;
@@ -2184,8 +2165,8 @@ const shallowCompare = (obj1, obj2) => Object.keys(obj1).length === Object.keys(
   }
   return !0;
 }, splitDecorationsByChild = (editor, node, path2, decorations) => {
-  const children = isEditor(node) || isTextBlock({
-    schema: editor.schema
+  const children = isEditor(node) ? editor.snapshot.context.value : isTextBlock({
+    schema: editor.snapshot.context.schema
   }, node) ? node.children : [], decorationsByChild = Array.from(children, () => []);
   if (decorations.length === 0)
     return decorationsByChild;
@@ -2213,10 +2194,10 @@ const shallowCompare = (obj1, obj2) => Object.keys(obj1).length === Object.keys(
       return keyToIndex.get(segment._key);
   };
   for (const decoration of decorations) {
-    const decorationRange = rangeIntersection(ancestorRange, decoration, editor);
+    const decorationRange = rangeIntersection(ancestorRange, decoration, editor.snapshot.context);
     if (!decorationRange)
       continue;
-    const [startPoint, endPoint] = rangeEdges(decorationRange, editor), startIndex = resolveChildIndex2(startPoint) ?? 0, endIndex = resolveChildIndex2(endPoint) ?? children.length - 1;
+    const [startPoint, endPoint] = rangeEdges(decorationRange, editor.snapshot.context), startIndex = resolveChildIndex2(startPoint) ?? 0, endIndex = resolveChildIndex2(endPoint) ?? children.length - 1;
     for (let i = startIndex; i <= endIndex; i++) {
       const ds = decorationsByChild[i];
       if (!ds)
@@ -2224,7 +2205,7 @@ const shallowCompare = (obj1, obj2) => Object.keys(obj1).length === Object.keys(
       const childRange = getChildRange(i);
       if (!childRange)
         continue;
-      const childDecorationRange = rangeIntersection(childRange, decoration, editor);
+      const childDecorationRange = rangeIntersection(childRange, decoration, editor.snapshot.context);
       childDecorationRange && ds.push({
         ...decoration,
         ...childDecorationRange
@@ -2274,7 +2255,7 @@ const DecorateContext = createContext({}), useDecorations = (node, path2, parent
   let t0;
   $[0] !== decorate || $[1] !== node || $[2] !== path2 ? (t0 = () => decorate([node, path2]), $[0] = decorate, $[1] = node, $[2] = path2, $[3] = t0) : t0 = $[3];
   const selector = t0, equalityFn = isSpan({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node) ? isTextDecorationsEqual : isElementDecorationsEqual, [decorations, update] = useGenericSelector(selector, equalityFn);
   let t1, t2;
   $[4] !== addEventListener || $[5] !== update ? (t1 = () => {
@@ -2322,7 +2303,7 @@ const Element$1 = (props) => {
     renderElement,
     renderLeaf,
     renderText
-  } = props, dataPath = serializePath(props.path), editor = useEngineStatic(), isInline$1 = isInline(editor, props.path), isInNewPipeline = useContext(NewPipelineContext), decorations = useDecorations(element, props.path, parentDecorations);
+  } = props, dataPath = serializePath(props.path), editor = useEngineStatic(), isInline$1 = isInline(editor.snapshot, props.path), isInNewPipeline = useContext(NewPipelineContext), decorations = useDecorations(element, props.path, parentDecorations);
   let t0;
   $[0] !== decorations || $[1] !== element || $[2] !== props.path || $[3] !== renderElement || $[4] !== renderLeaf || $[5] !== renderText ? (t0 = {
     decorations,
@@ -2342,9 +2323,9 @@ const Element$1 = (props) => {
     "data-pt-path": dataPath
   };
   if (!isInline$1 && isTextBlockNode({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, element)) {
-    const text = getText(editor, props.path), dir = text !== void 0 ? getDirection(text) : void 0;
+    const text = getText(editor.snapshot, props.path), dir = text !== void 0 ? getDirection(text) : void 0;
     dir === "rtl" && (attributes.dir = dir);
   }
   return renderElement({
@@ -2622,15 +2603,15 @@ function getTextContent(editor, path2) {
   for (const {
     node,
     path: nodePath
-  } of getNodes(editor, {
+  } of getNodes(editor.snapshot, {
     from: start$1.path,
     to: end$1.path,
     match: (n) => isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, n)
   })) {
     if (!isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node))
       continue;
     let nodeText = node.text;
@@ -2647,7 +2628,7 @@ const EngineString = (props) => {
     text
   } = props, editor = useEngineStatic(), parentPath$1 = parentPath(path2), leafText = leaf.text ?? "";
   if (leafText === "" && isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, parent) && parent.children[parent.children.length - 1] === text && getTextContent(editor, parentPath$1) === "") {
     let t02;
     return $[0] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (t02 = /* @__PURE__ */ jsx(ZeroWidthString, { isLineBreak: !0 }), $[0] = t02) : t02 = $[0], t02;
@@ -2825,12 +2806,12 @@ const useChildren = (props) => {
   const parentContainer = useParentContainer(), parentIsInNewPipeline = useContext(NewPipelineContext), decorationsByChild = useDecorationsByChild(editor, node, parentPath2, decorations);
   let children = [], arrayFieldName = "children", childContainer = parentContainer;
   if (isEditor(node))
-    children = node.children;
+    children = node.snapshot.context.value;
   else if (isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node))
     children = node.children;
-  else if (isObject$1(editor, node)) {
+  else if (isObject$1(editor.snapshot, node)) {
     const containerConfig = resolveContainerForNode(editor, parentContainer, node);
     if (containerConfig) {
       const fieldValue = node[containerConfig.field.name];
@@ -2845,7 +2826,7 @@ const useChildren = (props) => {
     }];
     return /* @__PURE__ */ jsx(MemoizedElement, { decorations: decorationsByChild[i] ?? [], element: node2, isContainer, path: nodePath, renderElement, renderLeaf, renderText }, node2._key);
   }, [arrayFieldName, decorationsByChild, parentPath2, renderElement, renderLeaf, renderText]), textBlockParent = isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node) ? node : void 0, wrapNewPipeline = (child, isInNewPipelineForChild2, key) => parentIsInNewPipeline || !isInNewPipelineForChild2 ? child : /* @__PURE__ */ jsx(NewPipelineContext.Provider, { value: !0, children: child }, key), renderTextComponent = (node2, index) => {
     if (!textBlockParent)
       throw new Error("Cannot render text component without a text block parent");
@@ -2864,9 +2845,9 @@ const useChildren = (props) => {
     return /* @__PURE__ */ jsx(MemoizedObjectNode, { decorations: decorationsByChild[index] ?? [], isInline: textBlockParent !== void 0, objectNode: node2, path: nodePath, renderElement }, node2._key);
   }, isInNewPipelineForChild = (n, isContainerChild) => {
     if (isTextBlock({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, n)) {
-      if (editor.textBlocks.has(n._type))
+      if (editor.textBlocks.has(n._type) || editor.textBlocks.has("*"))
         return !0;
       if (parentContainer?.of) {
         for (const entry of parentContainer.of)
@@ -2875,10 +2856,10 @@ const useChildren = (props) => {
       }
       return !1;
     }
-    if (isObject$1(editor, n)) {
+    if (isObject$1(editor.snapshot, n)) {
       if (textBlockParent !== void 0)
         return !1;
-      if (editor.blockObjects.has(n._type))
+      if (editor.blockObjects.has(n._type) || editor.blockObjects.has("*"))
         return !0;
       if (parentContainer?.of) {
         for (const entry of parentContainer.of)
@@ -2888,25 +2869,25 @@ const useChildren = (props) => {
       return !1;
     }
     return isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, n), !1;
   }, elements = children.map((n, i) => {
     if (isTextBlock({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, n))
       return wrapNewPipeline(renderElementComponent(n, i, !1), isInNewPipelineForChild(n), n._key);
     if (isTextBlockNode({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, n))
       return null;
-    if (isObject$1(editor, n))
+    if (isObject$1(editor.snapshot, 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
+      schema: editor.snapshot.context.schema
     }, n))
       return wrapNewPipeline(renderTextComponent(n, i), isInNewPipelineForChild(n), n._key);
     if (isSpanNode({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, n))
       return null;
     throw new Error("Unexpected node type");
@@ -3163,7 +3144,7 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
     ref.current && (window2 = getDefaultView(ref.current)) && (editor.domWindow = window2, editor.domElement = ref.current);
     const {
       selection
-    } = editor, root = DOMEditor.findDocumentOrShadowRoot(editor), domSelection = getSelection(root);
+    } = editor.snapshot.context, root = DOMEditor.findDocumentOrShadowRoot(editor), domSelection = getSelection(root);
     if (!domSelection || !editor.focused || androidInputManagerRef.current?.hasPendingAction())
       return;
     const setDomSelection = (forceChange) => {
@@ -3194,9 +3175,9 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
           exactMatch: !1,
           suppressThrow: !0
         });
-        editor.selection = fallbackRange ? {
+        editor.snapshot.context.selection = fallbackRange ? {
           ...fallbackRange,
-          backward: isBackwardRange(fallbackRange, editor)
+          backward: isBackwardRange(fallbackRange, editor.snapshot.context)
         } : null;
         return;
       }
@@ -3206,7 +3187,7 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
         newDomRange = selection && DOMEditor.toDOMRange(editor, selection);
       } catch {
       }
-      return newDomRange ? (editor.composing && !IS_ANDROID ? domSelection.collapseToEnd() : isBackwardRange(selection, editor) ? domSelection.setBaseAndExtent(newDomRange.endContainer, newDomRange.endOffset, newDomRange.startContainer, newDomRange.startOffset) : domSelection.setBaseAndExtent(newDomRange.startContainer, newDomRange.startOffset, newDomRange.endContainer, newDomRange.endOffset), scrollSelectionIntoView(editor, newDomRange)) : domSelection.removeAllRanges(), newDomRange;
+      return newDomRange ? (editor.composing && !IS_ANDROID ? domSelection.collapseToEnd() : isBackwardRange(selection, editor.snapshot.context) ? domSelection.setBaseAndExtent(newDomRange.endContainer, newDomRange.endOffset, newDomRange.startContainer, newDomRange.startOffset) : domSelection.setBaseAndExtent(newDomRange.startContainer, newDomRange.startOffset, newDomRange.endContainer, newDomRange.endOffset), scrollSelectionIntoView(editor, newDomRange)) : domSelection.removeAllRanges(), newDomRange;
     };
     domSelection.rangeCount <= 1 && setDomSelection();
     const ensureSelection = androidInputManagerRef.current?.isFlushing() === "action";
@@ -3259,7 +3240,7 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
       scheduleOnDOMSelectionChange.flush(), onDOMSelectionChange.flush();
       const {
         selection
-      } = editor, {
+      } = editor.snapshot.context, {
         inputType: type
       } = event, data = event.dataTransfer || event.data || void 0, isCompositionChange = type === "insertCompositionText" || type === "deleteCompositionText";
       if (isCompositionChange && editor.composing)
@@ -3280,12 +3261,12 @@ 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 = getParent(editor, anchor.path, {
+          const block = getParent(editor.snapshot, anchor.path, {
             match: (node2) => isTextBlock({
-              schema: editor.schema
+              schema: editor.snapshot.context.schema
             }, node2)
           });
-          block && getText(editor, block.path)?.includes("	") && (native = !1);
+          block && getText(editor.snapshot, block.path)?.includes("	") && (native = !1);
         }
       }
       if ((!type.startsWith("delete") || type.startsWith("deleteBy")) && !editor.isNodeMapDirty) {
@@ -3297,7 +3278,7 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
           });
           if (!selection || !rangeEquals(selection, range2)) {
             native = !1;
-            const selectionRef = !isCompositionChange && editor.selection && rangeRef(editor, editor.selection);
+            const selectionRef = !isCompositionChange && editor.snapshot.context.selection && rangeRef(editor, editor.snapshot.context.selection);
             editor.select(range2), selectionRef && (editor.userSelection = selectionRef);
           }
         }
@@ -3490,7 +3471,7 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
         }
       }
       const toRestore = editor.userSelection?.unref();
-      editor.userSelection = null, toRestore && (!editor.selection || !rangeEquals(editor.selection, toRestore)) && editor.select(toRestore);
+      editor.userSelection = null, toRestore && (!editor.snapshot.context.selection || !rangeEquals(editor.snapshot.context.selection, toRestore)) && editor.select(toRestore);
     }
   }, [editor, editorActor, onDOMSelectionChange, onUserInput, propsOnDOMBeforeInput, readOnly, scheduleOnDOMSelectionChange]), callbackRef = useCallback((node) => {
     node == null ? (onDOMSelectionChange.cancel(), scheduleOnDOMSelectionChange.cancel(), editor.domElement = null, ref.current && HAS_BEFORE_INPUT_SUPPORT && ref.current.removeEventListener("beforeinput", onDOMBeforeInput)) : HAS_BEFORE_INPUT_SUPPORT && node.addEventListener("beforeinput", onDOMBeforeInput), ref.current = node, typeof forwardedRef == "function" ? forwardedRef(node) : forwardedRef && (forwardedRef.current = node);
@@ -3572,10 +3553,10 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
           if (relatedTarget != null && isDOMNode(relatedTarget) && DOMEditor.hasDOMNode(editor, relatedTarget)) {
             const relatedPath = getDomNodePath(relatedTarget);
             if (relatedPath) {
-              const relatedNodeEntry = getNode(editor, relatedPath), relatedNode = relatedNodeEntry ? relatedNodeEntry.node : void 0;
+              const relatedNodeEntry = getNode(editor.snapshot, relatedPath), relatedNode = relatedNodeEntry ? relatedNodeEntry.node : void 0;
               if (relatedNode && (isTextBlockNode({
-                schema: editor.schema
-              }, relatedNode) || isLeafObject(editor, relatedNode, relatedPath)))
+                schema: editor.snapshot.context.schema
+              }, relatedNode) || isLeafObject(editor.snapshot, relatedNode, relatedPath)))
                 return;
             }
           }
@@ -3587,17 +3568,17 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
           const path2 = getDomNodePath(event.target);
           if (!path2)
             return;
-          const nodeClickEntry = getNode(editor, path2);
+          const nodeClickEntry = getNode(editor.snapshot, path2);
           if (!nodeClickEntry)
             return;
           const node = nodeClickEntry.node;
           if (event.detail === TRIPLE_CLICK && path2.length >= 1) {
             let blockPath = path2;
             isTextBlockNode({
-              schema: editor.schema
-            }, node) || (blockPath = getParent(editor, path2, {
+              schema: editor.snapshot.context.schema
+            }, node) || (blockPath = getParent(editor.snapshot, path2, {
               match: (node2) => isTextBlock({
-                schema: editor.schema
+                schema: editor.snapshot.context.schema
               }, node2)
             })?.path ?? path2.slice(0, 1));
             const range$1 = range(editor, blockPath);
@@ -3606,10 +3587,10 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
           }
           if (readOnly)
             return;
-          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)
+          const start$1 = start(editor, path2), end$1 = end(editor, path2), startEntry = getNode(editor.snapshot, start$1.path), startVoidNode = startEntry && isLeafObject(editor.snapshot, startEntry.node, start$1.path) ? startEntry : getAncestor(editor.snapshot, start$1.path, {
+            match: (node2, ancestorPath) => isLeafObject(editor.snapshot, node2, ancestorPath)
+          }), endEntry = getNode(editor.snapshot, end$1.path), endVoidNode = endEntry && isLeafObject(editor.snapshot, endEntry.node, end$1.path) ? endEntry : getAncestor(editor.snapshot, end$1.path, {
+            match: (node2, ancestorPath) => isLeafObject(editor.snapshot, node2, ancestorPath)
           });
           if (startVoidNode && endVoidNode && pathEquals(startVoidNode.path, endVoidNode.path)) {
             const range$1 = range(editor, start$1);
@@ -3643,7 +3624,7 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
             return;
           const {
             selection
-          } = editor;
+          } = editor.snapshot.context;
           if (selection && isExpandedRange(selection)) {
             editorActor.send({
               type: "behavior event",
@@ -3686,7 +3667,7 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
             return;
           const {
             selection
-          } = editor, blockSegment = selection !== null ? selection.focus.path[0] : 0, elementText = getText(editor, [blockSegment]), isRTL = elementText !== void 0 && getDirection(elementText) === "rtl";
+          } = editor.snapshot.context, blockSegment = selection !== null ? selection.focus.path[0] : 0, elementText = getText(editor.snapshot, [blockSegment]), isRTL = elementText !== void 0 && getDirection(elementText) === "rtl";
           if (Hotkeys.isMoveLineBackward(nativeEvent)) {
             event.preventDefault(), move(editor, {
               unit: "line",
@@ -3751,8 +3732,8 @@ 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 && isLeafObject(editor, currentNodeEntry.node, selection.anchor.path)) {
+              const currentNodeEntry = getNode(editor.snapshot, selection.anchor.path);
+              if (currentNodeEntry && isLeafObject(editor.snapshot, currentNodeEntry.node, selection.anchor.path)) {
                 event.preventDefault(), editorActor.send({
                   type: "behavior event",
                   behaviorEvent: {
@@ -3916,7 +3897,7 @@ const RestoreDOM = IS_ANDROID ? RestoreDOMComponent : ({
     }
   ) }) }) });
 }), defaultDecorate = () => [], defaultScrollSelectionIntoView = (editor, domRange) => {
-  const isBackward = !!editor.selection && isBackwardRange(editor.selection, editor), domFocusPoint = domRange.cloneRange();
+  const isBackward = !!editor.snapshot.context.selection && isBackwardRange(editor.snapshot.context.selection, editor.snapshot.context), domFocusPoint = domRange.cloneRange();
   if (domFocusPoint.collapse(isBackward), domFocusPoint.getBoundingClientRect) {
     const leafEl = domFocusPoint.startContainer.parentElement, domRect = domFocusPoint.getBoundingClientRect();
     if (domRect.width === 0 && domRect.height === 0 && domRect.x === 0 && domRect.y === 0) {
@@ -3969,23 +3950,23 @@ function resolveSelection(editor, selection) {
 function resolveSelectionPoint(editor, selectionPoint, direction) {
   const snapshot = {
     context: {
-      schema: editor.schema,
-      containers: editor.publicContainers,
-      value: editor.children
+      schema: editor.snapshot.context.schema,
+      containers: editor.snapshot.context.containers,
+      value: editor.snapshot.context.value
     },
-    blockIndexMap: editor.blockIndexMap
+    blockIndexMap: editor.snapshot.blockIndexMap
   }, entry = getNode(snapshot, selectionPoint.path);
   if (entry) {
     if (getChildren(snapshot, entry.path).length === 0)
       return {
         path: entry.path,
         offset: isSpan({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, entry.node) ? Math.min(entry.node.text.length, selectionPoint.offset) : 0
       };
     const isBlockLevelPath = isBlock(snapshot, selectionPoint.path);
     if (isTextBlock({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, entry.node) && isBlockLevelPath) {
       const spanPoint = blockOffsetToSpanSelectionPoint({
         snapshot,
@@ -4029,9 +4010,7 @@ function resolveSelectionPoint(editor, selectionPoint, direction) {
   };
 }
 function applySelect(editor, target) {
-  const range2 = toRange(editor, target), {
-    selection
-  } = editor;
+  const range2 = toRange(editor, target), selection = editor.snapshot.context.selection;
   if (selection) {
     const oldProps = {}, newProps = {};
     range2.anchor != null && !pointEquals(range2.anchor, selection.anchor) && (oldProps.anchor = selection.anchor, newProps.anchor = range2.anchor), range2.focus != null && !pointEquals(range2.focus, selection.focus) && (oldProps.focus = selection.focus, newProps.focus = range2.focus), Object.keys(oldProps).length > 0 && editor.apply({
@@ -4047,9 +4026,7 @@ function applySelect(editor, target) {
     });
 }
 function applyDeselect(editor) {
-  const {
-    selection
-  } = editor;
+  const selection = editor.snapshot.context.selection;
   selection && editor.apply({
     type: "set_selection",
     properties: selection,
@@ -4105,7 +4082,7 @@ function getEventPosition({
   const {
     node: eventNode,
     path: eventPath
-  } = eventResult, eventBlockEntry = getEnclosingBlock(editorEngine, eventPath), eventBlock = eventBlockEntry?.node, eventBlockPath = eventBlockEntry?.path, eventPositionBlock = getEventPositionBlock({
+  } = eventResult, eventBlockEntry = getEnclosingBlock(editorEngine.snapshot, eventPath), eventBlock = eventBlockEntry?.node, eventBlockPath = eventBlockEntry?.path, eventPositionBlock = getEventPositionBlock({
     nodePath: eventPath,
     editorEngine,
     event
@@ -4117,14 +4094,14 @@ function getEventPosition({
       isContainer: !1,
       selection: {
         anchor: getBlockStartPoint({
-          context: editorEngine,
+          context: editorEngine.snapshot.context,
           block: {
             node: eventBlock,
             path: eventBlockPath
           }
         }),
         focus: getBlockEndPoint({
-          context: editorEngine,
+          context: editorEngine.snapshot.context,
           block: {
             node: eventBlock,
             path: eventBlockPath
@@ -4134,7 +4111,7 @@ function getEventPosition({
     };
   if (!eventPositionBlock || !eventSelection)
     return;
-  const eventSelectionFocusBlock = getEnclosingBlock(editorEngine, eventSelection.focus.path);
+  const eventSelectionFocusBlock = getEnclosingBlock(editorEngine.snapshot, eventSelection.focus.path);
   if (eventSelectionFocusBlock)
     return isSelectionCollapsed(eventSelection) && eventBlock && eventBlockPath && eventSelectionFocusBlock.node._key !== eventBlock._key && !isAncestorPath(eventBlockPath, eventSelectionFocusBlock.path) ? {
       block: eventPositionBlock,
@@ -4142,14 +4119,14 @@ function getEventPosition({
       isContainer: !1,
       selection: {
         anchor: getBlockStartPoint({
-          context: editorEngine,
+          context: editorEngine.snapshot.context,
           block: {
             node: eventBlock,
             path: eventBlockPath
           }
         }),
         focus: getBlockEndPoint({
-          context: editorEngine,
+          context: editorEngine.snapshot.context,
           block: {
             node: eventBlock,
             path: eventBlockPath
@@ -4159,7 +4136,7 @@ function getEventPosition({
     } : {
       block: eventPositionBlock,
       isEditor: isEditor(eventNode),
-      isContainer: isEditor(eventNode) ? !1 : isEditableContainer(editorEngine, eventNode, eventPath),
+      isContainer: isEditor(eventNode) ? !1 : isEditableContainer(editorEngine.snapshot, eventNode, eventPath),
       selection: eventSelection
     };
 }
@@ -4177,7 +4154,7 @@ function getEventNode({
             path: path2
           };
         {
-          const nodeEntry = getNode(editorEngine, path2);
+          const nodeEntry = getNode(editorEngine.snapshot, path2);
           if (nodeEntry)
             return {
               node: nodeEntry.node,
@@ -4194,7 +4171,7 @@ function getEventPositionBlock({
   editorEngine,
   event
 }) {
-  const firstBlockEntry = getNode(editorEngine, [0]);
+  const firstBlockEntry = getNode(editorEngine.snapshot, [0]);
   if (!firstBlockEntry)
     return;
   const firstBlockElement = getDomNode(editorEngine, firstBlockEntry.path);
@@ -4203,7 +4180,7 @@ function getEventPositionBlock({
   const firstBlockRect = firstBlockElement.getBoundingClientRect();
   if (event.pageY < firstBlockRect.top)
     return "start";
-  const lastBlock = editorEngine.children.at(-1), lastBlockEntry = lastBlock ? getNode(editorEngine, [{
+  const lastBlock = editorEngine.snapshot.context.value.at(-1), lastBlockEntry = lastBlock ? getNode(editorEngine.snapshot, [{
     _key: lastBlock._key
   }]) : void 0;
   if (!lastBlockEntry)
@@ -4250,7 +4227,7 @@ function getSelectionFromEvent(editor, event) {
     }
 }
 function isEventContainer(editorEngine, eventNode, eventPath) {
-  return isEditor(eventNode) ? !0 : isEditableContainer(editorEngine, eventNode, eventPath);
+  return isEditor(eventNode) ? !0 : isEditableContainer(editorEngine.snapshot, eventNode, eventPath);
 }
 const EditorActorContext = createContext({}), IS_MAC = typeof window < "u" && /Mac|iPod|iPhone|iPad/.test(window.navigator.userAgent), modifiers = {
   alt: "altKey",
@@ -4409,20 +4386,32 @@ function performHotkey({
       }
   });
 }
-function rangeIncludes(range2, target, root) {
-  if (isRange(target)) {
-    if (rangeIncludes(range2, target.anchor, root) || rangeIncludes(range2, target.focus, root))
-      return !0;
-    const [rs, re] = rangeEdges(range2, root), [ts, te] = rangeEdges(target, root);
-    return isBeforePoint(rs, ts, root) && isAfterPoint(re, te, root);
+function isForwardRange(range2, root) {
+  return !isBackwardRange(range2, root);
+}
+function resolveRangeAffinities(range2, root, affinity) {
+  if (affinity === "inward") {
+    const isCollapsed = isCollapsedRange(range2);
+    if (isForwardRange(range2, root)) {
+      const anchorAffinity2 = "forward";
+      return [anchorAffinity2, isCollapsed ? anchorAffinity2 : "backward"];
+    }
+    const anchorAffinity = "backward";
+    return [anchorAffinity, isCollapsed ? anchorAffinity : "forward"];
   }
-  const [start2, end2] = rangeEdges(range2, root);
-  let isAfterStart = !1, isBeforeEnd = !1;
-  return isPoint(target) ? (isAfterStart = comparePoints(target, start2, root) >= 0, isBeforeEnd = comparePoints(target, end2, root) <= 0) : (isAfterStart = comparePaths(target, start2.path, root) >= 0, isBeforeEnd = comparePaths(target, end2.path, root) <= 0), isAfterStart && isBeforeEnd;
+  return affinity === "outward" ? isForwardRange(range2, root) ? ["backward", "forward"] : ["forward", "backward"] : [affinity, affinity];
 }
-function moveRangeByOperation(range2, operation) {
-  const anchor = transformPoint$1(range2.anchor, operation), focus = transformPoint$1(range2.focus, operation);
-  return anchor === null || focus === null ? null : pointEquals(anchor, range2.anchor) && pointEquals(focus, range2.focus) ? range2 : {
+function transformRange(range2, op, root, options = {}) {
+  if (range2 === null)
+    return null;
+  const {
+    affinity = "inward"
+  } = options, [affinityAnchor, affinityFocus] = resolveRangeAffinities(range2, root, affinity), anchor = transformPoint$1(range2.anchor, op, {
+    affinity: affinityAnchor
+  }), focus = transformPoint$1(range2.focus, op, {
+    affinity: affinityFocus
+  });
+  return !anchor || !focus ? null : anchor === range2.anchor && focus === range2.focus ? range2 : {
     anchor,
     focus
   };
@@ -4513,7 +4502,7 @@ const engineOperationCallback = ({
           });
           continue;
         }
-        const newRange = moveRangeByOperation(currentSelection, event.operation);
+        const newRange = transformRange(currentSelection, event.operation, context.editorEngine.snapshot.context);
         (newRange && newRange !== currentSelection || newRange === null && currentSelection) && decoratedRange.rangeDecoration.onMoved?.({
           newSelection: newRange,
           rangeDecoration: decoratedRange.rangeDecoration,
@@ -4658,8 +4647,8 @@ const engineOperationCallback = ({
 });
 function createDecorate(schema, editorEngine) {
   return function([node, path2]) {
-    const defaultStyle = schema.styles.at(0)?.name, firstBlock = editorEngine.children[0];
-    return editorEngine.children.length === 1 && firstBlock && isEmptyTextBlock({
+    const defaultStyle = schema.styles.at(0)?.name, firstBlock = editorEngine.snapshot.context.value[0];
+    return editorEngine.snapshot.context.value.length === 1 && firstBlock && isEmptyTextBlock({
       schema
     }, firstBlock) && (!firstBlock.style || firstBlock.style === defaultStyle) && !firstBlock.listItem ? [{
       anchor: {
@@ -4672,10 +4661,10 @@ function createDecorate(schema, editorEngine) {
       },
       placeholder: !0
     }] : path2.length === 0 ? [] : !isTextBlock({
-      schema: editorEngine.schema
+      schema: editorEngine.snapshot.context.schema
     }, node) || node.children.length === 0 ? [] : editorEngine.decoratedRanges.filter((decoratedRange) => {
       if (isCollapsedRange(decoratedRange)) {
-        const anchorBlock = getEnclosingBlock(editorEngine, decoratedRange.anchor.path), anchorChildSegment = decoratedRange.anchor.path.at(-1);
+        const anchorBlock = getEnclosingBlock(editorEngine.snapshot, decoratedRange.anchor.path), anchorChildSegment = decoratedRange.anchor.path.at(-1);
         return !anchorBlock || !isKeyedSegment(anchorChildSegment) ? !1 : anchorBlock.node._key === node._key && node.children.some((child) => child._key === anchorChildSegment._key);
       }
       return rangeIntersection(decoratedRange, {
@@ -4687,18 +4676,16 @@ function createDecorate(schema, editorEngine) {
           path: path2,
           offset: 0
         }
-      }, editorEngine) || rangeIncludes(decoratedRange, path2, editorEngine);
+      }, editorEngine.snapshot.context) || rangeIntersects(editorEngine.snapshot, decoratedRange, path2);
     });
   };
 }
 const RelayActorContext = createContext({});
 function findBlockPositionalOverride(parentConfig, type) {
-  if (parentConfig?.of)
-    return parentConfig.of.find((entry) => "container" in entry ? entry.container.type === type : "textBlock" in entry ? entry.textBlock.type === type : entry.blockObject.type === type);
+  return parentConfig?.of ? parentConfig.of.find((entry) => "container" in entry ? entry.container.type === type : "textBlock" in entry ? entry.textBlock.type === type : entry.blockObject.type === type) || parentConfig.of.find((entry) => "container" in entry ? !1 : "textBlock" in entry ? entry.textBlock.type === "*" : entry.blockObject.type === "*") : void 0;
 }
 function findInlinePositionalOverride(parentTextBlock, type) {
-  if (parentTextBlock?.of)
-    return parentTextBlock.of.find((entry) => "span" in entry ? entry.span.type === type : entry.inlineObject.type === type);
+  return parentTextBlock?.of ? parentTextBlock.of.find((entry) => "span" in entry ? entry.span.type === type : entry.inlineObject.type === type) || parentTextBlock.of.find((entry) => "span" in entry ? entry.span.type === "*" : entry.inlineObject.type === "*") : void 0;
 }
 const ParentTextBlockContext = createContext(void 0);
 function renderDefaultContainer(props) {
@@ -4853,11 +4840,11 @@ const defaultStore = {
   getSnapshot: () => defaultSelectionState
 }, SelectionStateStoreContext = createContext(defaultStore);
 function SelectionStateProvider(t0) {
-  const $ = c(11), {
+  const $ = c(10), {
     children
   } = t0, editorActor = useContext(EditorActorContext), editorEngine = useEngineStatic();
   let t1;
-  $[0] !== editorEngine.blockIndexMap || $[1] !== editorEngine.publicContainers || $[2] !== editorEngine.snapshot ? (t1 = () => {
+  $[0] !== editorEngine.blockIndexMap || $[1] !== editorEngine.snapshot ? (t1 = () => {
     const snapshot = editorEngine.snapshot, selection = snapshot.context.selection ? {
       anchorPath: snapshot.context.selection.anchor.path,
       focusPath: snapshot.context.selection.focus.path,
@@ -4867,15 +4854,15 @@ function SelectionStateProvider(t0) {
     return getSelectionState({
       context: {
         schema: snapshot.context.schema,
-        containers: editorEngine.publicContainers,
+        containers: editorEngine.snapshot.context.containers,
         value: snapshot.context.value
       },
       blockIndexMap: editorEngine.blockIndexMap
     }, selection);
-  }, $[0] = editorEngine.blockIndexMap, $[1] = editorEngine.publicContainers, $[2] = editorEngine.snapshot, $[3] = t1) : t1 = $[3];
+  }, $[0] = editorEngine.blockIndexMap, $[1] = editorEngine.snapshot, $[2] = t1) : t1 = $[2];
   const computeCurrent = t1, [seed] = useState(computeCurrent), stateRef = useRef(seed), [initialSubscribers] = useState(_temp$2), subscribersRef = useRef(initialSubscribers);
   let t2, t3;
-  $[4] !== computeCurrent || $[5] !== editorActor ? (t2 = () => {
+  $[3] !== computeCurrent || $[4] !== editorActor ? (t2 = () => {
     const next = computeCurrent();
     if (!selectionStatesEqual(stateRef.current, next)) {
       stateRef.current = next;
@@ -4895,17 +4882,17 @@ function SelectionStateProvider(t0) {
       }));
     });
     return () => subscription.unsubscribe();
-  }, t3 = [editorActor, computeCurrent], $[4] = computeCurrent, $[5] = editorActor, $[6] = t2, $[7] = t3) : (t2 = $[6], t3 = $[7]), useEffect(t2, t3);
+  }, t3 = [editorActor, computeCurrent], $[3] = computeCurrent, $[4] = editorActor, $[5] = t2, $[6] = t3) : (t2 = $[5], t3 = $[6]), useEffect(t2, t3);
   let t4;
-  $[8] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (t4 = {
+  $[7] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel") ? (t4 = {
     subscribe: (callback) => (subscribersRef.current.add(callback), () => {
       subscribersRef.current.delete(callback);
     }),
     getSnapshot: () => stateRef.current
-  }, $[8] = t4) : t4 = $[8];
+  }, $[7] = t4) : t4 = $[7];
   const store = t4;
   let t5;
-  return $[9] !== children ? (t5 = /* @__PURE__ */ jsx(SelectionStateStoreContext.Provider, { value: store, children }), $[9] = children, $[10] = t5) : t5 = $[10], t5;
+  return $[8] !== children ? (t5 = /* @__PURE__ */ jsx(SelectionStateStoreContext.Provider, { value: store, children }), $[8] = children, $[9] = t5) : t5 = $[9], t5;
 }
 function _temp$2() {
   return /* @__PURE__ */ new Set();
@@ -5058,7 +5045,7 @@ function RenderContainer(props) {
 function useBlockSubSchema(path2) {
   const $ = c(3), editor = useEngineStatic();
   let t0;
-  return $[0] !== editor || $[1] !== path2 ? (t0 = getPathSubSchema(editor, path2), $[0] = editor, $[1] = path2, $[2] = t0) : t0 = $[2], t0;
+  return $[0] !== editor.snapshot || $[1] !== path2 ? (t0 = getPathSubSchema(editor.snapshot, path2), $[0] = editor.snapshot, $[1] = path2, $[2] = t0) : t0 = $[2], t0;
 }
 function RenderInlineObject(props) {
   const $ = c(41), inlineObjectRef = useRef(null), subSchema = useBlockSubSchema(props.path);
@@ -5336,8 +5323,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 = (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);
+  $[6] !== type ? (t2 = (engine) => [engine.containers.get(type), engine.blockObjects.get(type), engine.blockObjects.get("*"), engine.inlineObjects.get(type), engine.inlineObjects.get("*"), engine.textBlocks.get(type), engine.textBlocks.get("*")], $[6] = type, $[7] = t2) : t2 = $[7];
+  const [globalContainerConfig, globalBlockObjectConfig, globalBlockObjectCatchAll, globalInlineObjectConfig, globalInlineObjectCatchAll, textBlockConfig, textBlockCatchAll] = useEngineSelector(t2, tupleRefEqual);
   let t3;
   bb0: {
     if (blockPositionalOverride && "container" in blockPositionalOverride) {
@@ -5357,27 +5344,27 @@ function RenderElement(props) {
       t4 = blockPositionalOverride;
       break bb1;
     }
-    t4 = textBlockConfig;
+    t4 = textBlockConfig ?? textBlockCatchAll;
   }
   const textBlockScope = t4;
   let t5;
   bb2: {
     if (blockPositionalOverride && "textBlock" in blockPositionalOverride) {
       if (blockPositionalOverride.textBlock.render === void 0) {
-        t5 = textBlockConfig;
+        t5 = textBlockConfig ?? textBlockCatchAll;
         break bb2;
       }
       t5 = blockPositionalOverride;
       break bb2;
     }
-    t5 = textBlockConfig;
+    t5 = textBlockConfig ?? textBlockCatchAll;
   }
   const renderableTextBlockConfig = t5;
   let t6;
   bb3: {
     if (blockPositionalOverride && "blockObject" in blockPositionalOverride) {
       if (blockPositionalOverride.blockObject.render === void 0) {
-        t6 = globalBlockObjectConfig;
+        t6 = globalBlockObjectConfig ?? globalBlockObjectCatchAll;
         break bb3;
       }
       t6 = blockPositionalOverride;
@@ -5387,14 +5374,14 @@ function RenderElement(props) {
       t6 = void 0;
       break bb3;
     }
-    t6 = globalBlockObjectConfig;
+    t6 = globalBlockObjectConfig ?? globalBlockObjectCatchAll;
   }
   const blockObjectConfig = t6;
   let t7;
   bb4: {
     if (inlinePositionalOverride && "inlineObject" in inlinePositionalOverride) {
       if (inlinePositionalOverride.inlineObject.render === void 0) {
-        t7 = globalInlineObjectConfig;
+        t7 = globalInlineObjectConfig ?? globalInlineObjectCatchAll;
         break bb4;
       }
       t7 = inlinePositionalOverride;
@@ -5404,7 +5391,7 @@ function RenderElement(props) {
       t7 = void 0;
       break bb4;
     }
-    t7 = globalInlineObjectConfig;
+    t7 = globalInlineObjectConfig ?? globalInlineObjectCatchAll;
   }
   const inlineObjectConfig = t7;
   if (containerConfig) {
@@ -5451,7 +5438,7 @@ function RenderElement(props) {
     }
     return rendered;
   }
-  if (isInline(engineStatic, props.path)) {
+  if (isInline(engineStatic.snapshot, props.path)) {
     if (isInNewPipeline && !inlineObjectConfig) {
       let rest_0;
       if ($[44] !== props.attributes) {
@@ -5534,9 +5521,9 @@ function useSpanConfig(node, _path) {
   $[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 = (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;
+  $[3] !== node._type ? (t1 = (engine) => [engine.spans.get(node._type), engine.spans.get("*")], $[3] = node._type, $[4] = t1) : t1 = $[4];
+  const [globalSpan, globalSpanCatchAll] = useEngineSelector(t1, tupleRefEqual);
+  return positional && "span" in positional ? positional.span.render === void 0 ? globalSpan ?? globalSpanCatchAll : positional : globalSpan ?? globalSpanCatchAll;
 }
 function RenderSpan(props) {
   const $ = c(41), schema = props.schema, spanRef = useRef(null);
@@ -5969,7 +5956,7 @@ const PortableTextEditorContext = createContext(null), usePortableTextEditor = (
   }
 });
 function validateSelection(editorEngine, editorElement) {
-  if (!editorEngine.selection)
+  if (!editorEngine.snapshot.context.selection)
     return;
   let root;
   try {
@@ -5983,10 +5970,10 @@ function validateSelection(editorEngine, editorElement) {
     return;
   const existingDOMRange = domSelection.getRangeAt(0);
   try {
-    const newDOMRange = DOMEditor.toDOMRange(editorEngine, editorEngine.selection);
+    const newDOMRange = DOMEditor.toDOMRange(editorEngine, editorEngine.snapshot.context.selection);
     (newDOMRange.startOffset !== existingDOMRange.startOffset || newDOMRange.endOffset !== existingDOMRange.endOffset) && (debug.selection("DOM range out of sync, validating selection"), domSelection?.removeAllRanges(), domSelection.addRange(newDOMRange));
   } catch {
-    debug.selection("Could not resolve selection, selecting top document"), applyDeselect(editorEngine), editorEngine.children.length > 0 && applySelect(editorEngine, start(editorEngine, [])), editorEngine.onChange();
+    debug.selection("Could not resolve selection, selecting top document"), applyDeselect(editorEngine), editorEngine.snapshot.context.value.length > 0 && applySelect(editorEngine, start(editorEngine, [])), editorEngine.onChange();
   }
 }
 const PortableTextEditable = forwardRef(function(props, forwardedRef) {
@@ -6020,7 +6007,7 @@ 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), editorEngine = useEngine(), schema = editorEngine.schema, readOnly = useSelector(editorActor, _temp);
+  const portableTextEditor = usePortableTextEditor(), [hasInvalidValue, setHasInvalidValue] = useState(!1), editorActor = useContext(EditorActorContext), relayActor = useContext(RelayActorContext), editorEngine = useEngine(), schema = editorEngine.snapshot.context.schema, readOnly = useSelector(editorActor, _temp);
   let t0;
   $[27] !== editorEngine ? (t0 = {
     input: {
@@ -6112,7 +6099,7 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         onCopy(event) !== void 0 && event.preventDefault();
       else if (event.nativeEvent.clipboardData) {
         event.stopPropagation(), event.preventDefault();
-        const selection = editorEngine.selection ?? void 0, position = selection ? {
+        const selection = editorEngine.snapshot.context.selection ?? void 0, position = selection ? {
           selection
         } : void 0;
         if (!position) {
@@ -6142,7 +6129,7 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
         onCut(event_0) !== void 0 && event_0.preventDefault();
       else if (event_0.nativeEvent.clipboardData) {
         event_0.stopPropagation(), event_0.preventDefault();
-        const selection_0 = editorEngine.selection, position_0 = selection_0 ? {
+        const selection_0 = editorEngine.snapshot.context.selection, position_0 = selection_0 ? {
           selection: selection_0
         } : void 0;
         if (!position_0) {
@@ -6167,19 +6154,19 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
   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?.({
+    const value = editorEngine.snapshot.context.value, path2 = editorEngine.snapshot.context.selection?.focus.path || [], onPasteResult = onPaste?.({
       event: event_1,
       value,
       path: path2,
       schemaTypes: portableTextEditor.schemaTypes
     });
-    if (onPasteResult || !editorEngine.selection)
+    if (onPasteResult || !editorEngine.snapshot.context.selection)
       event_1.preventDefault(), relayActor.send({
         type: "loading"
       }), 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 = editorEngine.selection, position_1 = selection_1 ? {
+          const selection_1 = editorEngine.snapshot.context.selection, position_1 = selection_1 ? {
             selection: selection_1
           } : void 0;
           if (!position_1) {
@@ -6204,8 +6191,8 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
             behaviorEvent: {
               type: "insert.blocks",
               blocks: parseBlocks({
-                keyGenerator: editorEngine.keyGenerator,
-                schema: editorEngine.schema,
+                keyGenerator: editorEngine.snapshot.context.keyGenerator,
+                schema: editorEngine.snapshot.context.schema,
                 blocks: result_1.insert,
                 options: {
                   normalize: !1,
@@ -6224,7 +6211,7 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
       });
     else if (event_1.nativeEvent.clipboardData) {
       event_1.preventDefault(), event_1.stopPropagation();
-      const selection_2 = editorEngine.selection, position_2 = selection_2 ? {
+      const selection_2 = editorEngine.snapshot.context.selection, position_2 = selection_2 ? {
         selection: selection_2
       } : void 0;
       if (!position_2) {
@@ -6252,7 +6239,7 @@ const PortableTextEditable = forwardRef(function(props, forwardedRef) {
     onFocus && onFocus(event_2), event_2.isDefaultPrevented() || (relayActor.send({
       type: "focused",
       event: event_2
-    }), !editorEngine.selection && editorEngine.children.length === 1 && isEmptyTextBlock(editorEngine, editorEngine.children.at(0)) && (editorEngine.select(start(editorEngine, [])), editorEngine.onChange()));
+    }), !editorEngine.snapshot.context.selection && editorEngine.snapshot.context.value.length === 1 && isEmptyTextBlock(editorEngine.snapshot.context, editorEngine.snapshot.context.value.at(0)) && (editorEngine.select(start(editorEngine, [])), editorEngine.onChange()));
   }, $[92] = editorEngine, $[93] = onFocus, $[94] = relayActor, $[95] = t20) : t20 = $[95];
   const handleOnFocus = t20;
   let t21;
@@ -6880,34 +6867,34 @@ function isListItemActive({
   editor,
   listItem
 }) {
-  if (!editor.selection)
+  if (!editor.snapshot.context.selection)
     return !1;
-  const [selStart, selEnd] = rangeEdges(editor.selection, editor), selectedBlocks = [...getNodes(editor, {
+  const [selStart, selEnd] = rangeEdges(editor.snapshot.context.selection, editor.snapshot.context), selectedBlocks = [...getNodes(editor.snapshot, {
     from: selStart.path,
     to: selEnd.path,
     match: (node) => isTextBlock({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node)
   })];
   return selectedBlocks.length > 0 ? selectedBlocks.every((entry) => isListBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, entry.node) && entry.node.listItem === listItem) : !1;
 }
 function isStyleActive({
   editor,
   style
 }) {
-  if (!editor.selection)
+  if (!editor.snapshot.context.selection)
     return !1;
-  const [selStart, selEnd] = rangeEdges(editor.selection, editor), selectedBlocks = [...getNodes(editor, {
+  const [selStart, selEnd] = rangeEdges(editor.snapshot.context.selection, editor.snapshot.context), selectedBlocks = [...getNodes(editor.snapshot, {
     from: selStart.path,
     to: selEnd.path,
     match: (node) => isTextBlock({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node)
   })];
   return selectedBlocks.length > 0 ? selectedBlocks.every((entry) => isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, entry.node) && entry.node.style === style) : !1;
 }
 function createEditableAPI(editor, editorActor) {
@@ -6991,18 +6978,18 @@ function createEditableAPI(editor, editorActor) {
       });
     },
     focusBlock: () => {
-      if (!editor.selection)
+      if (!editor.snapshot.context.selection)
         return;
-      const focusPath = editor.selection.focus.path;
-      return getBlock(editor, focusPath)?.node ?? getBlock(editor, parentPath(focusPath))?.node;
+      const focusPath = editor.snapshot.context.selection.focus.path;
+      return getBlock(editor.snapshot, focusPath)?.node ?? getBlock(editor.snapshot, parentPath(focusPath))?.node;
     },
     focusChild: () => {
-      if (!editor.selection)
+      if (!editor.snapshot.context.selection)
         return;
-      const leaf = getLeaf(editor, editor.selection.focus.path, {
+      const leaf = getLeaf(editor.snapshot, editor.snapshot.context.selection.focus.path, {
         edge: "start"
       });
-      if (!(!leaf || isBlock(editor, leaf.path)))
+      if (!(!leaf || isBlock(editor.snapshot, leaf.path)))
         return leaf.node;
     },
     insertChild: (type, value) => (editorActor.send({
@@ -7015,7 +7002,7 @@ function createEditableAPI(editor, editorActor) {
         }
       },
       editor
-    }), editor.selection?.focus.path ?? []),
+    }), editor.snapshot.context.selection?.focus.path ?? []),
     insertBlock: (type, value) => (editorActor.send({
       type: "behavior event",
       behaviorEvent: {
@@ -7027,7 +7014,7 @@ function createEditableAPI(editor, editorActor) {
         placement: "auto"
       },
       editor
-    }), editor.selection?.focus.path ?? []),
+    }), editor.snapshot.context.selection?.focus.path ?? []),
     hasBlockStyle: (style) => {
       try {
         return isStyleActive({
@@ -7049,17 +7036,17 @@ function createEditableAPI(editor, editorActor) {
       }
     },
     isVoid: (element) => {
-      const schema = editor.schema;
+      const schema = editor.snapshot.context.schema;
       return ![schema.block.name, schema.span.name].includes(element._type);
     },
     findByPath: (path2) => {
-      const result = getNode(editor, path2);
+      const result = getNode(editor.snapshot, path2);
       return result ? [result.node, path2] : [void 0, void 0];
     },
     findDOMNode: (element) => {
       let node;
       try {
-        const entry = Array.from(getNodes(editor, {
+        const entry = Array.from(getNodes(editor.snapshot, {
           match: (n) => n._key === element._key
         }))[0];
         if (entry) {
@@ -7071,24 +7058,24 @@ function createEditableAPI(editor, editorActor) {
       return node;
     },
     activeAnnotations: () => {
-      if (!editor.selection || editor.selection.focus.path.length < 2)
+      if (!editor.snapshot.context.selection || editor.snapshot.context.selection.focus.path.length < 2)
         return [];
       try {
-        const activeAnnotations = [], spans = getNodes(editor, {
-          from: rangeStart(editor.selection, editor).path,
-          to: rangeEnd(editor.selection, editor).path,
+        const activeAnnotations = [], spans = getNodes(editor.snapshot, {
+          from: rangeStart(editor.snapshot.context.selection, editor.snapshot.context).path,
+          to: rangeEnd(editor.snapshot.context.selection, editor.snapshot.context).path,
           match: (node) => isSpan({
-            schema: editor.schema
+            schema: editor.snapshot.context.schema
           }, node) && node.marks !== void 0 && Array.isArray(node.marks) && node.marks.length > 0
         });
         for (const {
           node: span,
           path: spanPath
         } of spans) {
-          const blockEntry = getTextBlock(editor, parentPath(spanPath));
+          const blockEntry = getTextBlock(editor.snapshot, parentPath(spanPath));
           blockEntry && blockEntry.node.markDefs?.forEach((def) => {
             isSpan({
-              schema: editor.schema
+              schema: editor.snapshot.context.schema
             }, span) && span.marks && Array.isArray(span.marks) && span.marks.includes(def._key) && activeAnnotations.push(def);
           });
         }
@@ -7152,10 +7139,10 @@ function createEditableAPI(editor, editorActor) {
         editor
       });
     },
-    getSelection: () => editor.selection,
-    getValue: () => editor.children,
-    isCollapsedSelection: () => !!editor.selection && isCollapsedRange(editor.selection),
-    isExpandedSelection: () => !!editor.selection && isExpandedRange(editor.selection),
+    getSelection: () => editor.snapshot.context.selection,
+    getValue: () => editor.snapshot.context.value,
+    isCollapsedSelection: () => !!editor.snapshot.context.selection && isCollapsedRange(editor.snapshot.context.selection),
+    isExpandedSelection: () => !!editor.snapshot.context.selection && isExpandedRange(editor.snapshot.context.selection),
     insertBreak: () => {
       editorActor.send({
         type: "behavior event",
@@ -7169,7 +7156,7 @@ function createEditableAPI(editor, editorActor) {
       const snapshot = editor.snapshot;
       return getFragment(snapshot).map((entry) => entry.node);
     },
-    isSelectionsOverlapping: (selectionA, selectionB) => !selectionA || !selectionB ? !1 : rangeIncludes(selectionA, selectionB, editor)
+    isSelectionsOverlapping: (selectionA, selectionB) => !selectionA || !selectionB ? !1 : rangeIntersects(editor.snapshot, selectionA, selectionB)
   };
 }
 function createBehaviorApiPlugin(editorActor) {
@@ -7183,7 +7170,7 @@ function createBehaviorApiPlugin(editorActor) {
         select2(location);
         return;
       }
-      if (editor.selection) {
+      if (editor.snapshot.context.selection) {
         select2(location);
         return;
       }
@@ -7194,7 +7181,7 @@ function createBehaviorApiPlugin(editorActor) {
           type: "select",
           at: {
             ...range$1,
-            backward: isBackwardRange(range$1, editor)
+            backward: isBackwardRange(range$1, editor.snapshot.context)
           }
         },
         editor
@@ -7204,16 +7191,16 @@ function createBehaviorApiPlugin(editorActor) {
         setSelection2(partialRange);
         return;
       }
-      const anchor = partialRange.anchor, focus = partialRange.focus, backward = editor.selection ? isBackwardRange({
-        anchor: partialRange.anchor ?? editor.selection.anchor,
-        focus: partialRange.focus ?? editor.selection.focus
-      }, editor) : partialRange.anchor && partialRange.focus ? isBackwardRange({
+      const anchor = partialRange.anchor, focus = partialRange.focus, backward = editor.snapshot.context.selection ? isBackwardRange({
+        anchor: partialRange.anchor ?? editor.snapshot.context.selection.anchor,
+        focus: partialRange.focus ?? editor.snapshot.context.selection.focus
+      }, editor.snapshot.context) : partialRange.anchor && partialRange.focus ? isBackwardRange({
         anchor: partialRange.anchor,
         focus: partialRange.focus
-      }, editor) : void 0;
-      if (editor.selection) {
-        const newAnchor = partialRange.anchor ?? editor.selection.anchor, newFocus = partialRange.focus ?? editor.selection.focus;
-        if (pointEquals(newAnchor, editor.selection.anchor) && pointEquals(newFocus, editor.selection.focus)) {
+      }, editor.snapshot.context) : void 0;
+      if (editor.snapshot.context.selection) {
+        const newAnchor = partialRange.anchor ?? editor.snapshot.context.selection.anchor, newFocus = partialRange.focus ?? editor.snapshot.context.selection.focus;
+        if (pointEquals(newAnchor, editor.snapshot.context.selection.anchor) && pointEquals(newFocus, editor.snapshot.context.selection.focus)) {
           setSelection2(partialRange);
           return;
         }
@@ -7240,38 +7227,45 @@ function createBehaviorApiPlugin(editorActor) {
 function createUndoSteps({
   steps,
   op,
-  editor,
   currentUndoStepId,
-  previousUndoStepId
+  previousUndoStepId,
+  operationsInProgress,
+  isNormalizingNode,
+  selectionBeforeApply
 }) {
   const lastStep = steps.at(-1);
   if (!lastStep)
-    return createNewStep(steps, op, editor);
-  if (editor.operations.length > 0)
-    return currentUndoStepId === previousUndoStepId || editor.isNormalizingNode ? mergeIntoLastStep(steps, lastStep, op) : createNewStep(steps, op, editor);
+    return createNewStep(steps, op, selectionBeforeApply);
+  if (operationsInProgress)
+    return currentUndoStepId === previousUndoStepId || isNormalizingNode ? mergeIntoLastStep(steps, lastStep, op) : createNewStep(steps, op, selectionBeforeApply);
   if (op.type === "set_selection" && currentUndoStepId === void 0 && previousUndoStepId !== void 0 || op.type === "set_selection" && currentUndoStepId !== void 0 && previousUndoStepId !== void 0 && previousUndoStepId !== currentUndoStepId)
     return mergeIntoLastStep(steps, lastStep, op);
   if (currentUndoStepId === void 0 && previousUndoStepId === void 0) {
     if (op.type === "set_selection")
       return mergeIntoLastStep(steps, lastStep, op);
     const lastOp = lastStep.operations.at(-1);
-    return lastOp && op.type === "insert_text" && lastOp.type === "insert_text" && op.offset === lastOp.offset + lastOp.text.length && pathEquals(op.path, lastOp.path) && op.text !== " " || lastOp && op.type === "remove_text" && lastOp.type === "remove_text" && op.offset + op.text.length === lastOp.offset && pathEquals(op.path, lastOp.path) ? mergeIntoLastStep(steps, lastStep, op) : createNewStep(steps, op, editor);
+    return lastOp && op.type === "insert_text" && lastOp.type === "insert_text" && op.offset === lastOp.offset + lastOp.text.length && pathEquals(op.path, lastOp.path) && op.text !== " " || lastOp && op.type === "remove_text" && lastOp.type === "remove_text" && op.offset + op.text.length === lastOp.offset && pathEquals(op.path, lastOp.path) ? mergeIntoLastStep(steps, lastStep, op) : createNewStep(steps, op, selectionBeforeApply);
   }
   if (currentUndoStepId !== void 0 && previousUndoStepId !== void 0 && currentUndoStepId !== previousUndoStepId) {
     const lastOp = lastStep.operations.at(-1);
     if (lastOp && op.type === "insert_text" && lastOp.type === "insert_text" && op.offset === lastOp.offset + lastOp.text.length && pathEquals(op.path, lastOp.path) && op.text !== " " || lastOp && op.type === "remove_text" && lastOp.type === "remove_text" && op.offset + op.text.length === lastOp.offset && pathEquals(op.path, lastOp.path))
       return mergeIntoLastStep(steps, lastStep, op);
   }
-  return createNewStep(steps, op, editor);
+  if (currentUndoStepId === void 0 && previousUndoStepId !== void 0) {
+    const lastOp = lastStep.operations.at(-1);
+    if (lastOp && op.type === "insert_text" && lastOp.type === "insert_text" && op.offset === lastOp.offset + lastOp.text.length && pathEquals(op.path, lastOp.path) && op.text !== " ")
+      return mergeIntoLastStep(steps, lastStep, op);
+  }
+  return createNewStep(steps, op, selectionBeforeApply);
 }
-function createNewStep(steps, op, editor) {
-  const operations = editor.selection === null ? [op] : [{
+function createNewStep(steps, op, selectionBeforeApply) {
+  const operations = selectionBeforeApply === null ? [op] : [{
     type: "set_selection",
     properties: {
-      ...editor.selection
+      ...selectionBeforeApply
     },
     newProperties: {
-      ...editor.selection
+      ...selectionBeforeApply
     }
   }, op];
   return steps.push({
@@ -7288,7 +7282,7 @@ function createHistoryPlugin({
   subscriptions
 }) {
   return function(editor) {
-    let previousSnapshot = editor.children, previousUndoStepId = editor.undoStepId;
+    let previousSnapshot = editor.snapshot.context.value, previousUndoStepId = editor.undoStepId;
     subscriptions.push(() => {
       const subscription = editorActor.on("patches", ({
         patches,
@@ -7340,15 +7334,22 @@ function createHistoryPlugin({
         previousUndoStepId = currentUndoStepId, apply2(op);
         return;
       }
+      const operationsInProgress = editor.operations.length > 0, isNormalizingNode = editor.isNormalizingNode, selectionBeforeApply = editor.snapshot.context.selection;
+      if (apply2(op), (op.type === "set" || op.type === "unset" || op.type === "insert") && !op.inverse || (op.type === "insert_text" || op.type === "remove_text") && op.text.length === 0) {
+        previousUndoStepId = currentUndoStepId;
+        return;
+      }
       for (op.type !== "set_selection" && editor.history.redos.length > 0 && (editor.history.redos = []), editor.history.undos = createUndoSteps({
         steps: editor.history.undos,
         op,
-        editor,
         currentUndoStepId,
-        previousUndoStepId
+        previousUndoStepId,
+        operationsInProgress,
+        isNormalizingNode,
+        selectionBeforeApply
       }); editor.history.undos.length > UNDO_STEP_LIMIT; )
         editor.history.undos.shift();
-      previousUndoStepId = currentUndoStepId, apply2(op);
+      previousUndoStepId = currentUndoStepId;
     }, editor;
   };
 }
@@ -7378,18 +7379,18 @@ function normalize(editor, options = {}) {
   };
   if (isNormalizing(editor)) {
     if (force) {
-      const allPaths = Array.from(getNodes(editor), (entry) => entry.path), allPathKeys = new Set(allPaths.map((p) => serializePath(p)));
+      const allPaths = Array.from(getNodes(editor.snapshot), (entry) => entry.path), allPathKeys = new Set(allPaths.map((p) => serializePath(p)));
       editor.dirtyPaths = allPaths, editor.dirtyPathKeys = allPathKeys;
     }
     getDirtyPaths2(editor).length !== 0 && withoutNormalizing(editor, () => {
       for (const dirtyPath of getDirtyPaths2(editor))
-        if (dirtyPath.length !== 0 && hasNode(editor, dirtyPath)) {
-          const entry = getNode(editor, dirtyPath);
+        if (dirtyPath.length !== 0 && hasNode(editor.snapshot, dirtyPath)) {
+          const entry = getNode(editor.snapshot, dirtyPath);
           if (!entry)
             continue;
           const entryNode = entry.node;
           isTextBlock({
-            schema: editor.schema
+            schema: editor.snapshot.context.schema
           }, entryNode) && entryNode.children.length === 0 && (editor.isNormalizingNode = !0, editor.normalizeNode([entry.node, entry.path], {
             operation
           }), editor.isNormalizingNode = !1);
@@ -7410,8 +7411,8 @@ function normalize(editor, options = {}) {
           editor.isNormalizingNode = !0, editor.normalizeNode([editor, dirtyPath], {
             operation
           }), editor.isNormalizingNode = !1;
-        else if (hasNode(editor, dirtyPath)) {
-          const entry = getNode(editor, dirtyPath);
+        else if (hasNode(editor.snapshot, dirtyPath)) {
+          const entry = getNode(editor.snapshot, dirtyPath);
           entry && (editor.isNormalizingNode = !0, editor.normalizeNode([entry.node, entry.path], {
             operation
           }), editor.isNormalizingNode = !1);
@@ -8171,9 +8172,9 @@ function createApplyPatch(context) {
 function diffMatchPatch(editor, patch) {
   if (patch.path.at(-1) !== "text")
     return !1;
-  const spanPath = patch.path.slice(0, -1), spanEntry = getNode(editor, spanPath);
+  const spanPath = patch.path.slice(0, -1), spanEntry = getNode(editor.snapshot, spanPath);
   if (!spanEntry || !isSpan({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, spanEntry.node))
     return !1;
   const patches = parse(patch.value), [newValue] = apply$1(patches, spanEntry.node.text, {
@@ -8198,7 +8199,7 @@ function insertPatch(context, editor, patch) {
   const {
     items,
     position
-  } = patch, editorWasEmptyBefore = patch.path.length === 1 && isEqualToEmptyEditor(context.initialValue, editor.children, context.schema), arrayFieldPath = patch.path.slice(0, -1);
+  } = patch, editorWasEmptyBefore = patch.path.length === 1 && isEqualToEmptyEditor(context.initialValue, editor.snapshot.context.value, context.schema), arrayFieldPath = patch.path.slice(0, -1);
   for (let index = 0; index < items.length; index++)
     if (index === 0)
       editor.apply({
@@ -8229,7 +8230,7 @@ function insertPatch(context, editor, patch) {
       }
     }
   if (editorWasEmptyBefore && typeof patch.path[0] == "number") {
-    const removeIdx = position === "before" ? items.length : 0, removeNode = editor.children[removeIdx];
+    const removeIdx = position === "before" ? items.length : 0, removeNode = editor.snapshot.context.value[removeIdx];
     removeNode && editor.apply({
       type: "unset",
       path: [{
@@ -8240,7 +8241,7 @@ function insertPatch(context, editor, patch) {
   return !0;
 }
 function setPatch(editor, patch) {
-  return patch.type === "setIfMissing" && (patch.path.length === 0 ? editor.children.length > 0 : getValue(editor.children, patch.path) !== void 0) ? !1 : (editor.apply({
+  return patch.type === "setIfMissing" && (patch.path.length === 0 ? editor.snapshot.context.value.length > 0 : getValue(editor.snapshot.context.value, patch.path) !== void 0) ? !1 : (editor.apply({
     type: "set",
     path: patch.path,
     value: patch.value
@@ -8290,7 +8291,7 @@ function createPatchesPlugin({
   let previousValue;
   const applyPatch = createApplyPatch(editorActor.getSnapshot().context);
   return function(editor) {
-    previousValue = [...editor.children];
+    previousValue = [...editor.snapshot.context.value];
     const {
       apply: apply2
     } = editor;
@@ -8329,21 +8330,21 @@ function createPatchesPlugin({
       };
     }), editor.apply = (operation) => {
       let patches = [];
-      previousValue = editor.children;
+      previousValue = editor.snapshot.context.value;
       const snapshot = editorActor.getSnapshot(), {
         initialValue,
         schema
       } = snapshot.context, editorWasEmpty = previousValue.length === 1 && isEqualToEmptyEditor(initialValue, previousValue, schema);
       apply2(operation);
-      const editorIsEmpty = editor.children.length === 1 && isEqualToEmptyEditor(initialValue, editor.children, schema);
+      const editorIsEmpty = editor.snapshot.context.value.length === 1 && isEqualToEmptyEditor(initialValue, editor.snapshot.context.value, schema);
       if (!editor.isPatching)
         return editor;
       switch (editorWasEmpty && !editorIsEmpty && operation.type !== "set_selection" && patches.push(insert(previousValue, "before", [0])), operation.type) {
         case "insert_text":
-          patches = [...patches, ...textPatch(editor, operation, previousValue)];
+          patches = [...patches, ...textPatch(editor.snapshot, operation, previousValue)];
           break;
         case "remove_text":
-          patches = [...patches, ...textPatch(editor, operation, previousValue)];
+          patches = [...patches, ...textPatch(editor.snapshot, operation, previousValue)];
           break;
         case "insert":
           patches = [...patches, ...insertNodePatch(operation)];
@@ -8367,7 +8368,7 @@ function createPatchesPlugin({
               origin: "local"
             },
             operationId: editor.undoStepId,
-            value: editor.children
+            value: editor.snapshot.context.value
           });
       return editor;
     }, editor;
@@ -8380,7 +8381,7 @@ function updateSelectionPlugin({
   const updateSelection = () => {
     editorActor.send({
       type: "update selection",
-      selection: editor.selection
+      selection: editor.snapshot.context.selection
     });
   }, {
     onChange
@@ -8459,7 +8460,7 @@ ${safeStringify(operation, 2)}`), operation.type === "set_selection") {
     }
     apply2(operation), operation.path.length <= 2 && buildIndexMaps({
       schema: context.schema,
-      value: editor.children
+      value: editor.snapshot.context.value
     }, {
       blockIndexMap: editor.blockIndexMap,
       listIndexMap: editor.listIndexMap
@@ -8661,36 +8662,6 @@ const PathRef = {
     ref.current = point2, point2 == null && ref.unref();
   }
 };
-function isForwardRange(range2, root) {
-  return !isBackwardRange(range2, root);
-}
-function resolveRangeAffinities(range2, root, affinity) {
-  if (affinity === "inward") {
-    const isCollapsed = isCollapsedRange(range2);
-    if (isForwardRange(range2, root)) {
-      const anchorAffinity2 = "forward";
-      return [anchorAffinity2, isCollapsed ? anchorAffinity2 : "backward"];
-    }
-    const anchorAffinity = "backward";
-    return [anchorAffinity, isCollapsed ? anchorAffinity : "forward"];
-  }
-  return affinity === "outward" ? isForwardRange(range2, root) ? ["backward", "forward"] : ["forward", "backward"] : [affinity, affinity];
-}
-function transformRange(range2, op, root, options = {}) {
-  if (range2 === null)
-    return null;
-  const {
-    affinity = "inward"
-  } = options, [affinityAnchor, affinityFocus] = resolveRangeAffinities(range2, root, affinity), anchor = transformPoint$1(range2.anchor, op, {
-    affinity: affinityAnchor
-  }), focus = transformPoint$1(range2.focus, op, {
-    affinity: affinityFocus
-  });
-  return !anchor || !focus ? null : {
-    anchor,
-    focus
-  };
-}
 function transformRangeRef(ref, op, root) {
   const {
     current,
@@ -8731,9 +8702,9 @@ const modifyDescendant = (editor, path2, f) => {
   if (path2.length === 0)
     return;
   const context = {
-    schema: editor.schema,
-    containers: editor.publicContainers
-  }, nodeEntry = getNode(editor, path2);
+    schema: editor.snapshot.context.schema,
+    containers: editor.snapshot.context.containers
+  }, nodeEntry = getNode(editor.snapshot, path2);
   if (!nodeEntry)
     return;
   const node = nodeEntry.node;
@@ -8747,7 +8718,7 @@ const modifyDescendant = (editor, path2, f) => {
   const fieldNames = [];
   {
     let currentNode = {
-      value: editor.children
+      value: editor.snapshot.context.value
     }, currentParent;
     for (let i = 0; i < keyedSegments.length; i++) {
       const result = getNodeChildren(context, currentNode, currentParent);
@@ -8771,7 +8742,7 @@ const modifyDescendant = (editor, path2, f) => {
         }
         keyedCount++;
       }
-    const ancestorPath = ancestorPathEnd > 0 ? path2.slice(0, ancestorPathEnd) : [], ancestorEntry = getNode(editor, ancestorPath);
+    const ancestorPath = ancestorPathEnd > 0 ? path2.slice(0, ancestorPathEnd) : [], ancestorEntry = getNode(editor.snapshot, ancestorPath);
     if (!ancestorEntry)
       return;
     const ancestorNode = ancestorEntry.node, ancestorRecord = ancestorNode, currentChildren = Array.isArray(ancestorRecord[fieldName]) ? ancestorRecord[fieldName] : [], originalNumericIndex = numericIndices.get(level + 1), childIndex = originalNumericIndex !== void 0 ? originalNumericIndex : findIndexByKey(currentChildren, childKey);
@@ -8788,23 +8759,23 @@ const modifyDescendant = (editor, path2, f) => {
     rootIndex = rootNumericIndex;
   else if (keyedSegments.length > 0) {
     const rootKey = keyedSegments[0]._key;
-    editor.blockIndexMap.size === editor.children.length && editor.blockIndexMap.has(rootKey) ? rootIndex = editor.blockIndexMap.get(rootKey) : rootIndex = findIndexByKey(editor.children, rootKey);
+    editor.blockIndexMap.size === editor.snapshot.context.value.length && editor.blockIndexMap.has(rootKey) ? rootIndex = editor.blockIndexMap.get(rootKey) : rootIndex = findIndexByKey(editor.snapshot.context.value, rootKey);
   } else {
     const firstSegment = path2[0];
     rootIndex = typeof firstSegment == "number" ? firstSegment : -1;
   }
-  rootIndex === -1 || rootIndex >= editor.children.length || (editor.children = replaceChildren(editor.children, rootIndex, 1, modifiedNode));
+  rootIndex === -1 || rootIndex >= editor.snapshot.context.value.length || (editor.snapshot.context.value = replaceChildren(editor.snapshot.context.value, rootIndex, 1, modifiedNode));
 }, modifyChildren = (editor, path2, f) => {
   if (path2.length === 0)
-    editor.children = f(editor.children);
+    editor.snapshot.context.value = f(editor.snapshot.context.value);
   else {
     const context = {
-      schema: editor.schema,
-      containers: editor.publicContainers
-    }, nodeEntry = getNode(editor, path2);
+      schema: editor.snapshot.context.schema,
+      containers: editor.snapshot.context.containers
+    }, nodeEntry = getNode(editor.snapshot, path2);
     if (!nodeEntry)
       return;
-    const resolved = resolveContainerAt(context.containers, editor.children, path2);
+    const resolved = resolveContainerAt(context.containers, editor.snapshot.context.value, path2);
     let fieldName;
     resolved && "field" in resolved ? fieldName = resolved.field.name : (isTextBlock(context, nodeEntry.node), fieldName = "children"), modifyDescendant(editor, path2, (node) => {
       const record = node, currentChildren = Array.isArray(record[fieldName]) ? record[fieldName] : [];
@@ -8815,7 +8786,7 @@ const modifyDescendant = (editor, path2, f) => {
     });
   }
 }, modifyLeaf = (editor, path2, f) => modifyDescendant(editor, path2, (node) => isSpan({
-  schema: editor.schema
+  schema: editor.snapshot.context.schema
 }, node) ? f(node) : node);
 function applyOperation(editor, op) {
   let transformSelection = !1;
@@ -8832,7 +8803,7 @@ function applyOperation(editor, op) {
       if (modifyChildren(editor, parentPath(path2), (children) => {
         !editor.isProcessingRemoteChanges && !editor.isUndoing && !editor.isRedoing && node._key !== void 0 && children.some((sibling) => sibling._key === node._key) && (node = {
           ...node,
-          _key: editor.keyGenerator()
+          _key: editor.snapshot.context.keyGenerator()
         }, op.node = node);
         const lastSegment = path2[path2.length - 1];
         let index;
@@ -8901,11 +8872,22 @@ function applyOperation(editor, op) {
         path: path2,
         value
       } = op;
+      if (!op.inverse && !editor.isProcessingRemoteChanges) {
+        const previousValue = getValue(editor.snapshot.context.value, path2);
+        op.inverse = previousValue === void 0 ? {
+          type: "unset",
+          path: path2
+        } : {
+          type: "set",
+          path: path2,
+          value: previousValue
+        };
+      }
       if (path2.length === 0) {
         if (Array.isArray(value)) {
-          editor.children = value, editor.blockIndexMap.clear();
-          for (let i = 0; i < editor.children.length; i++) {
-            const child = editor.children[i];
+          editor.snapshot.context.value = value, editor.blockIndexMap.clear();
+          for (let i = 0; i < editor.snapshot.context.value.length; i++) {
+            const child = editor.snapshot.context.value[i];
             child && editor.blockIndexMap.set(child._key, i);
           }
         }
@@ -8922,26 +8904,16 @@ function applyOperation(editor, op) {
         value !== null && typeof value == "object" && !Array.isArray(value) && modifyDescendant(editor, setNodePath, () => value), transformSelection = !0;
         break;
       }
-      if (getNode(editor, setNodePath))
+      if (getNode(editor.snapshot, setNodePath))
         if (setPropertyPath.length === 1) {
           const propertyName = setPropertyPath[0];
           if (modifyDescendant(editor, setNodePath, (node) => ({
             ...node,
             [propertyName]: value
-          })), propertyName === "_key" && setNodePath.length === 1)
-            if (op.inverse) {
-              const oldKey = op.inverse.type === "set" ? op.inverse.value : void 0, newKey = value;
-              if (typeof oldKey == "string" && typeof newKey == "string") {
-                const blockIndex = editor.blockIndexMap.get(oldKey);
-                blockIndex !== void 0 && (editor.blockIndexMap.delete(oldKey), editor.blockIndexMap.set(newKey, blockIndex));
-              }
-            } else {
-              editor.blockIndexMap.clear();
-              for (let i = 0; i < editor.children.length; i++) {
-                const child = editor.children[i];
-                child && editor.blockIndexMap.set(child._key, i);
-              }
-            }
+          })), propertyName === "_key" && setNodePath.length === 1 && op.inverse?.type === "set" && typeof op.inverse.value == "string" && typeof value == "string") {
+            const blockIndex = editor.blockIndexMap.get(op.inverse.value);
+            blockIndex !== void 0 && (editor.blockIndexMap.delete(op.inverse.value), editor.blockIndexMap.set(value, blockIndex));
+          }
         } else
           modifyDescendant(editor, setNodePath, (node) => deepSet(node, setPropertyPath, value));
       else {
@@ -8951,11 +8923,11 @@ function applyOperation(editor, op) {
         const blockIndex = resolveBlockIndex(editor, blockKey);
         if (blockIndex === -1)
           break;
-        const block = editor.children[blockIndex];
+        const block = editor.snapshot.context.value[blockIndex];
         if (!block)
           break;
-        const updatedBlock = applyAll(block, [set(value, path2.slice(1))]), newChildren = editor.children.slice();
-        newChildren[blockIndex] = updatedBlock, editor.children = newChildren;
+        const updatedBlock = applyAll(block, [set(value, path2.slice(1))]), newChildren = editor.snapshot.context.value.slice();
+        newChildren[blockIndex] = updatedBlock, editor.snapshot.context.value = newChildren;
       }
       transformSelection = !0;
       break;
@@ -8965,14 +8937,18 @@ function applyOperation(editor, op) {
         path: path2
       } = op;
       if (path2.length === 0) {
-        editor.children = [], editor.blockIndexMap.clear(), transformSelection = !0;
+        !op.inverse && !editor.isProcessingRemoteChanges && (op.inverse = {
+          type: "set",
+          path: path2,
+          value: editor.snapshot.context.value
+        }), editor.snapshot.context.value = [], editor.blockIndexMap.clear(), transformSelection = !0;
         break;
       }
       const lastSegment = path2[path2.length - 1];
       if (isKeyedSegment(lastSegment) || typeof lastSegment == "number") {
-        if (editor.selection) {
+        if (editor.snapshot.context.selection) {
           let selection = {
-            ...editor.selection
+            ...editor.snapshot.context.selection
           };
           for (const [point2, key] of rangePoints(selection)) {
             const result = transformPoint$1(point2, op);
@@ -8983,11 +8959,11 @@ function applyOperation(editor, op) {
               for (const {
                 node: n,
                 path: p
-              } of getNodes(editor))
+              } of getNodes(editor.snapshot))
                 if (isSpan({
-                  schema: editor.schema
+                  schema: editor.snapshot.context.schema
                 }, n) && !pathEquals(p, path2))
-                  if (comparePaths(p, path2, editor) === -1)
+                  if (comparePaths(p, path2, editor.snapshot.context) === -1)
                     prev = [n, p];
                   else {
                     next = [n, p];
@@ -9003,9 +8979,9 @@ function applyOperation(editor, op) {
               } : selection = null;
             }
           }
-          editor.selection = selection ? {
+          editor.snapshot.context.selection = selection ? {
             ...selection,
-            backward: isBackwardRange(selection, editor)
+            backward: isBackwardRange(selection, editor.snapshot.context)
           } : null;
         }
         const isRootRemove = parentPath(path2).length === 0;
@@ -9044,7 +9020,17 @@ function applyOperation(editor, op) {
       } = splitNodeAndPropertyPath(path2);
       if (unsetPropertyPath.length === 0 || unsetNodePath.length === 0)
         break;
-      if (getNode(editor, unsetNodePath))
+      if (!op.inverse && !editor.isProcessingRemoteChanges) {
+        const previousValue = getValue(editor.snapshot.context.value, path2);
+        if (previousValue === void 0)
+          break;
+        op.inverse = {
+          type: "set",
+          path: path2,
+          value: previousValue
+        };
+      }
+      if (getNode(editor.snapshot, unsetNodePath))
         if (unsetPropertyPath.length === 1) {
           const propertyName = unsetPropertyPath[0];
           modifyDescendant(editor, unsetNodePath, (node) => {
@@ -9062,11 +9048,11 @@ function applyOperation(editor, op) {
         const blockIndex = resolveBlockIndex(editor, blockKey);
         if (blockIndex === -1)
           break;
-        const block = editor.children[blockIndex];
+        const block = editor.snapshot.context.value[blockIndex];
         if (!block)
           break;
-        const updatedBlock = applyAll(block, [unset(path2.slice(1))]), newChildren = editor.children.slice();
-        newChildren[blockIndex] = updatedBlock, editor.children = newChildren;
+        const updatedBlock = applyAll(block, [unset(path2.slice(1))]), newChildren = editor.snapshot.context.value.slice();
+        newChildren[blockIndex] = updatedBlock, editor.snapshot.context.value = newChildren;
       }
       transformSelection = !0;
       break;
@@ -9076,20 +9062,20 @@ function applyOperation(editor, op) {
         newProperties
       } = op;
       if (newProperties == null) {
-        editor.selection = null;
+        editor.snapshot.context.selection = null;
         break;
       }
-      if (editor.selection == null) {
+      if (editor.snapshot.context.selection == null) {
         if (!isRange(newProperties))
           throw new Error(`Cannot apply an incomplete "set_selection" operation properties ${safeStringify(newProperties)} when there is no current selection.`);
-        editor.selection = {
+        editor.snapshot.context.selection = {
           ...newProperties,
-          backward: isBackwardRange(newProperties, editor)
+          backward: isBackwardRange(newProperties, editor.snapshot.context)
         };
         break;
       }
       const selection = {
-        ...editor.selection
+        ...editor.snapshot.context.selection
       };
       for (const key in newProperties) {
         const value = newProperties[key];
@@ -9100,22 +9086,22 @@ function applyOperation(editor, op) {
         } else
           selection[key] = value;
       }
-      editor.selection = {
+      editor.snapshot.context.selection = {
         ...selection,
-        backward: isBackwardRange(selection, editor)
+        backward: isBackwardRange(selection, editor.snapshot.context)
       };
       break;
     }
   }
-  if (transformSelection && editor.selection) {
-    const anchor = transformPoint$1(editor.selection.anchor, op), focus = transformPoint$1(editor.selection.focus, op);
-    !anchor || !focus ? editor.selection = null : (anchor !== editor.selection.anchor || focus !== editor.selection.focus) && (editor.selection = {
+  if (transformSelection && editor.snapshot.context.selection) {
+    const anchor = transformPoint$1(editor.snapshot.context.selection.anchor, op), focus = transformPoint$1(editor.snapshot.context.selection.focus, op);
+    !anchor || !focus ? editor.snapshot.context.selection = null : (anchor !== editor.snapshot.context.selection.anchor || focus !== editor.snapshot.context.selection.focus) && (editor.snapshot.context.selection = {
       anchor,
       focus,
       backward: isBackwardRange({
         anchor,
         focus
-      }, editor)
+      }, editor.snapshot.context)
     });
   }
 }
@@ -9143,7 +9129,7 @@ function findBlockKey(path2) {
 }
 function resolveBlockIndex(editor, blockKey) {
   const mapIndex = editor.blockIndexMap.get(blockKey);
-  return mapIndex !== void 0 ? mapIndex : editor.children.findIndex((child) => child._key === blockKey);
+  return mapIndex !== void 0 ? mapIndex : editor.snapshot.context.value.findIndex((child) => child._key === blockKey);
 }
 function splitNodeAndPropertyPath(path2) {
   let lastKeyedOrNumericIndex = -1;
@@ -9238,8 +9224,8 @@ const apply = (editor, op) => {
   for (const ref of editor.pointRefs)
     PointRef.transform(ref, op);
   for (const ref of editor.rangeRefs)
-    transformRangeRef(ref, op, editor);
-  if (applyOperation(editor, op), updateDirtyPaths(editor, getDirtyPaths(editor.context, op)), editor.operations.push(op), normalize(editor, {
+    transformRangeRef(ref, op, editor.snapshot.context);
+  if (applyOperation(editor, op), updateDirtyPaths(editor, getDirtyPaths(editor.snapshot.context, op)), editor.operations.push(op), normalize(editor, {
     operation: op
   }), op.type === "set_selection")
     if (op.properties && op.newProperties && op.properties.anchor && op.properties.focus && op.newProperties.anchor && op.newProperties.focus) {
@@ -9251,20 +9237,20 @@ const apply = (editor, op) => {
         focus: op.newProperties.focus
       });
       if (previousSelectionIsCollapsed && newSelectionIsCollapsed) {
-        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));
+        const focusSpan = getSpan(editor.snapshot, op.properties.focus.path)?.node, newFocusSpan = getSpan(editor.snapshot, 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, {
+          const nextSibling = getSibling(editor.snapshot, op.properties.focus.path, {
             direction: "next"
-          }), previousSibling = getSibling(editor, op.properties.focus.path, {
+          }), previousSibling = getSibling(editor.snapshot, 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 = {});
+        !movedToNextSpan && !movedToPreviousSpan && (editor.snapshot.decoratorState = {});
       }
     } else
-      editor.decoratorState = {};
+      editor.snapshot.decoratorState = {};
   editor.flushing || (editor.flushing = !0, Promise.resolve().then(() => {
     editor.flushing = !1, editor.onChange({
       operation: op
@@ -9300,12 +9286,12 @@ function pathRef(editor, path2, options = {}) {
   return editor.pathRefs.add(ref), ref;
 }
 function applySplitNode(editor, path2, position) {
-  const nodeEntry = getNode(editor, path2);
+  const nodeEntry = getNode(editor.snapshot, path2);
   if (!nodeEntry)
     return;
-  const node = nodeEntry.node, newKey = editor.keyGenerator(), movedChildKeys = /* @__PURE__ */ new Set();
+  const node = nodeEntry.node, newKey = editor.snapshot.context.keyGenerator(), movedChildKeys = /* @__PURE__ */ new Set();
   if (isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node))
     for (let i = position; i < node.children.length; i++)
       movedChildKeys.add(node.children[i]._key);
@@ -9320,31 +9306,31 @@ function applySplitNode(editor, path2, position) {
   for (const ref of editor.rangeRefs) {
     const current = ref.current;
     if (current) {
-      const [anchorAffinity, focusAffinity] = resolveRangeAffinities(current, editor, ref.affinity), anchor = transformPointForSplit(current.anchor, path2, position, newKey, movedChildKeys, anchorAffinity ?? "forward"), focus = transformPointForSplit(current.focus, path2, position, newKey, movedChildKeys, focusAffinity ?? "forward");
+      const [anchorAffinity, focusAffinity] = resolveRangeAffinities(current, editor.snapshot.context, ref.affinity), anchor = transformPointForSplit(current.anchor, path2, position, newKey, movedChildKeys, anchorAffinity ?? "forward"), focus = transformPointForSplit(current.focus, path2, position, newKey, movedChildKeys, focusAffinity ?? "forward");
       anchor && focus ? ref.current = {
         anchor,
         focus
       } : (ref.current = null, ref.unref());
     }
   }
-  if (editor.selection) {
-    const anchor = transformPointForSplit(editor.selection.anchor, path2, position, newKey, movedChildKeys, "forward"), focus = transformPointForSplit(editor.selection.focus, path2, position, newKey, movedChildKeys, "forward");
-    anchor && focus && (editor.selection = {
+  if (editor.snapshot.context.selection) {
+    const anchor = transformPointForSplit(editor.snapshot.context.selection.anchor, path2, position, newKey, movedChildKeys, "forward"), focus = transformPointForSplit(editor.snapshot.context.selection.focus, path2, position, newKey, movedChildKeys, "forward");
+    anchor && focus && (editor.snapshot.context.selection = {
       anchor,
       focus,
       backward: isBackwardRange({
         anchor,
         focus
-      }, editor)
+      }, editor.snapshot.context)
     });
   }
   const pathRefs = new Set(editor.pathRefs), pointRefs = new Set(editor.pointRefs), rangeRefs = new Set(editor.rangeRefs);
   editor.pathRefs.clear(), editor.pointRefs.clear(), editor.rangeRefs.clear();
-  const savedSelection = editor.selection;
+  const savedSelection = editor.snapshot.context.selection;
   try {
     withoutNormalizing(editor, () => {
       if (isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, node)) {
         const {
           text: _text,
@@ -9366,7 +9352,7 @@ function applySplitNode(editor, path2, position) {
           position: "after"
         });
       } else if (isTextBlock({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, node)) {
         const {
           children: _children,
@@ -9392,7 +9378,7 @@ function applySplitNode(editor, path2, position) {
       }
     });
   } finally {
-    editor.selection = savedSelection;
+    editor.snapshot.context.selection = savedSelection;
     for (const ref of pathRefs)
       editor.pathRefs.add(ref);
     for (const ref of pointRefs)
@@ -9454,12 +9440,12 @@ function applyInsertNodeAtPath(editor, node, path2) {
 function applyInsertNodeAtPoint(editor, node, at) {
   withoutNormalizing(editor, () => {
     const match2 = isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node) ? (n) => isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, n) : (n) => isSpan({
-      schema: editor.schema
-    }, n) || isObject$1(editor, n), nodeEntry = getNode(editor, at.path), entry = nodeEntry && match2(nodeEntry.node) ? nodeEntry : void 0;
+      schema: editor.snapshot.context.schema
+    }, n) || isObject$1(editor.snapshot, n), nodeEntry = getNode(editor.snapshot, 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);
@@ -9478,10 +9464,10 @@ function applyInsertNodeAtPoint(editor, node, at) {
   });
 }
 function applyMergeNode(editor, path2, position) {
-  const nodeEntry = getNode(editor, path2);
+  const nodeEntry = getNode(editor.snapshot, path2);
   if (!nodeEntry)
     return;
-  const node = nodeEntry.node, prevSibling = getSibling(editor, path2, {
+  const node = nodeEntry.node, prevSibling = getSibling(editor.snapshot, path2, {
     direction: "previous"
   });
   if (!prevSibling)
@@ -9505,20 +9491,20 @@ function applyMergeNode(editor, path2, position) {
       } : (ref.current = null, ref.unref());
     }
   }
-  if (editor.selection) {
-    const anchor = transformPointForMerge(editor.selection.anchor, path2, prevKey, position), focus = transformPointForMerge(editor.selection.focus, path2, prevKey, position);
-    anchor && focus && (editor.selection = {
+  if (editor.snapshot.context.selection) {
+    const anchor = transformPointForMerge(editor.snapshot.context.selection.anchor, path2, prevKey, position), focus = transformPointForMerge(editor.snapshot.context.selection.focus, path2, prevKey, position);
+    anchor && focus && (editor.snapshot.context.selection = {
       anchor,
       focus,
       backward: isBackwardRange({
         anchor,
         focus
-      }, editor)
+      }, editor.snapshot.context)
     });
   }
   const pathRefs = new Set(editor.pathRefs), pointRefs = new Set(editor.pointRefs), rangeRefs = new Set(editor.rangeRefs);
   editor.pathRefs.clear(), editor.pointRefs.clear(), editor.rangeRefs.clear();
-  const savedSelection = editor.selection, editorAny = editor, savedPendingDiffs = editorAny.pendingDiffs, savedPendingSelection = editorAny.pendingSelection, savedPendingAction = editorAny.pendingAction;
+  const savedSelection = editor.snapshot.context.selection, editorAny = editor, savedPendingDiffs = editorAny.pendingDiffs, savedPendingSelection = editorAny.pendingSelection, savedPendingAction = editorAny.pendingAction;
   if (Array.isArray(savedPendingDiffs) && savedPendingDiffs.length > 0 && (editorAny.pendingDiffs = savedPendingDiffs.map((textDiff) => transformTextDiffForMerge(textDiff, path2, prevKey, position)).filter(Boolean)), savedPendingSelection && typeof savedPendingSelection == "object" && "anchor" in savedPendingSelection && "focus" in savedPendingSelection) {
     const sel = savedPendingSelection, anchor = transformPointForMerge(sel.anchor, path2, prevKey, position), focus = transformPointForMerge(sel.focus, path2, prevKey, position);
     editorAny.pendingSelection = anchor && focus ? {
@@ -9550,7 +9536,7 @@ function applyMergeNode(editor, path2, position) {
   try {
     withoutNormalizing(editor, () => {
       if (isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, node))
         node.text.length > 0 && editor.apply({
           type: "insert_text",
@@ -9562,11 +9548,11 @@ function applyMergeNode(editor, path2, position) {
           path: path2
         });
       else if (isTextBlock({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, node)) {
-        const prevEntry = getNode(editor, prevPath);
+        const prevEntry = getNode(editor.snapshot, prevPath);
         if (!prevEntry || !isTextBlock({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, prevEntry.node))
           return;
         const prevChildren = prevEntry.node.children;
@@ -9594,7 +9580,7 @@ function applyMergeNode(editor, path2, position) {
       }
     });
   } finally {
-    editor.selection = savedSelection;
+    editor.snapshot.context.selection = savedSelection;
     for (const ref of pathRefs)
       editor.pathRefs.add(ref);
     for (const ref of pointRefs)
@@ -9679,7 +9665,7 @@ function resolveDefaultStyle(snapshot, path2) {
   return path2 ? getPathSubSchema(snapshot, path2).styles[0]?.name ?? rootFallback : rootFallback;
 }
 function setNodeProperties(editor, props, path2) {
-  const nodeEntry = getNode(editor, path2);
+  const nodeEntry = getNode(editor.snapshot, path2);
   if (!nodeEntry)
     return;
   const nodeRecord = nodeEntry.node, propsRecord = props, keys = Object.keys(propsRecord), keyIndex = keys.indexOf("_key");
@@ -9805,16 +9791,16 @@ function createSpanNode(context) {
 }
 const normalizeNode = (editor, entry) => {
   const [node, path2] = entry, nodeRecord = node;
-  if (isEditor(node) && node.children.length === 0) {
+  if (isEditor(node) && node.snapshot.context.value.length === 0) {
     withoutPatching(editor, () => {
-      applyInsertNodeAtPath(editor, createPlaceholderBlock(editor), [0]);
+      applyInsertNodeAtPath(editor, createPlaceholderBlock(editor.snapshot), [0]);
     });
     return;
   }
   if (isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node)) {
-    const children = getChildren(editor, path2);
+    const children = getChildren(editor.snapshot, path2);
     for (let i = 0; i < children.length - 1; i++) {
       const {
         node: child
@@ -9823,9 +9809,9 @@ const normalizeNode = (editor, entry) => {
         path: nextChildPath
       } = children[i + 1];
       if (isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, child) && isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, nextNode) && child.marks?.every((mark) => nextNode.marks?.includes(mark)) && nextNode.marks?.every((mark) => child.marks?.includes(mark))) {
         debug.normalization("merging spans with same marks"), applyMergeNode(editor, nextChildPath, child.text.length);
         return;
@@ -9833,14 +9819,14 @@ const normalizeNode = (editor, entry) => {
     }
   }
   if (nodeRecord._type === void 0 && path2.length > 0) {
-    const parent = getNode(editor, parentPath(path2));
+    const parent = getNode(editor.snapshot, parentPath(path2));
     if (parent && isTextBlock({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, parent.node)) {
       debug.normalization("Setting span type on node without a type"), editor.apply({
         type: "set",
         path: [...path2, "_type"],
-        value: editor.schema.span.name,
+        value: editor.snapshot.context.schema.span.name,
         inverse: {
           type: "unset",
           path: [...path2, "_type"]
@@ -9851,7 +9837,7 @@ const normalizeNode = (editor, entry) => {
     debug.normalization("Setting block type on node without a type"), editor.apply({
       type: "set",
       path: [...path2, "_type"],
-      value: editor.schema.block.name,
+      value: editor.snapshot.context.schema.block.name,
       inverse: {
         type: "unset",
         path: [...path2, "_type"]
@@ -9860,7 +9846,7 @@ const normalizeNode = (editor, entry) => {
     return;
   }
   if (nodeRecord._key === void 0 && path2.length > 0) {
-    const newKey = editor.keyGenerator();
+    const newKey = editor.snapshot.context.keyGenerator();
     debug.normalization("Setting missing key on node");
     const numericPath = [];
     let currentNode;
@@ -9869,7 +9855,7 @@ const normalizeNode = (editor, entry) => {
         currentNode && numericPath.push(segment);
         continue;
       }
-      const siblings = currentNode ? currentNode[numericPath[numericPath.length - 1]] ?? [] : editor.children;
+      const siblings = currentNode ? currentNode[numericPath[numericPath.length - 1]] ?? [] : editor.snapshot.context.value;
       if (isKeyedSegment(segment) && segment._key !== void 0)
         numericPath.push(segment), currentNode = Array.prototype.find.call(siblings, (child) => child._key === segment._key);
       else {
@@ -9896,7 +9882,7 @@ const normalizeNode = (editor, entry) => {
     return;
   }
   if (path2.length > 0 && nodeRecord._key !== void 0) {
-    const parent = getParent(editor, path2), siblingList = [...parent ? getChildren(editor, parent.path) : editor.children.map((child, index) => ({
+    const parent = getParent(editor.snapshot, path2), siblingList = [...parent ? getChildren(editor.snapshot, parent.path) : editor.snapshot.context.value.map((child, index) => ({
       node: child,
       path: [{
         _key: child._key
@@ -9909,9 +9895,9 @@ const normalizeNode = (editor, entry) => {
         if (firstIndex === -1)
           firstIndex = i;
         else {
-          const newKey = editor.keyGenerator();
+          const newKey = editor.snapshot.context.keyGenerator();
           debug.normalization("Fixing duplicate key on node");
-          const dupParentPath = parent ? parent.path : [], numericPath = dupParentPath.length === 0 ? [i] : [...dupParentPath, getChildFieldName(editor.context, parent.path) ?? "children", i];
+          const dupParentPath = parent ? parent.path : [], numericPath = dupParentPath.length === 0 ? [i] : [...dupParentPath, getChildFieldName(editor.snapshot.context, parent.path) ?? "children", i];
           editor.apply({
             type: "set",
             path: [...numericPath, "_key"],
@@ -9926,7 +9912,7 @@ const normalizeNode = (editor, entry) => {
         }
   }
   if (isTextBlockNode({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node) && !Array.isArray(node.markDefs)) {
     debug.normalization("adding .markDefs to block node"), setNodeProperties(editor, {
       markDefs: []
@@ -9934,9 +9920,9 @@ const normalizeNode = (editor, entry) => {
     return;
   }
   if (isTextBlockNode({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node) && typeof node.style > "u") {
-    const defaultStyle = getPathSubSchema(editor, path2).styles.at(0)?.name;
+    const defaultStyle = getPathSubSchema(editor.snapshot, path2).styles.at(0)?.name;
     if (defaultStyle) {
       debug.normalization("adding .style to block node"), setNodeProperties(editor, {
         style: defaultStyle
@@ -9944,7 +9930,7 @@ const normalizeNode = (editor, entry) => {
       return;
     }
   }
-  if (isSpanNode(editor, node) && typeof node.text != "string") {
+  if (isSpanNode(editor.snapshot.context, node) && typeof node.text != "string") {
     debug.normalization("Adding .text to span node"), editor.apply({
       type: "set",
       path: [...path2, "text"],
@@ -9957,7 +9943,7 @@ const normalizeNode = (editor, entry) => {
     return;
   }
   if (isSpan({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node) && !Array.isArray(node.marks)) {
     debug.normalization("Adding .marks to span node"), setNodeProperties(editor, {
       marks: []
@@ -9965,12 +9951,12 @@ const normalizeNode = (editor, entry) => {
     return;
   }
   if (isSpan({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node)) {
     const blockPath = parentPath(path2);
-    if (!getTextBlock(editor, blockPath))
+    if (!getTextBlock(editor.snapshot, blockPath))
       return;
-    const decorators = getPathSubSchema(editor, path2).decorators.map((decorator) => decorator.name), annotations = node.marks?.filter((mark) => !decorators.includes(mark));
+    const decorators = getPathSubSchema(editor.snapshot, path2).decorators.map((decorator) => decorator.name), annotations = node.marks?.filter((mark) => !decorators.includes(mark));
     if (node.text === "" && annotations && annotations.length > 0) {
       debug.normalization("removing annotations from empty span node"), setNodeProperties(editor, {
         marks: node.marks?.filter((mark) => decorators.includes(mark))
@@ -9979,15 +9965,15 @@ const normalizeNode = (editor, entry) => {
     }
   }
   if (isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node)) {
-    const decorators = getPathSubSchema(editor, path2).decorators.map((decorator) => decorator.name);
+    const decorators = getPathSubSchema(editor.snapshot, path2).decorators.map((decorator) => decorator.name);
     for (const {
       node: child,
       path: childPath
-    } of getChildren(editor, path2))
+    } of getChildren(editor.snapshot, path2))
       if (isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, child)) {
         const marks = child.marks ?? [], orphanedAnnotations = marks.filter((mark) => !decorators.includes(mark) && !node.markDefs?.find((def) => def._key === mark));
         if (orphanedAnnotations.length > 0) {
@@ -9999,11 +9985,11 @@ const normalizeNode = (editor, entry) => {
       }
   }
   if (isSpan({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node)) {
-    const blockPath = parentPath(path2), blockEntry2 = getTextBlock(editor, blockPath);
+    const blockPath = parentPath(path2), blockEntry2 = getTextBlock(editor.snapshot, 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));
+      const block = blockEntry2.node, decorators = getPathSubSchema(editor.snapshot, 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) {
         debug.normalization("removing orphaned annotations from span node"), setNodeProperties(editor, {
           marks: marks.filter((mark) => !orphanedAnnotations.includes(mark))
@@ -10013,7 +9999,7 @@ const normalizeNode = (editor, entry) => {
     }
   }
   if (isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node)) {
     const markDefs = node.markDefs ?? [], markDefKeys = /* @__PURE__ */ new Set(), newMarkDefs = [];
     for (const markDef of markDefs)
@@ -10026,10 +10012,10 @@ const normalizeNode = (editor, entry) => {
     }
   }
   if (isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node)) {
     const newMarkDefs = (node.markDefs || []).filter((def) => node.children.find((child) => isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, child) && Array.isArray(child.marks) && child.marks.includes(def._key)));
     if (node.markDefs && !isEqualMarkDefs(newMarkDefs, node.markDefs)) {
       debug.normalization("removing markDef not in use"), setNodeProperties(editor, {
@@ -10039,7 +10025,7 @@ const normalizeNode = (editor, entry) => {
     }
   }
   if (isSpanNode({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node)) {
     if (typeof node.text != "string") {
       debug.normalization("Adding .text to span node"), editor.apply({
@@ -10055,16 +10041,20 @@ const normalizeNode = (editor, entry) => {
     }
     return;
   }
-  if (isObject$1(editor, node)) {
-    const resolved = resolveContainerByPath(editor, path2, node), arrayField = resolved && "container" in resolved ? resolved.field : void 0;
+  if (isObject$1(editor.snapshot, node)) {
+    const resolved = resolveContainerByPath({
+      containers: editor.containers,
+      schema: editor.snapshot.context.schema,
+      value: editor.snapshot.context.value
+    }, path2, node), arrayField = resolved && "container" in resolved ? resolved.field : void 0;
     if (arrayField) {
       const fieldValue = node[arrayField.name], needsField = !Array.isArray(fieldValue);
       if (needsField || fieldValue.length === 0) {
         const acceptsBlocks = arrayField.of.some((definition) => definition.type === "block"), firstChildType = arrayField.of.at(0);
         let childNode;
-        if (acceptsBlocks ? childNode = createPlaceholderBlock(editor, [...path2, arrayField.name, 0]) : firstChildType && firstChildType.type !== "block" && (childNode = {
+        if (acceptsBlocks ? childNode = createPlaceholderBlock(editor.snapshot, [...path2, arrayField.name, 0]) : firstChildType && firstChildType.type !== "block" && (childNode = {
           _type: firstChildType.type === "object" && "name" in firstChildType ? firstChildType.name : firstChildType.type,
-          _key: editor.keyGenerator()
+          _key: editor.snapshot.context.keyGenerator()
         }), needsField && childNode) {
           setNodeProperties(editor, {
             [arrayField.name]: [childNode]
@@ -10089,16 +10079,16 @@ const normalizeNode = (editor, entry) => {
       }
     }
   }
-  if (isObject$1(editor, node)) {
-    const children = [...getChildren(editor, path2)];
+  if (isObject$1(editor.snapshot, node)) {
+    const children = [...getChildren(editor.snapshot, path2)];
     if (children.length > 1) {
       const seen = /* @__PURE__ */ new Map();
       for (let i = 0; i < children.length; i++) {
         const key = children[i].node._key;
         if (key !== void 0 && seen.has(key)) {
-          const newKey = editor.keyGenerator();
+          const newKey = editor.snapshot.context.keyGenerator();
           debug.normalization("Fixing duplicate key on container child");
-          const arrayFieldName = getChildFieldName(editor.context, path2);
+          const arrayFieldName = getChildFieldName(editor.snapshot.context, path2);
           if (arrayFieldName) {
             editor.apply({
               type: "set",
@@ -10119,9 +10109,10 @@ const normalizeNode = (editor, entry) => {
     return;
   }
   if (isTextBlockNode({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, node)) {
-    if (!Array.isArray(node.children)) {
+    let element = node;
+    if (!Array.isArray(element.children)) {
       editor.apply({
         type: "set",
         path: [...path2, "children"],
@@ -10133,16 +10124,15 @@ const normalizeNode = (editor, entry) => {
       });
       return;
     }
-    let element = node;
     if (element.children.length === 0) {
-      const child = createSpanNode(editor);
+      const child = createSpanNode(editor.snapshot.context);
       editor.apply({
         type: "insert",
         path: [...path2, "children", 0],
         node: child,
         position: "before"
       });
-      const refetched = getTextBlock(editor, path2)?.node;
+      const refetched = getTextBlock(editor.snapshot, path2)?.node;
       if (!refetched)
         return;
       element = refetched;
@@ -10152,17 +10142,17 @@ const normalizeNode = (editor, entry) => {
         _key: child._key
       }];
       if (isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, child)) {
         if (prev != null && isSpan({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, prev)) {
           if (child.text === "") {
             editor.apply({
               type: "unset",
               path: childPath
             });
-            const refetched = getTextBlock(editor, path2)?.node;
+            const refetched = getTextBlock(editor.snapshot, path2)?.node;
             if (!refetched)
               return;
             element = refetched, n--;
@@ -10174,7 +10164,7 @@ const normalizeNode = (editor, entry) => {
               type: "unset",
               path: prevPath
             });
-            const refetched = getTextBlock(editor, path2)?.node;
+            const refetched = getTextBlock(editor.snapshot, path2)?.node;
             if (!refetched)
               return;
             element = refetched, n--;
@@ -10182,30 +10172,30 @@ const normalizeNode = (editor, entry) => {
             loose: !0
           })) {
             applyMergeNode(editor, childPath, prev.text.length);
-            const refetched = getTextBlock(editor, path2)?.node;
+            const refetched = getTextBlock(editor.snapshot, path2)?.node;
             if (!refetched)
               return;
             element = refetched, n--;
           }
         }
-      } else if (isObject$1(editor, child)) {
+      } else if (isObject$1(editor.snapshot, child)) {
         if (prev == null || !isSpan({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, prev)) {
-          const newChild = createSpanNode(editor);
+          const newChild = createSpanNode(editor.snapshot.context);
           editor.apply({
             type: "insert",
             path: childPath,
             node: newChild,
             position: "before"
           });
-          const refetched = getTextBlock(editor, path2)?.node;
+          const refetched = getTextBlock(editor.snapshot, path2)?.node;
           if (!refetched)
             return;
           element = refetched, n++;
         }
         if (n === element.children.length - 1) {
-          const newChild = createSpanNode(editor);
+          const newChild = createSpanNode(editor.snapshot.context);
           editor.apply({
             type: "insert",
             path: [...path2, "children", {
@@ -10214,7 +10204,7 @@ const normalizeNode = (editor, entry) => {
             node: newChild,
             position: "after"
           });
-          const refetched = getTextBlock(editor, path2)?.node;
+          const refetched = getTextBlock(editor.snapshot, path2)?.node;
           if (!refetched)
             return;
           element = refetched, n++;
@@ -10225,9 +10215,7 @@ const normalizeNode = (editor, entry) => {
   }
 };
 function select(editor, target) {
-  const {
-    selection
-  } = editor;
+  const selection = editor.snapshot.context.selection;
   if (target = range(editor, target), selection) {
     editor.setSelection(target);
     return;
@@ -10241,9 +10229,7 @@ function select(editor, target) {
   });
 }
 function setSelection(editor, props) {
-  const {
-    selection
-  } = editor, oldProps = {}, newProps = {};
+  const selection = editor.snapshot.context.selection, oldProps = {}, newProps = {};
   if (selection) {
     for (const k in props)
       (k === "anchor" && props.anchor != null && !pointEquals(props.anchor, selection.anchor) || k === "focus" && props.focus != null && !pointEquals(props.focus, selection.focus) || k !== "anchor" && k !== "focus" && props[k] !== selection[k]) && (oldProps[k] = selection[k], newProps[k] = props[k]);
@@ -10265,20 +10251,7 @@ const shouldNormalize = (_editor, {
 }, createEditor = () => {
   const e = {
     [EDITOR_BRAND]: !0,
-    children: [],
-    get value() {
-      return this.children;
-    },
-    get context() {
-      return {
-        schema: this.schema,
-        containers: this.publicContainers,
-        value: this.children,
-        keyGenerator: this.keyGenerator
-      };
-    },
     operations: [],
-    selection: null,
     marks: null,
     dirtyPaths: [],
     dirtyPathKeys: /* @__PURE__ */ new Set(),
@@ -10333,29 +10306,6 @@ const shouldNormalize = (_editor, {
     onContextChange && onContextChange(options), onChange(options);
   }, e;
 };
-function defaultCompare(a, b) {
-  return a === b;
-}
-function useEditorSelector(editor, selector, t0) {
-  return useSelector(editor, selector, t0 === void 0 ? defaultCompare : t0);
-}
-function getEditorSnapshot({
-  editorEngineInstance
-}) {
-  return {
-    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 createEditorEngine(config) {
   debug.setup("creating new editor engine instance");
   const context = config.editorActor.getSnapshot().context, placeholderBlock = createPlaceholderBlock({
@@ -10369,10 +10319,22 @@ function createEditorEngine(config) {
     },
     blockIndexMap: /* @__PURE__ */ new Map()
   }), editor = createEditor();
-  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 = {
+  editor.snapshot = {
+    blockIndexMap: /* @__PURE__ */ new Map(),
+    context: {
+      containers: /* @__PURE__ */ new Map(),
+      converters: context.initialConverters,
+      keyGenerator: context.keyGenerator,
+      readOnly: context.initialReadOnly,
+      schema: context.schema,
+      selection: null,
+      value: [placeholderBlock]
+    },
+    decoratorState: {}
+  }, editor.containers = /* @__PURE__ */ new Map(), editor.blockObjects = /* @__PURE__ */ new Map(), editor.inlineObjects = /* @__PURE__ */ new Map(), editor.spans = /* @__PURE__ */ new Map(), editor.textBlocks = /* @__PURE__ */ new Map(), editor.decoratedRanges = [], editor.blockIndexMap = editor.snapshot.blockIndexMap, 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;
+  }, editor.listIndexMap = /* @__PURE__ */ new Map(), editor.remotePatches = [], editor.undoStepId = void 0, editor.isDeferringMutations = !1, editor.isNormalizingNode = !1, editor.isPatching = !0, editor.isPerformingBehaviorOperation = !1, editor.isProcessingRemoteChanges = !1, editor.isRedoing = !1, editor.isUndoing = !1, editor.withHistory = !0;
   const editorEngine = plugins(withDOM(editor), {
     editorActor: config.editorActor,
     relayActor: config.relayActor,
@@ -10380,17 +10342,18 @@ function createEditorEngine(config) {
   });
   return buildIndexMaps({
     schema: context.schema,
-    value: editorEngine.children
+    value: editorEngine.snapshot.context.value
   }, {
     blockIndexMap: editorEngine.blockIndexMap,
     listIndexMap: editorEngine.listIndexMap
-  }), editorEngine.snapshot = getEditorSnapshot({
-    editorEngineInstance: editorEngine
   }), config.subscriptions.push(() => {
     const subscription = config.editorActor.subscribe(() => {
-      editorEngine.snapshot = getEditorSnapshot({
-        editorEngineInstance: editorEngine
-      });
+      editorEngine.snapshot = {
+        ...editorEngine.snapshot,
+        context: {
+          ...editorEngine.snapshot.context
+        }
+      };
     });
     return () => {
       subscription.unsubscribe();
@@ -10431,9 +10394,9 @@ function getChildNodes(editorEngine, snapshot) {
   if (!snapshot.context.selection)
     return [];
   try {
-    const [start2, end2] = rangeEdges(snapshot.context.selection, editorEngine), childEntries = [];
+    const [start2, end2] = rangeEdges(snapshot.context.selection, editorEngine.snapshot.context), childEntries = [];
     let buffered;
-    for (const entry of getNodes(editorEngine, {
+    for (const entry of getNodes(editorEngine.snapshot, {
       from: start2.path,
       to: end2.path
     })) {
@@ -11103,7 +11066,7 @@ function isDropTargetingDragOrigin(dropSelection, dragOriginSelection, snapshot)
   if (isCollapsedRange(dropSelection) || isCollapsedRange(dragOriginSelection))
     return !0;
   const root = {
-    children: snapshot.context.value
+    value: snapshot.context.value
   }, [startA, endA] = rangeEdges(dropSelection, root), [startB, endB] = rangeEdges(dragOriginSelection, root);
   return !(comparePoints(endA, startB, root) === 0 || comparePoints(endB, startA, root) === 0);
 }
@@ -12012,19 +11975,19 @@ function createEditorSnapshot({
   readOnly,
   schema
 }) {
-  const selection = editor.selection, context = {
-    containers: editor.publicContainers,
+  const selection = editor.snapshot.context.selection, context = {
+    containers: editor.snapshot.context.containers,
     converters,
     keyGenerator,
     readOnly,
     schema,
     selection,
-    value: editor.children
+    value: editor.snapshot.context.value
   };
   return {
     blockIndexMap: editor.blockIndexMap,
     context,
-    decoratorState: editor.decoratorState
+    decoratorState: editor.snapshot.decoratorState
   };
 }
 function withPerformingBehaviorOperation(editor, fn) {
@@ -12040,7 +12003,7 @@ const addAnnotationOperationImplementation = ({
 }) => {
   const {
     context
-  } = snapshot, editor = operation.editor, at = operation.at ? resolveSelection(operation.editor, operation.at) : null, effectiveSelection = at ?? editor.selection, anchorPath = effectiveSelection?.anchor.path, annotationSchema = anchorPath ? getPathSubSchema(snapshot, anchorPath) : context.schema, parsedAnnotation = parseAnnotation({
+  } = snapshot, editor = operation.editor, at = operation.at ? resolveSelection(operation.editor, operation.at) : null, effectiveSelection = at ?? editor.snapshot.context.selection, anchorPath = effectiveSelection?.anchor.path, annotationSchema = anchorPath ? getPathSubSchema(snapshot, anchorPath) : context.schema, parsedAnnotation = parseAnnotation({
     annotation: {
       _type: operation.annotation.name,
       _key: operation.annotation._key,
@@ -12058,13 +12021,13 @@ const addAnnotationOperationImplementation = ({
     return;
   const ref = at ? rangeRef(editor, at, {
     affinity: "inward"
-  }) : null, selectedBlocks = Array.from(getNodes(editor, {
-    from: rangeStart(effectiveSelection, editor).path,
-    to: rangeEnd(effectiveSelection, editor).path,
+  }) : null, selectedBlocks = Array.from(getNodes(editor.snapshot, {
+    from: rangeStart(effectiveSelection, editor.snapshot.context).path,
+    to: rangeEnd(effectiveSelection, editor.snapshot.context).path,
     match: (node) => isTextBlock({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node),
-    reverse: isBackwardRange(effectiveSelection, editor)
+    reverse: isBackwardRange(effectiveSelection, editor.snapshot.context)
   }));
   let blockIndex = 0;
   withoutNormalizing(editor, () => {
@@ -12073,7 +12036,7 @@ const addAnnotationOperationImplementation = ({
       path: blockPath
     } of selectedBlocks) {
       if (!isTextBlock({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, block) || block.children.length === 0 || block.children.length === 1 && block.children[0]?.text === "" || !getPathSubSchema(snapshot, blockPath).annotations.some((annotation) => annotation.name === parsedAnnotation._type))
         continue;
       const annotationKey = blockIndex === 0 ? parsedAnnotation._key : context.keyGenerator(), markDefs = block.markDefs ?? [];
@@ -12083,28 +12046,28 @@ const addAnnotationOperationImplementation = ({
           _key: annotationKey
         }]
       }, blockPath);
-      const splitRange = at ?? editor.selection;
+      const splitRange = at ?? editor.snapshot.context.selection;
       if (splitRange && isRange(splitRange)) {
-        const splitLeaf = getNode(editor, splitRange.anchor.path)?.node;
+        const splitLeaf = getNode(editor.snapshot, splitRange.anchor.path)?.node;
         if (!(splitLeaf && isCollapsedRange(splitRange) && isSpan({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, splitLeaf) && splitLeaf.text.length > 0)) {
           const splitRangeRef = rangeRef(editor, splitRange, {
             affinity: "inward"
-          }), [splitStart, splitEnd] = rangeEdges(splitRange, editor);
+          }), [splitStart, splitEnd] = rangeEdges(splitRange, editor.snapshot.context);
           (!isEnd(editor, splitEnd, splitEnd.path) || !isEdge(editor, splitEnd, splitEnd.path)) && applySplitNode(editor, splitEnd.path, splitEnd.offset), (!isStart(editor, splitStart, splitStart.path) || !isEdge(editor, splitStart, splitStart.path)) && applySplitNode(editor, splitStart.path, splitStart.offset);
           const updatedSplitRange = splitRangeRef.unref();
           !at && updatedSplitRange && applySelect(editor, updatedSplitRange);
         }
       }
-      const children = getChildren(editor, blockPath), selectionRange = ref?.current ?? editor.selection;
+      const children = getChildren(editor.snapshot, blockPath), selectionRange = ref?.current ?? editor.snapshot.context.selection;
       for (const {
         node: span,
         path: spanPath
       } of children) {
         if (!isSpan({
-          schema: editor.schema
-        }, span) || !selectionRange || !rangeIncludes(selectionRange, spanPath, editor))
+          schema: editor.snapshot.context.schema
+        }, span) || !selectionRange || !rangeIntersects(editor.snapshot, selectionRange, spanPath))
           continue;
         const marks = span.marks ?? [];
         setNodeProperties(editor, {
@@ -12125,12 +12088,12 @@ const removeAnnotationOperationImplementation = ({
   snapshot,
   operation
 }) => {
-  const editor = operation.editor, at = operation.at ? resolveSelection(operation.editor, operation.at) : null, effectiveSelection = at ?? editor.selection;
+  const editor = operation.editor, at = operation.at ? resolveSelection(operation.editor, operation.at) : null, effectiveSelection = at ?? editor.snapshot.context.selection;
   if (effectiveSelection)
     if (isCollapsedRange(effectiveSelection)) {
       const blockEntry = getParent(snapshot, effectiveSelection.focus.path, {
         match: (node) => isTextBlock({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, node)
       });
       if (!blockEntry)
@@ -12138,7 +12101,7 @@ const removeAnnotationOperationImplementation = ({
       const {
         node: block,
         path: blockPath
-      } = blockEntry, potentialAnnotations = (block.markDefs ?? []).filter((markDef) => markDef._type === operation.annotation.name), selectedChildEntry = getNode(editor, effectiveSelection.focus.path);
+      } = blockEntry, potentialAnnotations = (block.markDefs ?? []).filter((markDef) => markDef._type === operation.annotation.name), selectedChildEntry = getNode(editor.snapshot, effectiveSelection.focus.path);
       if (!selectedChildEntry)
         return;
       const {
@@ -12146,13 +12109,13 @@ const removeAnnotationOperationImplementation = ({
         path: selectedChildPath
       } = selectedChildEntry;
       if (!isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, selectedChild))
         return;
       const annotationToRemove = selectedChild.marks?.find((mark) => potentialAnnotations.some((markDef) => markDef._key === mark));
       if (!annotationToRemove)
         return;
-      const previousSpansWithSameAnnotation = [], reversedChildren = getChildren(editor, blockPath);
+      const previousSpansWithSameAnnotation = [], reversedChildren = getChildren(editor.snapshot, blockPath);
       for (let index = reversedChildren.length - 1; index >= 0; index--) {
         const entry = reversedChildren[index];
         if (!entry)
@@ -12162,8 +12125,8 @@ const removeAnnotationOperationImplementation = ({
           path: childPath
         } = entry;
         if (isSpan({
-          schema: editor.schema
-        }, child) && isBeforePath(childPath, selectedChildPath, editor))
+          schema: editor.snapshot.context.schema
+        }, child) && isBeforePath(childPath, selectedChildPath, editor.snapshot.context))
           if (child.marks?.includes(annotationToRemove))
             previousSpansWithSameAnnotation.push([child, childPath]);
           else
@@ -12173,10 +12136,10 @@ const removeAnnotationOperationImplementation = ({
       for (const {
         node: child,
         path: childPath
-      } of getChildren(editor, blockPath))
+      } of getChildren(editor.snapshot, blockPath))
         if (isSpan({
-          schema: editor.schema
-        }, child) && isAfterPath(childPath, selectedChildPath, editor))
+          schema: editor.snapshot.context.schema
+        }, child) && isAfterPath(childPath, selectedChildPath, editor.snapshot.context))
           if (child.marks?.includes(annotationToRemove))
             nextSpansWithSameAnnotation.push([child, childPath]);
           else
@@ -12190,43 +12153,43 @@ const removeAnnotationOperationImplementation = ({
         affinity: "inward"
       }) : null;
       withoutNormalizing(editor, () => {
-        const splitRange = at ?? editor.selection;
+        const splitRange = at ?? editor.snapshot.context.selection;
         if (splitRange && isRange(splitRange)) {
-          const splitLeaf = getNode(editor, splitRange.anchor.path)?.node;
+          const splitLeaf = getNode(editor.snapshot, splitRange.anchor.path)?.node;
           if (!(splitLeaf && isCollapsedRange(splitRange) && isSpan({
-            schema: editor.schema
+            schema: editor.snapshot.context.schema
           }, splitLeaf) && splitLeaf.text.length > 0)) {
             const splitRangeRef = rangeRef(editor, splitRange, {
               affinity: "inward"
-            }), [splitStart, splitEnd] = rangeEdges(splitRange, editor);
+            }), [splitStart, splitEnd] = rangeEdges(splitRange, editor.snapshot.context);
             (!isEnd(editor, splitEnd, splitEnd.path) || !isEdge(editor, splitEnd, splitEnd.path)) && applySplitNode(editor, splitEnd.path, splitEnd.offset), (!isStart(editor, splitStart, splitStart.path) || !isEdge(editor, splitStart, splitStart.path)) && applySplitNode(editor, splitStart.path, splitStart.offset);
             const updatedSplitRange = splitRangeRef.unref();
             !at && updatedSplitRange && applySelect(editor, updatedSplitRange);
           }
         }
-        const blocks = Array.from(getNodes(editor, {
-          from: rangeStart(effectiveSelection, editor).path,
-          to: rangeEnd(effectiveSelection, editor).path,
+        const blocks = Array.from(getNodes(editor.snapshot, {
+          from: rangeStart(effectiveSelection, editor.snapshot.context).path,
+          to: rangeEnd(effectiveSelection, editor.snapshot.context).path,
           match: (node) => isTextBlock({
-            schema: editor.schema
+            schema: editor.snapshot.context.schema
           }, node)
-        })), selectionRange = ref?.current ?? editor.selection;
+        })), selectionRange = ref?.current ?? editor.snapshot.context.selection;
         for (const {
           node: block,
           path: blockPath
         } of blocks) {
           if (!isTextBlock({
-            schema: editor.schema
+            schema: editor.snapshot.context.schema
           }, block))
             continue;
-          const children = getChildren(editor, blockPath);
+          const children = getChildren(editor.snapshot, blockPath);
           for (const {
             node: child,
             path: childPath
           } of children) {
             if (!isSpan({
-              schema: editor.schema
-            }, child) || !selectionRange || !rangeIncludes(selectionRange, childPath, editor))
+              schema: editor.snapshot.context.schema
+            }, child) || !selectionRange || !rangeIntersects(editor.snapshot, selectionRange, childPath))
               continue;
             const markDefs = block.markDefs ?? [], marks = child.marks ?? [], marksWithoutAnnotation = marks.filter((mark) => markDefs.find((markDef2) => markDef2._key === mark)?._type !== operation.annotation.name);
             marksWithoutAnnotation.length !== marks.length && setNodeProperties(editor, {
@@ -12256,7 +12219,7 @@ const blockSetOperationImplementation = ({
 }) => {
   const {
     context
-  } = snapshot, blockEntry = getNode(operation.editor, operation.at);
+  } = snapshot, blockEntry = getNode(operation.editor.snapshot, operation.at);
   if (!blockEntry)
     throw new Error(`Unable to find block at ${safeStringify(operation.at)}`);
   const engineBlock = blockEntry.node;
@@ -12316,7 +12279,7 @@ const blockSetOperationImplementation = ({
 }) => {
   const {
     context
-  } = snapshot, blockEntry = getNode(operation.editor, operation.at);
+  } = snapshot, blockEntry = getNode(operation.editor.snapshot, operation.at);
   if (!blockEntry)
     throw new Error(`Unable to find block at ${safeStringify(operation.at)}`);
   const engineBlock = blockEntry.node;
@@ -12348,7 +12311,7 @@ const childSetOperationImplementation = ({
   snapshot,
   operation
 }) => {
-  const childEntry = getNode(operation.editor, operation.at);
+  const childEntry = getNode(operation.editor.snapshot, operation.at);
   if (!childEntry)
     throw new Error(`Unable to find child at ${safeStringify(operation.at)}`);
   const {
@@ -12356,7 +12319,7 @@ const childSetOperationImplementation = ({
     path: childPath
   } = childEntry;
   if (isSpan({
-    schema: operation.editor.schema
+    schema: operation.editor.snapshot.context.schema
   }, child)) {
     const {
       _type,
@@ -12381,7 +12344,7 @@ const childSetOperationImplementation = ({
     }));
     return;
   }
-  if (isObject$1(operation.editor, child)) {
+  if (isObject$1(operation.editor.snapshot, child)) {
     const blockPath = parentPath(childPath), {
       inlineObjects
     } = getPathSubSchema(snapshot, blockPath), definition = inlineObjects.find((definition2) => definition2.name === child._type);
@@ -12408,7 +12371,7 @@ const childSetOperationImplementation = ({
 }) => {
   const {
     context
-  } = snapshot, childEntry = getNode(operation.editor, operation.at);
+  } = snapshot, childEntry = getNode(operation.editor.snapshot, operation.at);
   if (!childEntry)
     throw new Error(`Could not find a valid child at ${safeStringify(operation.at)}`);
   const {
@@ -12416,7 +12379,7 @@ const childSetOperationImplementation = ({
     path: childPath
   } = childEntry;
   if (isSpan({
-    schema: operation.editor.schema
+    schema: operation.editor.snapshot.context.schema
   }, child)) {
     const newNode = {};
     for (const prop of operation.props)
@@ -12430,7 +12393,7 @@ const childSetOperationImplementation = ({
     setNodeProperties(operation.editor, newNode, childPath);
     return;
   }
-  if (isObject$1(operation.editor, child)) {
+  if (isObject$1(operation.editor.snapshot, child)) {
     const unsetProps = {};
     for (const prop of operation.props)
       prop !== "_type" && (prop === "_key" ? unsetProps._key = context.keyGenerator() : unsetProps[prop] = null);
@@ -12443,22 +12406,22 @@ const childSetOperationImplementation = ({
   operation
 }) => {
   const editor = operation.editor, mark = operation.decorator;
-  let at = operation.at ? resolveSelection(operation.editor, operation.at) : operation.editor.selection;
+  let at = operation.at ? resolveSelection(operation.editor, operation.at) : operation.editor.snapshot.context.selection;
   if (at) {
     if (isExpandedRange(at)) {
       const ref = rangeRef(editor, at, {
         affinity: "inward"
       });
       withoutNormalizing(editor, () => {
-        const [start2, end2] = rangeEdges(at, editor);
+        const [start2, end2] = rangeEdges(at, editor.snapshot.context);
         if (isEdge(editor, end2, end2.path) || applySplitNode(editor, end2.path, end2.offset), isEdge(editor, start2, start2.path) || applySplitNode(editor, start2.path, start2.offset), at = ref.unref(), !at)
           throw new Error("Unable to add decorator without a selection");
         operation.at || applySelect(editor, at);
-        const atStart = rangeStart(at, editor), atEnd = rangeEnd(at, editor), splitTextNodes = Array.from(getNodes(editor, {
+        const atStart = rangeStart(at, editor.snapshot.context), atEnd = rangeEnd(at, editor.snapshot.context), splitTextNodes = Array.from(getNodes(editor.snapshot, {
           from: atStart.path,
           to: atEnd.path,
           match: (n) => isSpan({
-            schema: editor.schema
+            schema: editor.snapshot.context.schema
           }, n)
         }));
         for (const {
@@ -12466,7 +12429,7 @@ const childSetOperationImplementation = ({
           path: spanPath
         } of splitTextNodes) {
           if (!isSpan({
-            schema: editor.schema
+            schema: editor.snapshot.context.schema
           }, node) || isEnd(editor, atStart, spanPath) && !isStart(editor, atStart, spanPath) || isStart(editor, atEnd, spanPath) && !isEnd(editor, atEnd, spanPath))
             continue;
           const blockPath = parentPath(spanPath);
@@ -12479,11 +12442,11 @@ const childSetOperationImplementation = ({
         }
       });
     } else {
-      if (!Array.from(getNodes(editor, {
-        from: rangeStart(at, editor).path,
-        to: rangeEnd(at, editor).path,
+      if (!Array.from(getNodes(editor.snapshot, {
+        from: rangeStart(at, editor.snapshot.context).path,
+        to: rangeEnd(at, editor.snapshot.context).path,
         match: (node) => isSpan({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, node)
       }))?.at(0))
         return;
@@ -12501,27 +12464,27 @@ const childSetOperationImplementation = ({
       if (!getPathSubSchema(snapshot, blockPath).decorators.some((decorator) => decorator.name === mark))
         return;
       const lonelyEmptySpan = block.children.length === 1 && isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, block.children[0]) && block.children[0].text === "" ? block.children[0] : void 0;
       if (lonelyEmptySpan) {
         const existingMarks = lonelyEmptySpan.marks ?? [], existingMarksWithoutDecorator = existingMarks.filter((existingMark) => existingMark !== mark), newMarks = existingMarks.length === existingMarksWithoutDecorator.length ? [...existingMarks, mark] : existingMarksWithoutDecorator;
         for (const {
           path: spanPath
-        } of Array.from(getNodes(editor, {
+        } of Array.from(getNodes(editor.snapshot, {
           at: blockPath,
           match: (node) => isSpan({
-            schema: editor.schema
+            schema: editor.snapshot.context.schema
           }, node)
         })))
           setNodeProperties(editor, {
             marks: newMarks
           }, spanPath);
       } else
-        editor.decoratorState[mark] = !0;
+        editor.snapshot.decoratorState[mark] = !0;
     }
-    if (editor.selection) {
-      const selection = editor.selection;
-      editor.selection = {
+    if (editor.snapshot.context.selection) {
+      const selection = editor.snapshot.context.selection;
+      editor.snapshot.context.selection = {
         ...selection
       };
     }
@@ -12532,27 +12495,27 @@ const childSetOperationImplementation = ({
 }) => {
   const {
     context
-  } = snapshot, editor = operation.editor, mark = operation.decorator, at = operation.at ? resolveSelection(operation.editor, operation.at) : editor.selection;
+  } = snapshot, editor = operation.editor, mark = operation.decorator, at = operation.at ? resolveSelection(operation.editor, operation.at) : editor.snapshot.context.selection;
   if (at) {
     if (isExpandedRange(at)) {
       const ref = rangeRef(editor, at, {
         affinity: "inward"
       });
       withoutNormalizing(editor, () => {
-        const decoratorLeaf = getNode(editor, at.anchor.path)?.node;
+        const decoratorLeaf = getNode(editor.snapshot, at.anchor.path)?.node;
         if (!(decoratorLeaf && isCollapsedRange(at) && isSpan({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, decoratorLeaf) && decoratorLeaf.text.length > 0)) {
-          const [start2, end2] = rangeEdges(at, editor);
+          const [start2, end2] = rangeEdges(at, editor.snapshot.context);
           (!isEnd(editor, end2, end2.path) || !isEdge(editor, end2, end2.path)) && applySplitNode(editor, end2.path, end2.offset), (!isStart(editor, start2, start2.path) || !isEdge(editor, start2, start2.path)) && applySplitNode(editor, start2.path, start2.offset);
         }
         const updatedAt = ref.unref();
         if (updatedAt) {
-          const splitTextNodes = [...getNodes(editor, {
-            from: rangeStart(updatedAt, editor).path,
-            to: rangeEnd(updatedAt, editor).path,
+          const splitTextNodes = [...getNodes(editor.snapshot, {
+            from: rangeStart(updatedAt, editor.snapshot.context).path,
+            to: rangeEnd(updatedAt, editor.snapshot.context).path,
             match: (n) => isSpan({
-              schema: editor.schema
+              schema: editor.snapshot.context.schema
             }, n)
           })];
           for (const {
@@ -12560,12 +12523,12 @@ const childSetOperationImplementation = ({
             path: nodePath
           } of splitTextNodes) {
             if (!isSpan({
-              schema: editor.schema
+              schema: editor.snapshot.context.schema
             }, node))
               continue;
-            const blockPath = parentPath(nodePath), block = getNode(editor, blockPath)?.node;
+            const blockPath = parentPath(nodePath), block = getNode(editor.snapshot, blockPath)?.node;
             isTextBlock({
-              schema: editor.schema
+              schema: editor.snapshot.context.schema
             }, block) && block.children.includes(node) && setNodeProperties(editor, {
               marks: (Array.isArray(node.marks) ? node.marks : []).filter((eMark) => eMark !== mark),
               _type: context.schema.span.name
@@ -12576,7 +12539,7 @@ const childSetOperationImplementation = ({
     } else {
       const textBlockEntry = getParent(snapshot, at.focus.path, {
         match: (node) => isTextBlock({
-          schema: editor.schema
+          schema: editor.snapshot.context.schema
         }, node)
       });
       if (!textBlockEntry)
@@ -12585,27 +12548,27 @@ const childSetOperationImplementation = ({
         node: block,
         path: blockPath
       } = textBlockEntry, lonelyEmptySpan = block.children.length === 1 && isSpan({
-        schema: editor.schema
+        schema: editor.snapshot.context.schema
       }, block.children[0]) && block.children[0].text === "" ? block.children[0] : void 0;
       if (lonelyEmptySpan) {
         const existingMarksWithoutDecorator = (lonelyEmptySpan.marks ?? []).filter((existingMark) => existingMark !== mark);
         for (const {
           path: spanPath
-        } of Array.from(getNodes(editor, {
+        } of Array.from(getNodes(editor.snapshot, {
           at: blockPath,
           match: (node) => isSpan({
-            schema: editor.schema
+            schema: editor.snapshot.context.schema
           }, node)
         })))
           setNodeProperties(editor, {
             marks: existingMarksWithoutDecorator
           }, spanPath);
       } else
-        editor.decoratorState[mark] = !1;
+        editor.snapshot.decoratorState[mark] = !1;
     }
-    if (editor.selection) {
-      const selection = editor.selection;
-      editor.selection = {
+    if (editor.snapshot.context.selection) {
+      const selection = editor.snapshot.context.selection;
+      editor.snapshot.context.selection = {
         ...selection
       };
     }
@@ -12616,7 +12579,7 @@ function unhangRange(snapshot, range2) {
     context
   } = snapshot;
   let [start2, end2] = rangeEdges(range2, {
-    children: context.value
+    value: context.value
   });
   if (start2.offset !== 0 || end2.offset !== 0 || isCollapsedRange(range2) || getSibling(snapshot, end2.path, {
     direction: "previous"
@@ -12655,7 +12618,7 @@ function unhangRange(snapshot, range2) {
     if (isSpan({
       schema: context.schema
     }, node) && (node.text !== "" || isBeforePath(nodePath, blockPath, {
-      children: context.value
+      value: context.value
     }))) {
       end2 = {
         path: nodePath,
@@ -12685,23 +12648,23 @@ function pointRef(editor, point2, options = {}) {
   return editor.pointRefs.add(ref), ref;
 }
 function getFullyCoveredContainers(editor, range2) {
-  const [start2, end2] = rangeEdges(range2, editor);
+  const [start2, end2] = rangeEdges(range2, editor.snapshot.context);
   return {
-    start: getAncestor(editor, start2.path, {
+    start: getAncestor(editor.snapshot, start2.path, {
       match: (node, path2) => isFullyCovered(editor, node, path2, start2, end2)
     })?.path,
-    end: getAncestor(editor, end2.path, {
+    end: getAncestor(editor.snapshot, end2.path, {
       match: (node, path2) => isFullyCovered(editor, node, path2, start2, end2)
     })?.path
   };
 }
 function isFullyCovered(editor, node, path2, rangeStart2, rangeEnd2) {
-  if (!isEditableContainer(editor, node, path2) || isTextBlock({
-    schema: editor.schema
+  if (!isEditableContainer(editor.snapshot, node, path2) || isTextBlock({
+    schema: editor.snapshot.context.schema
   }, node))
     return !1;
   const root = {
-    children: editor.children
+    value: editor.snapshot.context.value
   }, containerStart = start(editor, path2), containerEnd = end(editor, path2), reachesStart = pointEquals(rangeStart2, containerStart) || isBeforePoint(rangeStart2, containerStart, root), reachesEnd = pointEquals(rangeEnd2, containerEnd) || isAfterPoint(rangeEnd2, containerEnd, root);
   return !reachesStart || !reachesEnd || pointEquals(rangeStart2, containerStart) && pointEquals(rangeEnd2, containerEnd) && fieldAcceptsTextBlock(editor, node) ? !1 : parentFieldAcceptsTextBlock(editor, path2);
 }
@@ -12709,12 +12672,12 @@ function parentFieldAcceptsTextBlock(editor, path2) {
   const parent = parentPath(path2);
   if (parent.length === 0)
     return !0;
-  const parentEntry = getNode(editor, parent);
+  const parentEntry = getNode(editor.snapshot, parent);
   return parentEntry ? fieldAcceptsTextBlock(editor, parentEntry.node) : !1;
 }
 function fieldAcceptsTextBlock(editor, node, _path) {
   const container = editor.containers.get(node._type);
-  return container ? container.field.of.some((member) => member.type === editor.schema.block.name) : !1;
+  return container ? container.field.of.some((member) => member.type === editor.snapshot.context.schema.block.name) : !1;
 }
 const COMPOUND_SCRIPT_REGEX = /[\u0980-\u09FF\u0E00-\u0E7F\u1000-\u109F\u0900-\u097F\u1780-\u17FF\u0D00-\u0D7F\u0B00-\u0B7F\u0A00-\u0A7F\u0B80-\u0BFF\u0C00-\u0C7F]+/;
 function applyDelete(editor, range2, options) {
@@ -12740,11 +12703,11 @@ function applyDelete(editor, range2, options) {
     startRef?.unref(), endRef?.unref();
   if (reverse && unit === "character" && collapsedInput && removedText && removedText.length > 1 && COMPOUND_SCRIPT_REGEX.test(removedText)) {
     const reinsert = removedText.slice(0, removedText.length - 1);
-    if (editor.selection) {
+    if (editor.snapshot.context.selection) {
       const {
         path: path2,
         offset
-      } = editor.selection.anchor;
+      } = editor.snapshot.context.selection.anchor;
       editor.apply({
         type: "insert_text",
         path: path2,
@@ -12758,30 +12721,30 @@ function mutateRange(editor, range2, options) {
   const {
     capture,
     removeEmptyStartBlock
-  } = options, [start2, end2] = rangeEdges(range2, editor), startBlock = getEnclosingBlock(editor, start2.path), endBlock = getEnclosingBlock(editor, end2.path);
+  } = options, [start2, end2] = rangeEdges(range2, editor.snapshot.context), startBlock = getEnclosingBlock(editor.snapshot, start2.path), endBlock = getEnclosingBlock(editor.snapshot, end2.path);
   return !startBlock || !endBlock ? null : pathEquals(startBlock.path, endBlock.path) ? deleteSameBlockRange(editor, start2, end2, capture) : pathEquals(parentPath(startBlock.path), parentPath(endBlock.path)) ? (deleteSameParentCrossBlockRange(editor, startBlock.path, endBlock.path, start2, end2, removeEmptyStartBlock), null) : (deleteCrossParentRange(editor, startBlock.path, endBlock.path, start2, end2), null);
 }
 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 && isLeafObject(editor, startEntry.node, start2.path))
+  const startEntry = getNode(editor.snapshot, start2.path);
+  if (startEntry && isLeafObject(editor.snapshot, 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, {
+  const adjustedEnd = getSibling(editor.snapshot, start2.path, {
     direction: "next"
   });
-  return adjustedEnd ? isLeafObject(editor, adjustedEnd.node, adjustedEnd.path) ? (editor.apply({
+  return adjustedEnd ? isLeafObject(editor.snapshot, 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 && isLeafObject(editor, startBlockNode.node, startBlockPath), endIsVoid = endBlockNode != null && isLeafObject(editor, endBlockNode.node, endBlockPath);
+  const startBlockNode = getNode(editor.snapshot, startBlockPath), endBlockNode = getNode(editor.snapshot, endBlockPath), startIsVoid = startBlockNode != null && isLeafObject(editor.snapshot, startBlockNode.node, startBlockPath), endIsVoid = endBlockNode != null && isLeafObject(editor.snapshot, 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;
@@ -12789,7 +12752,7 @@ function deleteSameParentCrossBlockRange(editor, startBlockPath, endBlockPath, s
   if (startIsVoid) {
     if (!pathEquals(end2.path, endBlockPath)) {
       removeLeadingChildrenOf(editor, endBlockPath, end2.path);
-      const firstChild = getFirstChild(editor, endBlockPath);
+      const firstChild = getFirstChild(editor.snapshot, endBlockPath);
       firstChild && removeTextUpToOffset(editor, firstChild.path, end2.offset);
     }
     removeNodeAt(editor, startBlockPath);
@@ -12799,12 +12762,12 @@ function deleteSameParentCrossBlockRange(editor, startBlockPath, endBlockPath, s
     removeNodeAt(editor, endBlockPath);
     return;
   }
-  const adjustedEndBlockPath = getSibling(editor, startBlockPath, {
+  const adjustedEndBlockPath = getSibling(editor.snapshot, startBlockPath, {
     direction: "next"
   })?.path ?? startBlockPath;
   if (!pathEquals(end2.path, endBlockPath)) {
     removeLeadingChildrenOf(editor, adjustedEndBlockPath, end2.path);
-    const firstChild = getFirstChild(editor, adjustedEndBlockPath);
+    const firstChild = getFirstChild(editor.snapshot, adjustedEndBlockPath);
     firstChild && removeTextUpToOffset(editor, firstChild.path, end2.offset);
   }
   mergeBlock(editor, startBlockPath, adjustedEndBlockPath, removeEmptyStartBlock);
@@ -12818,16 +12781,16 @@ function deleteCrossParentRange(editor, startBlockPath, endBlockPath, start2, en
   let startLevel = startBlockPath;
   for (; !pathEquals(startLevel, startBranchRoot); )
     parentAcceptsTextBlock(editor, startLevel) ? removeTrailingChildren(editor, startLevel) : clearTrailingSiblings(editor, startLevel), startLevel = parentPath(startLevel);
-  const lcaContainer = getEnclosingContainer(editor, startBranchRoot);
-  if (!lcaContainer || lcaContainer.of.some((member) => member.type === editor.schema.block.name))
+  const lcaContainer = getEnclosingContainer(editor.snapshot, startBranchRoot);
+  if (!lcaContainer || lcaContainer.of.some((member) => member.type === editor.snapshot.context.schema.block.name))
     removeChildrenBetween(editor, startBranchRoot, endBranchRoot);
   else {
-    let cursor = getSibling(editor, startBranchRoot, {
+    let cursor = getSibling(editor.snapshot, startBranchRoot, {
       direction: "next"
     });
     for (; cursor && !pathEquals(cursor.path, endBranchRoot); ) {
       const cursorPath = cursor.path;
-      clearContainerContents(editor, cursorPath), cursor = getSibling(editor, cursorPath, {
+      clearContainerContents(editor, cursorPath), cursor = getSibling(editor.snapshot, cursorPath, {
         direction: "next"
       });
     }
@@ -12837,7 +12800,7 @@ function deleteCrossParentRange(editor, startBlockPath, endBlockPath, start2, en
     parentAcceptsTextBlock(editor, endLevel) ? removePrecedingSiblings(editor, endLevel) : clearPrecedingSiblings(editor, endLevel), endLevel = parentPath(endLevel);
   if (!pathEquals(end2.path, endBlockPath)) {
     removeLeadingChildrenOf(editor, endBlockPath, end2.path);
-    const firstChild = getFirstChild(editor, endBlockPath);
+    const firstChild = getFirstChild(editor.snapshot, endBlockPath);
     firstChild && removeTextUpToOffset(editor, firstChild.path, end2.offset);
   }
   if (fullyCovered.start && fullyCovered.end && pathEquals(fullyCovered.start, fullyCovered.end)) {
@@ -12856,7 +12819,7 @@ function deleteCrossParentRange(editor, startBlockPath, endBlockPath, start2, en
   });
 }
 function removeTextRange(editor, path2, startOffset, endOffset, capture) {
-  const span = getSpan(editor, path2);
+  const span = getSpan(editor.snapshot, path2);
   if (!span)
     return null;
   const text = span.node.text.slice(startOffset, endOffset);
@@ -12868,7 +12831,7 @@ function removeTextRange(editor, path2, startOffset, endOffset, capture) {
   }), capture ? text : null);
 }
 function removeTextFromOffset(editor, path2, offset, capture) {
-  const span = getSpan(editor, path2);
+  const span = getSpan(editor.snapshot, path2);
   if (!span || offset >= span.node.text.length)
     return null;
   const text = span.node.text.slice(offset);
@@ -12882,7 +12845,7 @@ function removeTextFromOffset(editor, path2, offset, capture) {
 function removeTextUpToOffset(editor, path2, offset) {
   if (offset <= 0)
     return;
-  const span = getSpan(editor, path2);
+  const span = getSpan(editor.snapshot, path2);
   span && editor.apply({
     type: "remove_text",
     path: path2,
@@ -12891,115 +12854,119 @@ function removeTextUpToOffset(editor, path2, offset) {
   });
 }
 function removeChildrenBetween(editor, startChildPath, endChildPath) {
-  let cursor = getSibling(editor, startChildPath, {
+  let cursor = getSibling(editor.snapshot, startChildPath, {
     direction: "next"
   });
   for (; cursor && !pathEquals(cursor.path, endChildPath); )
-    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startChildPath, {
+    removeNodeAt(editor, cursor.path), cursor = getSibling(editor.snapshot, startChildPath, {
       direction: "next"
     });
 }
 function clearContainerContents(editor, containerPath) {
-  const node = getNode(editor, containerPath)?.node;
+  const node = getNode(editor.snapshot, containerPath)?.node;
   if (!node)
     return;
-  const container = resolveContainerByPath(editor, containerPath, node);
+  const container = resolveContainerByPath({
+    containers: editor.containers,
+    schema: editor.snapshot.context.schema,
+    value: editor.snapshot.context.value
+  }, containerPath, node);
   if (!container || !("container" in container))
     return;
   const fieldName = container.field.name;
-  if (container.field.of.some((member) => member.type === editor.schema.block.name)) {
-    let firstChild = getFirstChild(editor, containerPath);
+  if (container.field.of.some((member) => member.type === editor.snapshot.context.schema.block.name)) {
+    let firstChild = getFirstChild(editor.snapshot, containerPath);
     for (; firstChild; )
-      removeNodeAt(editor, firstChild.path), firstChild = getFirstChild(editor, containerPath);
+      removeNodeAt(editor, firstChild.path), firstChild = getFirstChild(editor.snapshot, containerPath);
     const placeholderPath = [...containerPath, fieldName, 0];
     editor.apply({
       type: "insert",
       path: placeholderPath,
-      node: createPlaceholderBlock(editor, placeholderPath),
+      node: createPlaceholderBlock(editor.snapshot, placeholderPath),
       position: "before"
     });
     return;
   }
-  for (const child of getChildren(editor, containerPath))
+  for (const child of getChildren(editor.snapshot, containerPath))
     clearContainerContents(editor, child.path);
 }
 function removeTrailingChildren(editor, startChildPath) {
-  let cursor = getSibling(editor, startChildPath, {
+  let cursor = getSibling(editor.snapshot, startChildPath, {
     direction: "next"
   });
   for (; cursor; )
-    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startChildPath, {
+    removeNodeAt(editor, cursor.path), cursor = getSibling(editor.snapshot, startChildPath, {
       direction: "next"
     });
 }
 function clearTrailingSiblings(editor, startChildPath) {
-  let cursor = getSibling(editor, startChildPath, {
+  let cursor = getSibling(editor.snapshot, startChildPath, {
     direction: "next"
   });
   for (; cursor; ) {
     const cursorPath = cursor.path;
-    clearContainerContents(editor, cursorPath), cursor = getSibling(editor, cursorPath, {
+    clearContainerContents(editor, cursorPath), cursor = getSibling(editor.snapshot, cursorPath, {
       direction: "next"
     });
   }
 }
 function removePrecedingSiblings(editor, startChildPath) {
-  let cursor = getSibling(editor, startChildPath, {
+  let cursor = getSibling(editor.snapshot, startChildPath, {
     direction: "previous"
   });
   for (; cursor; )
-    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startChildPath, {
+    removeNodeAt(editor, cursor.path), cursor = getSibling(editor.snapshot, startChildPath, {
       direction: "previous"
     });
 }
 function clearPrecedingSiblings(editor, startChildPath) {
-  let cursor = getSibling(editor, startChildPath, {
+  let cursor = getSibling(editor.snapshot, startChildPath, {
     direction: "previous"
   });
   for (; cursor; ) {
     const cursorPath = cursor.path;
-    clearContainerContents(editor, cursorPath), cursor = getSibling(editor, cursorPath, {
+    clearContainerContents(editor, cursorPath), cursor = getSibling(editor.snapshot, cursorPath, {
       direction: "previous"
     });
   }
 }
 function parentAcceptsTextBlock(editor, path2) {
-  const enclosing = getEnclosingContainer(editor, path2);
-  return enclosing ? enclosing.of.some((member) => member.type === editor.schema.block.name) : !0;
+  const enclosing = getEnclosingContainer(editor.snapshot, path2);
+  return enclosing ? enclosing.of.some((member) => member.type === editor.snapshot.context.schema.block.name) : !0;
 }
 function removeAllChildren(editor, blockPath) {
-  let firstChild = getFirstChild(editor, blockPath);
+  let firstChild = getFirstChild(editor.snapshot, blockPath);
   for (; firstChild; )
-    removeNodeAt(editor, firstChild.path), firstChild = getFirstChild(editor, blockPath);
+    removeNodeAt(editor, firstChild.path), firstChild = getFirstChild(editor.snapshot, blockPath);
 }
 function removeLeadingChildrenOf(editor, blockPath, endChildPath) {
   const endKey = endChildPath.at(-1)?._key;
   if (!endKey)
     return;
-  let firstChild = getFirstChild(editor, blockPath);
+  let firstChild = getFirstChild(editor.snapshot, blockPath);
   for (; firstChild && firstChild.path.at(-1)?._key !== endKey; )
-    removeNodeAt(editor, firstChild.path), firstChild = getFirstChild(editor, blockPath);
+    removeNodeAt(editor, firstChild.path), firstChild = getFirstChild(editor.snapshot, blockPath);
 }
 function removeBlocksBetween(editor, startBlockPath, endBlockPath) {
-  let cursor = getSibling(editor, startBlockPath, {
+  let cursor = getSibling(editor.snapshot, startBlockPath, {
     direction: "next"
   });
   for (; cursor && !pathEquals(cursor.path, endBlockPath); )
-    removeNodeAt(editor, cursor.path), cursor = getSibling(editor, startBlockPath, {
+    removeNodeAt(editor, cursor.path), cursor = getSibling(editor.snapshot, startBlockPath, {
       direction: "next"
     });
 }
 function mergeBlock(editor, startBlockPath, endBlockPath, removeEmptyStartBlock) {
   if (pathEquals(startBlockPath, endBlockPath))
     return;
-  const startBlock = getTextBlock(editor, startBlockPath), endBlock = getTextBlock(editor, endBlockPath);
+  const startBlock = getTextBlock(editor.snapshot, startBlockPath), endBlock = getTextBlock(editor.snapshot, endBlockPath);
   if (!startBlock || !endBlock)
     return;
   if (removeEmptyStartBlock && isEmptyTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, startBlock.node)) {
     if (isEmptyTextBlock({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, endBlock.node)) {
       removeNodeAt(editor, endBlockPath);
       return;
@@ -13017,15 +12984,15 @@ function mergeBlock(editor, startBlockPath, endBlockPath, removeEmptyStartBlock)
   applyMergeNode(editor, endBlockPath, startBlock.node.children.length);
 }
 function removeNodeAt(editor, path2) {
-  getNode(editor, path2) && editor.apply({
+  getNode(editor.snapshot, path2) && editor.apply({
     type: "unset",
     path: path2
   });
 }
 function deleteCollapsed(editor, point2, options) {
   withoutNormalizing(editor, () => {
-    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),
+    const pointEntry = getNode(editor.snapshot, point2.path), furthestObjectNode = pointEntry && isLeafObject(editor.snapshot, pointEntry.node, point2.path) ? pointEntry : getAncestor(editor.snapshot, point2.path, {
+      match: (node, ancestorPath) => isLeafObject(editor.snapshot, node, ancestorPath),
       mode: "highest"
     });
     if (furthestObjectNode) {
@@ -13072,19 +13039,19 @@ function deleteRange(editor, range2, options) {
 function resolveExplicitRange(editor, at) {
   if (isCollapsedRange(at))
     return null;
-  const [start2, end2] = rangeEdges(at, editor), startBlock = getEnclosingBlock(editor, start2.path), endBlock = getEnclosingBlock(editor, end2.path);
+  const [start2, end2] = rangeEdges(at, editor.snapshot.context), startBlock = getEnclosingBlock(editor.snapshot, start2.path), endBlock = getEnclosingBlock(editor.snapshot, end2.path);
   let clampedStart = start2, clampedEnd = end2;
-  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),
+  const startEntry = getNode(editor.snapshot, start2.path);
+  if ((startEntry && isLeafObject(editor.snapshot, startEntry.node, start2.path) ? startEntry : getAncestor(editor.snapshot, start2.path, {
+    match: (node, ancestorPath) => isLeafObject(editor.snapshot, node, ancestorPath),
     mode: "highest"
   })) && startBlock) {
     const beforePoint = before(editor, start2);
     beforePoint && isAncestorPath(startBlock.path, beforePoint.path) && (clampedStart = beforePoint);
   }
-  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),
+  const endEntry = getNode(editor.snapshot, end2.path);
+  if ((endEntry && isLeafObject(editor.snapshot, endEntry.node, end2.path) ? endEntry : getAncestor(editor.snapshot, end2.path, {
+    match: (node, ancestorPath) => isLeafObject(editor.snapshot, node, ancestorPath),
     mode: "highest"
   })) && endBlock) {
     const afterPoint = after(editor, end2);
@@ -13096,7 +13063,7 @@ function resolveExplicitRange(editor, at) {
   };
 }
 function findCurrentLineRange(editor, parentRange) {
-  const parentRangeBoundary = range(editor, rangeEnd(parentRange, editor)), positions$1 = Array.from(positions(editor, {
+  const parentRangeBoundary = range(editor, rangeEnd(parentRange, editor.snapshot.context)), positions$1 = Array.from(positions(editor, {
     at: parentRange
   }));
   let left = 0, right = positions$1.length, middle = Math.floor(right / 2);
@@ -13118,7 +13085,7 @@ function domRectsIntersect(rect, compareRect) {
 }
 function unsetMatchedNodesInRange(editor, from, to, predicate) {
   const candidates = [];
-  for (const entry of getNodes(editor, {
+  for (const entry of getNodes(editor.snapshot, {
     from,
     to,
     match: predicate
@@ -13127,7 +13094,7 @@ function unsetMatchedNodesInRange(editor, from, to, predicate) {
   const matchPathRefs = candidates.filter((candidate, index) => !candidates.some((other, otherIndex) => otherIndex > index && isAncestorPath(candidate.path, other.path))).map((entry) => pathRef(editor, entry.path));
   for (const ref of matchPathRefs) {
     const path2 = ref.unref();
-    path2 && getNode(editor, path2) && editor.apply({
+    path2 && getNode(editor.snapshot, path2) && editor.apply({
       type: "unset",
       path: path2
     });
@@ -13150,7 +13117,7 @@ function getUnwrapTarget(snapshot, originPath, payloadTypes) {
   }
 }
 function unwrapContainer(editor, originPath, position) {
-  const children = getChildren(editor, originPath);
+  const children = getChildren(editor.snapshot, originPath);
   if (children.length === 0) {
     editor.apply({
       type: "unset",
@@ -13158,10 +13125,10 @@ function unwrapContainer(editor, originPath, position) {
     });
     return;
   }
-  const payloadTypes = new Set(children.map((child) => child.node._type)), unwrapTarget = getUnwrapTarget(editor, originPath, payloadTypes);
+  const payloadTypes = new Set(children.map((child) => child.node._type)), unwrapTarget = getUnwrapTarget(editor.snapshot, originPath, payloadTypes);
   if (!unwrapTarget)
     return;
-  const innerPrefix = children[0].path.slice(0, originPath.length + 1), previousSelection = editor.selection, order = position === "before" ? [...children].reverse() : children;
+  const innerPrefix = children[0].path.slice(0, originPath.length + 1), previousSelection = editor.snapshot.context.selection, order = position === "before" ? [...children].reverse() : children;
   for (const child of order)
     editor.apply({
       type: "insert",
@@ -13176,7 +13143,7 @@ function unwrapContainer(editor, originPath, position) {
     const anchor = transformPoint(previousSelection.anchor, innerPrefix), focus = transformPoint(previousSelection.focus, innerPrefix);
     editor.apply({
       type: "set_selection",
-      properties: editor.selection,
+      properties: editor.snapshot.context.selection,
       newProperties: {
         anchor,
         focus
@@ -13193,30 +13160,30 @@ function transformPoint(point2, innerPrefix) {
 const deleteOperationImplementation = ({
   operation
 }) => {
-  const at = operation.at ? resolveSelection(operation.editor, operation.at) : operation.editor.selection;
+  const at = operation.at ? resolveSelection(operation.editor, operation.at) : operation.editor.snapshot.context.selection;
   if (!at)
     throw new Error("Unable to delete without a selection");
-  const [start2, end2] = rangeEdges(at, operation.editor);
+  const [start2, end2] = rangeEdges(at, operation.editor.snapshot.context);
   if (operation.unit === "block") {
-    unsetMatchedNodesInRange(operation.editor, start2.path, end2.path, (_, path2) => isBlock(operation.editor, path2));
+    unsetMatchedNodesInRange(operation.editor, start2.path, end2.path, (_, path2) => isBlock(operation.editor.snapshot, path2));
     return;
   }
   if (operation.unit === "child") {
-    unsetMatchedNodesInRange(operation.editor, start2.path, end2.path, (_, path2) => isInline(operation.editor, path2));
+    unsetMatchedNodesInRange(operation.editor, start2.path, end2.path, (_, path2) => isInline(operation.editor.snapshot, path2));
     return;
   }
   if (operation.direction === "backward" && operation.unit === "line") {
-    const parentBlockEntry = pathEquals(at.anchor.path, at.focus.path) ? getParent(operation.editor, at.anchor.path, {
+    const parentBlockEntry = pathEquals(at.anchor.path, at.focus.path) ? getParent(operation.editor.snapshot, at.anchor.path, {
       match: (node) => isTextBlock({
-        schema: operation.editor.schema
+        schema: operation.editor.snapshot.context.schema
       }, node)
     }) : (() => {
-      const fromPath = commonPath(at.anchor.path, at.focus.path), nodeEntry = getNode(operation.editor, fromPath);
+      const fromPath = commonPath(at.anchor.path, at.focus.path), nodeEntry = getNode(operation.editor.snapshot, fromPath);
       return nodeEntry && isTextBlockNode({
-        schema: operation.editor.schema
-      }, nodeEntry.node) ? nodeEntry : getParent(operation.editor, fromPath, {
+        schema: operation.editor.snapshot.context.schema
+      }, nodeEntry.node) ? nodeEntry : getParent(operation.editor.snapshot, fromPath, {
         match: (node) => isTextBlock({
-          schema: operation.editor.schema
+          schema: operation.editor.snapshot.context.schema
         }, node)
       });
     })();
@@ -13233,10 +13200,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, {
-      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)) {
+    const enclosingContainer = getAncestor(operation.editor.snapshot, at.anchor.path, {
+      match: (node, path2) => isObject$1(operation.editor.snapshot, node) && isEditableContainer(operation.editor.snapshot, node, path2)
+    }), enclosingContainerChildren = enclosingContainer ? getChildren(operation.editor.snapshot, enclosingContainer.path) : void 0, [firstChild] = enclosingContainerChildren ?? [];
+    if (enclosingContainer && enclosingContainerChildren?.length === 1 && firstChild && isEmptyTextBlock(operation.editor.snapshot.context, firstChild.node)) {
       unwrapContainer(operation.editor, enclosingContainer.path, operation.direction === "backward" ? "before" : "after");
       return;
     }
@@ -13257,7 +13224,7 @@ const deleteOperationImplementation = ({
     });
     return;
   }
-  deleteRange(operation.editor, unhangRange(operation.editor, at), {
+  deleteRange(operation.editor, unhangRange(operation.editor.snapshot, at), {
     selection,
     removeEmptyStartBlock: !0
   });
@@ -13267,13 +13234,13 @@ function pluginRedoing(editor, fn) {
   editor.isRedoing = !0, fn(), editor.isRedoing = prev;
 }
 function transformOperation(editor, patch, operation) {
-  const snapshot = editor, transformedOperation = {
+  const snapshot = editor.snapshot, transformedOperation = {
     ...operation
   };
   if (patch.type === "insert")
     return debug.history(`No path adjustment needed for '${transformedOperation.type}' operation and patch '${patch.type}' (keyed paths)`), [transformedOperation];
   if (patch.type === "unset" && patch.path.length > 0)
-    return "path" in transformedOperation && Array.isArray(transformedOperation.path) && pathStartsWith(transformedOperation.path, patch.path) ? (debug.history("Skipping transformation that targeted removed block"), []) : [transformedOperation];
+    return "path" in transformedOperation && Array.isArray(transformedOperation.path) && pathContains(patch.path, transformedOperation.path) ? (debug.history("Skipping transformation that targeted removed block"), []) : [transformedOperation];
   if (patch.type === "unset" && patch.path.length === 0)
     return debug.history(`Adjusting selection for unset everything patch and ${operation.type} operation`), [];
   if (patch.type === "diffMatchPatch") {
@@ -13311,14 +13278,11 @@ function transformOperation(editor, patch, operation) {
   return [transformedOperation];
 }
 function findOperationTargetBlock(snapshot, editor, operation) {
-  if (operation.type === "set_selection" && editor.selection)
-    return getEnclosingBlock(snapshot, editor.selection.focus.path)?.node;
+  if (operation.type === "set_selection" && editor.snapshot.context.selection)
+    return getEnclosingBlock(snapshot, editor.snapshot.context.selection.focus.path)?.node;
   if ("path" in operation)
     return getEnclosingBlock(snapshot, operation.path)?.node;
 }
-function pathStartsWith(path2, prefix) {
-  return pathEquals(path2, prefix) || isAncestorPath(prefix, path2);
-}
 const historyRedoOperationImplementation = ({
   operation
 }) => {
@@ -13489,7 +13453,7 @@ const historyUndoOperationImplementation = ({
 }) => {
   const {
     context
-  } = snapshot, editor = operation.editor, resolved = operation.at ? resolveSelection(editor, operation.at) : resolveSelection(editor, editor.selection), at = resolved && operation.at && operation.placement !== "auto" ? operation.at : resolved, destinationPath = at ? operation.placement === "before" ? rangeStart(at, editor).path : rangeEnd(at, editor).path : editor.children.length > 0 ? end(editor, []).path : void 0, schema = destinationPath ? getPathSubSchema(snapshot, destinationPath) : context.schema, parsedBlock = parseBlock({
+  } = snapshot, editor = operation.editor, resolved = operation.at ? resolveSelection(editor, operation.at) : resolveSelection(editor, editor.snapshot.context.selection), at = resolved && operation.at && operation.placement !== "auto" ? operation.at : resolved, destinationPath = at ? operation.placement === "before" ? rangeStart(at, editor.snapshot.context).path : rangeEnd(at, editor.snapshot.context).path : editor.snapshot.context.value.length > 0 ? end(editor, []).path : void 0, schema = destinationPath ? getPathSubSchema(snapshot, destinationPath) : context.schema, parsedBlock = parseBlock({
     block: operation.block,
     keyGenerator: context.keyGenerator,
     options: {
@@ -13515,7 +13479,7 @@ const historyUndoOperationImplementation = ({
     block,
     target,
     select: operation.select ?? "start",
-    selectionAtEntry: editor.selection
+    selectionAtEntry: editor.snapshot.context.selection
   });
 };
 function resolveTarget(args) {
@@ -13525,11 +13489,11 @@ function resolveTarget(args) {
     at,
     placement
   } = args;
-  if (editor.children.length === 0)
+  if (editor.snapshot.context.value.length === 0)
     return {
       kind: "empty-editor"
     };
-  const [startPoint, endPoint] = at ? rangeEdges(at, editor) : [start(editor, []), end(editor, [])], startBlockEntry = getEnclosingBlock(editor, startPoint.path), endBlockEntry = getEnclosingBlock(editor, endPoint.path);
+  const [startPoint, endPoint] = at ? rangeEdges(at, editor.snapshot.context) : [start(editor, []), end(editor, [])], startBlockEntry = getEnclosingBlock(editor.snapshot, startPoint.path), endBlockEntry = getEnclosingBlock(editor.snapshot, endPoint.path);
   if (!startBlockEntry || !endBlockEntry)
     return;
   const startBlockPath = startBlockEntry.path, endBlock = endBlockEntry.node, endBlockPath = endBlockEntry.path;
@@ -13544,7 +13508,7 @@ function resolveTarget(args) {
       blockPath: endBlockPath
     };
   const schemaContext = {
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   };
   if (!at) {
     if (isEmptyTextBlock(schemaContext, endBlock))
@@ -13567,7 +13531,7 @@ function resolveTarget(args) {
       range: at,
       startBlockPath
     };
-  const collapsedPoint = rangeStart(at, editor);
+  const collapsedPoint = rangeStart(at, editor.snapshot.context);
   if (isEmptyTextBlock(schemaContext, endBlock))
     return {
       kind: "replace",
@@ -13693,10 +13657,10 @@ function splitBlockAndInsert(editor, block, blockPath, splitAt) {
     affinity: "backward"
   });
   if (splitAt.offset > 0) {
-    const spanEntry = getSpan(editor, splitAt.path);
+    const spanEntry = getSpan(editor.snapshot, splitAt.path);
     spanEntry && splitAt.offset < spanEntry.node.text.length && applySplitNode(editor, splitAt.path, splitAt.offset);
   }
-  const currentBlockPath = blockPathRef.current ?? blockPath, blockEntry = getTextBlock(editor, currentBlockPath);
+  const currentBlockPath = blockPathRef.current ?? blockPath, blockEntry = getTextBlock(editor.snapshot, 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);
@@ -13713,7 +13677,7 @@ function mergeTextBlockFragment(args) {
     endBlockPath,
     select: select2,
     wasCrossBlock
-  } = args, endBlockEntry = getTextBlock(editor, endBlockPath);
+  } = args, endBlockEntry = getTextBlock(editor.snapshot, endBlockPath);
   if (!endBlockEntry)
     return;
   const endBlock = endBlockEntry.node, {
@@ -13743,9 +13707,9 @@ function applyPostInsertSelection(editor, insertedBlockPath, select2, selectionA
       applySelect(editor, selectionAtEntry);
       return;
     }
-    editor.selection && editor.apply({
+    editor.snapshot.context.selection && editor.apply({
       type: "set_selection",
-      properties: editor.selection,
+      properties: editor.snapshot.context.selection,
       newProperties: null
     });
     return;
@@ -13761,22 +13725,22 @@ function executeDeleteThenInsert(args) {
     range: range2,
     select: select2,
     selectionAtEntry
-  } = args, rangeStartPoint = rangeStart(range2, editor), rangeEndPoint = rangeEnd(range2, editor), startBlockEntry = getEnclosingBlock(editor, rangeStartPoint.path), endBlockEntry = getEnclosingBlock(editor, rangeEndPoint.path), wasCrossBlock = startBlockEntry !== void 0 && endBlockEntry !== void 0 && !pathEquals(startBlockEntry.path, endBlockEntry.path), startBlockPath = startBlockEntry?.path, startOfStartBlock = startBlockPath ? start(editor, startBlockPath) : void 0, isAtStartOfBlock = startOfStartBlock ? pointEquals(rangeStartPoint, startOfStartBlock) : !1, collapsedRangeRef = rangeRef(editor, range2, {
+  } = args, rangeStartPoint = rangeStart(range2, editor.snapshot.context), rangeEndPoint = rangeEnd(range2, editor.snapshot.context), startBlockEntry = getEnclosingBlock(editor.snapshot, rangeStartPoint.path), endBlockEntry = getEnclosingBlock(editor.snapshot, rangeEndPoint.path), wasCrossBlock = startBlockEntry !== void 0 && endBlockEntry !== void 0 && !pathEquals(startBlockEntry.path, endBlockEntry.path), startBlockPath = startBlockEntry?.path, startOfStartBlock = startBlockPath ? start(editor, startBlockPath) : void 0, isAtStartOfBlock = startOfStartBlock ? pointEquals(rangeStartPoint, startOfStartBlock) : !1, collapsedRangeRef = rangeRef(editor, range2, {
     affinity: "inward"
   });
   deleteRange(editor, range2, {
     selection: "preserve",
     removeEmptyStartBlock: !1
   });
-  const collapsedRange = collapsedRangeRef.unref() ?? editor.selection, collapsedPoint = collapsedRange ? rangeStart(collapsedRange, editor) : void 0;
+  const collapsedRange = collapsedRangeRef.unref() ?? editor.snapshot.context.selection, collapsedPoint = collapsedRange ? rangeStart(collapsedRange, editor.snapshot.context) : void 0;
   if (!collapsedPoint)
     return;
-  const resolvedBlock = getParent(editor, collapsedPoint.path, {
+  const resolvedBlock = getParent(editor.snapshot, collapsedPoint.path, {
     match: (node) => isTextBlock({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, node)
   }), blockIsText = isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, block), postDeleteSelection = select2 === "none" ? collapsedRange : selectionAtEntry;
   if (blockIsText && resolvedBlock) {
     if (!wasCrossBlock && isEmptyTextBlock(context, resolvedBlock.node)) {
@@ -13808,7 +13772,7 @@ function executeDeleteThenInsert(args) {
     });
     return;
   }
-  const containingBlockEntry = resolvedBlock ?? getEnclosingBlock(editor, collapsedPoint.path);
+  const containingBlockEntry = resolvedBlock ?? getEnclosingBlock(editor.snapshot, collapsedPoint.path);
   if (!containingBlockEntry)
     return;
   const insertedPath = insertSiblingBlock(editor, block, containingBlockEntry.path, isAtStartOfBlock ? "before" : "after");
@@ -13825,7 +13789,7 @@ function removeAdjacentEmptyTextBlock(args) {
     insertedPath
   } = args;
   for (const direction of ["next", "previous"]) {
-    const sibling = getSibling(editor, insertedPath, {
+    const sibling = getSibling(editor.snapshot, insertedPath, {
       direction
     });
     if (sibling && isEmptyTextBlock(context, sibling.node)) {
@@ -13894,16 +13858,16 @@ function adjustFragmentKeys(args) {
 }
 function insertFragmentChildren(editor, block, at) {
   if (!isTextBlock({
-    schema: editor.schema
+    schema: editor.snapshot.context.schema
   }, block))
     return;
-  at.offset > 0 && getSpan(editor, at.path) && applySplitNode(editor, at.path, at.offset);
+  at.offset > 0 && getSpan(editor.snapshot, 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 = getSpan(editor, at.path);
+    const firstChild = block.children[0], existingEntry = getSpan(editor.snapshot, at.path);
     if (existingEntry && isSpan({
-      schema: editor.schema
+      schema: editor.snapshot.context.schema
     }, firstChild))
       return firstChild.text.length > 0 && editor.apply({
         type: "insert_text",
@@ -13932,12 +13896,12 @@ const insertChildOperationImplementation = ({
 }) => {
   const {
     context
-  } = snapshot, focus = operation.editor.selection?.focus;
+  } = snapshot, focus = operation.editor.snapshot.context.selection?.focus;
   if (!focus)
     throw new Error("Unable to insert child without a focus");
-  const focusBlockEntry = getParent(operation.editor, focus.path, {
+  const focusBlockEntry = getParent(operation.editor.snapshot, focus.path, {
     match: (node) => isTextBlock({
-      schema: operation.editor.schema
+      schema: operation.editor.snapshot.context.schema
     }, node)
   });
   if (!focusBlockEntry)
@@ -13961,13 +13925,13 @@ const insertChildOperationImplementation = ({
     schema
   });
   if (span) {
-    const focusSpanEntry = getNode(operation.editor, focusChildPath);
+    const focusSpanEntry = getNode(operation.editor.snapshot, focusChildPath);
     if (focusSpanEntry && isSpan({
-      schema: operation.editor.schema
+      schema: operation.editor.snapshot.context.schema
     }, focusSpanEntry.node) && focusSpanEntry.node)
       applyInsertNodeAtPoint(operation.editor, span, focus);
     else {
-      const nextSibling = getSibling(operation.editor, focusChildPath, {
+      const nextSibling = getSibling(operation.editor.snapshot, focusChildPath, {
         direction: "next"
       });
       nextSibling ? applyInsertNodeAtPath(operation.editor, span, nextSibling.path) : operation.editor.apply({
@@ -13977,7 +13941,7 @@ const insertChildOperationImplementation = ({
         position: "after"
       });
     }
-    operation.editor.pendingSelection = operation.editor.selection;
+    operation.editor.pendingSelection = operation.editor.snapshot.context.selection;
     return;
   }
   const inlineObject = parseInlineObject({
@@ -13997,13 +13961,13 @@ const insertChildOperationImplementation = ({
       _key,
       _type,
       ...rest
-    }, focusSpanEntry = getNode(operation.editor, focusChildPath);
+    }, focusSpanEntry = getNode(operation.editor.snapshot, focusChildPath);
     if (focusSpanEntry && isSpan({
-      schema: operation.editor.schema
+      schema: operation.editor.snapshot.context.schema
     }, focusSpanEntry.node) && focusSpanEntry.node)
       applyInsertNodeAtPoint(operation.editor, inlineNode, focus);
     else {
-      const nextSibling = getSibling(operation.editor, focusChildPath, {
+      const nextSibling = getSibling(operation.editor.snapshot, focusChildPath, {
         direction: "next"
       });
       nextSibling ? applyInsertNodeAtPath(operation.editor, inlineNode, nextSibling.path) : operation.editor.apply({
@@ -14034,23 +13998,23 @@ const insertChildOperationImplementation = ({
   }
   const {
     selection
-  } = editor;
+  } = editor.snapshot.context;
   if (!selection || !isCollapsedRange(selection))
     return;
   let {
     path: path2,
     offset
   } = selection.anchor;
-  const nodeEntry = getNode(editor, path2);
+  const nodeEntry = getNode(editor.snapshot, path2);
   if (!nodeEntry)
     return;
   const node = nodeEntry.node;
-  if (isLeafObject(editor, node, nodeEntry.path)) {
-    const nextSibling = getSibling(editor, nodeEntry.path, {
+  if (isLeafObject(editor.snapshot, node, nodeEntry.path)) {
+    const nextSibling = getSibling(editor.snapshot, nodeEntry.path, {
       direction: "next"
     });
     if (nextSibling)
-      if (getSpan(editor, nextSibling.path))
+      if (getSpan(editor.snapshot, nextSibling.path))
         path2 = nextSibling.path, offset = 0, applySelect(editor, {
           path: path2,
           offset
@@ -14068,9 +14032,7 @@ const insertChildOperationImplementation = ({
   });
 };
 function applyMove(editor, options = {}) {
-  const {
-    selection
-  } = editor;
+  const selection = editor.snapshot.context.selection;
   if (!selection)
     return;
   const {
@@ -14117,7 +14079,7 @@ const moveBackwardOperationImplementation = ({
   operation
 }) => {
   const newSelection = resolveSelection(operation.editor, operation.at);
-  newSelection ? applySelect(operation.editor, newSelection) : applyDeselect(operation.editor), operation.editor.focused && operation.editor.readOnly && (operation.editor.focused = !1);
+  newSelection ? applySelect(operation.editor, newSelection) : applyDeselect(operation.editor), operation.editor.focused && operation.editor.snapshot.context.readOnly && (operation.editor.focused = !1);
 }, setOperationImplementation = ({
   operation
 }) => {
@@ -16069,7 +16031,7 @@ function performEvent({
   if (eventBehaviors.length === 0 && isSyntheticBehaviorEvent(event)) {
     nativeEvent?.preventDefault(), mode === "send" && (editor.undoStepId = void 0), withPerformingBehaviorOperation(editor, () => {
       debug.operation.enabled && debug.operation(safeStringify(event, 2)), performOperation({
-        snapshot: editor,
+        snapshot: editor.snapshot,
         operation: {
           ...event,
           editor
@@ -16192,7 +16154,7 @@ function performEvent({
   }
   !defaultBehaviorOverwritten && isSyntheticBehaviorEvent(event) ? (nativeEvent?.preventDefault(), mode === "send" && (editor.undoStepId = void 0), withPerformingBehaviorOperation(editor, () => {
     debug.operation.enabled && debug.operation(safeStringify(event, 2)), performOperation({
-      snapshot: editor,
+      snapshot: editor.snapshot,
       operation: {
         ...event,
         editor
@@ -16243,13 +16205,6 @@ 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)
@@ -16427,11 +16382,11 @@ function registerNodeOnEngine(engine, node) {
   if (node.kind === "container") {
     if (isTypeAlreadyRegistered(engine, "container", node.type))
       return;
-    const containerConfig = resolveNestedContainer(engine.schema, node);
+    const containerConfig = resolveNestedContainer(engine.snapshot.context.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, {
+    containers.set(node.type, containerConfig), engine.containers = containers, engine.snapshot.context.containers = buildPublicContainers(containers), normalize(engine, {
       force: !0
     }), engine.onChange();
     return;
@@ -16471,7 +16426,7 @@ function registerNodeOnEngine(engine, node) {
 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, {
+    containers.delete(node.type), engine.containers = containers, engine.snapshot.context.containers = buildPublicContainers(containers), normalize(engine, {
       force: !0
     }), engine.onChange();
     return;
@@ -16601,7 +16556,7 @@ const editorMachine = setup({
       context,
       enqueue
     }) => {
-      context.editorEngine && (context.editorEngine.readOnly = !0, context.editorEngine.onChange()), enqueue.emit({
+      context.editorEngine && (context.editorEngine.snapshot.context.readOnly = !0, context.editorEngine.onChange()), enqueue.emit({
         type: "read only"
       });
     }),
@@ -16609,7 +16564,7 @@ const editorMachine = setup({
       context,
       enqueue
     }) => {
-      context.editorEngine && (context.editorEngine.readOnly = !1, context.editorEngine.onChange()), enqueue.emit({
+      context.editorEngine && (context.editorEngine.snapshot.context.readOnly = !1, context.editorEngine.onChange()), enqueue.emit({
         type: "editable"
       });
     }),
@@ -16640,7 +16595,7 @@ const editorMachine = setup({
         if (event.type !== "patches")
           return context.pendingEvents;
         const incomingPaths = event.patches.map((patch) => patch.path);
-        return context.pendingEvents.filter((pendingEvent) => pendingEvent.type !== "internal.patch" ? !0 : !incomingPaths.some((incomingPath) => pathsOverlap(pendingEvent.patch.path, incomingPath)));
+        return context.pendingEvents.filter((pendingEvent) => pendingEvent.type !== "internal.patch" ? !0 : !incomingPaths.some((incomingPath) => pathContains(pendingEvent.patch.path, incomingPath) || pathContains(incomingPath, pendingEvent.patch.path)));
       }
     }),
     "discard all pending events": assign({
@@ -16681,8 +16636,8 @@ const editorMachine = setup({
         return;
       }
       try {
-        const currentSelection = editorEngine.selection;
-        DOMEditor.focus(editorEngine), currentSelection && (editorEngine.select(currentSelection), editorEngine.pendingSelection = editorEngine.selection, editorEngine.onChange());
+        const currentSelection = editorEngine.snapshot.context.selection;
+        DOMEditor.focus(editorEngine), currentSelection && (editorEngine.select(currentSelection), editorEngine.pendingSelection = editorEngine.snapshot.context.selection, editorEngine.onChange());
       } catch (error) {
         console.error(new Error(`Failed to focus editor: ${error instanceof Error ? error.message : error}`));
       }
@@ -16701,10 +16656,10 @@ const editorMachine = setup({
           remainingEventBehaviors: behaviors,
           event: event.behaviorEvent,
           editor: event.editor,
-          converters: event.editor.converters,
-          keyGenerator: event.editor.keyGenerator,
-          schema: event.editor.schema,
-          readOnly: event.editor.readOnly,
+          converters: event.editor.snapshot.context.converters,
+          keyGenerator: event.editor.snapshot.context.keyGenerator,
+          schema: event.editor.snapshot.context.schema,
+          readOnly: event.editor.snapshot.context.readOnly,
           nativeEvent: event.nativeEvent,
           sendBack: (eventSentBack) => {
             if (eventSentBack.type === "set drag ghost") {
@@ -17947,7 +17902,7 @@ async function updateValue({
   value
 }) {
   let doneSyncing = !1, isChanged = !1, isValid = !0;
-  const hadSelection = !!editorEngine.selection;
+  const hadSelection = !!editorEngine.snapshot.context.selection;
   if ((!value || value.length === 0) && (clearEditor({
     editorEngine,
     doneSyncing
@@ -18029,7 +17984,7 @@ async function updateValue({
       });
       return;
     }
-    hadSelection && !editorEngine.selection && editorEngine.children.length > 0 && (applySelect(editorEngine, start(editorEngine, [])), editorEngine.onChange()), sendBack({
+    hadSelection && !editorEngine.snapshot.context.selection && editorEngine.snapshot.context.value.length > 0 && (applySelect(editorEngine, start(editorEngine, [])), editorEngine.onChange()), sendBack({
       type: "value changed",
       value
     });
@@ -18057,9 +18012,9 @@ function clearEditor({
         withoutPatching(editorEngine, () => {
           if (doneSyncing)
             return;
-          const childrenLength = editorEngine.children.length;
-          editorEngine.children.forEach((_, index) => {
-            const removeNode = editorEngine.children[childrenLength - 1 - index];
+          const childrenLength = editorEngine.snapshot.context.value.length;
+          editorEngine.snapshot.context.value.forEach((_, index) => {
+            const removeNode = editorEngine.snapshot.context.value[childrenLength - 1 - index];
             removeNode && editorEngine.apply({
               type: "unset",
               path: [{
@@ -18080,10 +18035,10 @@ function removeExtraBlocks({
   return withoutNormalizing(editorEngine, () => {
     withRemoteChanges(editorEngine, () => {
       withoutPatching(editorEngine, () => {
-        const childrenLength = editorEngine.children.length;
+        const childrenLength = editorEngine.snapshot.context.value.length;
         if (value.length < childrenLength) {
           for (let i = childrenLength - 1; i > value.length - 1; i--) {
-            const removeNode = editorEngine.children[i];
+            const removeNode = editorEngine.snapshot.context.value[i];
             removeNode && editorEngine.apply({
               type: "unset",
               path: [{
@@ -18105,7 +18060,7 @@ function syncBlock({
   editorEngine,
   value
 }) {
-  const oldEngineBlock = editorEngine.children.at(index), oldBlock = editorEngine.children.at(index);
+  const oldEngineBlock = editorEngine.snapshot.context.value.at(index), oldBlock = editorEngine.snapshot.context.value.at(index);
   if (!oldEngineBlock || !oldBlock) {
     const validation2 = validateValue([block], context.schema, context.keyGenerator);
     if (debug.syncValue("Validating and inserting new block in the end of the value", block), validation2.valid || validation2.resolution?.autoResolve) {
@@ -18117,7 +18072,7 @@ function syncBlock({
           withoutPatching(editorEngine, () => {
             editorEngine.apply({
               type: "insert",
-              path: [editorEngine.children.length],
+              path: [editorEngine.snapshot.context.value.length],
               node: engineBlock,
               position: "before"
             });
@@ -18197,9 +18152,9 @@ function replaceBlock({
 }) {
   const engineBlock = toEngineBlock(block, {
     schemaTypes: context.schema
-  }), currentSelection = editorEngine.selection, focusBlockSegment = currentSelection?.focus.path[0], blockAtIndex = editorEngine.children[index], selectionFocusOnBlock = currentSelection && isKeyedSegment(focusBlockSegment) && blockAtIndex && focusBlockSegment._key === blockAtIndex._key;
+  }), currentSelection = editorEngine.snapshot.context.selection, focusBlockSegment = currentSelection?.focus.path[0], blockAtIndex = editorEngine.snapshot.context.value[index], selectionFocusOnBlock = currentSelection && isKeyedSegment(focusBlockSegment) && blockAtIndex && focusBlockSegment._key === blockAtIndex._key;
   selectionFocusOnBlock && applyDeselect(editorEngine);
-  const oldNode = editorEngine.children[index];
+  const oldNode = editorEngine.snapshot.context.value[index];
   oldNode && (editorEngine.apply({
     type: "unset",
     path: [{
@@ -18210,7 +18165,7 @@ function replaceBlock({
     path: [index],
     node: engineBlock,
     position: "before"
-  }), editorEngine.onChange(), selectionFocusOnBlock && hasNode(editorEngine, currentSelection.anchor.path) && hasNode(editorEngine, currentSelection.focus.path) && applySelect(editorEngine, currentSelection));
+  }), editorEngine.onChange(), selectionFocusOnBlock && hasNode(editorEngine.snapshot, currentSelection.anchor.path) && hasNode(editorEngine.snapshot, currentSelection.focus.path) && applySelect(editorEngine, currentSelection));
 }
 function updateBlock({
   context,
@@ -18234,9 +18189,9 @@ function updateBlock({
   if (Object.keys(removedProperties).length > 0 && setNodeProperties(editorEngine, removedProperties, [{
     _key: oldEngineBlock._key
   }]), isTextBlock({
-    schema: editorEngine.schema
+    schema: editorEngine.snapshot.context.schema
   }, engineBlock) && isTextBlock({
-    schema: editorEngine.schema
+    schema: editorEngine.snapshot.context.schema
   }, oldEngineBlock)) {
     const oldKeys = oldEngineBlock.children.map((c2) => c2._key), newKeys = engineBlock.children.map((c2) => c2._key), oldKeySet = new Set(oldKeys), hasSharedKeys = newKeys.some((key) => oldKeySet.has(key));
     if (oldKeys.length === newKeys.length && oldKeys.length > 0 && oldKeySet.size === oldKeys.length && oldKeys.some((key, i) => key !== newKeys[i]) && newKeys.every((key) => oldKeySet.has(key)) || newKeys.length > 0 && !hasSharedKeys) {
@@ -18265,8 +18220,8 @@ function updateBlock({
         });
       }
     }), engineBlock.children.forEach((currentBlockChild, currentBlockChildIndex) => {
-      const oldBlockChild = oldEngineBlock.children.at(currentBlockChildIndex), isChildChanged = !oldBlockChild || !isEqualChild(currentBlockChild, oldBlockChild, editorEngine.schema.span.name), isTextChanged = oldBlockChild && isSpan({
-        schema: editorEngine.schema
+      const oldBlockChild = oldEngineBlock.children.at(currentBlockChildIndex), isChildChanged = !oldBlockChild || !isEqualChild(currentBlockChild, oldBlockChild, editorEngine.snapshot.context.schema.span.name), isTextChanged = oldBlockChild && isSpan({
+        schema: editorEngine.snapshot.context.schema
       }, oldBlockChild) && currentBlockChild.text !== oldBlockChild.text, path2 = [{
         _key: oldEngineBlock._key
       }, "children", {
@@ -18523,7 +18478,7 @@ function createActors(config) {
           config.editorActor.send({
             ...event,
             type: "internal.patch",
-            value: config.editorEngine.children
+            value: config.editorEngine.snapshot.context.value
           });
           break;
         default:
@@ -19003,8 +18958,14 @@ function EditorProvider(props) {
   let t8;
   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;
 }
+function defaultCompare(a, b) {
+  return a === b;
+}
+function useEditorSelector(editor, selector, t0) {
+  return useSelector(editor, selector, t0 === void 0 ? defaultCompare : t0);
+}
 const usePortableTextEditorSelection = () => {
-  const $ = c(3), editorActor = useContext(EditorActorContext), editorEngine = useEngineStatic(), [selection, setSelection2] = useState(editorEngine.selection);
+  const $ = c(3), editorActor = useContext(EditorActorContext), editorEngine = useEngineStatic(), [selection, setSelection2] = useState(editorEngine.snapshot.context.selection);
   let t0, t1;
   return $[0] !== editorActor ? (t0 = () => {
     const subscription = editorActor.on("selection", (event) => {