@portabletext/editor 4.0.2 → 4.1.0

package/lib/index.js

@@ -4774,6 +4774,9 @@ function createApplyPatch(context) {
         case "set":
           changed = setPatch(editor, patch);
           break;
+        case "setIfMissing":
+          changed = setPatch(editor, patch);
+          break;
         case "diffMatchPatch":
           changed = diffMatchPatch(editor, patch);
           break;
@@ -4899,6 +4902,8 @@ function setPatch(editor, patch) {
   if (isTextBlock2 && child) {
     if (Text.isText(child.node))
       if (Text.isText(value)) {
+        if (patch.type === "setIfMissing")
+          return !1;
         const oldText = child.node.text, newText = value.text;
         oldText !== newText && (editor.apply({
           type: "remove_text",
@@ -4939,38 +4944,6 @@ function setPatch(editor, patch) {
       });
     }
     return !0;
-  } else if (Element$1.isElement(block.node) && patch.path.length === 1) {
-    const {
-      children,
-      ...nextRest
-    } = value, {
-      children: _prevChildren,
-      ...prevRest
-    } = block.node || {
-      children: void 0
-    };
-    editor.apply({
-      type: "set_node",
-      path: [block.index],
-      properties: {
-        ...prevRest
-      },
-      newProperties: nextRest
-    });
-    const blockNode = block.node;
-    blockNode.children.forEach((child2, childIndex) => {
-      editor.apply({
-        type: "remove_node",
-        path: [block.index, blockNode.children.length - 1 - childIndex],
-        node: child2
-      });
-    }), Array.isArray(children) && children.forEach((child2, childIndex) => {
-      editor.apply({
-        type: "insert_node",
-        path: [block.index, childIndex],
-        node: child2
-      });
-    });
   } else if (block && "value" in block.node)
     if (patch.path.length > 1 && patch.path[1] !== "children") {
       const newVal = applyAll(block.node.value, [{
@@ -9289,7 +9262,11 @@ const abstractDeserializeBehaviors = [
       originEvent: event
     })]]
   })
-], abstractInsertBehaviors = [
+];
+function getUniqueBlockKey(blockKey) {
+  return (snapshot) => !blockKey || snapshot.blockIndexMap.has(blockKey) ? snapshot.context.keyGenerator() : blockKey;
+}
+const abstractInsertBehaviors = [
   defineBehavior({
     on: "insert.blocks",
     guard: ({
@@ -9319,7 +9296,7 @@ const abstractDeserializeBehaviors = [
     }) => {
       if (event.placement !== "before")
         return !1;
-      const firstBlockKey = event.blocks.at(0)?._key ?? snapshot.context.keyGenerator(), lastBlockKey = event.blocks.at(-1)?._key ?? snapshot.context.keyGenerator();
+      const firstBlockKey = getUniqueBlockKey(event.blocks.at(0)?._key)(snapshot), lastBlockKey = getUniqueBlockKey(event.blocks.at(-1)?._key)(snapshot);
       return {
         firstBlockKey,
         lastBlockKey
@@ -9333,7 +9310,13 @@ const abstractDeserializeBehaviors = [
       lastBlockKey
     }) => [...event.blocks.map((block, index) => raise({
       type: "insert.block",
-      block,
+      block: index === 0 ? {
+        ...block,
+        _key: firstBlockKey
+      } : index === event.blocks.length - 1 ? {
+        ...block,
+        _key: lastBlockKey
+      } : block,
       placement: index === 0 ? "before" : "after",
       select: index !== event.blocks.length - 1 ? "end" : "none"
     })), ...event.select === "none" ? [raise({
@@ -9361,7 +9344,7 @@ const abstractDeserializeBehaviors = [
     }) => {
       if (event.placement !== "after")
         return !1;
-      const firstBlockKey = event.blocks.at(0)?._key ?? snapshot.context.keyGenerator(), lastBlockKey = event.blocks.at(-1)?._key ?? snapshot.context.keyGenerator();
+      const firstBlockKey = getUniqueBlockKey(event.blocks.at(0)?._key)(snapshot), lastBlockKey = getUniqueBlockKey(event.blocks.at(-1)?._key)(snapshot);
       return {
         firstBlockKey,
         lastBlockKey
@@ -9375,7 +9358,13 @@ const abstractDeserializeBehaviors = [
       lastBlockKey
     }) => [...event.blocks.map((block, index) => raise({
       type: "insert.block",
-      block,
+      block: index === 0 ? {
+        ...block,
+        _key: firstBlockKey
+      } : index === event.blocks.length - 1 ? {
+        ...block,
+        _key: lastBlockKey
+      } : block,
       placement: "after",
       select: index !== event.blocks.length - 1 ? "end" : "none"
     })), ...event.select === "none" ? [raise({
@@ -9406,7 +9395,7 @@ const abstractDeserializeBehaviors = [
       const focusTextBlock = getFocusTextBlock(snapshot);
       if (!focusTextBlock || !isEmptyTextBlock(snapshot.context, focusTextBlock.node))
         return !1;
-      const firstBlockKey = event.blocks.at(0)?._key ?? snapshot.context.keyGenerator(), lastBlockKey = event.blocks.at(-1)?._key ?? snapshot.context.keyGenerator();
+      const firstBlockKey = getUniqueBlockKey(event.blocks.at(0)?._key)(snapshot), lastBlockKey = getUniqueBlockKey(event.blocks.at(-1)?._key)(snapshot);
       return {
         focusTextBlock,
         firstBlockKey,
@@ -9420,10 +9409,22 @@ const abstractDeserializeBehaviors = [
       lastBlockKey
     }) => [...event.blocks.map((block, index) => raise({
       type: "insert.block",
-      block,
+      block: index === 0 ? {
+        ...block,
+        _key: firstBlockKey
+      } : index === event.blocks.length - 1 ? {
+        ...block,
+        _key: lastBlockKey
+      } : block,
       placement: index === 0 ? "auto" : "after",
       select: index !== event.blocks.length - 1 ? "end" : "none"
-    })), ...event.select === "none" || event.select === "start" ? [raise({
+    })), ...event.select === "none" ? [raise({
+      type: "select.block",
+      at: [{
+        _key: firstBlockKey
+      }],
+      select: "start"
+    })] : event.select === "start" ? [raise({
       type: "select.block",
       at: [{
         _key: firstBlockKey
@@ -9463,23 +9464,28 @@ const abstractDeserializeBehaviors = [
           }
         },
         block: focusTextBlock.node
-      });
+      }), firstBlockKey = getUniqueBlockKey(event.blocks.at(0)?._key)(snapshot), lastBlockKey = getUniqueBlockKey(event.blocks.at(-1)?._key)(snapshot), isFirstBlockTextBlock = isTextBlock(snapshot.context, event.blocks.at(0));
       return {
-        firstBlockKey: event.blocks.at(0)?._key ?? snapshot.context.keyGenerator(),
+        firstBlockKey,
+        lastBlockKey,
         focusBlockStartPoint,
         focusBlockEndPoint,
         focusTextBlockAfter,
-        selection: snapshot.context.selection
+        selection: snapshot.context.selection,
+        isFirstBlockTextBlock
       };
     },
     actions: [({
+      snapshot,
       event
     }, {
       focusBlockEndPoint,
       focusTextBlockAfter,
       selection,
       firstBlockKey,
-      focusBlockStartPoint
+      lastBlockKey,
+      focusBlockStartPoint,
+      isFirstBlockTextBlock
     }) => [...event.blocks.flatMap((block, index) => index === 0 ? [...isEqualSelectionPoints(selection.focus, focusBlockEndPoint) ? [] : [raise({
       type: "delete",
       at: {
@@ -9488,20 +9494,26 @@ const abstractDeserializeBehaviors = [
       }
     })], raise({
       type: "insert.block",
-      block,
+      block: {
+        ...block,
+        _key: firstBlockKey
+      },
       placement: "auto",
       select: "end"
     })] : index === event.blocks.length - 1 ? [raise({
       type: "insert.block",
-      block,
+      block: {
+        ...block,
+        _key: lastBlockKey
+      },
       placement: "after",
       select: "end"
-    }), raise({
+    }), ...isEmptyTextBlock(snapshot.context, focusTextBlockAfter) ? [] : [raise({
       type: "insert.block",
       block: focusTextBlockAfter,
       placement: "auto",
       select: event.select === "end" ? "none" : "end"
-    })] : [raise({
+    })]] : [raise({
       type: "insert.block",
       block,
       placement: "after",
@@ -9509,7 +9521,7 @@ const abstractDeserializeBehaviors = [
     })]), ...event.select === "none" ? [raise({
       type: "select",
       at: selection
-    })] : event.select === "start" ? [isEqualSelectionPoints(selection.focus, focusBlockStartPoint) ? raise({
+    })] : event.select === "start" ? [isEqualSelectionPoints(selection.focus, focusBlockStartPoint) || !isFirstBlockTextBlock ? raise({
       type: "select.block",
       at: [{
         _key: firstBlockKey
@@ -9526,16 +9538,51 @@ const abstractDeserializeBehaviors = [
   defineBehavior({
     on: "insert.blocks",
     guard: ({
+      snapshot,
       event
-    }) => event.placement === "auto",
+    }) => {
+      if (event.placement !== "auto")
+        return !1;
+      const selection = snapshot.context.selection, firstBlockKey = getUniqueBlockKey(event.blocks.at(0)?._key)(snapshot), lastBlockKey = getUniqueBlockKey(event.blocks.at(-1)?._key)(snapshot);
+      return {
+        firstBlockKey,
+        lastBlockKey,
+        selection
+      };
+    },
     actions: [({
       event
-    }) => event.blocks.map((block, index) => raise({
+    }, {
+      firstBlockKey,
+      lastBlockKey,
+      selection
+    }) => [...event.blocks.map((block, index) => raise({
       type: "insert.block",
-      block,
+      block: index === 0 ? {
+        ...block,
+        _key: firstBlockKey
+      } : index === event.blocks.length - 1 ? {
+        ...block,
+        _key: lastBlockKey
+      } : block,
       placement: index === 0 ? "auto" : "after",
-      select: event.select ?? "end"
-    }))]
+      select: index !== event.blocks.length - 1 ? "end" : event.select ?? "end"
+    })), ...event.select === "none" ? [raise({
+      type: "select",
+      at: selection
+    })] : event.select === "start" ? [raise({
+      type: "select.block",
+      at: [{
+        _key: firstBlockKey
+      }],
+      select: "start"
+    })] : [raise({
+      type: "select.block",
+      at: [{
+        _key: lastBlockKey
+      }],
+      select: "end"
+    })]]]
   }),
   defineBehavior({
     on: "insert.break",