docx-diff-editor 1.0.52 → 1.0.54

package/README.md

@@ -51,6 +51,10 @@ function App() {
     );
 
     console.log(`Found ${result.totalChanges} changes`);
+
+    // Note: Subsequent compareWith calls compare against current editor state
+    // (with track changes accepted), not the original source.
+    // To compare against original again, call setSource() first.
   };
 
   return (
@@ -117,7 +121,8 @@ interface DocxDiffEditorRef {
   // Set the source/base document
   setSource(content: DocxContent): Promise<void>;
 
-  // Compare and show track changes
+  // Compare current editor content with new content, show track changes
+  // Note: Compares against current editor state (not original source)
   compareWith(content: DocxContent): Promise<ComparisonResult>;
 
   // Get diff data

package/dist/index.js

@@ -2882,14 +2882,38 @@ var DocxDiffEditor = react.forwardRef(
     const instanceId = react.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 = react.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 = react.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 = react.useCallback((sd) => {
       if (sd.setTrackedChangesPreferences) {
         sd.setTrackedChangesPreferences({ mode: "review", enabled: true });
@@ -3185,17 +3209,27 @@ var DocxDiffEditor = react.forwardRef(
           }
         },
         /**
-         * Compare source with new content, show track changes
+         * Compare current editor content with new content, show track changes.
+         * 
+         * The comparison uses the current editor state (with any existing track
+         * changes accepted/stripped) as the baseline. This means if you've made
+         * edits or accepted previous comparisons, those become the new baseline.
+         * 
+         * To compare against the original source document, call setSource() again
+         * before compareWith().
          */
         async compareWith(content) {
           if (!SuperDocRef.current) {
             throw new Error("Editor not initialized");
           }
-          if (!sourceJson) {
-            throw new Error("No source document set. Call setSource() first.");
+          if (!superdocRef.current?.activeEditor) {
+            throw new Error("Editor not ready. Ensure a document is loaded first.");
           }
           setIsLoading(true);
           try {
+            const currentEditorJson = superdocRef.current.activeEditor.getJSON();
+            const cleanBaseline = acceptAllChangesInJson(currentEditorJson) || { type: "doc", content: [] };
+            setSourceJson(cleanBaseline);
             const contentType = detectContentType(content);
             let newJson;
             if (contentType === "file") {
@@ -3254,14 +3288,14 @@ var DocxDiffEditor = react.forwardRef(
             }
             const normalizedNewJson = normalizeRunProperties(newJson);
             const structuralResult = mergeWithStructuralAwareness(
-              sourceJson,
+              cleanBaseline,
               normalizedNewJson,
               author
             );
             const merged = structuralResult.mergedDoc;
             const structInfos = structuralResult.structuralInfos;
             setMergedJson(merged);
-            const diff = diffDocuments(sourceJson, newJson);
+            const diff = diffDocuments(cleanBaseline, newJson);
             setDiffResult(diff);
             if (superdocRef.current?.activeEditor) {
               setEditorContent(superdocRef.current.activeEditor, merged);