@portabletext/editor 2.19.3 → 2.20.0

package/lib/index.js

@@ -13,7 +13,7 @@ import { getBlockStartPoint, getBlockKeyFromSelectionPoint, getChildKeyFromSelec
 import isEqual from "lodash/isEqual.js";
 import { isTextBlock, isSpan, compileSchema } from "@portabletext/schema";
 import { defineSchema } from "@portabletext/schema";
-import { getFocusInlineObject, getSelectedBlocks, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, isOverlappingSelection, isSelectingEntireBlocks, getActiveDecorators, getTrimmedSelection, isActiveAnnotation, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, getMarkState, getActiveAnnotationsMarks, isAtTheEndOfBlock, isAtTheStartOfBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock, getSelectionEndPoint as getSelectionEndPoint$1, isActiveDecorator, getActiveAnnotations, getSelectedTextBlocks, isActiveListItem, isActiveStyle } from "./_chunks-es/selector.is-at-the-start-of-block.js";
+import { getFocusInlineObject, getSelectedBlocks, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, isOverlappingSelection, isSelectingEntireBlocks, getActiveDecorators, isActiveAnnotation, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, getMarkState, getActiveAnnotationsMarks, isAtTheEndOfBlock, isAtTheStartOfBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock, getSelectionEndPoint as getSelectionEndPoint$1, isActiveDecorator, getActiveAnnotations, getSelectedTextBlocks, isActiveListItem, isActiveStyle } from "./_chunks-es/selector.is-at-the-start-of-block.js";
 import { isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan as getFocusSpan$1, isSelectionExpanded, getFocusBlock as getFocusBlock$1, getSelectedValue, getSelectionStartPoint as getSelectionStartPoint$1, getFocusChild as getFocusChild$1 } from "./_chunks-es/selector.get-selection-text.js";
 import { defineBehavior, forward, raise, effect } from "./behaviors/index.js";
 import uniq from "lodash/uniq.js";
@@ -25,10 +25,9 @@ import { Schema } from "@sanity/schema";
 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 { createDraft, finishDraft } from "immer";
 import { createKeyboardShortcut, code, underline, italic, bold, undo, redo } from "@portabletext/keyboard-shortcuts";
+import { sliceTextBlock } from "./_chunks-es/util.slice-text-block.js";
 import isPlainObject from "lodash/isPlainObject.js";
 import { Subject } from "rxjs";
 function EditorEventListener(props) {
@@ -4494,97 +4493,42 @@ const addAnnotationOperationImplementation = ({
   context,
   operation
 }) => {
-  const editor = operation.editor, mark = operation.decorator, value = fromSlateValue(editor.children, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(editor)), manualAnchor = operation.at?.anchor ? blockOffsetToSpanSelectionPoint({
-    context: {
-      ...context,
-      value
-    },
-    blockOffset: operation.at.anchor,
-    direction: "backward"
-  }) : void 0, manualFocus = operation.at?.focus ? blockOffsetToSpanSelectionPoint({
-    context: {
-      ...context,
-      value
-    },
-    blockOffset: operation.at.focus,
-    direction: "forward"
-  }) : void 0, manualSelection = manualAnchor && manualFocus ? {
-    anchor: manualAnchor,
-    focus: manualFocus
-  } : void 0, selection = manualSelection ? toSlateRange({
+  const editor = operation.editor, mark = operation.decorator;
+  let at = operation.at ? toSlateRange({
     context: {
       schema: context.schema,
       value: operation.editor.value,
-      selection: manualSelection
+      selection: operation.at
     },
     blockIndexMap: operation.editor.blockIndexMap
-  }) ?? editor.selection : editor.selection;
-  if (!selection)
-    return;
-  const editorSelection = slateRangeToSelection({
-    schema: context.schema,
-    editor,
-    range: selection
-  }), anchorOffset = editorSelection ? selectionPointToBlockOffset({
-    context: {
-      ...context,
-      value
-    },
-    selectionPoint: editorSelection.anchor
-  }) : void 0, focusOffset = editorSelection ? selectionPointToBlockOffset({
-    context: {
-      ...context,
-      value
-    },
-    selectionPoint: editorSelection.focus
-  }) : void 0;
-  if (!anchorOffset || !focusOffset)
-    throw new Error("Unable to find anchor or focus offset");
-  if (Range.isExpanded(selection)) {
-    Transforms.setNodes(editor, {}, {
-      at: selection,
+  }) : operation.editor.selection;
+  if (!at)
+    throw new Error("Unable to add decorator without a selection");
+  if (Range.isExpanded(at)) {
+    const rangeRef = Editor.rangeRef(editor, at, {
+      affinity: "inward"
+    }), [start, end] = Range.edges(at), endAtEndOfNode = Editor.isEnd(editor, end, end.path);
+    Transforms.splitNodes(editor, {
+      at: end,
       match: Text.isText,
-      split: !0,
-      hanging: !0
-    });
-    const newValue = fromSlateValue(editor.children, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(editor)), newSelection = blockOffsetsToSelection({
-      context: {
-        ...context,
-        value: newValue
-      },
-      offsets: {
-        anchor: anchorOffset,
-        focus: focusOffset
-      },
-      backward: editorSelection?.backward
-    }), trimmedSelection = getTrimmedSelection({
-      blockIndexMap: editor.blockIndexMap,
-      context: {
-        converters: [],
-        keyGenerator: context.keyGenerator,
-        readOnly: !1,
-        schema: context.schema,
-        selection: newSelection,
-        value: newValue
-      },
-      decoratorState: editor.decoratorState
+      mode: "lowest",
+      voids: !1,
+      always: !endAtEndOfNode
     });
-    if (!trimmedSelection)
-      throw new Error("Unable to find trimmed selection");
-    const newRange = toSlateRange({
-      context: {
-        schema: context.schema,
-        value: operation.editor.value,
-        selection: trimmedSelection
-      },
-      blockIndexMap: operation.editor.blockIndexMap
+    const startAtStartOfNode = Editor.isStart(editor, start, start.path);
+    if (Transforms.splitNodes(editor, {
+      at: start,
+      match: Text.isText,
+      mode: "lowest",
+      voids: !1,
+      always: !startAtStartOfNode
+    }), at = rangeRef.unref(), !at)
+      throw new Error("Unable to add decorator without a selection");
+    operation.at || Transforms.select(editor, at);
+    const splitTextNodes = Editor.nodes(editor, {
+      at,
+      match: Text.isText
     });
-    if (!newRange)
-      throw new Error("Unable to find new selection");
-    const splitTextNodes = Range.isRange(newRange) ? [...Editor.nodes(editor, {
-      at: newRange,
-      match: (node) => Text.isText(node)
-    })] : [];
     for (const [node, path] of splitTextNodes) {
       const marks = [...(Array.isArray(node.marks) ? node.marks : []).filter((eMark) => eMark !== mark), mark];
       Transforms.setNodes(editor, {
@@ -4598,11 +4542,11 @@ const addAnnotationOperationImplementation = ({
     }
   } else {
     if (!Array.from(Editor.nodes(editor, {
-      at: selection,
+      at,
       match: (node) => editor.isTextSpan(node)
     }))?.at(0))
       return;
-    const [block, blockPath] = Editor.node(editor, selection, {
+    const [block, blockPath] = Editor.node(editor, at, {
       depth: 1
     }), lonelyEmptySpan = editor.isTextBlock(block) && block.children.length === 1 && editor.isTextSpan(block.children[0]) && block.children[0].text === "" ? block.children[0] : void 0;
     if (lonelyEmptySpan) {
@@ -4617,9 +4561,9 @@ const addAnnotationOperationImplementation = ({
       editor.decoratorState[mark] = !0;
   }
   if (editor.selection) {
-    const selection2 = editor.selection;
+    const selection = editor.selection;
     editor.selection = {
-      ...selection2
+      ...selection
     };
   }
 }, deleteOperationImplementation = ({
@@ -8317,19 +8261,13 @@ const abstractAnnotationBehaviors = [defineBehavior({
   guard: ({
     snapshot,
     event
-  }) => {
-    const manualSelection = event.at ? blockOffsetsToSelection({
-      context: snapshot.context,
-      offsets: event.at
-    }) : null;
-    return manualSelection ? !isActiveDecorator(event.decorator)({
-      ...snapshot,
-      context: {
-        ...snapshot.context,
-        selection: manualSelection
-      }
-    }) : !isActiveDecorator(event.decorator)(snapshot);
-  },
+  }) => event.at ? !isActiveDecorator(event.decorator)({
+    ...snapshot,
+    context: {
+      ...snapshot.context,
+      selection: event.at
+    }
+  }) : !isActiveDecorator(event.decorator)(snapshot),
   actions: [({
     event
   }) => [raise({
@@ -8542,33 +8480,11 @@ const abstractAnnotationBehaviors = [defineBehavior({
   })]]
 }), defineBehavior({
   on: "delete.text",
-  guard: ({
-    snapshot,
+  actions: [({
     event
-  }) => {
-    const selection = blockOffsetsToSelection({
-      context: snapshot.context,
-      offsets: event.at
-    });
-    if (!selection)
-      return !1;
-    const trimmedSelection = getTrimmedSelection({
-      ...snapshot,
-      context: {
-        ...snapshot.context,
-        value: snapshot.context.value,
-        selection
-      }
-    });
-    return trimmedSelection ? {
-      selection: trimmedSelection
-    } : !1;
-  },
-  actions: [(_, {
-    selection
   }) => [raise({
-    type: "delete",
-    at: selection
+    ...event,
+    type: "delete"
   })]]
 })], abstractDeserializeBehaviors = [
   defineBehavior({