@portabletext/editor 1.50.4 → 1.50.6

package/lib/index.cjs

@@ -220,6 +220,34 @@ function getFocusBlock({
     return [void 0, void 0];
   }
 }
+function getFocusSpan({
+  editor
+}) {
+  if (!editor.selection)
+    return [void 0, void 0];
+  try {
+    const [node, path] = slate.Editor.node(editor, editor.selection.focus.path);
+    if (editor.isTextSpan(node))
+      return [node, path];
+  } catch {
+    return [void 0, void 0];
+  }
+  return [void 0, void 0];
+}
+function getSelectedSpans({
+  editor
+}) {
+  if (!editor.selection)
+    return [];
+  try {
+    return Array.from(slate.Editor.nodes(editor, {
+      at: editor.selection,
+      match: (node) => editor.isTextSpan(node)
+    }));
+  } catch {
+    return [];
+  }
+}
 function getSelectionStartBlock({
   editor
 }) {
@@ -288,6 +316,8 @@ function getPointChild({
 function getFirstBlock({
   editor
 }) {
+  if (editor.children.length === 0)
+    return [void 0, void 0];
   const firstBlockPath = slate.Editor.start(editor, []).path.at(0);
   try {
     return firstBlockPath !== void 0 ? slate.Editor.node(editor, [firstBlockPath]) ?? [void 0, void 0] : [void 0, void 0];
@@ -298,6 +328,8 @@ function getFirstBlock({
 function getLastBlock({
   editor
 }) {
+  if (editor.children.length === 0)
+    return [void 0, void 0];
   const lastBlockPath = slate.Editor.end(editor, []).path.at(0);
   try {
     return lastBlockPath !== void 0 ? slate.Editor.node(editor, [lastBlockPath]) ?? [void 0, void 0] : [void 0, void 0];
@@ -1362,13 +1394,54 @@ 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
 }) => {
-  operation.editor.marks ? slate.Transforms.insertNodes(operation.editor, {
+  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({
+    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 (markStateDecorators.length === activeDecorators.length && markStateDecorators.every((mark) => activeDecorators.includes(mark))) {
+      slate.Transforms.insertText(operation.editor, operation.text);
+      return;
+    }
+  }
+  slate.Transforms.insertNodes(operation.editor, {
+    _type: focusSpan._type,
+    _key: context.keyGenerator(),
     text: operation.text,
-    ...operation.editor.marks
-  }) : slate.Transforms.insertText(operation.editor, operation.text), operation.editor.marks = null;
+    marks: [...activeDecorators, ...activeAnnotations]
+  }), operation.editor.decoratorState = {};
 };
 function isPortableTextSpan(node) {
   return node._type === "span" && "text" in node && typeof node.text == "string" && (typeof node.marks > "u" || Array.isArray(node.marks) && node.marks.every((mark) => typeof mark == "string"));
@@ -1441,6 +1514,50 @@ function isRedoing(editor) {
 function setIsRedoing(editor, isRedoing2) {
   IS_REDOING.set(editor, isRedoing2);
 }
+function defaultCompare(a, b) {
+  return a === b;
+}
+function useEditorSelector(editor, selector, t0) {
+  const $ = reactCompilerRuntime.c(3), compare = t0 === void 0 ? defaultCompare : t0;
+  let t1;
+  return $[0] !== editor || $[1] !== selector ? (t1 = (editorActorSnapshot) => {
+    const snapshot = getEditorSnapshot({
+      editorActorSnapshot,
+      slateEditorInstance: editor._internal.slateEditor.instance
+    });
+    return selector(snapshot);
+  }, $[0] = editor, $[1] = selector, $[2] = t1) : t1 = $[2], react.useSelector(editor._internal.editorActor, t1, compare);
+}
+function getEditorSnapshot({
+  editorActorSnapshot,
+  slateEditorInstance
+}) {
+  return {
+    context: {
+      converters: [...editorActorSnapshot.context.converters],
+      keyGenerator: editorActorSnapshot.context.keyGenerator,
+      readOnly: editorActorSnapshot.matches({
+        "edit mode": "read only"
+      }),
+      schema: editorActorSnapshot.context.schema,
+      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
+      }),
+      hasTag: (tag) => editorActorSnapshot.hasTag(tag),
+      internalDrag: editorActorSnapshot.context.internalDrag
+    }
+  };
+}
 const debug$h = debugWithName("plugin:withPortableTextMarkModel");
 function createWithPortableTextMarkModel(editorActor) {
   return function(editor) {
@@ -1585,7 +1702,7 @@ function createWithPortableTextMarkModel(editorActor) {
         apply2(op);
         return;
       }
-      if (op.type === "set_selection" && slate.Editor.marks(editor) && op.properties && op.newProperties && op.properties.anchor && op.properties.focus && op.newProperties.anchor && op.newProperties.focus) {
+      if (op.type === "set_selection" && op.properties && op.newProperties && op.properties.anchor && op.properties.focus && op.newProperties.anchor && op.newProperties.focus) {
         const previousSelectionIsCollapsed = slate.Range.isCollapsed({
           anchor: op.properties.anchor,
           focus: op.properties.focus
@@ -1605,8 +1722,7 @@ function createWithPortableTextMarkModel(editorActor) {
             match: (n) => editor.isTextSpan(n),
             voids: !1
           }))[0]?.[0], movedToNextSpan = focusSpan && newFocusSpan && op.newProperties.focus.path[0] === op.properties.focus.path[0] && op.newProperties.focus.path[1] === op.properties.focus.path[1] + 1 && focusSpan.text.length === op.properties.focus.offset && op.newProperties.focus.offset === 0, movedToPreviousSpan = focusSpan && newFocusSpan && op.newProperties.focus.path[0] === op.properties.focus.path[0] && op.newProperties.focus.path[1] === op.properties.focus.path[1] - 1 && op.properties.focus.offset === 0 && newFocusSpan.text.length === op.newProperties.focus.offset;
-          if (movedToNextSpan || movedToPreviousSpan)
-            return;
+          !movedToNextSpan && !movedToPreviousSpan && (editor.decoratorState = {});
         }
       }
       if (op.type === "insert_node") {
@@ -1654,88 +1770,21 @@ function createWithPortableTextMarkModel(editorActor) {
         }
       }
       if (op.type === "insert_text") {
-        const {
-          selection
-        } = editor, collapsedSelection = selection ? slate.Range.isCollapsed(selection) : !1;
-        if (selection && collapsedSelection) {
-          const [_block, blockPath] = slate.Editor.node(editor, selection, {
-            depth: 1
-          }), [span, spanPath] = Array.from(slate.Editor.nodes(editor, {
-            mode: "lowest",
-            at: selection.focus,
-            match: (n) => editor.isTextSpan(n),
-            voids: !1
-          }))[0] ?? [void 0, void 0], marks = span.marks ?? [], marksWithoutAnnotations = marks.filter((mark) => decorators.includes(mark)), spanHasAnnotations = marks.length > marksWithoutAnnotations.length, spanIsEmpty = span.text.length === 0, atTheBeginningOfSpan = selection.anchor.offset === 0, atTheEndOfSpan = 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) {
-                slate.Transforms.insertNodes(editor, {
-                  _type: "span",
-                  _key: editorActor.getSnapshot().context.keyGenerator(),
-                  text: op.text,
-                  marks: previousSpan?.marks ?? []
-                });
-                return;
-              } else if (previousSpanHasSameAnnotations) {
-                slate.Transforms.insertNodes(editor, {
-                  _type: "span",
-                  _key: editorActor.getSnapshot().context.keyGenerator(),
-                  text: op.text,
-                  marks: previousSpan?.marks ?? []
-                });
-                return;
-              } else if (previousSpanHasSameAnnotation) {
-                apply2(op);
-                return;
-              } else if (!previousSpan) {
-                slate.Transforms.insertNodes(editor, {
-                  _type: "span",
-                  _key: editorActor.getSnapshot().context.keyGenerator(),
-                  text: op.text,
-                  marks: []
-                });
-                return;
-              }
-            }
-            if (atTheEndOfSpan) {
-              if (nextSpan && nextSpanSharesSomeAnnotations && nextSpanAnnotations.length < spanAnnotations.length || !nextSpanSharesSomeAnnotations) {
-                slate.Transforms.insertNodes(editor, {
-                  _type: "span",
-                  _key: editorActor.getSnapshot().context.keyGenerator(),
-                  text: op.text,
-                  marks: nextSpan?.marks ?? []
-                });
-                return;
-              }
-              if (!nextSpan) {
-                slate.Transforms.insertNodes(editor, {
-                  _type: "span",
-                  _key: editorActor.getSnapshot().context.keyGenerator(),
-                  text: op.text,
-                  marks: []
-                });
-                return;
-              }
-            }
-          }
-          if (atTheBeginningOfSpan && !spanIsEmpty && previousSpan) {
-            slate.Transforms.insertNodes(editor, {
-              _type: "span",
-              _key: editorActor.getSnapshot().context.keyGenerator(),
-              text: op.text,
-              marks: previousSpanHasAnnotations ? [] : (previousSpan.marks ?? []).filter((mark) => decorators.includes(mark))
-            });
-            return;
-          }
+        if (!editor.markState) {
+          apply2(op);
+          return;
+        }
+        if (editor.markState.state === "unchanged") {
+          apply2(op);
+          return;
         }
+        slate.Transforms.insertNodes(editor, {
+          _type: "span",
+          _key: editorActor.getSnapshot().context.keyGenerator(),
+          text: op.text,
+          marks: editor.markState.marks
+        });
+        return;
       }
       if (op.type === "remove_text") {
         const {
@@ -1764,12 +1813,13 @@ function createWithPortableTextMarkModel(editorActor) {
               spanPath
             }), previousSpanHasSameAnnotation = previousSpan ? previousSpan.marks?.some((mark) => !decorators.includes(mark) && marks.includes(mark)) : !1, nextSpanHasSameAnnotation = nextSpan ? nextSpan.marks?.some((mark) => !decorators.includes(mark) && marks.includes(mark)) : !1;
             if (spanHasAnnotations && deletingAllText && !previousSpanHasSameAnnotation && !nextSpanHasSameAnnotation) {
-              const marksWithoutAnnotationMarks = ({
-                ...slate.Editor.marks(editor) || {}
-              }.marks || []).filter((mark) => decorators.includes(mark));
+              const snapshot = getEditorSnapshot({
+                editorActorSnapshot: editorActor.getSnapshot(),
+                slateEditorInstance: editor
+              });
               slate.Editor.withoutNormalizing(editor, () => {
                 apply2(op), slate.Transforms.setNodes(editor, {
-                  marks: marksWithoutAnnotationMarks
+                  marks: snapshot.beta.activeDecorators
                 }, {
                   at: op.path
                 });
@@ -1832,18 +1882,8 @@ const removeDecoratorOperationImplementation = ({
           at: blockPath,
           match: (node) => editor.isTextSpan(node)
         });
-      } else {
-        const existingMarks = {
-          ...slate.Editor.marks(editor) || {}
-        }.marks || [], marks = {
-          ...slate.Editor.marks(editor) || {},
-          marks: existingMarks.filter((eMark) => eMark !== mark)
-        };
-        editor.marks = {
-          marks: marks.marks,
-          _type: "span"
-        };
-      }
+      } else
+        editor.decoratorState[mark] = !1;
     }
     if (editor.selection) {
       const selection2 = editor.selection;
@@ -1853,23 +1893,6 @@ const removeDecoratorOperationImplementation = ({
     }
   }
 };
-function isDecoratorActive({
-  editor,
-  decorator
-}) {
-  if (!editor.selection)
-    return !1;
-  const selectedTextNodes = Array.from(slate.Editor.nodes(editor, {
-    match: slate.Text.isText,
-    at: editor.selection
-  }));
-  return selectedTextNodes.length === 0 ? !1 : slate.Range.isExpanded(editor.selection) ? selectedTextNodes.every((n) => {
-    const [node] = n;
-    return node.marks?.includes(decorator);
-  }) : ({
-    ...slate.Editor.marks(editor) || {}
-  }.marks || []).includes(decorator);
-}
 function cloneDiff(diff2) {
   const [type, patch] = diff2;
   return [type, patch];
@@ -3089,7 +3112,6 @@ const addAnnotationOperationImplementation = ({
       backward: editorSelection?.backward
     }), trimmedSelection = selector_isSelectingEntireBlocks.getTrimmedSelection({
       context: {
-        activeDecorators: [],
         converters: [],
         keyGenerator: context.keyGenerator,
         readOnly: !1,
@@ -3135,15 +3157,8 @@ const addAnnotationOperationImplementation = ({
         at: blockPath,
         match: (node) => editor.isTextSpan(node)
       });
-    } else {
-      const existingMarks = {
-        ...slate.Editor.marks(editor) || {}
-      }.marks || [], marks = {
-        ...slate.Editor.marks(editor) || {},
-        marks: [...existingMarks, mark]
-      };
-      editor.marks = marks;
-    }
+    } else
+      editor.decoratorState[mark] = !0;
   }
   if (editor.selection) {
     const selection2 = editor.selection;
@@ -3676,7 +3691,6 @@ function createWithEventListeners(editorActor) {
     if (editorActor.getSnapshot().context.maxBlocks !== void 0)
       return editor;
     const {
-      insertText,
       select
     } = editor;
     return editor.deleteBackward = (unit) => {
@@ -3754,9 +3768,18 @@ function createWithEventListeners(editorActor) {
         },
         editor
       });
-    }, editor.insertText = (text, options) => {
+    }, editor.insertText = (text) => {
       if (isApplyingBehaviorOperations(editor)) {
-        insertText(text, options);
+        insertTextOperationImplementation({
+          context: {
+            keyGenerator: editorActor.getSnapshot().context.keyGenerator,
+            schema: editorActor.getSnapshot().context.schema
+          },
+          operation: {
+            text,
+            editor
+          }
+        });
         return;
       }
       editorActor.send({
@@ -4730,6 +4753,98 @@ 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 selectedSpans = getSelectedSpans({
+      editor
+    });
+    let index = 0, marks2 = [];
+    for (const [span2] of selectedSpans)
+      index === 0 ? marks2 = span2.marks ?? [] : (span2.marks?.length === 0 || (span2.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 isEditorNode(node) {
   return typeof node == "object" && node !== null ? !("_type" in node) && "children" in node && Array.isArray(node.children) : !1;
 }
@@ -5007,10 +5122,7 @@ function pluginUpdateValue(context, editor) {
       apply2(operation);
       return;
     }
-    editor.value = applyOperationToPortableText({
-      keyGenerator: context.keyGenerator,
-      schema: context.schema
-    }, editor.value, operation), apply2(operation);
+    editor.value = applyOperationToPortableText(context, editor.value, operation), apply2(operation);
   }, editor;
 }
 const withPlugins = (editor, options) => {
@@ -5029,7 +5141,7 @@ const withPlugins = (editor, options) => {
   }), withPortableTextMarkModel = createWithPortableTextMarkModel(editorActor), withPortableTextBlockStyle = createWithPortableTextBlockStyle(editorActor), withPlaceholderBlock = createWithPlaceholderBlock(editorActor), withUtils = createWithUtils({
     editorActor
   }), withPortableTextSelections = createWithPortableTextSelections(editorActor);
-  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPortableTextBlockStyle(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(withPortableTextSelections(pluginUpdateValue(editorActor.getSnapshot().context, e))))))))))));
+  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPortableTextBlockStyle(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(withPortableTextSelections(pluginUpdateValue(editorActor.getSnapshot().context, pluginUpdateMarkState(editorActor.getSnapshot().context, e)))))))))))));
 }, debug$a = debugWithName("setup");
 function createSlateEditor(config) {
   debug$a("Creating new Slate editor instance");
@@ -5038,7 +5150,7 @@ function createSlateEditor(config) {
     relayActor: config.relayActor,
     subscriptions: config.subscriptions
   });
