@portabletext/editor 1.25.0 → 1.26.1

package/lib/index.js

@@ -23,7 +23,7 @@ import { toHTML } from "@portabletext/to-html";
 import get from "lodash/get.js";
 import isUndefined from "lodash/isUndefined.js";
 import omitBy from "lodash/omitBy.js";
-import { createGuards } from "./_chunks-es/selector.is-active-style.js";
+import { createGuards } from "./_chunks-es/selector.is-at-the-start-of-block.js";
 import { blockOffsetToSpanSelectionPoint } from "./_chunks-es/util.is-empty-text-block.js";
 import { coreBehaviors, isCustomBehaviorEvent, isHotkey } from "./_chunks-es/behavior.core.js";
 import getRandomValues from "get-random-values-esm";
@@ -2523,6 +2523,7 @@ function _temp(s) {
 }
 Synchronizer.displayName = "Synchronizer";
 const converterJson = {
+  mimeType: "application/json",
   serialize: ({
     context,
     event
@@ -2558,8 +2559,7 @@ const converterJson = {
       mimeType: "application/json",
       reason: "No application/x-portable-text Converter found"
     };
-  },
-  mimeType: "application/json"
+  }
 };
 function isTypedObject(object) {
   return isRecord(object) && typeof object._type == "string";
@@ -2569,18 +2569,34 @@ function isRecord(value) {
 }
 function parseBlock({
   context,
-  block
+  block,
+  options
 }) {
   if (!isTypedObject(block) || block._type !== context.schema.block.name && !context.schema.blockObjects.some((blockObject) => blockObject.name === block._type))
     return;
-  if (!isPortableTextTextBlock(block))
+  if (block._type !== context.schema.block.name) {
+    const _key = options.refreshKeys ? context.keyGenerator() : typeof block._key == "string" ? block._key : context.keyGenerator();
     return {
       ...block,
-      _key: context.keyGenerator()
+      _key
+    };
+  }
+  if (!isPortableTextTextBlock(block))
+    return {
+      _type: context.schema.block.name,
+      _key: options.refreshKeys ? context.keyGenerator() : typeof block._key == "string" ? block._key : context.keyGenerator(),
+      children: [{
+        _key: context.keyGenerator(),
+        _type: context.schema.span.name,
+        text: "",
+        marks: []
+      }],
+      markDefs: [],
+      style: context.schema.styles[0].value
     };
   const markDefKeyMap = /* @__PURE__ */ new Map(), markDefs = (block.markDefs ?? []).flatMap((markDef) => {
     if (context.schema.annotations.some((annotation) => annotation.name === markDef._type)) {
-      const _key = context.keyGenerator();
+      const _key = options.refreshKeys ? context.keyGenerator() : markDef._key;
       return markDefKeyMap.set(markDef._key, _key), [{
         ...markDef,
         _key
@@ -2595,17 +2611,17 @@ function parseBlock({
     if (!isPortableTextSpan$1(child))
       return [{
         ...child,
-        _key: context.keyGenerator()
+        _key: options.refreshKeys ? context.keyGenerator() : child._key
       }];
     const marks = (child.marks ?? []).flatMap((mark) => markDefKeyMap.has(mark) ? [markDefKeyMap.get(mark)] : context.schema.decorators.some((decorator) => decorator.value === mark) ? [mark] : []);
     return [{
       ...child,
-      _key: context.keyGenerator(),
+      _key: options.refreshKeys ? context.keyGenerator() : child._key,
       marks
     }];
   }), parsedBlock = {
     ...block,
-    _key: context.keyGenerator(),
+    _key: options.refreshKeys ? context.keyGenerator() : block._key,
     children: children.length > 0 ? children : [{
       _key: context.keyGenerator(),
       _type: context.schema.span.name,
@@ -2621,6 +2637,7 @@ function parseBlock({
   return context.schema.lists.find((list) => list.value === block.listItem) || (delete parsedBlock.listItem, delete parsedBlock.level), parsedBlock;
 }
 const converterPortableText = {
+  mimeType: "application/x-portable-text",
   serialize: ({
     context,
     event
@@ -2657,7 +2674,10 @@ const converterPortableText = {
     const parsedBlocks = blocks.flatMap((block) => {
       const parsedBlock = parseBlock({
         context,
-        block
+        block,
+        options: {
+          refreshKeys: !0
+        }
       });
       return parsedBlock ? [parsedBlock] : [];
     });
@@ -2670,9 +2690,9 @@ const converterPortableText = {
       data: parsedBlocks,
       mimeType: "application/x-portable-text"
     };
-  },
-  mimeType: "application/x-portable-text"
+  }
 }, converterTextHtml = {
+  mimeType: "text/html",
   serialize: ({
     context,
     event
@@ -2717,8 +2737,7 @@ const converterPortableText = {
       unstable_whitespaceOnPasteMode: context.schema.block.options.unstable_whitespaceOnPasteMode
     }),
     mimeType: "text/html"
-  }),
-  mimeType: "text/html"
+  })
 }, converterTextPlain = {
   mimeType: "text/plain",
   serialize: ({
@@ -3013,6 +3032,8 @@ function createWithEventListeners(editorActor, subscriptions) {
           case "annotation.add":
           case "annotation.remove":
           case "annotation.toggle":
+          case "block.set":
+          case "block.unset":
           case "blur":
           case "data transfer.set":
           case "decorator.add":
@@ -3025,6 +3046,7 @@ function createWithEventListeners(editorActor, subscriptions) {
           case "deserialization.failure":
           case "deserialization.success":
           case "focus":
+          case "insert.block":
           case "insert.block object":
           case "insert.inline object":
           case "insert.span":
@@ -3226,21 +3248,23 @@ function createWithObjectKeys(editorActor, schemaTypes) {
         return;
       }
       if (operation.type === "split_node") {
+        const existingKeys = [...Node.descendants(editor)].map(([node]) => node._key);
         apply2({
           ...operation,
           properties: {
             ...operation.properties,
-            _key: editorActor.getSnapshot().context.keyGenerator()
+            _key: operation.properties._key === void 0 || existingKeys.includes(operation.properties._key) ? editorActor.getSnapshot().context.keyGenerator() : operation.properties._key
           }
         });
         return;
       }
       if (operation.type === "insert_node" && !Editor.isEditor(operation.node)) {
+        const existingKeys = [...Node.descendants(editor)].map(([node]) => node._key);
         apply2({
           ...operation,
           node: {
             ...operation.node,
-            _key: editorActor.getSnapshot().context.keyGenerator()
+            _key: operation.node._key === void 0 || existingKeys.includes(operation.node._key) ? editorActor.getSnapshot().context.keyGenerator() : operation.node._key
           }
         });
         return;
@@ -3928,6 +3952,7 @@ function createWithPortableTextMarkModel(editorActor, types) {
           if (atTheEndOfAnnotation && isPortableTextSpan(op.node) && op.node.marks?.some((mark) => annotationsEnding.includes(mark))) {
             Transforms.insertNodes(editor, {
               ...op.node,
+              _key: editorActor.getSnapshot().context.keyGenerator(),
               marks: op.node.marks?.filter((mark) => !annotationsEnding.includes(mark)) ?? []
             });
             return;
@@ -3936,6 +3961,7 @@ function createWithPortableTextMarkModel(editorActor, types) {
           if (atTheStartOfAnnotation && isPortableTextSpan(op.node) && op.node.marks?.some((mark) => annotationsStarting.includes(mark))) {
             Transforms.insertNodes(editor, {
               ...op.node,
+              _key: editorActor.getSnapshot().context.keyGenerator(),
               marks: op.node.marks?.filter((mark) => !annotationsStarting.includes(mark)) ?? []
             });
             return;
@@ -3944,6 +3970,7 @@ function createWithPortableTextMarkModel(editorActor, types) {
           if (nextSpanDecorators.length > 0 && atTheEndOfAnnotation && !atTheStartOfAnnotation && isPortableTextSpan(op.node) && op.node.marks?.length === 0) {
             Transforms.insertNodes(editor, {
               ...op.node,
+              _key: editorActor.getSnapshot().context.keyGenerator(),
               marks: nextSpanDecorators
             });
             return;
@@ -5074,10 +5101,9 @@ function insertBlock({
       });
     } else placement === "before" ? Transforms.insertNodes(editor, block, {
       at: focusBlockPath
-    }) : Editor.insertNode(editor, block);
-    focusBlock && isEqualToEmptyEditor([focusBlock], schema) && Transforms.removeNodes(editor, {
+    }) : (Editor.insertNode(editor, block), focusBlock && isEqualToEmptyEditor([focusBlock], schema) && Transforms.removeNodes(editor, {
       at: focusBlockPath
-    });
+    }));
   } else {
     const lastBlock = Array.from(Editor.nodes(editor, {
       match: (n) => !Editor.isEditor(n),
@@ -5089,7 +5115,47 @@ function insertBlock({
     });
   }
 }
-const dataTransferSetActionImplementation = ({
+const blockSetBehaviorActionImplementation = ({
+  action
+}) => {
+  const location = toSlateRange({
+    anchor: {
+      path: action.at,
+      offset: 0
+    },
+    focus: {
+      path: action.at,
+      offset: 0
+    }
+  }, action.editor);
+  if (!location)
+    return;
+  const {
+    at,
+    editor,
+    type,
+    ...payload
+  } = action;
+  Transforms.setNodes(action.editor, payload, {
+    at: location
+  });
+}, blockUnsetBehaviorActionImplementation = ({
+  action
+}) => {
+  const location = toSlateRange({
+    anchor: {
+      path: action.at,
+      offset: 0
+    },
+    focus: {
+      path: action.at,
+      offset: 0
+    }
+  }, action.editor);
+  location && Transforms.unsetNodes(action.editor, action.props, {
+    at: location
+  });
+}, dataTransferSetActionImplementation = ({
   action
 }) => {
   action.dataTransfer.setData(action.mimeType, action.data);
@@ -5146,96 +5212,54 @@ const dataTransferSetActionImplementation = ({
   const keyGenerator = context.keyGenerator, schema = context.schema, editor = action.editor;
   if (!editor.selection)
     return;
-  const [focusSpan] = Array.from(Editor.nodes(editor, {
-    mode: "lowest",
-    at: editor.selection.focus,
-    match: (n) => editor.isTextSpan(n),
-    voids: !1
-  }))[0] ?? [void 0], focusDecorators = focusSpan?.marks?.filter((mark) => schema.decorators.some((decorator) => decorator.value === mark)) ?? [], focusAnnotations = focusSpan?.marks?.filter((mark) => !schema.decorators.some((decorator) => decorator.value === mark)) ?? [], 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)) {
-    const [start, end] = Range.edges(editor.selection), lastFocusBlockChild = focusBlock.children[focusBlock.children.length - 1], atTheEndOfBlock = isEqual(start, {
-      path: [...focusBlockPath, focusBlock.children.length - 1],
-      offset: editor.isTextSpan(lastFocusBlockChild) ? lastFocusBlockChild.text.length : 0
-    }), atTheStartOfBlock = isEqual(end, {
-      path: [...focusBlockPath, 0],
-      offset: 0
-    });
-    if (atTheEndOfBlock && Range.isCollapsed(editor.selection)) {
-      Editor.insertNode(editor, editor.pteCreateTextBlock({
-        decorators: [],
-        listItem: focusBlock.listItem,
-        level: focusBlock.level
-      }));
-      return;
-    }
-    if (atTheStartOfBlock && Range.isCollapsed(editor.selection)) {
-      Editor.insertNode(editor, editor.pteCreateTextBlock({
-        decorators: focusAnnotations.length === 0 ? focusDecorators : [],
-        listItem: focusBlock.listItem,
-        level: focusBlock.level
-      }));
-      const [nextBlockPath] = Path.next(focusBlockPath);
-      Transforms.select(editor, {
+  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]) {
+    Editor.withoutNormalizing(editor, () => {
+      if (!editor.selection)
+        return;
+      Transforms.splitNodes(editor, {
+        at: editor.selection
+      });
+      const [nextNode, nextNodePath] = Editor.node(editor, Path.next(focusBlockPath), {
+        depth: 1
+      });
+      if (Transforms.setSelection(editor, {
         anchor: {
-          path: [nextBlockPath, 0],
+          path: [...nextNodePath, 0],
           offset: 0
         },
         focus: {
-          path: [nextBlockPath, 0],
+          path: [...nextNodePath, 0],
           offset: 0
         }
-      });
-      return;
-    }
-    const selectionAcrossBlocks = anchorBlockPath[0] !== focusBlockPath[0];
-    if (!atTheStartOfBlock && !atTheEndOfBlock && !selectionAcrossBlocks) {
-      Editor.withoutNormalizing(editor, () => {
-        if (!editor.selection)
-          return;
-        Transforms.splitNodes(editor, {
-          at: editor.selection
-        });
-        const [nextNode, nextNodePath] = Editor.node(editor, Path.next(focusBlockPath), {
-          depth: 1
-        });
-        if (Transforms.setSelection(editor, {
-          anchor: {
-            path: [...nextNodePath, 0],
-            offset: 0
-          },
-          focus: {
-            path: [...nextNodePath, 0],
-            offset: 0
-          }
-        }), editor.isTextBlock(nextNode) && nextNode.markDefs && nextNode.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, nextNodePath);
-          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 = nextNode.markDefs.map((markDef) => ({
-            ...markDef,
-            _key: newMarkDefKeys.get(markDef._key) ?? markDef._key
-          }));
-          isEqual(nextNode.markDefs, newMarkDefs) || Transforms.setNodes(editor, {
-            markDefs: newMarkDefs
+      }), editor.isTextBlock(nextNode) && nextNode.markDefs && nextNode.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, nextNodePath);
+        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: nextNodePath,
-            match: (node) => editor.isTextBlock(node)
+            at: childPath
           });
         }
-      }), editor.onChange();
-      return;
-    }
+        const newMarkDefs = nextNode.markDefs.map((markDef) => ({
+          ...markDef,
+          _key: newMarkDefKeys.get(markDef._key) ?? markDef._key
+        }));
+        isEqual(nextNode.markDefs, newMarkDefs) || Transforms.setNodes(editor, {
+          markDefs: newMarkDefs
+        }, {
+          at: nextNodePath,
+          match: (node) => editor.isTextBlock(node)
+        });
+      }
+    }), editor.onChange();
+    return;
   }
   Transforms.splitNodes(editor, {
     always: !0
@@ -5316,6 +5340,30 @@ const dataTransferSetActionImplementation = ({
     text: action.text,
     marks: [...annotations?.map((annotation) => annotation._key) ?? [], ...action.decorators ?? []]
   });
+}, insertBlockActionImplementation = ({
+  context,
+  action
+}) => {
+  const parsedBlock = parseBlock({
+    block: action.block,
+    context,
+    options: {
+      refreshKeys: !1
+    }
+  });
+  if (!parsedBlock)
+    throw new Error(`Failed to parse block ${JSON.stringify(action.block)}`);
+  const fragment = toSlateValue([parsedBlock], {
+    schemaTypes: context.schema
+  })[0];
+  if (!fragment)
+    throw new Error(`Failed to convert block to Slate fragment ${JSON.stringify(parsedBlock)}`);
+  insertBlock({
+    block: fragment,
+    placement: action.placement,
+    editor: action.editor,
+    schema: context.schema
+  });
 }, textBlockSetActionImplementation = ({
   action
 }) => {
@@ -5362,6 +5410,8 @@ const dataTransferSetActionImplementation = ({
   "annotation.add": addAnnotationActionImplementation,
   "annotation.remove": removeAnnotationActionImplementation,
   "annotation.toggle": toggleAnnotationActionImplementation,
+  "block.set": blockSetBehaviorActionImplementation,
+  "block.unset": blockUnsetBehaviorActionImplementation,
   blur: ({
     action
   }) => {
@@ -5452,6 +5502,7 @@ const dataTransferSetActionImplementation = ({
       }
     });
   },
+  "insert.block": insertBlockActionImplementation,
   "insert.blocks": insertBlocksActionImplementation,
   "insert.block object": insertBlockObjectActionImplementation,
   "insert.break": insertBreakActionImplementation,
@@ -5601,13 +5652,6 @@ function performAction({
       });
       break;
     }
-    case "select": {
-      behaviorActionImplementations.select({
-        context,
-        action
-      });
-      break;
-    }
     default:
       performDefaultAction({
         context,
@@ -5641,6 +5685,20 @@ function performDefaultAction({
       });
       break;
     }
+    case "block.set": {
+      behaviorActionImplementations["block.set"]({
+        context,
+        action
+      });
+      break;
+    }
+    case "block.unset": {
+      behaviorActionImplementations["block.unset"]({
+        context,
+        action
+      });
+      break;
+    }
     case "blur": {
       behaviorActionImplementations.blur({
         context,
@@ -5725,6 +5783,13 @@ function performDefaultAction({
       });
       break;
     }
+    case "insert.block": {
+      behaviorActionImplementations["insert.block"]({
+        context,
+        action
+      });
+      break;
+    }
     case "insert.blocks": {
       behaviorActionImplementations["insert.blocks"]({
         context,
@@ -5886,13 +5951,11 @@ function performDefaultAction({
       });
       break;
     }
-    case "text block.unset": {
+    default:
       behaviorActionImplementations["text block.unset"]({
         context,
         action
       });
-      break;
-    }
   }
 }
 function getActiveDecorators({
@@ -6273,6 +6336,11 @@ const editorMachine = setup({
                 event
               }) => event)
             },
+            "block.*": {
+              actions: emit(({
+                event
+              }) => event)
+            },
             blur: {
               actions: emit(({
                 event