@portabletext/editor 2.6.8 → 2.6.10-canary.0

package/lib/plugins/index.d.cts

@@ -1,5 +1,5 @@
 import { Behavior, Editor, EditorEmittedEvent, EditorSchema } from "../_chunks-dts/behavior.types.action.cjs";
-import * as react22 from "react";
+import * as react12 from "react";
 import React from "react";
 /**
  * @beta
@@ -181,7 +181,7 @@ type MarkdownPluginConfig = MarkdownBehaviorsConfig & {
  */
 declare function MarkdownPlugin(props: {
   config: MarkdownPluginConfig;
-}): react22.JSX.Element;
+}): react12.JSX.Element;
 /**
  * @beta
  * Restrict the editor to one line. The plugin takes care of blocking
@@ -192,5 +192,5 @@ declare function MarkdownPlugin(props: {
  *
  * @deprecated Install the plugin from `@portabletext/plugin-one-line`
  */
-declare function OneLinePlugin(): react22.JSX.Element;
+declare function OneLinePlugin(): react12.JSX.Element;
 export { BehaviorPlugin, DecoratorShortcutPlugin, EditorRefPlugin, EventListenerPlugin, MarkdownPlugin, type MarkdownPluginConfig, OneLinePlugin };

package/lib/utils/index.d.ts

@@ -1,5 +1,5 @@
 import { BlockOffset, BlockPath, ChildPath, EditorContext, EditorSelection, EditorSelectionPoint } from "../_chunks-dts/behavior.types.action.js";
