@portabletext/editor 2.15.2 → 2.15.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "2.15.2",
+  "version": "2.15.4",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",

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

@@ -9,7 +9,6 @@ import {
 } from '@portabletext/patches'
 import {isSpan, isTextBlock} from '@portabletext/schema'
 import type {Path, PortableTextSpan, PortableTextTextBlock} from '@sanity/types'
-import {get} from 'lodash'
 import {
   Element,
   Text,
@@ -124,6 +123,12 @@ export function setNodePatch(
         }
       }
 
+      for (const key of Object.keys(operation.properties)) {
+        if (!(key in operation.newProperties)) {
+          patches.push(unset([{_key: block._key}, key]))
+        }
+      }
+
       return patches
     } else {
       const patches: Patch[] = []
@@ -134,20 +139,32 @@ export function setNodePatch(
         patches.push(set(_key, [blockIndex, '_key']))
       }
 
-      const properties =
+      const newValue =
         'value' in operation.newProperties &&
         typeof operation.newProperties.value === 'object'
           ? (operation.newProperties.value as Record<string, unknown>)
           : ({} satisfies Record<string, unknown>)
 
-      const keys = Object.keys(properties)
+      const keys = Object.keys(newValue)
 
       for (const key of keys) {
-        const value = properties[key]
+        const value = newValue[key]
 
         patches.push(set(value, [{_key: block._key}, key]))
       }
 
+      const value =
+        'value' in operation.properties &&
+        typeof operation.properties.value === 'object'
+          ? (operation.properties.value as Record<string, unknown>)
+          : ({} satisfies Record<string, unknown>)
+
+      for (const key of Object.keys(value)) {
+        if (!(key in newValue)) {
+          patches.push(unset([{_key: block._key}, key]))
+        }
+      }
+
       return patches
     }
   } else if (operation.path.length === 2) {
@@ -196,31 +213,48 @@ export function setNodePatch(
           return patches
         }
 
-        const keys = Object.keys(operation.newProperties)
-        keys.forEach((keyName) => {
-          // Special case for setting _key on a child. We have to target it by index and not the _key.
-          if (keys.length === 1 && keyName === '_key') {
-            const val = get(operation.newProperties, keyName)
+        const newPropNames = Object.keys(operation.newProperties)
+
+        for (const keyName of newPropNames) {
+          const value = (operation.newProperties as Record<string, unknown>)[
+            keyName
+          ]
+
+          if (keyName === '_key') {
             patches.push(
-              set(val, [
+              set(value, [
                 {_key: blockKey},
                 'children',
                 block.children.indexOf(child),
                 keyName,
               ]),
             )
-          } else {
-            const val = get(operation.newProperties, keyName)
-            patches.push(
-              set(val, [
-                {_key: blockKey},
-                'children',
-                {_key: childKey},
-                keyName,
-              ]),
-            )
+
+            continue
           }
-        })
+
+          patches.push(
+            set(value, [
+              {_key: blockKey},
+              'children',
+              {_key: childKey},
+              keyName,
+            ]),
+          )
+        }
+
+        const propNames = Object.keys(operation.properties)
+
+        for (const keyName of propNames) {
+          if (keyName in operation.newProperties) {
+            continue
+          }
+
+          patches.push(
+            unset([{_key: blockKey}, 'children', {_key: childKey}, keyName]),
+          )
+        }
+
         return patches
       }
       throw new Error('Could not find a valid child')

package/src/operations/behavior.operation.child.unset.ts

@@ -33,18 +33,14 @@ export const childUnsetOperationImplementation: BehaviorOperationImplementation<
   }
 
   if (operation.editor.isTextSpan(child)) {
-    if (operation.props.includes('text')) {
-      operation.editor.apply({
-        type: 'remove_text',
-        path: childPath,
-        offset: 0,
-        text: child.text,
-      })
-    }
-
     const newNode: Record<string, unknown> = {}
 
     for (const prop of operation.props) {
+      if (prop === 'text') {
+        // Unsetting `text` requires special treatment
+        continue
+      }
+
       if (prop === '_type') {
         // It's not allowed to unset the _type of a span
         continue
@@ -60,6 +56,15 @@ export const childUnsetOperationImplementation: BehaviorOperationImplementation<
 
     Transforms.setNodes(operation.editor, newNode, {at: childPath})
 
+    if (operation.props.includes('text')) {
+      operation.editor.apply({
+        type: 'remove_text',
+        path: childPath,
+        offset: 0,
+        text: child.text,
+      })
+    }
+
     return
   }
 

package/src/test/vitest/step-definitions.tsx

@@ -251,11 +251,9 @@ export const stepDefinitions = [
           type: 'select',
           at: selection,
         })
-      })
 
-      await vi.waitFor(() => {
         expect(context.editor.getSnapshot().context.selection).toEqual(
-          getSelectionBeforeText(context.editor.getSnapshot().context, text),
+          selection,
         )
       })
     },
@@ -283,17 +281,16 @@ export const stepDefinitions = [
           context.editor.getSnapshot().context,
           text,
         )
+
         expect(selection).not.toBeNull()
 
         context.editor.send({
           type: 'select',
-          at: getSelectionAfterText(context.editor.getSnapshot().context, text),
+          at: selection,
         })
-      })
 
-      await vi.waitFor(() => {
         expect(context.editor.getSnapshot().context.selection).toEqual(
-          getSelectionAfterText(context.editor.getSnapshot().context, text),
+          selection,
         )
       })
     },