@portabletext/editor 2.1.11 → 2.3.0

package/lib/_chunks-cjs/util.merge-text-blocks.cjs

@@ -12,8 +12,8 @@ function mergeTextBlocks({
     context,
     block: incomingBlock,
     options: {
-      refreshKeys: !0,
-      validateFields: !0
+      refreshKeys: !1,
+      validateFields: !1
     }
   });
   return !parsedIncomingBlock || !isTextBlock(context, parsedIncomingBlock) ? targetBlock : {

package/lib/_chunks-cjs/util.merge-text-blocks.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"util.merge-text-blocks.cjs","sources":["../../src/utils/util.is-text-block.ts","../../src/utils/util.merge-text-blocks.ts"],"sourcesContent":["import type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '..'\nimport {isTypedObject} from '../internal-utils/asserters'\n\n/**\n * @public\n */\nexport function isTextBlock(\n  context: Pick<EditorContext, 'schema'>,\n  block: unknown,\n): block is PortableTextTextBlock {\n  return isTypedObject(block) && block._type === context.schema.block.name\n}\n","import type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '..'\nimport {parseBlock} from '../internal-utils/parse-blocks'\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, validateFields: 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"],"names":["isTextBlock","context","block","isTypedObject","_type","schema","name","mergeTextBlocks","targetBlock","incomingBlock","parsedIncomingBlock","parseBlock","options","refreshKeys","validateFields","children","markDefs"],"mappings":";;AAOO,SAASA,YACdC,SACAC,OACgC;AAChC,SAAOC,iBAAAA,cAAcD,KAAK,KAAKA,MAAME,UAAUH,QAAQI,OAAOH,MAAMI;AACtE;ACJO,SAASC,gBAAgB;AAAA,EAC9BN;AAAAA,EACAO;AAAAA,EACAC;AAKF,GAAG;AACD,QAAMC,sBAAsBC,iBAAAA,WAAW;AAAA,IACrCV;AAAAA,IACAC,OAAOO;AAAAA,IACPG,SAAS;AAAA,MAACC,aAAa;AAAA,MAAMC,gBAAgB;AAAA,IAAA;AAAA,EAAI,CAClD;AAED,SAAI,CAACJ,uBAAuB,CAACV,YAAYC,SAASS,mBAAmB,IAC5DF,cAGF;AAAA,IACL,GAAGA;AAAAA,IACHO,UAAU,CAAC,GAAGP,YAAYO,UAAU,GAAGL,oBAAoBK,QAAQ;AAAA,IACnEC,UAAU,CACR,GAAIR,YAAYQ,YAAY,CAAA,GAC5B,GAAIN,oBAAoBM,YAAY,CAAA,CAAG;AAAA,EAAA;AAG7C;;;"}
+{"version":3,"file":"util.merge-text-blocks.cjs","sources":["../../src/utils/util.is-text-block.ts","../../src/utils/util.merge-text-blocks.ts"],"sourcesContent":["import type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '..'\nimport {isTypedObject} from '../internal-utils/asserters'\n\n/**\n * @public\n */\nexport function isTextBlock(\n  context: Pick<EditorContext, 'schema'>,\n  block: unknown,\n): block is PortableTextTextBlock {\n  return isTypedObject(block) && block._type === context.schema.block.name\n}\n","import type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '..'\nimport {parseBlock} from '../internal-utils/parse-blocks'\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: false, validateFields: false},\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"],"names":["isTextBlock","context","block","isTypedObject","_type","schema","name","mergeTextBlocks","targetBlock","incomingBlock","parsedIncomingBlock","parseBlock","options","refreshKeys","validateFields","children","markDefs"],"mappings":";;AAOO,SAASA,YACdC,SACAC,OACgC;AAChC,SAAOC,iBAAAA,cAAcD,KAAK,KAAKA,MAAME,UAAUH,QAAQI,OAAOH,MAAMI;AACtE;ACJO,SAASC,gBAAgB;AAAA,EAC9BN;AAAAA,EACAO;AAAAA,EACAC;AAKF,GAAG;AACD,QAAMC,sBAAsBC,iBAAAA,WAAW;AAAA,IACrCV;AAAAA,IACAC,OAAOO;AAAAA,IACPG,SAAS;AAAA,MAACC,aAAa;AAAA,MAAOC,gBAAgB;AAAA,IAAA;AAAA,EAAK,CACpD;AAED,SAAI,CAACJ,uBAAuB,CAACV,YAAYC,SAASS,mBAAmB,IAC5DF,cAGF;AAAA,IACL,GAAGA;AAAAA,IACHO,UAAU,CAAC,GAAGP,YAAYO,UAAU,GAAGL,oBAAoBK,QAAQ;AAAA,IACnEC,UAAU,CACR,GAAIR,YAAYQ,YAAY,CAAA,GAC5B,GAAIN,oBAAoBM,YAAY,CAAA,CAAG;AAAA,EAAA;AAG7C;;;"}

