@portabletext/editor 2.7.2 → 2.8.0

package/lib/index.js

@@ -8,15 +8,14 @@ import { Element as Element$1, Text, Range, Editor, Node, Point, Path, Transform
 import { useSelected, useSlateSelector, useSlateStatic, useSlate, Editable, ReactEditor, withReact, Slate } from "slate-react";
 import debug$f from "debug";
 import { DOMEditor, isDOMNode, EDITOR_TO_PENDING_SELECTION, IS_FOCUSED, IS_READ_ONLY } from "slate-dom";
-import { getBlockStartPoint, getBlockKeyFromSelectionPoint, getChildKeyFromSelectionPoint, blockOffsetToSpanSelectionPoint, parseBlocks, parseBlock, parseAnnotation, parseInlineObject, isKeyedSegment, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText } from "./_chunks-es/util.slice-blocks.js";
+import { getBlockStartPoint, getBlockKeyFromSelectionPoint, getChildKeyFromSelectionPoint, blockOffsetToSpanSelectionPoint, defaultKeyGenerator, parseBlocks, parseBlock, parseAnnotation, isKeyedSegment, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText } from "./_chunks-es/util.slice-blocks.js";
 import { getBlockEndPoint, isSelectionCollapsed, isEqualSelectionPoints, isEmptyTextBlock } from "./_chunks-es/util.is-selection-collapsed.js";
 import isEqual from "lodash/isEqual.js";
 import { isTextBlock, isSpan, compileSchema } from "@portabletext/schema";
 import { defineSchema } from "@portabletext/schema";
 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.is-selection-expanded.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, getSelectionEndPoint as getSelectionEndPoint$1, isActiveAnnotation, isActiveDecorator, getActiveAnnotations, getSelectedTextBlocks, isActiveListItem, isActiveStyle } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
