@portabletext/editor 2.8.1 → 2.8.3

package/lib/index.js

@@ -3991,8 +3991,7 @@ const addAnnotationOperationImplementation = ({
   const editor = operation.editor;
   if (!editor.selection || Range.isCollapsed(editor.selection))
     return;
-  let paths, spanPath, markDefPath;
-  const markDefPaths = [], selectedBlocks = Editor.nodes(editor, {
+  const selectedBlocks = Editor.nodes(editor, {
     at: editor.selection,
     match: (node) => editor.isTextBlock(node),
     reverse: Range.isBackward(editor.selection)
@@ -4002,18 +4001,14 @@ const addAnnotationOperationImplementation = ({
     if (block.children.length === 0 || block.children.length === 1 && block.children[0].text === "")
       continue;
     const annotationKey = blockIndex === 0 ? parsedAnnotation._key : context.keyGenerator(), markDefs = block.markDefs ?? [];
-    markDefs.find((markDef) => markDef._type === parsedAnnotation._type && markDef._key === annotationKey) === void 0 && (Transforms.setNodes(editor, {
+    markDefs.find((markDef) => markDef._type === parsedAnnotation._type && markDef._key === annotationKey) === void 0 && Transforms.setNodes(editor, {
       markDefs: [...markDefs, {
         ...parsedAnnotation,
         _key: annotationKey
       }]
     }, {
       at: blockPath
-    }), markDefPath = [{
-      _key: block._key
-    }, "markDefs", {
-      _key: annotationKey
-    }], Range.isBackward(editor.selection) ? markDefPaths.unshift(markDefPath) : markDefPaths.push(markDefPath)), Transforms.setNodes(editor, {}, {
+    }), Transforms.setNodes(editor, {}, {
       match: Text.isText,
       split: !0
     });
@@ -4026,19 +4021,10 @@ const addAnnotationOperationImplementation = ({
         marks: [...marks, annotationKey]
       }, {
         at: path
-      }), spanPath = [{
-        _key: block._key
-      }, "children", {
-        _key: span._key
-      }];
+      });
     }
     blockIndex++;
   }
-  return markDefPath && spanPath && (paths = {
-    markDefPath,
-    markDefPaths,
-    spanPath
-  }), paths;
 }, removeAnnotationOperationImplementation = ({
   operation
 }) => {
@@ -10317,37 +10303,38 @@ function createEditableAPI(editor, editorActor) {
       return isActiveAnnotation(annotationType)(snapshot);
     },
     addAnnotation: (type, value) => {
-      let paths;
-      const snapshot = getEditorSnapshot({
+      const snapshotBefore = getEditorSnapshot({
         editorActorSnapshot: editorActor.getSnapshot(),
         slateEditorInstance: editor
-      });
-      return isActiveAnnotation(type.name, {
-        mode: "partial"
-      })(snapshot) && editorActor.send({
+      }), selectedValueBefore = getSelectedValue(snapshotBefore), focusSpanBefore = getFocusSpan$1(snapshotBefore), markDefsBefore = selectedValueBefore.flatMap((block) => isTextBlock(snapshotBefore.context, block) ? block.markDefs ?? [] : []);
+      editorActor.send({
         type: "behavior event",
         behaviorEvent: {
-          type: "annotation.remove",
+          type: "annotation.add",
           annotation: {
-            name: type.name
+            name: type.name,
+            value: value ?? {}
           }
         },
         editor
-      }), Editor.withoutNormalizing(editor, () => {
-        paths = addAnnotationOperationImplementation({
-          context: {
-            keyGenerator: editorActor.getSnapshot().context.keyGenerator,
-            schema: types
-          },
-          operation: {
-            annotation: {
-              name: type.name,
-              value: value ?? {}
-            },
-            editor
-          }
-        });
-      }), editor.onChange(), paths;
+      });
+      const snapshotAfter = getEditorSnapshot({
+        editorActorSnapshot: editorActor.getSnapshot(),
+        slateEditorInstance: editor
+      }), selectedValueAfter = getSelectedValue(snapshotAfter), focusBlockAfter = getFocusBlock$1(snapshotAfter), focusSpanAfter = getFocusSpan$1(snapshotAfter), newMarkDefKeysOnFocusSpan = focusSpanAfter?.node.marks?.filter((mark) => !focusSpanBefore?.node.marks?.includes(mark) && !snapshotAfter.context.schema.decorators.map((decorator) => decorator.name).includes(mark)), markDefs = selectedValueAfter.flatMap((block) => isTextBlock(snapshotAfter.context, block) ? block.markDefs?.map((markDef2) => ({
+        markDef: markDef2,
+        path: [{
+          _key: block._key
+        }, "markDefs", {
+          _key: markDef2._key
+        }]
+      })) ?? [] : []).filter((markDef2) => !markDefsBefore.some((markDefBefore) => markDefBefore._key === markDef2.markDef._key)), spanPath = focusSpanAfter?.path, markDef = markDefs.find((markDef2) => newMarkDefKeysOnFocusSpan?.some((mark) => mark === markDef2.markDef._key));
+      if (focusBlockAfter && spanPath && markDef)
+        return {
+          markDefPath: markDef.path,
+          markDefPaths: markDefs.map((markDef2) => markDef2.path),
+          spanPath
+        };
     },
     delete: (selection, options) => {
       if (selection) {