@portabletext/editor 1.24.0 → 1.26.0

package/lib/utils/index.d.ts

@@ -38,6 +38,17 @@ export declare type EditorSelectionPoint = {
   offset: number
 }
 
+/**
+ * @public
+ */
+export declare function getBlockEndPoint({
+  node,
+  path,
+}: {
+  node: PortableTextBlock
+  path: [KeyedSegment]
+}): EditorSelectionPoint
+
 /**
  * @public
  */
@@ -59,6 +70,14 @@ export declare function getTextBlockText(block: PortableTextTextBlock): string
  */
 export declare function isEmptyTextBlock(block: PortableTextBlock): boolean
 
+/**
+ * @public
+ */
+export declare function isEqualSelectionPoints(
+  a: EditorSelectionPoint,
+  b: EditorSelectionPoint,
+): boolean
+
 /**
  * @public
  */

package/lib/utils/index.js

@@ -1,12 +1,14 @@
 import { blockOffsetToSpanSelectionPoint, getTextBlockText, isEmptyTextBlock, spanSelectionPointToBlockOffset } from "../_chunks-es/util.is-empty-text-block.js";
-import { getBlockStartPoint, reverseSelection } from "../_chunks-es/util.reverse-selection.js";
-import { isKeyedSegment } from "../_chunks-es/util.is-keyed-segment.js";
+import { getBlockEndPoint, getBlockStartPoint, isEqualSelectionPoints, isKeyedSegment } from "../_chunks-es/util.is-equal-selection-points.js";
+import { reverseSelection } from "../_chunks-es/util.reverse-selection.js";
 import { sliceBlocks } from "../_chunks-es/util.slice-blocks.js";
 export {
   blockOffsetToSpanSelectionPoint,
+  getBlockEndPoint,
   getBlockStartPoint,
   getTextBlockText,
   isEmptyTextBlock,
+  isEqualSelectionPoints,
   isKeyedSegment,
   reverseSelection,
   sliceBlocks,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.24.0",
+  "version": "1.26.0",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -73,15 +73,15 @@
     "slate-react": "0.112.1",
     "use-effect-event": "^1.0.2",
     "xstate": "^5.19.2",
-    "@portabletext/block-tools": "1.1.1",
+    "@portabletext/block-tools": "1.1.2",
     "@portabletext/patches": "1.1.2"
   },
   "devDependencies": {
     "@portabletext/toolkit": "^2.0.16",
     "@sanity/diff-match-patch": "^3.2.0",
     "@sanity/pkg-utils": "^7.0.2",
-    "@sanity/schema": "^3.71.0",
-    "@sanity/types": "^3.71.0",
+    "@sanity/schema": "^3.71.1",
+    "@sanity/types": "^3.71.1",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
     "@types/debug": "^4.1.12",
@@ -109,8 +109,8 @@
     "racejar": "1.1.1"
   },
   "peerDependencies": {
-    "@sanity/schema": "^3.71.0",
-    "@sanity/types": "^3.71.0",
+    "@sanity/schema": "^3.71.1",
+    "@sanity/types": "^3.71.1",
     "react": "^16.9 || ^17 || ^18 || ^19",
     "rxjs": "^7.8.1"
   },

package/src/behavior-actions/behavior.action-utils.insert-block.ts

@@ -52,10 +52,10 @@ export function insertBlock({
       Transforms.insertNodes(editor, block, {at: focusBlockPath})
     } else {
       Editor.insertNode(editor, block)
-    }
 
-    if (focusBlock && isEqualToEmptyEditor([focusBlock], schema)) {
-      Transforms.removeNodes(editor, {at: focusBlockPath})
+      if (focusBlock && isEqualToEmptyEditor([focusBlock], schema)) {
+        Transforms.removeNodes(editor, {at: focusBlockPath})
+      }
     }
   }
 }

package/src/behavior-actions/behavior.action.block.set.ts

@@ -0,0 +1,23 @@
+import {Transforms} from 'slate'
+import {toSlateRange} from '../internal-utils/ranges'
+import type {BehaviorActionImplementation} from './behavior.actions'
+
+export const blockSetBehaviorActionImplementation: BehaviorActionImplementation<
+  'block.set'
+> = ({action}) => {
+  const location = toSlateRange(
+    {
+      anchor: {path: action.at, offset: 0},
+      focus: {path: action.at, offset: 0},
+    },
+    action.editor,
+  )
+
+  if (!location) {
+    return
+  }
+
+  const {at, editor, type, ...payload} = action
+
+  Transforms.setNodes(action.editor, payload, {at: location})
+}

package/src/behavior-actions/behavior.action.block.unset.ts

@@ -0,0 +1,21 @@
+import {Transforms} from 'slate'
+import {toSlateRange} from '../internal-utils/ranges'
+import type {BehaviorActionImplementation} from './behavior.actions'
+
+export const blockUnsetBehaviorActionImplementation: BehaviorActionImplementation<
+  'block.unset'
+> = ({action}) => {
+  const location = toSlateRange(
+    {
+      anchor: {path: action.at, offset: 0},
+      focus: {path: action.at, offset: 0},
+    },
+    action.editor,
+  )
+
+  if (!location) {
+    return
+  }
+
+  Transforms.unsetNodes(action.editor, action.props, {at: location})
+}

