@portabletext/editor 2.21.3 → 2.21.5

package/lib/index.js

@@ -24,7 +24,7 @@ import { toHTML } from "@portabletext/to-html";
 import { Schema } from "@sanity/schema";
 import flatten from "lodash/flatten.js";
 import omit from "lodash/omit.js";
-import { applyAll, unset, insert, set, setIfMissing, diffMatchPatch as diffMatchPatch$1 } from "@portabletext/patches";
+import { applyAll, unset, insert, setIfMissing, set, diffMatchPatch as diffMatchPatch$1 } from "@portabletext/patches";
 import { createDraft, finishDraft } from "immer";
 import { createKeyboardShortcut, code, underline, italic, bold, undo, redo } from "@portabletext/keyboard-shortcuts";
 import { sliceTextBlock } from "./_chunks-es/util.slice-text-block.js";
@@ -6074,12 +6074,14 @@ function insertNodePatch(schema, children, operation, beforeValue) {
       ...operation.node
     };
     !node._type && Text.isText(node) && (node._type = "span", node.marks = []);
-    const child = fromSlateValue([{
+    const setIfMissingPatch = setIfMissing([], [{
+      _key: block._key
+    }, "children"]), child = fromSlateValue([{
       _key: "bogus",
       _type: schema.block.name,
       children: [node]
     }], schema.block.name)[0].children[0];
-    return [insert([child], position, [{
+    return [setIfMissingPatch, insert([child], position, [{
       _key: block._key
     }, "children", block.children.length <= 1 || !block.children[operation.path[1] - 1] ? 0 : {
       _key: block.children[operation.path[1] - 1]._key
@@ -6121,7 +6123,9 @@ function splitNodePatch(schema, children, operation, beforeValue) {
         ...splitBlock,
         children: splitBlock.children.slice(operation.path[1] + 1, operation.path[1] + 2)
       }], schema.block.name)[0].children;
-      patches.push(insert(targetSpans, "after", [{
+      patches.push(setIfMissing([], [{
+        _key: splitBlock._key
+      }, "children"])), patches.push(insert(targetSpans, "after", [{
         _key: splitBlock._key
       }, "children", {
         _key: splitSpan._key
@@ -6210,7 +6214,9 @@ function moveNodePatch(schema, beforeValue, operation) {
       _key: block._key
     }, "children", {
       _key: child._key
-    }])), patches.push(insert([childToInsert], position, [{
+    }])), patches.push(setIfMissing([], [{
+      _key: targetBlock._key
+    }, "children"])), patches.push(insert([childToInsert], position, [{
       _key: targetBlock._key
     }, "children", {
       _key: targetChild._key
@@ -6474,11 +6480,11 @@ function isTextBlockNode(context, node) {
 function isSpanNode(context, node) {
   return typeof node != "object" || node === null || "children" in node ? !1 : "_type" in node ? node._type === context.schema.span.name : "text" in node;
 }
-function isPartialSpanNode(node) {
-  return typeof node == "object" && node !== null && "text" in node && typeof node.text == "string";
+function isPartialSpanNode(context, node) {
+  return !(typeof node != "object" || node === null || !("text" in node) || typeof node.text != "string" || "_type" in node && node._type !== context.schema.span.name);
 }
 function isObjectNode(context, node) {
-  return !isEditorNode(node) && !isTextBlockNode(context, node) && !isSpanNode(context, node) && !isPartialSpanNode(node);
+  return !isEditorNode(node) && !isTextBlockNode(context, node) && !isSpanNode(context, node) && !isPartialSpanNode(context, node);
 }
 function getBlock(root, path) {
   const index = path.at(0);
@@ -6557,7 +6563,7 @@ function applyOperationToPortableTextDraft(context, root, operation) {
       if (path.length === 2) {
         if (!isTextBlockNode(context, parent))
           break;
-        if (isPartialSpanNode(insertedNode)) {
+        if (isPartialSpanNode(context, insertedNode)) {
           parent.children.splice(index, 0, insertedNode);
           break;
         }
@@ -6593,7 +6599,7 @@ function applyOperationToPortableTextDraft(context, root, operation) {
       if (!node || !prev || !parent)
         break;
       const index = path[path.length - 1];
-      if (isPartialSpanNode(node) && isPartialSpanNode(prev))
+      if (isPartialSpanNode(context, node) && isPartialSpanNode(context, prev))
         prev.text += node.text;
       else if (isTextBlockNode(context, node) && isTextBlockNode(context, prev))
         prev.children.push(...node.children);
@@ -6678,7 +6684,7 @@ function applyOperationToPortableTextDraft(context, root, operation) {
           newProperties.hasOwnProperty(key) || delete node[key];
         break;
       }
-      if (isPartialSpanNode(node)) {
+      if (isPartialSpanNode(context, node)) {
         for (const key in newProperties) {
           if (key === "text")
             break;
@@ -12044,7 +12050,7 @@ function syncBlock({
       type: "patch",
       patch
     });
-  })), validation.valid || validation.resolution?.autoResolve ? (oldBlock._key === block._key ? (debug$2.enabled && debug$2("Updating block", oldBlock, block), Editor.withoutNormalizing(slateEditor, () => {
+  })), validation.valid || validation.resolution?.autoResolve ? (oldBlock._key === block._key && oldBlock._type === block._type ? (debug$2.enabled && debug$2("Updating block", oldBlock, block), Editor.withoutNormalizing(slateEditor, () => {
     withRemoteChanges(slateEditor, () => {
       withoutPatching(slateEditor, () => {
         updateBlock({
@@ -12116,7 +12122,7 @@ function updateBlock({
     }), slateBlock.children.forEach((currentBlockChild, currentBlockChildIndex) => {
       const oldBlockChild = oldBlock.children[currentBlockChildIndex], isChildChanged = !isEqual(currentBlockChild, oldBlockChild), isTextChanged = !isEqual(currentBlockChild.text, oldBlockChild?.text), path = [index, currentBlockChildIndex];
       if (isChildChanged)
-        if (currentBlockChild._key === oldBlockChild?._key) {
+        if (currentBlockChild._key === oldBlockChild?._key && currentBlockChild._type === oldBlockChild?._type) {
           debug$2("Updating changed child", currentBlockChild, oldBlockChild), Transforms.setNodes(slateEditor, currentBlockChild, {
             at: path
           });