@portabletext/editor 2.9.1 → 2.10.0

package/lib/index.js

@@ -8,14 +8,14 @@ import { Element as Element$1, Text, Range, Editor, Node, Point, Path, Transform
 import { useSelected, useSlateSelector, useSlateStatic, useSlate, Editable, ReactEditor, withReact, Slate } from "slate-react";
 import debug$f from "debug";
 import { DOMEditor, isDOMNode, EDITOR_TO_PENDING_SELECTION, IS_FOCUSED, IS_READ_ONLY } from "slate-dom";
-import { getBlockStartPoint, getBlockKeyFromSelectionPoint, getChildKeyFromSelectionPoint, blockOffsetToSpanSelectionPoint, defaultKeyGenerator, parseBlocks, parseBlock, parseAnnotation, isKeyedSegment, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText } from "./_chunks-es/util.slice-blocks.js";
+import { getBlockStartPoint, getBlockKeyFromSelectionPoint, getChildKeyFromSelectionPoint, blockOffsetToSpanSelectionPoint, defaultKeyGenerator, parseBlocks, parseBlock, parseAnnotation, parseSpan, parseInlineObject, isKeyedSegment, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText } from "./_chunks-es/util.slice-blocks.js";
 import { getBlockEndPoint, isSelectionCollapsed, isEqualSelectionPoints, isEmptyTextBlock } from "./_chunks-es/util.is-selection-collapsed.js";
 import isEqual from "lodash/isEqual.js";
 import { isTextBlock, isSpan, compileSchema } from "@portabletext/schema";
 import { defineSchema } from "@portabletext/schema";
 import { isSelectionCollapsed as isSelectionCollapsed$1, getFocusTextBlock, getFocusSpan as getFocusSpan$1, isSelectionExpanded, getFocusBlock as getFocusBlock$1, getSelectedValue, getSelectionStartPoint as getSelectionStartPoint$1, getFocusChild as getFocusChild$1 } from "./_chunks-es/selector.is-selection-expanded.js";
-import { getFocusInlineObject, getSelectedBlocks, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, isOverlappingSelection, isSelectingEntireBlocks, getMarkState, getActiveDecorators, getActiveAnnotationsMarks, getTrimmedSelection, isActiveAnnotation, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, isAtTheEndOfBlock, isAtTheStartOfBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock, getSelectionEndPoint as getSelectionEndPoint$1, isActiveDecorator, getActiveAnnotations, getSelectedTextBlocks, isActiveListItem, isActiveStyle } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
-import { defineBehavior, forward, raise, effect, execute } from "./behaviors/index.js";
+import { getFocusInlineObject, getSelectedBlocks, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, isOverlappingSelection, isSelectingEntireBlocks, getMarkState, getActiveDecorators, getTrimmedSelection, getActiveAnnotationsMarks, isActiveAnnotation, getCaretWordSelection, getFocusBlockObject, getPreviousBlock, getNextBlock, isAtTheEndOfBlock, isAtTheStartOfBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock, getSelectionEndPoint as getSelectionEndPoint$1, isActiveDecorator, getActiveAnnotations, getSelectedTextBlocks, isActiveListItem, isActiveStyle } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
+import { defineBehavior, forward, raise, effect } from "./behaviors/index.js";
 import uniq from "lodash/uniq.js";
 import { setup, fromCallback, assign, and, enqueueActions, emit, assertEvent, raise as raise$1, not, createActor } from "xstate";
 import { compileSchemaDefinitionToPortableTextMemberSchemaTypes, createPortableTextMemberSchemaTypes, portableTextMemberSchemaTypesToSchema } from "@portabletext/sanity-bridge";
@@ -185,7 +185,14 @@ function getFocusSpan({
   if (!editor.selection)
     return [void 0, void 0];
   try {
-    const [node, path] = Editor.node(editor, editor.selection.focus.path);
+    const [focusBlock] = getFocusBlock({
+      editor
+    });
+    if (!focusBlock)
+      return [void 0, void 0];
+    if (!editor.isTextBlock(focusBlock))
+      return [void 0, void 0];
+    const [node, path] = Editor.node(editor, editor.selection.focus.path.slice(0, 2));
     if (editor.isTextSpan(node))
       return [node, path];
   } catch {
@@ -1111,6 +1118,11 @@ function getEditorSnapshot({
   editorActorSnapshot,
   slateEditorInstance
 }) {
+  const selection = slateEditorInstance.selection ? slateRangeToSelection({
+    schema: editorActorSnapshot.context.schema,
+    editor: slateEditorInstance,
+    range: slateEditorInstance.selection
+  }) : null;
   return {
     blockIndexMap: slateEditorInstance.blockIndexMap,
     context: {
@@ -1120,7 +1132,7 @@ function getEditorSnapshot({
         "edit mode": "read only"
       }),
       schema: editorActorSnapshot.context.schema,
-      selection: editorActorSnapshot.context.selection,
+      selection,
       value: slateEditorInstance.value
     },
     decoratorState: slateEditorInstance.decoratorState
@@ -1948,6 +1960,7 @@ const RelayActorContext = createContext({}), debug$d = debugWithName("component:
                 },
                 blocks: result_1.insert,
                 options: {
+                  removeUnusedMarkDefs: !0,
                   validateFields: !1
                 }
               }),
@@ -2416,6 +2429,7 @@ const converterJson = {
         context: snapshot.context,
         block,
         options: {
+          removeUnusedMarkDefs: !0,
           validateFields: !1
         }
       });
@@ -2478,6 +2492,7 @@ function createConverterTextHtml(legacySchema) {
           context: snapshot.context,
           block,
           options: {
+            removeUnusedMarkDefs: !0,
             validateFields: !1
           }
         });
@@ -2525,6 +2540,7 @@ function createConverterTextPlain(legacySchema) {
           context: snapshot.context,
           block,
           options: {
+            removeUnusedMarkDefs: !0,
             validateFields: !1
           }
         });
@@ -2630,46 +2646,6 @@ function createPlaceholderBlock(context) {
     }]
   };
 }
