@portabletext/editor 1.55.13 → 1.55.15

package/lib/index.js

@@ -9,12 +9,11 @@ import { Element as Element$1, Text, Range, Editor, Node, Point, Transforms, Pat
 import { useSelected, useSlateSelector, useSlateStatic, withReact, ReactEditor, Slate, useSlate, Editable } from "slate-react";
 import debug$f from "debug";
 import { DOMEditor, isDOMNode } from "slate-dom";
-import { getBlockStartPoint, getBlockKeyFromSelectionPoint, getChildKeyFromSelectionPoint, isTextBlock, parseBlock, parseAnnotation, blockOffsetToSpanSelectionPoint, parseInlineObject, isKeyedSegment, isSpan$1 as isSpan, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText, parseBlocks } from "./_chunks-es/util.slice-blocks.js";
-import { getBlockEndPoint, isEmptyTextBlock, isEqualSelectionPoints } from "./_chunks-es/util.is-equal-selection-points.js";
-import { isSelectionCollapsed, selectionPointToBlockOffset, sliceTextBlock } from "./_chunks-es/util.slice-text-block.js";
+import { getBlockStartPoint, getBlockKeyFromSelectionPoint, isTextBlock, getChildKeyFromSelectionPoint, isSpan, parseBlock, parseAnnotation, blockOffsetToSpanSelectionPoint, parseInlineObject, isKeyedSegment, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText, parseBlocks } from "./_chunks-es/util.slice-blocks.js";
+import { getBlockEndPoint, isSelectionCollapsed, isEmptyTextBlock, isEqualSelectionPoints } from "./_chunks-es/util.is-selection-collapsed.js";
 import isEqual from "lodash/isEqual.js";
-import { isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan as getFocusSpan$1, isSelectionExpanded, getFocusBlock as getFocusBlock$1, getSelectedValue, getFocusChild as getFocusChild$1 } from "./_chunks-es/selector.is-selection-expanded.js";
-import { getFocusInlineObject, getSelectedBlocks, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, isOverlappingSelection, isSelectingEntireBlocks, getTrimmedSelection, getSelectedSpans, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, isAtTheEndOfBlock, isAtTheStartOfBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock, isActiveAnnotation, isActiveDecorator, getSelectedTextBlocks, isActiveListItem, isActiveStyle, getActiveAnnotations as getActiveAnnotations$1 } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
+import { getFocusInlineObject, getSelectedBlocks, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, isOverlappingSelection, isSelectingEntireBlocks, getMarkState, getActiveDecorators, getActiveAnnotationsMarks, getTrimmedSelection, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, isAtTheEndOfBlock, isAtTheStartOfBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock, isActiveAnnotation, isActiveDecorator, getSelectedTextBlocks, isActiveListItem, isActiveStyle, getActiveAnnotations } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
+import { isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan as getFocusSpan$1, isSelectionExpanded, getFocusBlock as getFocusBlock$1, getSelectedValue, getFocusChild as getFocusChild$1 } from "./_chunks-es/selector.get-focus-span.js";
 import getRandomValues from "get-random-values-esm";
 import { defineBehavior, forward, raise, effect } from "./behaviors/index.js";
 import uniq from "lodash/uniq.js";
@@ -27,6 +26,7 @@ import flatten from "lodash/flatten.js";
 import omit from "lodash/omit.js";
 import { applyAll, unset, insert, set, setIfMissing, diffMatchPatch as diffMatchPatch$1 } from "@portabletext/patches";
 import { blockOffsetsToSelection } from "./_chunks-es/util.child-selection-point-to-block-offset.js";
+import { selectionPointToBlockOffset, sliceTextBlock } from "./_chunks-es/util.slice-text-block.js";
 import get from "lodash/get.js";
 import isUndefined from "lodash/isUndefined.js";
 import omitBy from "lodash/omitBy.js";
@@ -548,47 +548,78 @@ function getSlateRangeFromEvent(editor, event) {
   }
   return range;
 }
