refactor: optimize mdUtil

aieditor-team · Dec 12, 2024 · 2767bd1 · 2767bd1
1 parent 010ddb6
commit 2767bd1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 22 deletions.
diff --git a/src/util/htmlUtil.ts b/src/util/htmlUtil.ts
@@ -149,3 +149,28 @@ export const clearDataMpSlice = (html: string) => {
     tempDiv.appendChild(fragment)
     return tempDiv.innerHTML;
 }
+
+export const organizeHTMLContent = (originalHtml: string) => {
+    if (!originalHtml) return "";
+    const parser = new DOMParser();
+    const doc = parser.parseFromString(originalHtml, 'text/html');
+    const lis = doc.querySelectorAll("li");
+
+    //"tiptap" does not support empty list items. Here to fill in the gaps
+    if (lis) lis.forEach(li => {
+        if (!li.innerHTML) li.innerHTML = "<p></p>"
+    })
+
+    let html = '';
+    for (let i = 0; i < doc.body.children.length; i++) {
+        const element = doc.body.children[i];
+        if (i == 0 && element.tagName === "P") {
+            html += element.innerHTML;
+        } else {
+            // https://gitee.com/aieditor-team/aieditor/pulls/10
+            html += element.querySelector("img")
+                ? element.innerHTML : element.outerHTML;
+        }
+    }
+    return html;
+}
diff --git a/src/util/mdUtil.ts b/src/util/mdUtil.ts
@@ -6,6 +6,7 @@ import container from 'markdown-it-container';
 import TurndownService from 'turndown'
 // @ts-ignore
 import {gfm, tables} from 'joplin-turndown-plugin-gfm';
+import { organizeHTMLContent } from './htmlUtil';
 
 
 const md = MarkdownIt({
@@ -77,30 +78,9 @@ export const mdToHtml = (markdown: string) => {
     if (!markdown) return markdown;
     const renderHtml = md.render(markdown).trim();
     if (!renderHtml) return markdown;
-    const parser = new DOMParser();
-    const doc = parser.parseFromString(renderHtml, 'text/html');
-    const lis = doc.querySelectorAll("li");
-
-    //"tiptap" does not support empty list items. Here to fill in the gaps
-    if (lis) lis.forEach(li => {
-        if (!li.innerHTML) li.innerHTML = "<p></p>"
-    })
-
-    let html = '';
-    for (let i = 0; i < doc.body.children.length; i++) {
-        const element = doc.body.children[i];
-        if (i == 0 && element.tagName === "P") {
-            html += element.innerHTML;
-        } else {
-            // https://gitee.com/aieditor-team/aieditor/pulls/10
-            html += element.querySelector("img")
-                ? element.innerHTML : element.outerHTML;
-        }
-    }
-    return html;
+    return organizeHTMLContent(renderHtml);
 }
 
-
 export const htmlToMd = (html: string) => {
     if (!html) return html;
     const parser = new DOMParser();