package/lib/_chunks-dts/behavior.types.action.d.cts

@@ -4,7 +4,7 @@ import { ArrayDefinition, ArraySchemaType, BlockDecoratorDefinition, BlockListDe
 import * as xstate227 from "xstate";
 import { ActorRef, ActorRefFrom, EventObject, Snapshot } from "xstate";
 import { BaseRange, Descendant, Operation } from "slate";
-import * as react22 from "react";
+import * as react20 from "react";
 import React$1, { BaseSyntheticEvent, ClipboardEvent, Component, FocusEvent, JSX, KeyboardEvent as KeyboardEvent$1, MutableRefObject, PropsWithChildren, ReactElement, RefObject, TextareaHTMLAttributes } from "react";
 import * as xstate_guards12 from "xstate/guards";
 import { Observable, Subject } from "rxjs";
@@ -352,7 +352,7 @@ declare class PortableTextEditor extends Component<PortableTextEditorProps<Inter
   componentDidUpdate(prevProps: PortableTextEditorProps): void;
   componentWillUnmount(): void;
   setEditable: (editable: EditableAPI) => void;
-  render(): react22.JSX.Element;
+  render(): react20.JSX.Element;
   /**
    * @deprecated
    * Use built-in selectors or write your own: https://www.portabletext.org/reference/selectors/
@@ -747,7 +747,7 @@ type PortableTextEditableProps = Omit<TextareaHTMLAttributes<HTMLDivElement>, 'o
  * ```
  * @group Components
  */
-declare const PortableTextEditable: react22.ForwardRefExoticComponent<Omit<PortableTextEditableProps, "ref"> & react22.RefAttributes<Omit<HTMLDivElement, "as" | "onPaste" | "onBeforeInput">>>;
+declare const PortableTextEditable: react20.ForwardRefExoticComponent<Omit<PortableTextEditableProps, "ref"> & react20.RefAttributes<Omit<HTMLDivElement, "as" | "onPaste" | "onBeforeInput">>>;
 type DecoratedRange = BaseRange & {
   rangeDecoration: RangeDecoration;
 };
@@ -1476,7 +1476,7 @@ declare const editorMachine: xstate227.StateMachine<{
   initialValue?: Array<PortableTextBlock>;
 }, xstate227.NonReducibleUnknown, InternalPatchEvent | MutationEvent | PatchesEvent | {
   type: "blurred";
-  event: react22.FocusEvent<HTMLDivElement, Element>;
+  event: react20.FocusEvent<HTMLDivElement, Element>;
 } | {
   type: "done loading";
 } | {
@@ -1488,7 +1488,7 @@ declare const editorMachine: xstate227.StateMachine<{
   data: unknown;
 } | {
   type: "focused";
-  event: react22.FocusEvent<HTMLDivElement, Element>;
+  event: react20.FocusEvent<HTMLDivElement, Element>;
 } | {
   type: "invalid value";
   resolution: InvalidValueResolution | null;
@@ -2135,7 +2135,7 @@ declare const editorMachine: xstate227.StateMachine<{
         type: "drop";
       }, undefined, never, never, never, never, InternalPatchEvent | MutationEvent | PatchesEvent | {
         type: "blurred";
-        event: react22.FocusEvent<HTMLDivElement, Element>;
+        event: react20.FocusEvent<HTMLDivElement, Element>;
       } | {
         type: "done loading";
       } | {
@@ -2147,7 +2147,7 @@ declare const editorMachine: xstate227.StateMachine<{
         data: unknown;
       } | {
         type: "focused";
-        event: react22.FocusEvent<HTMLDivElement, Element>;
+        event: react20.FocusEvent<HTMLDivElement, Element>;
       } | {
         type: "invalid value";
         resolution: InvalidValueResolution | null;
@@ -3018,7 +3018,7 @@ declare const editorMachine: xstate227.StateMachine<{
                         type: "drop";
                       }, undefined, never, never, never, never, InternalPatchEvent | MutationEvent | PatchesEvent | {
                         type: "blurred";
-                        event: react22.FocusEvent<HTMLDivElement, Element>;
+                        event: react20.FocusEvent<HTMLDivElement, Element>;
                       } | {
                         type: "done loading";
                       } | {
@@ -3030,7 +3030,7 @@ declare const editorMachine: xstate227.StateMachine<{
                         data: unknown;
                       } | {
                         type: "focused";
-                        event: react22.FocusEvent<HTMLDivElement, Element>;
+                        event: react20.FocusEvent<HTMLDivElement, Element>;
                       } | {
                         type: "invalid value";
                         resolution: InvalidValueResolution | null;

package/lib/_chunks-es/selector.is-selection-expanded.js

@@ -1,4 +1,4 @@
-import { getBlockKeyFromSelectionPoint, isTextBlock, getChildKeyFromSelectionPoint, isSpan, isSpan$1, getSelectionStartPoint as getSelectionStartPoint$1, getSelectionEndPoint, sliceBlocks } from "./util.slice-blocks.js";
+import { getBlockKeyFromSelectionPoint, isTextBlock, getChildKeyFromSelectionPoint, isSpan, isSpan$1, sliceBlocks, getSelectionStartPoint as getSelectionStartPoint$1, getSelectionEndPoint } from "./util.slice-blocks.js";
 import { isKeySegment } from "@sanity/types";
 const getFocusBlock = (snapshot) => {
   if (!snapshot.context.selection)

package/lib/_chunks-es/util.merge-text-blocks.js

@@ -11,8 +11,8 @@ function mergeTextBlocks({
     context,
     block: incomingBlock,
     options: {
-      refreshKeys: !0,
-      validateFields: !0
+      refreshKeys: !1,
+      validateFields: !1
     }
   });
   return !parsedIncomingBlock || !isTextBlock(context, parsedIncomingBlock) ? targetBlock : {

package/lib/_chunks-es/util.merge-text-blocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.merge-text-blocks.js","sources":["../../src/utils/util.is-text-block.ts","../../src/utils/util.merge-text-blocks.ts"],"sourcesContent":["import type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '..'\nimport {isTypedObject} from '../internal-utils/asserters'\n\n/**\n * @public\n */\nexport function isTextBlock(\n  context: Pick<EditorContext, 'schema'>,\n  block: unknown,\n): block is PortableTextTextBlock {\n  return isTypedObject(block) && block._type === context.schema.block.name\n}\n","import type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '..'\nimport {parseBlock} from '../internal-utils/parse-blocks'\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, validateFields: 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"],"names":["isTextBlock","context","block","isTypedObject","_type","schema","name","mergeTextBlocks","targetBlock","incomingBlock","parsedIncomingBlock","parseBlock","options","refreshKeys","validateFields","children","markDefs"],"mappings":";AAOO,SAASA,YACdC,SACAC,OACgC;AAChC,SAAOC,cAAcD,KAAK,KAAKA,MAAME,UAAUH,QAAQI,OAAOH,MAAMI;AACtE;ACJO,SAASC,gBAAgB;AAAA,EAC9BN;AAAAA,EACAO;AAAAA,EACAC;AAKF,GAAG;AACD,QAAMC,sBAAsBC,WAAW;AAAA,IACrCV;AAAAA,IACAC,OAAOO;AAAAA,IACPG,SAAS;AAAA,MAACC,aAAa;AAAA,MAAMC,gBAAgB;AAAA,IAAA;AAAA,EAAI,CAClD;AAED,SAAI,CAACJ,uBAAuB,CAACV,YAAYC,SAASS,mBAAmB,IAC5DF,cAGF;AAAA,IACL,GAAGA;AAAAA,IACHO,UAAU,CAAC,GAAGP,YAAYO,UAAU,GAAGL,oBAAoBK,QAAQ;AAAA,IACnEC,UAAU,CACR,GAAIR,YAAYQ,YAAY,CAAA,GAC5B,GAAIN,oBAAoBM,YAAY,CAAA,CAAG;AAAA,EAAA;AAG7C;"}
+{"version":3,"file":"util.merge-text-blocks.js","sources":["../../src/utils/util.is-text-block.ts","../../src/utils/util.merge-text-blocks.ts"],"sourcesContent":["import type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '..'\nimport {isTypedObject} from '../internal-utils/asserters'\n\n/**\n * @public\n */\nexport function isTextBlock(\n  context: Pick<EditorContext, 'schema'>,\n  block: unknown,\n): block is PortableTextTextBlock {\n  return isTypedObject(block) && block._type === context.schema.block.name\n}\n","import type {PortableTextTextBlock} from '@sanity/types'\nimport type {EditorContext} from '..'\nimport {parseBlock} from '../internal-utils/parse-blocks'\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: false, validateFields: false},\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"],"names":["isTextBlock","context","block","isTypedObject","_type","schema","name","mergeTextBlocks","targetBlock","incomingBlock","parsedIncomingBlock","parseBlock","options","refreshKeys","validateFields","children","markDefs"],"mappings":";AAOO,SAASA,YACdC,SACAC,OACgC;AAChC,SAAOC,cAAcD,KAAK,KAAKA,MAAME,UAAUH,QAAQI,OAAOH,MAAMI;AACtE;ACJO,SAASC,gBAAgB;AAAA,EAC9BN;AAAAA,EACAO;AAAAA,EACAC;AAKF,GAAG;AACD,QAAMC,sBAAsBC,WAAW;AAAA,IACrCV;AAAAA,IACAC,OAAOO;AAAAA,IACPG,SAAS;AAAA,MAACC,aAAa;AAAA,MAAOC,gBAAgB;AAAA,IAAA;AAAA,EAAK,CACpD;AAED,SAAI,CAACJ,uBAAuB,CAACV,YAAYC,SAASS,mBAAmB,IAC5DF,cAGF;AAAA,IACL,GAAGA;AAAAA,IACHO,UAAU,CAAC,GAAGP,YAAYO,UAAU,GAAGL,oBAAoBK,QAAQ;AAAA,IACnEC,UAAU,CACR,GAAIR,YAAYQ,YAAY,CAAA,GAC5B,GAAIN,oBAAoBM,YAAY,CAAA,CAAG;AAAA,EAAA;AAG7C;"}

package/lib/index.cjs

@@ -1136,7 +1136,7 @@ const converterJson = {
         context: snapshot.context,
         block,
         options: {
-          refreshKeys: !0,
+          refreshKeys: !1,
           validateFields: !1
         }
       });
@@ -1200,7 +1200,7 @@ function createConverterTextHtml(legacySchema) {
           block,
           options: {
             refreshKeys: !1,
-            validateFields: !0
+            validateFields: !1
           }
         });
         return parsedBlock ? [parsedBlock] : [];
@@ -1248,7 +1248,7 @@ function createConverterTextPlain(legacySchema) {
           block,
           options: {
             refreshKeys: !1,
-            validateFields: !0
+            validateFields: !1
           }
         });
         return parsedBlock ? [parsedBlock] : [];
@@ -3276,9 +3276,17 @@ const addAnnotationOperationImplementation = ({
   context,
   operation
 }) => {
-  const anchorBlockKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(operation.at.anchor), focusBlockKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(operation.at.focus), endBlockKey = operation.at.backward ? anchorBlockKey : focusBlockKey, endOffset = operation.at.backward ? operation.at.focus.offset : operation.at.anchor.offset;
+  const anchorBlockKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(operation.at.anchor), focusBlockKey = util_sliceBlocks.getBlockKeyFromSelectionPoint(operation.at.focus), startBlockKey = operation.at.backward ? focusBlockKey : anchorBlockKey, endBlockKey = operation.at.backward ? anchorBlockKey : focusBlockKey, endOffset = operation.at.backward ? operation.at.focus.offset : operation.at.anchor.offset;
+  if (!startBlockKey)
+    throw new Error("Failed to get start block key");
   if (!endBlockKey)
     throw new Error("Failed to get end block key");
+  const startBlockIndex = operation.editor.blockIndexMap.get(startBlockKey);
+  if (startBlockIndex === void 0)
+    throw new Error("Failed to get start block index");
+  const startBlock = operation.editor.value.at(startBlockIndex);
+  if (!startBlock)
+    throw new Error("Failed to get start block");
   const endBlockIndex = operation.editor.blockIndexMap.get(endBlockKey);
   if (endBlockIndex === void 0)
     throw new Error("Failed to get end block index");
@@ -3309,11 +3317,14 @@ const addAnnotationOperationImplementation = ({
   if (!range)
     throw new Error(`Failed to get Slate Range for selection ${JSON.stringify(operation.at)}`);
   const hanging = util_sliceBlocks.isTextBlock(context, endBlock) && endOffset === 0;
-  operation.editor.delete({
+  slate.deleteText(operation.editor, {
     at: range,
     reverse: operation.direction === "backward",
     unit: operation.unit,
     hanging
+  }), operation.editor.selection && util_sliceBlocks.isTextBlock(context, startBlock) && util_sliceBlocks.isTextBlock(context, endBlock) && slate.setSelection(operation.editor, {
+    anchor: operation.editor.selection.focus,
+    focus: operation.editor.selection.focus
   });
 }, insertInlineObjectOperationImplementation = ({
   context,
@@ -3405,19 +3416,19 @@ const addAnnotationOperationImplementation = ({
   if (!fragment)
     throw new Error(`Failed to convert block to Slate fragment ${JSON.stringify(parsedBlock)}`);
   insertBlock({
+    context,
     block: fragment,
     placement: operation.placement,
     select: operation.select ?? "start",
-    editor: operation.editor,
-    schema: context.schema
+    editor: operation.editor
   });
 };
 function insertBlock({
+  context,
   block,
   placement,
   select,
-  editor,
-  schema: schema2
+  editor
 }) {
   const [startBlock, startBlockPath] = getSelectionStartBlock({
     editor
@@ -3439,7 +3450,7 @@ function insertBlock({
         at: nextPath
       }), select === "start" ? slate.Transforms.select(editor, slate.Editor.start(editor, nextPath)) : select === "end" && slate.Transforms.select(editor, slate.Editor.end(editor, nextPath));
     } else {
-      if (lastBlock && isEqualToEmptyEditor([lastBlock], schema2)) {
+      if (lastBlock && isEqualToEmptyEditor([lastBlock], context.schema)) {
         slate.Transforms.removeNodes(editor, {
           at: lastBlockPath
         }), slate.Transforms.insertNodes(editor, [block], {
@@ -3490,14 +3501,14 @@ function insertBlock({
         node: block,
         path: [newSelection.anchor.path[0]]
       }) : newSelection;
-      select === "none" && adjustedSelection && slate.Transforms.select(editor, adjustedSelection), focusBlock && isEqualToEmptyEditor([focusBlock], schema2) && slate.Transforms.removeNodes(editor, {
+      select === "none" && adjustedSelection && slate.Transforms.select(editor, adjustedSelection), focusBlock && isEqualToEmptyEditor([focusBlock], context.schema) && slate.Transforms.removeNodes(editor, {
         at: focusBlockPath
       });
       return;
     }
     if (editor.isTextBlock(endBlock) && editor.isTextBlock(block)) {
       const selectionStartPoint = slate.Range.start(currentSelection);
-      if (isEqualToEmptyEditor([endBlock], schema2)) {
+      if (isEqualToEmptyEditor([endBlock], context.schema)) {
         const currentSelection2 = editor.selection;
         slate.Transforms.insertNodes(editor, [block], {
           at: endBlockPath,
@@ -3507,17 +3518,46 @@ function insertBlock({
         }), select === "start" ? slate.Transforms.select(editor, selectionStartPoint) : select === "end" ? slate.Transforms.select(editor, slate.Editor.end(editor, endBlockPath)) : slate.Transforms.select(editor, currentSelection2);
         return;
       }
-      if (slate.Transforms.setNodes(editor, {
-        markDefs: [...endBlock.markDefs ?? [], ...block.markDefs ?? []]
+      const endBlockChildKeys = endBlock.children.map((child) => child._key), endBlockMarkDefsKeys = endBlock.markDefs?.map((markDef) => markDef._key) ?? [], markDefKeyMap = /* @__PURE__ */ new Map(), adjustedMarkDefs = block.markDefs?.map((markDef) => {
+        if (endBlockMarkDefsKeys.includes(markDef._key)) {
+          const newKey = context.keyGenerator();
+          return markDefKeyMap.set(markDef._key, newKey), {
+            ...markDef,
+            _key: newKey
+          };
+        }
+        return markDef;
+      }), adjustedChildren = block.children.map((child) => {
+        if (util_sliceBlocks.isSpan(context, child)) {
+          const marks = child.marks?.map((mark) => markDefKeyMap.get(mark) || mark) ?? [];
+          if (!isEqual__default.default(child.marks, marks))
+            return {
+              ...child,
+              _key: endBlockChildKeys.includes(child._key) ? context.keyGenerator() : child._key,
+              marks
+            };
+        }
+        return endBlockChildKeys.includes(child._key) ? {
+          ...child,
+          _key: context.keyGenerator()
+        } : child;
+      });
+      slate.Transforms.setNodes(editor, {
+        markDefs: [...endBlock.markDefs ?? [], ...adjustedMarkDefs ?? []]
       }, {
         at: endBlockPath
-      }), select === "end") {
-        slate.Transforms.insertFragment(editor, [block], {
+      });
+      const adjustedBlock = isEqual__default.default(block.children, adjustedChildren) ? block : {
+        ...block,
+        children: adjustedChildren
+      };
+      if (select === "end") {
+        slate.Transforms.insertFragment(editor, [adjustedBlock], {
           voids: !0
         });
         return;
       }
-      slate.Transforms.insertFragment(editor, [block], {
+      slate.Transforms.insertFragment(editor, [adjustedBlock], {
         at: currentSelection,
         voids: !0
       }), select === "start" ? slate.Transforms.select(editor, selectionStartPoint) : slate.Point.equals(selectionStartPoint, endBlockEndPoint) || slate.Transforms.select(editor, selectionStartPoint);
@@ -3527,9 +3567,7 @@ function insertBlock({
         slate.Transforms.insertNodes(editor, [block], {
           at: endBlockPath,
           select: !1
-        }), (select === "start" || select === "end") && slate.Transforms.select(editor, slate.Editor.start(editor, endBlockPath)), util_isSelectionCollapsed.isEmptyTextBlock({
-          schema: schema2
-        }, endBlock) && slate.Transforms.removeNodes(editor, {
+        }), (select === "start" || select === "end") && slate.Transforms.select(editor, slate.Editor.start(editor, endBlockPath)), util_isSelectionCollapsed.isEmptyTextBlock(context, endBlock) && slate.Transforms.removeNodes(editor, {
           at: slate.Path.next(endBlockPath)
         });
       else if (slate.Range.isCollapsed(currentSelection) && slate.Point.equals(selectionEndPoint, endBlockEndPoint2)) {
@@ -4065,6 +4103,58 @@ function createWithObjectKeys(editorActor) {
         });
         return;
       }
+      if (operation.type === "merge_node") {
+        const index = operation.path[operation.path.length - 1], prevPath = slate.Path.previous(operation.path), prevIndex = prevPath[prevPath.length - 1];
+        if (operation.path.length !== 1 || prevPath.length !== 1) {
+          apply2(operation);
+          return;
+        }
+        const block = editor.value.at(index), previousBlock = editor.value.at(prevIndex);
+        if (!block || !previousBlock) {
+          apply2(operation);
+          return;
+        }
+        if (!util_sliceBlocks.isTextBlock(editorActor.getSnapshot().context, block) || !util_sliceBlocks.isTextBlock(editorActor.getSnapshot().context, previousBlock)) {
+          apply2(operation);
+          return;
+        }
+        const previousBlockChildKeys = previousBlock.children.map((child) => child._key), previousBlockMarkDefKeys = previousBlock.markDefs?.map((markDef) => markDef._key) ?? [], markDefKeyMap = /* @__PURE__ */ new Map(), adjustedMarkDefs = block.markDefs?.map((markDef) => {
+          if (previousBlockMarkDefKeys.includes(markDef._key)) {
+            const newKey = editorActor.getSnapshot().context.keyGenerator();
+            return markDefKeyMap.set(markDef._key, newKey), {
+              ...markDef,
+              _key: newKey
+            };
+          }
+          return markDef;
+        });
+        let childIndex = 0;
+        for (const child of block.children) {
+          if (util_sliceBlocks.isSpan(editorActor.getSnapshot().context, child)) {
+            const marks = child.marks?.map((mark) => markDefKeyMap.get(mark) || mark) ?? [];
+            isEqual__default.default(child.marks, marks) || slate.Transforms.setNodes(editor, {
+              marks
+            }, {
+              at: [index, childIndex]
+            });
+          }
+          previousBlockChildKeys.includes(child._key) && slate.Transforms.setNodes(editor, {
+            _key: editorActor.getSnapshot().context.keyGenerator()
+          }, {
+            at: [index, childIndex]
+          }), childIndex++;
+        }
+        apply2({
+          ...operation,
+          properties: {
+            ...operation.properties,
+            // Make sure the adjusted markDefs are carried along for the merge
+            // operation
+            markDefs: adjustedMarkDefs
+          }
+        });
+        return;
+      }
       apply2(operation);
     }, editor.normalizeNode = (entry) => {
       const [node, path] = entry;
@@ -6468,6 +6558,44 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = behaviors_index.defineBehavior
     unit: event.unit,
     at: selection
   })]]
+}), behaviors_index.defineBehavior({
+  on: "delete",
+  guard: ({
+    snapshot,
+    event
+  }) => {
+    if (event.direction !== "backward")
+      return !1;
+    const previousBlock = selector_isSelectingEntireBlocks.getPreviousBlock(snapshot), focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot);
+    if (!previousBlock || !focusTextBlock || !selector_isSelectingEntireBlocks.isAtTheStartOfBlock(focusTextBlock)(snapshot))
+      return !1;
+    const previousBlockEndPoint = util_isSelectionCollapsed.getBlockEndPoint({
+      context: snapshot.context,
+      block: previousBlock
+    });
+    return util_sliceBlocks.isTextBlock(snapshot.context, previousBlock.node) ? {
+      previousBlockEndPoint,
+      focusTextBlock
+    } : !1;
+  },
+  actions: [(_, {
+    previousBlockEndPoint,
+    focusTextBlock
+  }) => [behaviors_index.raise({
+    type: "delete.block",
+    at: focusTextBlock.path
+  }), behaviors_index.raise({
+    type: "select",
+    at: {
+      anchor: previousBlockEndPoint,
+      focus: previousBlockEndPoint
+    }
+  }), behaviors_index.raise({
+    type: "insert.block",
+    block: focusTextBlock.node,
+    placement: "auto",
+    select: "start"
+  })]]
 }), behaviors_index.defineBehavior({
   on: "delete.forward",
   guard: ({
@@ -6485,6 +6613,30 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = behaviors_index.defineBehavior
     unit: event.unit,
     at: selection
   })]]
+}), behaviors_index.defineBehavior({
+  on: "delete",
+  guard: ({
+    snapshot,
+    event
+  }) => {
+    if (event.direction !== "forward")
+      return !1;
+    const nextBlock = selector_isSelectingEntireBlocks.getNextBlock(snapshot), focusTextBlock = selector_isSelectionExpanded.getFocusTextBlock(snapshot);
+    return !nextBlock || !focusTextBlock || !selector_isSelectingEntireBlocks.isAtTheEndOfBlock(focusTextBlock)(snapshot) || !util_sliceBlocks.isTextBlock(snapshot.context, nextBlock.node) ? !1 : {
+      nextBlock
+    };
+  },
+  actions: [(_, {
+    nextBlock
+  }) => [behaviors_index.raise({
+    type: "delete.block",
+    at: nextBlock.path
+  }), behaviors_index.raise({
+    type: "insert.block",
+    block: nextBlock.node,
+    placement: "auto",
+    select: "none"
+  })]]
 }), behaviors_index.defineBehavior({
   on: "delete.block",
   actions: [({
@@ -6967,6 +7119,57 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = behaviors_index.defineBehavior
       at: selection
     })]]
   }),
+  behaviors_index.defineBehavior({
+    on: "split",
+    guard: ({
+      snapshot
+    }) => {
+      const selection = snapshot.context.selection;
+      if (!selection || util_isSelectionCollapsed.isSelectionCollapsed(selection))
+        return !1;
+      const selectionStartBlock = selector_isSelectingEntireBlocks.getSelectionStartBlock(snapshot), selectionEndBlock = selector_isSelectingEntireBlocks.getSelectionEndBlock(snapshot);
+      if (!selectionStartBlock || !selectionEndBlock || selectionStartBlock.node._key === selectionEndBlock.node._key)
+        return !1;
+      const startPoint = util_sliceBlocks.getSelectionStartPoint(selection), startBlockEndPoint = util_isSelectionCollapsed.getBlockEndPoint({
+        context: snapshot.context,
+        block: selectionStartBlock
+      }), endPoint = util_sliceBlocks.getSelectionEndPoint(selection), endBlockStartPoint = util_sliceBlocks.getBlockStartPoint({
+        context: snapshot.context,
+        block: selectionEndBlock
+      }), blocksInBetween = selector_isSelectionExpanded.getSelectedValue(snapshot).filter((block) => block._key !== selectionStartBlock.node._key && block._key !== selectionEndBlock.node._key);
+      return {
+        startPoint,
+        startBlockEndPoint,
+        endPoint,
+        endBlockStartPoint,
+        blocksInBetween
+      };
+    },
+    actions: [(_, {
+      startPoint,
+      startBlockEndPoint,
+      endPoint,
+      endBlockStartPoint,
+      blocksInBetween
+    }) => [behaviors_index.raise({
+      type: "delete",
+      at: {
+        anchor: startPoint,
+        focus: startBlockEndPoint
+      }
+    }), ...blocksInBetween.map((block) => behaviors_index.raise({
+      type: "delete.block",
+      at: [{
+        _key: block._key
+      }]
+    })), behaviors_index.raise({
+      type: "delete",
+      at: {
+        anchor: endBlockStartPoint,
+        focus: endPoint
+      }
+    })]]
+  }),
   behaviors_index.defineBehavior({
     on: "split",
     guard: ({
@@ -7013,8 +7216,8 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = behaviors_index.defineBehavior
         }),
         context: snapshot.context,
         options: {
-          refreshKeys: !0,
-          validateFields: !0
+          refreshKeys: !1,
+          validateFields: !1
         }
       });
       return newTextBlock ? {
@@ -11341,8 +11544,8 @@ const debug = debugWithName("component:Editable"), PortableTextEditable = React.
               },
               blocks: result_1.insert,
               options: {
-                refreshKeys: !0,
-                validateFields: !0
+                refreshKeys: !1,
+                validateFields: !1
               }
             }),
             placement: "auto"