-function toSlatePath(path, editor) {
+function toSlatePath(snapshot, path) {
   const blockKey = getBlockKeyFromSelectionPoint({
     path
   });
   if (!blockKey)
-    return [];
-  const blockIndex = editor.blockIndexMap.get(blockKey);
+    return {
+      block: void 0,
+      child: void 0,
+      path: []
+    };
+  const blockIndex = snapshot.blockIndexMap.get(blockKey);
   if (blockIndex === void 0)
-    return [];
-  const block = editor.children.at(blockIndex);
-  if (!block || !Element$1.isElement(block))
-    return [];
-  if (editor.isVoid(block))
-    return [blockIndex, 0];
+    return {
+      block: void 0,
+      child: void 0,
+      path: []
+    };
+  const block = snapshot.context.value.at(blockIndex);
+  if (!block)
+    return {
+      block: void 0,
+      child: void 0,
+      path: []
+    };
+  if (!isTextBlock(snapshot.context, block))
+    return {
+      block,
+      child: void 0,
+      path: [blockIndex, 0]
+    };
   const childKey = getChildKeyFromSelectionPoint({
     path
   });
   if (!childKey)
-    return [blockIndex, 0];
-  let childPath = [], childIndex = -1;
+    return {
+      block,
+      child: void 0,
+      path: [blockIndex, 0]
+    };
+  let childPath = [], childIndex = -1, pathChild;
   for (const child of block.children)
     if (childIndex++, child._key === childKey) {
-      Element$1.isElement(child) && editor.isVoid(child) ? childPath = [childIndex, 0] : childPath = [childIndex];
+      pathChild = child, isSpan(snapshot.context, child) ? childPath = [childIndex] : childPath = [childIndex, 0];
       break;
     }
-  return [blockIndex].concat(childPath);
+  return childPath.length === 0 ? {
+    block,
+    child: void 0,
+    path: [blockIndex, 0]
+  } : {
+    block,
+    child: pathChild,
+    path: [blockIndex].concat(childPath)
+  };
 }
-function toSlateRange(selection, editor) {
-  if (!selection || !editor)
+function toSlateRange(snapshot) {
+  if (!snapshot.context.selection)
+    return null;
+  const anchorPath = toSlatePath(snapshot, snapshot.context.selection.anchor.path), focusPath = toSlatePath(snapshot, snapshot.context.selection.focus.path);
+  if (anchorPath.path.length === 0 || focusPath.path.length === 0)
     return null;
-  const anchor = {
-    path: toSlatePath(selection.anchor.path, editor),
-    offset: selection.anchor.offset
-  }, focus = {
-    path: toSlatePath(selection.focus.path, editor),
-    offset: selection.focus.offset
+  const anchorOffset = anchorPath.child && isSpan(snapshot.context, anchorPath.child) ? Math.min(anchorPath.child.text.length, snapshot.context.selection.anchor.offset) : 0, focusOffset = focusPath.child && isSpan(snapshot.context, focusPath.child) ? Math.min(focusPath.child.text.length, snapshot.context.selection.focus.offset) : 0;
+  return {
+    anchor: {
+      path: anchorPath.path,
+      offset: anchorOffset
+    },
+    focus: {
+      path: focusPath.path,
+      offset: focusOffset
+    }
   };
-  return focus.path.length === 0 || anchor.path.length === 0 ? null : anchor && focus ? {
-    anchor,
-    focus
-  } : null;
 }
 function moveRangeByOperation(range, operation) {
   const anchor = Point.transform(range.anchor, operation), focus = Point.transform(range.focus, operation);
@@ -1372,43 +1403,34 @@ function createPlaceholderBlock(context) {
     }]
   };
 }
-function getActiveAnnotations({
-  markState,
-  schema
-}) {
-  return (markState?.marks ?? []).filter((mark) => !schema.decorators.map((decorator) => decorator.name).includes(mark));
-}
-function getActiveDecorators({
-  decoratorState,
-  markState,
-  schema
-}) {
-  const decorators = schema.decorators.map((decorator) => decorator.name);
-  let activeDecorators = (markState?.marks ?? []).filter((mark) => decorators.includes(mark));
-  for (const decorator in decoratorState)
-    decoratorState[decorator] === !1 ? activeDecorators = activeDecorators.filter((activeDecorator) => activeDecorator !== decorator) : decoratorState[decorator] === !0 && (activeDecorators.includes(decorator) || activeDecorators.push(decorator));
-  return activeDecorators;
-}
 const insertTextOperationImplementation = ({
   context,
   operation
 }) => {
-  const activeDecorators = getActiveDecorators({
-    decoratorState: operation.editor.decoratorState,
-    markState: operation.editor.markState,
-    schema: context.schema
-  }), activeAnnotations = getActiveAnnotations({
-    markState: operation.editor.markState,
-    schema: context.schema
-  }), [focusSpan] = getFocusSpan({
+  const snapshot = {
+    blockIndexMap: operation.editor.blockIndexMap,
+    context: {
+      value: operation.editor.value,
+      selection: operation.editor.selection ? slateRangeToSelection({
+        schema: context.schema,
+        editor: operation.editor,
+        range: operation.editor.selection
+      }) : null,
+      schema: context.schema,
+      keyGenerator: context.keyGenerator,
+      converters: [],
+      readOnly: !1
+    },
+    decoratorState: operation.editor.decoratorState
+  }, markState = getMarkState(snapshot), activeDecorators = getActiveDecorators(snapshot), activeAnnotations = getActiveAnnotationsMarks(snapshot), [focusSpan] = getFocusSpan({
     editor: operation.editor
   });
   if (!focusSpan) {
     Transforms.insertText(operation.editor, operation.text);
     return;
   }
-  if (operation.editor.markState && operation.editor.markState.state === "unchanged") {
-    const markStateDecorators = (operation.editor.markState.marks ?? []).filter((mark) => context.schema.decorators.map((decorator) => decorator.name).includes(mark));
+  if (markState && markState.state === "unchanged") {
+    const markStateDecorators = (markState.marks ?? []).filter((mark) => context.schema.decorators.map((decorator) => decorator.name).includes(mark));
     if (markStateDecorators.length === activeDecorators.length && markStateDecorators.every((mark) => activeDecorators.includes(mark))) {
       Transforms.insertText(operation.editor, operation.text);
       return;
@@ -1522,17 +1544,7 @@ function getEditorSnapshot({
       selection: editorActorSnapshot.context.selection,
       value: slateEditorInstance.value
     },
-    beta: {
-      activeAnnotations: getActiveAnnotations({
-        markState: slateEditorInstance.markState,
-        schema: editorActorSnapshot.context.schema
-      }),
-      activeDecorators: getActiveDecorators({
-        decoratorState: slateEditorInstance.decoratorState,
-        markState: slateEditorInstance.markState,
-        schema: editorActorSnapshot.context.schema
-      })
-    }
+    decoratorState: slateEditorInstance.decoratorState
   };
 }
 const debug$e = debugWithName("plugin:withPortableTextMarkModel");
@@ -1747,11 +1759,15 @@ function createWithPortableTextMarkModel(editorActor) {
         }
       }
       if (op.type === "insert_text") {
-        if (!editor.markState) {
+        const snapshot = getEditorSnapshot({
+          editorActorSnapshot: editorActor.getSnapshot(),
+          slateEditorInstance: editor
+        }), markState = getMarkState(snapshot);
+        if (!markState) {
           apply2(op);
           return;
         }
-        if (editor.markState.state === "unchanged") {
+        if (markState.state === "unchanged") {
           apply2(op);
           return;
         }
@@ -1759,7 +1775,7 @@ function createWithPortableTextMarkModel(editorActor) {
           _type: "span",
           _key: editorActor.getSnapshot().context.keyGenerator(),
           text: op.text,
-          marks: editor.markState.marks
+          marks: markState.marks
         });
         return;
       }
@@ -1796,7 +1812,7 @@ function createWithPortableTextMarkModel(editorActor) {
               });
               Editor.withoutNormalizing(editor, () => {
                 apply2(op), Transforms.setNodes(editor, {
-                  marks: snapshot.beta.activeDecorators
+                  marks: getActiveDecorators(snapshot)
                 }, {
                   at: op.path
                 });
@@ -2919,15 +2935,22 @@ const addAnnotationOperationImplementation = ({
   operation
 }) => {
   const location = toSlateRange({
-    anchor: {
-      path: operation.at,
-      offset: 0
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: {
+        anchor: {
+          path: operation.at,
+          offset: 0
+        },
+        focus: {
+          path: operation.at,
+          offset: 0
+        }
+      }
     },
-    focus: {
-      path: operation.at,
-      offset: 0
-    }
-  }, operation.editor);
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   if (!location)
     throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
   const block = Editor.node(operation.editor, location, {
@@ -2967,15 +2990,22 @@ const addAnnotationOperationImplementation = ({
   operation
 }) => {
   const location = toSlateRange({
-    anchor: {
-      path: operation.at,
-      offset: 0
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: {
+        anchor: {
+          path: operation.at,
+          offset: 0
+        },
+        focus: {
+          path: operation.at,
+          offset: 0
+        }
+      }
     },
-    focus: {
-      path: operation.at,
-      offset: 0
-    }
-  }, operation.editor);
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   if (!location)
     throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
   const block = Editor.node(operation.editor, location, {
@@ -3032,15 +3062,22 @@ const addAnnotationOperationImplementation = ({
   operation
 }) => {
   const location = toSlateRange({
-    anchor: {
-      path: operation.at,
-      offset: 0
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: {
+        anchor: {
+          path: operation.at,
+          offset: 0
+        },
+        focus: {
+          path: operation.at,
+          offset: 0
+        }
+      }
     },
-    focus: {
-      path: operation.at,
-      offset: 0
-    }
-  }, operation.editor);
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   if (!location)
     throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
   const childEntry = Editor.node(operation.editor, location, {
@@ -3101,15 +3138,22 @@ const addAnnotationOperationImplementation = ({
   operation
 }) => {
   const location = toSlateRange({
-    anchor: {
-      path: operation.at,
-      offset: 0
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: {
+        anchor: {
+          path: operation.at,
+          offset: 0
+        },
+        focus: {
+          path: operation.at,
+          offset: 0
+        }
+      }
     },
-    focus: {
-      path: operation.at,
-      offset: 0
-    }
-  }, operation.editor);
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   if (!location)
     throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
   const childEntry = Editor.node(operation.editor, location, {
@@ -3174,7 +3218,14 @@ const addAnnotationOperationImplementation = ({
   }) : void 0, manualSelection = manualAnchor && manualFocus ? {
     anchor: manualAnchor,
     focus: manualFocus
-  } : void 0, selection = manualSelection ? toSlateRange(manualSelection, operation.editor) ?? editor.selection : editor.selection;
+  } : void 0, selection = manualSelection ? toSlateRange({
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: manualSelection
+    },
+    blockIndexMap: operation.editor.blockIndexMap
+  }) ?? editor.selection : editor.selection;
   if (!selection)
     return;
   const editorSelection = slateRangeToSelection({
@@ -3215,10 +3266,6 @@ const addAnnotationOperationImplementation = ({
       backward: editorSelection?.backward
     }), trimmedSelection = getTrimmedSelection({
       blockIndexMap: editor.blockIndexMap,
-      beta: {
-        activeAnnotations: [],
-        activeDecorators: []
-      },
       context: {
         converters: [],
         keyGenerator: context.keyGenerator,
@@ -3226,11 +3273,19 @@ const addAnnotationOperationImplementation = ({
         schema: context.schema,
         selection: newSelection,
         value: newValue
-      }
+      },
+      decoratorState: editor.decoratorState
     });
     if (!trimmedSelection)
       throw new Error("Unable to find trimmed selection");
-    const newRange = toSlateRange(trimmedSelection, editor);
+    const newRange = toSlateRange({
+      context: {
+        schema: context.schema,
+        value: operation.editor.value,
+        selection: trimmedSelection
+      },
+      blockIndexMap: operation.editor.blockIndexMap
+    });
     if (!newRange)
       throw new Error("Unable to find new selection");
     const splitTextNodes = Range.isRange(newRange) ? [...Editor.nodes(editor, {
@@ -3291,7 +3346,14 @@ const addAnnotationOperationImplementation = ({
     }), operation.editor.children.length === 0 && Transforms.insertNodes(operation.editor, createPlaceholderBlock(context));
     return;
   }
-  const range = toSlateRange(operation.at, operation.editor);
+  const range = toSlateRange({
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: operation.at
+    },
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   if (!range)
     throw new Error(`Failed to get Slate Range for selection ${JSON.stringify(operation.at)}`);
   operation.editor.delete({
@@ -3564,9 +3626,22 @@ const moveBackwardOperationImplementation = ({
     reverse: !0
   });
 }, moveBlockOperationImplementation = ({
+  context,
   operation
 }) => {
-  const at = [toSlatePath(operation.at, operation.editor)[0]], to = [toSlatePath(operation.to, operation.editor)[0]];
+  const at = [toSlatePath({
+    context: {
+      schema: context.schema,
+      value: operation.editor.value
+    },
+    blockIndexMap: operation.editor.blockIndexMap
+  }, operation.at).path[0]], to = [toSlatePath({
+    context: {
+      schema: context.schema,
+      value: operation.editor.value
+    },
+    blockIndexMap: operation.editor.blockIndexMap
+  }, operation.to).path[0]];
   Transforms.moveNodes(operation.editor, {
     at,
     to,
@@ -3580,9 +3655,17 @@ const moveBackwardOperationImplementation = ({
     distance: operation.distance
   });
 }, selectOperationImplementation = ({
+  context,
   operation
 }) => {
-  const newSelection = toSlateRange(operation.at, operation.editor);
+  const newSelection = toSlateRange({
+    context: {
+      schema: context.schema,
+      value: operation.editor.value,
+      selection: operation.at
+    },
+    blockIndexMap: operation.editor.blockIndexMap
+  });
   newSelection ? Transforms.select(operation.editor, newSelection) : Transforms.deselect(operation.editor);
 }, behaviorOperationImplementations = {
   "annotation.add": addAnnotationOperationImplementation,
@@ -4829,110 +4912,6 @@ function createWithUtils({
     })[0], editor;
   };
 }
-function getMarkState({
-  schema,
-  editor
-}) {
-  if (!editor.selection)
-    return;
-  const [block, blockPath] = getFocusBlock({
-    editor
-  }), [span, spanPath] = getFocusSpan({
-    editor
-  });
-  if (!block || !editor.isTextBlock(block) || !span)
-    return;
-  if (Range.isExpanded(editor.selection)) {
-    const selection = editor.selection ? slateRangeToSelection({
-      schema,
-      editor,
-      range: editor.selection
-    }) : null, selectedSpans = getSelectedSpans({
-      blockIndexMap: editor.blockIndexMap,
-      context: {
-        value: editor.value,
-        selection,
-        schema,
-        converters: [],
-        keyGenerator: () => "",
-        readOnly: !1
-      }
-    });
-    let index = 0, marks2 = [];
-    for (const span2 of selectedSpans)
-      index === 0 ? marks2 = span2.node.marks ?? [] : (span2.node.marks?.length === 0 || (span2.node.marks ?? [])?.some((mark) => !marks2.includes(mark))) && (marks2 = []), index++;
-    return {
-      state: "unchanged",
-      marks: marks2
-    };
-  }
-  const decorators = schema.decorators.map((decorator) => decorator.name), marks = span.marks ?? [], marksWithoutAnnotations = marks.filter((mark) => decorators.includes(mark)), spanHasAnnotations = marks.length > marksWithoutAnnotations.length, spanIsEmpty = span.text.length === 0, atTheBeginningOfSpan = editor.selection.anchor.offset === 0, atTheEndOfSpan = editor.selection.anchor.offset === span.text.length, previousSpan = getPreviousSpan({
-    editor,
-    blockPath,
-    spanPath
-  }), nextSpan = getNextSpan({
-    editor,
-    blockPath,
-    spanPath
-  }), nextSpanAnnotations = nextSpan?.marks?.filter((mark) => !decorators.includes(mark)) ?? [], spanAnnotations = marks.filter((mark) => !decorators.includes(mark)), previousSpanHasAnnotations = previousSpan ? previousSpan.marks?.some((mark) => !decorators.includes(mark)) : !1, previousSpanHasSameAnnotations = previousSpan ? previousSpan.marks?.filter((mark) => !decorators.includes(mark)).every((mark) => marks.includes(mark)) : !1, previousSpanHasSameAnnotation = previousSpan ? previousSpan.marks?.some((mark) => !decorators.includes(mark) && marks.includes(mark)) : !1, previousSpanHasSameMarks = previousSpan ? previousSpan.marks?.every((mark) => marks.includes(mark)) : !1, nextSpanSharesSomeAnnotations = spanAnnotations.some((mark) => nextSpanAnnotations?.includes(mark));
-  if (spanHasAnnotations && !spanIsEmpty) {
-    if (atTheBeginningOfSpan) {
-      if (previousSpanHasSameMarks)
-        return {
-          state: "changed",
-          marks: previousSpan?.marks ?? []
-        };
-      if (previousSpanHasSameAnnotations)
-        return {
-          state: "changed",
-          marks: previousSpan?.marks ?? []
-        };
-      if (previousSpanHasSameAnnotation)
-        return {
-          state: "unchanged",
-          marks: span.marks ?? []
-        };
-      if (!previousSpan)
-        return {
-          state: "changed",
-          marks: []
-        };
-    }
-    if (atTheEndOfSpan) {
-      if (nextSpan && nextSpanSharesSomeAnnotations && nextSpanAnnotations.length < spanAnnotations.length || !nextSpanSharesSomeAnnotations)
-        return {
-          state: "changed",
-          marks: nextSpan?.marks ?? []
-        };
-      if (!nextSpan)
-        return {
-          state: "changed",
-          marks: []
-        };
-    }
-  }
-  return atTheBeginningOfSpan && !spanIsEmpty && previousSpan ? previousSpanHasAnnotations ? {
-    state: "changed",
-    marks: []
-  } : {
-    state: "changed",
-    marks: (previousSpan?.marks ?? []).filter((mark) => decorators.includes(mark))
-  } : {
-    state: "unchanged",
-    marks: span.marks ?? []
-  };
-}
-function pluginUpdateMarkState(context, editor) {
-  const {
-    apply: apply2
-  } = editor;
-  return editor.apply = (operation) => {
-    apply2(operation), editor.markState = getMarkState({
-      editor,
-      schema: context.schema
-    });
-  }, editor;
-}
 function pluginUpdateSelection({
   editor,
   editorActor
@@ -5276,10 +5255,10 @@ const withPlugins = (editor, options) => {
   }), withPortableTextMarkModel = createWithPortableTextMarkModel(editorActor), withPlaceholderBlock = createWithPlaceholderBlock(editorActor), withUtils = createWithUtils({
     editorActor
   });
-  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(pluginUpdateValue(editorActor.getSnapshot().context, pluginUpdateMarkState(editorActor.getSnapshot().context, pluginUpdateSelection({
+  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(pluginUpdateValue(editorActor.getSnapshot().context, pluginUpdateSelection({
     editorActor,
     editor: e
-  }))))))))))));
+  })))))))))));
 }, debug$9 = debugWithName("setup");
 function createSlateEditor(config) {
   debug$9("Creating new Slate editor instance");
@@ -5288,7 +5267,7 @@ function createSlateEditor(config) {
     relayActor: config.relayActor,
     subscriptions: config.subscriptions
   });
-  KEY_TO_VALUE_ELEMENT.set(instance, {}), KEY_TO_SLATE_ELEMENT.set(instance, {}), instance.decoratedRanges = [], instance.decoratorState = {}, instance.markState = void 0;
+  KEY_TO_VALUE_ELEMENT.set(instance, {}), KEY_TO_SLATE_ELEMENT.set(instance, {}), instance.decoratedRanges = [], instance.decoratorState = {};
   const placeholderBlock = createPlaceholderBlock(config.editorActor.getSnapshot().context);
   instance.value = [placeholderBlock], instance.blockIndexMap = /* @__PURE__ */ new Map(), instance.listIndexMap = /* @__PURE__ */ new Map(), buildIndexMaps({
     schema: config.editorActor.getSnapshot().context.schema,
@@ -5322,7 +5301,7 @@ function createEditorDom(sendBack, slateEditor) {
 function getBlockNodes(slateEditor, snapshot) {
   if (!snapshot.context.selection)
     return [];
-  const range = toSlateRange(snapshot.context.selection, slateEditor);
+  const range = toSlateRange(snapshot);
   if (!range)
     return [];
   try {
@@ -5338,7 +5317,7 @@ function getBlockNodes(slateEditor, snapshot) {
 function getChildNodes(slateEditor, snapshot) {
   if (!snapshot.context.selection)
     return [];
-  const range = toSlateRange(snapshot.context.selection, slateEditor);
+  const range = toSlateRange(snapshot);
   if (!range)
     return [];
   try {
@@ -6082,16 +6061,16 @@ const coreDndBehaviors = [
       dragOrigin,
       dropPosition,
       originEvent
-    }) => [...draggingEntireBlocks ? draggedBlocks.map((block) => raise({
+    }) => [raise({
+      type: "select",
+      at: dropPosition
+    }), ...draggingEntireBlocks ? draggedBlocks.map((block) => raise({
       type: "delete.block",
       at: block.path
     })) : [raise({
       type: "delete",
       at: dragOrigin.selection
     })], raise({
-      type: "select",
-      at: dropPosition
-    }), raise({
       type: "insert.blocks",
       blocks: event.data,
       placement: draggingEntireBlocks ? originEvent.position.block === "start" ? "before" : originEvent.position.block === "end" ? "after" : "auto" : "auto"
@@ -7278,9 +7257,9 @@ const coreDndBehaviors = [
       event
     }) => {
       if (getFocusTextBlock(snapshot) && event.mimeType === "text/plain" && event.originEvent.type === "clipboard.paste") {
-        const activeDecorators = snapshot.beta.activeDecorators;
+        const activeDecorators = getActiveDecorators(snapshot);
         return {
-          activeAnnotations: getActiveAnnotations$1(snapshot),
+          activeAnnotations: getActiveAnnotations(snapshot),
           activeDecorators,
           textRuns: event.data.flatMap((block) => isTextBlock(snapshot.context, block) ? [getTextBlockText(block)] : [])
         };
@@ -7654,17 +7633,7 @@ function createEditorSnapshot({
   return {
     blockIndexMap: editor.blockIndexMap,
     context,
-    beta: {
-      activeAnnotations: getActiveAnnotations({
-        markState: editor.markState,
-        schema
-      }),
-      activeDecorators: getActiveDecorators({
-        decoratorState: editor.decoratorState,
-        markState: editor.markState,
-        schema
-      })
-    }
+    decoratorState: editor.decoratorState
   };
 }
 const debug$7 = debugWithName("editor machine"), editorMachine = setup({
@@ -8630,16 +8599,19 @@ function createEditableAPI(editor, editorActor) {
         editor
       });
     },
-    isMarkActive: (mark) => getEditorSnapshot({
-      editorActorSnapshot: editorActor.getSnapshot(),
-      slateEditorInstance: editor
-    }).beta.activeDecorators.includes(mark),
-    marks: () => {
+    isMarkActive: (mark) => {
       const snapshot = getEditorSnapshot({
         editorActorSnapshot: editorActor.getSnapshot(),
         slateEditorInstance: editor
       });
-      return [...snapshot.beta.activeAnnotations, ...snapshot.beta.activeDecorators];
+      return getActiveDecorators(snapshot).includes(mark);
+    },
+    marks: () => {
+      const snapshot = getEditorSnapshot({
+        editorActorSnapshot: editorActor.getSnapshot(),
+        slateEditorInstance: editor
+      }), activeAnnotations = getActiveAnnotationsMarks(snapshot), activeDecorators = getActiveDecorators(snapshot);
+      return [...activeAnnotations, ...activeDecorators];
     },
     undo: () => {
       editorActor.send({
@@ -8660,7 +8632,14 @@ function createEditableAPI(editor, editorActor) {
       });
     },
     select: (selection) => {
-      const slateSelection = toSlateRange(selection, editor);
+      const slateSelection = toSlateRange({
+        context: {
+          schema: editorActor.getSnapshot().context.schema,
+          value: editor.value,
+          selection
+        },
+        blockIndexMap: editor.blockIndexMap
+      });
       slateSelection ? Transforms.select(editor, slateSelection) : Transforms.deselect(editor), editor.onChange();
     },
     focusBlock: () => {
@@ -8766,15 +8745,22 @@ function createEditableAPI(editor, editorActor) {
     isVoid: (element) => ![types.block.name, types.span.name].includes(element._type),
     findByPath: (path) => {
       const slatePath = toSlateRange({
-        focus: {
-          path,
-          offset: 0
+        context: {
+          schema: editorActor.getSnapshot().context.schema,
+          value: editor.value,
+          selection: {
+            focus: {
+              path,
+              offset: 0
+            },
+            anchor: {
+              path,
+              offset: 0
+            }
+          }
         },
-        anchor: {
-          path,
-          offset: 0
-        }
-      }, editor);
+        blockIndexMap: editor.blockIndexMap
+      });
       if (slatePath) {
         const [block, blockPath] = Editor.node(editor, slatePath.focus.path.slice(0, 1));
         if (block && blockPath && typeof block._key == "string") {
@@ -8856,7 +8842,14 @@ function createEditableAPI(editor, editorActor) {
     },
     delete: (selection, options) => {
       if (selection) {
-        const range = toSlateRange(selection, editor);
+        const range = toSlateRange({
+          context: {
+            schema: editorActor.getSnapshot().context.schema,
+            value: editor.value,
+            selection
+          },
+          blockIndexMap: editor.blockIndexMap
+        });
         if (!(range && range.anchor.path.length > 0 && range.focus.path.length > 0))
           throw new Error("Invalid range");
         if (range) {
@@ -8917,7 +8910,21 @@ function createEditableAPI(editor, editorActor) {
     },
     getFragment: () => fromSlateValue(editor.getFragment(), types.block.name),
     isSelectionsOverlapping: (selectionA, selectionB) => {
-      const rangeA = toSlateRange(selectionA, editor), rangeB = toSlateRange(selectionB, editor);
+      const rangeA = toSlateRange({
+        context: {
+          schema: editorActor.getSnapshot().context.schema,
+          value: editor.value,
+          selection: selectionA
+        },
+        blockIndexMap: editor.blockIndexMap
+      }), rangeB = toSlateRange({
+        context: {
+          schema: editorActor.getSnapshot().context.schema,
+          value: editor.value,
+          selection: selectionB
+        },
+        blockIndexMap: editor.blockIndexMap
+      });
       return Range.isRange(rangeA) && Range.isRange(rangeB) && Range.includes(rangeA, rangeB);
     }
   };
@@ -10885,7 +10892,14 @@ const slateOperationCallback = ({
     }) => {
       const rangeDecorationState = [];
       for (const rangeDecoration of context.pendingRangeDecorations) {
-        const slateRange = toSlateRange(rangeDecoration.selection, context.slateEditor);
+        const slateRange = toSlateRange({
+          context: {
+            schema: context.schema,
+            value: context.slateEditor.value,
+            selection: rangeDecoration.selection
+          },
+          blockIndexMap: context.slateEditor.blockIndexMap
+        });
         if (!Range.isRange(slateRange)) {
           rangeDecoration.onMoved?.({
             newSelection: null,
@@ -10909,7 +10923,14 @@ const slateOperationCallback = ({
         return;
       const rangeDecorationState = [];
       for (const rangeDecoration of event.rangeDecorations) {
-        const slateRange = toSlateRange(rangeDecoration.selection, context.slateEditor);
+        const slateRange = toSlateRange({
+          context: {
+            schema: context.schema,
+            value: context.slateEditor.value,
+            selection: rangeDecoration.selection
+          },
+          blockIndexMap: context.slateEditor.blockIndexMap
+        });
         if (!Range.isRange(slateRange)) {
           rangeDecoration.onMoved?.({
             newSelection: null,
@@ -10933,7 +10954,14 @@ const slateOperationCallback = ({
         return;
       const rangeDecorationState = [];
       for (const decoratedRange of context.slateEditor.decoratedRanges) {
-        const slateRange = toSlateRange(decoratedRange.rangeDecoration.selection, context.slateEditor);
+        const slateRange = toSlateRange({
+          context: {
+            schema: context.schema,
+            value: context.slateEditor.value,
+            selection: decoratedRange.rangeDecoration.selection
+          },
+          blockIndexMap: context.slateEditor.blockIndexMap
+        });
         if (!Range.isRange(slateRange)) {
           decoratedRange.rangeDecoration.onMoved?.({
             newSelection: null,
@@ -11187,7 +11215,14 @@ const debug = debugWithName("component:Editable"), PortableTextEditable = forwar
       const normalizedSelection = normalizeSelection(propsSelection, fromSlateValue(slateEditor.children, editorActor.getSnapshot().context.schema.block.name));
       if (normalizedSelection !== null) {
         debug(`Normalized selection from props ${JSON.stringify(normalizedSelection)}`);
-        const slateRange = toSlateRange(normalizedSelection, slateEditor);
+        const slateRange = toSlateRange({
+          context: {
+            schema: editorActor.getSnapshot().context.schema,
+            value: slateEditor.value,
+            selection: normalizedSelection
+          },
+          blockIndexMap: slateEditor.blockIndexMap
+        });
         slateRange && (Transforms.select(slateEditor, slateRange), slateEditor.operations.some((o) => o.type === "set_selection") || editorActor.send({
           type: "update selection",
           selection: normalizedSelection