fix: remove marks from breaks that are first node inside that mark (#378

)
gravity-ui · Sep 24, 2024 · 6b148fd · 6b148fd
1 parent b6b61f8
commit 6b148fd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/core/markdown/Markdown.test.ts b/src/core/markdown/Markdown.test.ts
@@ -163,7 +163,10 @@ describe('markdown', () => {
 
     it('drops trailing hard breaks', () => serialize(doc(p('a', br(), br())), 'a'));
 
-    it('should remove marks from edge break', () =>
+    it('should remove marks from edge break (before)', () =>
+        serialize(doc(p('text', strong(br(), 'text2'))), 'text\\\n**text2**'));
+
+    it('should remove marks from edge break (after)', () =>
         serialize(doc(p(strong('text', br()), 'text2')), '**text**\\\ntext2'));
 
     it('expels enclosing whitespace from inside emphasis', () =>

diff --git a/src/core/markdown/MarkdownSerializer.js b/src/core/markdown/MarkdownSerializer.js
@@ -194,14 +194,19 @@ export class MarkdownSerializerState {
         const progress = (node, _, index) => {
             let marks = node ? node.marks : [];
 
-            // Remove marks from breaks (hard_break or soft_break) that are the last node inside
+            // Remove marks from breaks (hard_break or soft_break) that are the edge node inside
             // that mark to prevent parser edge cases with new lines just
-            // before closing marks.
+            // before closing or after opening marks.
             if (node && node.type.spec.isBreak) {
                 marks = marks.filter(m => {
+                    if (index === 0) return false;
                     if (index + 1 == parent.childCount) return false;
+                    const prev = parent.child(index - 1);
                     const next = parent.child(index + 1);
-                    return m.isInSet(next.marks) && (!next.isText || /\S/.test(next.text));
+                    return (
+                        (m.isInSet(prev.marks) && (!prev.isText || /\S/.test(prev.text))) &&
+                        (m.isInSet(next.marks) && (!next.isText || /\S/.test(next.text)))
+                    );
                 });
             }
 

diff --git a/src/extensions/markdown/Breaks/Breaks.test.ts b/src/extensions/markdown/Breaks/Breaks.test.ts
@@ -33,12 +33,24 @@ describe('Breaks extension', () => {
             'Lorem **ipsum**\\\ndolor sit amet',
         ));
 
+    it('should serialize hard break 2', () =>
+        serialize(
+            doc(p('Lorem', bold(hb(), 'ipsum'), ' dolor sit amet')),
+            'Lorem\\\n**ipsum** dolor sit amet',
+        ));
+
     it('should serialize soft break', () =>
         serialize(
             doc(p('Lorem ', bold('ipsum', sb()), 'dolor sit amet')),
             'Lorem **ipsum**\ndolor sit amet',
         ));
 
+    it('should serialize soft break 2', () =>
+        serialize(
+            doc(p('Lorem', bold(sb(), 'ipsum'), ' dolor sit amet')),
+            'Lorem\n**ipsum** dolor sit amet',
+        ));
+
     it('should parse html - br tag', () => {
         parseDOM(schema, '<div>hello<br>world!</div>', doc(p('hello', hb(), 'world!')));
     });