-import * as _sanity_types9 from "@sanity/types";
+import * as _sanity_types8 from "@sanity/types";
 import { KeyedSegment, PortableTextBlock, PortableTextTextBlock } from "@sanity/types";
 import { isSpan, isTextBlock } from "@portabletext/schema";
 /**
@@ -143,7 +143,7 @@ declare function mergeTextBlocks({
   context: Pick<EditorContext, 'keyGenerator' | 'schema'>;
   targetBlock: PortableTextTextBlock;
   incomingBlock: PortableTextTextBlock;
-}): PortableTextTextBlock<_sanity_types9.PortableTextObject | _sanity_types9.PortableTextSpan>;
+}): PortableTextTextBlock<_sanity_types8.PortableTextObject | _sanity_types8.PortableTextSpan>;
 /**
  * @public
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "2.6.8",
+  "version": "2.6.10-canary.0",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -74,7 +74,7 @@
     "immer": "^10.1.1",
     "lodash": "^4.17.21",
     "lodash.startcase": "^4.4.0",
-    "react-compiler-runtime": "19.1.0-rc.2",
+    "react-compiler-runtime": "19.1.0-rc.3",
     "slate": "0.118.1",
     "slate-dom": "^0.118.1",
     "slate-react": "0.117.4",
@@ -86,7 +86,7 @@
   },
   "devDependencies": {
     "@sanity/diff-match-patch": "^3.2.0",
-    "@sanity/pkg-utils": "^8.1.1",
+    "@sanity/pkg-utils": "^8.1.4",
     "@sanity/schema": "^4.6.0",
     "@sanity/types": "^4.6.0",
     "@testing-library/react": "^16.3.0",
@@ -100,9 +100,9 @@
     "@vitejs/plugin-react": "^4.7.0",
     "@vitest/browser": "^3.2.4",
     "@vitest/coverage-istanbul": "^3.2.4",
-    "babel-plugin-react-compiler": "19.1.0-rc.2",
+    "babel-plugin-react-compiler": "19.1.0-rc.3",
     "eslint": "8.57.1",
-    "eslint-plugin-react-hooks": "6.0.0-rc.1",
+    "eslint-plugin-react-hooks": "6.0.0-rc.2",
     "jsdom": "^26.0.0",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
@@ -131,7 +131,7 @@
   "scripts": {
     "build": "pkg-utils build --strict --check --clean",
     "check:lint": "biome lint .",
-    "check:react-compiler": "eslint --cache --no-inline-config --no-eslintrc --ignore-pattern '**/__tests__/**' --ext .cjs,.mjs,.js,.jsx,.ts,.tsx --parser @typescript-eslint/parser --plugin react-hooks --rule 'react-hooks/react-compiler: [error]' --rule 'react-hooks/rules-of-hooks: [error]' --rule 'react-hooks/exhaustive-deps: [error]' src",
+    "check:react-compiler": "eslint --cache --no-inline-config --no-eslintrc --ignore-pattern '**/__tests__/**' --ext .cjs,.mjs,.js,.jsx,.ts,.tsx --parser @typescript-eslint/parser --plugin react-hooks --rule 'react-hooks/rules-of-hooks: [error]' --rule 'react-hooks/exhaustive-deps: [error]' src",
     "check:types": "tsc",
     "check:types:watch": "tsc --watch",
     "clean": "del .turbo && del lib && del node_modules",

package/src/behaviors/behavior.abstract.delete.ts

@@ -103,6 +103,59 @@ export const abstractDeleteBehaviors = [
         return false
       }
 
+      const nextBlock = selectors.getNextBlock({
+        ...snapshot,
+        context: {
+          ...snapshot.context,
+          selection: event.at,
+        },
+      })
+      const focusTextBlock = selectors.getFocusTextBlock({
+        ...snapshot,
+        context: {
+          ...snapshot.context,
+          selection: event.at,
+        },
+      })
+
+      if (!nextBlock || !focusTextBlock) {
+        return false
+      }
+
+      if (!utils.isEmptyTextBlock(snapshot.context, focusTextBlock.node)) {
+        return false
+      }
+
+      const nextBlockStartPoint = utils.getBlockStartPoint({
+        context: snapshot.context,
+        block: nextBlock,
+      })
+
+      return {focusTextBlock, nextBlockStartPoint}
+    },
+    actions: [
+      (_, {focusTextBlock, nextBlockStartPoint}) => [
+        raise({
+          type: 'delete.block',
+          at: focusTextBlock.path,
+        }),
+        raise({
+          type: 'select',
+          at: {
+            anchor: nextBlockStartPoint,
+            focus: nextBlockStartPoint,
+          },
+        }),
+      ],
+    ],
+  }),
+  defineBehavior({
+    on: 'delete',
+    guard: ({snapshot, event}) => {
+      if (event.direction !== 'forward') {
+        return false
+      }
+
       const nextBlock = selectors.getNextBlock(snapshot)
       const focusTextBlock = selectors.getFocusTextBlock(snapshot)
 

package/src/editor/__tests__/self-solving.test.tsx

@@ -147,39 +147,7 @@ describe('Feature: Self-solving', () => {
         })
         expect(onChange).toHaveBeenNthCalledWith(8, {
           type: 'mutation',
-          patches: [spanPatch, blockPatch],
-          snapshot: [
-            block({
-              _key: 'b1',
-              children: [
-                span({
-                  _key: 's1',
-                  text: 'foo',
-                  marks: [],
-                }),
-              ],
-              style: 'normal',
-              markDefs: [],
-            }),
-          ],
-          value: [
-            block({
-              _key: 'b1',
-              children: [
-                span({
-                  _key: 's1',
-                  text: 'foo',
-                  marks: [],
-                }),
-              ],
-              style: 'normal',
-              markDefs: [],
-            }),
-          ],
-        })
-        expect(onChange).toHaveBeenNthCalledWith(9, {
-          type: 'mutation',
-          patches: [strongPatch],
+          patches: [spanPatch, blockPatch, strongPatch],
           snapshot: [
             block({
               _key: 'b1',

package/src/editor/mutation-machine.ts

@@ -10,8 +10,8 @@ import {
   enqueueActions,
   fromCallback,
   not,
+  raise,
   setup,
-  stateIn,
   type AnyEventObject,
 } from 'xstate'
 import {debugWithName} from '../internal-utils/debug'
@@ -41,7 +41,7 @@ export const mutationMachine = setup({
     },
     events: {} as
       | {
-          type: 'mutation delay passed'
+          type: 'emit changes'
         }
       | {
           type: 'patch'
@@ -164,12 +164,12 @@ export const mutationMachine = setup({
         input.slateEditor.apply = originalApply
       }
     }),
-    'mutation debouncer': fromCallback(({sendBack}) => {
+    'mutation interval': fromCallback(({sendBack}) => {
       const interval = setInterval(
         () => {
-          sendBack({type: 'mutation delay passed'})
+          sendBack({type: 'emit changes'})
         },
-        process.env.NODE_ENV === 'test' ? 250 : 0,
+        process.env.NODE_ENV === 'test' ? 250 : 1000,
       )
 
       return () => {
@@ -179,12 +179,11 @@ export const mutationMachine = setup({
   },
   guards: {
     'is read-only': ({context}) => context.readOnly,
-    'is typing': stateIn({typing: 'typing'}),
     'slate is normalizing': ({context}) =>
       Editor.isNormalizing(context.slateEditor),
   },
   delays: {
-    'type debounce': process.env.NODE_ENV === 'test' ? 0 : 250,
+    'type debounce': 250,
   },
 }).createMachine({
   id: 'mutation',
@@ -232,6 +231,7 @@ export const mutationMachine = setup({
             'type debounce': {
               target: 'idle',
               actions: [
+                raise({type: 'emit changes'}),
                 () => {
                   debug('exit: typing->typing')
                 },
@@ -241,6 +241,7 @@ export const mutationMachine = setup({
           on: {
             'not typing': {
               target: 'idle',
+              actions: [raise({type: 'emit changes'})],
             },
             'typing': {
               target: 'typing',
@@ -291,15 +292,11 @@ export const mutationMachine = setup({
             },
           ],
           invoke: {
-            src: 'mutation debouncer',
+            src: 'mutation interval',
           },
           on: {
-            'mutation delay passed': {
-              guard: and([
-                not('is read-only'),
-                not('is typing'),
-                'slate is normalizing',
-              ]),
+            'emit changes': {
+              guard: and([not('is read-only'), 'slate is normalizing']),
               target: 'idle',
               actions: [
                 'emit pending patch events',

package/src/editor/plugins/createWithPatches.ts

@@ -26,7 +26,7 @@ import {
 import type {PortableTextSlateEditor} from '../../types/editor'
 import type {EditorActor} from '../editor-machine'
 import type {RelayActor} from '../relay-machine'
-import {getCurrentOperationId} from '../with-applying-behavior-operations'
+import {getCurrentUndoStepId} from '../with-undo-step'
 import {withoutSaving} from './createWithUndoRedo'
 
 const debug = debugWithName('plugin:withPatches')
@@ -266,7 +266,7 @@ export function createWithPatches({
           editorActor.send({
             type: 'internal.patch',
             patch: {...patch, origin: 'local'},
-            operationId: getCurrentOperationId(editor),
+            operationId: getCurrentUndoStepId(editor),
             value: editor.value,
           })
         }