@portabletext/editor 1.30.6 → 1.31.0

package/lib/utils/index.cjs

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: !0 });
-var util_isEmptyTextBlock = require("../_chunks-cjs/util.is-empty-text-block.cjs"), util_isEqualSelectionPoints = require("../_chunks-cjs/util.is-equal-selection-points.cjs"), parseBlocks = require("../_chunks-cjs/parse-blocks.cjs"), util_reverseSelection = require("../_chunks-cjs/util.reverse-selection.cjs"), util_sliceBlocks = require("../_chunks-cjs/util.slice-blocks.cjs");
-function isSpan(context, child) {
-  return child._type === context.schema.span.name;
-}
+var util_reverseSelection = require("../_chunks-cjs/util.reverse-selection.cjs"), util_isEmptyTextBlock = require("../_chunks-cjs/util.is-empty-text-block.cjs"), parseBlocks = require("../_chunks-cjs/parse-blocks.cjs"), util_sliceBlocks = require("../_chunks-cjs/util.slice-blocks.cjs");
 function isTextBlock(context, block) {
   return block._type === context.schema.block.name;
 }
@@ -56,7 +53,7 @@ function splitTextBlock({
         }, "children", {
           _key: lastChild._key
         }],
-        offset: isSpan(context, lastChild) ? lastChild.text.length : 0
+        offset: util_reverseSelection.isSpan(context, lastChild) ? lastChild.text.length : 0
       }
     }
   }).at(0);
@@ -66,17 +63,17 @@ function splitTextBlock({
       after
     };
 }
-exports.blockOffsetToSpanSelectionPoint = util_isEmptyTextBlock.blockOffsetToSpanSelectionPoint;
+exports.blockOffsetToSpanSelectionPoint = util_reverseSelection.blockOffsetToSpanSelectionPoint;
+exports.getBlockEndPoint = util_reverseSelection.getBlockEndPoint;
+exports.getBlockStartPoint = util_reverseSelection.getBlockStartPoint;
+exports.isEqualSelectionPoints = util_reverseSelection.isEqualSelectionPoints;
+exports.isKeyedSegment = util_reverseSelection.isKeyedSegment;
+exports.isSpan = util_reverseSelection.isSpan;
+exports.reverseSelection = util_reverseSelection.reverseSelection;
+exports.spanSelectionPointToBlockOffset = util_reverseSelection.spanSelectionPointToBlockOffset;
 exports.getTextBlockText = util_isEmptyTextBlock.getTextBlockText;
 exports.isEmptyTextBlock = util_isEmptyTextBlock.isEmptyTextBlock;
-exports.spanSelectionPointToBlockOffset = util_isEmptyTextBlock.spanSelectionPointToBlockOffset;
-exports.getBlockEndPoint = util_isEqualSelectionPoints.getBlockEndPoint;
-exports.getBlockStartPoint = util_isEqualSelectionPoints.getBlockStartPoint;
-exports.isEqualSelectionPoints = util_isEqualSelectionPoints.isEqualSelectionPoints;
-exports.isKeyedSegment = util_isEqualSelectionPoints.isKeyedSegment;
-exports.reverseSelection = util_reverseSelection.reverseSelection;
 exports.sliceBlocks = util_sliceBlocks.sliceBlocks;
-exports.isSpan = isSpan;
 exports.isTextBlock = isTextBlock;
 exports.mergeTextBlocks = mergeTextBlocks;
 exports.splitTextBlock = splitTextBlock;

