@portabletext/editor 1.5.2 → 1.5.4-canary.0

package/lib/index.esm.js

@@ -470,7 +470,9 @@ function defineSchema(definition) {
 function compileSchemaDefinition(definition) {
   const blockObjects = definition?.blockObjects?.map((blockObject) => defineType({
     type: "object",
-    name: blockObject.name,
+    // Very naive way to work around `SanitySchema.compile` adding default
+    // fields to objects with the name `image`
+    name: blockObject.name === "image" ? "tmp-image" : blockObject.name,
     title: blockObject.title,
     icon: blockObject.icon,
     fields: []
@@ -517,8 +519,18 @@ function compileSchemaDefinition(definition) {
     }]
   }), schema = Schema.compile({
     types: [portableTextSchema, ...blockObjects, ...inlineObjects]
-  }).get("portable-text");
-  return getPortableTextMemberSchemaTypes(schema);
+  }).get("portable-text"), pteSchema = getPortableTextMemberSchemaTypes(schema);
+  return {
+    ...pteSchema,
+    blockObjects: pteSchema.blockObjects.map((blockObject) => blockObject.name === "tmp-image" ? {
+      ...blockObject,
+      name: "image",
+      type: {
+        ...blockObject.type,
+        name: "image"
+      }
+    } : blockObject)
+  };
 }
 const rootName = "sanity-pte:";
 debug$m(rootName);
@@ -3523,7 +3535,7 @@ function createWithPortableTextMarkModel(editorActor, types) {
         const children = Node.children(editor, path);
         for (const [child, childPath] of children) {
           const nextNode = node.children[childPath[1] + 1];
-          if (editor.isTextSpan(child) && editor.isTextSpan(nextNode) && isEqual(child.marks, nextNode.marks)) {
+          if (editor.isTextSpan(child) && editor.isTextSpan(nextNode) && child.marks?.every((mark) => nextNode.marks?.includes(mark)) && nextNode.marks?.every((mark) => child.marks?.includes(mark))) {
             debug$c("Merging spans", JSON.stringify(child, null, 2), JSON.stringify(nextNode, null, 2)), editorActor.send({
               type: "normalizing"
             }), Transforms.mergeNodes(editor, {
@@ -3693,22 +3705,30 @@ function createWithPortableTextMarkModel(editorActor, types) {
             editor,
             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)) ?? [];
-          if (annotationsEnding.length > 0 && isPortableTextSpan(op.node) && op.node.marks?.some((mark) => annotationsEnding.includes(mark))) {
+          }), 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))) {
             Transforms.insertNodes(editor, {
               ...op.node,
               marks: op.node.marks?.filter((mark) => !annotationsEnding.includes(mark)) ?? []
             });
             return;
           }
-          const annotationsStarting = nextSpanAnnotations?.filter((annotation) => !previousSpanAnnotations?.includes(annotation)) ?? [];
-          if (annotationsStarting.length > 0 && isPortableTextSpan(op.node) && op.node.marks?.some((mark) => annotationsStarting.includes(mark))) {
+          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))) {
             Transforms.insertNodes(editor, {
               ...op.node,
               marks: op.node.marks?.filter((mark) => !annotationsStarting.includes(mark)) ?? []
             });
             return;
           }
+          const nextSpanDecorators = nextSpan?.marks?.filter((mark) => decorators.includes(mark)) ?? [];
+          if (nextSpanDecorators.length > 0 && atTheEndOfAnnotation && !atTheStartOfAnnotation && isPortableTextSpan(op.node) && op.node.marks?.length === 0) {
+            Transforms.insertNodes(editor, {
+              ...op.node,
+              marks: nextSpanDecorators
+            });
+            return;
+          }
         }
       }
       if (op.type === "insert_text") {