@portabletext/editor 1.55.13 → 1.55.15

package/lib/index.cjs

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: !0 });
-var reactCompilerRuntime = require("react-compiler-runtime"), React = require("react"), useEffectEvent = require("use-effect-event"), useEditor = require("./_chunks-cjs/use-editor.cjs"), jsxRuntime = require("react/jsx-runtime"), react = require("@xstate/react"), noop = require("lodash/noop.js"), slate = require("slate"), slateReact = require("slate-react"), debug$f = require("debug"), slateDom = require("slate-dom"), util_sliceBlocks = require("./_chunks-cjs/util.slice-blocks.cjs"), util_isEqualSelectionPoints = require("./_chunks-cjs/util.is-equal-selection-points.cjs"), util_sliceTextBlock = require("./_chunks-cjs/util.slice-text-block.cjs"), isEqual = require("lodash/isEqual.js"), selector_isSelectionExpanded = require("./_chunks-cjs/selector.is-selection-expanded.cjs"), selector_isSelectingEntireBlocks = require("./_chunks-cjs/selector.is-selecting-entire-blocks.cjs"), getRandomValues = require("get-random-values-esm"), behaviors_index = require("./behaviors/index.cjs"), uniq = require("lodash/uniq.js"), rxjs = require("rxjs"), xstate = require("xstate"), blockTools = require("@portabletext/block-tools"), toHtml = require("@portabletext/to-html"), schema = require("@sanity/schema"), flatten = require("lodash/flatten.js"), omit = require("lodash/omit.js"), patches = require("@portabletext/patches"), util_childSelectionPointToBlockOffset = require("./_chunks-cjs/util.child-selection-point-to-block-offset.cjs"), get = require("lodash/get.js"), isUndefined = require("lodash/isUndefined.js"), omitBy = require("lodash/omitBy.js"), immer = require("immer"), types = require("@sanity/types"), startCase = require("lodash.startcase"), isPlainObject = require("lodash/isPlainObject.js");
+var reactCompilerRuntime = require("react-compiler-runtime"), React = require("react"), useEffectEvent = require("use-effect-event"), useEditor = require("./_chunks-cjs/use-editor.cjs"), jsxRuntime = require("react/jsx-runtime"), react = require("@xstate/react"), noop = require("lodash/noop.js"), slate = require("slate"), slateReact = require("slate-react"), debug$f = require("debug"), slateDom = require("slate-dom"), util_sliceBlocks = require("./_chunks-cjs/util.slice-blocks.cjs"), util_isSelectionCollapsed = require("./_chunks-cjs/util.is-selection-collapsed.cjs"), isEqual = require("lodash/isEqual.js"), selector_isSelectingEntireBlocks = require("./_chunks-cjs/selector.is-selecting-entire-blocks.cjs"), selector_getFocusSpan = require("./_chunks-cjs/selector.get-focus-span.cjs"), getRandomValues = require("get-random-values-esm"), behaviors_index = require("./behaviors/index.cjs"), uniq = require("lodash/uniq.js"), rxjs = require("rxjs"), xstate = require("xstate"), blockTools = require("@portabletext/block-tools"), toHtml = require("@portabletext/to-html"), schema = require("@sanity/schema"), flatten = require("lodash/flatten.js"), omit = require("lodash/omit.js"), patches = require("@portabletext/patches"), util_childSelectionPointToBlockOffset = require("./_chunks-cjs/util.child-selection-point-to-block-offset.cjs"), util_sliceTextBlock = require("./_chunks-cjs/util.slice-text-block.cjs"), get = require("lodash/get.js"), isUndefined = require("lodash/isUndefined.js"), omitBy = require("lodash/omitBy.js"), immer = require("immer"), types = require("@sanity/types"), startCase = require("lodash.startcase"), isPlainObject = require("lodash/isPlainObject.js");
 function _interopDefaultCompat(e) {
   return e && typeof e == "object" && "default" in e ? e : { default: e };
 }
@@ -402,7 +402,7 @@ function getEventPosition({
             }]
           }
         }),