-const insertTextOperationImplementation = ({
-  context,
-  operation
-}) => {
-  const snapshot = {
-    blockIndexMap: operation.editor.blockIndexMap,
-    context: {
-      value: operation.editor.value,
-      selection: operation.editor.selection ? slateRangeToSelection({
-        schema: context.schema,
-        editor: operation.editor,
-        range: operation.editor.selection
-      }) : null,
-      schema: context.schema,
-      keyGenerator: context.keyGenerator,
-      converters: [],
-      readOnly: !1
-    },
-    decoratorState: operation.editor.decoratorState
-  }, markState = getMarkState(snapshot), activeDecorators = getActiveDecorators(snapshot), activeAnnotations = getActiveAnnotationsMarks(snapshot), [focusSpan] = getFocusSpan({
-    editor: operation.editor
-  });
-  if (!focusSpan) {
-    Transforms.insertText(operation.editor, operation.text);
-    return;
-  }
-  if (markState && markState.state === "unchanged") {
-    const markStateDecorators = (markState.marks ?? []).filter((mark) => context.schema.decorators.map((decorator) => decorator.name).includes(mark));
-    if (markStateDecorators.length === activeDecorators.length && markStateDecorators.every((mark) => activeDecorators.includes(mark))) {
-      Transforms.insertText(operation.editor, operation.text);
-      return;
-    }
-  }
-  Transforms.insertNodes(operation.editor, {
-    _type: focusSpan._type,
-    _key: context.keyGenerator(),
-    text: operation.text,
-    marks: [...activeDecorators, ...activeAnnotations]
-  }), EDITOR_TO_PENDING_SELECTION.set(operation.editor, operation.editor.selection), operation.editor.decoratorState = {};
-};
 function getPreviousSpan({
   editor,
   blockPath,
@@ -4096,55 +4072,35 @@ const addAnnotationOperationImplementation = ({
   context,
   operation
 }) => {
-  const location = toSlateRange({
-    context: {
-      schema: context.schema,
-      value: operation.editor.value,
-      selection: {
-        anchor: {
-          path: operation.at,
-          offset: 0
-        },
-        focus: {
-          path: operation.at,
-          offset: 0
-        }
-      }
-    },
-    blockIndexMap: operation.editor.blockIndexMap
-  });
-  if (!location)
-    throw new Error(`Unable to convert ${JSON.stringify(operation.at)} into a Slate Range`);
-  const block = Editor.node(operation.editor, location, {
-    depth: 1
-  })?.[0];
+  const blockIndex = operation.editor.blockIndexMap.get(operation.at[0]._key);
+  if (blockIndex === void 0)
+    throw new Error(`Unable to find block index for block at ${JSON.stringify(operation.at)}`);
+  const block = operation.editor.value.at(blockIndex);
   if (!block)
     throw new Error(`Unable to find block at ${JSON.stringify(operation.at)}`);
-  const parsedBlock = fromSlateValue([block], context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(operation.editor)).at(0);
-  if (!parsedBlock)
-    throw new Error(`Unable to parse block at ${JSON.stringify(operation.at)}`);
   const {
     _type,
     ...filteredProps
-  } = operation.props, updatedBlock = parseBlock({
+  } = operation.props, updatedBlock = {
+    ...block,
+    ...filteredProps
+  }, parsedBlock = parseBlock({
     context,
-    block: {
-      ...parsedBlock,
-      ...filteredProps
-    },
+    block: updatedBlock,
     options: {
+      removeUnusedMarkDefs: !1,
       validateFields: !0
     }
   });
-  if (!updatedBlock)
+  if (!parsedBlock)
     throw new Error(`Unable to update block at ${JSON.stringify(operation.at)}`);
-  const slateBlock = toSlateValue([updatedBlock], {
+  const slateBlock = toSlateValue([parsedBlock], {
     schemaTypes: context.schema
   })?.at(0);
   if (!slateBlock)
     throw new Error("Unable to convert block to Slate value");
   Transforms.setNodes(operation.editor, slateBlock, {
-    at: location
+    at: [blockIndex]
   });
 }, blockUnsetOperationImplementation = ({
   context,
@@ -4182,6 +4138,7 @@ const addAnnotationOperationImplementation = ({
       context,
       block: omit(parsedBlock, propsToRemove),
       options: {
+        removeUnusedMarkDefs: !0,
         validateFields: !0
       }
     });
@@ -4199,6 +4156,7 @@ const addAnnotationOperationImplementation = ({
     context,
     block: omit(parsedBlock, operation.props.filter((prop) => prop !== "_type")),
     options: {
+      removeUnusedMarkDefs: !0,
       validateFields: !0
     }
   });
@@ -4587,6 +4545,7 @@ const insertBlockOperationImplementation = ({
     block: operation.block,
     context,
     options: {
+      removeUnusedMarkDefs: !0,
       validateFields: !0
     }
   });
@@ -4797,7 +4756,115 @@ function insertBlock({
     }
   }
 }
-const moveBackwardOperationImplementation = ({
+const insertChildOperationImplementation = ({
+  context,
+  operation
+}) => {
+  const focus = operation.editor.selection?.focus, focusBlockIndex = focus?.path.at(0), focusChildIndex = focus?.path.at(1);
+  if (focusBlockIndex === void 0 || focusChildIndex === void 0)
+    throw new Error("Unable to insert child without a focus");
+  const [focusBlock, focusBlockPath] = getFocusBlock({
+    editor: operation.editor
+  });
+  if (!focus || !focusBlock || !focusBlockPath)
+    throw new Error("Unable to insert child without a focus block");
+  if (!isTextBlock(context, focusBlock))
+    throw new Error("Unable to insert child into a non-text block");
+  const markDefs = focusBlock.markDefs ?? [], markDefKeyMap = /* @__PURE__ */ new Map();
+  for (const markDef of markDefs)
+    markDefKeyMap.set(markDef._key, markDef._key);
+  const span = parseSpan({
+    span: operation.child,
+    context,
+    markDefKeyMap,
+    options: {
+      validateFields: !0
+    }
+  });
+  if (span) {
+    const [focusSpan] = getFocusSpan({
+      editor: operation.editor
+    });
+    focusSpan ? Transforms.insertNodes(operation.editor, span, {
+      at: focus,
+      select: !0
+    }) : Transforms.insertNodes(operation.editor, span, {
+      at: [focusBlockIndex, focusChildIndex + 1],
+      select: !0
+    });
+    return;
+  }
+  const inlineObject = parseInlineObject({
+    inlineObject: operation.child,
+    context,
+    options: {
+      validateFields: !0
+    }
+  });
+  if (inlineObject) {
+    const {
+      _key,
+      _type,
+      ...rest
+    } = inlineObject;
+    Transforms.insertNodes(operation.editor, {
+      _key,
+      _type,
+      children: [{
+        _key: VOID_CHILD_KEY,
+        _type: "span",
+        text: "",
+        marks: []
+      }],
+      value: rest,
+      __inline: !0
+    }, {
+      at: [focusBlockIndex, focusChildIndex + 1],
+      select: !0
+    });
+    return;
+  }
+  throw new Error("Unable to parse child");
+}, insertTextOperationImplementation = ({
+  context,
+  operation
+}) => {
+  const snapshot = {
+    blockIndexMap: operation.editor.blockIndexMap,
+    context: {
+      value: operation.editor.value,
+      selection: operation.editor.selection ? slateRangeToSelection({
+        schema: context.schema,
+        editor: operation.editor,
+        range: operation.editor.selection
+      }) : null,
+      schema: context.schema,
+      keyGenerator: context.keyGenerator,
+      converters: [],
+      readOnly: !1
+    },
+    decoratorState: operation.editor.decoratorState
+  }, markState = getMarkState(snapshot), activeDecorators = getActiveDecorators(snapshot), activeAnnotations = getActiveAnnotationsMarks(snapshot), [focusSpan] = getFocusSpan({
+    editor: operation.editor
+  });
+  if (!focusSpan) {
+    Transforms.insertText(operation.editor, operation.text);
+    return;
+  }
+  if (markState && markState.state === "unchanged") {
+    const markStateDecorators = (markState.marks ?? []).filter((mark) => context.schema.decorators.map((decorator) => decorator.name).includes(mark));
+    if (markStateDecorators.length === activeDecorators.length && markStateDecorators.every((mark) => activeDecorators.includes(mark))) {
+      Transforms.insertText(operation.editor, operation.text);
+      return;
+    }
+  }
+  Transforms.insertNodes(operation.editor, {
+    _type: focusSpan._type,
+    _key: context.keyGenerator(),
+    text: operation.text,
+    marks: [...activeDecorators, ...activeAnnotations]
+  }), EDITOR_TO_PENDING_SELECTION.set(operation.editor, operation.editor.selection), operation.editor.decoratorState = {};
+}, moveBackwardOperationImplementation = ({
   operation
 }) => {
   Transforms.move(operation.editor, {
@@ -4862,6 +4929,7 @@ const moveBackwardOperationImplementation = ({
   "history.redo": historyRedoOperationImplementation,
   "history.undo": historyUndoOperationImplementation,
   "insert.block": insertBlockOperationImplementation,
+  "insert.child": insertChildOperationImplementation,
   "insert.text": insertTextOperationImplementation,
   "move.backward": moveBackwardOperationImplementation,
   "move.block": moveBlockOperationImplementation,
@@ -4872,141 +4940,148 @@ function performOperation({
   context,
   operation
 }) {
-  try {
-    switch (operation.type) {
-      case "annotation.add": {
-        behaviorOperationImplementations["annotation.add"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "annotation.remove": {
-        behaviorOperationImplementations["annotation.remove"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "block.set": {
-        behaviorOperationImplementations["block.set"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "block.unset": {
-        behaviorOperationImplementations["block.unset"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "child.set": {
-        behaviorOperationImplementations["child.set"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "child.unset": {
-        behaviorOperationImplementations["child.unset"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "decorator.add": {
-        behaviorOperationImplementations["decorator.add"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "decorator.remove": {
-        behaviorOperationImplementations["decorator.remove"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "delete": {
-        behaviorOperationImplementations.delete({
-          context,
-          operation
-        });
-        break;
-      }
-      case "history.redo": {
-        behaviorOperationImplementations["history.redo"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "history.undo": {
-        behaviorOperationImplementations["history.undo"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "insert.block": {
-        behaviorOperationImplementations["insert.block"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "insert.text": {
-        behaviorOperationImplementations["insert.text"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "move.backward": {
-        behaviorOperationImplementations["move.backward"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "move.block": {
-        behaviorOperationImplementations["move.block"]({
-          context,
-          operation
-        });
-        break;
-      }
-      case "move.forward": {
-        behaviorOperationImplementations["move.forward"]({
-          context,
-          operation
-        });
-        break;
-      }
-      default: {
-        behaviorOperationImplementations.select({
-          context,
-          operation
-        });
-        break;
+  Editor.withoutNormalizing(operation.editor, () => {
+    try {
+      switch (operation.type) {
+        case "annotation.add": {
+          behaviorOperationImplementations["annotation.add"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "annotation.remove": {
+          behaviorOperationImplementations["annotation.remove"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "block.set": {
+          behaviorOperationImplementations["block.set"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "block.unset": {
+          behaviorOperationImplementations["block.unset"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "child.set": {
+          behaviorOperationImplementations["child.set"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "child.unset": {
+          behaviorOperationImplementations["child.unset"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "decorator.add": {
+          behaviorOperationImplementations["decorator.add"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "decorator.remove": {
+          behaviorOperationImplementations["decorator.remove"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "delete": {
+          behaviorOperationImplementations.delete({
+            context,
+            operation
+          });
+          break;
+        }
+        case "history.redo": {
+          behaviorOperationImplementations["history.redo"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "history.undo": {
+          behaviorOperationImplementations["history.undo"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "insert.block": {
+          behaviorOperationImplementations["insert.block"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "insert.child": {
+          behaviorOperationImplementations["insert.child"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "insert.text": {
+          behaviorOperationImplementations["insert.text"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "move.backward": {
+          behaviorOperationImplementations["move.backward"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "move.block": {
+          behaviorOperationImplementations["move.block"]({
+            context,
+            operation
+          });
+          break;
+        }
+        case "move.forward": {
+          behaviorOperationImplementations["move.forward"]({
+            context,
+            operation
+          });
+          break;
+        }
+        default: {
+          behaviorOperationImplementations.select({
+            context,
+            operation
+          });
+          break;
+        }
       }
+    } catch (error) {
+      console.error(new Error(`Executing "${operation.type}" failed due to: ${error.message}`));
     }
-  } catch (error) {
-    console.error(new Error(`Executing "${operation.type}" failed due to: ${error.message}`));
-  }
-}
-const CURRENT_OPERATION_ID = /* @__PURE__ */ new WeakMap();
-function withApplyingBehaviorOperations(editor, fn) {
-  CURRENT_OPERATION_ID.set(editor, defaultKeyGenerator()), Editor.withoutNormalizing(editor, fn), CURRENT_OPERATION_ID.set(editor, void 0);
+  });
 }
-function getCurrentOperationId(editor) {
-  return CURRENT_OPERATION_ID.get(editor);
+const IS_PERFORMING_OPERATION = /* @__PURE__ */ new WeakMap();
+function withPerformingBehaviorOperation(editor, fn) {
+  const prev = IS_PERFORMING_OPERATION.get(editor);
+  IS_PERFORMING_OPERATION.set(editor, !0), fn(), IS_PERFORMING_OPERATION.set(editor, prev);
 }
-function isApplyingBehaviorOperations(editor) {
-  return getCurrentOperationId(editor) !== void 0;
+function isPerformingBehaviorOperation(editor) {
+  return IS_PERFORMING_OPERATION.get(editor) ?? !1;
 }
 function createWithEventListeners(editorActor) {
   return function(editor) {
@@ -5017,7 +5092,7 @@ function createWithEventListeners(editorActor) {
       select
     } = editor;
     return editor.delete = (options) => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         editorDelete(options);
         return;
       }
@@ -5046,7 +5121,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.deleteBackward = (unit) => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         console.error("Unexpected call to .deleteBackward(...)");
         return;
       }
@@ -5059,7 +5134,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.deleteForward = (unit) => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         console.error("Unexpected call to .deleteForward(...)");
         return;
       }
@@ -5072,7 +5147,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.insertBreak = () => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         console.error("Unexpected call to .insertBreak(...)");
         return;
       }
@@ -5084,7 +5159,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.insertData = (dataTransfer) => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         console.error("Unexpected call to .insertData(...)");
         return;
       }
@@ -5099,13 +5174,14 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.insertSoftBreak = () => {
-      if (isApplyingBehaviorOperations(editor)) {
-        insertTextOperationImplementation({
+      if (isPerformingBehaviorOperation(editor)) {
+        performOperation({
           context: {
             keyGenerator: editorActor.getSnapshot().context.keyGenerator,
             schema: editorActor.getSnapshot().context.schema
           },
           operation: {
+            type: "insert.text",
             text: `
 `,
             editor
@@ -5121,13 +5197,14 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.insertText = (text) => {
-      if (isApplyingBehaviorOperations(editor)) {
-        insertTextOperationImplementation({
+      if (isPerformingBehaviorOperation(editor)) {
+        performOperation({
           context: {
             keyGenerator: editorActor.getSnapshot().context.keyGenerator,
             schema: editorActor.getSnapshot().context.schema
           },
           operation: {
+            type: "insert.text",
             text,
             editor
           }
@@ -5143,7 +5220,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.redo = () => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         performOperation({
           context: {
             keyGenerator: editorActor.getSnapshot().context.keyGenerator,
@@ -5164,7 +5241,7 @@ function createWithEventListeners(editorActor) {
         editor
       });
     }, editor.select = (location) => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         select(location);
         return;
       }
@@ -5184,7 +5261,7 @@ function createWithEventListeners(editorActor) {
     }, editor.setFragmentData = () => {
       console.error("Unexpected call to .setFragmentData(...)");
     }, editor.undo = () => {
-      if (isApplyingBehaviorOperations(editor)) {
+      if (isPerformingBehaviorOperation(editor)) {
         performOperation({
           context: {
             keyGenerator: editorActor.getSnapshot().context.keyGenerator,
@@ -7734,7 +7811,11 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
 }, coreBehaviorsConfig = [...coreAnnotationBehaviors, coreDecoratorBehaviors.strongShortcut, coreDecoratorBehaviors.emShortcut, coreDecoratorBehaviors.underlineShortcut, coreDecoratorBehaviors.codeShortcut, ...coreDndBehaviors, coreBlockObjectBehaviors.clickingAboveLonelyBlockObject, coreBlockObjectBehaviors.clickingBelowLonelyBlockObject, coreBlockObjectBehaviors.arrowDownOnLonelyBlockObject, coreBlockObjectBehaviors.arrowUpOnLonelyBlockObject, coreBlockObjectBehaviors.breakingBlockObject, coreBlockObjectBehaviors.deletingEmptyTextBlockAfterBlockObject, coreBlockObjectBehaviors.deletingEmptyTextBlockBeforeBlockObject, coreListBehaviors.clearListOnBackspace, coreListBehaviors.unindentListOnBackspace, coreListBehaviors.mergeTextIntoListOnDelete, coreListBehaviors.mergeTextIntoListOnBackspace, coreListBehaviors.deletingListFromStart, coreListBehaviors.clearListOnEnter, coreListBehaviors.indentListOnTab, coreListBehaviors.unindentListOnShiftTab, coreListBehaviors.inheritListLevel, coreListBehaviors.inheritListItem, coreListBehaviors.inheritListProperties, coreInsertBreakBehaviors.breakingAtTheEndOfTextBlock, coreInsertBreakBehaviors.breakingAtTheStartOfTextBlock, coreInsertBreakBehaviors.breakingEntireDocument, coreInsertBreakBehaviors.breakingEntireBlocks, coreInsertBreakBehaviors.breakingInlineObject].map((behavior) => ({
   behavior,
   priority: corePriority
-})), abstractAnnotationBehaviors = [defineBehavior({
+}));
+function withoutNormalizingConditional(editor, predicate, fn) {
+  predicate() ? Editor.withoutNormalizing(editor, fn) : fn();
+}
+const abstractAnnotationBehaviors = [defineBehavior({
   on: "annotation.set",
   guard: ({
     snapshot,
@@ -8516,21 +8597,63 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
     type: "split"
   })]]
 }), defineBehavior({
-  on: "insert.inline object",
+  on: "insert.child",
+  guard: ({
+    snapshot
+  }) => {
+    const lastBlock = getLastBlock$1(snapshot);
+    return !lastBlock || snapshot.context.selection ? !1 : {
+      lastBlockEndPoint: getBlockEndPoint({
+        context: snapshot.context,
+        block: lastBlock
+      })
+    };
+  },
+  actions: [({
+    event
+  }, {
+    lastBlockEndPoint
+  }) => [raise({
+    type: "select",
+    at: {
+      anchor: lastBlockEndPoint,
+      focus: lastBlockEndPoint
+    }
+  }), raise(event)]]
+}), defineBehavior({
+  on: "insert.child",
+  guard: ({
+    snapshot
+  }) => {
+    const focusTextBlock = getFocusTextBlock(snapshot);
+    return snapshot.context.selection && !focusTextBlock;
+  },
   actions: [({
     snapshot,
     event
-  }) => [execute({
+  }) => [raise({
     type: "insert.block",
     block: {
       _type: snapshot.context.schema.block.name,
       children: [{
-        _type: event.inlineObject.name,
-        ...event.inlineObject.value
+        _type: snapshot.context.schema.span.name,
+        text: "",
+        marks: []
       }]
     },
     placement: "auto",
     select: "end"
+  }), raise(event)]]
+}), defineBehavior({
+  on: "insert.inline object",
+  actions: [({
+    event
+  }) => [raise({
+    type: "insert.child",
+    child: {
+      _type: event.inlineObject.name,
+      ...event.inlineObject.value
+    }
   })]]
 }), defineBehavior({
   on: "insert.soft break",
@@ -8542,33 +8665,59 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
 }), defineBehavior({
   on: "insert.span",
   guard: ({
-    snapshot,
-    event
-  }) => ({
-    markDefs: event.annotations?.map((annotation) => ({
-      _type: annotation.name,
-      _key: snapshot.context.keyGenerator(),
-      ...annotation.value
-    })) ?? []
-  }),
+    snapshot
+  }) => !getFocusTextBlock(snapshot),
   actions: [({
     snapshot,
     event
-  }, {
-    markDefs
-  }) => [execute({
+  }) => [raise({
     type: "insert.block",
     block: {
       _type: snapshot.context.schema.block.name,
       children: [{
         _type: snapshot.context.schema.span.name,
-        text: event.text,
-        marks: [...event.decorators ?? [], ...markDefs.map((markDef) => markDef._key)]
-      }],
-      markDefs
+        text: "",
+        marks: []
+      }]
     },
     placement: "auto",
     select: "end"
+  }), raise(event)]]
+}), defineBehavior({
+  on: "insert.span",
+  guard: ({
+    snapshot,
+    event
+  }) => {
+    const focusTextBlock = getFocusTextBlock(snapshot);
+    return {
+      markDefs: event.annotations?.map((annotation) => ({
+        _type: annotation.name,
+        _key: snapshot.context.keyGenerator(),
+        ...annotation.value
+      })) ?? [],
+      focusTextBlock
+    };
+  },
+  actions: [({
+    snapshot,
+    event
+  }, {
+    markDefs,
+    focusTextBlock
+  }) => [...focusTextBlock ? [raise({
+    type: "block.set",
+    at: focusTextBlock.path,
+    props: {
+      markDefs: [...focusTextBlock.node.markDefs ?? [], ...markDefs]
+    }
+  })] : [], raise({
+    type: "insert.child",
+    child: {
+      _type: snapshot.context.schema.span.name,
+      text: event.text,
+      marks: [...event.decorators ?? [], ...markDefs.map((markDef) => markDef._key)]
+    }
   })]]
 })], abstractKeyboardBehaviors = [
   /**
@@ -9046,6 +9195,7 @@ const MAX_LIST_LEVEL = 10, clearListOnBackspace = defineBehavior({
         }),
         context: snapshot.context,
         options: {
+          removeUnusedMarkDefs: !0,
           validateFields: !1
         }
       });
@@ -9253,7 +9403,7 @@ function performEvent({
     return listenedNamespace !== void 0 && eventNamespace !== void 0 && listenedNamespace === eventNamespace || listenedNamespace !== void 0 && eventNamespace === void 0 && listenedNamespace === event.type ? !0 : behavior.on === event.type;
   });
   if (eventBehaviors.length === 0 && isSyntheticBehaviorEvent(event)) {
-    nativeEvent?.preventDefault(), mode === "send" && clearUndoStep(editor), withApplyingBehaviorOperations(editor, () => {
+    nativeEvent?.preventDefault(), mode === "send" && clearUndoStep(editor), withPerformingBehaviorOperation(editor, () => {
       debug$6(`(execute:${eventCategory(event)})`, JSON.stringify(event, null, 2)), performOperation({
         context: {
           keyGenerator,
@@ -9295,67 +9445,13 @@ function performEvent({
         } catch (error) {
           console.error(new Error(`Evaluating actions for "${event.type}" failed due to: ${error.message}`));
         }
-        if (actions.length !== 0) {
-          if (nativeEventPrevented = actions.some((action) => action.type === "raise" || action.type === "execute") || !actions.some((action) => action.type === "forward"), actions.some((action) => action.type === "execute")) {
-            createUndoStep(editor);
-            for (const action of actions) {
-              if (action.type === "effect") {
-                try {
-                  action.effect({
-                    send: sendBack
-                  });
-                } catch (error) {
-                  console.error(new Error(`Executing effect as a result of "${event.type}" failed due to: ${error.message}`));
-                }
-                continue;
-              }
-              if (action.type === "forward") {
-                const remainingEventBehaviors2 = eventBehaviors.slice(eventBehaviorIndex + 1);
-                performEvent({
-                  mode: "forward",
-                  behaviors,
-                  remainingEventBehaviors: remainingEventBehaviors2,
-                  event: action.event,
-                  editor,
-                  keyGenerator,
-                  schema,
-                  getSnapshot,
-                  nativeEvent,
-                  sendBack
-                });
-                continue;
-              }
-              if (action.type === "raise") {
-                performEvent({
-                  mode: "raise",
-                  behaviors,
-                  remainingEventBehaviors: behaviors,
-                  event: action.event,
-                  editor,
-                  keyGenerator,
-                  schema,
-                  getSnapshot,
-                  nativeEvent,
-                  sendBack
-                });
-                continue;
-              }
-              performEvent({
-                mode: "execute",
-                behaviors,
-                remainingEventBehaviors: [],
-                event: action.event,
-                editor,
-                keyGenerator,
-                schema,
-                getSnapshot,
-                nativeEvent: void 0,
-                sendBack
-              });
-            }
-            clearUndoStep(editor);
-            continue;
-          }
+        if (actions.length === 0)
+          continue;
+        nativeEventPrevented = actions.some((action) => action.type === "raise" || action.type === "execute") || !actions.some((action) => action.type === "forward");
+        let undoStepCreated = !1;
+        actions.some((action) => action.type === "execute") && (createUndoStep(editor), undoStepCreated = !0);
+        const actionTypes = actions.map((action) => action.type), uniqueActionTypes = new Set(actionTypes), raiseGroup = actionTypes.length > 1 && uniqueActionTypes.size === 1 && uniqueActionTypes.has("raise"), executeGroup = actionTypes.length > 1 && uniqueActionTypes.size === 1 && uniqueActionTypes.has("execute");
+        withoutNormalizingConditional(editor, () => raiseGroup || executeGroup, () => {
           for (const action of actions) {
             if (action.type === "effect") {
               try {
@@ -9370,7 +9466,7 @@ function performEvent({
             if (action.type === "forward") {
               const remainingEventBehaviors2 = eventBehaviors.slice(eventBehaviorIndex + 1);
               performEvent({
-                mode: "forward",
+                mode: mode === "execute" ? "execute" : "forward",
                 behaviors,
                 remainingEventBehaviors: remainingEventBehaviors2,
                 event: action.event,
@@ -9385,7 +9481,7 @@ function performEvent({
             }
             if (action.type === "raise") {
               performEvent({
-                mode: "raise",
+                mode: mode === "execute" ? "execute" : "raise",
                 behaviors,
                 remainingEventBehaviors: mode === "execute" ? remainingEventBehaviors : behaviors,
                 event: action.event,
@@ -9398,14 +9494,25 @@ function performEvent({
               });
               continue;
             }
-            action.type === "execute" && console.error("Unexpected action type: `execute`");
+            performEvent({
+              mode: "execute",
+              behaviors,
+              remainingEventBehaviors: [],
+              event: action.event,
+              editor,
+              keyGenerator,
+              schema,
+              getSnapshot,
+              nativeEvent: void 0,
+              sendBack
+            });
           }
-        }
+        }), undoStepCreated && clearUndoStep(editor);
       }
       break;
     }
   }
-  !defaultBehaviorOverwritten && isSyntheticBehaviorEvent(event) ? (nativeEvent?.preventDefault(), mode === "send" && clearUndoStep(editor), withApplyingBehaviorOperations(editor, () => {
+  !defaultBehaviorOverwritten && isSyntheticBehaviorEvent(event) ? (nativeEvent?.preventDefault(), mode === "send" && clearUndoStep(editor), withPerformingBehaviorOperation(editor, () => {
     debug$6(`(execute:${eventCategory(event)})`, JSON.stringify(event, null, 2)), performOperation({
       context: {
         keyGenerator,
@@ -11345,7 +11452,8 @@ async function updateValue({
                   slateEditor,
                   value
                 });
-                isChanged = blockChanged || isChanged, isValid = isValid && blockValid;
+                if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !isValid)
+                  break;
               }
               resolve();
             })();
@@ -11374,7 +11482,9 @@ async function updateValue({
               slateEditor,
               value
             });
-            isChanged = blockChanged || isChanged, isValid = isValid && blockValid, index++;
+            if (isChanged = blockChanged || isChanged, isValid = isValid && blockValid, !blockValid)
+              break;
+            index++;
           }
         });
       });