@portabletext/editor 1.5.1 → 1.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",

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

@@ -9,7 +9,7 @@ import {
   selectionIsCollapsed,
 } from './behavior.utils'
 
-const breakingVoidBlock = defineBehavior({
+const breakingBlockObject = defineBehavior({
   on: 'insert break',
   guard: ({context}) => {
     const focusBlockObject = getFocusBlockObject(context)
@@ -99,8 +99,8 @@ const deletingEmptyTextBlockBeforeBlockObject = defineBehavior({
   ],
 })
 
-export const coreBlockObjectBehaviors = [
-  breakingVoidBlock,
+export const coreBlockObjectBehaviors = {
+  breakingBlockObject,
   deletingEmptyTextBlockAfterBlockObject,
   deletingEmptyTextBlockBeforeBlockObject,
-]
+}

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

@@ -73,4 +73,4 @@ const unindentListOnBackspace = defineBehavior({
   ],
 })
 
-export const coreListBehaviors = [clearListOnBackspace, unindentListOnBackspace]
+export const coreListBehaviors = {clearListOnBackspace, unindentListOnBackspace}

package/src/editor/behavior/behavior.core.ts

@@ -7,8 +7,23 @@ const softReturn = defineBehavior({
   actions: [() => [{type: 'insert text', text: '\n'}]],
 })
 
+/**
+ * @alpha
+ */
 export const coreBehaviors = [
   softReturn,
-  ...coreBlockObjectBehaviors,
-  ...coreListBehaviors,
+  coreBlockObjectBehaviors.breakingBlockObject,
+  coreBlockObjectBehaviors.deletingEmptyTextBlockAfterBlockObject,
+  coreBlockObjectBehaviors.deletingEmptyTextBlockBeforeBlockObject,
+  coreListBehaviors.clearListOnBackspace,
+  coreListBehaviors.unindentListOnBackspace,
 ]
+
+/**
+ * @alpha
+ */
+export const coreBehavior = {
+  softReturn,
+  blockObjects: coreBlockObjectBehaviors,
+  lists: coreListBehaviors,
+}

package/src/editor/behavior/behavior.markdown.ts

@@ -74,6 +74,11 @@ export function createMarkdownBehaviors(config: MarkdownBehaviorsConfig) {
         },
       ],
       (_, {focusTextBlock, focusSpan, style}) => [
+        {
+          type: 'unset block',
+          props: ['listItem', 'level'],
+          paths: [focusTextBlock.path],
+        },
         {
           type: 'set block',
           style,

package/src/editor/define-schema.ts

@@ -3,8 +3,10 @@ import {
   defineField,
   defineType,
   type BlockDecoratorDefinition,
+  type ObjectSchemaType,
 } from '@sanity/types'
 import startCase from 'lodash.startcase'
+import type {PortableTextMemberSchemaTypes} from '../types/editor'
 import {getPortableTextMemberSchemaTypes} from '../utils/getPortableTextMemberSchemaTypes'
 
 /**
@@ -46,7 +48,9 @@ export function compileSchemaDefinition<
     definition?.blockObjects?.map((blockObject) =>
       defineType({
         type: 'object',
-        name: blockObject.name,
+        // Very naive way to work around `SanitySchema.compile` adding default
+        // fields to objects with the name `image`
+        name: blockObject.name === 'image' ? 'tmp-image' : blockObject.name,
         title: blockObject.title,
         icon: blockObject.icon,
         fields: [],
@@ -107,5 +111,21 @@ export function compileSchemaDefinition<
     types: [portableTextSchema, ...blockObjects, ...inlineObjects],
   }).get('portable-text')
 
-  return getPortableTextMemberSchemaTypes(schema)
+  const pteSchema = getPortableTextMemberSchemaTypes(schema)
+
+  return {
+    ...pteSchema,
+    blockObjects: pteSchema.blockObjects.map((blockObject) =>
+      blockObject.name === 'tmp-image'
+        ? ({
+            ...blockObject,
+            name: 'image',
+            type: {
+              ...blockObject.type,
+              name: 'image',
+            },
+          } as ObjectSchemaType)
+        : blockObject,
+    ),
+  } satisfies PortableTextMemberSchemaTypes
 }

package/src/editor/editor-machine.ts

@@ -153,7 +153,7 @@ export const editorMachine = setup({
     'assign behaviors': assign({
       behaviors: ({event}) => {
         assertEvent(event, 'update behaviors')
-        return [...coreBehaviors, ...event.behaviors]
+        return event.behaviors
       },
     }),
     'assign schema': assign({
@@ -274,9 +274,7 @@ export const editorMachine = setup({
 }).createMachine({
   id: 'editor',
   context: ({input}) => ({
-    behaviors: input.behaviors
-      ? [...coreBehaviors, ...input.behaviors]
-      : coreBehaviors,
+    behaviors: input.behaviors ?? coreBehaviors,
     keyGenerator: input.keyGenerator,
     pendingEvents: [],
     schema: input.schema,

package/src/editor/plugins/createWithPortableTextMarkModel.ts

@@ -411,6 +411,24 @@ export function createWithPortableTextMarkModel(
             })
             return
           }
+
+          const nextSpanDecorators =
+            nextSpan?.marks?.filter((mark) => decorators.includes(mark)) ?? []
+          const decoratorStarting = nextSpanDecorators.length > 0
+
+          if (
+            decoratorStarting &&
+            atTheEndOfAnnotation &&
+            !atTheStartOfAnnotation &&
+            isPortableTextSpan(op.node) &&
+            op.node.marks?.length === 0
+          ) {
+            Transforms.insertNodes(editor, {
+              ...op.node,
+              marks: nextSpanDecorators,
+            })
+            return
+          }
         }
       }
 

package/src/index.ts

@@ -1,5 +1,6 @@
 export type {Patch} from '@portabletext/patches'
 export type {PortableTextBlock, PortableTextChild} from '@sanity/types'
+export {coreBehavior, coreBehaviors} from './editor/behavior/behavior.core'
 export {
   createMarkdownBehaviors,
   type MarkdownBehaviorsConfig,
@@ -16,8 +17,8 @@ export {
 } from './editor/behavior/behavior.types'
 export {
   defineSchema,
-  type SchemaDefinition,
   type BaseDefinition,
+  type SchemaDefinition,
 } from './editor/define-schema'
 export {PortableTextEditable} from './editor/Editable'
 export type {PortableTextEditableProps} from './editor/Editable'