@portabletext/editor 6.1.0-canary.0 → 6.1.0-canary.1

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

@@ -1,4 +1,4 @@
-import * as _portabletext_schema5 from "@portabletext/schema";
+import * as _portabletext_schema6 from "@portabletext/schema";
 import { AnnotationDefinition, AnnotationSchemaType, AnnotationSchemaType as AnnotationSchemaType$1, BaseDefinition, BlockObjectDefinition, BlockObjectSchemaType, BlockObjectSchemaType as BlockObjectSchemaType$1, DecoratorDefinition, DecoratorSchemaType, DecoratorSchemaType as DecoratorSchemaType$1, FieldDefinition, InlineObjectDefinition, InlineObjectSchemaType, InlineObjectSchemaType as InlineObjectSchemaType$1, ListDefinition, ListSchemaType, ListSchemaType as ListSchemaType$1, PortableTextBlock, PortableTextBlock as PortableTextBlock$1, PortableTextChild, PortableTextChild as PortableTextChild$1, PortableTextListBlock, PortableTextObject, PortableTextObject as PortableTextObject$1, PortableTextSpan, PortableTextSpan as PortableTextSpan$1, PortableTextTextBlock, PortableTextTextBlock as PortableTextTextBlock$1, Schema, SchemaDefinition, SchemaDefinition as SchemaDefinition$1, StyleDefinition, StyleSchemaType, StyleSchemaType as StyleSchemaType$1, TypedObject, defineSchema } from "@portabletext/schema";
 import * as xstate73 from "xstate";
 import { ActorRef, ActorRefFrom, EventObject, Snapshot } from "xstate";
@@ -1996,7 +1996,7 @@ declare class PortableTextEditor {
    */
   static delete: (editor: PortableTextEditor, selection: EditorSelection, options?: EditableAPIDeleteOptions) => void;
   static findDOMNode: (editor: PortableTextEditor, element: PortableTextBlock | PortableTextChild) => Node | undefined;
-  static findByPath: (editor: PortableTextEditor, path: Path) => [_portabletext_schema5.PortableTextTextBlock<PortableTextObject | _portabletext_schema5.PortableTextSpan> | PortableTextObject | _portabletext_schema5.PortableTextSpan | undefined, Path | undefined];
+  static findByPath: (editor: PortableTextEditor, path: Path) => [_portabletext_schema6.PortableTextTextBlock<PortableTextObject | _portabletext_schema6.PortableTextSpan> | PortableTextObject | _portabletext_schema6.PortableTextSpan | undefined, Path | undefined];
   /**
    * @deprecated
    * Use `editor.send(...)` instead

package/lib/index.js

@@ -10971,13 +10971,12 @@ function createUndoSteps({
     return currentUndoStepId === previousUndoStepId || editor.isNormalizingNode ? mergeIntoLastStep(steps, lastStep, op) : createNewStep(steps, op, editor);
   if (op.type === "set_selection" && currentUndoStepId === void 0 && previousUndoStepId !== void 0 || op.type === "set_selection" && currentUndoStepId !== void 0 && previousUndoStepId !== void 0 && previousUndoStepId !== currentUndoStepId)
     return mergeIntoLastStep(steps, lastStep, op);
-  if (currentUndoStepId === void 0 && previousUndoStepId === void 0) {
-    if (op.type === "set_selection")
+  if ((op.type === "insert_text" || op.type === "remove_text") && !(lastStep.operations.length > 0 && lastStep.operations.at(-1)?.type === "set_selection" && previousUndoStepId !== currentUndoStepId)) {
+    const lastTextOp = findLastTextOp(lastStep.operations);
+    if (lastTextOp && op.type === "insert_text" && lastTextOp.type === "insert_text" && op.offset === lastTextOp.offset + lastTextOp.text.length && Path.equals(op.path, lastTextOp.path) && op.text !== " " || lastTextOp && op.type === "remove_text" && lastTextOp.type === "remove_text" && op.offset + op.text.length === lastTextOp.offset && Path.equals(op.path, lastTextOp.path))
       return mergeIntoLastStep(steps, lastStep, op);
-    const lastOp = lastStep.operations.at(-1);
-    return lastOp && op.type === "insert_text" && lastOp.type === "insert_text" && op.offset === lastOp.offset + lastOp.text.length && Path.equals(op.path, lastOp.path) && op.text !== " " || lastOp && op.type === "remove_text" && lastOp.type === "remove_text" && op.offset + op.text.length === lastOp.offset && Path.equals(op.path, lastOp.path) ? mergeIntoLastStep(steps, lastStep, op) : createNewStep(steps, op, editor);
   }
-  return createNewStep(steps, op, editor);
+  return currentUndoStepId === void 0 && previousUndoStepId === void 0 && op.type === "set_selection" ? mergeIntoLastStep(steps, lastStep, op) : createNewStep(steps, op, editor);
 }
 function createNewStep(steps, op, editor) {
   const operations = editor.selection === null ? [op] : [{
@@ -11000,6 +10999,13 @@ function mergeIntoLastStep(steps, lastStep, op) {
     operations: [...lastStep.operations, op]
   }];
 }
+function findLastTextOp(operations) {
+  for (let i = operations.length - 1; i >= 0; i--) {
+    const op = operations[i];
+    if (op !== void 0 && (op.type === "insert_text" || op.type === "remove_text"))
+      return op;
+  }
+}
 const UNDO_STEP_LIMIT = 1e3;
 function createHistoryPlugin({
   editorActor,