@portabletext/editor 1.48.5 → 1.48.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.48.5",
+  "version": "1.48.6",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -76,7 +76,7 @@
     "react-compiler-runtime": "19.1.0-rc.1",
     "slate": "0.114.0",
     "slate-dom": "^0.114.0",
-    "slate-react": "0.114.0",
+    "slate-react": "0.114.2",
     "use-effect-event": "^1.0.2",
     "xstate": "^5.19.2",
     "@portabletext/block-tools": "1.1.22",
@@ -94,7 +94,7 @@
     "@types/lodash": "^4.17.16",
     "@types/lodash.startcase": "^4.4.9",
     "@types/react": "^19.1.2",
-    "@types/react-dom": "^19.1.2",
+    "@types/react-dom": "^19.1.3",
     "@typescript-eslint/eslint-plugin": "^8.29.0",
     "@typescript-eslint/parser": "^8.29.0",
     "@vitejs/plugin-react": "^4.4.1",

package/src/behavior-actions/behavior.actions.ts

@@ -1,4 +1,3 @@
-import {omit} from 'lodash'
 import type {InternalBehaviorAction} from '../behaviors/behavior.types.action'
 import type {EditorContext} from '../editor/editor-snapshot'
 import {removeDecoratorActionImplementation} from '../editor/plugins/createWithPortableTextMarkModel'
@@ -6,7 +5,6 @@ import {
   historyRedoActionImplementation,
   historyUndoActionImplementation,
 } from '../editor/plugins/createWithUndoRedo'
-import {debugWithName} from '../internal-utils/debug'
 import type {PickFromUnion} from '../type-utils'
 import {addAnnotationActionImplementation} from './behavior.action.annotation.add'
 import {removeAnnotationActionImplementation} from './behavior.action.annotation.remove'
@@ -27,8 +25,6 @@ import {moveBlockActionImplementation} from './behavior.action.move.block'
 import {moveForwardActionImplementation} from './behavior.action.move.forward'
 import {selectActionImplementation} from './behavior.action.select'
 
-const debug = debugWithName('behaviors:action')
-
 export type BehaviorActionImplementationContext = Pick<
   EditorContext,
   'keyGenerator' | 'schema'