package/src/behavior-actions/behavior.action.insert-break.ts

@@ -1,5 +1,5 @@
 import {isEqual} from 'lodash'
-import {Editor, Node, Path, Range, Transforms} from 'slate'
+import {Editor, Node, Path, Transforms} from 'slate'
 import type {SlateTextBlock, VoidElement} from '../types/slate'
 import type {BehaviorActionImplementation} from './behavior.actions'
 
@@ -14,24 +14,6 @@ export const insertBreakActionImplementation: BehaviorActionImplementation<
     return
   }
 
-  const [focusSpan] = Array.from(
-    Editor.nodes(editor, {
-      mode: 'lowest',
-      at: editor.selection.focus,
-      match: (n) => editor.isTextSpan(n),
-      voids: false,
-    }),
-  )[0] ?? [undefined]
-  const focusDecorators =
-    focusSpan?.marks?.filter((mark) =>
-      schema.decorators.some((decorator) => decorator.value === mark),
-    ) ?? []
-  const focusAnnotations =
-    focusSpan?.marks?.filter(
-      (mark) =>
-        !schema.decorators.some((decorator) => decorator.value === mark),
-    ) ?? []
-
   const anchorBlockPath = editor.selection.anchor.path.slice(0, 1)
   const focusBlockPath = editor.selection.focus.path.slice(0, 1)
   const focusBlock = Node.descendant(editor, focusBlockPath) as
@@ -39,58 +21,9 @@ export const insertBreakActionImplementation: BehaviorActionImplementation<
     | VoidElement
 
   if (editor.isTextBlock(focusBlock)) {
-    const [start, end] = Range.edges(editor.selection)
-    const lastFocusBlockChild =
-      focusBlock.children[focusBlock.children.length - 1]
-    const atTheEndOfBlock = isEqual(start, {
-      path: [...focusBlockPath, focusBlock.children.length - 1],
-      offset: editor.isTextSpan(lastFocusBlockChild)
-        ? lastFocusBlockChild.text.length
-        : 0,
-    })
-    const atTheStartOfBlock = isEqual(end, {
-      path: [...focusBlockPath, 0],
-      offset: 0,
-    })
-
-    if (atTheEndOfBlock && Range.isCollapsed(editor.selection)) {
-      Editor.insertNode(
-        editor,
-        editor.pteCreateTextBlock({
-          decorators: [],
-          listItem: focusBlock.listItem,
-          level: focusBlock.level,
-        }),
-      )
-
-      return
-    }
-
-    if (atTheStartOfBlock && Range.isCollapsed(editor.selection)) {
-      Editor.insertNode(
-        editor,
-        editor.pteCreateTextBlock({
-          decorators: focusAnnotations.length === 0 ? focusDecorators : [],
-          listItem: focusBlock.listItem,
-          level: focusBlock.level,
-        }),
-      )
-
-      const [nextBlockPath] = Path.next(focusBlockPath)
-
-      Transforms.select(editor, {
-        anchor: {path: [nextBlockPath, 0], offset: 0},
-        focus: {path: [nextBlockPath, 0], offset: 0},
-      })
-
-      return
-    }
-
     const selectionAcrossBlocks = anchorBlockPath[0] !== focusBlockPath[0]
 
-    const isInTheMiddleOfNode = !atTheStartOfBlock && !atTheEndOfBlock
-
-    if (isInTheMiddleOfNode && !selectionAcrossBlocks) {
+    if (!selectionAcrossBlocks) {
       Editor.withoutNormalizing(editor, () => {
         if (!editor.selection) {
           return

package/src/behavior-actions/behavior.action.insert.block.ts

@@ -0,0 +1,29 @@
+import {parseBlock} from '../internal-utils/parse-blocks'
+import {toSlateValue} from '../internal-utils/values'
+import {insertBlock} from './behavior.action-utils.insert-block'
+import type {BehaviorActionImplementation} from './behavior.actions'
+
+export const insertBlockActionImplementation: BehaviorActionImplementation<
+  'insert.block'
+> = ({context, action}) => {
+  const parsedBlock = parseBlock({block: action.block, context})
+
+  if (!parsedBlock) {
+    throw new Error(`Failed to parse block ${JSON.stringify(action.block)}`)
+  }
+
+  const fragment = toSlateValue([parsedBlock], {schemaTypes: context.schema})[0]
+
+  if (!fragment) {
+    throw new Error(
+      `Failed to convert block to Slate fragment ${JSON.stringify(parsedBlock)}`,
+    )
+  }
+
+  insertBlock({
+    block: fragment,
+    placement: action.placement,
+    editor: action.editor,
+    schema: context.schema,
+  })
+}