-        focus: util_isEqualSelectionPoints.getBlockEndPoint({
+        focus: util_isSelectionCollapsed.getBlockEndPoint({
           context: editorActor.getSnapshot().context,
           block: {
             node: eventBlock,
@@ -417,7 +417,7 @@ function getEventPosition({
     return;
   const eventSelectionFocusBlockKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(eventSelection.focus);
   if (eventSelectionFocusBlockKey !== void 0)
-    return util_sliceTextBlock.isSelectionCollapsed(eventSelection) && eventBlock && eventSelectionFocusBlockKey !== eventBlock._key ? {
+    return util_isSelectionCollapsed.isSelectionCollapsed(eventSelection) && eventBlock && eventSelectionFocusBlockKey !== eventBlock._key ? {
       block: eventPositionBlock,
       isEditor: !1,
       selection: {
@@ -430,7 +430,7 @@ function getEventPosition({
             }]
           }
         }),
-        focus: util_isEqualSelectionPoints.getBlockEndPoint({
+        focus: util_isSelectionCollapsed.getBlockEndPoint({
           context: editorActor.getSnapshot().context,
           block: {
             node: eventBlock,
@@ -519,47 +519,78 @@ function getSlateRangeFromEvent(editor, event) {
   }
   return range;
 }
-function toSlatePath(path, editor) {
+function toSlatePath(snapshot, path) {
   const blockKey = util_sliceBlocks.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 || !slate.Element.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 (!util_sliceBlocks.isTextBlock(snapshot.context, block))
+    return {
+      block,
+      child: void 0,
+      path: [blockIndex, 0]
+    };
   const childKey = util_sliceBlocks.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) {
-      slate.Element.isElement(child) && editor.isVoid(child) ? childPath = [childIndex, 0] : childPath = [childIndex];
+      pathChild = child, util_sliceBlocks.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 && util_sliceBlocks.isSpan(snapshot.context, anchorPath.child) ? Math.min(anchorPath.child.text.length, snapshot.context.selection.anchor.offset) : 0, focusOffset = focusPath.child && util_sliceBlocks.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 = slate.Point.transform(range.anchor, operation), focus = slate.Point.transform(range.focus, operation);
@@ -669,18 +700,18 @@ function getDragSelection({
     }
   }))
     return dragSelection;
-  const draggingCollapsedSelection = selector_isSelectionExpanded.isSelectionCollapsed({
+  const draggingCollapsedSelection = selector_getFocusSpan.isSelectionCollapsed({
     context: {
       ...snapshot.context,
       selection: eventSelection
     }
-  }), draggedTextBlock = selector_isSelectionExpanded.getFocusTextBlock({
+  }), draggedTextBlock = selector_getFocusSpan.getFocusTextBlock({
     ...snapshot,
     context: {
       ...snapshot.context,
       selection: eventSelection
     }
-  }), draggedSpan = selector_isSelectionExpanded.getFocusSpan({
+  }), draggedSpan = selector_getFocusSpan.getFocusSpan({
     ...snapshot,
     context: {
       ...snapshot.context,
@@ -692,20 +723,20 @@ function getDragSelection({
       context: snapshot.context,
       block: draggedTextBlock
     }),
-    focus: util_isEqualSelectionPoints.getBlockEndPoint({
+    focus: util_isSelectionCollapsed.getBlockEndPoint({
       context: snapshot.context,
       block: draggedTextBlock
     })
   });
   const selectedBlocks = selector_isSelectingEntireBlocks.getSelectedBlocks(snapshot);
-  if (snapshot.context.selection && selector_isSelectionExpanded.isSelectionExpanded(snapshot) && selectedBlocks.length > 1) {
+  if (snapshot.context.selection && selector_getFocusSpan.isSelectionExpanded(snapshot) && selectedBlocks.length > 1) {
     const selectionStartBlock = selector_isSelectingEntireBlocks.getSelectionStartBlock(snapshot), selectionEndBlock = selector_isSelectingEntireBlocks.getSelectionEndBlock(snapshot);
     if (!selectionStartBlock || !selectionEndBlock)
       return dragSelection;
     const selectionStartPoint = util_sliceBlocks.getBlockStartPoint({
       context: snapshot.context,
       block: selectionStartBlock
-    }), selectionEndPoint = util_isEqualSelectionPoints.getBlockEndPoint({
+    }), selectionEndPoint = util_isSelectionCollapsed.getBlockEndPoint({
       context: snapshot.context,
       block: selectionEndBlock
     });
@@ -765,7 +796,7 @@ function createCoreBlockElementBehaviorsConfig({
         snapshot,
         event
       }) => {
-        const dropFocusBlock = selector_isSelectionExpanded.getFocusBlock({
+        const dropFocusBlock = selector_getFocusSpan.getFocusBlock({
           ...snapshot,
           context: {
             ...snapshot.context,
@@ -1092,7 +1123,7 @@ const converterJson = {
         originEvent: event.originEvent,
         reason: "No selection"
       };
-    const blocks = selector_isSelectionExpanded.getSelectedValue(snapshot);
+    const blocks = selector_getFocusSpan.getSelectedValue(snapshot);
     return blocks.length === 0 ? {
       type: "serialization.failure",
       mimeType: "application/x-portable-text",
@@ -1152,7 +1183,7 @@ function createConverterTextHtml(legacySchema) {
           originEvent: event.originEvent,
           reason: "No selection"
         };
-      const blocks = selector_isSelectionExpanded.getSelectedValue(snapshot), html = toHtml.toHTML(blocks, {
+      const blocks = selector_getFocusSpan.getSelectedValue(snapshot), html = toHtml.toHTML(blocks, {
         onMissingComponent: !1,
         components: {
           unknownType: ({
@@ -1210,7 +1241,7 @@ function createConverterTextPlain(legacySchema) {
       event
     }) => snapshot.context.selection ? {
       type: "serialization.success",
-      data: selector_isSelectionExpanded.getSelectedValue(snapshot).map((block) => util_sliceBlocks.isTextBlock(snapshot.context, block) ? block.children.map((child) => child._type === snapshot.context.schema.span.name ? child.text : event.originEvent === "drag.dragstart" ? `[${snapshot.context.schema.inlineObjects.find((inlineObjectType) => inlineObjectType.name === child._type)?.title ?? "Object"}]` : "").join("") : event.originEvent === "drag.dragstart" ? `[${snapshot.context.schema.blockObjects.find((blockObjectType) => blockObjectType.name === block._type)?.title ?? "Object"}]` : "").filter((block) => block !== "").join(`
+      data: selector_getFocusSpan.getSelectedValue(snapshot).map((block) => util_sliceBlocks.isTextBlock(snapshot.context, block) ? block.children.map((child) => child._type === snapshot.context.schema.span.name ? child.text : event.originEvent === "drag.dragstart" ? `[${snapshot.context.schema.inlineObjects.find((inlineObjectType) => inlineObjectType.name === child._type)?.title ?? "Object"}]` : "").join("") : event.originEvent === "drag.dragstart" ? `[${snapshot.context.schema.blockObjects.find((blockObjectType) => blockObjectType.name === block._type)?.title ?? "Object"}]` : "").filter((block) => block !== "").join(`
 
 `),
       mimeType: "text/plain",
@@ -1343,43 +1374,34 @@ function createPlaceholderBlock(context) {
     }]
   };
 }
-function getActiveAnnotations({
-  markState,
-  schema: schema2
-}) {
-  return (markState?.marks ?? []).filter((mark) => !schema2.decorators.map((decorator) => decorator.name).includes(mark));
-}
-function getActiveDecorators({
-  decoratorState,
-  markState,
-  schema: schema2
-}) {
-  const decorators = schema2.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 = selector_isSelectingEntireBlocks.getMarkState(snapshot), activeDecorators = selector_isSelectingEntireBlocks.getActiveDecorators(snapshot), activeAnnotations = selector_isSelectingEntireBlocks.getActiveAnnotationsMarks(snapshot), [focusSpan] = getFocusSpan({
     editor: operation.editor
   });
   if (!focusSpan) {
     slate.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))) {
       slate.Transforms.insertText(operation.editor, operation.text);
       return;
@@ -1493,17 +1515,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");
@@ -1718,11 +1730,15 @@ function createWithPortableTextMarkModel(editorActor) {
         }
       }
       if (op.type === "insert_text") {
-        if (!editor.markState) {
+        const snapshot = getEditorSnapshot({
+          editorActorSnapshot: editorActor.getSnapshot(),
+          slateEditorInstance: editor
+        }), markState = selector_isSelectingEntireBlocks.getMarkState(snapshot);
+        if (!markState) {
           apply2(op);
           return;
         }
-        if (editor.markState.state === "unchanged") {
+        if (markState.state === "unchanged") {
           apply2(op);
           return;
         }
@@ -1730,7 +1746,7 @@ function createWithPortableTextMarkModel(editorActor) {
           _type: "span",
           _key: editorActor.getSnapshot().context.keyGenerator(),
           text: op.text,
-          marks: editor.markState.marks
+          marks: markState.marks
         });
         return;
       }
@@ -1767,7 +1783,7 @@ function createWithPortableTextMarkModel(editorActor) {
               });
               slate.Editor.withoutNormalizing(editor, () => {
                 apply2(op), slate.Transforms.setNodes(editor, {
-                  marks: snapshot.beta.activeDecorators
+                  marks: selector_isSelectingEntireBlocks.getActiveDecorators(snapshot)
                 }, {
                   at: op.path
                 });
@@ -2890,15 +2906,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 = slate.Editor.node(operation.editor, location, {
@@ -2938,15 +2961,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 = slate.Editor.node(operation.editor, location, {
@@ -3003,15 +3033,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 = slate.Editor.node(operation.editor, location, {
@@ -3072,15 +3109,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 = slate.Editor.node(operation.editor, location, {
@@ -3145,7 +3189,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({
@@ -3186,10 +3237,6 @@ const addAnnotationOperationImplementation = ({
       backward: editorSelection?.backward
     }), trimmedSelection = selector_isSelectingEntireBlocks.getTrimmedSelection({
       blockIndexMap: editor.blockIndexMap,
-      beta: {
-        activeAnnotations: [],
-        activeDecorators: []
-      },
       context: {
         converters: [],
         keyGenerator: context.keyGenerator,
@@ -3197,11 +3244,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 = slate.Range.isRange(newRange) ? [...slate.Editor.nodes(editor, {
@@ -3262,7 +3317,14 @@ const addAnnotationOperationImplementation = ({
     }), operation.editor.children.length === 0 && slate.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({
@@ -3535,9 +3597,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]];
   slate.Transforms.moveNodes(operation.editor, {
     at,
     to,
@@ -3551,9 +3626,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 ? slate.Transforms.select(operation.editor, newSelection) : slate.Transforms.deselect(operation.editor);
 }, behaviorOperationImplementations = {
   "annotation.add": addAnnotationOperationImplementation,
@@ -4348,7 +4431,7 @@ function insertTextPatch(schema2, children, operation, beforeValue) {
     throw new Error("Could not find block");
   const textChild = util_sliceBlocks.isTextBlock({
     schema: schema2
-  }, block) && util_sliceBlocks.isSpan$1({
+  }, block) && util_sliceBlocks.isSpan({
     schema: schema2
   }, block.children[operation.path[1]]) && block.children[operation.path[1]];
   if (!textChild)
@@ -4359,7 +4442,7 @@ function insertTextPatch(schema2, children, operation, beforeValue) {
     _key: textChild._key
   }, "text"], prevBlock = beforeValue[operation.path[0]], prevChild = util_sliceBlocks.isTextBlock({
     schema: schema2
-  }, prevBlock) && prevBlock.children[operation.path[1]], prevText = util_sliceBlocks.isSpan$1({
+  }, prevBlock) && prevBlock.children[operation.path[1]], prevText = util_sliceBlocks.isSpan({
     schema: schema2
   }, prevChild) ? prevChild.text : "", patch = patches.diffMatchPatch(prevText, textChild.text, path);
   return patch.value.length ? [patch] : [];
@@ -4370,7 +4453,7 @@ function removeTextPatch(schema2, children, operation, beforeValue) {
     throw new Error("Could not find block");
   const child = util_sliceBlocks.isTextBlock({
     schema: schema2
-  }, block) && block.children[operation.path[1]] || void 0, textChild = util_sliceBlocks.isSpan$1({
+  }, block) && block.children[operation.path[1]] || void 0, textChild = util_sliceBlocks.isSpan({
     schema: schema2
   }, child) ? child : void 0;
   if (child && !textChild)
@@ -4383,7 +4466,7 @@ function removeTextPatch(schema2, children, operation, beforeValue) {
     _key: textChild._key
   }, "text"], beforeBlock = beforeValue[operation.path[0]], prevTextChild = util_sliceBlocks.isTextBlock({
     schema: schema2
-  }, beforeBlock) && beforeBlock.children[operation.path[1]], prevText = util_sliceBlocks.isSpan$1({
+  }, beforeBlock) && beforeBlock.children[operation.path[1]], prevText = util_sliceBlocks.isSpan({
     schema: schema2
   }, prevTextChild) && prevTextChild.text, patch = patches.diffMatchPatch(prevText || "", textChild.text, path);
   return patch.value ? [patch] : [];
@@ -4484,7 +4567,7 @@ function splitNodePatch(schema2, children, operation, beforeValue) {
   }
   if (operation.path.length === 2) {
     const splitSpan = splitBlock.children[operation.path[1]];
-    if (util_sliceBlocks.isSpan$1({
+    if (util_sliceBlocks.isSpan({
       schema: schema2
     }, splitSpan)) {
       const targetSpans = fromSlateValue([{
@@ -4542,9 +4625,9 @@ function mergeNodePatch(schema2, children, operation, beforeValue) {
   }, block) && util_sliceBlocks.isTextBlock({
     schema: schema2
   }, updatedBlock) && operation.path.length === 2) {
-    const updatedSpan = updatedBlock.children[operation.path[1] - 1] && util_sliceBlocks.isSpan$1({
+    const updatedSpan = updatedBlock.children[operation.path[1] - 1] && util_sliceBlocks.isSpan({
       schema: schema2
-    }, updatedBlock.children[operation.path[1] - 1]) ? updatedBlock.children[operation.path[1] - 1] : void 0, removedSpan = block.children[operation.path[1]] && util_sliceBlocks.isSpan$1({
+    }, updatedBlock.children[operation.path[1] - 1]) ? updatedBlock.children[operation.path[1] - 1] : void 0, removedSpan = block.children[operation.path[1]] && util_sliceBlocks.isSpan({
       schema: schema2
     }, block.children[operation.path[1]]) ? block.children[operation.path[1]] : void 0;
     updatedSpan && (block.children.filter((span) => span._key === updatedSpan._key).length === 1 ? patches$1.push(patches.set(updatedSpan.text, [{
@@ -4732,7 +4815,7 @@ function createWithSchemaTypes({
   editorActor
 }) {
   return function(editor) {
-    editor.isTextBlock = (value) => slate.Editor.isEditor(value) ? !1 : util_sliceBlocks.isTextBlock(editorActor.getSnapshot().context, value), editor.isTextSpan = (value) => slate.Editor.isEditor(value) ? !1 : util_sliceBlocks.isSpan$1(editorActor.getSnapshot().context, value), editor.isListBlock = (value) => slate.Editor.isEditor(value) ? !1 : util_sliceBlocks.isListBlock(editorActor.getSnapshot().context, value), editor.isVoid = (element) => slate.Editor.isEditor(element) ? !1 : editorActor.getSnapshot().context.schema.block.name !== element._type && (editorActor.getSnapshot().context.schema.blockObjects.map((obj) => obj.name).includes(element._type) || editorActor.getSnapshot().context.schema.inlineObjects.map((obj) => obj.name).includes(element._type)), editor.isInline = (element) => slate.Editor.isEditor(element) ? !1 : editorActor.getSnapshot().context.schema.inlineObjects.map((obj) => obj.name).includes(element._type) && "__inline" in element && element.__inline === !0;
+    editor.isTextBlock = (value) => slate.Editor.isEditor(value) ? !1 : util_sliceBlocks.isTextBlock(editorActor.getSnapshot().context, value), editor.isTextSpan = (value) => slate.Editor.isEditor(value) ? !1 : util_sliceBlocks.isSpan(editorActor.getSnapshot().context, value), editor.isListBlock = (value) => slate.Editor.isEditor(value) ? !1 : util_sliceBlocks.isListBlock(editorActor.getSnapshot().context, value), editor.isVoid = (element) => slate.Editor.isEditor(element) ? !1 : editorActor.getSnapshot().context.schema.block.name !== element._type && (editorActor.getSnapshot().context.schema.blockObjects.map((obj) => obj.name).includes(element._type) || editorActor.getSnapshot().context.schema.inlineObjects.map((obj) => obj.name).includes(element._type)), editor.isInline = (element) => slate.Editor.isEditor(element) ? !1 : editorActor.getSnapshot().context.schema.inlineObjects.map((obj) => obj.name).includes(element._type) && "__inline" in element && element.__inline === !0;
     const {
       normalizeNode
     } = editor;
@@ -4800,110 +4883,6 @@ function createWithUtils({
     })[0], editor;
   };
 }
-function getMarkState({
-  schema: schema2,
-  editor
-}) {
-  if (!editor.selection)
-    return;
-  const [block, blockPath] = getFocusBlock({
-    editor
-  }), [span, spanPath] = getFocusSpan({
-    editor
-  });
-  if (!block || !editor.isTextBlock(block) || !span)
-    return;
-  if (slate.Range.isExpanded(editor.selection)) {
-    const selection = editor.selection ? slateRangeToSelection({
-      schema: schema2,
-      editor,
-      range: editor.selection
-    }) : null, selectedSpans = selector_isSelectingEntireBlocks.getSelectedSpans({
-      blockIndexMap: editor.blockIndexMap,
-      context: {
-        value: editor.value,
-        selection,
-        schema: schema2,
-        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 = schema2.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
@@ -5247,10 +5226,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");
@@ -5259,7 +5238,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,
@@ -5293,7 +5272,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 {
@@ -5309,7 +5288,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 {
@@ -5337,10 +5316,10 @@ const addAnnotationOnCollapsedSelection = behaviors_index.defineBehavior({
   guard: ({
     snapshot
   }) => {
-    if (!selector_isSelectionExpanded.isSelectionCollapsed(snapshot))
+    if (!selector_getFocusSpan.isSelectionCollapsed(snapshot))
       return !1;
     const caretWordSelection = selector_isSelectingEntireBlocks.getCaretWordSelection(snapshot);
-    return !caretWordSelection || !selector_isSelectionExpanded.isSelectionExpanded({
+    return !caretWordSelection || !selector_getFocusSpan.isSelectionExpanded({
       context: {
         ...snapshot.context,
         selection: caretWordSelection
@@ -5566,7 +5545,7 @@ const defaultKeyboardShortcuts = {
     snapshot,
     event
   }) => {
-    if (!defaultKeyboardShortcuts.arrowDown.guard(event.originEvent) || !selector_isSelectionExpanded.isSelectionCollapsed(snapshot))
+    if (!defaultKeyboardShortcuts.arrowDown.guard(event.originEvent) || !selector_getFocusSpan.isSelectionCollapsed(snapshot))
       return !1;
     const focusBlockObject = selector_isSelectingEntireBlocks.getFocusBlockObject(snapshot), nextBlock = selector_isSelectingEntireBlocks.getNextBlock(snapshot);
     return focusBlockObject && !nextBlock;
@@ -5586,7 +5565,7 @@ const defaultKeyboardShortcuts = {
     snapshot,
     event
   }) => {
-    if (!defaultKeyboardShortcuts.arrowUp.guard(event.originEvent) || !selector_isSelectionExpanded.isSelectionCollapsed(snapshot))
+    if (!defaultKeyboardShortcuts.arrowUp.guard(event.originEvent) || !selector_getFocusSpan.isSelectionCollapsed(snapshot))
       return !1;
     const focusBlockObject = selector_isSelectingEntireBlocks.getFocusBlockObject(snapshot), previousBlock = selector_isSelectingEntireBlocks.getPreviousBlock(snapshot);
     return focusBlockObject && !previousBlock;
@@ -5606,7 +5585,7 @@ const defaultKeyboardShortcuts = {
     snapshot
   }) => {
     const focusBlockObject = selector_isSelectingEntireBlocks.getFocusBlockObject(snapshot);
-    return selector_isSelectionExpanded.isSelectionCollapsed(snapshot) && focusBlockObject !== void 0;
+    return selector_getFocusSpan.isSelectionCollapsed(snapshot) && focusBlockObject !== void 0;
   },
   actions: [({
     snapshot
@@ -5623,7 +5602,7 @@ const defaultKeyboardShortcuts = {
     snapshot,
     event
   }) => {
-    if (snapshot.context.readOnly || snapshot.context.selection && !selector_isSelectionExpanded.isSelectionCollapsed(snapshot))
+    if (snapshot.context.readOnly || snapshot.context.selection && !selector_getFocusSpan.isSelectionCollapsed(snapshot))
       return !1;
     const focusBlockObject = selector_isSelectingEntireBlocks.getFocusBlockObject({
       ...snapshot,
@@ -5660,7 +5639,7 @@ const defaultKeyboardShortcuts = {
     snapshot,
     event
   }) => {
-    if (snapshot.context.readOnly || snapshot.context.selection && !selector_isSelectionExpanded.isSelectionCollapsed(snapshot))
+    if (snapshot.context.readOnly || snapshot.context.selection && !selector_getFocusSpan.isSelectionCollapsed(snapshot))
       return !1;
     const focusBlockObject = selector_isSelectingEntireBlocks.getFocusBlockObject({
       ...snapshot,
@@ -5696,8 +5675,8 @@ const defaultKeyboardShortcuts = {
   guard: ({
     snapshot
   }) => {
-    const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot), selectionCollapsed = selector_isSelectionExpanded.isSelectionCollapsed(snapshot), previousBlock = selector_isSelectingEntireBlocks.getPreviousBlock(snapshot);
-    return !focusTextBlock || !selectionCollapsed || !previousBlock ? !1 : util_isEqualSelectionPoints.isEmptyTextBlock(snapshot.context, focusTextBlock.node) && !util_sliceBlocks.isTextBlock(snapshot.context, previousBlock.node) ? {
+    const focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot), selectionCollapsed = selector_getFocusSpan.isSelectionCollapsed(snapshot), previousBlock = selector_isSelectingEntireBlocks.getPreviousBlock(snapshot);
+    return !focusTextBlock || !selectionCollapsed || !previousBlock ? !1 : util_isSelectionCollapsed.isEmptyTextBlock(snapshot.context, focusTextBlock.node) && !util_sliceBlocks.isTextBlock(snapshot.context, previousBlock.node) ? {
       focusTextBlock,
       previousBlock
     } : !1;
@@ -5726,8 +5705,8 @@ const defaultKeyboardShortcuts = {
   guard: ({
     snapshot
   }) => {
-    const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot), selectionCollapsed = selector_isSelectionExpanded.isSelectionCollapsed(snapshot), nextBlock = selector_isSelectingEntireBlocks.getNextBlock(snapshot);
-    return !focusTextBlock || !selectionCollapsed || !nextBlock ? !1 : util_isEqualSelectionPoints.isEmptyTextBlock(snapshot.context, focusTextBlock.node) && !util_sliceBlocks.isTextBlock(snapshot.context, nextBlock.node) ? {
+    const focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot), selectionCollapsed = selector_getFocusSpan.isSelectionCollapsed(snapshot), nextBlock = selector_isSelectingEntireBlocks.getNextBlock(snapshot);
+    return !focusTextBlock || !selectionCollapsed || !nextBlock ? !1 : util_isSelectionCollapsed.isEmptyTextBlock(snapshot.context, focusTextBlock.node) && !util_sliceBlocks.isTextBlock(snapshot.context, nextBlock.node) ? {
       focusTextBlock,
       nextBlock
     } : !1;
@@ -6053,16 +6032,16 @@ const coreDndBehaviors = [
       dragOrigin,
       dropPosition,
       originEvent
-    }) => [...draggingEntireBlocks ? draggedBlocks.map((block) => behaviors_index.raise({
+    }) => [behaviors_index.raise({
+      type: "select",
+      at: dropPosition
+    }), ...draggingEntireBlocks ? draggedBlocks.map((block) => behaviors_index.raise({
       type: "delete.block",
       at: block.path
     })) : [behaviors_index.raise({
       type: "delete",
       at: dragOrigin.selection
     })], behaviors_index.raise({
-      type: "select",
-      at: dropPosition
-    }), behaviors_index.raise({
       type: "insert.blocks",
       blocks: event.data,
       placement: draggingEntireBlocks ? originEvent.position.block === "start" ? "before" : originEvent.position.block === "end" ? "after" : "auto" : "auto"
@@ -6073,7 +6052,7 @@ const coreDndBehaviors = [
   guard: ({
     snapshot
   }) => {
-    const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot), selectionCollapsed = selector_isSelectionExpanded.isSelectionCollapsed(snapshot);
+    const focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot), selectionCollapsed = selector_getFocusSpan.isSelectionCollapsed(snapshot);
     if (!snapshot.context.selection || !focusTextBlock || !selectionCollapsed)
       return !1;
     const atTheEndOfBlock = selector_isSelectingEntireBlocks.isAtTheEndOfBlock(focusTextBlock)(snapshot), focusListItem = focusTextBlock.node.listItem, focusLevel = focusTextBlock.node.level;
@@ -6108,10 +6087,10 @@ const coreDndBehaviors = [
   guard: ({
     snapshot
   }) => {
-    const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot), selectionCollapsed = selector_isSelectionExpanded.isSelectionCollapsed(snapshot);
+    const focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot), selectionCollapsed = selector_getFocusSpan.isSelectionCollapsed(snapshot);
     if (!snapshot.context.selection || !focusTextBlock || !selectionCollapsed)
       return !1;
-    const focusSpan = selector_isSelectionExpanded.getFocusSpan(snapshot), focusDecorators = focusSpan?.node.marks?.filter((mark) => snapshot.context.schema.decorators.some((decorator) => decorator.name === mark) ?? []), focusAnnotations = focusSpan?.node.marks?.filter((mark) => !snapshot.context.schema.decorators.some((decorator) => decorator.name === mark)) ?? [], focusListItem = focusTextBlock.node.listItem, focusLevel = focusTextBlock.node.level;
+    const focusSpan = selector_getFocusSpan.getFocusSpan(snapshot), focusDecorators = focusSpan?.node.marks?.filter((mark) => snapshot.context.schema.decorators.some((decorator) => decorator.name === mark) ?? []), focusAnnotations = focusSpan?.node.marks?.filter((mark) => !snapshot.context.schema.decorators.some((decorator) => decorator.name === mark)) ?? [], focusListItem = focusTextBlock.node.listItem, focusLevel = focusTextBlock.node.level;
     return selector_isSelectingEntireBlocks.isAtTheStartOfBlock(focusTextBlock)(snapshot) ? {
       focusAnnotations,
       focusDecorators,
@@ -6147,7 +6126,7 @@ const coreDndBehaviors = [
   guard: ({
     snapshot
   }) => {
-    if (!snapshot.context.selection || !selector_isSelectionExpanded.isSelectionExpanded(snapshot))
+    if (!snapshot.context.selection || !selector_getFocusSpan.isSelectionExpanded(snapshot))
       return !1;
     const firstBlock = selector_isSelectingEntireBlocks.getFirstBlock(snapshot), lastBlock = selector_isSelectingEntireBlocks.getLastBlock(snapshot);
     if (!firstBlock || !lastBlock)
@@ -6155,11 +6134,11 @@ const coreDndBehaviors = [
     const firstBlockStartPoint = util_sliceBlocks.getBlockStartPoint({
       context: snapshot.context,
       block: firstBlock
-    }), selectionStartPoint = util_sliceBlocks.getSelectionStartPoint(snapshot.context.selection), lastBlockEndPoint = util_isEqualSelectionPoints.getBlockEndPoint({
+    }), selectionStartPoint = util_sliceBlocks.getSelectionStartPoint(snapshot.context.selection), lastBlockEndPoint = util_isSelectionCollapsed.getBlockEndPoint({
       context: snapshot.context,
       block: lastBlock
     }), selectionEndPoint = util_sliceBlocks.getSelectionEndPoint(snapshot.context.selection);
-    return util_isEqualSelectionPoints.isEqualSelectionPoints(firstBlockStartPoint, selectionStartPoint) && util_isEqualSelectionPoints.isEqualSelectionPoints(lastBlockEndPoint, selectionEndPoint) ? {
+    return util_isSelectionCollapsed.isEqualSelectionPoints(firstBlockStartPoint, selectionStartPoint) && util_isSelectionCollapsed.isEqualSelectionPoints(lastBlockEndPoint, selectionEndPoint) ? {
       selection: snapshot.context.selection
     } : !1;
   },
@@ -6174,7 +6153,7 @@ const coreDndBehaviors = [
   guard: ({
     snapshot
   }) => {
-    if (!snapshot.context.selection || !selector_isSelectionExpanded.isSelectionExpanded(snapshot))
+    if (!snapshot.context.selection || !selector_getFocusSpan.isSelectionExpanded(snapshot))
       return !1;
     const selectedBlocks = selector_isSelectingEntireBlocks.getSelectedBlocks(snapshot), selectionStartBlock = selector_isSelectingEntireBlocks.getSelectionStartBlock(snapshot), selectionEndBlock = selector_isSelectingEntireBlocks.getSelectionEndBlock(snapshot);
     if (!selectionStartBlock || !selectionEndBlock)
@@ -6182,11 +6161,11 @@ const coreDndBehaviors = [
     const startBlockStartPoint = util_sliceBlocks.getBlockStartPoint({
       context: snapshot.context,
       block: selectionStartBlock
-    }), selectionStartPoint = util_sliceBlocks.getSelectionStartPoint(snapshot.context.selection), endBlockEndPoint = util_isEqualSelectionPoints.getBlockEndPoint({
+    }), selectionStartPoint = util_sliceBlocks.getSelectionStartPoint(snapshot.context.selection), endBlockEndPoint = util_isSelectionCollapsed.getBlockEndPoint({
       context: snapshot.context,
       block: selectionEndBlock
     }), selectionEndPoint = util_sliceBlocks.getSelectionEndPoint(snapshot.context.selection);
-    return util_isEqualSelectionPoints.isEqualSelectionPoints(selectionStartPoint, startBlockStartPoint) && util_isEqualSelectionPoints.isEqualSelectionPoints(selectionEndPoint, endBlockEndPoint) ? {
+    return util_isSelectionCollapsed.isEqualSelectionPoints(selectionStartPoint, startBlockStartPoint) && util_isSelectionCollapsed.isEqualSelectionPoints(selectionEndPoint, endBlockEndPoint) ? {
       selectedBlocks
     } : !1;
   },
@@ -6215,7 +6194,7 @@ const coreDndBehaviors = [
   guard: ({
     snapshot
   }) => {
-    const selectionCollapsed = selector_isSelectionExpanded.isSelectionCollapsed(snapshot), focusInlineObject = selector_isSelectingEntireBlocks.getFocusInlineObject(snapshot);
+    const selectionCollapsed = selector_getFocusSpan.isSelectionCollapsed(snapshot), focusInlineObject = selector_isSelectingEntireBlocks.getFocusInlineObject(snapshot);
     return selectionCollapsed && focusInlineObject;
   },
   actions: [() => [behaviors_index.raise({
@@ -6235,7 +6214,7 @@ const coreDndBehaviors = [
   guard: ({
     snapshot
   }) => {
-    const selectionCollapsed = selector_isSelectionExpanded.isSelectionCollapsed(snapshot), focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot), focusSpan = selector_isSelectionExpanded.getFocusSpan(snapshot);
+    const selectionCollapsed = selector_getFocusSpan.isSelectionCollapsed(snapshot), focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot), focusSpan = selector_getFocusSpan.getFocusSpan(snapshot);
     return !selectionCollapsed || !focusTextBlock || !focusSpan ? !1 : focusTextBlock.node.children[0]._key === focusSpan.node._key && snapshot.context.selection?.focus.offset === 0 && focusTextBlock.node.level === 1 ? {
       focusTextBlock
     } : !1;
@@ -6252,7 +6231,7 @@ const coreDndBehaviors = [
   guard: ({
     snapshot
   }) => {
-    const selectionCollapsed = selector_isSelectionExpanded.isSelectionCollapsed(snapshot), focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot), focusSpan = selector_isSelectionExpanded.getFocusSpan(snapshot);
+    const selectionCollapsed = selector_getFocusSpan.isSelectionCollapsed(snapshot), focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot), focusSpan = selector_getFocusSpan.getFocusSpan(snapshot);
     return !selectionCollapsed || !focusTextBlock || !focusSpan ? !1 : focusTextBlock.node.children[0]._key === focusSpan.node._key && snapshot.context.selection?.focus.offset === 0 && focusTextBlock.node.level !== void 0 && focusTextBlock.node.level > 1 ? {
       focusTextBlock,
       level: focusTextBlock.node.level - 1
@@ -6273,8 +6252,8 @@ const coreDndBehaviors = [
   guard: ({
     snapshot
   }) => {
-    const selectionCollapsed = selector_isSelectionExpanded.isSelectionCollapsed(snapshot), focusListBlock = selector_isSelectingEntireBlocks.getFocusListBlock(snapshot);
-    return !selectionCollapsed || !focusListBlock || !util_isEqualSelectionPoints.isEmptyTextBlock(snapshot.context, focusListBlock.node) ? !1 : {
+    const selectionCollapsed = selector_getFocusSpan.isSelectionCollapsed(snapshot), focusListBlock = selector_isSelectingEntireBlocks.getFocusListBlock(snapshot);
+    return !selectionCollapsed || !focusListBlock || !util_isSelectionCollapsed.isEmptyTextBlock(snapshot.context, focusListBlock.node) ? !1 : {
       focusListBlock
     };
   },
@@ -6350,7 +6329,7 @@ const coreDndBehaviors = [
     snapshot,
     event
   }) => {
-    const blockKey = event.at[0]._key, markDefKey = event.at[2]._key, block = selector_isSelectionExpanded.getFocusTextBlock({
+    const blockKey = event.at[0]._key, markDefKey = event.at[2]._key, block = selector_getFocusSpan.getFocusTextBlock({
       ...snapshot,
       context: {
         ...snapshot.context,
@@ -6510,7 +6489,7 @@ const coreDndBehaviors = [
     snapshot,
     event
   }) => {
-    const focusChild = selector_isSelectionExpanded.getFocusChild({
+    const focusChild = selector_getFocusSpan.getFocusChild({
       ...snapshot,
       context: {
         ...snapshot.context,
@@ -6526,7 +6505,7 @@ const coreDndBehaviors = [
         }
       }
     });
-    return focusChild ? util_sliceBlocks.isSpan$1(snapshot.context, focusChild.node) ? {
+    return focusChild ? util_sliceBlocks.isSpan(snapshot.context, focusChild.node) ? {
       selection: {
         anchor: {
           path: event.at,
@@ -6620,7 +6599,7 @@ const coreDndBehaviors = [
   }) => {
     if (event.placement !== "auto")
       return !1;
-    const focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot);
+    const focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot);
     return focusTextBlock ? {
       focusTextBlock
     } : !1;
@@ -6635,7 +6614,7 @@ const coreDndBehaviors = [
     block: event.blocks[0],
     placement: "auto",
     select: event.select ?? "end"
-  })] : util_isEqualSelectionPoints.isEmptyTextBlock(snapshot.context, focusTextBlock.node) ? event.blocks.map((block, index) => behaviors_index.raise({
+  })] : util_isSelectionCollapsed.isEmptyTextBlock(snapshot.context, focusTextBlock.node) ? event.blocks.map((block, index) => behaviors_index.raise({
     type: "insert.block",
     block,
     placement: index === 0 ? "auto" : "after",
@@ -6699,7 +6678,7 @@ const coreDndBehaviors = [
     guard: ({
       snapshot,
       event
-    }) => defaultKeyboardShortcuts.break.guard(event.originEvent) && selector_isSelectionExpanded.isSelectionCollapsed(snapshot) && selector_isSelectingEntireBlocks.getFocusInlineObject(snapshot),
+    }) => defaultKeyboardShortcuts.break.guard(event.originEvent) && selector_getFocusSpan.isSelectionCollapsed(snapshot) && selector_isSelectingEntireBlocks.getFocusInlineObject(snapshot),
     actions: [() => [behaviors_index.raise({
       type: "insert.break"
     })]]
@@ -6878,7 +6857,7 @@ const coreDndBehaviors = [
     const previousBlock = selector_isSelectingEntireBlocks.getPreviousBlock(snapshot);
     if (!previousBlock)
       return !1;
-    const point = event.select === "end" ? util_isEqualSelectionPoints.getBlockEndPoint({
+    const point = event.select === "end" ? util_isSelectionCollapsed.getBlockEndPoint({
       context: snapshot.context,
       block: previousBlock
     }) : util_sliceBlocks.getBlockStartPoint({
@@ -6907,7 +6886,7 @@ const coreDndBehaviors = [
     const nextBlock = selector_isSelectingEntireBlocks.getNextBlock(snapshot);
     if (!nextBlock)
       return !1;
-    const point = event.select === "end" ? util_isEqualSelectionPoints.getBlockEndPoint({
+    const point = event.select === "end" ? util_isSelectionCollapsed.getBlockEndPoint({
       context: snapshot.context,
       block: nextBlock
     }) : util_sliceBlocks.getBlockStartPoint({
@@ -6935,7 +6914,7 @@ const coreDndBehaviors = [
     on: "split",
     guard: ({
       snapshot
-    }) => selector_isSelectionExpanded.isSelectionCollapsed(snapshot) && selector_isSelectingEntireBlocks.getFocusInlineObject(snapshot),
+    }) => selector_getFocusSpan.isSelectionCollapsed(snapshot) && selector_isSelectingEntireBlocks.getFocusInlineObject(snapshot),
     actions: []
   }),
   /**
@@ -6945,7 +6924,7 @@ const coreDndBehaviors = [
     on: "split",
     guard: ({
       snapshot
-    }) => selector_isSelectionExpanded.isSelectionCollapsed(snapshot) && selector_isSelectingEntireBlocks.getFocusBlockObject(snapshot),
+    }) => selector_getFocusSpan.isSelectionCollapsed(snapshot) && selector_isSelectingEntireBlocks.getFocusBlockObject(snapshot),
     actions: []
   }),
   behaviors_index.defineBehavior({
@@ -6954,7 +6933,7 @@ const coreDndBehaviors = [
       snapshot
     }) => {
       const selection = snapshot.context.selection;
-      if (!selection || util_sliceTextBlock.isSelectionCollapsed(selection))
+      if (!selection || util_isSelectionCollapsed.isSelectionCollapsed(selection))
         return !1;
       const selectionStartBlock = selector_isSelectingEntireBlocks.getSelectionStartBlock(snapshot), selectionEndBlock = selector_isSelectingEntireBlocks.getSelectionEndBlock(snapshot);
       return !selectionStartBlock || !selectionEndBlock ? !1 : !util_sliceBlocks.isTextBlock(snapshot.context, selectionStartBlock.node) && util_sliceBlocks.isTextBlock(snapshot.context, selectionEndBlock.node) ? {
@@ -6974,7 +6953,7 @@ const coreDndBehaviors = [
       snapshot
     }) => {
       const selection = snapshot.context.selection;
-      return !selection || util_sliceTextBlock.isSelectionCollapsed(selection) ? !1 : {
+      return !selection || util_isSelectionCollapsed.isSelectionCollapsed(selection) ? !1 : {
         selection
       };
     },
@@ -6993,12 +6972,12 @@ const coreDndBehaviors = [
       snapshot
     }) => {
       const selection = snapshot.context.selection;
-      if (!selection || !util_sliceTextBlock.isSelectionCollapsed(selection))
+      if (!selection || !util_isSelectionCollapsed.isSelectionCollapsed(selection))
         return !1;
-      const selectionStartPoint = util_sliceBlocks.getSelectionStartPoint(selection), focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot);
+      const selectionStartPoint = util_sliceBlocks.getSelectionStartPoint(selection), focusTextBlock = selector_getFocusSpan.getFocusTextBlock(snapshot);
       if (!focusTextBlock)
         return !1;
-      const blockEndPoint = util_isEqualSelectionPoints.getBlockEndPoint({
+      const blockEndPoint = util_isSelectionCollapsed.getBlockEndPoint({
         context: snapshot.context,
         block: focusTextBlock
       }), newTextBlockSelection = {
@@ -7026,7 +7005,7 @@ const coreDndBehaviors = [
     actions: [(_, {
       newTextBlock,
       newTextBlockSelection
-    }) => util_sliceTextBlock.isSelectionCollapsed(newTextBlockSelection) ? [behaviors_index.raise({
+    }) => util_isSelectionCollapsed.isSelectionCollapsed(newTextBlockSelection) ? [behaviors_index.raise({
       type: "insert.block",
       block: newTextBlock,
       placement: "after",
@@ -7163,7 +7142,7 @@ const coreDndBehaviors = [
     guard: ({
       snapshot
     }) => {
-      const focusSpan = selector_isSelectionExpanded.getFocusSpan(snapshot), selectionCollapsed = selector_isSelectionExpanded.isSelectionCollapsed(snapshot);
+      const focusSpan = selector_getFocusSpan.getFocusSpan(snapshot), selectionCollapsed = selector_getFocusSpan.isSelectionCollapsed(snapshot);
       return focusSpan && selectionCollapsed;
     },
     actions: []
@@ -7182,7 +7161,7 @@ const coreDndBehaviors = [
     guard: ({
       snapshot
     }) => {
-      const focusSpan = selector_isSelectionExpanded.getFocusSpan(snapshot), selectionCollapsed = selector_isSelectionExpanded.isSelectionCollapsed(snapshot);
+      const focusSpan = selector_getFocusSpan.getFocusSpan(snapshot), selectionCollapsed = selector_getFocusSpan.isSelectionCollapsed(snapshot);
       return focusSpan && selectionCollapsed;
     },
     actions: []
@@ -7248,8 +7227,8 @@ const coreDndBehaviors = [
       snapshot,
       event
     }) => {
-      if (selector_isSelectionExpanded.getFocusTextBlock(snapshot) && event.mimeType === "text/plain" && event.originEvent.type === "clipboard.paste") {
-        const activeDecorators = snapshot.beta.activeDecorators;
+      if (selector_getFocusSpan.getFocusTextBlock(snapshot) && event.mimeType === "text/plain" && event.originEvent.type === "clipboard.paste") {
+        const activeDecorators = selector_isSelectingEntireBlocks.getActiveDecorators(snapshot);
         return {
           activeAnnotations: selector_isSelectingEntireBlocks.getActiveAnnotations(snapshot),
           activeDecorators,
@@ -7315,7 +7294,7 @@ const coreDndBehaviors = [
     on: "clipboard.paste",
     guard: ({
       snapshot
-    }) => snapshot.context.selection && selector_isSelectionExpanded.isSelectionExpanded(snapshot) ? {
+    }) => snapshot.context.selection && selector_getFocusSpan.isSelectionExpanded(snapshot) ? {
       selection: snapshot.context.selection
     } : !1,
     actions: [({
@@ -7625,17 +7604,7 @@ function createEditorSnapshot({
   return {
     blockIndexMap: editor.blockIndexMap,
     context,
-    beta: {
-      activeAnnotations: getActiveAnnotations({
-        markState: editor.markState,
-        schema: schema2
-      }),
-      activeDecorators: getActiveDecorators({
-        decoratorState: editor.decoratorState,
-        markState: editor.markState,
-        schema: schema2
-      })
-    }
+    decoratorState: editor.decoratorState
   };
 }
 const debug$7 = debugWithName("editor machine"), editorMachine = xstate.setup({
@@ -8601,16 +8570,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 selector_isSelectingEntireBlocks.getActiveDecorators(snapshot).includes(mark);
+    },
+    marks: () => {
+      const snapshot = getEditorSnapshot({
+        editorActorSnapshot: editorActor.getSnapshot(),
+        slateEditorInstance: editor
+      }), activeAnnotations = selector_isSelectingEntireBlocks.getActiveAnnotationsMarks(snapshot), activeDecorators = selector_isSelectingEntireBlocks.getActiveDecorators(snapshot);
+      return [...activeAnnotations, ...activeDecorators];
     },
     undo: () => {
       editorActor.send({
@@ -8631,7 +8603,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 ? slate.Transforms.select(editor, slateSelection) : slate.Transforms.deselect(editor), editor.onChange();
     },
     focusBlock: () => {
@@ -8737,15 +8716,22 @@ function createEditableAPI(editor, editorActor) {
     isVoid: (element) => ![types2.block.name, types2.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] = slate.Editor.node(editor, slatePath.focus.path.slice(0, 1));
         if (block && blockPath && typeof block._key == "string") {
@@ -8827,7 +8813,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) {
@@ -8888,7 +8881,21 @@ function createEditableAPI(editor, editorActor) {
     },
     getFragment: () => fromSlateValue(editor.getFragment(), types2.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 slate.Range.isRange(rangeA) && slate.Range.isRange(rangeB) && slate.Range.includes(rangeA, rangeB);
     }
   };
@@ -10856,7 +10863,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 (!slate.Range.isRange(slateRange)) {
           rangeDecoration.onMoved?.({
             newSelection: null,
@@ -10880,7 +10894,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 (!slate.Range.isRange(slateRange)) {
           rangeDecoration.onMoved?.({
             newSelection: null,
@@ -10904,7 +10925,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 (!slate.Range.isRange(slateRange)) {
           decoratedRange.rangeDecoration.onMoved?.({
             newSelection: null,
@@ -11158,7 +11186,14 @@ const debug = debugWithName("component:Editable"), PortableTextEditable = React.
       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 && (slate.Transforms.select(slateEditor, slateRange), slateEditor.operations.some((o) => o.type === "set_selection") || editorActor.send({
           type: "update selection",
           selection: normalizedSelection