@portabletext/editor 1.48.6 → 1.48.8

package/lib/_chunks-es/editor-provider.js

@@ -8,26 +8,24 @@ import isEqual from "lodash/isEqual.js";
 import { Element, Text, Editor, Operation, Transforms, Path, Node, Range, Point, createEditor } from "slate";
 import { setup, stateIn, fromCallback, assign, enqueueActions, emit, assertEvent, and, not, createActor } from "xstate";
 import { unset, set, setIfMissing, insert, diffMatchPatch as diffMatchPatch$1, applyAll } from "@portabletext/patches";
-import { isPortableTextTextBlock, isKeySegment, isPortableTextSpan as isPortableTextSpan$1, isPortableTextListBlock, defineType, defineField } from "@sanity/types";
 import flatten from "lodash/flatten.js";
 import isPlainObject from "lodash/isPlainObject.js";
 import uniq from "lodash/uniq.js";
+import { isTextBlock, parseBlock, sliceBlocks, parseAnnotation, blockOffsetToSpanSelectionPoint, parseInlineObject, isSpan, isListBlock, isEmptyTextBlock, getBlockEndPoint, getBlockStartPoint, getTextBlockText } from "./util.slice-blocks.js";
 import getRandomValues from "get-random-values-esm";
-import { parseBlock, parseAnnotation, isTextBlock, parseInlineObject } from "./parse-blocks.js";
-import { sliceBlocks, blockOffsetToSpanSelectionPoint, isEmptyTextBlock, getBlockEndPoint, getBlockStartPoint, getTextBlockText } from "./util.slice-blocks.js";
 import { htmlToBlocks } from "@portabletext/block-tools";
 import { toHTML } from "@portabletext/to-html";
 import { Schema } from "@sanity/schema";
 import get from "lodash/get.js";
 import isUndefined from "lodash/isUndefined.js";
 import omitBy from "lodash/omitBy.js";
+import { isKeySegment, defineType, defineField, isPortableTextSpan as isPortableTextSpan$1, getFocusTextBlock, getPreviousBlock, getNextBlock, getFocusBlockObject, getFocusSpan, isSelectionCollapsed, isOverlappingSelection, getSelectedBlocks, isSelectionExpanded } from "./selector.is-overlapping-selection.js";
 import omit from "lodash/omit.js";
 import { selectionPointToBlockOffset, blockOffsetsToSelection } from "./util.selection-point-to-block-offset.js";
 import { getTrimmedSelection, isActiveAnnotation, isActiveDecorator, getSelectedTextBlocks, isActiveListItem, isActiveStyle, isSelectingEntireBlocks, getActiveAnnotations } from "./selector.is-selecting-entire-blocks.js";
 import { DOMEditor } from "slate-dom";
 import startCase from "lodash.startcase";
 import { defineBehavior, raise, coreBehaviors } from "./behavior.core.js";
-import { getFocusTextBlock, getPreviousBlock, getNextBlock, getFocusBlockObject, getFocusSpan, isSelectionCollapsed, isOverlappingSelection, getSelectedBlocks, isSelectionExpanded } from "./selector.is-overlapping-selection.js";
 import { getSelectionStartPoint, getSelectionEndPoint } from "./util.get-selection-start-point.js";
 import { Subject } from "rxjs";
 import { useEffectEvent } from "use-effect-event";
@@ -381,7 +379,9 @@ function validateValue(value, types, keyGenerator) {
           }
         }, !0;
       }
