@portabletext/editor 1.33.6 → 1.34.1

package/lib/utils/index.js

@@ -1,8 +1,30 @@
-import { sliceBlocks, isSpan } from "../_chunks-es/util.slice-blocks.js";
-import { blockOffsetToSpanSelectionPoint, getBlockEndPoint, getBlockStartPoint, getTextBlockText, isEmptyTextBlock, isEqualSelectionPoints, isKeyedSegment, spanSelectionPointToBlockOffset } from "../_chunks-es/util.slice-blocks.js";
+import { isKeyedSegment, sliceBlocks, isSpan } from "../_chunks-es/util.slice-blocks.js";
+import { blockOffsetToSpanSelectionPoint, getBlockEndPoint, getBlockStartPoint, getTextBlockText, isEmptyTextBlock, isEqualSelectionPoints, spanSelectionPointToBlockOffset } from "../_chunks-es/util.slice-blocks.js";
 import { parseBlock } from "../_chunks-es/util.block-offsets-to-selection.js";
 import { blockOffsetsToSelection } from "../_chunks-es/util.block-offsets-to-selection.js";
+import { isPortableTextTextBlock, isPortableTextSpan } from "@sanity/types";
 import { reverseSelection } from "../_chunks-es/util.reverse-selection.js";
+function childSelectionPointToBlockOffset({
+  value,
+  selectionPoint
+}) {
+  let offset = 0;
+  const blockKey = isKeyedSegment(selectionPoint.path[0]) ? selectionPoint.path[0]._key : void 0, childKey = isKeyedSegment(selectionPoint.path[2]) ? selectionPoint.path[2]._key : void 0;
+  if (!(!blockKey || !childKey)) {
+    for (const block of value)
+      if (block._key === blockKey && isPortableTextTextBlock(block))
+        for (const child of block.children) {
+          if (child._key === childKey)
+            return {
+              path: [{
+                _key: block._key
+              }],
+              offset: offset + selectionPoint.offset
+            };
+          isPortableTextSpan(child) && (offset += child.text.length);
+        }
+  }
+}
 function isTextBlock(context, block) {
   return block._type === context.schema.block.name;
 }
