@portabletext/editor 1.24.0 → 1.25.0

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

@@ -308,312 +308,313 @@ export function performAction({
   action: BehaviorAction
 }) {
   switch (action.type) {
-    case 'annotation.toggle': {
-      behaviorActionImplementations['annotation.toggle']({
+    case 'noop': {
+      behaviorActionImplementations.noop({
         context,
         action,
       })
       break
     }
-    case 'decorator.add': {
-      behaviorActionImplementations['decorator.add']({
+    case 'effect': {
+      behaviorActionImplementations.effect({
         context,
         action,
       })
       break
     }
-    case 'decorator.remove': {
-      behaviorActionImplementations['decorator.remove']({
+    case 'select': {
+      behaviorActionImplementations.select({
         context,
         action,
       })
       break
     }
-    case 'delete.block': {
-      behaviorActionImplementations['delete.block']({
+    default: {
+      performDefaultAction({context, action})
+    }
+  }
+}
+
+function performDefaultAction({
+  context,
+  action,
+}: {
+  context: BehaviorActionImplementationContext
+  action: PickFromUnion<BehaviorAction, 'type', SyntheticBehaviorEvent['type']>
+}) {
+  switch (action.type) {
+    case 'annotation.add': {
+      behaviorActionImplementations['annotation.add']({
         context,
         action,
       })
       break
     }
-    case 'delete.text': {
-      behaviorActionImplementations['delete.text']({
+    case 'annotation.remove': {
+      behaviorActionImplementations['annotation.remove']({
         context,
         action,
       })
       break
     }
-    case 'insert.span': {
-      behaviorActionImplementations['insert.span']({
+    case 'annotation.toggle': {
+      behaviorActionImplementations['annotation.toggle']({
         context,
         action,
       })
       break
     }
-    case 'insert.text block': {
-      behaviorActionImplementations['insert.text block']({
+    case 'blur': {
+      behaviorActionImplementations.blur({
         context,
         action,
       })
       break
     }
-    case 'list item.add': {
-      behaviorActionImplementations['list item.add']({
+    case 'data transfer.set': {
+      behaviorActionImplementations['data transfer.set']({
         context,
         action,
       })
       break
     }
-    case 'list item.remove': {
-      behaviorActionImplementations['list item.remove']({
+    case 'decorator.add': {
+      behaviorActionImplementations['decorator.add']({
         context,
         action,
       })
       break
     }
-    case 'move.block': {
-      behaviorActionImplementations['move.block']({
+    case 'decorator.remove': {
+      behaviorActionImplementations['decorator.remove']({
         context,
         action,
       })
       break
     }
-    case 'move.block down': {
-      behaviorActionImplementations['move.block down']({
+    case 'decorator.toggle': {
+      behaviorActionImplementations['decorator.toggle']({
         context,
         action,
       })
       break
     }
-    case 'move.block up': {
-      behaviorActionImplementations['move.block up']({
+    case 'delete.backward': {
+      behaviorActionImplementations['delete.backward']({
         context,
         action,
       })
       break
     }
-    case 'noop': {
-      behaviorActionImplementations.noop({
+    case 'delete.block': {
+      behaviorActionImplementations['delete.block']({
         context,
         action,
       })
       break
     }
-    case 'effect': {
-      behaviorActionImplementations.effect({
+    case 'delete.forward': {
+      behaviorActionImplementations['delete.forward']({
         context,
         action,
       })
       break
     }
-    case 'select': {
-      behaviorActionImplementations.select({
+    case 'delete.text': {
+      behaviorActionImplementations['delete.text']({
         context,
         action,
       })
       break
     }
-    case 'select.previous block': {
-      behaviorActionImplementations['select.previous block']({
+    case 'deserialization.failure': {
+      behaviorActionImplementations['deserialization.failure']({
         context,
         action,
       })
       break
     }
-    case 'select.next block': {
-      behaviorActionImplementations['select.next block']({
+    case 'deserialization.success': {
+      behaviorActionImplementations['deserialization.success']({
         context,
         action,
       })
       break
     }
-    case 'style.add': {
-      behaviorActionImplementations['style.add']({
+    case 'focus': {
+      behaviorActionImplementations.focus({
         context,
         action,
       })
       break
     }
-    case 'style.remove': {
-      behaviorActionImplementations['style.remove']({
+    case 'insert.blocks': {
+      behaviorActionImplementations['insert.blocks']({
         context,
         action,
       })
       break
     }
-    case 'text block.set': {
-      behaviorActionImplementations['text block.set']({
+    case 'insert.block object': {
+      behaviorActionImplementations['insert.block object']({
         context,
         action,
       })
       break
     }
-    case 'text block.unset': {
-      behaviorActionImplementations['text block.unset']({
+    case 'insert.inline object': {
+      behaviorActionImplementations['insert.inline object']({
         context,
         action,
       })
       break
     }
-    default: {
-      performDefaultAction({context, action})
-    }
-  }
-}
-
-function performDefaultAction({
-  context,
-  action,
-}: {
-  context: BehaviorActionImplementationContext
-  action: PickFromUnion<BehaviorAction, 'type', SyntheticBehaviorEvent['type']>
-}) {
-  switch (action.type) {
-    case 'annotation.add': {
-      behaviorActionImplementations['annotation.add']({
+    case 'insert.break': {
+      behaviorActionImplementations['insert.break']({
         context,
         action,
       })
       break
     }
-    case 'annotation.remove': {
-      behaviorActionImplementations['annotation.remove']({
+    case 'insert.soft break': {
+      behaviorActionImplementations['insert.soft break']({
         context,
         action,
       })
       break
     }
-    case 'blur': {
-      behaviorActionImplementations.blur({
+    case 'insert.span': {
+      behaviorActionImplementations['insert.span']({
         context,
         action,
       })
       break
     }
-    case 'data transfer.set': {
-      behaviorActionImplementations['data transfer.set']({
+    case 'insert.text': {
+      behaviorActionImplementations['insert.text']({
         context,
         action,
       })
       break
     }
-    case 'decorator.toggle': {
-      behaviorActionImplementations['decorator.toggle']({
+    case 'insert.text block': {
+      behaviorActionImplementations['insert.text block']({
         context,
         action,
       })
       break
     }
-    case 'delete.backward': {
-      behaviorActionImplementations['delete.backward']({
+    case 'list item.add': {
+      behaviorActionImplementations['list item.add']({
         context,
         action,
       })
       break
     }
-    case 'delete.forward': {
-      behaviorActionImplementations['delete.forward']({
+    case 'list item.remove': {
+      behaviorActionImplementations['list item.remove']({
         context,
         action,
       })
       break
     }
-    case 'deserialization.failure': {
-      behaviorActionImplementations['deserialization.failure']({
+    case 'list item.toggle': {
+      behaviorActionImplementations['list item.toggle']({
         context,
         action,
       })
       break
     }
-    case 'deserialization.success': {
-      behaviorActionImplementations['deserialization.success']({
+    case 'move.block': {
+      behaviorActionImplementations['move.block']({
         context,
         action,
       })
       break
     }
-    case 'focus': {
-      behaviorActionImplementations.focus({
+    case 'move.block down': {
+      behaviorActionImplementations['move.block down']({
         context,
         action,
       })
       break
     }
-    case 'insert.blocks': {
-      behaviorActionImplementations['insert.blocks']({
+    case 'move.block up': {
+      behaviorActionImplementations['move.block up']({
         context,
         action,
       })
       break
     }
-    case 'insert.block object': {
-      behaviorActionImplementations['insert.block object']({
+    case 'select': {
+      behaviorActionImplementations.select({
         context,
         action,
       })
       break
     }
-    case 'insert.inline object': {
-      behaviorActionImplementations['insert.inline object']({
+    case 'select.previous block': {
+      behaviorActionImplementations['select.previous block']({
         context,
         action,
       })
       break
     }
-    case 'insert.break': {
-      behaviorActionImplementations['insert.break']({
+    case 'select.next block': {
+      behaviorActionImplementations['select.next block']({
         context,
         action,
       })
       break
     }
-    case 'insert.soft break': {
-      behaviorActionImplementations['insert.soft break']({
+    case 'serialization.failure': {
+      behaviorActionImplementations['serialization.failure']({
         context,
         action,
       })
       break
     }
-    case 'insert.text': {
-      behaviorActionImplementations['insert.text']({
+    case 'serialization.success': {
+      behaviorActionImplementations['serialization.success']({
         context,
         action,
       })
       break
     }
-    case 'list item.toggle': {
-      behaviorActionImplementations['list item.toggle']({
+    case 'style.add': {
+      behaviorActionImplementations['style.add']({
         context,
         action,
       })
       break
     }
-    case 'select': {
-      behaviorActionImplementations.select({
+    case 'style.remove': {
+      behaviorActionImplementations['style.remove']({
         context,
         action,
       })
       break
     }
-    case 'serialization.failure': {
-      behaviorActionImplementations['serialization.failure']({
+    case 'style.toggle': {
+      behaviorActionImplementations['style.toggle']({
         context,
         action,
       })
       break
     }
-    case 'serialization.success': {
-      behaviorActionImplementations['serialization.success']({
+    case 'text block.set': {
+      behaviorActionImplementations['text block.set']({
         context,
         action,
       })
       break
     }
-    default: {
-      behaviorActionImplementations['style.toggle']({
+    case 'text block.unset': {
+      behaviorActionImplementations['text block.unset']({
         context,
         action,
       })
+      break
     }
   }
 }

package/src/behaviors/behavior.core.annotations.ts

@@ -0,0 +1,29 @@
+import * as selectors from '../selectors'
+import {defineBehavior, raise} from './behavior.types'
+
+const toggleAnnotationOff = defineBehavior({
+  on: 'annotation.toggle',
+  guard: ({context, event}) =>
+    selectors.isActiveAnnotation(event.annotation.name)({context}),
+  actions: [
+    ({event}) => [
+      raise({type: 'annotation.remove', annotation: event.annotation}),
+    ],
+  ],
+})
+
+const toggleAnnotationOn = defineBehavior({
+  on: 'annotation.toggle',
+  guard: ({context, event}) =>
+    !selectors.isActiveAnnotation(event.annotation.name)({context}),
+  actions: [
+    ({event}) => [
+      raise({type: 'annotation.add', annotation: event.annotation}),
+    ],
+  ],
+})
+
+export const coreAnnotationBehaviors = {
+  toggleAnnotationOff,
+  toggleAnnotationOn,
+}

package/src/behaviors/behavior.core.block-objects.ts

@@ -2,7 +2,7 @@ import {isPortableTextTextBlock} from '@sanity/types'
 import {isHotkey} from '../internal-utils/is-hotkey'
 import * as selectors from '../selectors'
 import {isEmptyTextBlock} from '../utils/util.is-empty-text-block'
-import {defineBehavior} from './behavior.types'
+import {defineBehavior, raise} from './behavior.types'
 
 const arrowDownOnLonelyBlockObject = defineBehavior({
   on: 'key.down',
@@ -13,7 +13,7 @@ const arrowDownOnLonelyBlockObject = defineBehavior({
 
     return isArrowDown && focusBlockObject && !nextBlock
   },
-  actions: [() => [{type: 'insert.text block', placement: 'after'}]],
+  actions: [() => [raise({type: 'insert.text block', placement: 'after'})]],
 })
 
 const arrowUpOnLonelyBlockObject = defineBehavior({
@@ -27,8 +27,8 @@ const arrowUpOnLonelyBlockObject = defineBehavior({
   },
   actions: [
     () => [
-      {type: 'insert.text block', placement: 'before'},
-      {type: 'select.previous block'},
+      raise({type: 'insert.text block', placement: 'before'}),
+      raise({type: 'select.previous block'}),
     ],
   ],
 })
@@ -41,7 +41,7 @@ const breakingBlockObject = defineBehavior({
 
     return collapsedSelection && focusBlockObject !== undefined
   },
-  actions: [() => [{type: 'insert.text block', placement: 'after'}]],
+  actions: [() => [raise({type: 'insert.text block', placement: 'after'})]],
 })
 
 const deletingEmptyTextBlockAfterBlockObject = defineBehavior({
@@ -66,17 +66,17 @@ const deletingEmptyTextBlockAfterBlockObject = defineBehavior({
   },
   actions: [
     (_, {focusTextBlock, previousBlock}) => [
-      {
+      raise({
         type: 'delete.block',
         blockPath: focusTextBlock.path,
-      },
-      {
+      }),
+      raise({
         type: 'select',
         selection: {
           anchor: {path: previousBlock.path, offset: 0},
           focus: {path: previousBlock.path, offset: 0},
         },
-      },
+      }),
     ],
   ],
 })
@@ -103,17 +103,17 @@ const deletingEmptyTextBlockBeforeBlockObject = defineBehavior({
   },
   actions: [
     (_, {focusTextBlock, nextBlock}) => [
-      {
+      raise({
         type: 'delete.block',
         blockPath: focusTextBlock.path,
-      },
-      {
+      }),
+      raise({
         type: 'select',
         selection: {
           anchor: {path: nextBlock.path, offset: 0},
           focus: {path: nextBlock.path, offset: 0},
         },
-      },
+      }),
     ],
   ],
 })

package/src/behaviors/behavior.core.decorators.ts

@@ -1,7 +1,26 @@
 import {isHotkey} from '../internal-utils/is-hotkey'
+import * as selectors from '../selectors'
 import {defineBehavior, raise} from './behavior.types'
 
 export const coreDecoratorBehaviors = {
+  toggleDecoratorOff: defineBehavior({
+    on: 'decorator.toggle',
+    guard: ({context, event}) =>
+      selectors.isActiveDecorator(event.decorator)({context}),
+    actions: [
+      ({event}) => [
+        raise({type: 'decorator.remove', decorator: event.decorator}),
+      ],
+    ],
+  }),
+  toggleDecoratorOn: defineBehavior({
+    on: 'decorator.toggle',
+    guard: ({context, event}) =>
+      !selectors.isActiveDecorator(event.decorator)({context}),
+    actions: [
+      ({event}) => [raise({type: 'decorator.add', decorator: event.decorator})],
+    ],
+  }),
   strongShortcut: defineBehavior({
     on: 'key.down',
     guard: ({context, event}) =>

package/src/behaviors/behavior.core.lists.ts

@@ -2,10 +2,38 @@ import {createGuards} from '../behavior-actions/behavior.guards'
 import {isHotkey} from '../internal-utils/is-hotkey'
 import * as selectors from '../selectors'
 import {isEmptyTextBlock} from '../utils/util.is-empty-text-block'
-import {defineBehavior} from './behavior.types'
+import {defineBehavior, raise} from './behavior.types'
 
 const MAX_LIST_LEVEL = 10
 
+const toggleListItemOff = defineBehavior({
+  on: 'list item.toggle',
+  guard: ({context, event}) =>
+    selectors.isActiveListItem(event.listItem)({context}),
+  actions: [
+    ({event}) => [
+      raise({
+        type: 'list item.remove',
+        listItem: event.listItem,
+      }),
+    ],
+  ],
+})
+
+const toggleListItemOn = defineBehavior({
+  on: 'list item.toggle',
+  guard: ({context, event}) =>
+    !selectors.isActiveListItem(event.listItem)({context}),
+  actions: [
+    ({event}) => [
+      raise({
+        type: 'list item.add',
+        listItem: event.listItem,
+      }),
+    ],
+  ],
+})
+
 const clearListOnBackspace = defineBehavior({
   on: 'delete.backward',
   guard: ({context}) => {
@@ -29,11 +57,11 @@ const clearListOnBackspace = defineBehavior({
   },
   actions: [
     (_, {focusTextBlock}) => [
-      {
+      raise({
         type: 'text block.unset',
         props: ['listItem', 'level'],
         at: focusTextBlock.path,
-      },
+      }),
     ],
   ],
 })
@@ -65,11 +93,11 @@ const unindentListOnBackspace = defineBehavior({
   },
   actions: [
     (_, {focusTextBlock, level}) => [
-      {
+      raise({
         type: 'text block.set',
         level,
         at: focusTextBlock.path,
-      },
+      }),
     ],
   ],
 })
@@ -92,11 +120,11 @@ const clearListOnEnter = defineBehavior({
   },
   actions: [
     (_, {focusListBlock}) => [
-      {
+      raise({
         type: 'text block.unset',
         props: ['listItem', 'level'],
         at: focusListBlock.path,
-      },
+      }),
     ],
   ],
 })
@@ -131,14 +159,16 @@ const indentListOnTab = defineBehavior({
   },
   actions: [
     (_, {selectedListBlocks}) =>
-      selectedListBlocks.map((selectedListBlock) => ({
-        type: 'text block.set',
-        level: Math.min(
-          MAX_LIST_LEVEL,
-          Math.max(1, selectedListBlock.node.level + 1),
-        ),
-        at: selectedListBlock.path,
-      })),
+      selectedListBlocks.map((selectedListBlock) =>
+        raise({
+          type: 'text block.set',
+          level: Math.min(
+            MAX_LIST_LEVEL,
+            Math.max(1, selectedListBlock.node.level + 1),
+          ),
+          at: selectedListBlock.path,
+        }),
+      ),
   ],
 })
 
@@ -172,18 +202,22 @@ const unindentListOnShiftTab = defineBehavior({
   },
   actions: [
     (_, {selectedListBlocks}) =>
-      selectedListBlocks.map((selectedListBlock) => ({
-        type: 'text block.set',
-        level: Math.min(
-          MAX_LIST_LEVEL,
-          Math.max(1, selectedListBlock.node.level - 1),
-        ),
-        at: selectedListBlock.path,
-      })),
+      selectedListBlocks.map((selectedListBlock) =>
+        raise({
+          type: 'text block.set',
+          level: Math.min(
+            MAX_LIST_LEVEL,
+            Math.max(1, selectedListBlock.node.level - 1),
+          ),
+          at: selectedListBlock.path,
+        }),
+      ),
   ],
 })
 
 export const coreListBehaviors = {
+  toggleListItemOff,
+  toggleListItemOn,
   clearListOnBackspace,
   unindentListOnBackspace,
   clearListOnEnter,