docx-diff-editor 1.0.53 → 1.0.55

package/dist/index.mjs

@@ -2874,14 +2874,38 @@ var DocxDiffEditor = forwardRef(
     const instanceId = useRef(`dde-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`);
     const editorId = `dde-editor-${instanceId.current}`;
     const toolbarId = `dde-toolbar-${instanceId.current}`;
+    const sanitizeJson = useCallback((node) => {
+      if (node.type === "text") {
+        if (!node.text || node.text === "") {
+          return null;
+        }
+        return node;
+      }
+      if (node.content && Array.isArray(node.content)) {
+        const cleanedContent = node.content.map((child) => sanitizeJson(child)).filter((child) => child !== null);
+        if (node.type === "run" && cleanedContent.length === 0) {
+          return null;
+        }
+        return {
+          ...node,
+          content: cleanedContent.length > 0 ? cleanedContent : void 0
+        };
+      }
+      return node;
+    }, []);
     const setEditorContent = useCallback((editor, json) => {
       const { state, view } = editor;
       if (state?.doc && view && json.content) {
-        const newDoc = state.schema.nodeFromJSON(json);
+        const sanitized = sanitizeJson(json);
+        if (!sanitized || !sanitized.content) {
+          console.warn("[DocxDiffEditor] Sanitized JSON has no content");
+          return;
+        }
+        const newDoc = state.schema.nodeFromJSON(sanitized);
         const tr = state.tr.replaceWith(0, state.doc.content.size, newDoc.content);
         view.dispatch(tr);
       }
-    }, []);
+    }, [sanitizeJson]);
     const enableReviewMode = useCallback((sd) => {
       if (sd.setTrackedChangesPreferences) {
         sd.setTrackedChangesPreferences({ mode: "review", enabled: true });
@@ -3254,7 +3278,8 @@ var DocxDiffEditor = forwardRef(
               }
               newJson = content;
             }
-            const normalizedNewJson = normalizeRunProperties(newJson);
+            const cleanNewJson = acceptAllChangesInJson(newJson) || { type: "doc", content: [] };
+            const normalizedNewJson = normalizeRunProperties(cleanNewJson);
             const structuralResult = mergeWithStructuralAwareness(
               cleanBaseline,
               normalizedNewJson,
@@ -3263,7 +3288,7 @@ var DocxDiffEditor = forwardRef(
             const merged = structuralResult.mergedDoc;
             const structInfos = structuralResult.structuralInfos;
             setMergedJson(merged);
-            const diff = diffDocuments(cleanBaseline, newJson);
+            const diff = diffDocuments(cleanBaseline, cleanNewJson);
             setDiffResult(diff);
             if (superdocRef.current?.activeEditor) {
               setEditorContent(superdocRef.current.activeEditor, merged);