@@ -68,6 +90,7 @@ function splitTextBlock({
 export {
   blockOffsetToSpanSelectionPoint,
   blockOffsetsToSelection,
+  childSelectionPointToBlockOffset,
   getBlockEndPoint,
   getBlockStartPoint,
   getTextBlockText,

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/utils/util.is-text-block.ts","../../src/utils/util.merge-text-blocks.ts","../../src/utils/util.split-text-block.ts"],"sourcesContent":["import type {PortableTextBlock, PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '../selectors'\n\n/**\n * @public\n */\nexport function isTextBlock(\n  context: Pick<EditorContext, 'schema'>,\n  block: PortableTextBlock,\n): block is PortableTextTextBlock {\n  return block._type === context.schema.block.name\n}\n","import type {PortableTextTextBlock} from '@sanity/types'\nimport {parseBlock} from '../internal-utils/parse-blocks'\nimport type {EditorContext} from '../selectors'\nimport {isTextBlock} from './util.is-text-block'\n\n/**\n * @beta\n */\nexport function mergeTextBlocks({\n  context,\n  targetBlock,\n  incomingBlock,\n}: {\n  context: Pick<EditorContext, 'keyGenerator' | 'schema'>\n  targetBlock: PortableTextTextBlock\n  incomingBlock: PortableTextTextBlock\n}) {\n  const parsedIncomingBlock = parseBlock({\n    context,\n    block: incomingBlock,\n    options: {refreshKeys: true},\n  })\n\n  if (!parsedIncomingBlock || !isTextBlock(context, parsedIncomingBlock)) {\n    return targetBlock\n  }\n\n  return {\n    ...targetBlock,\n    children: [...targetBlock.children, ...parsedIncomingBlock.children],\n    markDefs: [\n      ...(targetBlock.markDefs ?? []),\n      ...(parsedIncomingBlock.markDefs ?? []),\n    ],\n  }\n}\n","import type {PortableTextTextBlock} from '@sanity/types'\nimport {isTextBlock, sliceBlocks, type EditorSelectionPoint} from '.'\nimport type {EditorContext} from '../selectors'\nimport {isSpan} from './util.is-span'\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 = sliceBlocks({\n    blocks: [block],\n    selection: {\n      anchor: {\n        path: [{_key: block._key}, 'children', {_key: firstChild._key}],\n        offset: 0,\n      },\n      focus: point,\n    },\n  }).at(0)\n  const after = sliceBlocks({\n    blocks: [block],\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  }).at(0)\n\n  if (!before || !after) {\n    return undefined\n  }\n\n  if (!isTextBlock(context, before) || !isTextBlock(context, after)) {\n    return undefined\n  }\n\n  return {before, after}\n}\n"],"names":["isTextBlock","context","block","_type","schema","name","mergeTextBlocks","targetBlock","incomingBlock","parsedIncomingBlock","parseBlock","options","refreshKeys","children","markDefs","splitTextBlock","point","firstChild","at","lastChild","length","before","sliceBlocks","blocks","selection","anchor","path","_key","offset","focus","after","isSpan","text"],"mappings":";;;;;AAMgBA,SAAAA,YACdC,SACAC,OACgC;AAChC,SAAOA,MAAMC,UAAUF,QAAQG,OAAOF,MAAMG;AAC9C;ACHO,SAASC,gBAAgB;AAAA,EAC9BL;AAAAA,EACAM;AAAAA,EACAC;AAKF,GAAG;AACD,QAAMC,sBAAsBC,WAAW;AAAA,IACrCT;AAAAA,IACAC,OAAOM;AAAAA,IACPG,SAAS;AAAA,MAACC,aAAa;AAAA,IAAA;AAAA,EAAI,CAC5B;AAED,SAAI,CAACH,uBAAuB,CAACT,YAAYC,SAASQ,mBAAmB,IAC5DF,cAGF;AAAA,IACL,GAAGA;AAAAA,IACHM,UAAU,CAAC,GAAGN,YAAYM,UAAU,GAAGJ,oBAAoBI,QAAQ;AAAA,IACnEC,UAAU,CACR,GAAIP,YAAYO,YAAY,CAAA,GAC5B,GAAIL,oBAAoBK,YAAY,CAAG,CAAA;AAAA,EAE3C;AACF;AC3BO,SAASC,eAAe;AAAA,EAC7Bd;AAAAA,EACAC;AAAAA,EACAc;AAKF,GAA8E;AAC5E,QAAMC,aAAaf,MAAMW,SAASK,GAAG,CAAC,GAChCC,YAAYjB,MAAMW,SAASK,GAAGhB,MAAMW,SAASO,SAAS,CAAC;AAEzD,MAAA,CAACH,cAAc,CAACE;AAClB;AAGF,QAAME,SAASC,YAAY;AAAA,IACzBC,QAAQ,CAACrB,KAAK;AAAA,IACdsB,WAAW;AAAA,MACTC,QAAQ;AAAA,QACNC,MAAM,CAAC;AAAA,UAACC,MAAMzB,MAAMyB;AAAAA,WAAO,YAAY;AAAA,UAACA,MAAMV,WAAWU;AAAAA,QAAAA,CAAK;AAAA,QAC9DC,QAAQ;AAAA,MACV;AAAA,MACAC,OAAOb;AAAAA,IAAAA;AAAAA,EAEV,CAAA,EAAEE,GAAG,CAAC,GACDY,QAAQR,YAAY;AAAA,IACxBC,QAAQ,CAACrB,KAAK;AAAA,IACdsB,WAAW;AAAA,MACTC,QAAQT;AAAAA,MACRa,OAAO;AAAA,QACLH,MAAM,CAAC;AAAA,UAACC,MAAMzB,MAAMyB;AAAAA,WAAO,YAAY;AAAA,UAACA,MAAMR,UAAUQ;AAAAA,QAAAA,CAAK;AAAA,QAC7DC,QAAQG,OAAO9B,SAASkB,SAAS,IAAIA,UAAUa,KAAKZ,SAAS;AAAA,MAAA;AAAA,IAC/D;AAAA,EACF,CACD,EAAEF,GAAG,CAAC;AAEP,MAAI,EAACG,CAAAA,UAAU,CAACS,UAIZ,EAAC9B,CAAAA,YAAYC,SAASoB,MAAM,KAAK,CAACrB,YAAYC,SAAS6B,KAAK;AAIzD,WAAA;AAAA,MAACT;AAAAA,MAAQS;AAAAA,IAAK;AACvB;"}
+{"version":3,"file":"index.js","sources":["../../src/utils/util.child-selection-point-to-block-offset.ts","../../src/utils/util.is-text-block.ts","../../src/utils/util.merge-text-blocks.ts","../../src/utils/util.split-text-block.ts"],"sourcesContent":["import {\n  isPortableTextSpan,\n  isPortableTextTextBlock,\n  type PortableTextBlock,\n} from '@sanity/types'\nimport type {BlockOffset} from '../behaviors/behavior.types'\nimport type {EditorSelectionPoint} from '../types/editor'\nimport {isKeyedSegment} from './util.is-keyed-segment'\n\n/**\n * @public\n */\nexport function childSelectionPointToBlockOffset({\n  value,\n  selectionPoint,\n}: {\n  value: Array<PortableTextBlock>\n  selectionPoint: EditorSelectionPoint\n}): BlockOffset | undefined {\n  let offset = 0\n\n  const blockKey = isKeyedSegment(selectionPoint.path[0])\n    ? selectionPoint.path[0]._key\n    : undefined\n  const childKey = isKeyedSegment(selectionPoint.path[2])\n    ? selectionPoint.path[2]._key\n    : undefined\n\n  if (!blockKey || !childKey) {\n    return undefined\n  }\n\n  for (const block of value) {\n    if (block._key !== blockKey) {\n      continue\n    }\n\n    if (!isPortableTextTextBlock(block)) {\n      continue\n    }\n\n    for (const child of block.children) {\n      if (child._key === childKey) {\n        return {\n          path: [{_key: block._key}],\n          offset: offset + selectionPoint.offset,\n        }\n      }\n\n      if (isPortableTextSpan(child)) {\n        offset += child.text.length\n      }\n    }\n  }\n}\n","import type {PortableTextBlock, PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '../selectors'\n\n/**\n * @public\n */\nexport function isTextBlock(\n  context: Pick<EditorContext, 'schema'>,\n  block: PortableTextBlock,\n): block is PortableTextTextBlock {\n  return block._type === context.schema.block.name\n}\n","import type {PortableTextTextBlock} from '@sanity/types'\nimport {parseBlock} from '../internal-utils/parse-blocks'\nimport type {EditorContext} from '../selectors'\nimport {isTextBlock} from './util.is-text-block'\n\n/**\n * @beta\n */\nexport function mergeTextBlocks({\n  context,\n  targetBlock,\n  incomingBlock,\n}: {\n  context: Pick<EditorContext, 'keyGenerator' | 'schema'>\n  targetBlock: PortableTextTextBlock\n  incomingBlock: PortableTextTextBlock\n}) {\n  const parsedIncomingBlock = parseBlock({\n    context,\n    block: incomingBlock,\n    options: {refreshKeys: true},\n  })\n\n  if (!parsedIncomingBlock || !isTextBlock(context, parsedIncomingBlock)) {\n    return targetBlock\n  }\n\n  return {\n    ...targetBlock,\n    children: [...targetBlock.children, ...parsedIncomingBlock.children],\n    markDefs: [\n      ...(targetBlock.markDefs ?? []),\n      ...(parsedIncomingBlock.markDefs ?? []),\n    ],\n  }\n}\n","import type {PortableTextTextBlock} from '@sanity/types'\nimport {isTextBlock, sliceBlocks, type EditorSelectionPoint} from '.'\nimport type {EditorContext} from '../selectors'\nimport {isSpan} from './util.is-span'\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 = sliceBlocks({\n    blocks: [block],\n    selection: {\n      anchor: {\n        path: [{_key: block._key}, 'children', {_key: firstChild._key}],\n        offset: 0,\n      },\n      focus: point,\n    },\n  }).at(0)\n  const after = sliceBlocks({\n    blocks: [block],\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  }).at(0)\n\n  if (!before || !after) {\n    return undefined\n  }\n\n  if (!isTextBlock(context, before) || !isTextBlock(context, after)) {\n    return undefined\n  }\n\n  return {before, after}\n}\n"],"names":["childSelectionPointToBlockOffset","value","selectionPoint","offset","blockKey","isKeyedSegment","path","_key","undefined","childKey","block","isPortableTextTextBlock","child","children","isPortableTextSpan","text","length","isTextBlock","context","_type","schema","name","mergeTextBlocks","targetBlock","incomingBlock","parsedIncomingBlock","parseBlock","options","refreshKeys","markDefs","splitTextBlock","point","firstChild","at","lastChild","before","sliceBlocks","blocks","selection","anchor","focus","after","isSpan"],"mappings":";;;;;;AAYO,SAASA,iCAAiC;AAAA,EAC/CC;AAAAA,EACAC;AAIF,GAA4B;AAC1B,MAAIC,SAAS;AAEPC,QAAAA,WAAWC,eAAeH,eAAeI,KAAK,CAAC,CAAC,IAClDJ,eAAeI,KAAK,CAAC,EAAEC,OACvBC,QACEC,WAAWJ,eAAeH,eAAeI,KAAK,CAAC,CAAC,IAClDJ,eAAeI,KAAK,CAAC,EAAEC,OACvBC;AAEA,MAAA,EAAA,CAACJ,YAAY,CAACK;AAIlB,eAAWC,SAAST;AAClB,UAAIS,MAAMH,SAASH,YAIdO,wBAAwBD,KAAK;AAIvBE,mBAAAA,SAASF,MAAMG,UAAU;AAClC,cAAID,MAAML,SAASE;AACV,mBAAA;AAAA,cACLH,MAAM,CAAC;AAAA,gBAACC,MAAMG,MAAMH;AAAAA,cAAAA,CAAK;AAAA,cACzBJ,QAAQA,SAASD,eAAeC;AAAAA,YAClC;AAGEW,6BAAmBF,KAAK,MAC1BT,UAAUS,MAAMG,KAAKC;AAAAA,QAAAA;AAAAA;AAI7B;AChDgBC,SAAAA,YACdC,SACAR,OACgC;AAChC,SAAOA,MAAMS,UAAUD,QAAQE,OAAOV,MAAMW;AAC9C;ACHO,SAASC,gBAAgB;AAAA,EAC9BJ;AAAAA,EACAK;AAAAA,EACAC;AAKF,GAAG;AACD,QAAMC,sBAAsBC,WAAW;AAAA,IACrCR;AAAAA,IACAR,OAAOc;AAAAA,IACPG,SAAS;AAAA,MAACC,aAAa;AAAA,IAAA;AAAA,EAAI,CAC5B;AAED,SAAI,CAACH,uBAAuB,CAACR,YAAYC,SAASO,mBAAmB,IAC5DF,cAGF;AAAA,IACL,GAAGA;AAAAA,IACHV,UAAU,CAAC,GAAGU,YAAYV,UAAU,GAAGY,oBAAoBZ,QAAQ;AAAA,IACnEgB,UAAU,CACR,GAAIN,YAAYM,YAAY,CAAA,GAC5B,GAAIJ,oBAAoBI,YAAY,CAAG,CAAA;AAAA,EAE3C;AACF;AC3BO,SAASC,eAAe;AAAA,EAC7BZ;AAAAA,EACAR;AAAAA,EACAqB;AAKF,GAA8E;AAC5E,QAAMC,aAAatB,MAAMG,SAASoB,GAAG,CAAC,GAChCC,YAAYxB,MAAMG,SAASoB,GAAGvB,MAAMG,SAASG,SAAS,CAAC;AAEzD,MAAA,CAACgB,cAAc,CAACE;AAClB;AAGF,QAAMC,SAASC,YAAY;AAAA,IACzBC,QAAQ,CAAC3B,KAAK;AAAA,IACd4B,WAAW;AAAA,MACTC,QAAQ;AAAA,QACNjC,MAAM,CAAC;AAAA,UAACC,MAAMG,MAAMH;AAAAA,WAAO,YAAY;AAAA,UAACA,MAAMyB,WAAWzB;AAAAA,QAAAA,CAAK;AAAA,QAC9DJ,QAAQ;AAAA,MACV;AAAA,MACAqC,OAAOT;AAAAA,IAAAA;AAAAA,EAEV,CAAA,EAAEE,GAAG,CAAC,GACDQ,QAAQL,YAAY;AAAA,IACxBC,QAAQ,CAAC3B,KAAK;AAAA,IACd4B,WAAW;AAAA,MACTC,QAAQR;AAAAA,MACRS,OAAO;AAAA,QACLlC,MAAM,CAAC;AAAA,UAACC,MAAMG,MAAMH;AAAAA,WAAO,YAAY;AAAA,UAACA,MAAM2B,UAAU3B;AAAAA,QAAAA,CAAK;AAAA,QAC7DJ,QAAQuC,OAAOxB,SAASgB,SAAS,IAAIA,UAAUnB,KAAKC,SAAS;AAAA,MAAA;AAAA,IAC/D;AAAA,EACF,CACD,EAAEiB,GAAG,CAAC;AAEP,MAAI,EAACE,CAAAA,UAAU,CAACM,UAIZ,EAACxB,CAAAA,YAAYC,SAASiB,MAAM,KAAK,CAAClB,YAAYC,SAASuB,KAAK;AAIzD,WAAA;AAAA,MAACN;AAAAA,MAAQM;AAAAA,IAAK;AACvB;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@portabletext/editor",
-  "version": "1.33.6",
+  "version": "1.34.1",
   "description": "Portable Text Editor made in React",
   "keywords": [
     "sanity",
@@ -79,8 +79,8 @@
     "slate-react": "0.112.1",
     "use-effect-event": "^1.0.2",
     "xstate": "^5.19.2",
-    "@portabletext/block-tools": "1.1.8",
-    "@portabletext/patches": "1.1.3"
+    "@portabletext/patches": "1.1.3",
+    "@portabletext/block-tools": "1.1.8"
   },
   "devDependencies": {
     "@portabletext/toolkit": "^2.0.17",

package/src/behavior-actions/behavior.action.decorator.add.ts

@@ -11,20 +11,42 @@ export const decoratorAddActionImplementation: BehaviorActionImplementation<
 > = ({context, action}) => {
   const editor = action.editor
   const mark = action.decorator
-  const selection = action.selection
-    ? (toSlateRange(action.selection, action.editor) ?? editor.selection)
-    : editor.selection
-
-  if (!selection) {
-    return
-  }
-
   const value = fromSlateValue(
     editor.children,
     context.schema.block.name,
     KEY_TO_VALUE_ELEMENT.get(editor),
   )
 
+  const manualAnchor = action.offsets?.anchor
+    ? utils.blockOffsetToSpanSelectionPoint({
+        value,
+        blockOffset: action.offsets.anchor,
+        direction: 'backward',
+      })
+    : undefined
+  const manualFocus = action.offsets?.focus
+    ? utils.blockOffsetToSpanSelectionPoint({
+        value,
+        blockOffset: action.offsets.focus,
+        direction: 'forward',
+      })
+    : undefined
+  const manualSelection =
+    manualAnchor && manualFocus
+      ? {
+          anchor: manualAnchor,
+          focus: manualFocus,
+        }
+      : undefined
+
+  const selection = manualSelection
+    ? (toSlateRange(manualSelection, action.editor) ?? editor.selection)
+    : editor.selection
+
+  if (!selection) {
+    return
+  }
+
   const editorSelection = toPortableTextRange(value, selection, context.schema)
   const anchorOffset = editorSelection
     ? utils.spanSelectionPointToBlockOffset({

package/src/behaviors/behavior.markdown-emphasis.ts

@@ -79,10 +79,6 @@ const emphasisListener: CallbackLogicFunction<
           return false
         }
 
-        if (event.text !== '*' && event.text !== '_') {
-          return false
-        }
-
         const focusTextBlock = selectors.getFocusTextBlock({context})
         const selectionStartPoint = selectors.getSelectionStartPoint({context})
         const selectionStartOffset = selectionStartPoint
@@ -104,44 +100,33 @@ const emphasisListener: CallbackLogicFunction<
           const prefixOffsets = {
             anchor: {
               path: focusTextBlock.path,
-              offset: textBefore.length - textToItalic.length + 1,
+              // Example: "foo *bar*".length - "*bar*".length = 4
+              offset: `${textBefore}${event.text}`.length - textToItalic.length,
             },
             focus: {
               path: focusTextBlock.path,
-              offset: textBefore.length - textToItalic.length + 1 + 1,
+              // Example: "foo *bar*".length - "*bar*".length + 1 = 5
+              offset:
+                `${textBefore}${event.text}`.length - textToItalic.length + 1,
             },
           }
           const suffixOffsets = {
             anchor: {
               path: focusTextBlock.path,
-              offset: selectionStartOffset.offset,
+              // Example: "foo *bar|" (8) + "*".length - 1 = 8
+              offset: selectionStartOffset.offset + event.text.length - 1,
             },
             focus: {
               path: focusTextBlock.path,
-              offset: selectionStartOffset.offset + 1,
+              // Example: "foo *bar|" (8) + "*".length = 9
+              offset: selectionStartOffset.offset + event.text.length,
             },
           }
 
-          const anchor = utils.blockOffsetToSpanSelectionPoint({
-            value: context.value,
-            blockOffset: prefixOffsets.focus,
-            direction: 'backward',
-          })
-          const focus = utils.blockOffsetToSpanSelectionPoint({
-            value: context.value,
-            blockOffset: suffixOffsets.anchor,
-            direction: 'forward',
-          })
-
-          if (!anchor || !focus) {
-            return false
-          }
-
           return {
             prefixOffsets,
             suffixOffsets,
             decorator: italicDecorator,
-            selection: {anchor, focus},
           }
         }
 
@@ -151,35 +136,85 @@ const emphasisListener: CallbackLogicFunction<
           const prefixOffsets = {
             anchor: {
               path: focusTextBlock.path,
-              offset: textBefore.length - textToBold.length + 1,
+              // Example: "foo **bar**".length - "**bar**".length = 4
+              offset: `${textBefore}${event.text}`.length - textToBold.length,
             },
             focus: {
               path: focusTextBlock.path,
-              offset: textBefore.length - textToBold.length + 1 + 2,
+              // Example: "foo **bar**".length - "**bar**".length + 2 = 6
+              offset:
+                `${textBefore}${event.text}`.length - textToBold.length + 2,
             },
           }
+
+          const prefixSelection = utils.blockOffsetsToSelection({
+            value: context.value,
+            offsets: prefixOffsets,
+          })
+          const inlineObjectBeforePrefixFocus =
+            selectors.getPreviousInlineObject({
+              context: {
+                ...context,
+                selection: prefixSelection
+                  ? {
+                      anchor: prefixSelection.focus,
+                      focus: prefixSelection.focus,
+                    }
+                  : null,
+              },
+            })
+          const inlineObjectBeforePrefixFocusOffset =
+            inlineObjectBeforePrefixFocus
+              ? utils.childSelectionPointToBlockOffset({
+                  value: context.value,
+                  selectionPoint: {
+                    path: inlineObjectBeforePrefixFocus.path,
+                    offset: 0,
+                  },
+                })
+              : undefined
+
+          if (
+            inlineObjectBeforePrefixFocusOffset &&
+            inlineObjectBeforePrefixFocusOffset.offset >
+              prefixOffsets.anchor.offset &&
+            inlineObjectBeforePrefixFocusOffset.offset <
+              prefixOffsets.focus.offset
+          ) {
+            return false
+          }
+
           const suffixOffsets = {
             anchor: {
               path: focusTextBlock.path,
-              offset: selectionStartOffset.offset - 1,
+              // Example: "foo **bar*|" (10) + "*".length - 2 = 9
+              offset: selectionStartOffset.offset + event.text.length - 2,
             },
             focus: {
               path: focusTextBlock.path,
-              offset: selectionStartOffset.offset + 1,
+              // Example: "foo **bar*|" (10) + "*".length = 11
+              offset: selectionStartOffset.offset + event.text.length,
             },
           }
-          const anchor = utils.blockOffsetToSpanSelectionPoint({
-            value: context.value,
-            blockOffset: prefixOffsets.focus,
-            direction: 'backward',
-          })
-          const focus = utils.blockOffsetToSpanSelectionPoint({
-            value: context.value,
-            blockOffset: suffixOffsets.anchor,
-            direction: 'forward',
+
+          const previousInlineObject = selectors.getPreviousInlineObject({
+            context,
           })
+          const previousInlineObjectOffset = previousInlineObject
+            ? utils.childSelectionPointToBlockOffset({
+                value: context.value,
+                selectionPoint: {
+                  path: previousInlineObject.path,
+                  offset: 0,
+                },
+              })
+            : undefined
 
-          if (!anchor || !focus) {
+          if (
+            previousInlineObjectOffset &&
+            previousInlineObjectOffset.offset > suffixOffsets.anchor.offset &&
+            previousInlineObjectOffset.offset < suffixOffsets.focus.offset
+          ) {
             return false
           }
 
@@ -187,7 +222,6 @@ const emphasisListener: CallbackLogicFunction<
             prefixOffsets,
             suffixOffsets,
             decorator: boldDecorator,
-            selection: {anchor, focus},
           }
         }
 
@@ -195,11 +229,14 @@ const emphasisListener: CallbackLogicFunction<
       },
       actions: [
         ({event}) => [event],
-        (_, {prefixOffsets, suffixOffsets, decorator, selection}) => [
+        (_, {prefixOffsets, suffixOffsets, decorator}) => [
           {
             type: 'decorator.add',
             decorator,
-            selection,
+            offsets: {
+              anchor: prefixOffsets.focus,
+              focus: suffixOffsets.anchor,
+            },
           },
           {
             type: 'delete.text',
@@ -209,6 +246,10 @@ const emphasisListener: CallbackLogicFunction<
             type: 'delete.text',
             ...prefixOffsets,
           },
+          {
+            type: 'decorator.remove',
+            decorator,
+          },
           {
             type: 'effect',
             effect: () => {

package/src/behaviors/behavior.types.ts

@@ -57,7 +57,7 @@ export type SyntheticBehaviorEvent =
   | {
       type: 'decorator.add'
       decorator: string
-      selection?: NonNullable<EditorSelection>
+      offsets?: {anchor: BlockOffset; focus: BlockOffset}
     }
   | {
       type: 'decorator.remove'
@@ -236,7 +236,7 @@ export type NativeBehaviorEvent =
     }
   | {
       type: 'serialize'
-      originEvent: 'copy' | 'cut' | 'unknown'
+      originEvent: 'copy' | 'cut' | 'drag' | 'unknown'
       dataTransfer: DataTransfer
     }
 

package/src/converters/converter.types.ts

@@ -18,18 +18,19 @@ export function defineConverter<TMIMEType extends MIMEType>(
 export type ConverterEvent<TMIMEType extends MIMEType = MIMEType> =
   | {
       type: 'serialize'
-      originEvent: 'copy' | 'cut' | 'unknown'
+      originEvent: 'copy' | 'cut' | 'drag' | 'unknown'
     }
   | {
       type: 'serialization.failure'
       mimeType: TMIMEType
+      originEvent: 'copy' | 'cut' | 'drag' | 'unknown'
       reason: string
     }
   | {
       type: 'serialization.success'
       data: string
       mimeType: TMIMEType
-      originEvent: 'copy' | 'cut' | 'unknown'
+      originEvent: 'copy' | 'cut' | 'drag' | 'unknown'
     }
   | {
       type: 'deserialize'

package/src/editor/plugins/create-with-event-listeners.ts

@@ -236,11 +236,6 @@ export function createWithEventListeners(
     }
 
     editor.setFragmentData = (dataTransfer, originEvent) => {
-      if (originEvent === 'drag') {
-        setFragmentData(dataTransfer)
-        return
-      }
-
       if (isApplyingBehaviorActions(editor)) {
         setFragmentData(dataTransfer)
         return

package/src/utils/index.ts

@@ -5,6 +5,7 @@ export {
   spanSelectionPointToBlockOffset,
 } from './util.block-offset'
 export {blockOffsetsToSelection} from './util.block-offsets-to-selection'
+export {childSelectionPointToBlockOffset} from './util.child-selection-point-to-block-offset'
 export {getBlockEndPoint} from './util.get-block-end-point'
 export {getBlockStartPoint} from './util.get-block-start-point'
 export {getTextBlockText} from './util.get-text-block-text'

package/src/utils/util.child-selection-point-to-block-offset.ts

@@ -0,0 +1,55 @@
+import {
+  isPortableTextSpan,
+  isPortableTextTextBlock,
+  type PortableTextBlock,
+} from '@sanity/types'
+import type {BlockOffset} from '../behaviors/behavior.types'
+import type {EditorSelectionPoint} from '../types/editor'
+import {isKeyedSegment} from './util.is-keyed-segment'
+
+/**
+ * @public
+ */
+export function childSelectionPointToBlockOffset({
+  value,
+  selectionPoint,
+}: {
+  value: Array<PortableTextBlock>
+  selectionPoint: EditorSelectionPoint
+}): BlockOffset | undefined {
+  let offset = 0
+
+  const blockKey = isKeyedSegment(selectionPoint.path[0])
+    ? selectionPoint.path[0]._key
+    : undefined
+  const childKey = isKeyedSegment(selectionPoint.path[2])
+    ? selectionPoint.path[2]._key
+    : undefined
+
+  if (!blockKey || !childKey) {
+    return undefined
+  }
+
+  for (const block of value) {
+    if (block._key !== blockKey) {
+      continue
+    }
+
+    if (!isPortableTextTextBlock(block)) {
+      continue
+    }
+
+    for (const child of block.children) {
+      if (child._key === childKey) {
+        return {
+          path: [{_key: block._key}],
+          offset: offset + selectionPoint.offset,
+        }
+      }
+
+      if (isPortableTextSpan(child)) {
+        offset += child.text.length
+      }
+    }
+  }
+}