@portabletext/editor 1.39.1 → 1.40.1

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$e from "debug";
 import isEqual from "lodash/isEqual.js";
-import { Editor, Element, Range, Point, Text, Operation, Transforms, Path, insertText, Node, createEditor as createEditor$1 } from "slate";
+import { Editor, Element, Range, Point, Text, Operation, Transforms, Path, insertText, Node, 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 { defineType, defineField, isKeySegment, isPortableTextTextBlock, isPortableTextSpan as isPortableTextSpan$1, isPortableTextListBlock } from "@sanity/types";
@@ -13,8 +13,8 @@ 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, blockOffsetsToSelection, isTextBlock, parseBlocks } from "./parse-blocks.js";
-import { sliceBlocks, blockOffsetToSpanSelectionPoint, spanSelectionPointToBlockOffset, isKeyedSegment as isKeyedSegment$1 } from "./util.slice-blocks.js";
+import { parseBlock, selectionPointToBlockOffset, blockOffsetsToSelection, isTextBlock, parseBlocks } from "./util.selection-point-to-block-offset.js";
+import { sliceBlocks, blockOffsetToSpanSelectionPoint, isKeyedSegment as isKeyedSegment$1 } from "./util.slice-blocks.js";
 import { htmlToBlocks } from "@portabletext/block-tools";
 import { toHTML } from "@portabletext/to-html";
 import { Schema } from "@sanity/schema";
