@portabletext/editor 2.21.3 → 2.21.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "2.21.3",
+  "version": "2.21.4",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -73,9 +73,9 @@
     "slate-dom": "^0.119.0",
     "slate-react": "0.119.0",
     "xstate": "^5.24.0",
-    "@portabletext/block-tools": "^4.0.2",
     "@portabletext/keyboard-shortcuts": "^2.1.0",
     "@portabletext/patches": "^2.0.0",
+    "@portabletext/block-tools": "^4.0.2",
     "@portabletext/schema": "^2.0.0"
   },
   "devDependencies": {
@@ -107,8 +107,8 @@
     "vitest": "^4.0.8",
     "vitest-browser-react": "^2.0.2",
     "@portabletext/sanity-bridge": "1.2.2",
-    "@portabletext/test": "^1.0.0",
-    "racejar": "2.0.0"
+    "racejar": "2.0.0",
+    "@portabletext/test": "^1.0.0"
   },
   "peerDependencies": {
     "@portabletext/sanity-bridge": "^1.2.2",

package/src/editor/sync-machine.ts

@@ -757,8 +757,10 @@ function syncBlock({
   }
 
   if (validation.valid || validation.resolution?.autoResolve) {
-    if (oldBlock._key === block._key) {
-      if (debug.enabled) debug('Updating block', oldBlock, block)
+    if (oldBlock._key === block._key && oldBlock._type === block._type) {
+      if (debug.enabled) {
+        debug('Updating block', oldBlock, block)
+      }
 
       Editor.withoutNormalizing(slateEditor, () => {
         withRemoteChanges(slateEditor, () => {
@@ -908,8 +910,11 @@ function updateBlock({
       const path = [index, currentBlockChildIndex]
 
       if (isChildChanged) {
-        // Update if this is the same child
-        if (currentBlockChild._key === oldBlockChild?._key) {
+        // Update if this is the same child (same key and type)
+        if (
+          currentBlockChild._key === oldBlockChild?._key &&
+          currentBlockChild._type === oldBlockChild?._type
+        ) {
           debug('Updating changed child', currentBlockChild, oldBlockChild)
 
           Transforms.setNodes(slateEditor, currentBlockChild as Partial<Node>, {
@@ -949,7 +954,6 @@ function updateBlock({
             )
           }
         } else if (oldBlockChild) {
-          // Replace the child if _key's are different
           debug('Replacing child', currentBlockChild)
 
           Transforms.removeNodes(slateEditor, {

package/src/internal-utils/operation-to-patches.test.ts

@@ -141,6 +141,16 @@ describe('operationToPatches', () => {
       ),
     ).toMatchInlineSnapshot(`
       [
+        {
+          "path": [
+            {
+              "_key": "1f2e64b47787",
+            },
+            "children",
+          ],
+          "type": "setIfMissing",
+          "value": [],
+        },
         {
           "items": [
             {
@@ -285,6 +295,16 @@ describe('operationToPatches', () => {
       ),
     ).toMatchInlineSnapshot(`
       [
+        {
+          "path": [
+            {
+              "_key": "1f2e64b47787",
+            },
+            "children",
+          ],
+          "type": "setIfMissing",
+          "value": [],
+        },
         {
           "items": [
             {

package/src/internal-utils/operation-to-patches.ts

@@ -314,6 +314,9 @@ export function insertNodePatch(
       node._type = 'span'
       node.marks = []
     }
+
+    // Defensive setIfMissing to ensure children array exists before inserting
+    const setIfMissingPatch = setIfMissing([], [{_key: block._key}, 'children'])
     const blk = fromSlateValue(
       [
         {
@@ -326,6 +329,7 @@ export function insertNodePatch(
     )[0] as PortableTextTextBlock
     const child = blk.children[0]
     return [
+      setIfMissingPatch,
       insert([child], position, [
         {_key: block._key},
         'children',
@@ -389,6 +393,8 @@ export function splitNodePatch(
         )[0] as PortableTextTextBlock
       ).children
 
+      // Defensive setIfMissing to ensure children array exists before inserting
+      patches.push(setIfMissing([], [{_key: splitBlock._key}, 'children']))
       patches.push(
         insert(targetSpans, 'after', [
           {_key: splitBlock._key},
@@ -563,6 +569,8 @@ export function moveNodePatch(
       fromSlateValue([block], schema.block.name)[0] as PortableTextTextBlock
     ).children[operation.path[1]]
     patches.push(unset([{_key: block._key}, 'children', {_key: child._key}]))
+    // Defensive setIfMissing to ensure children array exists before inserting
+    patches.push(setIfMissing([], [{_key: targetBlock._key}, 'children']))
     patches.push(
       insert([childToInsert], position, [
         {_key: targetBlock._key},