@portabletext/editor 2.19.3 → 2.21.0

package/lib/utils/index.js

@@ -1,12 +1,12 @@
+import { getBlockKeyFromSelectionPoint } from "../_chunks-es/util.get-text-block-text.js";
 import { blockOffsetToSpanSelectionPoint, getBlockStartPoint, getSelectionEndPoint, getSelectionStartPoint, getTextBlockText, isKeyedSegment, sliceBlocks, spanSelectionPointToBlockOffset } from "../_chunks-es/util.get-text-block-text.js";
-import { blockOffsetToBlockSelectionPoint, blockOffsetToSelectionPoint, blockOffsetsToSelection, childSelectionPointToBlockOffset } from "../_chunks-es/util.child-selection-point-to-block-offset.js";
+import { childSelectionPointToBlockOffset } from "../_chunks-es/util.merge-text-blocks.js";
+import { blockOffsetToBlockSelectionPoint, blockOffsetToSelectionPoint, blockOffsetsToSelection, mergeTextBlocks } from "../_chunks-es/util.merge-text-blocks.js";
 import { isEqualSelectionPoints } from "../_chunks-es/util.is-empty-text-block.js";
 import { getBlockEndPoint, isEmptyTextBlock, isSelectionCollapsed } from "../_chunks-es/util.is-empty-text-block.js";
 import { isSpan } from "@portabletext/schema";
 import { isSpan as isSpan2, isTextBlock } from "@portabletext/schema";
-import { mergeTextBlocks } from "../_chunks-es/util.merge-text-blocks.js";
 import { sliceTextBlock } from "../_chunks-es/util.slice-text-block.js";
-import { selectionPointToBlockOffset } from "../_chunks-es/util.slice-text-block.js";
 function isEqualSelections(a, b) {
   return !a && !b ? !0 : !a || !b ? !1 : isEqualSelectionPoints(a.anchor, b.anchor) && isEqualSelectionPoints(a.focus, b.focus);
 }
@@ -21,6 +21,21 @@ function reverseSelection(selection) {
     backward: !0
   });
 }
