@portabletext/editor 1.55.13 → 1.55.14

package/lib/index.d.cts

@@ -1215,10 +1215,10 @@ declare const editorMachine: StateMachine<
     'edit mode':
       | {
           editable:
-            | 'dragging internally'
             | 'idle'
+            | 'dragging internally'
             | {
-                focusing: 'checking if busy' | 'busy'
+                focusing: 'busy' | 'checking if busy'
               }
         }
       | {
@@ -1228,11 +1228,11 @@ declare const editorMachine: StateMachine<
       | 'setting up'
       | {
           'set up': {
-            'value sync': 'syncing value' | 'idle'
+            'value sync': 'idle' | 'syncing value'
             'writing':
               | 'dirty'
               | {
-                  pristine: 'normalizing' | 'idle'
+                  pristine: 'idle' | 'normalizing'
                 }
           }
         }
@@ -1557,6 +1557,7 @@ declare const editorMachine: StateMachine<
           | 'keyboard.keyup'
           | 'mouse.click'
           | '*'
+          | `custom.${string}`
           | 'deserialize.*'
           | 'serialize.*'
           | 'split.*'
@@ -1564,20 +1565,19 @@ declare const editorMachine: StateMachine<
           | 'select.*'
           | 'style.*'
           | 'block.*'
+          | 'history.*'
+          | 'insert.*'
           | 'annotation.*'
           | 'decorator.*'
           | 'child.*'
           | 'deserialization.*'
-          | 'insert.*'
           | 'list item.*'
           | 'move.*'
           | 'serialization.*'
-          | 'history.*'
           | 'clipboard.*'
           | 'drag.*'
           | 'keyboard.*'
-          | 'mouse.*'
-          | `custom.${string}`,
+          | 'mouse.*',
           true,
           | {
               type: StrictExtract_2<
@@ -6156,15 +6156,12 @@ export declare type EditorSelector<TSelected> = (
  */
 export declare type EditorSnapshot = {
   context: EditorContext
+  blockIndexMap: Map<string, number>
   /**
    * @beta
-   * Do not rely on this externally
+   * Subject to change
    */
-  beta: {
-    activeAnnotations: Array<string>
-    activeDecorators: Array<string>
-  }
-  blockIndexMap: Map<string, number>
+  decoratorState: Record<string, boolean | undefined>
 }
 
 /**
@@ -6417,11 +6414,6 @@ export declare type LoadingChange = {
   isLoading: boolean
 }
 
-declare type MarkState = {
-  state: 'changed' | 'unchanged'
-  marks: Array<string>
-}
-
 declare type MIMEType = `${string}/${string}`
 
 declare type MouseBehaviorEvent = {
@@ -7178,7 +7170,6 @@ declare interface PortableTextSlateEditor extends ReactEditor {
   value: Array<PortableTextBlock>
   decoratedRanges: Array<DecoratedRange>
   decoratorState: Record<string, boolean | undefined>
-  markState: MarkState | undefined
   blockIndexMap: Map<string, number>
   listIndexMap: Map<string, number>
   /**

package/lib/index.d.ts

@@ -1215,10 +1215,10 @@ declare const editorMachine: StateMachine<
     'edit mode':
       | {
           editable:
-            | 'dragging internally'
             | 'idle'
+            | 'dragging internally'
             | {
-                focusing: 'checking if busy' | 'busy'
+                focusing: 'busy' | 'checking if busy'
               }
         }
       | {
@@ -1228,11 +1228,11 @@ declare const editorMachine: StateMachine<
       | 'setting up'
       | {
           'set up': {
-            'value sync': 'syncing value' | 'idle'
+            'value sync': 'idle' | 'syncing value'
             'writing':
               | 'dirty'
               | {
-                  pristine: 'normalizing' | 'idle'
+                  pristine: 'idle' | 'normalizing'
                 }
           }
         }
@@ -1557,6 +1557,7 @@ declare const editorMachine: StateMachine<
           | 'keyboard.keyup'
           | 'mouse.click'
           | '*'
+          | `custom.${string}`
           | 'deserialize.*'
           | 'serialize.*'
           | 'split.*'
@@ -1564,20 +1565,19 @@ declare const editorMachine: StateMachine<
           | 'select.*'
           | 'style.*'
           | 'block.*'
+          | 'history.*'
+          | 'insert.*'
           | 'annotation.*'
           | 'decorator.*'
           | 'child.*'
           | 'deserialization.*'
-          | 'insert.*'
           | 'list item.*'
           | 'move.*'
           | 'serialization.*'
-          | 'history.*'
           | 'clipboard.*'
           | 'drag.*'
           | 'keyboard.*'
-          | 'mouse.*'
-          | `custom.${string}`,
+          | 'mouse.*',
           true,
           | {
               type: StrictExtract_2<
@@ -6156,15 +6156,12 @@ export declare type EditorSelector<TSelected> = (
  */
 export declare type EditorSnapshot = {
   context: EditorContext
+  blockIndexMap: Map<string, number>
   /**
    * @beta
-   * Do not rely on this externally
+   * Subject to change
    */
-  beta: {
-    activeAnnotations: Array<string>
-    activeDecorators: Array<string>
-  }
-  blockIndexMap: Map<string, number>
+  decoratorState: Record<string, boolean | undefined>
 }
 
 /**
@@ -6417,11 +6414,6 @@ export declare type LoadingChange = {
   isLoading: boolean
 }
 
-declare type MarkState = {
-  state: 'changed' | 'unchanged'
-  marks: Array<string>
-}
-
 declare type MIMEType = `${string}/${string}`
 
 declare type MouseBehaviorEvent = {
@@ -7178,7 +7170,6 @@ declare interface PortableTextSlateEditor extends ReactEditor {
   value: Array<PortableTextBlock>
   decoratedRanges: Array<DecoratedRange>
   decoratorState: Record<string, boolean | undefined>
-  markState: MarkState | undefined
   blockIndexMap: Map<string, number>
   listIndexMap: Map<string, number>
   /**

package/lib/index.js

@@ -9,12 +9,11 @@ import { Element as Element$1, Text, Range, Editor, Node, Point, Transforms, Pat
 import { useSelected, useSlateSelector, useSlateStatic, withReact, ReactEditor, Slate, useSlate, Editable } from "slate-react";
 import debug$f from "debug";
 import { DOMEditor, isDOMNode } from "slate-dom";
-import { getBlockStartPoint, getBlockKeyFromSelectionPoint, getChildKeyFromSelectionPoint, isTextBlock, parseBlock, parseAnnotation, blockOffsetToSpanSelectionPoint, parseInlineObject, isKeyedSegment, isSpan$1 as isSpan, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText, parseBlocks } from "./_chunks-es/util.slice-blocks.js";
-import { getBlockEndPoint, isEmptyTextBlock, isEqualSelectionPoints } from "./_chunks-es/util.is-equal-selection-points.js";
-import { isSelectionCollapsed, selectionPointToBlockOffset, sliceTextBlock } from "./_chunks-es/util.slice-text-block.js";
+import { getBlockStartPoint, getBlockKeyFromSelectionPoint, getChildKeyFromSelectionPoint, isTextBlock, parseBlock, parseAnnotation, blockOffsetToSpanSelectionPoint, parseInlineObject, isKeyedSegment, isSpan, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText, parseBlocks } from "./_chunks-es/util.slice-blocks.js";
+import { getBlockEndPoint, isSelectionCollapsed, isEmptyTextBlock, isEqualSelectionPoints } from "./_chunks-es/util.is-selection-collapsed.js";
 import isEqual from "lodash/isEqual.js";
-import { isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan as getFocusSpan$1, isSelectionExpanded, getFocusBlock as getFocusBlock$1, getSelectedValue, getFocusChild as getFocusChild$1 } from "./_chunks-es/selector.is-selection-expanded.js";
-import { getFocusInlineObject, getSelectedBlocks, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, isOverlappingSelection, isSelectingEntireBlocks, getTrimmedSelection, getSelectedSpans, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, isAtTheEndOfBlock, isAtTheStartOfBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock, isActiveAnnotation, isActiveDecorator, getSelectedTextBlocks, isActiveListItem, isActiveStyle, getActiveAnnotations as getActiveAnnotations$1 } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
+import { getFocusInlineObject, getSelectedBlocks, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, isOverlappingSelection, isSelectingEntireBlocks, getMarkState, getActiveDecorators, getActiveAnnotationsMarks, getTrimmedSelection, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, isAtTheEndOfBlock, isAtTheStartOfBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock, isActiveAnnotation, isActiveDecorator, getSelectedTextBlocks, isActiveListItem, isActiveStyle, getActiveAnnotations } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
+import { isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan as getFocusSpan$1, isSelectionExpanded, getFocusBlock as getFocusBlock$1, getSelectedValue, getFocusChild as getFocusChild$1 } from "./_chunks-es/selector.get-focus-span.js";
 import getRandomValues from "get-random-values-esm";
 import { defineBehavior, forward, raise, effect } from "./behaviors/index.js";
 import uniq from "lodash/uniq.js";
@@ -27,6 +26,7 @@ import flatten from "lodash/flatten.js";
 import omit from "lodash/omit.js";
 import { applyAll, unset, insert, set, setIfMissing, diffMatchPatch as diffMatchPatch$1 } from "@portabletext/patches";
 import { blockOffsetsToSelection } from "./_chunks-es/util.child-selection-point-to-block-offset.js";
+import { selectionPointToBlockOffset, sliceTextBlock } from "./_chunks-es/util.slice-text-block.js";
 import get from "lodash/get.js";
 import isUndefined from "lodash/isUndefined.js";
 import omitBy from "lodash/omitBy.js";
@@ -1372,43 +1372,34 @@ function createPlaceholderBlock(context) {
     }]
   };
 }
-function getActiveAnnotations({
-  markState,
-  schema
-}) {
-  return (markState?.marks ?? []).filter((mark) => !schema.decorators.map((decorator) => decorator.name).includes(mark));
-}
-function getActiveDecorators({
-  decoratorState,
-  markState,
-  schema
-}) {
-  const decorators = schema.decorators.map((decorator) => decorator.name);
-  let activeDecorators = (markState?.marks ?? []).filter((mark) => decorators.includes(mark));
-  for (const decorator in decoratorState)
-    decoratorState[decorator] === !1 ? activeDecorators = activeDecorators.filter((activeDecorator) => activeDecorator !== decorator) : decoratorState[decorator] === !0 && (activeDecorators.includes(decorator) || activeDecorators.push(decorator));
-  return activeDecorators;
-}
 const insertTextOperationImplementation = ({
   context,
   operation
 }) => {
-  const activeDecorators = getActiveDecorators({
-    decoratorState: operation.editor.decoratorState,
-    markState: operation.editor.markState,
-    schema: context.schema
-  }), activeAnnotations = getActiveAnnotations({
-    markState: operation.editor.markState,
-    schema: context.schema
-  }), [focusSpan] = getFocusSpan({
+  const snapshot = {
+    blockIndexMap: operation.editor.blockIndexMap,
+    context: {
+      value: operation.editor.value,
+      selection: operation.editor.selection ? slateRangeToSelection({
+        schema: context.schema,
+        editor: operation.editor,
+        range: operation.editor.selection
+      }) : null,
+      schema: context.schema,
+      keyGenerator: context.keyGenerator,
+      converters: [],
+      readOnly: !1
+    },
+    decoratorState: operation.editor.decoratorState
+  }, markState = getMarkState(snapshot), activeDecorators = getActiveDecorators(snapshot), activeAnnotations = getActiveAnnotationsMarks(snapshot), [focusSpan] = getFocusSpan({
     editor: operation.editor
   });
   if (!focusSpan) {
     Transforms.insertText(operation.editor, operation.text);
     return;
   }
-  if (operation.editor.markState && operation.editor.markState.state === "unchanged") {
-    const markStateDecorators = (operation.editor.markState.marks ?? []).filter((mark) => context.schema.decorators.map((decorator) => decorator.name).includes(mark));
+  if (markState && markState.state === "unchanged") {
+    const markStateDecorators = (markState.marks ?? []).filter((mark) => context.schema.decorators.map((decorator) => decorator.name).includes(mark));
     if (markStateDecorators.length === activeDecorators.length && markStateDecorators.every((mark) => activeDecorators.includes(mark))) {
       Transforms.insertText(operation.editor, operation.text);
       return;
@@ -1522,17 +1513,7 @@ function getEditorSnapshot({
       selection: editorActorSnapshot.context.selection,
       value: slateEditorInstance.value
     },
-    beta: {
-      activeAnnotations: getActiveAnnotations({
-        markState: slateEditorInstance.markState,
-        schema: editorActorSnapshot.context.schema
-      }),
-      activeDecorators: getActiveDecorators({
-        decoratorState: slateEditorInstance.decoratorState,
-        markState: slateEditorInstance.markState,
-        schema: editorActorSnapshot.context.schema
-      })
-    }
+    decoratorState: slateEditorInstance.decoratorState
   };
 }
 const debug$e = debugWithName("plugin:withPortableTextMarkModel");
@@ -1747,11 +1728,15 @@ function createWithPortableTextMarkModel(editorActor) {
         }
       }
       if (op.type === "insert_text") {
-        if (!editor.markState) {
+        const snapshot = getEditorSnapshot({
+          editorActorSnapshot: editorActor.getSnapshot(),
+          slateEditorInstance: editor
+        }), markState = getMarkState(snapshot);
+        if (!markState) {
           apply2(op);
           return;
         }
-        if (editor.markState.state === "unchanged") {
+        if (markState.state === "unchanged") {
           apply2(op);
           return;
         }
@@ -1759,7 +1744,7 @@ function createWithPortableTextMarkModel(editorActor) {
           _type: "span",
           _key: editorActor.getSnapshot().context.keyGenerator(),
           text: op.text,
-          marks: editor.markState.marks
+          marks: markState.marks
         });
         return;
       }
@@ -1796,7 +1781,7 @@ function createWithPortableTextMarkModel(editorActor) {
               });
               Editor.withoutNormalizing(editor, () => {
                 apply2(op), Transforms.setNodes(editor, {
-                  marks: snapshot.beta.activeDecorators
+                  marks: getActiveDecorators(snapshot)
                 }, {
                   at: op.path
                 });
@@ -3215,10 +3200,6 @@ const addAnnotationOperationImplementation = ({
       backward: editorSelection?.backward
     }), trimmedSelection = getTrimmedSelection({
       blockIndexMap: editor.blockIndexMap,
-      beta: {
-        activeAnnotations: [],
-        activeDecorators: []
-      },
       context: {
         converters: [],
         keyGenerator: context.keyGenerator,
@@ -3226,7 +3207,8 @@ const addAnnotationOperationImplementation = ({
         schema: context.schema,
         selection: newSelection,
         value: newValue
-      }
+      },
+      decoratorState: editor.decoratorState
     });
     if (!trimmedSelection)
       throw new Error("Unable to find trimmed selection");
@@ -4829,110 +4811,6 @@ function createWithUtils({
     })[0], editor;
   };
 }
-function getMarkState({
-  schema,
-  editor
-}) {
-  if (!editor.selection)
-    return;
-  const [block, blockPath] = getFocusBlock({
-    editor
-  }), [span, spanPath] = getFocusSpan({
-    editor
-  });
-  if (!block || !editor.isTextBlock(block) || !span)
-    return;
-  if (Range.isExpanded(editor.selection)) {
-    const selection = editor.selection ? slateRangeToSelection({
-      schema,
-      editor,
-      range: editor.selection
-    }) : null, selectedSpans = getSelectedSpans({
-      blockIndexMap: editor.blockIndexMap,
-      context: {
-        value: editor.value,
-        selection,
-        schema,
-        converters: [],
-        keyGenerator: () => "",
-        readOnly: !1
-      }
-    });
-    let index = 0, marks2 = [];
-    for (const span2 of selectedSpans)
-      index === 0 ? marks2 = span2.node.marks ?? [] : (span2.node.marks?.length === 0 || (span2.node.marks ?? [])?.some((mark) => !marks2.includes(mark))) && (marks2 = []), index++;
-    return {
-      state: "unchanged",
-      marks: marks2
-    };
-  }
-  const decorators = schema.decorators.map((decorator) => decorator.name), marks = span.marks ?? [], marksWithoutAnnotations = marks.filter((mark) => decorators.includes(mark)), spanHasAnnotations = marks.length > marksWithoutAnnotations.length, spanIsEmpty = span.text.length === 0, atTheBeginningOfSpan = editor.selection.anchor.offset === 0, atTheEndOfSpan = editor.selection.anchor.offset === span.text.length, previousSpan = getPreviousSpan({
-    editor,
-    blockPath,
-    spanPath
-  }), nextSpan = getNextSpan({
-    editor,
-    blockPath,
-    spanPath
-  }), nextSpanAnnotations = nextSpan?.marks?.filter((mark) => !decorators.includes(mark)) ?? [], spanAnnotations = marks.filter((mark) => !decorators.includes(mark)), previousSpanHasAnnotations = previousSpan ? previousSpan.marks?.some((mark) => !decorators.includes(mark)) : !1, previousSpanHasSameAnnotations = previousSpan ? previousSpan.marks?.filter((mark) => !decorators.includes(mark)).every((mark) => marks.includes(mark)) : !1, previousSpanHasSameAnnotation = previousSpan ? previousSpan.marks?.some((mark) => !decorators.includes(mark) && marks.includes(mark)) : !1, previousSpanHasSameMarks = previousSpan ? previousSpan.marks?.every((mark) => marks.includes(mark)) : !1, nextSpanSharesSomeAnnotations = spanAnnotations.some((mark) => nextSpanAnnotations?.includes(mark));
-  if (spanHasAnnotations && !spanIsEmpty) {
-    if (atTheBeginningOfSpan) {
-      if (previousSpanHasSameMarks)
-        return {
-          state: "changed",
-          marks: previousSpan?.marks ?? []
-        };
-      if (previousSpanHasSameAnnotations)
-        return {
-          state: "changed",
-          marks: previousSpan?.marks ?? []
-        };
-      if (previousSpanHasSameAnnotation)
-        return {
-          state: "unchanged",
-          marks: span.marks ?? []
-        };
-      if (!previousSpan)
-        return {
-          state: "changed",
-          marks: []
-        };
-    }
-    if (atTheEndOfSpan) {
-      if (nextSpan && nextSpanSharesSomeAnnotations && nextSpanAnnotations.length < spanAnnotations.length || !nextSpanSharesSomeAnnotations)
-        return {
-          state: "changed",
-          marks: nextSpan?.marks ?? []
-        };
-      if (!nextSpan)
-        return {
-          state: "changed",
-          marks: []
-        };
-    }
-  }
-  return atTheBeginningOfSpan && !spanIsEmpty && previousSpan ? previousSpanHasAnnotations ? {
-    state: "changed",
-    marks: []
-  } : {
-    state: "changed",
-    marks: (previousSpan?.marks ?? []).filter((mark) => decorators.includes(mark))
-  } : {
-    state: "unchanged",
-    marks: span.marks ?? []
-  };
-}
-function pluginUpdateMarkState(context, editor) {
-  const {
-    apply: apply2
-  } = editor;
-  return editor.apply = (operation) => {
-    apply2(operation), editor.markState = getMarkState({
-      editor,
-      schema: context.schema
-    });
-  }, editor;
-}
 function pluginUpdateSelection({
   editor,
   editorActor
@@ -5276,10 +5154,10 @@ const withPlugins = (editor, options) => {
   }), withPortableTextMarkModel = createWithPortableTextMarkModel(editorActor), withPlaceholderBlock = createWithPlaceholderBlock(editorActor), withUtils = createWithUtils({
     editorActor
   });
-  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(pluginUpdateValue(editorActor.getSnapshot().context, pluginUpdateMarkState(editorActor.getSnapshot().context, pluginUpdateSelection({
+  return createWithEventListeners(editorActor)(withSchemaTypes(withObjectKeys(withPortableTextMarkModel(withPlaceholderBlock(withUtils(withMaxBlocks(withUndoRedo(withPatches(pluginUpdateValue(editorActor.getSnapshot().context, pluginUpdateSelection({
     editorActor,
     editor: e
-  }))))))))))));
+  })))))))))));
 }, debug$9 = debugWithName("setup");
 function createSlateEditor(config) {
   debug$9("Creating new Slate editor instance");
@@ -5288,7 +5166,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,
@@ -7278,9 +7156,9 @@ const coreDndBehaviors = [
       event
     }) => {
       if (getFocusTextBlock(snapshot) && event.mimeType === "text/plain" && event.originEvent.type === "clipboard.paste") {
-        const activeDecorators = snapshot.beta.activeDecorators;
+        const activeDecorators = getActiveDecorators(snapshot);
         return {
-          activeAnnotations: getActiveAnnotations$1(snapshot),
+          activeAnnotations: getActiveAnnotations(snapshot),
           activeDecorators,
           textRuns: event.data.flatMap((block) => isTextBlock(snapshot.context, block) ? [getTextBlockText(block)] : [])
         };
@@ -7654,17 +7532,7 @@ function createEditorSnapshot({
   return {
     blockIndexMap: editor.blockIndexMap,
     context,
-    beta: {
-      activeAnnotations: getActiveAnnotations({
-        markState: editor.markState,
-        schema
-      }),
-      activeDecorators: getActiveDecorators({
-        decoratorState: editor.decoratorState,
-        markState: editor.markState,
-        schema
-      })
-    }
+    decoratorState: editor.decoratorState
   };
 }
 const debug$7 = debugWithName("editor machine"), editorMachine = setup({
@@ -8630,16 +8498,19 @@ function createEditableAPI(editor, editorActor) {
         editor
       });
     },
-    isMarkActive: (mark) => getEditorSnapshot({
-      editorActorSnapshot: editorActor.getSnapshot(),
-      slateEditorInstance: editor
-    }).beta.activeDecorators.includes(mark),
-    marks: () => {
+    isMarkActive: (mark) => {
       const snapshot = getEditorSnapshot({
         editorActorSnapshot: editorActor.getSnapshot(),
         slateEditorInstance: editor
       });
-      return [...snapshot.beta.activeAnnotations, ...snapshot.beta.activeDecorators];
+      return getActiveDecorators(snapshot).includes(mark);
+    },
+    marks: () => {
+      const snapshot = getEditorSnapshot({
+        editorActorSnapshot: editorActor.getSnapshot(),
+        slateEditorInstance: editor
+      }), activeAnnotations = getActiveAnnotationsMarks(snapshot), activeDecorators = getActiveDecorators(snapshot);
+      return [...activeAnnotations, ...activeDecorators];
     },
     undo: () => {
       editorActor.send({