-  KEY_TO_VALUE_ELEMENT.set(instance, {}), KEY_TO_SLATE_ELEMENT.set(instance, {}), instance.value = [createPlaceholderBlock(config.editorActor.getSnapshot().context)];
+  KEY_TO_VALUE_ELEMENT.set(instance, {}), KEY_TO_SLATE_ELEMENT.set(instance, {}), instance.decoratorState = {}, instance.markState = void 0, instance.value = [createPlaceholderBlock(config.editorActor.getSnapshot().context)];
   const initialValue = toSlateValue(instance.value, {
     schemaTypes: config.editorActor.getSnapshot().context.schema
   });
@@ -5789,7 +5901,6 @@ const arrowDownOnLonelyBlockObject = behaviors_index.defineBehavior({
         converters: [],
         schema: snapshot.context.schema,
         keyGenerator: snapshot.context.keyGenerator,
-        activeDecorators: [],
         readOnly: !1,
         value: snapshot.context.value,
         selection
@@ -6485,7 +6596,7 @@ const arrowDownOnLonelyBlockObject = behaviors_index.defineBehavior({
       event
     }) => {
       if (selector_isSelectionExpanded.getFocusTextBlock(snapshot) && event.mimeType === "text/plain" && event.originEvent.type === "clipboard.paste") {
-        const activeDecorators = snapshot.context.activeDecorators;
+        const activeDecorators = snapshot.beta.activeDecorators;
         return {
           activeAnnotations: selector_isSelectingEntireBlocks.getActiveAnnotations(snapshot),
           activeDecorators,
@@ -6833,15 +6944,6 @@ function sortByPriority(items) {
     result.includes(item) || result.push(item);
   return [...result, ...itemsWithoutPriority];
 }
-function getActiveDecorators({
-  schema: schema2,
-  slateEditorInstance
-}) {
-  const decorators = schema2.decorators.map((decorator) => decorator.name);
-  return ({
-    ...slate.Editor.marks(slateEditorInstance) ?? {}
-  }.marks ?? []).filter((mark) => decorators.includes(mark));
-}
 function createEditorSnapshot({
   converters,
   editor,
@@ -6858,10 +6960,6 @@ function createEditorSnapshot({
   }) : null;
   return {
     context: {
-      activeDecorators: getActiveDecorators({
-        schema: schema2,
-        slateEditorInstance: editor
-      }),
       converters,
       keyGenerator,
       readOnly,
@@ -6870,6 +6968,15 @@ function createEditorSnapshot({
       value: editor.value
     },
     beta: {
+      activeAnnotations: getActiveAnnotations({
+        markState: editor.markState,
+        schema: schema2
+      }),
+      activeDecorators: getActiveDecorators({
+        decoratorState: editor.decoratorState,
+        markState: editor.markState,
+        schema: schema2
+      }),
       hasTag,
       internalDrag
     }
@@ -7552,45 +7659,6 @@ function compileSchemaDefinitionToLegacySchema(definition) {
     } : inlineObject)
   };
 }
-function defaultCompare(a, b) {
-  return a === b;
-}
-function useEditorSelector(editor, selector, t0) {
-  const $ = reactCompilerRuntime.c(3), compare = t0 === void 0 ? defaultCompare : t0;
-  let t1;
-  return $[0] !== editor || $[1] !== selector ? (t1 = (editorActorSnapshot) => {
-    const snapshot = getEditorSnapshot({
-      editorActorSnapshot,
-      slateEditorInstance: editor._internal.slateEditor.instance
-    });
-    return selector(snapshot);
-  }, $[0] = editor, $[1] = selector, $[2] = t1) : t1 = $[2], react.useSelector(editor._internal.editorActor, t1, compare);
-}
-function getEditorSnapshot({
-  editorActorSnapshot,
-  slateEditorInstance
-}) {
-  return {
-    context: {
-      converters: [...editorActorSnapshot.context.converters],
-      activeDecorators: getActiveDecorators({
-        schema: editorActorSnapshot.context.schema,
-        slateEditorInstance
-      }),
-      keyGenerator: editorActorSnapshot.context.keyGenerator,
-      readOnly: editorActorSnapshot.matches({
-        "edit mode": "read only"
-      }),
-      schema: editorActorSnapshot.context.schema,
-      selection: editorActorSnapshot.context.selection,
-      value: slateEditorInstance.value
-    },
-    beta: {
-      hasTag: (tag) => editorActorSnapshot.hasTag(tag),
-      internalDrag: editorActorSnapshot.context.internalDrag
-    }
-  };
-}
 const debug$7 = debugWithName("mutation-machine"), mutationMachine = xstate.setup({
   types: {
     context: {},
@@ -7884,19 +7952,17 @@ function createEditableAPI(editor, editorActor) {
         editor
       });
     },
-    isMarkActive: (mark) => {
-      try {
-        return isDecoratorActive({
-          editor,
-          decorator: mark
-        });
-      } catch (err) {
-        return console.warn(err), !1;
-      }
+    isMarkActive: (mark) => getEditorSnapshot({
+      editorActorSnapshot: editorActor.getSnapshot(),
+      slateEditorInstance: editor
+    }).beta.activeDecorators.includes(mark),
+    marks: () => {
+      const snapshot = getEditorSnapshot({
+        editorActorSnapshot: editorActor.getSnapshot(),
+        slateEditorInstance: editor
+      });
+      return [...snapshot.beta.activeAnnotations, ...snapshot.beta.activeDecorators];
     },
-    marks: () => ({
-      ...slate.Editor.marks(editor) || {}
-    }).marks || [],
     undo: () => {
       editorActor.send({
         type: "behavior event",