package/lib/utils/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":["../../src/utils/util.is-span.ts","../../src/utils/util.is-text-block.ts","../../src/utils/util.merge-text-blocks.ts","../../src/utils/util.split-text-block.ts"],"sourcesContent":["import type {PortableTextChild, PortableTextSpan} from '@sanity/types'\nimport type {EditorContext} from '../selectors'\n\n/**\n * @public\n */\nexport function isSpan(\n  context: Pick<EditorContext, 'schema'>,\n  child: PortableTextChild,\n): child is PortableTextSpan {\n  return child._type === context.schema.span.name\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":["isSpan","context","child","_type","schema","span","name","isTextBlock","block","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","text"],"mappings":";;;AAMgBA,SAAAA,OACdC,SACAC,OAC2B;AAC3B,SAAOA,MAAMC,UAAUF,QAAQG,OAAOC,KAAKC;AAC7C;ACLgBC,SAAAA,YACdN,SACAO,OACgC;AAChC,SAAOA,MAAML,UAAUF,QAAQG,OAAOI,MAAMF;AAC9C;ACHO,SAASG,gBAAgB;AAAA,EAC9BR;AAAAA,EACAS;AAAAA,EACAC;AAKF,GAAG;AACD,QAAMC,sBAAsBC,YAAAA,WAAW;AAAA,IACrCZ;AAAAA,IACAO,OAAOG;AAAAA,IACPG,SAAS;AAAA,MAACC,aAAa;AAAA,IAAA;AAAA,EAAI,CAC5B;AAED,SAAI,CAACH,uBAAuB,CAACL,YAAYN,SAASW,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,EAC7BjB;AAAAA,EACAO;AAAAA,EACAW;AAKF,GAA8E;AAC5E,QAAMC,aAAaZ,MAAMQ,SAASK,GAAG,CAAC,GAChCC,YAAYd,MAAMQ,SAASK,GAAGb,MAAMQ,SAASO,SAAS,CAAC;AAEzD,MAAA,CAACH,cAAc,CAACE;AAClB;AAGF,QAAME,SAASC,iBAAAA,YAAY;AAAA,IACzBC,QAAQ,CAAClB,KAAK;AAAA,IACdmB,WAAW;AAAA,MACTC,QAAQ;AAAA,QACNC,MAAM,CAAC;AAAA,UAACC,MAAMtB,MAAMsB;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,iBAAAA,YAAY;AAAA,IACxBC,QAAQ,CAAClB,KAAK;AAAA,IACdmB,WAAW;AAAA,MACTC,QAAQT;AAAAA,MACRa,OAAO;AAAA,QACLH,MAAM,CAAC;AAAA,UAACC,MAAMtB,MAAMsB;AAAAA,WAAO,YAAY;AAAA,UAACA,MAAMR,UAAUQ;AAAAA,QAAAA,CAAK;AAAA,QAC7DC,QAAQ/B,OAAOC,SAASqB,SAAS,IAAIA,UAAUY,KAAKX,SAAS;AAAA,MAAA;AAAA,IAC/D;AAAA,EACF,CACD,EAAEF,GAAG,CAAC;AAEP,MAAI,EAACG,CAAAA,UAAU,CAACS,UAIZ,EAAC1B,CAAAA,YAAYN,SAASuB,MAAM,KAAK,CAACjB,YAAYN,SAASgC,KAAK;AAIzD,WAAA;AAAA,MAACT;AAAAA,MAAQS;AAAAA,IAAK;AACvB;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.cjs","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,YAAAA,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,iBAAAA,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,iBAAAA,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,sBAAO9B,OAAAA,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;;;;;;;;;;;;;;;"}

package/lib/utils/index.js

@@ -1,11 +1,8 @@
-import { blockOffsetToSpanSelectionPoint, getTextBlockText, isEmptyTextBlock, spanSelectionPointToBlockOffset } from "../_chunks-es/util.is-empty-text-block.js";
-import { getBlockEndPoint, getBlockStartPoint, isEqualSelectionPoints, isKeyedSegment } from "../_chunks-es/util.is-equal-selection-points.js";
+import { isSpan } from "../_chunks-es/util.reverse-selection.js";
+import { blockOffsetToSpanSelectionPoint, getBlockEndPoint, getBlockStartPoint, isEqualSelectionPoints, isKeyedSegment, reverseSelection, spanSelectionPointToBlockOffset } from "../_chunks-es/util.reverse-selection.js";
+import { getTextBlockText, isEmptyTextBlock } from "../_chunks-es/util.is-empty-text-block.js";
 import { parseBlock } from "../_chunks-es/parse-blocks.js";
-import { reverseSelection } from "../_chunks-es/util.reverse-selection.js";
 import { sliceBlocks } from "../_chunks-es/util.slice-blocks.js";
-function isSpan(context, child) {
-  return child._type === context.schema.span.name;
-}
 function isTextBlock(context, block) {
   return block._type === context.schema.block.name;
 }

package/lib/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../src/utils/util.is-span.ts","../../src/utils/util.is-text-block.ts","../../src/utils/util.merge-text-blocks.ts","../../src/utils/util.split-text-block.ts"],"sourcesContent":["import type {PortableTextChild, PortableTextSpan} from '@sanity/types'\nimport type {EditorContext} from '../selectors'\n\n/**\n * @public\n */\nexport function isSpan(\n  context: Pick<EditorContext, 'schema'>,\n  child: PortableTextChild,\n): child is PortableTextSpan {\n  return child._type === context.schema.span.name\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":["isSpan","context","child","_type","schema","span","name","isTextBlock","block","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","text"],"mappings":";;;;;AAMgBA,SAAAA,OACdC,SACAC,OAC2B;AAC3B,SAAOA,MAAMC,UAAUF,QAAQG,OAAOC,KAAKC;AAC7C;ACLgBC,SAAAA,YACdN,SACAO,OACgC;AAChC,SAAOA,MAAML,UAAUF,QAAQG,OAAOI,MAAMF;AAC9C;ACHO,SAASG,gBAAgB;AAAA,EAC9BR;AAAAA,EACAS;AAAAA,EACAC;AAKF,GAAG;AACD,QAAMC,sBAAsBC,WAAW;AAAA,IACrCZ;AAAAA,IACAO,OAAOG;AAAAA,IACPG,SAAS;AAAA,MAACC,aAAa;AAAA,IAAA;AAAA,EAAI,CAC5B;AAED,SAAI,CAACH,uBAAuB,CAACL,YAAYN,SAASW,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,EAC7BjB;AAAAA,EACAO;AAAAA,EACAW;AAKF,GAA8E;AAC5E,QAAMC,aAAaZ,MAAMQ,SAASK,GAAG,CAAC,GAChCC,YAAYd,MAAMQ,SAASK,GAAGb,MAAMQ,SAASO,SAAS,CAAC;AAEzD,MAAA,CAACH,cAAc,CAACE;AAClB;AAGF,QAAME,SAASC,YAAY;AAAA,IACzBC,QAAQ,CAAClB,KAAK;AAAA,IACdmB,WAAW;AAAA,MACTC,QAAQ;AAAA,QACNC,MAAM,CAAC;AAAA,UAACC,MAAMtB,MAAMsB;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,CAAClB,KAAK;AAAA,IACdmB,WAAW;AAAA,MACTC,QAAQT;AAAAA,MACRa,OAAO;AAAA,QACLH,MAAM,CAAC;AAAA,UAACC,MAAMtB,MAAMsB;AAAAA,WAAO,YAAY;AAAA,UAACA,MAAMR,UAAUQ;AAAAA,QAAAA,CAAK;AAAA,QAC7DC,QAAQ/B,OAAOC,SAASqB,SAAS,IAAIA,UAAUY,KAAKX,SAAS;AAAA,MAAA;AAAA,IAC/D;AAAA,EACF,CACD,EAAEF,GAAG,CAAC;AAEP,MAAI,EAACG,CAAAA,UAAU,CAACS,UAIZ,EAAC1B,CAAAA,YAAYN,SAASuB,MAAM,KAAK,CAACjB,YAAYN,SAASgC,KAAK;AAIzD,WAAA;AAAA,MAACT;AAAAA,MAAQS;AAAAA,IAAK;AACvB;"}
+{"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;"}

package/package.json

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

package/src/behaviors/behavior.core.annotations.ts

@@ -23,7 +23,39 @@ const toggleAnnotationOn = defineBehavior({
   ],
 })
 
+const addAnnotationOnCollapsedSelection = defineBehavior({
+  on: 'annotation.add',
+  guard: ({context}) => {
+    if (!selectors.isSelectionCollapsed({context})) {
+      return false
+    }
+
+    const caretWordSelection = selectors.getCaretWordSelection({context})
+
+    if (
+      !caretWordSelection ||
+      !selectors.isSelectionExpanded({
+        context: {
+          ...context,
+          selection: caretWordSelection,
+        },
+      })
+    ) {
+      return false
+    }
+
+    return {caretWordSelection}
+  },
+  actions: [
+    ({event}, {caretWordSelection}) => [
+      raise({type: 'select', selection: caretWordSelection}),
+      raise({type: 'annotation.add', annotation: event.annotation}),
+    ],
+  ],
+})
+
 export const coreAnnotationBehaviors = {
   toggleAnnotationOff,
   toggleAnnotationOn,
+  addAnnotationOnCollapsedSelection,
 }

package/src/behaviors/behavior.core.ts

@@ -13,6 +13,7 @@ import {coreStyleBehaviors} from './behavior.core.style'
 export const coreBehaviors = [
   coreAnnotationBehaviors.toggleAnnotationOff,
   coreAnnotationBehaviors.toggleAnnotationOn,
+  coreAnnotationBehaviors.addAnnotationOnCollapsedSelection,
   coreDecoratorBehaviors.toggleDecoratorOff,
   coreDecoratorBehaviors.toggleDecoratorOn,
   coreDecoratorBehaviors.strongShortcut,

package/src/editor/plugins/createWithEditableAPI.ts

@@ -634,8 +634,7 @@ export const addAnnotationActionImplementation: BehaviorActionImplementation<
 
   if (originalSelection) {
     if (Range.isCollapsed(originalSelection)) {
-      editor.pteExpandToWord()
-      editor.onChange()
+      return
     }
 
     // If we still have a selection, add the annotation to the selected text

package/src/editor/plugins/createWithUtils.ts

@@ -1,5 +1,3 @@
-import {Editor, Range, Text, Transforms} from 'slate'
-import {debugWithName} from '../../internal-utils/debug'
 import {toSlateValue} from '../../internal-utils/values'
 import type {
   PortableTextMemberSchemaTypes,
@@ -7,12 +5,11 @@ import type {
 } from '../../types/editor'
 import type {EditorActor} from '../editor-machine'
 
-const debug = debugWithName('plugin:withUtils')
-
 interface Options {
   editorActor: EditorActor
   schemaTypes: PortableTextMemberSchemaTypes
 }
+
 /**
  * This plugin makes various util commands available in the editor
  *
@@ -21,54 +18,6 @@ export function createWithUtils({editorActor, schemaTypes}: Options) {
   return function withUtils(
     editor: PortableTextSlateEditor,
   ): PortableTextSlateEditor {
-    // Expands the the selection to wrap around the word the focus is at
-    editor.pteExpandToWord = () => {
-      const {selection} = editor
-      if (selection && !Range.isExpanded(selection)) {
-        const [textNode] = Editor.node(editor, selection.focus, {depth: 2})
-        if (!textNode || !Text.isText(textNode) || textNode.text.length === 0) {
-          debug(`pteExpandToWord: Can't expand to word here`)
-          return
-        }
-        const {focus} = selection
-        const focusOffset = focus.offset
-        const charsBefore = textNode.text.slice(0, focusOffset)
-        const charsAfter = textNode.text.slice(focusOffset, -1)
-        const isEmpty = (str: string) => str.match(/\s/g)
-        const whiteSpaceBeforeIndex = charsBefore
-          .split('')
-          .reverse()
-          .findIndex((str) => isEmpty(str))
-        const newStartOffset =
-          whiteSpaceBeforeIndex > -1
-            ? charsBefore.length - whiteSpaceBeforeIndex
-            : 0
-        const whiteSpaceAfterIndex = charsAfter
-          .split('')
-          .findIndex((obj) => isEmpty(obj))
-        const newEndOffset =
-          charsBefore.length +
-          (whiteSpaceAfterIndex > -1
-            ? whiteSpaceAfterIndex
-            : charsAfter.length + 1)
-        if (
-          !(
-            newStartOffset === newEndOffset ||
-            Number.isNaN(newStartOffset) ||
-            Number.isNaN(newEndOffset)
-          )
-        ) {
-          debug('pteExpandToWord: Expanding to focused word')
-          Transforms.setSelection(editor, {
-            anchor: {...selection.anchor, offset: newStartOffset},
-            focus: {...selection.focus, offset: newEndOffset},
-          })
-          return
-        }
-        debug(`pteExpandToWord: Can't expand to word here`)
-      }
-    }
-
     editor.pteCreateTextBlock = (options: {
       decorators: Array<string>
       listItem?: string

package/src/selectors/index.ts

@@ -9,6 +9,10 @@ export type {
 export {getActiveAnnotations} from './selector.get-active-annotations'
 export {getActiveListItem} from './selector.get-active-list-item'
 export {getActiveStyle} from './selector.get-active-style'
+export {getBlockOffsets} from './selector.get-block-offsets'
+export {getCaretWordSelection} from './selector.get-caret-word-selection'
+export {getNextInlineObject} from './selector.get-next-inline-object'
+export {getPreviousInlineObject} from './selector.get-previous-inline-object'
 export {getSelectedSlice} from './selector.get-selected-slice'
 export {getSelectedSpans} from './selector.get-selected-spans'
 export {getSelection} from './selector.get-selection'

package/src/selectors/selector.get-block-offsets.ts

@@ -0,0 +1,33 @@
+import type {EditorSelector} from '../editor/editor-selector'
+import * as utils from '../utils'
+import {getSelectionEndPoint} from './selector.get-selection-end-point'
+import {getSelectionStartPoint} from './selector.get-selection-start-point'
+
+/**
+ * @public
+ */
+export const getBlockOffsets: EditorSelector<
+  {start: utils.BlockOffset; end: utils.BlockOffset} | undefined
+> = ({context}) => {
+  if (!context.selection) {
+    return undefined
+  }
+
+  const selectionStartPoint = getSelectionStartPoint({context})
+  const selectionEndPoint = getSelectionEndPoint({context})
+
+  if (!selectionStartPoint || !selectionEndPoint) {
+    return undefined
+  }
+
+  const start = utils.spanSelectionPointToBlockOffset({
+    value: context.value,
+    selectionPoint: selectionStartPoint,
+  })
+  const end = utils.spanSelectionPointToBlockOffset({
+    value: context.value,
+    selectionPoint: selectionEndPoint,
+  })
+
+  return start && end ? {start, end} : undefined
+}

package/src/selectors/selector.get-caret-word-selection.test.ts

@@ -0,0 +1,288 @@
+import type {PortableTextBlock} from '@sanity/types'
+import {describe, expect, test} from 'vitest'
+import {compileSchemaDefinition, defineSchema} from '../editor/define-schema'
+import type {EditorSnapshot} from '../editor/editor-snapshot'
+import {createTestKeyGenerator} from '../internal-utils/test-key-generator'
+import type {EditorSelection} from '../utils'
+import {getCaretWordSelection} from './selector.get-caret-word-selection'
+
+const keyGenerator = createTestKeyGenerator()
+
+function snapshot(value: Array<PortableTextBlock>, selection: EditorSelection) {
+  return {
+    context: {
+      value,
+      selection,
+      keyGenerator,
+      activeDecorators: [],
+      converters: [],
+      schema: compileSchemaDefinition(defineSchema({})),
+    },
+  } satisfies EditorSnapshot
+}
+
+describe(getCaretWordSelection.name, () => {
+  test('empty block', () => {
+    expect(
+      getCaretWordSelection(
+        snapshot(
+          [
+            {
+              _key: 'k0',
+              _type: 'block',
+              children: [
+                {
+                  _key: 'k1',
+                  _type: 'span',
+                  text: '',
+                },
+              ],
+            },
+          ],
+          {
+            anchor: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
+              offset: 0,
+            },
+            focus: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
+              offset: 0,
+            },
+          },
+        ),
+      ),
+    ).toEqual(null)
+  })
+
+  test('inline object', () => {
+    expect(
+      getCaretWordSelection(
+        snapshot(
+          [
+            {
+              _key: 'k0',
+              _type: 'block',
+              children: [
+                {
+                  _key: 'k1',
+                  _type: 'stock-ticker',
+                  symbol: 'FOO',
+                },
+              ],
+            },
+          ],
+          {
+            anchor: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
+              offset: 0,
+            },
+            focus: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
+              offset: 0,
+            },
+          },
+        ),
+      ),
+    ).toEqual(null)
+  })
+
+  test('between inline objects', () => {
+    expect(
+      getCaretWordSelection(
+        snapshot(
+          [
+            {
+              _key: 'k0',
+              _type: 'block',
+              children: [
+                {
+                  _key: 'k1',
+                  _type: 'stock-ticker',
+                  symbol: 'FOO',
+                },
+                {
+                  _key: 'k2',
+                  _type: 'span',
+                  text: '',
+                },
+                {
+                  _key: 'k3',
+                  _type: 'stock-ticker',
+                  symbol: 'BAR',
+                },
+              ],
+            },
+          ],
+          {
+            anchor: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k2'}],
+              offset: 0,
+            },
+            focus: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k2'}],
+              offset: 0,
+            },
+          },
+        ),
+      ),
+    ).toEqual(null)
+  })
+
+  test('word between inline objects', () => {
+    expect(
+      getCaretWordSelection(
+        snapshot(
+          [
+            {
+              _key: 'k0',
+              _type: 'block',
+              children: [
+                {
+                  _key: 'k1',
+                  _type: 'stock-ticker',
+                  symbol: 'FOO',
+                },
+                {
+                  _key: 'k2',
+                  _type: 'span',
+                  text: 'foo',
+                },
+                {
+                  _key: 'k3',
+                  _type: 'stock-ticker',
+                  symbol: 'BAR',
+                },
+              ],
+            },
+          ],
+          {
+            anchor: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k2'}],
+              offset: 0,
+            },
+            focus: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k2'}],
+              offset: 0,
+            },
+          },
+        ),
+      ),
+    ).toEqual({
+      anchor: {
+        path: [{_key: 'k0'}, 'children', {_key: 'k2'}],
+        offset: 0,
+      },
+      focus: {
+        path: [{_key: 'k0'}, 'children', {_key: 'k2'}],
+        offset: 3,
+      },
+    })
+  })
+
+  test('no formatting', () => {
+    expect(
+      getCaretWordSelection(
+        snapshot(
+          [
+            {
+              _key: 'k0',
+              _type: 'block',
+              children: [
+                {
+                  _key: 'k1',
+                  _type: 'span',
+                  text: 'foo bar baz',
+                },
+              ],
+            },
+          ],
+          {
+            anchor: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
+              offset: 5,
+            },
+            focus: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
+              offset: 5,
+            },
+          },
+        ),
+      ),
+    ).toEqual({
+      anchor: {
+        path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
+        offset: 4,
+      },
+      focus: {
+        path: [{_key: 'k0'}, 'children', {_key: 'k1'}],
+        offset: 7,
+      },
+    })
+  })
+
+  test('mixed formatting', () => {
+    expect(
+      getCaretWordSelection(
+        snapshot(
+          [
+            {
+              _key: 'k0',
+              _type: 'block',
+              children: [
+                {
+                  _type: 'span',
+                  _key: 'k1',
+                  text: 'f',
+                  marks: ['strong'],
+                },
+                {
+                  _type: 'span',
+                  _key: 'k2',
+                  marks: ['strong', 'em'],
+                  text: 'oo b',
+                },
+                {
+                  _type: 'span',
+                  _key: 'k3',
+                  marks: ['strong', 'em', 'underline'],
+                  text: 'a',
+                },
+                {
+                  _type: 'span',
+                  _key: 'k4',
+                  marks: ['strong', 'underline'],
+                  text: 'r ba',
+                },
+                {
+                  _type: 'span',
+                  _key: 'k5',
+                  marks: ['strong'],
+                  text: 'z',
+                },
+              ],
+            },
+          ],
+          {
+            anchor: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k3'}],
+              offset: 0,
+            },
+            focus: {
+              path: [{_key: 'k0'}, 'children', {_key: 'k3'}],
+              offset: 0,
+            },
+          },
+        ),
+      ),
+    ).toEqual({
+      anchor: {
+        path: [{_key: 'k0'}, 'children', {_key: 'k2'}],
+        offset: 3,
+      },
+      focus: {
+        path: [{_key: 'k0'}, 'children', {_key: 'k4'}],
+        offset: 1,
+      },
+    })
+  })
+})