-      return !blk._type && isPortableTextTextBlock({
+      return !blk._type && isTextBlock({
+        schema: types
+      }, {
         ...blk,
         _type: types.block.name
       }) ? (resolution = {
@@ -2229,8 +2229,7 @@ const converterJson = {
     snapshot,
     event
   }) => {
-    const selection = snapshot.beta.internalDrag?.origin.selection ?? snapshot.context.selection;
-    if (!selection)
+    if (!(snapshot.beta.internalDrag?.origin.selection ?? snapshot.context.selection))
       return {
         type: "serialization.failure",
         mimeType: "application/x-portable-text",
@@ -2238,8 +2237,8 @@ const converterJson = {
         reason: "No selection"
       };
     const blocks = sliceBlocks({
-      blocks: snapshot.context.value,
-      selection
+      context: snapshot.context,
+      blocks: snapshot.context.value
     });
     return blocks.length === 0 ? {
       type: "serialization.failure",
@@ -2296,8 +2295,7 @@ function createConverterTextHtml(legacySchema) {
       snapshot,
       event
     }) => {
-      const selection = snapshot.beta.internalDrag?.origin.selection ?? snapshot.context.selection;
-      if (!selection)
+      if (!(snapshot.beta.internalDrag?.origin.selection ?? snapshot.context.selection))
         return {
           type: "serialization.failure",
           mimeType: "text/html",
@@ -2305,8 +2303,8 @@ function createConverterTextHtml(legacySchema) {
           reason: "No selection"
         };
       const blocks = sliceBlocks({
-        blocks: snapshot.context.value,
-        selection
+        context: snapshot.context,
+        blocks: snapshot.context.value
       }), html = toHTML(blocks, {
         onMissingComponent: !1,
         components: {
@@ -2362,24 +2360,21 @@ function createConverterTextPlain(legacySchema) {
     serialize: ({
       snapshot,
       event
-    }) => {
-      const selection = snapshot.beta.internalDrag?.origin.selection ?? snapshot.context.selection;
-      return selection ? {
-        type: "serialization.success",
-        data: sliceBlocks({
-          blocks: snapshot.context.value,
-          selection
-        }).map((block) => isPortableTextTextBlock(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(`
+    }) => snapshot.beta.internalDrag?.origin.selection ?? snapshot.context.selection ? {
+      type: "serialization.success",
+      data: sliceBlocks({
+        context: snapshot.context,
+        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(`
 
 `),
-        mimeType: "text/plain",
-        originEvent: event.originEvent
-      } : {
-        type: "serialization.failure",
-        mimeType: "text/plain",
-        originEvent: event.originEvent,
-        reason: "No selection"
-      };
+      mimeType: "text/plain",
+      originEvent: event.originEvent
+    } : {
+      type: "serialization.failure",
+      mimeType: "text/plain",
+      originEvent: event.originEvent,
+      reason: "No selection"
     },
     deserialize: ({
       snapshot,
@@ -3379,7 +3374,7 @@ const blockSetBehaviorActionImplementation = ({
   const parsedBlock = fromSlateValue([block], context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(action.editor)).at(0);
   if (!parsedBlock)
     throw new Error(`Unable to parse block at ${JSON.stringify(action.at)}`);
-  if (isTextBlock(context.schema, parsedBlock)) {
+  if (isTextBlock(context, parsedBlock)) {
     const propsToRemove = action.props.filter((prop) => prop !== "_type"), updatedTextBlock = parseBlock({
       context,
       block: omit(parsedBlock, propsToRemove),
@@ -3625,11 +3620,17 @@ const decoratorAddActionImplementation = ({
   action
 }) => {
   const editor = action.editor, mark = action.decorator, value = fromSlateValue(editor.children, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(editor)), manualAnchor = action.at?.anchor ? blockOffsetToSpanSelectionPoint({
-    value,
+    context: {
+      ...context,
+      value
+    },
     blockOffset: action.at.anchor,
     direction: "backward"
   }) : void 0, manualFocus = action.at?.focus ? blockOffsetToSpanSelectionPoint({
-    value,
+    context: {
+      ...context,
+      value
+    },
     blockOffset: action.at.focus,
     direction: "forward"
   }) : void 0, manualSelection = manualAnchor && manualFocus ? {
@@ -3643,10 +3644,16 @@ const decoratorAddActionImplementation = ({
     editor,
     range: selection
   }), anchorOffset = editorSelection ? selectionPointToBlockOffset({
-    value,
+    context: {
+      ...context,
+      value
+    },
     selectionPoint: editorSelection.anchor
   }) : void 0, focusOffset = editorSelection ? selectionPointToBlockOffset({
-    value,
+    context: {
+      ...context,
+      value
+    },
     selectionPoint: editorSelection.focus
   }) : void 0;
   if (!anchorOffset || !focusOffset)
@@ -3659,7 +3666,10 @@ const decoratorAddActionImplementation = ({
       hanging: !0
     });
     const newValue = fromSlateValue(editor.children, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(editor)), newSelection = blockOffsetsToSelection({
-      value: newValue,
+      context: {
+        ...context,
+        value: newValue
+      },
       offsets: {
         anchor: anchorOffset,
         focus: focusOffset
@@ -3730,11 +3740,27 @@ const decoratorAddActionImplementation = ({
     };
   }
 }, deleteActionImplementation = ({
+  context,
   action
 }) => {
   const range = toSlateRange(action.at, action.editor);
   if (!range)
     throw new Error(`Failed to get Slate Range for selection ${JSON.stringify(action.at)}`);
+  if (Range.isCollapsed(range)) {
+    const [focusBlock] = getFocusBlock({
+      editor: {
+        ...action.editor,
+        selection: range
+      }
+    }), [focusChild] = getFocusChild({
+      editor: {
+        ...action.editor,
+        selection: range
+      }
+    });
+    if (focusBlock && focusBlock._type === context.schema.block.name && focusChild && focusChild._type === context.schema.span.name)
+      return;
+  }
   action.editor.delete({
     at: range
   });
@@ -4942,7 +4968,7 @@ function createWithSchemaTypes({
   editorActor
 }) {
   return function(editor) {
-    editor.isTextBlock = (value) => isPortableTextTextBlock(value) && value._type === editorActor.getSnapshot().context.schema.block.name, editor.isTextSpan = (value) => isPortableTextSpan$1(value) && value._type === editorActor.getSnapshot().context.schema.span.name, editor.isListBlock = (value) => isPortableTextListBlock(value) && value._type === editorActor.getSnapshot().context.schema.block.name, editor.isVoid = (element) => editorActor.getSnapshot().context.schema.block.name !== element._type && (editorActor.getSnapshot().context.schema.blockObjects.map((obj) => obj.name).includes(element._type) || editorActor.getSnapshot().context.schema.inlineObjects.map((obj) => obj.name).includes(element._type)), editor.isInline = (element) => editorActor.getSnapshot().context.schema.inlineObjects.map((obj) => obj.name).includes(element._type) && "__inline" in element && element.__inline === !0;
+    editor.isTextBlock = (value) => isTextBlock(editorActor.getSnapshot().context, value), editor.isTextSpan = (value) => isSpan(editorActor.getSnapshot().context, value), editor.isListBlock = (value) => isListBlock(editorActor.getSnapshot().context, value), editor.isVoid = (element) => editorActor.getSnapshot().context.schema.block.name !== element._type && (editorActor.getSnapshot().context.schema.blockObjects.map((obj) => obj.name).includes(element._type) || editorActor.getSnapshot().context.schema.inlineObjects.map((obj) => obj.name).includes(element._type)), editor.isInline = (element) => editorActor.getSnapshot().context.schema.inlineObjects.map((obj) => obj.name).includes(element._type) && "__inline" in element && element.__inline === !0;
     const {
       normalizeNode
     } = editor;
@@ -5850,7 +5876,7 @@ const EditorContext = createGloballyScopedContext("@portabletext/editor/context/
     event
   }) => {
     const manualSelection = event.at ? blockOffsetsToSelection({
-      value: snapshot.context.value,
+      context: snapshot.context,
       offsets: event.at
     }) : null;
     return manualSelection ? !isActiveDecorator(event.decorator)({
@@ -5874,7 +5900,7 @@ const EditorContext = createGloballyScopedContext("@portabletext/editor/context/
     event
   }) => {
     const selection = blockOffsetsToSelection({
-      value: snapshot.context.value,
+      context: snapshot.context,
       offsets: event.at
     });
     if (!selection)
@@ -5940,6 +5966,7 @@ const EditorContext = createGloballyScopedContext("@portabletext/editor/context/
     } : !1;
   },
   actions: [({
+    snapshot,
     event
   }, {
     focusTextBlock
@@ -5948,7 +5975,7 @@ const EditorContext = createGloballyScopedContext("@portabletext/editor/context/
     block: event.blocks[0],
     placement: "auto",
     select: "end"
-  })] : isEmptyTextBlock(focusTextBlock.node) ? event.blocks.map((block, index) => raise({
+  })] : isEmptyTextBlock(snapshot.context, focusTextBlock.node) ? event.blocks.map((block, index) => raise({
     type: "insert.block",
     block,
     placement: index === 0 ? "auto" : "after",
@@ -6136,7 +6163,13 @@ const EditorContext = createGloballyScopedContext("@portabletext/editor/context/
     const previousBlock = getPreviousBlock(snapshot);
     if (!previousBlock)
       return !1;
-    const point = event.select === "end" ? getBlockEndPoint(previousBlock) : getBlockStartPoint(previousBlock);
+    const point = event.select === "end" ? getBlockEndPoint({
+      context: snapshot.context,
+      block: previousBlock
+    }) : getBlockStartPoint({
+      context: snapshot.context,
+      block: previousBlock
+    });
     return {
       selection: {
         anchor: point,
@@ -6159,7 +6192,13 @@ const EditorContext = createGloballyScopedContext("@portabletext/editor/context/
     const nextBlock = getNextBlock(snapshot);
     if (!nextBlock)
       return !1;
-    const point = event.select === "end" ? getBlockEndPoint(nextBlock) : getBlockStartPoint(nextBlock);
+    const point = event.select === "end" ? getBlockEndPoint({
+      context: snapshot.context,
+      block: nextBlock
+    }) : getBlockStartPoint({
+      context: snapshot.context,
+      block: nextBlock
+    });
     return {
       selection: {
         anchor: point,
@@ -6190,20 +6229,26 @@ const EditorContext = createGloballyScopedContext("@portabletext/editor/context/
       }
     });
     if (focusTextBlock) {
-      const blockEndPoint = getBlockEndPoint(focusTextBlock), newTextBlockSelection = {
+      const blockEndPoint = getBlockEndPoint({
+        context: snapshot.context,
+        block: focusTextBlock
+      }), newTextBlockSelection = {
         anchor: selectionEndPoint,
         focus: blockEndPoint
       }, newTextBlock = parseBlock({
         block: sliceBlocks({
-          blocks: [focusTextBlock.node],
-          selection: newTextBlockSelection
+          context: {
+            ...snapshot.context,
+            selection: newTextBlockSelection
+          },
+          blocks: [focusTextBlock.node]
         }).at(0),
         context: snapshot.context,
         options: {
           refreshKeys: !0
         }
       });
-      return !newTextBlock || !isTextBlock(snapshot.context.schema, newTextBlock) ? !1 : {
+      return !newTextBlock || !isTextBlock(snapshot.context, newTextBlock) ? !1 : {
         newTextBlock,
         newTextBlockSelection,
         selection: {
@@ -6556,7 +6601,7 @@ const EditorContext = createGloballyScopedContext("@portabletext/editor/context/
         return {
           activeAnnotations: getActiveAnnotations(snapshot),
           activeDecorators,
-          textRuns: event.data.flatMap((block) => isTextBlock(snapshot.context.schema, block) ? [getTextBlockText(block)] : [])
+          textRuns: event.data.flatMap((block) => isTextBlock(snapshot.context, block) ? [getTextBlockText(block)] : [])
         };
       }
       return !1;