@portabletext/editor 1.44.15 → 1.45.0

package/lib/_chunks-es/editor-provider.js

@@ -5,7 +5,7 @@ import { ReactEditor, withReact, Slate } from "slate-react";
 import { useSelector, useActorRef } from "@xstate/react";
 import debug$g from "debug";
 import isEqual from "lodash/isEqual.js";
-import { Element, Text, Editor, Path, Operation, Transforms, insertText, Node, Range, Point, createEditor } from "slate";
+import { Element, Text, Editor, Path, Operation, Transforms, Node, Range, Point, createEditor } from "slate";
 import { setup, stateIn, fromCallback, assign, enqueueActions, emit, assertEvent, and, not, createActor } from "xstate";
 import { unset, set, setIfMissing, insert, diffMatchPatch as diffMatchPatch$1, applyAll } from "@portabletext/patches";
 import { isPortableTextTextBlock, isKeySegment, isPortableTextSpan as isPortableTextSpan$1, isPortableTextListBlock, defineType, defineField } from "@sanity/types";
@@ -13,7 +13,7 @@ import flatten from "lodash/flatten.js";
 import isPlainObject from "lodash/isPlainObject.js";
 import uniq from "lodash/uniq.js";
 import getRandomValues from "get-random-values-esm";
-import { parseBlock, isTextBlock } from "./parse-blocks.js";
+import { parseBlock, parseAnnotation, isTextBlock, parseInlineObject } from "./parse-blocks.js";
 import { sliceBlocks, blockOffsetToSpanSelectionPoint, getBlockEndPoint, getBlockStartPoint, getTextBlockText } from "./util.slice-blocks.js";
 import { htmlToBlocks } from "@portabletext/block-tools";
 import { toHTML } from "@portabletext/to-html";
@@ -917,8 +917,8 @@ function deisolateChar(diffs, i, dir) {
     }
   }
   if (insertIdx !== null && deleteIdx !== null && hasSharedChar(diffs, insertIdx, deleteIdx, dir)) {
-    const [insertText2, insertChar] = splitChar(diffs[insertIdx][1], inv), [deleteText] = splitChar(diffs[deleteIdx][1], inv);
-    diffs[insertIdx][1] = insertText2, diffs[deleteIdx][1] = deleteText, diffs[i][1] = combineChar(diffs[i][1], insertChar, dir);
+    const [insertText, insertChar] = splitChar(diffs[insertIdx][1], inv), [deleteText] = splitChar(diffs[deleteIdx][1], inv);
+    diffs[insertIdx][1] = insertText, diffs[deleteIdx][1] = deleteText, diffs[i][1] = combineChar(diffs[i][1], insertChar, dir);
     return;
   }
   const [text, char] = splitChar(diffs[i][1], dir);
@@ -2696,74 +2696,10 @@ function createOperationToPatches(types) {
     splitNodePatch
   };
 }