@@ -243,12 +243,7 @@ function toSlateValue(value, {
       _type,
       _key,
       ...rest
-    } = block, voidChildren = [{
-      _key: VOID_CHILD_KEY,
-      _type: "span",
-      text: "",
-      marks: []
-    }];
+    } = block;
     if (block && block._type === schemaTypes.block.name) {
       const textBlock = block;
       let hasInlines = !1;
@@ -261,7 +256,12 @@ function toSlateValue(value, {
         return cType !== "span" ? (hasInlines = !0, keepObjectEquality({
           _type: cType,
           _key: cKey,
-          children: voidChildren,
+          children: [{
+            _key: VOID_CHILD_KEY,
+            _type: "span",
+            text: "",
+            marks: []
+          }],
           value: cRest,
           __inline: !0
         }, keyMap)) : child;
@@ -276,7 +276,12 @@ function toSlateValue(value, {
     return keepObjectEquality({
       _type,
       _key,
-      children: voidChildren,
+      children: [{
+        _key: VOID_CHILD_KEY,
+        _type: "span",
+        text: "",
+        marks: []
+      }],
       value: rest
     }, keyMap);
   }) : [];
@@ -332,65 +337,7 @@ function fromSlateValue(value, textBlockType, keyMap = {}) {
 function isEqualToEmptyEditor(children, schemaTypes) {
   return children === void 0 || children && Array.isArray(children) && children.length === 0 || children && Array.isArray(children) && children.length === 1 && Element.isElement(children[0]) && children[0]._type === schemaTypes.block.name && "style" in children[0] && children[0].style === schemaTypes.styles[0].value && !("listItem" in children[0]) && Array.isArray(children[0].children) && children[0].children.length === 1 && Text.isText(children[0].children[0]) && children[0].children[0]._type === "span" && !children[0].children[0].marks?.join("") && children[0].children[0].text === "";
 }
-const IS_PROCESSING_REMOTE_CHANGES = /* @__PURE__ */ new WeakMap(), KEY_TO_SLATE_ELEMENT = /* @__PURE__ */ new WeakMap(), KEY_TO_VALUE_ELEMENT = /* @__PURE__ */ new WeakMap(), SLATE_TO_PORTABLE_TEXT_RANGE = /* @__PURE__ */ new WeakMap(), EditorActorContext = createContext({});
-function getActiveDecorators({
-  schema,
-  slateEditorInstance
-}) {
-  const decorators = schema.decorators.map((decorator) => decorator.value);
-  return ({
-    ...Editor.marks(slateEditorInstance) ?? {}
-  }.marks ?? []).filter((mark) => decorators.includes(mark));
-}
-function getValue({
-  editorActorSnapshot,
-  slateEditorInstance
-}) {
-  return fromSlateValue(slateEditorInstance.children, editorActorSnapshot.context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(slateEditorInstance));
-}
-function defaultCompare(a, b) {
-  return a === b;
-}
-function useEditorSelector(editor, selector, t0) {
-  const $ = c(3), compare = t0 === void 0 ? defaultCompare : t0;
-  let t1;
-  return $[0] !== editor._internal.slateEditor.instance || $[1] !== selector ? (t1 = (editorActorSnapshot) => {
-    const snapshot = getEditorSnapshot({
-      editorActorSnapshot,
-      slateEditorInstance: editor._internal.slateEditor.instance
-    });
-    return selector(snapshot);
-  }, $[0] = editor._internal.slateEditor.instance, $[1] = selector, $[2] = t1) : t1 = $[2], 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: getValue({
-        editorActorSnapshot,
-        slateEditorInstance
-      })
-    },
-    beta: {
-      hasTag: (tag) => editorActorSnapshot.hasTag(tag),
-      internalDrag: editorActorSnapshot.context.internalDrag
-    }
-  };
-}
-const PortableTextEditorContext = createContext(null), usePortableTextEditor = () => {
+const IS_PROCESSING_REMOTE_CHANGES = /* @__PURE__ */ new WeakMap(), KEY_TO_SLATE_ELEMENT = /* @__PURE__ */ new WeakMap(), KEY_TO_VALUE_ELEMENT = /* @__PURE__ */ new WeakMap(), SLATE_TO_PORTABLE_TEXT_RANGE = /* @__PURE__ */ new WeakMap(), EditorActorContext = createContext({}), PortableTextEditorContext = createContext(null), usePortableTextEditor = () => {
   const editor = useContext(PortableTextEditorContext);
   if (!editor)
     throw new Error("The `usePortableTextEditor` hook must be used inside the <PortableTextEditor> component's context.");
@@ -2496,7 +2443,12 @@ const converterJson = {
       blocks: snapshot.context.value,
       selection
     });
-    return {
+    return blocks.length === 0 ? {
+      type: "serialization.failure",
+      mimeType: "application/x-portable-text",
+      reason: "No blocks serialized",
+      originEvent: event.originEvent
+    } : {
       type: "serialization.success",
       data: JSON.stringify(blocks),
       mimeType: "application/x-portable-text",
@@ -2605,7 +2557,7 @@ const converterJson = {
       data: sliceBlocks({
         blocks: snapshot.context.value,
         selection
-      }).map((block) => isPortableTextTextBlock(block) ? block.children.map((child) => child._type === snapshot.context.schema.span.name ? child.text : `[${snapshot.context.schema.inlineObjects.find((inlineObjectType) => inlineObjectType.name === child._type)?.title ?? "Object"}]`).join("") : `[${snapshot.context.schema.blockObjects.find((blockObjectType) => blockObjectType.name === block._type)?.title ?? "Object"}]`).join(`
+      }).map((block) => isPortableTextTextBlock(block) ? block.children.map((child) => child._type === snapshot.context.schema.span.name ? child.text : "").join("") : "").filter((block) => block !== "").join(`
 
 `),
       mimeType: "text/plain",
@@ -3095,10 +3047,10 @@ const decoratorAddActionImplementation = ({
   } : void 0, selection = manualSelection ? toSlateRange(manualSelection, action.editor) ?? editor.selection : editor.selection;
   if (!selection)
     return;
-  const editorSelection = toPortableTextRange(value, selection, context.schema), anchorOffset = editorSelection ? spanSelectionPointToBlockOffset({
+  const editorSelection = toPortableTextRange(value, selection, context.schema), anchorOffset = editorSelection ? selectionPointToBlockOffset({
     value,
     selectionPoint: editorSelection.anchor
-  }) : void 0, focusOffset = editorSelection ? spanSelectionPointToBlockOffset({
+  }) : void 0, focusOffset = editorSelection ? selectionPointToBlockOffset({
     value,
     selectionPoint: editorSelection.focus
   }) : void 0;
@@ -3150,6 +3102,11 @@ const decoratorAddActionImplementation = ({
       });
     }
   } else {
+    if (!Array.from(Editor.nodes(editor, {
+      at: selection,
+      match: (node) => editor.isTextSpan(node)
+    }))?.at(0))
+      return;
     const [block, blockPath] = Editor.node(editor, selection, {
       depth: 1
     }), lonelyEmptySpan = editor.isTextBlock(block) && block.children.length === 1 && editor.isTextSpan(block.children[0]) && block.children[0].text === "" ? block.children[0] : void 0;
@@ -3650,8 +3607,7 @@ const toggleDecoratorActionImplementation = ({
   }) : decoratorAddActionImplementation({
     context,
     action: {
-      editor: action.editor,
-      decorator: action.decorator
+      ...action
     }
   });
 }, debug$8 = debugWithName("API:editable");
@@ -5340,12 +5296,9 @@ function createWithEventListeners(editorActor, subscriptions) {
       editorActor.send({
         type: "behavior event",
         behaviorEvent: {
-          type: "deserialize",
+          type: "input.*",
           originEvent: {
-            type: "input.*",
-            originEvent: {
-              dataTransfer
-            }
+            dataTransfer
           }
         },
         editor
@@ -6110,7 +6063,7 @@ function createSlateEditor(config) {
   if (existingSlateEditor)
     return debug$2("Reusing existing Slate editor instance", config.editorActor.id), existingSlateEditor;
   debug$2("Creating new Slate editor instance", config.editorActor.id);
-  const unsubscriptions = [], subscriptions = [], instance = withPlugins(withReact(createEditor$1()), {
+  const unsubscriptions = [], subscriptions = [], instance = withPlugins(withReact(createEditor()), {
     editorActor: config.editorActor,
     subscriptions
   });
@@ -6176,12 +6129,24 @@ const keyIs = {
   guard: ({
     snapshot,
     event
-  }) => !isActiveDecorator(event.decorator)(snapshot),
+  }) => {
+    const manualSelection = event.offsets ? blockOffsetsToSelection({
+      value: snapshot.context.value,
+      offsets: event.offsets
+    }) : null;
+    return manualSelection ? !isActiveDecorator(event.decorator)({
+      ...snapshot,
+      context: {
+        ...snapshot.context,
+        selection: manualSelection
+      }
+    }) : !isActiveDecorator(event.decorator)(snapshot);
+  },
   actions: [({
     event
   }) => [raise({
-    type: "decorator.add",
-    decorator: event.decorator
+    ...event,
+    type: "decorator.add"
   })]]
 }), toggleListItemOff = defineBehavior({
   on: "list item.toggle",
@@ -6413,17 +6378,17 @@ const keyIs = {
     draggedBlocks,
     dragOrigin,
     originEvent
-  }) => [raise({
-    type: "insert.blocks",
-    blocks: event.data,
-    placement: draggingEntireBlocks ? originEvent.position.block === "start" ? "before" : originEvent.position.block === "end" ? "after" : "auto" : "auto"
-  }), ...draggingEntireBlocks ? draggedBlocks.map((block) => raise({
+  }) => [...draggingEntireBlocks ? draggedBlocks.map((block) => raise({
     type: "delete.block",
     blockPath: block.path
   })) : [raise({
     type: "delete",
     selection: dragOrigin.selection
-  })]]]
+  })], raise({
+    type: "insert.blocks",
+    blocks: event.data,
+    placement: draggingEntireBlocks ? originEvent.position.block === "start" ? "before" : originEvent.position.block === "end" ? "after" : "auto" : "auto"
+  })]]
 }), defineBehavior({
   on: "deserialization.success",
   actions: [({
@@ -6468,6 +6433,15 @@ const keyIs = {
     originEvent: event
   })]]
 }), toggleAnnotationOff, toggleAnnotationOn, toggleDecoratorOff, toggleDecoratorOn, toggleListItemOff, toggleListItemOn, toggleStyleOff, toggleStyleOn, raiseDeserializationSuccessOrFailure, raiseSerializationSuccessOrFailure, raiseInsertSoftBreak];
+function getActiveDecorators({
+  schema,
+  slateEditorInstance
+}) {
+  const decorators = schema.decorators.map((decorator) => decorator.value);
+  return ({
+    ...Editor.marks(slateEditorInstance) ?? {}
+  }.marks ?? []).filter((mark) => decorators.includes(mark));
+}
 function createEditorSnapshot({
   converters,
   editor,
@@ -7063,13 +7037,61 @@ const editorMachine = setup({
     }
   }
 });
-function createEditor(config) {
+function getValue({
+  editorActorSnapshot,
+  slateEditorInstance
+}) {
+  return fromSlateValue(slateEditorInstance.children, editorActorSnapshot.context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(slateEditorInstance));
+}
+function defaultCompare(a, b) {
+  return a === b;
+}
+function useEditorSelector(editor, selector, t0) {
+  const $ = 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], 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: getValue({
+        editorActorSnapshot,
+        slateEditorInstance
+      })
+    },
+    beta: {
+      hasTag: (tag) => editorActorSnapshot.hasTag(tag),
+      internalDrag: editorActorSnapshot.context.internalDrag
+    }
+  };
+}
+function createInternalEditor(config) {
   const editorActor = createActor(editorMachine, {
     input: editorConfigToMachineInput(config)
   });
-  return editorActor.start(), createEditorFromActor(editorActor);
+  return editorActor.start(), createInternalEditorFromActor(editorActor);
 }
-function useCreateEditor(config) {
+function useCreateInternalEditor(config) {
   const $ = c(6);
   let t0;
   $[0] !== config ? (t0 = editorConfigToMachineInput(config), $[0] = config, $[1] = t0) : t0 = $[1];
@@ -7079,7 +7101,7 @@ function useCreateEditor(config) {
   }, $[2] = t0, $[3] = t1) : t1 = $[3];
   const editorActor = useActorRef(editorMachine, t1);
   let t2, t3;
-  return $[4] !== editorActor ? (t3 = createEditorFromActor(editorActor), $[4] = editorActor, $[5] = t3) : t3 = $[5], t2 = t3, t2;
+  return $[4] !== editorActor ? (t3 = createInternalEditorFromActor(editorActor), $[4] = editorActor, $[5] = t3) : t3 = $[5], t2 = t3, t2;
 }
 function editorConfigToMachineInput(config) {
   return {
@@ -7092,7 +7114,7 @@ function editorConfigToMachineInput(config) {
     value: config.initialValue
   };
 }
-function createEditorFromActor(editorActor) {
+function createInternalEditorFromActor(editorActor) {
   const slateEditor = createSlateEditor({
     editorActor
   }), editable = createEditableAPI(slateEditor.instance, editorActor);
@@ -7179,7 +7201,7 @@ class PortableTextEditor extends Component {
    * The editor API (currently implemented with Slate).
    */
   constructor(props) {
-    super(props), props.editor ? this.editor = props.editor : this.editor = createEditor({
+    super(props), props.editor ? this.editor = props.editor : this.editor = createInternalEditor({
       keyGenerator: props.keyGenerator ?? defaultKeyGenerator,
       schema: props.schemaType,
       initialValue: props.value,
@@ -7671,11 +7693,11 @@ function RouteEventsToChanges(props) {
 }
 const EditorContext = React.createContext(void 0);
 function EditorProvider(props) {
-  const $ = c(28), editor = useCreateEditor(props.initialConfig), editorActor = editor._internal.editorActor, slateEditor = editor._internal.slateEditor;
+  const $ = c(28), internalEditor = useCreateInternalEditor(props.initialConfig), editorActor = internalEditor._internal.editorActor, slateEditor = internalEditor._internal.slateEditor;
   let t0, t1;
-  $[0] !== editor ? (t1 = new PortableTextEditor({
-    editor
-  }), $[0] = editor, $[1] = t1) : t1 = $[1], t0 = t1;
+  $[0] !== internalEditor ? (t1 = new PortableTextEditor({
+    editor: internalEditor
+  }), $[0] = internalEditor, $[1] = t1) : t1 = $[1], t0 = t1;
   const portableTextEditor = t0;
   let t2;
   $[2] !== portableTextEditor.change$ ? (t2 = (change) => {
@@ -7694,11 +7716,11 @@ function EditorProvider(props) {
   let t8;
   $[20] !== editorActor || $[21] !== t7 ? (t8 = /* @__PURE__ */ jsx(EditorActorContext.Provider, { value: editorActor, children: t7 }), $[20] = editorActor, $[21] = t7, $[22] = t8) : t8 = $[22];
   let t9;
-  return $[23] !== editor || $[24] !== t3 || $[25] !== t4 || $[26] !== t8 ? (t9 = /* @__PURE__ */ jsxs(EditorContext.Provider, { value: editor, children: [
+  return $[23] !== internalEditor || $[24] !== t3 || $[25] !== t4 || $[26] !== t8 ? (t9 = /* @__PURE__ */ jsxs(EditorContext.Provider, { value: internalEditor, children: [
     t3,
     t4,
     t8
-  ] }), $[23] = editor, $[24] = t3, $[25] = t4, $[26] = t8, $[27] = t9) : t9 = $[27], t9;
+  ] }), $[23] = internalEditor, $[24] = t3, $[25] = t4, $[26] = t8, $[27] = t9) : t9 = $[27], t9;
 }
 function useEditor() {
   const editor = React.useContext(EditorContext);