@portabletext/editor 1.44.0 → 1.44.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.44.0",
+  "version": "1.44.1",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -85,7 +85,7 @@
   "devDependencies": {
     "@portabletext/toolkit": "^2.0.17",
     "@sanity/diff-match-patch": "^3.2.0",
-    "@sanity/pkg-utils": "^7.2.0",
+    "@sanity/pkg-utils": "^7.2.1",
     "@sanity/schema": "^3.81.0",
     "@sanity/types": "^3.81.0",
     "@testing-library/jest-dom": "^6.6.3",

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

@@ -4,12 +4,8 @@ import type {EditorContext} from '../editor/editor-snapshot'
 import {
   addAnnotationActionImplementation,
   removeAnnotationActionImplementation,
-  toggleAnnotationActionImplementation,
 } from '../editor/plugins/createWithEditableAPI'
-import {
-  removeDecoratorActionImplementation,
-  toggleDecoratorActionImplementation,
-} from '../editor/plugins/createWithPortableTextMarkModel'
+import {removeDecoratorActionImplementation} from '../editor/plugins/createWithPortableTextMarkModel'
 import {
   historyRedoActionImplementation,
   historyUndoActionImplementation,
@@ -66,13 +62,11 @@ type BehaviorActionImplementations = {
 const behaviorActionImplementations: BehaviorActionImplementations = {
   'annotation.add': addAnnotationActionImplementation,
   'annotation.remove': removeAnnotationActionImplementation,
-  'annotation.toggle': toggleAnnotationActionImplementation,
   'block.set': blockSetBehaviorActionImplementation,
   'block.unset': blockUnsetBehaviorActionImplementation,
   'blur': blurActionImplementation,
   'decorator.add': decoratorAddActionImplementation,
   'decorator.remove': removeDecoratorActionImplementation,
-  'decorator.toggle': toggleDecoratorActionImplementation,
   'focus': focusActionImplementation,
   'delete': deleteActionImplementation,
   'delete.backward': deleteBackwardActionImplementation,
@@ -119,13 +113,6 @@ export function performAction({
       })
       break
     }
-    case 'annotation.toggle': {
-      behaviorActionImplementations['annotation.toggle']({
-        context,
-        action,
-      })
-      break
-    }
     case 'block.set': {
       behaviorActionImplementations['block.set']({
         context,
@@ -161,13 +148,6 @@ export function performAction({
       })
       break
     }
-    case 'decorator.toggle': {
-      behaviorActionImplementations['decorator.toggle']({
-        context,
-        action,
-      })
-      break
-    }
     case 'delete': {
       behaviorActionImplementations.delete({
         context,

package/src/behaviors/behavior.default.ts

@@ -1,7 +1,9 @@
 import {isTextBlock} from '../internal-utils/parse-blocks'
 import * as selectors from '../selectors'
-import {blockOffsetsToSelection, getTextBlockText} from '../utils'
+import {getTextBlockText} from '../utils'
 import {raiseInsertSoftBreak} from './behavior.default.raise-soft-break'
+import {internalAnnotationBehaviors} from './behavior.internal.annotation'
+import {internalDecoratorBehaviors} from './behavior.internal.decorator'
 import {internalInsertBehaviors} from './behavior.internal.insert'
 import {internalListItemBehaviors} from './behavior.internal.list-item'
 import {internalSelectBehaviors} from './behavior.internal.select'
@@ -9,71 +11,6 @@ import {internalStyleBehaviors} from './behavior.internal.style'
 import {raise} from './behavior.types.action'
 import {defineBehavior} from './behavior.types.behavior'
 
-const toggleAnnotationOff = defineBehavior({
-  on: 'annotation.toggle',
-  guard: ({snapshot, event}) =>
-    selectors.isActiveAnnotation(event.annotation.name)(snapshot),
-  actions: [
-    ({event}) => [
-      raise({type: 'annotation.remove', annotation: event.annotation}),
-    ],
-  ],
-})
-
-const toggleAnnotationOn = defineBehavior({
-  on: 'annotation.toggle',
-  guard: ({snapshot, event}) =>
-    !selectors.isActiveAnnotation(event.annotation.name)(snapshot),
-  actions: [
-    ({event}) => [
-      raise({type: 'annotation.add', annotation: event.annotation}),
-    ],
-  ],
-})
-
-const toggleDecoratorOff = defineBehavior({
-  on: 'decorator.toggle',
-  guard: ({snapshot, event}) =>
-    selectors.isActiveDecorator(event.decorator)(snapshot),
-  actions: [
-    ({event}) => [
-      raise({type: 'decorator.remove', decorator: event.decorator}),
-    ],
-  ],
-})
-
-const toggleDecoratorOn = defineBehavior({
-  on: 'decorator.toggle',
-  guard: ({snapshot, event}) => {
-    const manualSelection = event.offsets
-      ? blockOffsetsToSelection({
-          value: snapshot.context.value,
-          offsets: event.offsets,
-        })
-      : null
-
-    if (manualSelection) {
-      return !selectors.isActiveDecorator(event.decorator)({
-        ...snapshot,
-        context: {
-          ...snapshot.context,
-          selection: manualSelection,
-        },
-      })
-    }
-
-    return !selectors.isActiveDecorator(event.decorator)(snapshot)
-  },
-  actions: [
-    ({event}) => [
-      raise({
-        ...event,
-        type: 'decorator.add',
-      }),
-    ],
-  ],
-})
-
 const raiseDeserializationSuccessOrFailure = defineBehavior({
   on: 'deserialize',
   guard: ({snapshot, event}) => {
@@ -505,14 +442,12 @@ export const defaultBehaviors = [
       ],
     ],
   }),
+  ...internalAnnotationBehaviors,
+  ...internalDecoratorBehaviors,
   ...internalInsertBehaviors,
   ...internalListItemBehaviors,
   ...internalStyleBehaviors,
   ...internalSelectBehaviors,
-  toggleAnnotationOff,
-  toggleAnnotationOn,
-  toggleDecoratorOff,
-  toggleDecoratorOn,
   raiseDeserializationSuccessOrFailure,
   raiseSerializationSuccessOrFailure,
   raiseInsertSoftBreak,

package/src/behaviors/behavior.internal.annotation.ts

@@ -0,0 +1,26 @@
+import {isActiveAnnotation} from '../selectors'
+import {raise} from './behavior.types.action'
+import {defineBehavior} from './behavior.types.behavior'
+
+export const internalAnnotationBehaviors = [
+  defineBehavior({
+    on: 'annotation.toggle',
+    guard: ({snapshot, event}) =>
+      isActiveAnnotation(event.annotation.name)(snapshot),
+    actions: [
+      ({event}) => [
+        raise({type: 'annotation.remove', annotation: event.annotation}),
+      ],
+    ],
+  }),
+  defineBehavior({
+    on: 'annotation.toggle',
+    guard: ({snapshot, event}) =>
+      !isActiveAnnotation(event.annotation.name)(snapshot),
+    actions: [
+      ({event}) => [
+        raise({type: 'annotation.add', annotation: event.annotation}),
+      ],
+    ],
+  }),
+]

package/src/behaviors/behavior.internal.decorator.ts

@@ -0,0 +1,47 @@
+import {isActiveDecorator} from '../selectors'
+import {blockOffsetsToSelection} from '../utils'
+import {raise} from './behavior.types.action'
+import {defineBehavior} from './behavior.types.behavior'
+
+export const internalDecoratorBehaviors = [
+  defineBehavior({
+    on: 'decorator.toggle',
+    guard: ({snapshot, event}) => isActiveDecorator(event.decorator)(snapshot),
+    actions: [
+      ({event}) => [
+        raise({type: 'decorator.remove', decorator: event.decorator}),
+      ],
+    ],
+  }),
+  defineBehavior({
+    on: 'decorator.toggle',
+    guard: ({snapshot, event}) => {
+      const manualSelection = event.offsets
+        ? blockOffsetsToSelection({
+            value: snapshot.context.value,
+            offsets: event.offsets,
+          })
+        : null
+
+      if (manualSelection) {
+        return !isActiveDecorator(event.decorator)({
+          ...snapshot,
+          context: {
+            ...snapshot.context,
+            selection: manualSelection,
+          },
+        })
+      }
+
+      return !isActiveDecorator(event.decorator)(snapshot)
+    },
+    actions: [
+      ({event}) => [
+        raise({
+          ...event,
+          type: 'decorator.add',
+        }),
+      ],
+    ],
+  }),
+]

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

@@ -51,6 +51,8 @@ export type ExternalBehaviorEvent =
   | PickFromUnion<
       InternalBehaviorEvent,
       'type',
+      | 'annotation.toggle'
+      | 'decorator.toggle'
       | 'insert.blocks'
       | 'list item.add'
       | 'list item.remove'
@@ -98,13 +100,6 @@ export type SyntheticBehaviorEvent =
         name: string
       }
     }
-  | {
-      type: SyntheticBehaviorEventType<'annotation', 'toggle'>
-      annotation: {
-        name: string
-        value: {[prop: string]: unknown}
-      }
-    }
   | {
       type: SyntheticBehaviorEventType<'block', 'set'>
       at: [KeyedSegment]
@@ -127,11 +122,6 @@ export type SyntheticBehaviorEvent =
       type: SyntheticBehaviorEventType<'decorator', 'remove'>
       decorator: string
     }
-  | {
-      type: SyntheticBehaviorEventType<'decorator', 'toggle'>
-      decorator: string
-      offsets?: {anchor: BlockOffset; focus: BlockOffset}
-    }
   | {
       type: SyntheticBehaviorEventType<'delete'>
       selection: NonNullable<EditorSelection>
@@ -225,6 +215,8 @@ export function isKeyboardBehaviorEvent(
  **************************************/
 
 type InternalBehaviorEventNamespace =
+  | 'annotation'
+  | 'decorator'
   | 'deserialize'
   | 'deserialization'
   | 'list item'
@@ -240,6 +232,18 @@ type InternalBehaviorEventType<
 > = TType extends '' ? `${TNamespace}` : `${TNamespace}.${TType}`
 
 export type InternalBehaviorEvent =
+  | {
+      type: InternalBehaviorEventType<'annotation', 'toggle'>
+      annotation: {
+        name: string
+        value: {[prop: string]: unknown}
+      }
+    }
+  | {
+      type: InternalBehaviorEventType<'decorator', 'toggle'>
+      decorator: string
+      offsets?: {anchor: BlockOffset; focus: BlockOffset}
+    }
   | {
       type: InternalBehaviorEventType<'deserialize'>
       originEvent:

package/src/editor/plugins/createWithEditableAPI.ts

@@ -899,33 +899,3 @@ export const removeAnnotationActionImplementation: BehaviorActionImplementation<
     }
   }
 }
-
-export const toggleAnnotationActionImplementation: BehaviorActionImplementation<
-  'annotation.toggle',
-  AddedAnnotationPaths | undefined
-> = ({context, action}) => {
-  const isActive = isAnnotationActive({
-    editor: action.editor,
-    annotation: {name: action.annotation.name},
-  })
-
-  if (isActive) {
-    removeAnnotationActionImplementation({
-      context,
-      action: {
-        type: 'annotation.remove',
-        annotation: action.annotation,
-        editor: action.editor,
-      },
-    })
-  } else {
-    return addAnnotationActionImplementation({
-      context,
-      action: {
-        type: 'annotation.add',
-        annotation: action.annotation,
-        editor: action.editor,
-      },
-    })
-  }
-}

package/src/editor/plugins/createWithPortableTextMarkModel.ts

@@ -8,7 +8,6 @@ import {isPortableTextBlock, isPortableTextSpan} from '@portabletext/toolkit'
 import type {PortableTextObject, PortableTextSpan} from '@sanity/types'
 import {isEqual, uniq} from 'lodash'
 import {Editor, Element, Node, Path, Range, Text, Transforms} from 'slate'
-import {decoratorAddActionImplementation} from '../../behavior-actions/behavior.action.decorator.add'
 import type {BehaviorActionImplementation} from '../../behavior-actions/behavior.actions'
 import {debugWithName} from '../../internal-utils/debug'
 import {getNextSpan, getPreviousSpan} from '../../internal-utils/sibling-utils'
@@ -778,31 +777,3 @@ export function isDecoratorActive({
     }.marks || []
   ).includes(decorator)
 }
-
-export const toggleDecoratorActionImplementation: BehaviorActionImplementation<
-  'decorator.toggle'
-> = ({context, action}) => {
-  const isActive = isDecoratorActive({
-    editor: action.editor,
-    decorator: action.decorator,
-  })
-
-  if (isActive) {
-    removeDecoratorActionImplementation({
-      context,
-      action: {
-        type: 'decorator.remove',
-        editor: action.editor,
-        decorator: action.decorator,
-      },
-    })
-  } else {
-    decoratorAddActionImplementation({
-      context,
-      action: {
-        ...action,
-        type: 'decorator.add',
-      },
-    })
-  }
-}