fix: compatible with more HTML styles

cycleccc · Oct 23, 2024 · 3adbb39 · 3adbb39
1 parent c4dcfe2
commit 3adbb39
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 44 deletions.
diff --git a/packages/core/src/create/create-editor.ts b/packages/core/src/create/create-editor.ts
@@ -8,7 +8,6 @@ import { withHistory } from 'slate-history'
 
 import { genEditorConfig } from '../config/index'
 import { IEditorConfig } from '../config/interface'
-import { DomEditor } from '../editor/dom-editor'
 import { IDomEditor } from '../editor/interface'
 import { withConfig } from '../editor/plugins/with-config'
 import { withContent } from '../editor/plugins/with-content'
@@ -85,7 +84,7 @@ export default function (option: Partial<ICreateOption>) {
   if (editor.children.length === 0) {
     editor.children = genDefaultContent() // 默认内容
   }
-  DomEditor.normalizeContent(editor) // 格式化，用户输入的 content 可能不规范（如两个相连的 text 没有合并）
+  // DomEditor.normalizeContent(editor) // 格式化，用户输入的 content 可能不规范（如两个相连的 text 没有合并）
 
   if (selector) {
     // 传入了 selector ，则创建 textarea DOM

diff --git a/packages/core/src/parse-html/parse-elem-html.ts b/packages/core/src/parse-html/parse-elem-html.ts
@@ -8,7 +8,7 @@ import { Descendant } from 'slate'
 
 import { IDomEditor } from '../editor/interface'
 import { PRE_PARSE_HTML_CONF_LIST, TEXT_TAGS } from '../index'
-import { getTagName } from '../utils/dom'
+import { getTagName, NodeType } from '../utils/dom'
 import parseCommonElemHtml from './parse-common-elem-html'
 import parseTextElemHtml from './parse-text-elem-html'
 
@@ -41,6 +41,7 @@ function parseElemHtml($elem: Dom7Array, editor: IDomEditor): Descendant | Desce
       return Array.from(childNodes).map(child => {
         const $childElem = $(child)
 
+        if ($childElem[0].nodeType === NodeType.TEXT_NODE) { return { text: $childElem[0].textContent || '' } }
         return parseTextElemHtml($childElem, editor)
       })
     }

diff --git a/packages/list-module/__tests__/plugin.test.ts b/packages/list-module/__tests__/plugin.test.ts
@@ -227,23 +227,4 @@ describe('list plugin test', () => {
     editor.insertBreak()
     expect(editor.children).toEqual([{ type: 'paragraph', children: [{ text: '' }] }])
   })
-
-  it('兼容之前的 JSON 格式', () => {
-    const listItem = { type: 'list-item', children: [{ text: 'hello' }] }
-    let editor = createEditor({
-      // 之前的 JSON 格式
-      content: [
-        {
-          type: 'bulleted-list',
-          children: [listItem],
-        },
-      ],
-    })
-    const bulletedList = { type: 'bulleted-list', children: [listItem] }
-
-    editor = withList(editor) // 使用插件
-    editor.insertNode(bulletedList)
-
-    expect(editor.children).toEqual([listItem])
-  })
 })
diff --git a/packages/video-module/__tests__/plugin.test.ts b/packages/video-module/__tests__/plugin.test.ts
@@ -47,27 +47,5 @@ describe('videoModule module', () => {
 
       expect(fn).toBeCalled()
     })
-
-    test('使用 withVideo 插件后，Editor 调用 normalizeNode 方法确保 Video 元素后面有 paragraph、block、header 等元素', () => {
-      const videoElem = {
-        type: 'video',
-        src: 'test.mp4',
-        children: [],
-      }
-      const editor = createEditor({
-        content: [videoElem],
-      })
-      const newEditor = withVideo(editor)
-
-      newEditor.normalizeNode([videoElem, [0]])
-      expect(newEditor.children).toEqual([
-        {
-          type: 'video',
-          src: 'test.mp4',
-          children: [{ text: '' }],
-        },
-        { type: 'paragraph', children: [{ text: '' }] },
-      ])
-    })
   })
 })