+function selectionPointToBlockOffset({
+  context,
+  selectionPoint
+}) {
+  const blockKey = getBlockKeyFromSelectionPoint(selectionPoint);
+  return selectionPoint.path.length === 1 && blockKey !== void 0 ? {
+    path: [{
+      _key: blockKey
+    }],
+    offset: selectionPoint.offset
+  } : childSelectionPointToBlockOffset({
+    context,
+    selectionPoint
+  });
+}
 function splitTextBlock({
   context,
   block,

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/utils/util.is-equal-selections.ts","../../src/utils/util.reverse-selection.ts","../../src/utils/util.split-text-block.ts"],"sourcesContent":["import type {EditorSelection} from '../types/editor'\nimport {isEqualSelectionPoints} from './util.is-equal-selection-points'\n\n/**\n * @public\n */\nexport function isEqualSelections(a: EditorSelection, b: EditorSelection) {\n  if (!a && !b) {\n    return true\n  }\n\n  if (!a || !b) {\n    return false\n  }\n\n  return (\n    isEqualSelectionPoints(a.anchor, b.anchor) &&\n    isEqualSelectionPoints(a.focus, b.focus)\n  )\n}\n","import type {EditorSelection} from '../types/editor'\n\n/**\n * @public\n */\nexport function reverseSelection<\n  TEditorSelection extends NonNullable<EditorSelection> | null,\n>(selection: TEditorSelection): TEditorSelection {\n  if (!selection) {\n    return selection\n  }\n\n  if (selection.backward) {\n    return {\n      anchor: selection.focus,\n      focus: selection.anchor,\n      backward: false,\n    } as TEditorSelection\n  }\n\n  return {\n    anchor: selection.focus,\n    focus: selection.anchor,\n    backward: true,\n  } as TEditorSelection\n}\n","import {isSpan} from '@portabletext/schema'\nimport type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '../editor/editor-snapshot'\nimport type {EditorSelectionPoint} from '../types/editor'\nimport {sliceTextBlock} from './util.slice-text-block'\n\n/**\n * @beta\n */\nexport function splitTextBlock({\n  context,\n  block,\n  point,\n}: {\n  context: Pick<EditorContext, 'schema'>\n  block: PortableTextTextBlock\n  point: EditorSelectionPoint\n}): {before: PortableTextTextBlock; after: PortableTextTextBlock} | undefined {\n  const firstChild = block.children.at(0)\n  const lastChild = block.children.at(block.children.length - 1)\n\n  if (!firstChild || !lastChild) {\n    return undefined\n  }\n\n  const before = sliceTextBlock({\n    context: {\n      schema: context.schema,\n      selection: {\n        anchor: {\n          path: [{_key: block._key}, 'children', {_key: firstChild._key}],\n          offset: 0,\n        },\n        focus: point,\n      },\n    },\n    block,\n  })\n  const after = sliceTextBlock({\n    context: {\n      schema: context.schema,\n      selection: {\n        anchor: point,\n        focus: {\n          path: [{_key: block._key}, 'children', {_key: lastChild._key}],\n          offset: isSpan(context, lastChild) ? lastChild.text.length : 0,\n        },\n      },\n    },\n    block,\n  })\n\n  return {before, after}\n}\n"],"names":["isEqualSelections","a","b","isEqualSelectionPoints","anchor","focus","reverseSelection","selection","backward","splitTextBlock","context","block","point","firstChild","children","at","lastChild","length","before","sliceTextBlock","schema","path","_key","offset","after","isSpan","text"],"mappings":";;;;;;;;;AAMO,SAASA,kBAAkBC,GAAoBC,GAAoB;AACxE,SAAI,CAACD,KAAK,CAACC,IACF,KAGL,CAACD,KAAK,CAACC,IACF,KAIPC,uBAAuBF,EAAEG,QAAQF,EAAEE,MAAM,KACzCD,uBAAuBF,EAAEI,OAAOH,EAAEG,KAAK;AAE3C;ACdO,SAASC,iBAEdC,WAA+C;AAC/C,SAAKA,cAIDA,UAAUC,WACL;AAAA,IACLJ,QAAQG,UAAUF;AAAAA,IAClBA,OAAOE,UAAUH;AAAAA,IACjBI,UAAU;AAAA,EAAA,IAIP;AAAA,IACLJ,QAAQG,UAAUF;AAAAA,IAClBA,OAAOE,UAAUH;AAAAA,IACjBI,UAAU;AAAA,EAAA;AAEd;AChBO,SAASC,eAAe;AAAA,EAC7BC;AAAAA,EACAC;AAAAA,EACAC;AAKF,GAA8E;AAC5E,QAAMC,aAAaF,MAAMG,SAASC,GAAG,CAAC,GAChCC,YAAYL,MAAMG,SAASC,GAAGJ,MAAMG,SAASG,SAAS,CAAC;AAE7D,MAAI,CAACJ,cAAc,CAACG;AAClB;AAGF,QAAME,SAASC,eAAe;AAAA,IAC5BT,SAAS;AAAA,MACPU,QAAQV,QAAQU;AAAAA,MAChBb,WAAW;AAAA,QACTH,QAAQ;AAAA,UACNiB,MAAM,CAAC;AAAA,YAACC,MAAMX,MAAMW;AAAAA,UAAAA,GAAO,YAAY;AAAA,YAACA,MAAMT,WAAWS;AAAAA,UAAAA,CAAK;AAAA,UAC9DC,QAAQ;AAAA,QAAA;AAAA,QAEVlB,OAAOO;AAAAA,MAAAA;AAAAA,IACT;AAAA,IAEFD;AAAAA,EAAAA,CACD,GACKa,QAAQL,eAAe;AAAA,IAC3BT,SAAS;AAAA,MACPU,QAAQV,QAAQU;AAAAA,MAChBb,WAAW;AAAA,QACTH,QAAQQ;AAAAA,QACRP,OAAO;AAAA,UACLgB,MAAM,CAAC;AAAA,YAACC,MAAMX,MAAMW;AAAAA,UAAAA,GAAO,YAAY;AAAA,YAACA,MAAMN,UAAUM;AAAAA,UAAAA,CAAK;AAAA,UAC7DC,QAAQE,OAAOf,SAASM,SAAS,IAAIA,UAAUU,KAAKT,SAAS;AAAA,QAAA;AAAA,MAC/D;AAAA,IACF;AAAA,IAEFN;AAAAA,EAAAA,CACD;AAED,SAAO;AAAA,IAACO;AAAAA,IAAQM;AAAAA,EAAAA;AAClB;"}
+{"version":3,"file":"index.js","sources":["../../src/utils/util.is-equal-selections.ts","../../src/utils/util.reverse-selection.ts","../../src/utils/util.selection-point-to-block-offset.ts","../../src/utils/util.split-text-block.ts"],"sourcesContent":["import type {EditorSelection} from '../types/editor'\nimport {isEqualSelectionPoints} from './util.is-equal-selection-points'\n\n/**\n * @public\n */\nexport function isEqualSelections(a: EditorSelection, b: EditorSelection) {\n  if (!a && !b) {\n    return true\n  }\n\n  if (!a || !b) {\n    return false\n  }\n\n  return (\n    isEqualSelectionPoints(a.anchor, b.anchor) &&\n    isEqualSelectionPoints(a.focus, b.focus)\n  )\n}\n","import type {EditorSelection} from '../types/editor'\n\n/**\n * @public\n */\nexport function reverseSelection<\n  TEditorSelection extends NonNullable<EditorSelection> | null,\n>(selection: TEditorSelection): TEditorSelection {\n  if (!selection) {\n    return selection\n  }\n\n  if (selection.backward) {\n    return {\n      anchor: selection.focus,\n      focus: selection.anchor,\n      backward: false,\n    } as TEditorSelection\n  }\n\n  return {\n    anchor: selection.focus,\n    focus: selection.anchor,\n    backward: true,\n  } as TEditorSelection\n}\n","import type {EditorContext} from '../editor/editor-snapshot'\nimport type {BlockOffset} from '../types/block-offset'\nimport type {EditorSelectionPoint} from '../types/editor'\nimport {childSelectionPointToBlockOffset} from './util.child-selection-point-to-block-offset'\nimport {getBlockKeyFromSelectionPoint} from './util.selection-point'\n\n/**\n * @public\n */\nexport function selectionPointToBlockOffset({\n  context,\n  selectionPoint,\n}: {\n  context: Pick<EditorContext, 'schema' | 'value'>\n  selectionPoint: EditorSelectionPoint\n}): BlockOffset | undefined {\n  const blockKey = getBlockKeyFromSelectionPoint(selectionPoint)\n\n  if (selectionPoint.path.length === 1 && blockKey !== undefined) {\n    return {\n      path: [{_key: blockKey}],\n      offset: selectionPoint.offset,\n    }\n  }\n\n  return childSelectionPointToBlockOffset({\n    context,\n    selectionPoint,\n  })\n}\n","import {isSpan} from '@portabletext/schema'\nimport type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '../editor/editor-snapshot'\nimport type {EditorSelectionPoint} from '../types/editor'\nimport {sliceTextBlock} from './util.slice-text-block'\n\n/**\n * @beta\n */\nexport function splitTextBlock({\n  context,\n  block,\n  point,\n}: {\n  context: Pick<EditorContext, 'schema'>\n  block: PortableTextTextBlock\n  point: EditorSelectionPoint\n}): {before: PortableTextTextBlock; after: PortableTextTextBlock} | undefined {\n  const firstChild = block.children.at(0)\n  const lastChild = block.children.at(block.children.length - 1)\n\n  if (!firstChild || !lastChild) {\n    return undefined\n  }\n\n  const before = sliceTextBlock({\n    context: {\n      schema: context.schema,\n      selection: {\n        anchor: {\n          path: [{_key: block._key}, 'children', {_key: firstChild._key}],\n          offset: 0,\n        },\n        focus: point,\n      },\n    },\n    block,\n  })\n  const after = sliceTextBlock({\n    context: {\n      schema: context.schema,\n      selection: {\n        anchor: point,\n        focus: {\n          path: [{_key: block._key}, 'children', {_key: lastChild._key}],\n          offset: isSpan(context, lastChild) ? lastChild.text.length : 0,\n        },\n      },\n    },\n    block,\n  })\n\n  return {before, after}\n}\n"],"names":["isEqualSelections","a","b","isEqualSelectionPoints","anchor","focus","reverseSelection","selection","backward","selectionPointToBlockOffset","context","selectionPoint","blockKey","getBlockKeyFromSelectionPoint","path","length","undefined","_key","offset","childSelectionPointToBlockOffset","splitTextBlock","block","point","firstChild","children","at","lastChild","before","sliceTextBlock","schema","after","isSpan","text"],"mappings":";;;;;;;;;AAMO,SAASA,kBAAkBC,GAAoBC,GAAoB;AACxE,SAAI,CAACD,KAAK,CAACC,IACF,KAGL,CAACD,KAAK,CAACC,IACF,KAIPC,uBAAuBF,EAAEG,QAAQF,EAAEE,MAAM,KACzCD,uBAAuBF,EAAEI,OAAOH,EAAEG,KAAK;AAE3C;ACdO,SAASC,iBAEdC,WAA+C;AAC/C,SAAKA,cAIDA,UAAUC,WACL;AAAA,IACLJ,QAAQG,UAAUF;AAAAA,IAClBA,OAAOE,UAAUH;AAAAA,IACjBI,UAAU;AAAA,EAAA,IAIP;AAAA,IACLJ,QAAQG,UAAUF;AAAAA,IAClBA,OAAOE,UAAUH;AAAAA,IACjBI,UAAU;AAAA,EAAA;AAEd;AChBO,SAASC,4BAA4B;AAAA,EAC1CC;AAAAA,EACAC;AAIF,GAA4B;AAC1B,QAAMC,WAAWC,8BAA8BF,cAAc;AAE7D,SAAIA,eAAeG,KAAKC,WAAW,KAAKH,aAAaI,SAC5C;AAAA,IACLF,MAAM,CAAC;AAAA,MAACG,MAAML;AAAAA,IAAAA,CAAS;AAAA,IACvBM,QAAQP,eAAeO;AAAAA,EAAAA,IAIpBC,iCAAiC;AAAA,IACtCT;AAAAA,IACAC;AAAAA,EAAAA,CACD;AACH;ACpBO,SAASS,eAAe;AAAA,EAC7BV;AAAAA,EACAW;AAAAA,EACAC;AAKF,GAA8E;AAC5E,QAAMC,aAAaF,MAAMG,SAASC,GAAG,CAAC,GAChCC,YAAYL,MAAMG,SAASC,GAAGJ,MAAMG,SAAST,SAAS,CAAC;AAE7D,MAAI,CAACQ,cAAc,CAACG;AAClB;AAGF,QAAMC,SAASC,eAAe;AAAA,IAC5BlB,SAAS;AAAA,MACPmB,QAAQnB,QAAQmB;AAAAA,MAChBtB,WAAW;AAAA,QACTH,QAAQ;AAAA,UACNU,MAAM,CAAC;AAAA,YAACG,MAAMI,MAAMJ;AAAAA,UAAAA,GAAO,YAAY;AAAA,YAACA,MAAMM,WAAWN;AAAAA,UAAAA,CAAK;AAAA,UAC9DC,QAAQ;AAAA,QAAA;AAAA,QAEVb,OAAOiB;AAAAA,MAAAA;AAAAA,IACT;AAAA,IAEFD;AAAAA,EAAAA,CACD,GACKS,QAAQF,eAAe;AAAA,IAC3BlB,SAAS;AAAA,MACPmB,QAAQnB,QAAQmB;AAAAA,MAChBtB,WAAW;AAAA,QACTH,QAAQkB;AAAAA,QACRjB,OAAO;AAAA,UACLS,MAAM,CAAC;AAAA,YAACG,MAAMI,MAAMJ;AAAAA,UAAAA,GAAO,YAAY;AAAA,YAACA,MAAMS,UAAUT;AAAAA,UAAAA,CAAK;AAAA,UAC7DC,QAAQa,OAAOrB,SAASgB,SAAS,IAAIA,UAAUM,KAAKjB,SAAS;AAAA,QAAA;AAAA,MAC/D;AAAA,IACF;AAAA,IAEFM;AAAAA,EAAAA,CACD;AAED,SAAO;AAAA,IAACM;AAAAA,IAAQG;AAAAA,EAAAA;AAClB;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "2.19.3",
+  "version": "2.21.0",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -73,7 +73,7 @@
     "slate-dom": "^0.118.1",
     "slate-react": "0.118.2",
     "xstate": "^5.24.0",
-    "@portabletext/block-tools": "^4.0.1",
+    "@portabletext/block-tools": "^4.0.2",
     "@portabletext/keyboard-shortcuts": "^2.1.0",
     "@portabletext/patches": "^2.0.0",
     "@portabletext/schema": "^2.0.0"
@@ -81,8 +81,8 @@
   "devDependencies": {
     "@sanity/diff-match-patch": "^3.2.0",
     "@sanity/pkg-utils": "^9.0.3",
-    "@sanity/schema": "^4.14.1",
-    "@sanity/types": "^4.14.1",
+    "@sanity/schema": "^4.14.2",
+    "@sanity/types": "^4.14.2",
     "@types/debug": "^4.1.12",
     "@types/lodash": "^4.17.20",
     "@types/lodash.startcase": "^4.4.9",
@@ -106,14 +106,14 @@
     "vite": "^7.1.12",
     "vitest": "^4.0.6",
     "vitest-browser-react": "^2.0.2",
-    "@portabletext/sanity-bridge": "1.2.1",
+    "@portabletext/sanity-bridge": "1.2.2",
     "@portabletext/test": "^1.0.0",
     "racejar": "2.0.0"
   },
   "peerDependencies": {
-    "@portabletext/sanity-bridge": "^1.2.1",
-    "@sanity/schema": "^4.14.1",
-    "@sanity/types": "^4.14.1",
+    "@portabletext/sanity-bridge": "^1.2.2",
+    "@sanity/schema": "^4.14.2",
+    "@sanity/types": "^4.14.2",
     "react": "^18.3 || ^19",
     "rxjs": "^7.8.2"
   },

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

@@ -1,5 +1,4 @@
 import {isActiveDecorator} from '../selectors/selector.is-active-decorator'
-import {blockOffsetsToSelection} from '../utils/util.block-offsets-to-selection'
 import {raise} from './behavior.types.action'
 import {defineBehavior} from './behavior.types.behavior'
 
@@ -16,19 +15,12 @@ export const abstractDecoratorBehaviors = [
   defineBehavior({
     on: 'decorator.toggle',
     guard: ({snapshot, event}) => {
-      const manualSelection = event.at
-        ? blockOffsetsToSelection({
-            context: snapshot.context,
-            offsets: event.at,
-          })
-        : null
-
-      if (manualSelection) {
+      if (event.at) {
         return !isActiveDecorator(event.decorator)({
           ...snapshot,
           context: {
             ...snapshot.context,
-            selection: manualSelection,
+            selection: event.at,
           },
         })
       }

package/src/behaviors/behavior.abstract.delete.ts

@@ -3,10 +3,8 @@ import {getFocusChild} from '../selectors/selector.get-focus-child'
 import {getFocusTextBlock} from '../selectors/selector.get-focus-text-block'
 import {getNextBlock} from '../selectors/selector.get-next-block'
 import {getPreviousBlock} from '../selectors/selector.get-previous-block'
-import {getTrimmedSelection} from '../selectors/selector.get-trimmed-selection'
 import {isAtTheEndOfBlock} from '../selectors/selector.is-at-the-end-of-block'
 import {isAtTheStartOfBlock} from '../selectors/selector.is-at-the-start-of-block'
-import {blockOffsetsToSelection} from '../utils/util.block-offsets-to-selection'
 import {getBlockEndPoint} from '../utils/util.get-block-end-point'
 import {getBlockStartPoint} from '../utils/util.get-block-start-point'
 import {isEmptyTextBlock} from '../utils/util.is-empty-text-block'
@@ -270,33 +268,6 @@ export const abstractDeleteBehaviors = [
   }),
   defineBehavior({
     on: 'delete.text',
-    guard: ({snapshot, event}) => {
-      const selection = blockOffsetsToSelection({
-        context: snapshot.context,
-        offsets: event.at,
-      })
-
-      if (!selection) {
-        return false
-      }
-
-      const trimmedSelection = getTrimmedSelection({
-        ...snapshot,
-        context: {
-          ...snapshot.context,
-          value: snapshot.context.value,
-          selection,
-        },
-      })
-
-      if (!trimmedSelection) {
-        return false
-      }
-
-      return {
-        selection: trimmedSelection,
-      }
-    },
-    actions: [(_, {selection}) => [raise({type: 'delete', at: selection})]],
+    actions: [({event}) => [raise({...event, type: 'delete'})]],
   }),
 ]

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

@@ -2,7 +2,6 @@ import type {PortableTextBlock} from '@sanity/types'
 import type {EventPosition} from '../internal-utils/event-position'
 import type {MIMEType} from '../internal-utils/mime-type'
 import type {OmitFromUnion, PickFromUnion, StrictExtract} from '../type-utils'
-import type {BlockOffset} from '../types/block-offset'
 import type {
   BlockWithOptionalKey,
   ChildWithOptionalKey,
@@ -130,10 +129,7 @@ export type SyntheticBehaviorEvent =
   | {
       type: StrictExtract<SyntheticBehaviorEventType, 'decorator.add'>
       decorator: string
-      at?: {
-        anchor: BlockOffset
-        focus: BlockOffset
-      }
+      at?: NonNullable<EditorSelection>
     }
   | {
       type: StrictExtract<SyntheticBehaviorEventType, 'decorator.remove'>
@@ -162,6 +158,7 @@ export type SyntheticBehaviorEvent =
       block: BlockWithOptionalKey
       placement: InsertPlacement
       select?: 'start' | 'end' | 'none'
+      at?: NonNullable<EditorSelection>
     }
   | {
       type: StrictExtract<SyntheticBehaviorEventType, 'insert.child'>
@@ -268,7 +265,7 @@ type AbstractBehaviorEvent =
   | {
       type: StrictExtract<SyntheticBehaviorEventType, 'decorator.toggle'>
       decorator: string
-      at?: {anchor: BlockOffset; focus: BlockOffset}
+      at?: NonNullable<EditorSelection>
     }
   | {
       type: StrictExtract<SyntheticBehaviorEventType, 'delete.backward'>
@@ -288,10 +285,7 @@ type AbstractBehaviorEvent =
     }
   | {
       type: StrictExtract<SyntheticBehaviorEventType, 'delete.text'>
-      at: {
-        anchor: BlockOffset
-        focus: BlockOffset
-      }
+      at: NonNullable<EditorSelection>
     }
   | {
       type: StrictExtract<SyntheticBehaviorEventType, 'deserialize'>

package/src/operations/behavior.operation.decorator.add.ts

@@ -1,12 +1,5 @@
 import {Editor, Range, Text, Transforms} from 'slate'
-import {KEY_TO_VALUE_ELEMENT} from '../editor/weakMaps'
-import {slateRangeToSelection} from '../internal-utils/slate-utils'
 import {toSlateRange} from '../internal-utils/to-slate-range'
-import {fromSlateValue} from '../internal-utils/values'
-import {getTrimmedSelection} from '../selectors/selector.get-trimmed-selection'
-import {blockOffsetToSpanSelectionPoint} from '../utils/util.block-offset'
-import {blockOffsetsToSelection} from '../utils/util.block-offsets-to-selection'
-import {selectionPointToBlockOffset} from '../utils/util.selection-point-to-block-offset'
 import type {BehaviorOperationImplementation} from './behavior.operations'
 
 export const decoratorAddOperationImplementation: BehaviorOperationImplementation<
@@ -14,147 +7,61 @@ export const decoratorAddOperationImplementation: BehaviorOperationImplementatio
 > = ({context, operation}) => {
   const editor = operation.editor
   const mark = operation.decorator
-  const value = fromSlateValue(
-    editor.children,
-    context.schema.block.name,
-    KEY_TO_VALUE_ELEMENT.get(editor),
-  )
-
-  const manualAnchor = operation.at?.anchor
-    ? blockOffsetToSpanSelectionPoint({
-        context: {
-          ...context,
-          value,
-        },
-        blockOffset: operation.at.anchor,
-        direction: 'backward',
-      })
-    : undefined
-  const manualFocus = operation.at?.focus
-    ? blockOffsetToSpanSelectionPoint({
-        context: {
-          ...context,
-          value,
-        },
-        blockOffset: operation.at.focus,
-        direction: 'forward',
-      })
-    : undefined
-  const manualSelection =
-    manualAnchor && manualFocus
-      ? {
-          anchor: manualAnchor,
-          focus: manualFocus,
-        }
-      : undefined
-
-  const selection = manualSelection
-    ? (toSlateRange({
+
+  let at = operation.at
+    ? toSlateRange({
         context: {
           schema: context.schema,
           value: operation.editor.value,
-          selection: manualSelection,
+          selection: operation.at,
         },
         blockIndexMap: operation.editor.blockIndexMap,
-      }) ?? editor.selection)
-    : editor.selection
+      })
+    : operation.editor.selection
 
-  if (!selection) {
-    return
+  if (!at) {
+    throw new Error('Unable to add decorator without a selection')
   }
 
-  const editorSelection = slateRangeToSelection({
-    schema: context.schema,
-    editor,
-    range: selection,
-  })
-  const anchorOffset = editorSelection
-    ? selectionPointToBlockOffset({
-        context: {
-          ...context,
-          value,
-        },
-        selectionPoint: editorSelection.anchor,
-      })
-    : undefined
-  const focusOffset = editorSelection
-    ? selectionPointToBlockOffset({
-        context: {
-          ...context,
-          value,
-        },
-        selectionPoint: editorSelection.focus,
-      })
-    : undefined
+  if (Range.isExpanded(at)) {
+    const rangeRef = Editor.rangeRef(editor, at, {affinity: 'inward'})
+    const [start, end] = Range.edges(at)
 
-  if (!anchorOffset || !focusOffset) {
-    throw new Error('Unable to find anchor or focus offset')
-  }
+    const endAtEndOfNode = Editor.isEnd(editor, end, end.path)
 
-  if (Range.isExpanded(selection)) {
-    // Split if needed
-    Transforms.setNodes(
-      editor,
-      {},
-      {at: selection, match: Text.isText, split: true, hanging: true},
-    )
-
-    // The value might have changed after splitting
-    const newValue = fromSlateValue(
-      editor.children,
-      context.schema.block.name,
-      KEY_TO_VALUE_ELEMENT.get(editor),
-    )
-    // We need to find the new selection from the original offsets because the
-    // split operation might have changed the value.
-    const newSelection = blockOffsetsToSelection({
-      context: {
-        ...context,
-        value: newValue,
-      },
-      offsets: {anchor: anchorOffset, focus: focusOffset},
-      backward: editorSelection?.backward,
+    Transforms.splitNodes(editor, {
+      at: end,
+      match: Text.isText,
+      mode: 'lowest',
+      voids: false,
+      always: !endAtEndOfNode,
     })
 
-    const trimmedSelection = getTrimmedSelection({
-      blockIndexMap: editor.blockIndexMap,
-      context: {
-        converters: [],
-        keyGenerator: context.keyGenerator,
-        readOnly: false,
-        schema: context.schema,
-        selection: newSelection,
-        value: newValue,
-      },
-      decoratorState: editor.decoratorState,
+    const startAtStartOfNode = Editor.isStart(editor, start, start.path)
+
+    Transforms.splitNodes(editor, {
+      at: start,
+      match: Text.isText,
+      mode: 'lowest',
+      voids: false,
+      always: !startAtStartOfNode,
     })
 
-    if (!trimmedSelection) {
-      throw new Error('Unable to find trimmed selection')
-    }
+    at = rangeRef.unref()
 
-    const newRange = toSlateRange({
-      context: {
-        schema: context.schema,
-        value: operation.editor.value,
-        selection: trimmedSelection,
-      },
-      blockIndexMap: operation.editor.blockIndexMap,
-    })
+    if (!at) {
+      throw new Error('Unable to add decorator without a selection')
+    }
 
-    if (!newRange) {
-      throw new Error('Unable to find new selection')
+    if (!operation.at) {
+      Transforms.select(editor, at)
     }
 
     // Use new selection to find nodes to decorate
-    const splitTextNodes = Range.isRange(newRange)
-      ? [
-          ...Editor.nodes(editor, {
-            at: newRange,
-            match: (node) => Text.isText(node),
-          }),
-        ]
-      : []
+    const splitTextNodes = Editor.nodes(editor, {
+      at,
+      match: Text.isText,
+    })
 
     for (const [node, path] of splitTextNodes) {
       const marks = [
@@ -172,7 +79,7 @@ export const decoratorAddOperationImplementation: BehaviorOperationImplementatio
   } else {
     const selectedSpan = Array.from(
       Editor.nodes(editor, {
-        at: selection,
+        at,
         match: (node) => editor.isTextSpan(node),
       }),
     )?.at(0)
@@ -181,7 +88,7 @@ export const decoratorAddOperationImplementation: BehaviorOperationImplementatio
       return
     }
 
-    const [block, blockPath] = Editor.node(editor, selection, {
+    const [block, blockPath] = Editor.node(editor, at, {
       depth: 1,
     })
     const lonelyEmptySpan =