@portabletext/editor 1.44.16 → 1.45.0

package/lib/_chunks-cjs/editor-provider.cjs

@@ -3151,6 +3151,18 @@ const addAnnotationActionImplementation = ({
   context,
   action
 }) => {
+  const parsedAnnotation = parseBlocks.parseAnnotation({
+    annotation: {
+      _type: action.annotation.name,
+      ...action.annotation.value
+    },
+    context,
+    options: {
+      refreshKeys: !1
+    }
+  });
+  if (!parsedAnnotation)
+    throw new Error(`Failed to parse annotation ${JSON.stringify(action.annotation)}`);
   const editor = action.editor;
   if (!editor.selection || slate.Range.isCollapsed(editor.selection))
     return;
@@ -3160,15 +3172,15 @@ const addAnnotationActionImplementation = ({
     match: (node) => editor.isTextBlock(node),
     reverse: slate.Range.isBackward(editor.selection)
   });
+  let blockIndex = 0;
   for (const [block, blockPath] of selectedBlocks) {
     if (block.children.length === 0 || block.children.length === 1 && block.children[0].text === "")
       continue;
-    const annotationKey = context.keyGenerator(), markDefs = block.markDefs ?? [];
-    markDefs.find((markDef) => markDef._type === action.annotation.name && markDef._key === annotationKey) === void 0 && (slate.Transforms.setNodes(editor, {
+    const annotationKey = blockIndex === 0 ? parsedAnnotation._key : context.keyGenerator(), markDefs = block.markDefs ?? [];
+    markDefs.find((markDef) => markDef._type === parsedAnnotation._type && markDef._key === annotationKey) === void 0 && (slate.Transforms.setNodes(editor, {
       markDefs: [...markDefs, {
-        _type: action.annotation.name,
-        _key: annotationKey,
-        ...action.annotation.value
+        ...parsedAnnotation,
+        _key: annotationKey
       }]
     }, {
       at: blockPath
@@ -3184,7 +3196,7 @@ const addAnnotationActionImplementation = ({
     for (const [span, path] of children) {
       if (!editor.isTextSpan(span) || !slate.Range.includes(editor.selection, path))
         continue;
-      const marks = span.marks ?? [], existingSameTypeAnnotations = marks.filter((mark) => markDefs.some((markDef) => markDef._key === mark && markDef._type === action.annotation.name));
+      const marks = span.marks ?? [], existingSameTypeAnnotations = marks.filter((mark) => markDefs.some((markDef) => markDef._key === mark && markDef._type === parsedAnnotation._type));
       slate.Transforms.setNodes(editor, {
         marks: [...marks.filter((mark) => !existingSameTypeAnnotations.includes(mark)), annotationKey]
       }, {
@@ -3195,6 +3207,7 @@ const addAnnotationActionImplementation = ({
         _key: span._key
       }];
     }
+    blockIndex++;
   }
   return markDefPath && spanPath && (paths = {
     markDefPath,
@@ -3607,13 +3620,13 @@ const decoratorAddActionImplementation = ({
   context,
   action
 }) => {
-  const editor = action.editor, mark = action.decorator, value = fromSlateValue(editor.children, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(editor)), manualAnchor = action.offsets?.anchor ? util_sliceBlocks.blockOffsetToSpanSelectionPoint({
+  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 ? util_sliceBlocks.blockOffsetToSpanSelectionPoint({
     value,
-    blockOffset: action.offsets.anchor,
+    blockOffset: action.at.anchor,
     direction: "backward"
-  }) : void 0, manualFocus = action.offsets?.focus ? util_sliceBlocks.blockOffsetToSpanSelectionPoint({
+  }) : void 0, manualFocus = action.at?.focus ? util_sliceBlocks.blockOffsetToSpanSelectionPoint({
     value,
-    blockOffset: action.offsets.focus,
+    blockOffset: action.at.focus,
     direction: "forward"
   }) : void 0, manualSelection = manualAnchor && manualFocus ? {
     anchor: manualAnchor,
@@ -3715,9 +3728,9 @@ const decoratorAddActionImplementation = ({
 }, deleteActionImplementation = ({
   action
 }) => {
-  const range = toSlateRange(action.selection, action.editor);
+  const range = toSlateRange(action.at, action.editor);
   if (!range)
-    throw new Error(`Failed to get Slate Range for selection ${JSON.stringify(action.selection)}`);
+    throw new Error(`Failed to get Slate Range for selection ${JSON.stringify(action.at)}`);
   action.editor.delete({
     at: range
   });
@@ -3755,10 +3768,7 @@ const decoratorAddActionImplementation = ({
 }) => {
   const value = fromSlateValue(action.editor.children, context.schema.block.name, KEY_TO_VALUE_ELEMENT.get(action.editor)), selection = util_selectionPointToBlockOffset.blockOffsetsToSelection({
     value,
-    offsets: {
-      anchor: action.anchor,
-      focus: action.focus
-    }
+    offsets: action.at
   });
   if (!selection)
     throw new Error("Unable to find selection from block offsets");
@@ -3793,10 +3803,18 @@ const decoratorAddActionImplementation = ({
   context,
   action
 }) => {
-  if (!context.schema.inlineObjects.some((inlineObject) => inlineObject.name === action.inlineObject.name)) {
-    console.error("Unable to insert unknown inline object");
-    return;
-  }
+  const parsedInlineObject = parseBlocks.parseInlineObject({
+    context,
+    inlineObject: {
+      _type: action.inlineObject.name,
+      ...action.inlineObject.value ?? {}
+    },
+    options: {
+      refreshKeys: !1
+    }
+  });
+  if (!parsedInlineObject)
+    throw new Error(`Failed to parse inline object ${JSON.stringify(action.inlineObject)}`);
   if (!action.editor.selection) {
     console.error("Unable to insert inline object without selection");
     return;
@@ -3812,11 +3830,7 @@ const decoratorAddActionImplementation = ({
   const child = toSlateValue([{
     _type: context.schema.block.name,
     _key: context.keyGenerator(),
-    children: [{
-      _type: action.inlineObject.name,
-      _key: context.keyGenerator(),
-      ...action.inlineObject.value ?? {}
-    }]
+    children: [parsedInlineObject]
   }], {
     schemaTypes: context.schema
   }).at(0)?.children.at(0);
@@ -4012,7 +4026,7 @@ const moveBlockActionImplementation = ({
 }, selectActionImplementation = ({
   action
 }) => {
-  const newSelection = toSlateRange(action.selection, action.editor);
+  const newSelection = toSlateRange(action.at, action.editor);
   newSelection ? slate.Transforms.select(action.editor, newSelection) : slate.Transforms.deselect(action.editor);
 }, splitBlockActionImplementation = ({
   context,
@@ -4404,7 +4418,7 @@ function createWithEventListeners(editorActor) {
         type: "behavior event",
         behaviorEvent: {
           type: "select",
-          selection: slateRangeToSelection({
+          at: slateRangeToSelection({
             schema: editorActor.getSnapshot().context.schema,
             editor,
             range
@@ -5137,7 +5151,10 @@ function compileSchemaDefinition(definition) {
       // This avoids the default title which is a title case of the object name
       defaultObjectTitles[blockObject.name]
     ) : blockObject.title,
-    fields: []
+    fields: blockObject.fields?.map((field) => ({
+      name: field.name,
+      type: field.type
+    })) ?? []
   })) ?? [], inlineObjects = definition?.inlineObjects?.map((inlineObject) => types.defineType({
     type: "object",
     // Very naive way to work around `SanitySchema.compile` adding default
@@ -5147,7 +5164,10 @@ function compileSchemaDefinition(definition) {
       // This avoids the default title which is a title case of the object name
       defaultObjectTitles[inlineObject.name]
     ) : inlineObject.title,
-    fields: []
+    fields: inlineObject.fields?.map((field) => ({
+      name: field.name,
+      type: field.type
+    })) ?? []
   })) ?? [], portableTextSchema = types.defineField({
     type: "array",
     name: "portable-text",
@@ -5167,7 +5187,11 @@ function compileSchemaDefinition(definition) {
         annotations: definition?.annotations?.map((annotation) => ({
           name: annotation.name,
           type: "object",
-          title: annotation.title
+          title: annotation.title,
+          fields: annotation.fields?.map((field) => ({
+            name: field.name,
+            type: field.type
+          })) ?? []
         })) ?? []
       },
       lists: definition?.lists?.map((list) => ({
@@ -5240,9 +5264,9 @@ const abstractAnnotationBehaviors = [behavior_core.defineBehavior({
     snapshot,
     event
   }) => {
-    const manualSelection = event.offsets ? util_selectionPointToBlockOffset.blockOffsetsToSelection({
+    const manualSelection = event.at ? util_selectionPointToBlockOffset.blockOffsetsToSelection({
       value: snapshot.context.value,
-      offsets: event.offsets
+      offsets: event.at
     }) : null;
     return manualSelection ? !selector_isSelectingEntireBlocks.isActiveDecorator(event.decorator)({
       ...snapshot,
@@ -5492,7 +5516,7 @@ const abstractAnnotationBehaviors = [behavior_core.defineBehavior({
     selection
   }) => [behavior_core.raise({
     type: "select",
-    selection
+    at: selection
   })]]
 }), behavior_core.defineBehavior({
   on: "select.next block",
@@ -5515,7 +5539,7 @@ const abstractAnnotationBehaviors = [behavior_core.defineBehavior({
     selection
   }) => [behavior_core.raise({
     type: "select",
-    selection
+    at: selection
   })]]
 })], abstractStyleBehaviors = [behavior_core.defineBehavior({
   on: "style.add",
@@ -5693,7 +5717,7 @@ const abstractAnnotationBehaviors = [behavior_core.defineBehavior({
       originEvent: event
     }), behavior_core.raise({
       type: "delete",
-      selection
+      at: selection
     })]]
   }),
   behavior_core.defineBehavior({
@@ -5752,7 +5776,7 @@ const abstractAnnotationBehaviors = [behavior_core.defineBehavior({
       event
     }) => [behavior_core.raise({
       type: "select",
-      selection: event.position.selection
+      at: event.position.selection
     }), behavior_core.raise({
       type: "deserialize",
       originEvent: event
@@ -5802,7 +5826,7 @@ const abstractAnnotationBehaviors = [behavior_core.defineBehavior({
       at: block.path
     })) : [behavior_core.raise({
       type: "delete",
-      selection: dragOrigin.selection
+      at: dragOrigin.selection
     })], behavior_core.raise({
       type: "insert.blocks",
       blocks: event.data,
@@ -5896,7 +5920,7 @@ const abstractAnnotationBehaviors = [behavior_core.defineBehavior({
       selection
     }) => [behavior_core.raise({
       type: "delete",
-      selection
+      at: selection
     }), behavior_core.raise({
       type: "deserialize",
       originEvent: event