chore: remove all hardBreaks

yiwen-ai · Oct 10, 2023 · 3201687 · 3201687
1 parent 0339b7c
commit 3201687
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 22 deletions.
diff --git a/dist/tiptap.js b/dist/tiptap.js
@@ -120,7 +120,9 @@ export class JSONDocumentAmender {
             node.type = 'invalid';
             return node;
         }
-        if (node.type === 'paragraph' && !node.content?.length) {
+        if (node.type === 'paragraph' &&
+            (!node.content?.length ||
+                (node.content.length == 1 && node.content[0].type === 'hardBreak'))) {
             node.type = 'invalid';
             return node;
         }
@@ -147,16 +149,7 @@ export class JSONDocumentAmender {
         }
         // content: Node[]
         if (node.content != null) {
-            let prevHardBreak = false;
             for (const child of node.content) {
-                const isHardBreak = child.type === 'paragraph' &&
-                    child.content?.length === 1 &&
-                    child.content[0].type === 'hardBreak';
-                if (prevHardBreak && isHardBreak) {
-                    // 清理连续的 hardBreak
-                    child.type = 'invalid';
-                }
-                prevHardBreak = isHardBreak;
                 this.amendNode(child);
             }
             node.content = node.content.filter((child) => child.type !== 'invalid');

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "webscraper",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "",
   "private": true,
   "main": "dist/main.js",

diff --git a/src/tiptap.ts b/src/tiptap.ts
@@ -141,7 +141,11 @@ export class JSONDocumentAmender {
       return node
     }
 
-    if (node.type === 'paragraph' && !node.content?.length) {
+    if (
+      node.type === 'paragraph' &&
+      (!node.content?.length ||
+        (node.content.length == 1 && node.content[0].type === 'hardBreak'))
+    ) {
       node.type = 'invalid'
       return node
     }
@@ -171,17 +175,7 @@ export class JSONDocumentAmender {
 
     // content: Node[]
     if (node.content != null) {
-      let prevHardBreak = false
       for (const child of node.content) {
-        const isHardBreak =
-          child.type === 'paragraph' &&
-          child.content?.length === 1 &&
-          child.content[0].type === 'hardBreak'
-        if (prevHardBreak && isHardBreak) {
-          // 清理连续的 hardBreak
-          child.type = 'invalid'
-        }
-        prevHardBreak = isHardBreak
         this.amendNode(child)
       }