@portabletext/editor 1.26.0 → 1.26.2

package/lib/index.js

@@ -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,
@@ -2658,7 +2674,10 @@ const converterPortableText = {
     const parsedBlocks = blocks.flatMap((block) => {
       const parsedBlock = parseBlock({
         context,
-        block
+        block,
+        options: {
+          refreshKeys: !0
+        }
       });
       return parsedBlock ? [parsedBlock] : [];
     });
@@ -3229,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;
@@ -3931,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;
@@ -3939,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;
@@ -3947,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;
@@ -5322,7 +5346,10 @@ const blockSetBehaviorActionImplementation = ({
 }) => {
   const parsedBlock = parseBlock({
     block: action.block,
-    context
+    context,
+    options: {
+      refreshKeys: !1
+    }
   });
   if (!parsedBlock)
     throw new Error(`Failed to parse block ${JSON.stringify(action.block)}`);