-const insertBreakActionImplementation = ({
-  context,
-  action
-}) => {
-  const keyGenerator = context.keyGenerator, schema = context.schema, editor = action.editor;
-  if (!editor.selection)
-    return;
-  const anchorBlockPath = editor.selection.anchor.path.slice(0, 1), focusBlockPath = editor.selection.focus.path.slice(0, 1), focusBlock = Node.descendant(editor, focusBlockPath);
-  if (editor.isTextBlock(focusBlock) && anchorBlockPath[0] === focusBlockPath[0]) {
-    Transforms.splitNodes(editor, {
-      at: editor.selection,
-      always: !0
-    });
-    const [nextBlock, nextBlockPath] = Editor.node(editor, Path.next(focusBlockPath), {
-      depth: 1
-    }), nextChild = Node.child(nextBlock, 0);
-    if (!editor.isTextSpan(nextChild) && Transforms.insertNodes(editor, {
-      _key: context.keyGenerator(),
-      _type: "span",
-      text: "",
-      marks: []
-    }, {
-      at: [nextBlockPath[0], 0]
-    }), Transforms.setSelection(editor, {
-      anchor: {
-        path: [...nextBlockPath, 0],
-        offset: 0
-      },
-      focus: {
-        path: [...nextBlockPath, 0],
-        offset: 0
-      }
-    }), editor.isTextBlock(nextBlock) && nextBlock.markDefs && nextBlock.markDefs.length > 0) {
-      const newMarkDefKeys = /* @__PURE__ */ new Map(), prevNodeSpans = Array.from(Node.children(editor, focusBlockPath)).map((entry) => entry[0]).filter((node) => editor.isTextSpan(node)), children = Node.children(editor, nextBlockPath);
-      for (const [child, childPath] of children) {
-        if (!editor.isTextSpan(child))
-          continue;
-        const marks = child.marks ?? [];
-        for (const mark of marks)
-          schema.decorators.some((decorator) => decorator.value === mark) || prevNodeSpans.some((prevNodeSpan) => prevNodeSpan.marks?.includes(mark)) && !newMarkDefKeys.has(mark) && newMarkDefKeys.set(mark, keyGenerator());
-        const newMarks = marks.map((mark) => newMarkDefKeys.get(mark) ?? mark);
-        isEqual(marks, newMarks) || Transforms.setNodes(editor, {
-          marks: newMarks
-        }, {
-          at: childPath
-        });
-      }
-      const newMarkDefs = nextBlock.markDefs.map((markDef) => ({
-        ...markDef,
-        _key: newMarkDefKeys.get(markDef._key) ?? markDef._key
-      }));
-      isEqual(nextBlock.markDefs, newMarkDefs) || Transforms.setNodes(editor, {
-        markDefs: newMarkDefs
-      }, {
-        at: nextBlockPath,
-        match: (node) => editor.isTextBlock(node)
-      });
-    }
-    return;
-  }
-  Transforms.splitNodes(editor, {
-    always: !0
-  });
-}, insertSoftBreakActionImplementation = ({
+const insertTextActionImplementation = ({
   action
 }) => {
-  insertText(action.editor, `
-`);
+  action.editor.insertText(action.text);
 };
 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"));
@@ -3241,6 +3177,18 @@ const addAnnotationActionImplementation = ({
   context,
   action
 }) => {
+  const parsedAnnotation = parseAnnotation({
+    annotation: {
+      _type: action.annotation.name,
+      ...action.annotation.value
+    },
+    context,
+    options: {
+      refreshKeys: !1
+    }
+  });
+  if (!parsedAnnotation)
+    throw new Error(`Failed to parse annotation ${JSON.stringify(action.annotation)}`);
   const editor = action.editor;
   if (!editor.selection || Range.isCollapsed(editor.selection))
     return;
@@ -3250,15 +3198,15 @@ const addAnnotationActionImplementation = ({
     match: (node) => editor.isTextBlock(node),
     reverse: Range.isBackward(editor.selection)
   });
+  let blockIndex = 0;
   for (const [block, blockPath] of selectedBlocks) {
     if (block.children.length === 0 || block.children.length === 1 && block.children[0].text === "")
       continue;
-    const annotationKey = context.keyGenerator(), markDefs = block.markDefs ?? [];
-    markDefs.find((markDef) => markDef._type === action.annotation.name && markDef._key === annotationKey) === void 0 && (Transforms.setNodes(editor, {
+    const annotationKey = blockIndex === 0 ? parsedAnnotation._key : context.keyGenerator(), markDefs = block.markDefs ?? [];
+    markDefs.find((markDef) => markDef._type === parsedAnnotation._type && markDef._key === annotationKey) === void 0 && (Transforms.setNodes(editor, {
       markDefs: [...markDefs, {
-        _type: action.annotation.name,
-        _key: annotationKey,
-        ...action.annotation.value
+        ...parsedAnnotation,
+        _key: annotationKey
       }]
     }, {
       at: blockPath
@@ -3274,7 +3222,7 @@ const addAnnotationActionImplementation = ({
     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 === action.annotation.name));
+      const marks = span.marks ?? [], existingSameTypeAnnotations = marks.filter((mark) => markDefs.some((markDef) => markDef._key === mark && markDef._type === parsedAnnotation._type));
       Transforms.setNodes(editor, {
         marks: [...marks.filter((mark) => !existingSameTypeAnnotations.includes(mark)), annotationKey]
       }, {
@@ -3285,6 +3233,7 @@ const addAnnotationActionImplementation = ({
         _key: span._key
       }];
     }
+    blockIndex++;
   }
   return markDefPath && spanPath && (paths = {
     markDefPath,
@@ -3697,13 +3646,13 @@ const decoratorAddActionImplementation = ({
   context,
   action
 }) => {
-  const editor = action.editor, mark = action.decorator, value = fromSlateValue(editor.children, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(editor)), manualAnchor = action.offsets?.anchor ? blockOffsetToSpanSelectionPoint({
+  const editor = action.editor, mark = action.decorator, value = fromSlateValue(editor.children, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(editor)), manualAnchor = action.at?.anchor ? blockOffsetToSpanSelectionPoint({
     value,
-    blockOffset: action.offsets.anchor,
+    blockOffset: action.at.anchor,
     direction: "backward"
-  }) : void 0, manualFocus = action.offsets?.focus ? blockOffsetToSpanSelectionPoint({
+  }) : void 0, manualFocus = action.at?.focus ? blockOffsetToSpanSelectionPoint({
     value,
-    blockOffset: action.offsets.focus,
+    blockOffset: action.at.focus,
     direction: "forward"
   }) : void 0, manualSelection = manualAnchor && manualFocus ? {
     anchor: manualAnchor,
@@ -3805,9 +3754,9 @@ const decoratorAddActionImplementation = ({
 }, deleteActionImplementation = ({
   action
 }) => {
-  const range = toSlateRange(action.selection, action.editor);
+  const range = toSlateRange(action.at, action.editor);
   if (!range)
-    throw new Error(`Failed to get Slate Range for selection ${JSON.stringify(action.selection)}`);
+    throw new Error(`Failed to get Slate Range for selection ${JSON.stringify(action.at)}`);
   action.editor.delete({
     at: range
   });
@@ -3845,10 +3794,7 @@ const decoratorAddActionImplementation = ({
 }) => {
   const value = fromSlateValue(action.editor.children, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(action.editor)), selection = blockOffsetsToSelection({
     value,
-    offsets: {
-      anchor: action.anchor,
-      focus: action.focus
-    }
+    offsets: action.at
   });
   if (!selection)
     throw new Error("Unable to find selection from block offsets");
@@ -3883,10 +3829,18 @@ const decoratorAddActionImplementation = ({
   context,
   action
 }) => {
-  if (!context.schema.inlineObjects.some((inlineObject) => inlineObject.name === action.inlineObject.name)) {
-    console.error("Unable to insert unknown inline object");
-    return;
-  }
+  const parsedInlineObject = parseInlineObject({
+    context,
+    inlineObject: {
+      _type: action.inlineObject.name,
+      ...action.inlineObject.value ?? {}
+    },
+    options: {
+      refreshKeys: !1
+    }
+  });
+  if (!parsedInlineObject)
+    throw new Error(`Failed to parse inline object ${JSON.stringify(action.inlineObject)}`);
   if (!action.editor.selection) {
     console.error("Unable to insert inline object without selection");
     return;
@@ -3902,11 +3856,7 @@ const decoratorAddActionImplementation = ({
   const child = toSlateValue([{
     _type: context.schema.block.name,
     _key: context.keyGenerator(),
-    children: [{
-      _type: action.inlineObject.name,
-      _key: context.keyGenerator(),
-      ...action.inlineObject.value ?? {}
-    }]
+    children: [parsedInlineObject]
   }], {
     schemaTypes: context.schema
   }).at(0)?.children.at(0);
@@ -4089,11 +4039,7 @@ function insertBlock({
     }
   }
 }
-const insertTextActionImplementation = ({
-  action
-}) => {
-  action.editor.insertText(action.text);
-}, moveBlockActionImplementation = ({
+const moveBlockActionImplementation = ({
   action
 }) => {
   const at = [toSlatePath(action.at, action.editor)[0]], to = [toSlatePath(action.to, action.editor)[0]];
@@ -4106,8 +4052,71 @@ const insertTextActionImplementation = ({
 }, selectActionImplementation = ({
   action
 }) => {
-  const newSelection = toSlateRange(action.selection, action.editor);
+  const newSelection = toSlateRange(action.at, action.editor);
   newSelection ? Transforms.select(action.editor, newSelection) : Transforms.deselect(action.editor);
+}, splitBlockActionImplementation = ({
+  context,
+  action
+}) => {
+  const keyGenerator = context.keyGenerator, schema = context.schema, editor = action.editor;
+  if (!editor.selection)
+    return;
+  const anchorBlockPath = editor.selection.anchor.path.slice(0, 1), focusBlockPath = editor.selection.focus.path.slice(0, 1), focusBlock = Node.descendant(editor, focusBlockPath);
+  if (editor.isTextBlock(focusBlock) && anchorBlockPath[0] === focusBlockPath[0]) {
+    Transforms.splitNodes(editor, {
+      at: editor.selection,
+      always: !0
+    });
+    const [nextBlock, nextBlockPath] = Editor.node(editor, Path.next(focusBlockPath), {
+      depth: 1
+    }), nextChild = Node.child(nextBlock, 0);
+    if (!editor.isTextSpan(nextChild) && Transforms.insertNodes(editor, {
+      _key: context.keyGenerator(),
+      _type: "span",
+      text: "",
+      marks: []
+    }, {
+      at: [nextBlockPath[0], 0]
+    }), Transforms.setSelection(editor, {
+      anchor: {
+        path: [...nextBlockPath, 0],
+        offset: 0
+      },
+      focus: {
+        path: [...nextBlockPath, 0],
+        offset: 0
+      }
+    }), editor.isTextBlock(nextBlock) && nextBlock.markDefs && nextBlock.markDefs.length > 0) {
+      const newMarkDefKeys = /* @__PURE__ */ new Map(), prevNodeSpans = Array.from(Node.children(editor, focusBlockPath)).map((entry) => entry[0]).filter((node) => editor.isTextSpan(node)), children = Node.children(editor, nextBlockPath);
+      for (const [child, childPath] of children) {
+        if (!editor.isTextSpan(child))
+          continue;
+        const marks = child.marks ?? [];
+        for (const mark of marks)
+          schema.decorators.some((decorator) => decorator.value === mark) || prevNodeSpans.some((prevNodeSpan) => prevNodeSpan.marks?.includes(mark)) && !newMarkDefKeys.has(mark) && newMarkDefKeys.set(mark, keyGenerator());
+        const newMarks = marks.map((mark) => newMarkDefKeys.get(mark) ?? mark);
+        isEqual(marks, newMarks) || Transforms.setNodes(editor, {
+          marks: newMarks
+        }, {
+          at: childPath
+        });
+      }
+      const newMarkDefs = nextBlock.markDefs.map((markDef) => ({
+        ...markDef,
+        _key: newMarkDefKeys.get(markDef._key) ?? markDef._key
+      }));
+      isEqual(nextBlock.markDefs, newMarkDefs) || Transforms.setNodes(editor, {
+        markDefs: newMarkDefs
+      }, {
+        at: nextBlockPath,
+        match: (node) => editor.isTextBlock(node)
+      });
+    }
+    return;
+  }
+  Transforms.splitNodes(editor, {
+    always: !0
+  });
 }, debug$a = debugWithName("behaviors:action"), behaviorActionImplementations = {
   "annotation.add": addAnnotationActionImplementation,
   "annotation.remove": removeAnnotationActionImplementation,
@@ -4125,15 +4134,14 @@ const insertTextActionImplementation = ({
   "history.redo": historyRedoActionImplementation,
   "history.undo": historyUndoActionImplementation,
   "insert.block": insertBlockActionImplementation,
-  "insert.break": insertBreakActionImplementation,
   "insert.inline object": insertInlineObjectActionImplementation,
-  "insert.soft break": insertSoftBreakActionImplementation,
   "insert.span": insertSpanActionImplementation,
   "insert.text": insertTextActionImplementation,
   effect: effectActionImplementation,
   "move.block": moveBlockActionImplementation,
   noop: noopActionImplementation,
-  select: selectActionImplementation
+  select: selectActionImplementation,
+  "split.block": splitBlockActionImplementation
 };
 function performAction({
   context,
@@ -4266,20 +4274,6 @@ function performAction({
       });
       break;
     }
-    case "insert.break": {
-      behaviorActionImplementations["insert.break"]({
-        context,
-        action
-      });
-      break;
-    }
-    case "insert.soft break": {
-      behaviorActionImplementations["insert.soft break"]({
-        context,
-        action
-      });
-      break;
-    }
     case "insert.span": {
       behaviorActionImplementations["insert.span"]({
         context,
@@ -4303,6 +4297,13 @@ function performAction({
     }
     case "noop":
       break;
+    case "split.block": {
+      behaviorActionImplementations["split.block"]({
+        context,
+        action
+      });
+      break;
+    }
     default: {
       behaviorActionImplementations.select({
         context,
@@ -4320,7 +4321,7 @@ function createWithEventListeners(editorActor) {
       deleteBackward,
       deleteForward,
       insertBreak,
-      insertText: insertText2,
+      insertText,
       select
     } = editor;
     return editor.deleteBackward = (unit) => {
@@ -4376,12 +4377,14 @@ function createWithEventListeners(editorActor) {
       });
     }, editor.insertSoftBreak = () => {
       if (isApplyingBehaviorActions(editor)) {
-        insertSoftBreakActionImplementation({
+        insertTextActionImplementation({
           context: {
             keyGenerator: editorActor.getSnapshot().context.keyGenerator,
             schema: editorActor.getSnapshot().context.schema
           },
           action: {
+            text: `
+`,
             editor
           }
         });
@@ -4396,7 +4399,7 @@ function createWithEventListeners(editorActor) {
       });
     }, editor.insertText = (text, options) => {
       if (isApplyingBehaviorActions(editor)) {
-        insertText2(text, options);
+        insertText(text, options);
         return;
       }
       editorActor.send({
@@ -4407,7 +4410,7 @@ function createWithEventListeners(editorActor) {
         },
         editor,
         defaultActionCallback: () => {
-          insertText2(text, options);
+          insertText(text, options);
         }
       });
     }, editor.redo = () => {
@@ -4441,7 +4444,7 @@ function createWithEventListeners(editorActor) {
         type: "behavior event",
         behaviorEvent: {
           type: "select",
-          selection: slateRangeToSelection({
+          at: slateRangeToSelection({
             schema: editorActor.getSnapshot().context.schema,
             editor,
             range
@@ -5174,7 +5177,10 @@ function compileSchemaDefinition(definition) {
       // This avoids the default title which is a title case of the object name
       defaultObjectTitles[blockObject.name]
     ) : blockObject.title,
-    fields: []
+    fields: blockObject.fields?.map((field) => ({
+      name: field.name,
+      type: field.type
+    })) ?? []
   })) ?? [], inlineObjects = definition?.inlineObjects?.map((inlineObject) => defineType({
     type: "object",
     // Very naive way to work around `SanitySchema.compile` adding default
@@ -5184,7 +5190,10 @@ function compileSchemaDefinition(definition) {
       // This avoids the default title which is a title case of the object name
       defaultObjectTitles[inlineObject.name]
     ) : inlineObject.title,
-    fields: []
+    fields: inlineObject.fields?.map((field) => ({
+      name: field.name,
+      type: field.type
+    })) ?? []
   })) ?? [], portableTextSchema = defineField({
     type: "array",
     name: "portable-text",
@@ -5204,7 +5213,11 @@ function compileSchemaDefinition(definition) {
         annotations: definition?.annotations?.map((annotation) => ({
           name: annotation.name,
           type: "object",
-          title: annotation.title
+          title: annotation.title,
+          fields: annotation.fields?.map((field) => ({
+            name: field.name,
+            type: field.type
+          })) ?? []
         })) ?? []
       },
       lists: definition?.lists?.map((list) => ({
@@ -5277,9 +5290,9 @@ const abstractAnnotationBehaviors = [defineBehavior({
     snapshot,
     event
   }) => {
-    const manualSelection = event.offsets ? blockOffsetsToSelection({
+    const manualSelection = event.at ? blockOffsetsToSelection({
       value: snapshot.context.value,
-      offsets: event.offsets
+      offsets: event.at
     }) : null;
     return manualSelection ? !isActiveDecorator(event.decorator)({
       ...snapshot,
@@ -5335,7 +5348,7 @@ const abstractAnnotationBehaviors = [defineBehavior({
     placement: "auto",
     select: "end"
   })] : event.blocks.flatMap((block, index) => index === 0 ? [raise({
-    type: "insert.break"
+    type: "split.block"
   }), raise({
     type: "select.previous block",
     select: "end"
@@ -5371,6 +5384,18 @@ const abstractAnnotationBehaviors = [defineBehavior({
     placement: index === 0 ? "auto" : "after",
     select: "end"
   }))]
+}), defineBehavior({
+  on: "insert.break",
+  actions: [() => [raise({
+    type: "split.block"
+  })]]
+}), defineBehavior({
+  on: "insert.soft break",
+  actions: [() => [raise({
+    type: "insert.text",
+    text: `
+`
+  })]]
 })], abstractListItemBehaviors = [defineBehavior({
   on: "list item.add",
   guard: ({
@@ -5517,7 +5542,7 @@ const abstractAnnotationBehaviors = [defineBehavior({
     selection
   }) => [raise({
     type: "select",
-    selection
+    at: selection
   })]]
 }), defineBehavior({
   on: "select.next block",
@@ -5540,7 +5565,7 @@ const abstractAnnotationBehaviors = [defineBehavior({
     selection
   }) => [raise({
     type: "select",
-    selection
+    at: selection
   })]]
 })], abstractStyleBehaviors = [defineBehavior({
   on: "style.add",
@@ -5718,7 +5743,7 @@ const abstractAnnotationBehaviors = [defineBehavior({
       originEvent: event
     }), raise({
       type: "delete",
-      selection
+      at: selection
     })]]
   }),
   defineBehavior({
@@ -5777,7 +5802,7 @@ const abstractAnnotationBehaviors = [defineBehavior({
       event
     }) => [raise({
       type: "select",
-      selection: event.position.selection
+      at: event.position.selection
     }), raise({
       type: "deserialize",
       originEvent: event
@@ -5827,7 +5852,7 @@ const abstractAnnotationBehaviors = [defineBehavior({
       at: block.path
     })) : [raise({
       type: "delete",
-      selection: dragOrigin.selection
+      at: dragOrigin.selection
     })], raise({
       type: "insert.blocks",
       blocks: event.data,
@@ -5921,7 +5946,7 @@ const abstractAnnotationBehaviors = [defineBehavior({
       selection
     }) => [raise({
       type: "delete",
-      selection
+      at: selection
     }), raise({
       type: "deserialize",
       originEvent: event
@@ -5955,7 +5980,7 @@ const abstractAnnotationBehaviors = [defineBehavior({
   raiseDeserializationSuccessOrFailure,
   raiseSerializationSuccessOrFailure,
   raiseInsertSoftBreak
-], abstractBehaviorEventTypes = ["annotation.toggle", "decorator.toggle", "deserialize", "deserialization.success", "deserialization.failure", "insert.blocks", "list item.add", "list item.remove", "list item.toggle", "move.block down", "move.block up", "select.previous block", "select.next block", "serialize", "serialization.success", "serialization.failure", "style.add", "style.remove", "style.toggle"];
+], abstractBehaviorEventTypes = ["annotation.toggle", "decorator.toggle", "deserialize", "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", "serialization.success", "serialization.failure", "style.add", "style.remove", "style.toggle"];
 function isAbstractBehaviorEvent(event) {
   return abstractBehaviorEventTypes.includes(event.type);
 }