@portabletext/editor 1.50.7 → 1.51.0

package/lib/index.d.cts

@@ -171,6 +171,7 @@ declare type AbstractBehaviorEvent =
       type: StrictExtract<SyntheticBehaviorEventType, 'insert.blocks'>
       blocks: Array<BlockWithOptionalKey>
       placement: InsertPlacement
+      select?: 'start' | 'end' | 'none'
     }
   | {
       type: StrictExtract<SyntheticBehaviorEventType, 'insert.break'>
@@ -2786,7 +2787,6 @@ export declare type EditorSnapshot = {
   beta: {
     activeAnnotations: Array<string>
     activeDecorators: Array<string>
-    hasTag: HasTag
     internalDrag:
       | {
           origin: Pick<EventPosition, 'selection'>
@@ -2887,8 +2887,6 @@ export declare type FocusChange = {
   event: FocusEvent_2<HTMLDivElement, Element>
 }
 
-declare type HasTag = ReturnType<EditorActor['getSnapshot']>['hasTag']
-
 declare interface History_2 {
   redos: HistoryItem[]
   undos: HistoryItem[]

package/lib/index.d.ts

@@ -171,6 +171,7 @@ declare type AbstractBehaviorEvent =
       type: StrictExtract<SyntheticBehaviorEventType, 'insert.blocks'>
       blocks: Array<BlockWithOptionalKey>
       placement: InsertPlacement
+      select?: 'start' | 'end' | 'none'
     }
   | {
       type: StrictExtract<SyntheticBehaviorEventType, 'insert.break'>
@@ -2786,7 +2787,6 @@ export declare type EditorSnapshot = {
   beta: {
     activeAnnotations: Array<string>
     activeDecorators: Array<string>
-    hasTag: HasTag
     internalDrag:
       | {
           origin: Pick<EventPosition, 'selection'>
@@ -2887,8 +2887,6 @@ export declare type FocusChange = {
   event: FocusEvent_2<HTMLDivElement, Element>
 }
 
-declare type HasTag = ReturnType<EditorActor['getSnapshot']>['hasTag']
-
 declare interface History_2 {
   redos: HistoryItem[]
   undos: HistoryItem[]

package/lib/index.js

@@ -9,18 +9,18 @@ import { Element as Element$1, Text, Range, Editor, Node, Point, Transforms, Pat
 import { useSlateStatic, useSelected, withReact, ReactEditor, Slate, useSlate, Editable } from "slate-react";
 import debug$h from "debug";
 import { getBlockEndPoint, isEmptyTextBlock, isEqualSelectionPoints } from "./_chunks-es/util.is-equal-selection-points.js";
-import { getBlockStartPoint, isKeyedSegment, parseInlineObject, parseTextBlock, parseBlockObject, parseBlock, sliceBlocks, isTextBlock, parseAnnotation, blockOffsetToSpanSelectionPoint, isSpan$1 as isSpan, isListBlock, isTypedObject, getTextBlockText, parseBlocks } from "./_chunks-es/util.slice-blocks.js";
+import { getBlockStartPoint, getBlockKeyFromSelectionPoint, parseInlineObject, parseTextBlock, parseBlockObject, parseBlock, sliceBlocks, isTextBlock, parseAnnotation, blockOffsetToSpanSelectionPoint, isKeyedSegment, isSpan$1 as isSpan, isListBlock, isTypedObject, getSelectionStartPoint, getSelectionEndPoint, getTextBlockText, parseBlocks } from "./_chunks-es/selection-point.js";
 import { isSelectionCollapsed, getFocusTextBlock, getFocusSpan as getFocusSpan$1, getSelectedBlocks, isSelectionExpanded, getSelectionStartBlock as getSelectionStartBlock$1, getSelectionEndBlock as getSelectionEndBlock$1, getFocusBlock as getFocusBlock$1, getFocusBlockObject, getPreviousBlock, getNextBlock, getFirstBlock as getFirstBlock$1, getLastBlock as getLastBlock$1, getFocusListBlock } from "./_chunks-es/selector.is-selection-expanded.js";
 import { getFocusInlineObject, isOverlappingSelection, isSelectingEntireBlocks, getTrimmedSelection, getCaretWordSelection, isAtTheEndOfBlock, isAtTheStartOfBlock, isActiveAnnotation, isActiveDecorator, getSelectedTextBlocks, isActiveListItem, isActiveStyle, getActiveAnnotations as getActiveAnnotations$1 } from "./_chunks-es/selector.is-selecting-entire-blocks.js";
 import { DOMEditor, isDOMNode } from "slate-dom";
-import { isSelectionCollapsed as isSelectionCollapsed$1, selectionPointToBlockOffset, getSelectionStartPoint, getSelectionEndPoint } from "./_chunks-es/util.selection-point-to-block-offset.js";
+import { isSelectionCollapsed as isSelectionCollapsed$1, selectionPointToBlockOffset } from "./_chunks-es/util.selection-point-to-block-offset.js";
 import isEqual from "lodash/isEqual.js";
 import { isKeySegment, defineType, defineField, isPortableTextSpan as isPortableTextSpan$1 } from "@sanity/types";
 import getRandomValues from "get-random-values-esm";
 import { defineBehavior, forward, raise } from "./behaviors/index.js";
 import uniq from "lodash/uniq.js";
 import { Subject } from "rxjs";
-import { setup, assign, enqueueActions, emit, assertEvent, stateIn, fromCallback, not, and, raise as raise$1, createActor } from "xstate";
+import { setup, assign, enqueueActions, emit, assertEvent, stateIn, fromCallback, and, not, raise as raise$1, createActor } from "xstate";
 import { htmlToBlocks } from "@portabletext/block-tools";
 import { toHTML } from "@portabletext/to-html";
 import { Schema } from "@sanity/schema";
@@ -537,8 +537,8 @@ function getEventPosition({
     };
   if (!positionBlock || !selection)
     return;
-  const focusBlockPath = selection.focus.path.at(0), focusBlockKey = isKeyedSegment(focusBlockPath) ? focusBlockPath._key : void 0;
-  if (focusBlockKey)
+  const focusBlockKey = getBlockKeyFromSelectionPoint(selection.focus);
+  if (focusBlockKey !== void 0)
     return isSelectionCollapsed$1(selection) && block && focusBlockKey !== block._key ? {
       block: positionBlock,
       isEditor: !1,
@@ -1253,7 +1253,7 @@ const converterJson = {
            * If we are dragging internally then we would like to keep the
            * dropped portable text as is.
            */
-          refreshKeys: !snapshot.beta.hasTag?.("dragging internally"),
+          refreshKeys: !snapshot.beta.internalDrag,
           validateFields: !1
         }
       });
@@ -1357,7 +1357,7 @@ function createConverterTextPlain(legacySchema) {
             schema: snapshot.context.schema
           },
           blocks: snapshot.context.value
-        }).map((block) => isTextBlock(snapshot.context, block) ? block.children.map((child) => child._type === snapshot.context.schema.span.name ? child.text : snapshot.beta.hasTag("dragging internally") ? `[${snapshot.context.schema.inlineObjects.find((inlineObjectType) => inlineObjectType.name === child._type)?.title ?? "Object"}]` : "").join("") : snapshot.beta.hasTag("dragging internally") ? `[${snapshot.context.schema.blockObjects.find((blockObjectType) => blockObjectType.name === block._type)?.title ?? "Object"}]` : "").filter((block) => block !== "").join(`
+        }).map((block) => isTextBlock(snapshot.context, block) ? block.children.map((child) => child._type === snapshot.context.schema.span.name ? child.text : snapshot.beta.internalDrag ? `[${snapshot.context.schema.inlineObjects.find((inlineObjectType) => inlineObjectType.name === child._type)?.title ?? "Object"}]` : "").join("") : snapshot.beta.internalDrag ? `[${snapshot.context.schema.blockObjects.find((blockObjectType) => blockObjectType.name === block._type)?.title ?? "Object"}]` : "").filter((block) => block !== "").join(`
 
 `),
         mimeType: "text/plain",
@@ -1593,7 +1593,6 @@ function getEditorSnapshot({
         markState: slateEditorInstance.markState,
         schema: editorActorSnapshot.context.schema
       }),
-      hasTag: (tag) => editorActorSnapshot.hasTag(tag),
       internalDrag: editorActorSnapshot.context.internalDrag
     }
   };
@@ -3209,12 +3208,12 @@ const addAnnotationOperationImplementation = ({
 }, deleteOperationImplementation = ({
   operation
 }) => {
-  const anchorBlockPath = isKeyedSegment(operation.at.anchor.path[0]) ? getBlockPath({
+  const anchorBlockKey = getBlockKeyFromSelectionPoint(operation.at.anchor), focusBlockKey = getBlockKeyFromSelectionPoint(operation.at.focus), anchorBlockPath = anchorBlockKey !== void 0 ? getBlockPath({
     editor: operation.editor,
-    _key: operation.at.anchor.path[0]._key
-  }) : void 0, focusBlockPath = isKeyedSegment(operation.at.focus.path[0]) ? getBlockPath({
+    _key: anchorBlockKey
+  }) : void 0, focusBlockPath = focusBlockKey !== void 0 ? getBlockPath({
     editor: operation.editor,
-    _key: operation.at.focus.path[0]._key
+    _key: focusBlockKey
   }) : void 0;
   if (operation.at.anchor.path.length === 1 && operation.at.focus.path.length === 1 && anchorBlockPath && focusBlockPath && anchorBlockPath[0] === focusBlockPath[0]) {
     Transforms.removeNodes(operation.editor, {
@@ -3351,8 +3350,7 @@ function insertBlock({
     else if (placement === "after") {
       const nextPath = lastBlockPath ? [lastBlockPath[0] + 1] : [0];
       Transforms.insertNodes(editor, [block], {
-        at: nextPath,
-        select: !1
+        at: nextPath
       }), select === "start" ? Transforms.select(editor, Editor.start(editor, nextPath)) : select === "end" && Transforms.select(editor, Editor.end(editor, nextPath));
     } else {
       if (lastBlock && isEqualToEmptyEditor([lastBlock], schema)) {
@@ -3465,7 +3463,9 @@ function insertBlock({
           editor
         });
         if (focusChild && editor.isTextSpan(focusChild))
-          Transforms.insertFragment(editor, [block], {
+          Transforms.splitNodes(editor, {
+            at: currentSelection2
+          }), Transforms.insertFragment(editor, [block], {
             at: currentSelection2
           }), select === "start" || select === "end" ? Transforms.select(editor, [endBlockPath[0] + 1]) : Transforms.select(editor, currentSelection2);
         else {
@@ -4216,7 +4216,7 @@ function unsetPatch(editor, patch) {
     const newNode = applyAll(child.node, [{
       ...patch,
       path: propPath
-    }]), removedProperties = Object.keys(child.node).filter((property) => newNode[property] === void 0);
+    }]), newKeys = Object.keys(newNode), removedProperties = Object.keys(child.node).filter((property) => !newKeys.includes(property));
     return Transforms.unsetNodes(editor, removedProperties, {
       at: [block.index, child.index]
     }), !0;
@@ -6017,7 +6017,7 @@ const arrowDownOnLonelyBlockObject = defineBehavior({
     type: "insert.block",
     block,
     placement: index === 0 ? "before" : "after",
-    select: "end"
+    select: event.select ?? "end"
   }))]
 }), defineBehavior({
   on: "insert.blocks",
@@ -6030,7 +6030,7 @@ const arrowDownOnLonelyBlockObject = defineBehavior({
     type: "insert.block",
     block,
     placement: "after",
-    select: "end"
+    select: event.select ?? "end"
   }))]
 }), defineBehavior({
   on: "insert.blocks",
@@ -6054,12 +6054,12 @@ const arrowDownOnLonelyBlockObject = defineBehavior({
     type: "insert.block",
     block: event.blocks[0],
     placement: "auto",
-    select: "end"
+    select: event.select ?? "end"
   })] : isEmptyTextBlock(snapshot.context, focusTextBlock.node) ? event.blocks.map((block, index) => raise({
     type: "insert.block",
     block,
     placement: index === 0 ? "auto" : "after",
-    select: "end"
+    select: event.select ?? "end"
   })) : event.blocks.flatMap((block, index) => index === 0 ? [raise({
     type: "split"
   }), raise({
@@ -6069,7 +6069,7 @@ const arrowDownOnLonelyBlockObject = defineBehavior({
     type: "insert.block",
     block,
     placement: "auto",
-    select: "end"
+    select: event.select ?? "end"
   })] : index === event.blocks.length - 1 ? [raise({
     type: "select.next block",
     select: "start"
@@ -6077,12 +6077,12 @@ const arrowDownOnLonelyBlockObject = defineBehavior({
     type: "insert.block",
     block,
     placement: "auto",
-    select: "end"
+    select: event.select ?? "end"
   })] : [raise({
     type: "insert.block",
     block,
     placement: "after",
-    select: "end"
+    select: event.select ?? "end"
   })])]
 }), defineBehavior({
   on: "insert.blocks",
@@ -6095,7 +6095,7 @@ const arrowDownOnLonelyBlockObject = defineBehavior({
     type: "insert.block",
     block,
     placement: index === 0 ? "auto" : "after",
-    select: "end"
+    select: event.select ?? "end"
   }))]
 }), defineBehavior({
   on: "insert.break",
@@ -7045,7 +7045,6 @@ function createEditorSnapshot({
   keyGenerator,
   readOnly,
   schema,
-  hasTag,
   internalDrag
 }) {
   const selection = editor.selection ? slateRangeToSelection({
@@ -7072,7 +7071,6 @@ function createEditorSnapshot({
         markState: editor.markState,
         schema
       }),
-      hasTag,
       internalDrag
     }
   };
@@ -7196,7 +7194,6 @@ const debug$8 = debugWithName("editor machine"), editorMachine = setup({
               "edit mode": "read only"
             }),
             schema: context.schema,
-            hasTag: (tag) => self.getSnapshot().hasTag(tag),
             internalDrag: context.internalDrag
           }),
           nativeEvent: event.nativeEvent
@@ -7849,6 +7846,18 @@ const debug$7 = debugWithName("mutation-machine"), mutationMachine = setup({
       }, () => {
         input.slateEditor.apply = originalApply;
       };
+    }),
+    "mutation debouncer": fromCallback(({
+      sendBack
+    }) => {
+      const interval = setInterval(() => {
+        sendBack({
+          type: "mutation delay passed"
+        });
+      }, process.env.NODE_ENV === "test" ? 250 : 0);
+      return () => {
+        clearInterval(interval);
+      };
     })
   },
   guards: {
@@ -7858,15 +7867,11 @@ const debug$7 = debugWithName("mutation-machine"), mutationMachine = setup({
     "is typing": stateIn({
       typing: "typing"
     }),
-    "no pending mutations": ({
-      context
-    }) => context.pendingMutations.length === 0,
     "slate is normalizing": ({
       context
     }) => Editor.isNormalizing(context.slateEditor)
   },
   delays: {
-    "mutation debounce": process.env.NODE_ENV === "test" ? 250 : 0,
     "type debounce": process.env.NODE_ENV === "test" ? 0 : 250
   }
 }).createMachine({
@@ -7903,7 +7908,7 @@ const debug$7 = debugWithName("mutation-machine"), mutationMachine = setup({
             debug$7("entry: typing->idle");
           }],
           exit: [() => {
-            debug$7("exit: typing->idle");
+            debug$7("exit: typing->idle"), debug$7("entry: typing->typing");
           }],
           on: {
             typing: {
@@ -7912,15 +7917,12 @@ const debug$7 = debugWithName("mutation-machine"), mutationMachine = setup({
           }
         },
         typing: {
-          entry: [() => {
-            debug$7("entry: typing->typing");
-          }],
-          exit: [() => {
-            debug$7("exit: typing->typing");
-          }],
           after: {
             "type debounce": {
-              target: "idle"
+              target: "idle",
+              actions: [() => {
+                debug$7("exit: typing->typing");
+              }]
             }
           },
           on: {
@@ -7946,56 +7948,38 @@ const debug$7 = debugWithName("mutation-machine"), mutationMachine = setup({
             debug$7("exit: mutations->idle");
           }],
           on: {
-            patch: {
-              actions: ["emit patch", "defer mutation", "emit has pending mutations"],
-              target: "emitting mutations"
-            }
-          }
-        },
-        "emitting mutations": {
-          entry: [() => {
-            debug$7("entry: mutations->emitting mutations");
-          }],
-          exit: [() => {
-            debug$7("exit: mutations->emitting mutations");
-          }],
-          after: {
-            "mutation debounce": [{
+            patch: [{
               guard: "is read-only",
-              target: "read-only"
+              actions: ["defer patch", "defer mutation"],
+              target: "has pending mutations"
             }, {
-              guard: and([not("is typing"), "slate is normalizing"]),
-              target: "idle",
-              actions: ["emit mutations", "clear pending mutations"]
-            }, {
-              target: "emitting mutations",
-              reenter: !0
-            }]
-          },
-          on: {
-            patch: {
-              target: "emitting mutations",
               actions: ["emit patch", "defer mutation"],
-              reenter: !0
-            }
+              target: "has pending mutations"
+            }]
           }
         },
-        "read-only": {
+        "has pending mutations": {
           entry: [() => {
-            debug$7("entry: mutations->read-only");
-          }],
+            debug$7("entry: mutations->has pending mutations");
+          }, "emit has pending mutations"],
           exit: [() => {
-            debug$7("exit: mutations->read-only");
-          }],
-          always: [{
-            guard: not("is read-only"),
-            target: "emitting mutations",
-            actions: ["emit pending patch events", "clear pending patch events"]
+            debug$7("exit: mutations->has pending mutations");
           }],
+          invoke: {
+            src: "mutation debouncer"
+          },
           on: {
-            patch: {
+            "mutation delay passed": {
+              guard: and([not("is read-only"), not("is typing"), "slate is normalizing"]),
+              target: "idle",
+              actions: ["emit pending patch events", "clear pending patch events", "emit mutations", "clear pending mutations"]
+            },
+            patch: [{
+              guard: "is read-only",
               actions: ["defer patch", "defer mutation"]
-            }
+            }, {
+              actions: ["emit patch", "defer mutation"]
+            }]
           }
         }
       }