@portabletext/editor 2.3.5 → 2.3.7

package/lib/index.js

@@ -1416,21 +1416,6 @@ const insertTextOperationImplementation = ({
     marks: [...activeDecorators, ...activeAnnotations]
   }), 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,
@@ -1703,7 +1688,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 && isSpan(editorActor.getSnapshot().context, op.node) && op.node.marks?.some((mark) => annotationsEnding.includes(mark))) {
             Transforms.insertNodes(editor, {
               ...op.node,
               _key: editorActor.getSnapshot().context.keyGenerator(),
@@ -1712,7 +1697,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 && isSpan(editorActor.getSnapshot().context, op.node) && op.node.marks?.some((mark) => annotationsStarting.includes(mark))) {
             Transforms.insertNodes(editor, {
               ...op.node,
               _key: editorActor.getSnapshot().context.keyGenerator(),
@@ -1721,7 +1706,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 && isSpan(editorActor.getSnapshot().context, op.node) && op.node.marks?.length === 0) {
             Transforms.insertNodes(editor, {
               ...op.node,
               _key: editorActor.getSnapshot().context.keyGenerator(),
@@ -1768,7 +1753,7 @@ function createWithPortableTextMarkModel(editorActor) {
             match: (n) => editor.isTextSpan(n),
             voids: !1
           }))[0] ?? [void 0, void 0];
-          if (span && block && isPortableTextBlock(block)) {
+          if (span && block && 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,