@portabletext/editor 1.0.16 → 1.0.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -51,6 +51,7 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
+    "@jest/types": "^29.6.3",
     "@playwright/test": "1.46.1",
     "@portabletext/toolkit": "^2.0.15",
     "@sanity/block-tools": "^3.55.0",

package/src/editor/plugins/createWithEditableAPI.ts

@@ -419,16 +419,7 @@ export function createWithEditableAPI(
                 )
               }
               editor.onChange()
-              if (editor.selection) {
-                // Insert an empty string to continue writing non-annotated text
-                Transforms.insertNodes(
-                  editor,
-                  [{_type: 'span', text: '', marks: [], _key: keyGenerator()}],
-                  {
-                    at: Range.end(editor.selection),
-                  },
-                )
-              }
+
               const newPortableTextEditorSelection = toPortableTextRange(
                 fromSlateValue(editor.children, types.block.name, KEY_TO_VALUE_ELEMENT.get(editor)),
                 editor.selection,

package/src/utils/operationToPatches.ts

@@ -264,9 +264,19 @@ export function createOperationToPatches(types: PortableTextMemberSchemaTypes):
       }
       throw new Error('Block not found')
     } else if (editor.isTextBlock(block) && operation.path.length === 2) {
-      const spanToRemove =
-        editor.isTextBlock(block) && block.children && block.children[operation.path[1]]
+      const spanToRemove = block.children[operation.path[1]]
+
       if (spanToRemove) {
+        const spansMatchingKey = block.children.filter((span) => span._key === operation.node._key)
+
+        if (spansMatchingKey.length > 1) {
+          console.warn(
+            `Multiple spans have \`_key\` ${operation.node._key}. It's ambiguous which one to remove.`,
+            JSON.stringify(block, null, 2),
+          )
+          return []
+        }
+
         return [unset([{_key: block._key}, 'children', {_key: spanToRemove._key}])]
       }
       debug('Span not found in editor trying to remove node')
@@ -285,7 +295,7 @@ export function createOperationToPatches(types: PortableTextMemberSchemaTypes):
     const patches: Patch[] = []
 
     const block = beforeValue[operation.path[0]]
-    const targetBlock = editor.children[operation.path[0]]
+    const updatedBlock = editor.children[operation.path[0]]
 
     if (operation.path.length === 1) {
       if (block?._key) {
@@ -295,17 +305,51 @@ export function createOperationToPatches(types: PortableTextMemberSchemaTypes):
       } else {
         throw new Error('Target key not found!')
       }
-    } else if (operation.path.length === 2 && editor.isTextBlock(targetBlock)) {
-      const mergedSpan =
-        (editor.isTextBlock(block) && block.children[operation.path[1]]) || undefined
-      const targetSpan = targetBlock.children[operation.path[1] - 1]
-      if (editor.isTextSpan(targetSpan)) {
-        // Set the merged span with it's new value
-        patches.push(
-          set(targetSpan.text, [{_key: block._key}, 'children', {_key: targetSpan._key}, 'text']),
-        )
-        if (mergedSpan) {
-          patches.push(unset([{_key: block._key}, 'children', {_key: mergedSpan._key}]))
+    } else if (
+      editor.isTextBlock(block) &&
+      editor.isTextBlock(updatedBlock) &&
+      operation.path.length === 2
+    ) {
+      const updatedSpan =
+        updatedBlock.children[operation.path[1] - 1] &&
+        editor.isTextSpan(updatedBlock.children[operation.path[1] - 1])
+          ? updatedBlock.children[operation.path[1] - 1]
+          : undefined
+      const removedSpan =
+        block.children[operation.path[1]] && editor.isTextSpan(block.children[operation.path[1]])
+          ? block.children[operation.path[1]]
+          : undefined
+
+      if (updatedSpan) {
+        const spansMatchingKey = block.children.filter((span) => span._key === updatedSpan._key)
+
+        if (spansMatchingKey.length === 1) {
+          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),
+          )
+        }
+      }
+
+      if (removedSpan) {
+        const spansMatchingKey = block.children.filter((span) => span._key === removedSpan._key)
+
+        if (spansMatchingKey.length === 1) {
+          patches.push(unset([{_key: block._key}, 'children', {_key: removedSpan._key}]))
+        } else {
+          console.warn(
+            `Multiple spans have \`_key\` ${removedSpan._key}. It's ambiguous which one to remove.`,
+            JSON.stringify(block, null, 2),
+          )
         }
       }
     } else {