@@ -80,8 +76,6 @@ export function performAction({
   context: BehaviorActionImplementationContext
   action: InternalBehaviorAction
 }) {
-  debug(JSON.stringify(omit(action, ['editor']), null, 2))
-
   switch (action.type) {
     case 'annotation.add': {
       behaviorActionImplementations['annotation.add']({

package/src/behaviors/behavior.perform-event.ts

@@ -9,11 +9,11 @@ import {
 import {debugWithName} from '../internal-utils/debug'
 import type {PortableTextSlateEditor} from '../types/editor'
 import {defaultBehaviors} from './behavior.default'
-import type {InternalBehaviorAction} from './behavior.types.action'
 import {
   isAbstractBehaviorEvent,
   isCustomBehaviorEvent,
   isNativeBehaviorEvent,
+  isSyntheticBehaviorEvent,
 } from './behavior.types.event'
 
 const debug = debugWithName('behaviors:event')
@@ -55,16 +55,6 @@ export function performEvent({
 }) {
   debug(`(${mode}:${eventCategory(event)})`, JSON.stringify(event, null, 2))
 
-  const defaultAction =
-    isCustomBehaviorEvent(event) ||
-    isNativeBehaviorEvent(event) ||
-    isAbstractBehaviorEvent(event)
-      ? undefined
-      : ({
-          ...event,
-          editor,
-        } satisfies InternalBehaviorAction)
-
   const eventBehaviors = [
     ...remainingEventBehaviors,
     ...defaultBehaviors,
@@ -105,24 +95,30 @@ export function performEvent({
     return behavior.on === event.type
   })
 
-  if (eventBehaviors.length === 0) {
-    if (!defaultAction) {
-      return
-    }
+  if (eventBehaviors.length === 0 && isSyntheticBehaviorEvent(event)) {
+    nativeEvent?.preventDefault()
 
     withApplyingBehaviorActions(editor, () => {
       try {
+        debug(
+          `(execute:${eventCategory(event)})`,
+          JSON.stringify(event, null, 2),
+        )
+
         performAction({
           context: {
             keyGenerator,
             schema,
           },
-          action: defaultAction,
+          action: {
+            ...event,
+            editor,
+          },
         })
       } catch (error) {
         console.error(
           new Error(
-            `Performing action "${defaultAction.type}" as a result of "${event.type}" failed due to: ${error.message}`,
+            `Executing "${event.type}" failed due to: ${error.message}`,
           ),
         )
       }
@@ -234,54 +230,21 @@ export function performEvent({
               continue
             }
 
-            if (isAbstractBehaviorEvent(action.event)) {
-              nativeEventPrevented = true
+            nativeEventPrevented = true
 
-              performEvent({
-                mode: 'execute',
-                behaviors,
-                remainingEventBehaviors: behaviors,
-                event: action.event,
-                editor,
-                keyGenerator,
-                schema,
-                getSnapshot,
-                nativeEvent: undefined,
-              })
-            } else {
-              nativeEventPrevented = true
-
-              const internalAction = {
-                ...action.event,
-                editor,
-              }
-              let actionFailed = false
-
-              withApplyingBehaviorActions(editor, () => {
-                try {
-                  performAction({
-                    context: {
-                      keyGenerator,
-                      schema,
-                    },
-                    action: internalAction,
-                  })
-                } catch (error) {
-                  console.error(
-                    new Error(
-                      `Performing action "${action.event.type}" as a result of "${event.type}" failed due to: ${error.message}`,
-                    ),
-                  )
-                  actionFailed = true
-                }
-              })
-
-              if (actionFailed) {
-                break
-              }
-
-              editor.onChange()
-            }
+            performEvent({
+              mode: 'execute',
+              behaviors,
+              remainingEventBehaviors: isAbstractBehaviorEvent(action.event)
+                ? behaviors
+                : [],
+              event: action.event,
+              editor,
+              keyGenerator,
+              schema,
+              getSnapshot,
+              nativeEvent: undefined,
+            })
           }
         })
 
@@ -353,19 +316,27 @@ export function performEvent({
     break
   }
 
-  if (!defaultBehaviorOverwritten && defaultAction) {
+  if (!defaultBehaviorOverwritten && isSyntheticBehaviorEvent(event)) {
     nativeEvent?.preventDefault()
 
     withApplyingBehaviorActions(editor, () => {
       try {
+        debug(
+          `(execute:${eventCategory(event)})`,
+          JSON.stringify(event, null, 2),
+        )
+
         performAction({
           context: {keyGenerator, schema},
-          action: defaultAction,
+          action: {
+            ...event,
+            editor,
+          },
         })
       } catch (error) {
         console.error(
           new Error(
-            `Performing action "${defaultAction.type}" as a result of "${event.type}" failed due to: ${error.message}`,
+            `Executing "${event.type}" failed due to: ${error.message}`,
           ),
         )
       }

package/src/behaviors/behavior.types.event.ts

@@ -2,7 +2,7 @@ import type {KeyedSegment, PortableTextBlock} from '@sanity/types'
 import type {TextUnit} from 'slate'
 import type {EventPosition} from '../internal-utils/event-position'
 import type {MIMEType} from '../internal-utils/mime-type'
-import type {PickFromUnion, StrictExtract} from '../type-utils'
+import type {OmitFromUnion, PickFromUnion, StrictExtract} from '../type-utils'
 import type {BlockOffset} from '../types/block-offset'
 import type {BlockWithOptionalKey} from '../types/block-with-optional-key'
 import type {EditorSelection} from '../types/editor'
@@ -197,10 +197,18 @@ export type SyntheticBehaviorEvent =
 
 export type InsertPlacement = 'auto' | 'after' | 'before'
 
-export function isKeyboardBehaviorEvent(
+export function isSyntheticBehaviorEvent(
   event: BehaviorEvent,
-): event is KeyboardBehaviorEvent {
-  return event.type.startsWith('keyboard.')
+): event is OmitFromUnion<
+  SyntheticBehaviorEvent,
+  'type',
+  AbstractBehaviorEventType
+> {
+  return (
+    !isCustomBehaviorEvent(event) &&
+    !isNativeBehaviorEvent(event) &&
+    !isAbstractBehaviorEvent(event)
+  )
 }
 
 /**************************************