@portabletext/editor 2.3.5 → 2.3.7

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

@@ -6,7 +6,7 @@ import { AnnotationDefinition, AnnotationSchemaType, BaseDefinition, BlockObject
 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";
@@ -215,7 +215,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/
@@ -610,7 +610,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;
 };
@@ -1339,7 +1339,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";
 } | {
@@ -1351,7 +1351,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;
@@ -1998,7 +1998,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";
       } | {
@@ -2010,7 +2010,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;
@@ -2881,7 +2881,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";
                       } | {
@@ -2893,7 +2893,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/index.cjs

@@ -1386,21 +1386,6 @@ const insertTextOperationImplementation = ({
     marks: [...activeDecorators, ...activeAnnotations]
   }), slateDom.EDITOR_TO_PENDING_SELECTION.set(operation.editor, operation.editor.selection), operation.editor.decoratorState = {};
 };
-function isPortableTextSpan(node) {
-  return node._type === "span" && "text" in node && typeof node.text == "string" && (typeof node.marks > "u" || Array.isArray(node.marks) && node.marks.every((mark) => typeof mark == "string"));
-}
-function isPortableTextBlock(node) {
-  return (
-    // A block doesn't _have_ to be named 'block' - to differentiate between
-    // allowed child types and marks, one might name them differently
-    typeof node._type == "string" && // Toolkit-types like nested spans are @-prefixed
-    node._type[0] !== "@" && // `markDefs` isn't _required_ per say, but if it's there, it needs to be an array
-    (!("markDefs" in node) || !node.markDefs || Array.isArray(node.markDefs) && // Every mark definition needs to have an `_key` to be mappable in child spans
-    node.markDefs.every((def) => typeof def._key == "string")) && // `children` is required and needs to be an array
-    "children" in node && Array.isArray(node.children) && // All children are objects with `_type` (usually spans, but can contain other stuff)
-    node.children.every((child) => typeof child == "object" && "_type" in child)
-  );
-}
 function getPreviousSpan({
   editor,
   blockPath,
@@ -1673,7 +1658,7 @@ function createWithPortableTextMarkModel(editorActor) {
             blockPath,
             spanPath: [op.path[0], op.path[1] - 1]
           }), nextSpanAnnotations = nextSpan ? nextSpan.marks?.filter((mark) => !decorators.includes(mark)) : [], annotationsEnding = previousSpanAnnotations?.filter((annotation) => !nextSpanAnnotations?.includes(annotation)) ?? [], atTheEndOfAnnotation = annotationsEnding.length > 0;
-          if (atTheEndOfAnnotation && isPortableTextSpan(op.node) && op.node.marks?.some((mark) => annotationsEnding.includes(mark))) {
+          if (atTheEndOfAnnotation && util_sliceBlocks.isSpan(editorActor.getSnapshot().context, op.node) && op.node.marks?.some((mark) => annotationsEnding.includes(mark))) {
             slate.Transforms.insertNodes(editor, {
               ...op.node,
               _key: editorActor.getSnapshot().context.keyGenerator(),
@@ -1682,7 +1667,7 @@ function createWithPortableTextMarkModel(editorActor) {
             return;
           }
           const annotationsStarting = nextSpanAnnotations?.filter((annotation) => !previousSpanAnnotations?.includes(annotation)) ?? [], atTheStartOfAnnotation = annotationsStarting.length > 0;
-          if (atTheStartOfAnnotation && isPortableTextSpan(op.node) && op.node.marks?.some((mark) => annotationsStarting.includes(mark))) {
+          if (atTheStartOfAnnotation && util_sliceBlocks.isSpan(editorActor.getSnapshot().context, op.node) && op.node.marks?.some((mark) => annotationsStarting.includes(mark))) {
             slate.Transforms.insertNodes(editor, {
               ...op.node,
               _key: editorActor.getSnapshot().context.keyGenerator(),
@@ -1691,7 +1676,7 @@ function createWithPortableTextMarkModel(editorActor) {
             return;
           }
           const nextSpanDecorators = nextSpan?.marks?.filter((mark) => decorators.includes(mark)) ?? [];
-          if (nextSpanDecorators.length > 0 && atTheEndOfAnnotation && !atTheStartOfAnnotation && isPortableTextSpan(op.node) && op.node.marks?.length === 0) {
+          if (nextSpanDecorators.length > 0 && atTheEndOfAnnotation && !atTheStartOfAnnotation && util_sliceBlocks.isSpan(editorActor.getSnapshot().context, op.node) && op.node.marks?.length === 0) {
             slate.Transforms.insertNodes(editor, {
               ...op.node,
               _key: editorActor.getSnapshot().context.keyGenerator(),
@@ -1738,7 +1723,7 @@ function createWithPortableTextMarkModel(editorActor) {
             match: (n) => editor.isTextSpan(n),
             voids: !1
           }))[0] ?? [void 0, void 0];
-          if (span && block && isPortableTextBlock(block)) {
+          if (span && block && util_sliceBlocks.isTextBlock(editorActor.getSnapshot().context, block)) {
             const markDefs = block.markDefs ?? [], marks = span.marks ?? [], spanHasAnnotations = marks.some((mark) => markDefs.find((markDef) => markDef._key === mark)), deletingFromTheEnd = op.offset + op.text.length === span.text.length, deletingAllText = op.offset === 0 && deletingFromTheEnd, previousSpan = getPreviousSpan({
               editor,
               blockPath,