-import getRandomValues from "get-random-values-esm";
-import { defineBehavior, forward, raise, effect } from "./behaviors/index.js";
+import { getFocusInlineObject, getSelectedBlocks, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, isOverlappingSelection, isSelectingEntireBlocks, getMarkState, getActiveDecorators, getActiveAnnotationsMarks, getTrimmedSelection, isActiveAnnotation, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, 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-selecting-entire-blocks.js";
+import { defineBehavior, forward, raise, effect, execute } from "./behaviors/index.js";
 import uniq from "lodash/uniq.js";
 import { setup, fromCallback, assign, and, enqueueActions, emit, assertEvent, raise as raise$1, not, createActor } from "xstate";
 import { compileSchemaDefinitionToPortableTextMemberSchemaTypes, createPortableTextMemberSchemaTypes, portableTextMemberSchemaTypesToSchema } from "@portabletext/sanity-bridge";
@@ -770,25 +769,6 @@ function getDragSelection({
   }
   return dragSelection;
 }
-const defaultKeyGenerator = () => randomKey(12), getByteHexTable = /* @__PURE__ */ (() => {
-  let table;
-  return () => {
-    if (table)
-      return table;
-    table = [];
-    for (let i = 0; i < 256; ++i)
-      table[i] = (i + 256).toString(16).slice(1);
-    return table;
-  };
-})();
-function whatwgRNG(length = 16) {
-  const rnds8 = new Uint8Array(length);
-  return getRandomValues(rnds8), rnds8;
-}
-function randomKey(length) {
-  const table = getByteHexTable();
-  return whatwgRNG(length).reduce((str, n) => str + table[n], "").slice(0, length);
-}
 function createEditorPriority(config) {
   return {
     id: defaultKeyGenerator(),
@@ -4046,9 +4026,9 @@ const addAnnotationOperationImplementation = ({
     for (const [span, path] of children) {
       if (!editor.isTextSpan(span) || !Range.includes(editor.selection, path))
         continue;
-      const marks = span.marks ?? [], existingSameTypeAnnotations = marks.filter((mark) => markDefs.some((markDef) => markDef._key === mark && markDef._type === parsedAnnotation._type));
+      const marks = span.marks ?? [];
       Transforms.setNodes(editor, {
-        marks: [...marks.filter((mark) => !existingSameTypeAnnotations.includes(mark)), annotationKey]
+        marks: [...marks, annotationKey]
       }, {
         at: path
       }), spanPath = [{
@@ -4619,77 +4599,7 @@ function domRectsIntersect(rect, compareRect) {
   const middle = (compareRect.top + compareRect.bottom) / 2;
   return rect.top <= middle && rect.bottom >= middle;
 }
-const insertInlineObjectOperationImplementation = ({
-  context,
-  operation
-}) => {
-  const parsedInlineObject = parseInlineObject({
-    context,
-    inlineObject: {
-      _type: operation.inlineObject.name,
-      ...operation.inlineObject.value ?? {}
-    },
-    options: {
-      refreshKeys: !1,
-      validateFields: !0
-    }
-  });
-  if (!parsedInlineObject)
-    throw new Error(`Failed to parse inline object ${JSON.stringify(operation.inlineObject)}`);
-  if (!operation.editor.selection) {
-    console.error("Unable to insert inline object without selection");
-    return;
-  }
-  const [focusTextBlock] = Array.from(Editor.nodes(operation.editor, {
-    at: operation.editor.selection.focus.path,
-    match: (node) => operation.editor.isTextBlock(node)
-  })).at(0) ?? [void 0, void 0];
-  if (!focusTextBlock) {
-    console.error("Unable to perform action without focus text block");
-    return;
-  }
-  const child = toSlateValue([{
-    _type: context.schema.block.name,
-    _key: context.keyGenerator(),
-    children: [parsedInlineObject]
-  }], {
-    schemaTypes: context.schema
-  }).at(0)?.children.at(0);
-  if (!child) {
-    console.error("Unable to insert inline object");
-    return;
-  }
-  Transforms.insertNodes(operation.editor, child);
-}, insertSpanOperationImplementation = ({
-  context,
-  operation
-}) => {
-  if (!operation.editor.selection) {
-    console.error("Unable to perform action without selection", operation);
-    return;
-  }
-  const [focusBlock, focusBlockPath] = Array.from(Editor.nodes(operation.editor, {
-    at: operation.editor.selection.focus.path,
-    match: (node) => operation.editor.isTextBlock(node)
-  }))[0] ?? [void 0, void 0];
-  if (!focusBlock || !focusBlockPath) {
-    console.error("Unable to perform action without focus block", operation);
-    return;
-  }
-  const markDefs = focusBlock.markDefs ?? [], annotations = operation.annotations ? operation.annotations.map((annotation) => ({
-    _type: annotation.name,
-    _key: context.keyGenerator(),
-    ...annotation.value
-  })) : void 0;
-  annotations && annotations.length > 0 && Transforms.setNodes(operation.editor, {
-    markDefs: [...markDefs, ...annotations]
-  }), Transforms.insertNodes(operation.editor, {
-    _type: "span",
-    _key: context.keyGenerator(),
-    text: operation.text,
-    marks: [...annotations?.map((annotation) => annotation._key) ?? [], ...operation.decorators ?? []]
-  });
-}, insertBlockOperationImplementation = ({
+const insertBlockOperationImplementation = ({
   context,
   operation
 }) => {
@@ -4973,8 +4883,6 @@ const moveBackwardOperationImplementation = ({
   "history.redo": historyRedoOperationImplementation,
   "history.undo": historyUndoOperationImplementation,
   "insert.block": insertBlockOperationImplementation,
-  "insert.inline object": insertInlineObjectOperationImplementation,
-  "insert.span": insertSpanOperationImplementation,
   "insert.text": insertTextOperationImplementation,
   "move.backward": moveBackwardOperationImplementation,
   "move.block": moveBlockOperationImplementation,
@@ -5071,20 +4979,6 @@ function performOperation({
         });
         break;
       }
-      case "insert.inline object": {
-        behaviorOperationImplementations["insert.inline object"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "insert.span": {
-        behaviorOperationImplementations["insert.span"]({
-          context,
-          operation
-        });
-        break;
-      }
       case "insert.text": {
         behaviorOperationImplementations["insert.text"]({
           context,
@@ -6713,9 +6607,24 @@ const addAnnotationOnCollapsedSelection = defineBehavior({
     type: "annotation.add",
     annotation: event.annotation
   })]]
-}), coreAnnotationBehaviors = {
-  addAnnotationOnCollapsedSelection
-}, defaultKeyboardShortcuts = {
+}), preventOverlappingAnnotations = defineBehavior({
+  // Given an `annotation.add` event
+  on: "annotation.add",
+  // When the annotation is active in the selection
+  guard: ({
+    snapshot,
+    event
+  }) => isActiveAnnotation(event.annotation.name, {
+    mode: "partial"
+  })(snapshot),
+  // Then the existing annotation is removed
+  actions: [({
+    event
+  }) => [raise({
+    type: "annotation.remove",
+    annotation: event.annotation
+  }), raise(event)]]
+}), coreAnnotationBehaviors = [addAnnotationOnCollapsedSelection, preventOverlappingAnnotations], defaultKeyboardShortcuts = {
   arrowDown: createKeyboardShortcut({
     default: [{
       key: "ArrowDown",
@@ -7843,7 +7752,7 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
   inheritListLevel,
   inheritListItem,
   inheritListProperties
-}, coreBehaviorsConfig = [coreAnnotationBehaviors.addAnnotationOnCollapsedSelection, coreDecoratorBehaviors.strongShortcut, coreDecoratorBehaviors.emShortcut, coreDecoratorBehaviors.underlineShortcut, coreDecoratorBehaviors.codeShortcut, ...coreDndBehaviors, coreBlockObjectBehaviors.clickingAboveLonelyBlockObject, coreBlockObjectBehaviors.clickingBelowLonelyBlockObject, coreBlockObjectBehaviors.arrowDownOnLonelyBlockObject, coreBlockObjectBehaviors.arrowUpOnLonelyBlockObject, coreBlockObjectBehaviors.breakingBlockObject, coreBlockObjectBehaviors.deletingEmptyTextBlockAfterBlockObject, coreBlockObjectBehaviors.deletingEmptyTextBlockBeforeBlockObject, coreListBehaviors.clearListOnBackspace, coreListBehaviors.unindentListOnBackspace, coreListBehaviors.mergeTextIntoListOnDelete, coreListBehaviors.mergeTextIntoListOnBackspace, coreListBehaviors.deletingListFromStart, coreListBehaviors.clearListOnEnter, coreListBehaviors.indentListOnTab, coreListBehaviors.unindentListOnShiftTab, coreListBehaviors.inheritListLevel, coreListBehaviors.inheritListItem, coreListBehaviors.inheritListProperties, coreInsertBreakBehaviors.breakingAtTheEndOfTextBlock, coreInsertBreakBehaviors.breakingAtTheStartOfTextBlock, coreInsertBreakBehaviors.breakingEntireDocument, coreInsertBreakBehaviors.breakingEntireBlocks, coreInsertBreakBehaviors.breakingInlineObject].map((behavior) => ({
+}, coreBehaviorsConfig = [...coreAnnotationBehaviors, coreDecoratorBehaviors.strongShortcut, coreDecoratorBehaviors.emShortcut, coreDecoratorBehaviors.underlineShortcut, coreDecoratorBehaviors.codeShortcut, ...coreDndBehaviors, coreBlockObjectBehaviors.clickingAboveLonelyBlockObject, coreBlockObjectBehaviors.clickingBelowLonelyBlockObject, coreBlockObjectBehaviors.arrowDownOnLonelyBlockObject, coreBlockObjectBehaviors.arrowUpOnLonelyBlockObject, coreBlockObjectBehaviors.breakingBlockObject, coreBlockObjectBehaviors.deletingEmptyTextBlockAfterBlockObject, coreBlockObjectBehaviors.deletingEmptyTextBlockBeforeBlockObject, coreListBehaviors.clearListOnBackspace, coreListBehaviors.unindentListOnBackspace, coreListBehaviors.mergeTextIntoListOnDelete, coreListBehaviors.mergeTextIntoListOnBackspace, coreListBehaviors.deletingListFromStart, coreListBehaviors.clearListOnEnter, coreListBehaviors.indentListOnTab, coreListBehaviors.unindentListOnShiftTab, coreListBehaviors.inheritListLevel, coreListBehaviors.inheritListItem, coreListBehaviors.inheritListProperties, coreInsertBreakBehaviors.breakingAtTheEndOfTextBlock, coreInsertBreakBehaviors.breakingAtTheStartOfTextBlock, coreInsertBreakBehaviors.breakingEntireDocument, coreInsertBreakBehaviors.breakingEntireBlocks, coreInsertBreakBehaviors.breakingInlineObject].map((behavior) => ({
   behavior,
   priority: corePriority
 })), abstractAnnotationBehaviors = [defineBehavior({
@@ -8477,6 +8386,23 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
   actions: [() => [raise({
     type: "split"
   })]]
+}), defineBehavior({
+  on: "insert.inline object",
+  actions: [({
+    snapshot,
+    event
+  }) => [execute({
+    type: "insert.block",
+    block: {
+      _type: snapshot.context.schema.block.name,
+      children: [{
+        _type: event.inlineObject.name,
+        ...event.inlineObject.value
+      }]
+    },
+    placement: "auto",
+    select: "end"
+  })]]
 }), defineBehavior({
   on: "insert.soft break",
   actions: [() => [raise({
@@ -8484,6 +8410,37 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
     text: `
 `
   })]]
+}), defineBehavior({
+  on: "insert.span",
+  guard: ({
+    snapshot,
+    event
+  }) => ({
+    markDefs: event.annotations?.map((annotation) => ({
+      _type: annotation.name,
+      _key: snapshot.context.keyGenerator(),
+      ...annotation.value
+    })) ?? []
+  }),
+  actions: [({
+    snapshot,
+    event
+  }, {
+    markDefs
+  }) => [execute({
+    type: "insert.block",
+    block: {
+      _type: snapshot.context.schema.block.name,
+      children: [{
+        _type: snapshot.context.schema.span.name,
+        text: event.text,
+        marks: [...event.decorators ?? [], ...markDefs.map((markDef) => markDef._key)]
+      }],
+      markDefs
+    },
+    placement: "auto",
+    select: "end"
+  })]]
 })], abstractKeyboardBehaviors = [
   /**
    * Allow raising an `insert.break` event when pressing Enter on an inline
@@ -9096,7 +9053,7 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
 function isSyntheticBehaviorEvent(event) {
   return !isCustomBehaviorEvent(event) && !isNativeBehaviorEvent(event) && !isAbstractBehaviorEvent(event);
 }
-const abstractBehaviorEventTypes = ["annotation.set", "annotation.toggle", "decorator.toggle", "delete.backward", "delete.block", "delete.child", "delete.forward", "delete.text", "deserialize", "deserialize.data", "deserialization.success", "deserialization.failure", "insert.blocks", "insert.break", "insert.soft break", "list item.add", "list item.remove", "list item.toggle", "move.block down", "move.block up", "select.previous block", "select.next block", "serialize", "serialize.data", "serialization.success", "serialization.failure", "split", "style.add", "style.remove", "style.toggle"];
+const abstractBehaviorEventTypes = ["annotation.set", "annotation.toggle", "decorator.toggle", "delete.backward", "delete.block", "delete.child", "delete.forward", "delete.text", "deserialize", "deserialize.data", "deserialization.success", "deserialization.failure", "insert.blocks", "insert.break", "insert.inline object", "insert.soft break", "insert.span", "list item.add", "list item.remove", "list item.toggle", "move.block down", "move.block up", "select.previous block", "select.next block", "serialize", "serialize.data", "serialization.success", "serialization.failure", "split", "style.add", "style.remove", "style.toggle"];
 function isAbstractBehaviorEvent(event) {
   return abstractBehaviorEventTypes.includes(event.type);
 }
@@ -10371,7 +10328,22 @@ function createEditableAPI(editor, editorActor) {
     },
     addAnnotation: (type, value) => {
       let paths;
-      return Editor.withoutNormalizing(editor, () => {
+      const snapshot = getEditorSnapshot({
+        editorActorSnapshot: editorActor.getSnapshot(),
+        slateEditorInstance: editor
+      });
+      return isActiveAnnotation(type.name, {
+        mode: "partial"
+      })(snapshot) && editorActor.send({
+        type: "behavior event",
+        behaviorEvent: {
+          type: "annotation.remove",
+          annotation: {
+            name: type.name
+          }
+        },
+        editor
+      }), Editor.withoutNormalizing(editor, () => {
         paths = addAnnotationOperationImplementation({
           context: {
             keyGenerator: editorActor.getSnapshot().context.keyGenerator,