@portabletext/editor 1.7.1 → 1.9.0

package/src/editor/plugins/createWithEditableAPI.ts

@@ -206,77 +206,18 @@ export function createEditableAPI(
       type: TSchemaType,
       value?: {[prop: string]: any},
     ): Path => {
-      const block = toSlateValue(
-        [
-          {
-            _key: editorActor.getSnapshot().context.keyGenerator(),
-            _type: type.name,
-            ...(value ? value : {}),
-          },
-        ],
-        {schemaTypes: editorActor.getSnapshot().context.schema},
-      )[0] as unknown as Node
-
-      if (!editor.selection) {
-        const lastBlock = Array.from(
-          Editor.nodes(editor, {
-            match: (n) => !Editor.isEditor(n),
-            at: [],
-            reverse: true,
-          }),
-        )[0]
-
-        // If there is no selection, let's just insert the new block at the
-        // end of the document
-        Editor.insertNode(editor, block)
-
-        if (lastBlock && isEqualToEmptyEditor([lastBlock[0]], types)) {
-          // And if the last block was an empty text block, let's remove
-          // that too
-          Transforms.removeNodes(editor, {at: lastBlock[1]})
-        }
-
-        editor.onChange()
-
-        return (
-          toPortableTextRange(
-            fromSlateValue(
-              editor.children,
-              types.block.name,
-              KEY_TO_VALUE_ELEMENT.get(editor),
-            ),
-            editor.selection,
-            types,
-          )?.focus.path ?? []
-        )
-      }
-
-      const focusBlock = Array.from(
-        Editor.nodes(editor, {
-          at: editor.selection.focus.path.slice(0, 1),
-          match: (n) => n._type === types.block.name,
-        }),
-      )[0]
-
-      Editor.insertNode(editor, block)
-
-      if (focusBlock && isEqualToEmptyEditor([focusBlock[0]], types)) {
-        Transforms.removeNodes(editor, {at: focusBlock[1]})
-      }
-
-      editor.onChange()
-
-      return (
-        toPortableTextRange(
-          fromSlateValue(
-            editor.children,
-            types.block.name,
-            KEY_TO_VALUE_ELEMENT.get(editor),
-          ),
-          editor.selection,
-          types,
-        )?.focus.path || []
-      )
+      return insertBlockObjectActionImplementation({
+        context: {
+          keyGenerator: editorActor.getSnapshot().context.keyGenerator,
+          schema: types,
+        },
+        action: {
+          type: 'insert block object',
+          name: type.name,
+          value,
+          editor,
+        },
+      })
     },
     hasBlockStyle: (style: string): boolean => {
       try {
@@ -546,6 +487,85 @@ export function createEditableAPI(
   return editableApi
 }
 
+export const insertBlockObjectActionImplementation: BehaviourActionImplementation<
+  'insert block object',
+  Path
+> = ({context, action}) => {
+  const editor = action.editor
+  const types = context.schema
+  const block = toSlateValue(
+    [
+      {
+        _key: context.keyGenerator(),
+        _type: action.name,
+        ...(action.value ? action.value : {}),
+      },
+    ],
+    {schemaTypes: context.schema},
+  )[0] as unknown as Node
+
+  if (!editor.selection) {
+    const lastBlock = Array.from(
+      Editor.nodes(editor, {
+        match: (n) => !Editor.isEditor(n),
+        at: [],
+        reverse: true,
+      }),
+    )[0]
+
+    // If there is no selection, let's just insert the new block at the
+    // end of the document
+    Editor.insertNode(editor, block)
+
+    if (lastBlock && isEqualToEmptyEditor([lastBlock[0]], types)) {
+      // And if the last block was an empty text block, let's remove
+      // that too
+      Transforms.removeNodes(editor, {at: lastBlock[1]})
+    }
+
+    editor.onChange()
+
+    return (
+      toPortableTextRange(
+        fromSlateValue(
+          editor.children,
+          types.block.name,
+          KEY_TO_VALUE_ELEMENT.get(editor),
+        ),
+        editor.selection,
+        types,
+      )?.focus.path ?? []
+    )
+  }
+
+  const focusBlock = Array.from(
+    Editor.nodes(editor, {
+      at: editor.selection.focus.path.slice(0, 1),
+      match: (n) => n._type === types.block.name,
+    }),
+  )[0]
+
+  Editor.insertNode(editor, block)
+
+  if (focusBlock && isEqualToEmptyEditor([focusBlock[0]], types)) {
+    Transforms.removeNodes(editor, {at: focusBlock[1]})
+  }
+
+  editor.onChange()
+
+  return (
+    toPortableTextRange(
+      fromSlateValue(
+        editor.children,
+        types.block.name,
+        KEY_TO_VALUE_ELEMENT.get(editor),
+      ),
+      editor.selection,
+      types,
+    )?.focus.path || []
+  )
+}
+
 function isAnnotationActive({
   editor,
   annotation,

package/src/editor/plugins/createWithPortableTextMarkModel.ts

@@ -837,12 +837,16 @@ export function isDecoratorActive({
     return false
   }
 
-  const selectedNodes = Array.from(
+  const selectedTextNodes = Array.from(
     Editor.nodes(editor, {match: Text.isText, at: editor.selection}),
   )
 
+  if (selectedTextNodes.length === 0) {
+    return false
+  }
+
   if (Range.isExpanded(editor.selection)) {
-    return selectedNodes.every((n) => {
+    return selectedTextNodes.every((n) => {
       const [node] = n
 
       return node.marks?.includes(decorator)

package/src/editor/plugins/with-plugins.ts

@@ -1,7 +1,7 @@
 import type {BaseOperation, Editor, Node, NodeEntry} from 'slate'
 import type {PortableTextSlateEditor} from '../../types/editor'
-import type {createEditorOptions} from '../../types/options'
 import {createOperationToPatches} from '../../utils/operationToPatches'
+import type {EditorActor} from '../editor-machine'
 import {createWithEventListeners} from './create-with-event-listeners'
 import {createWithMaxBlocks} from './createWithMaxBlocks'
 import {createWithObjectKeys} from './createWithObjectKeys'
@@ -26,9 +26,14 @@ const originalFnMap = new WeakMap<
   OriginalEditorFunctions
 >()
 
+type PluginsOptions = {
+  editorActor: EditorActor
+  subscriptions: Array<() => () => void>
+}
+
 export const withPlugins = <T extends Editor>(
   editor: T,
-  options: createEditorOptions,
+  options: PluginsOptions,
 ): PortableTextSlateEditor => {
   const e = editor as T & PortableTextSlateEditor
   const {editorActor} = options

package/src/index.ts

@@ -5,6 +5,10 @@ export {
   createMarkdownBehaviors,
   type MarkdownBehaviorsConfig,
 } from './editor/behavior/behavior.markdown'
+export {
+  createLinkBehaviors,
+  type LinkBehaviorsConfig,
+} from './editor/behavior/behavior.links'
 export {
   defineBehavior,
   type Behavior,
@@ -45,4 +49,4 @@ export {
   type EditorEvent,
 } from './editor/use-editor'
 export * from './types/editor'
-export * from './types/options'
+export type {HotkeyOptions} from './types/options'

package/src/types/options.ts

@@ -1,15 +1,6 @@
 import type {BaseSyntheticEvent} from 'react'
-import type {EditorActor} from '../editor/editor-machine'
 import type {PortableTextEditor} from '../editor/PortableTextEditor'
 
-/**
- * @internal
- */
-export type createEditorOptions = {
-  editorActor: EditorActor
-  subscriptions: Array<() => () => void>
-}
-
 /**
  * @beta
  */

package/src/utils/__tests__/operationToPatches.test.ts

@@ -2,9 +2,9 @@ import type {PortableTextTextBlock} from '@sanity/types'
 import {createEditor, type Descendant} from 'slate'
 import {beforeEach, describe, expect, it} from 'vitest'
 import {createActor} from 'xstate'
-import {editorMachine} from '../..'
 import {schemaType} from '../../editor/__tests__/PortableTextEditorTester'
 import {coreBehaviors} from '../../editor/behavior/behavior.core'
+import {editorMachine} from '../../editor/editor-machine'
 import {defaultKeyGenerator} from '../../editor/key-generator'
 import {withPlugins} from '../../editor/plugins/with-plugins'
 import {getPortableTextMemberSchemaTypes} from '../getPortableTextMemberSchemaTypes'

package/src/utils/__tests__/patchToOperations.test.ts

@@ -2,9 +2,9 @@ import type {Patch} from '@portabletext/patches'
 import {createEditor, type Descendant} from 'slate'
 import {beforeEach, describe, expect, it} from 'vitest'
 import {createActor} from 'xstate'
-import {editorMachine} from '../..'
 import {schemaType} from '../../editor/__tests__/PortableTextEditorTester'
 import {coreBehaviors} from '../../editor/behavior/behavior.core'
+import {editorMachine} from '../../editor/editor-machine'
 import {defaultKeyGenerator} from '../../editor/key-generator'
 import {withPlugins} from '../../editor/plugins/with-plugins'
 import {createApplyPatch} from '../applyPatch'