Merge pull request #2608 from huridocs/2526_markdown_improvement

markdown now ouputs single tags as self closed
huridocs · Nov 6, 2019 · 21b80f6 · 21b80f6
2 parents 7cf2a74 + 05e83cb
commit 21b80f6
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/app/react/Markdown/markdownToReact.js b/app/react/Markdown/markdownToReact.js
@@ -25,8 +25,8 @@ const dynamicCustomContainersConfig = {
 };
 
 
-const markdownIt = instanceMarkdownIt().use(mdContainer, 'dynamic', dynamicCustomContainersConfig);
-const markdownItWithHtml = instanceMarkdownIt({ html: true }).use(mdContainer, 'dynamic', dynamicCustomContainersConfig);
+const markdownIt = instanceMarkdownIt({ xhtmlOut: true }).use(mdContainer, 'dynamic', dynamicCustomContainersConfig);
+const markdownItWithHtml = instanceMarkdownIt({ html: true, xhtmlOut: true }).use(mdContainer, 'dynamic', dynamicCustomContainersConfig);
 const customComponentTypeMatcher = /{(.+)}\(/;
 
 const getConfig = (string) => {

diff --git a/app/react/Markdown/specs/MarkdownViewer.spec.js b/app/react/Markdown/specs/MarkdownViewer.spec.js
@@ -165,6 +165,17 @@ describe('MarkdownViewer', () => {
       expect(component).toMatchSnapshot();
     });
 
+    it('should render single tags as self closing', () => {
+      props.html = true;
+      props.markdown = '' +
+        'test\n\n' +
+        '***\n' +
+        'test';
+
+      render();
+      expect(component).toMatchSnapshot();
+    });
+
     it('should render properly a selfclosing XML tags', () => {
       props.html = true;
       props.markdown = '' +

diff --git a/app/react/Markdown/specs/__snapshots__/MarkdownViewer.spec.js.snap b/app/react/Markdown/specs/__snapshots__/MarkdownViewer.spec.js.snap
@@ -397,6 +397,32 @@ exports[`MarkdownViewer render should render properly a selfclosing XML tags 1`]
 </div>
 `;
 
+exports[`MarkdownViewer render should render single tags as self closing 1`] = `
+<div
+  className="markdown-viewer"
+>
+  <p
+    key="0"
+  >
+    test
+  </p>
+  
+
+  <hr
+    key="2"
+  />
+  
+
+  <p
+    key="4"
+  >
+    test
+  </p>
+  
+
+</div>
+`;
+
 exports[`MarkdownViewer render should support containers with custom classNames 1`] = `
 <div
   className="markdown-viewer"