fix removeMark (#14)

automerge · Aug 5, 2024 · 261267c · 261267c
1 parent 0fd4364
commit 261267c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/src/amToPm.ts b/src/amToPm.ts
@@ -111,11 +111,21 @@ function handleMark(
       const pmStart = amSpliceIdxToPmIdx(adapter, spans, mark.start)
       const pmEnd = amSpliceIdxToPmIdx(adapter, spans, mark.end)
       if (pmStart == null || pmEnd == null) throw new Error("Invalid index")
-      const pmMarks = pmMarksFromAmMarks(adapter, {
-        [mark.name]: mark.value,
-      })
-      for (const pmMark of pmMarks) {
-        tx = tx.addMark(pmStart, pmEnd, pmMark)
+      if (mark.value == null) {
+        const markMapping = adapter.markMappings.find(
+          m => m.automergeMarkName === mark.name,
+        )
+        const markType = markMapping
+          ? markMapping.prosemirrorMark
+          : adapter.unknownMark
+        tx = tx.removeMark(pmStart, pmEnd, markType)
+      } else {
+        const pmMarks = pmMarksFromAmMarks(adapter, {
+          [mark.name]: mark.value,
+        })
+        for (const pmMark of pmMarks) {
+          tx = tx.addMark(pmStart, pmEnd, pmMark)
+        }
       }
     }
   }

diff --git a/src/schema.ts b/src/schema.ts
@@ -264,6 +264,8 @@ export function pmMarksFromAmMarks(
   const pmMarks = []
 
   for (const [markName, markValue] of Object.entries(amMarks)) {
+    // Filter tombstoned marks (https://github.com/automerge/automerge/issues/715).
+    if (markValue == null) continue
     const mapping = adapter.markMappings.find(
       m => m.automergeMarkName === markName,
     )