@portabletext/editor 2.21.2 → 2.21.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "2.21.2",
+  "version": "2.21.3",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -90,9 +90,9 @@
     "@types/react": "^19.2.2",
     "@types/react-dom": "^19.2.2",
     "@vitejs/plugin-react": "^5.0.4",
-    "@vitest/browser": "^4.0.6",
-    "@vitest/browser-playwright": "^4.0.6",
-    "@vitest/coverage-istanbul": "^4.0.6",
+    "@vitest/browser": "^4.0.8",
+    "@vitest/browser-playwright": "^4.0.8",
+    "@vitest/coverage-istanbul": "^4.0.8",
     "babel-plugin-react-compiler": "1.0.0",
     "eslint": "^9.38.0",
     "eslint-formatter-gha": "^1.6.0",
@@ -104,7 +104,7 @@
     "typescript": "5.9.3",
     "typescript-eslint": "^8.46.1",
     "vite": "^7.1.12",
-    "vitest": "^4.0.6",
+    "vitest": "^4.0.8",
     "vitest-browser-react": "^2.0.2",
     "@portabletext/sanity-bridge": "1.2.2",
     "@portabletext/test": "^1.0.0",

package/src/internal-utils/applyPatch.ts

@@ -16,7 +16,7 @@ import {
   parsePatch,
 } from '@sanity/diff-match-patch'
 import type {Path, PortableTextBlock, PortableTextChild} from '@sanity/types'
-import {Element, Node, Text, Transforms, type Descendant} from 'slate'
+import {Editor, Element, Node, Text, Transforms, type Descendant} from 'slate'
 import type {EditorSchema} from '../editor/editor-schema'
 import {KEY_TO_SLATE_ELEMENT} from '../editor/weakMaps'
 import type {PortableTextSlateEditor} from '../types/editor'
@@ -202,6 +202,51 @@ function setPatch(editor: PortableTextSlateEditor, patch: SetPatch) {
 
   const isTextBlock = editor.isTextBlock(block.node)
 
+  if (patch.path.length === 1) {
+    const updatedBlock = applyAll(block.node, [
+      {
+        ...patch,
+        path: patch.path.slice(1),
+      },
+    ])
+
+    if (editor.isTextBlock(block.node) && Element.isElement(updatedBlock)) {
+      Transforms.setNodes(editor, updatedBlock, {at: [block.index]})
+
+      const previousSelection = editor.selection
+
+      // Remove the previous children
+      for (const [_, childPath] of Editor.nodes(editor, {
+        at: [block.index],
+        reverse: true,
+        mode: 'lowest',
+      })) {
+        Transforms.removeNodes(editor, {at: childPath})
+      }
+
+      // Insert the new children
+      Transforms.insertNodes(editor, updatedBlock.children, {
+        at: [block.index, 0],
+      })
+
+      // Restore the selection
+      if (previousSelection) {
+        // Update the selection on the editor object
+        Transforms.setSelection(editor, previousSelection)
+        // Actively select the previous selection
+        Transforms.select(editor, previousSelection)
+      }
+
+      return true
+    } else {
+      Transforms.setNodes(editor, updatedBlock as Partial<Node>, {
+        at: [block.index],
+      })
+
+      return true
+    }
+  }
+
   if (isTextBlock && patch.path[1] !== 'children') {
     const updatedBlock = applyAll(block.node, [
       {

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

@@ -190,7 +190,7 @@ export const stepDefinitions = [
     await userEvent.type(context.locator, text)
   }),
   When(
-    '{string} is typed by Editor B',
+    '{string} is typed in Editor B',
     async (context: Context, text: string) => {
       await userEvent.type(context.locatorB, text)
     },
@@ -222,23 +222,40 @@ export const stepDefinitions = [
    */
   When(
     '{button} is pressed',
-    async (_: Context, button: Parameter['button']) => {
+    async (context: Context, button: Parameter['button']) => {
+      const previousSelection = context.editor.getSnapshot().context.selection
       await userEvent.keyboard(button)
-      await new Promise((resolve) => setTimeout(resolve, 100))
+
+      await vi.waitFor(() => {
+        const currentSelection = context.editor.getSnapshot().context.selection
+
+        if (currentSelection) {
+          expect(currentSelection).not.toBe(previousSelection)
+        }
+      })
     },
   ),
   When(
     '{button} is pressed {int} times',
-    async (_: Context, button: Parameter['button'], times: number) => {
+    async (context: Context, button: Parameter['button'], times: number) => {
       for (let i = 0; i < times; i++) {
+        const previousSelection = context.editor.getSnapshot().context.selection
         await userEvent.keyboard(button)
-        await new Promise((resolve) => setTimeout(resolve, 100))
+
+        await vi.waitFor(() => {
+          const currentSelection =
+            context.editor.getSnapshot().context.selection
+
+          if (currentSelection) {
+            expect(currentSelection).not.toBe(previousSelection)
+          }
+        })
       }
     },
   ),
   When(
     '{shortcut} is pressed',
-    async (_: Context, shortcut: Parameter['shortcut']) => {
+    async (context: Context, shortcut: Parameter['shortcut']) => {
       const shortcuts: Record<Parameter['shortcut'], string> = {
         'deleteWord.backward': IS_MAC
           ? '{Alt>}{Backspace}{/Alt}'
@@ -248,8 +265,16 @@ export const stepDefinitions = [
           : '{Control>}{Delete}{/Control}',
       }
 
+      const previousSelection = context.editor.getSnapshot().context.selection
       await userEvent.keyboard(shortcuts[shortcut])
-      await new Promise((resolve) => setTimeout(resolve, 100))
+
+      await vi.waitFor(() => {
+        const currentSelection = context.editor.getSnapshot().context.selection
+
+        if (currentSelection) {
+          expect(currentSelection).not.toBe(previousSelection)
+        }
+      })
     },
   ),
 
@@ -315,7 +340,7 @@ export const stepDefinitions = [
     },
   ),
   When(
-    'the caret is put after {string} by Editor B',
+    'the caret is put after {string} in Editor B',
     async (context: Context, text: string) => {
       await vi.waitFor(() => {
         const selection = getSelectionAfterText(