@portabletext/editor 4.3.3 → 4.3.5

package/lib/index.js

@@ -283,7 +283,7 @@ function isEqualToEmptyEditor(initialValue, blocks, schemaTypes) {
   if (!Element$1.isElement(firstBlock) || firstBlock._type !== schemaTypes.block.name || "listItem" in firstBlock || !("style" in firstBlock) || firstBlock.style !== schemaTypes.styles.at(0)?.name || !Array.isArray(firstBlock.children) || firstBlock.children.length !== 1)
     return !1;
   const firstChild = firstBlock.children.at(0);
-  return !(!firstChild || !Text.isText(firstChild) || !("_type" in firstChild) || firstChild._type !== schemaTypes.span.name || firstChild.text !== "" || firstChild.marks?.join("") || Object.keys(firstBlock).some((key) => key !== "_type" && key !== "_key" && key !== "children" && key !== "markDefs" && key !== "style") || isEqualValues({
+  return !(!firstChild || !Text.isText(firstChild) || !("_type" in firstChild) || firstChild._type !== schemaTypes.span.name || firstChild.text !== "" || firstChild.marks?.join("") || "markDefs" in firstBlock && Array.isArray(firstBlock.markDefs) && firstBlock.markDefs.length > 0 || Object.keys(firstBlock).some((key) => key !== "_type" && key !== "_key" && key !== "children" && key !== "markDefs" && key !== "style") || isEqualValues({
     schema: schemaTypes
   }, initialValue, [firstBlock]));
 }
@@ -5218,11 +5218,21 @@ function mergeNodePatch(schema, children, operation, beforeValue) {
     }, updatedBlock.children[operation.path[1] - 1]) ? updatedBlock.children[operation.path[1] - 1] : void 0, removedSpan = block.children[operation.path[1]] && isSpan({
       schema
     }, block.children[operation.path[1]]) ? block.children[operation.path[1]] : void 0;
-    updatedSpan && (block.children.filter((span) => span._key === updatedSpan._key).length === 1 ? patches.push(set(updatedSpan.text, [{
-      _key: block._key
-    }, "children", {
-      _key: updatedSpan._key
-    }, "text"])) : console.warn(`Multiple spans have \`_key\` ${updatedSpan._key}. It's ambiguous which one to update.`, JSON.stringify(block, null, 2))), removedSpan && (block.children.filter((span) => span._key === removedSpan._key).length === 1 ? patches.push(unset([{
+    if (updatedSpan) {
+      const spansMatchingKey = block.children.filter((span) => span._key === updatedSpan._key);
+      if (spansMatchingKey.length === 1) {
+        const prevSpan = spansMatchingKey[0];
+        isSpan({
+          schema
+        }, prevSpan) && prevSpan.text !== updatedSpan.text && patches.push(set(updatedSpan.text, [{
+          _key: block._key
+        }, "children", {
+          _key: updatedSpan._key
+        }, "text"]));
+      } else
+        console.warn(`Multiple spans have \`_key\` ${updatedSpan._key}. It's ambiguous which one to update.`, JSON.stringify(block, null, 2));
+    }
+    removedSpan && (block.children.filter((span) => span._key === removedSpan._key).length === 1 ? patches.push(unset([{
       _key: block._key
     }, "children", {
       _key: removedSpan._key
@@ -12907,7 +12917,7 @@ function syncBlock({
       type: "patch",
       patch
     });
-  })), validation.valid || validation.resolution?.autoResolve ? (oldBlock._key === block._key ? (debug.syncValue("Updating block", oldBlock, block), Editor.withoutNormalizing(slateEditor, () => {
+  })), validation.valid || validation.resolution?.autoResolve ? (oldBlock._key === block._key && oldBlock._type === block._type ? (debug.syncValue("Updating block", oldBlock, block), Editor.withoutNormalizing(slateEditor, () => {
     withRemoteChanges(slateEditor, () => {
       withoutPatching(slateEditor, () => {
         updateBlock({
@@ -12979,7 +12989,7 @@ function updateBlock({
     }), slateBlock.children.forEach((currentBlockChild, currentBlockChildIndex) => {
       const oldBlockChild = oldSlateBlock.children.at(currentBlockChildIndex), isChildChanged = !oldBlockChild || !isEqualChild(currentBlockChild, oldBlockChild), isTextChanged = oldBlockChild && Text.isText(oldBlockChild) && currentBlockChild.text !== oldBlockChild.text, path = [index, currentBlockChildIndex];
       if (isChildChanged)
-        if (currentBlockChild._key === oldBlockChild?._key) {
+        if (currentBlockChild._key === oldBlockChild?._key && currentBlockChild._type === oldBlockChild?._type) {
           debug.syncValue("Updating changed child", currentBlockChild, oldBlockChild), Transforms.setNodes(slateEditor, currentBlockChild, {
             at: path
           });