docx-diff-editor 1.0.51 → 1.0.53

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.d.mts

@@ -516,8 +516,12 @@ declare function createTrackDeleteMark(author?: TrackChangeAuthor, id?: string):
  *
  * Note: SuperDoc's parseFormatList requires all marks in before/after arrays
  * to have both `type` and `attrs` properties. Marks without `attrs` get filtered out,
- * causing empty values in track change bubbles. We normalize marks here to ensure
- * all have at least an empty `attrs` object.
+ * causing empty values in track change bubbles.
+ *
+ * We use normalizeMarksForTrackFormat which:
+ * 1. Ensures all marks have `attrs` property (required by parseFormatList)
+ * 2. Cleans attrs to remove null/undefined/empty values (prevents "Set X to undefined" bubbles)
+ * 3. Normalizes color values to valid CSS format
  */
 declare function createTrackFormatMark(before: ProseMirrorMark[], after: ProseMirrorMark[], author?: TrackChangeAuthor): ProseMirrorMark;
 

package/dist/index.d.ts

@@ -516,8 +516,12 @@ declare function createTrackDeleteMark(author?: TrackChangeAuthor, id?: string):
  *
  * Note: SuperDoc's parseFormatList requires all marks in before/after arrays
  * to have both `type` and `attrs` properties. Marks without `attrs` get filtered out,
- * causing empty values in track change bubbles. We normalize marks here to ensure
- * all have at least an empty `attrs` object.
+ * causing empty values in track change bubbles.
+ *
+ * We use normalizeMarksForTrackFormat which:
+ * 1. Ensures all marks have `attrs` property (required by parseFormatList)
+ * 2. Cleans attrs to remove null/undefined/empty values (prevents "Set X to undefined" bubbles)
+ * 3. Normalizes color values to valid CSS format
  */
 declare function createTrackFormatMark(before: ProseMirrorMark[], after: ProseMirrorMark[], author?: TrackChangeAuthor): ProseMirrorMark;
 

package/dist/index.js

@@ -541,6 +541,18 @@ function ensureValidCssColor(color) {
 }
 
 // src/services/trackChangeInjector.ts
+function isMeaningfulValue(value) {
+  return value !== null && value !== void 0 && value !== "";
+}
+function cleanAttrs(attrs) {
+  const cleaned = {};
+  for (const [key, value] of Object.entries(attrs)) {
+    if (isMeaningfulValue(value)) {
+      cleaned[key] = value;
+    }
+  }
+  return cleaned;
+}
 function normalizeMark(mark) {
   const attrs = { ...mark.attrs || {} };
   if (attrs.color !== void 0) {
@@ -551,9 +563,23 @@ function normalizeMark(mark) {
     attrs
   };
 }
+function normalizeMarkForTrackFormat(mark) {
+  let attrs = { ...mark.attrs || {} };
+  if (attrs.color !== void 0) {
+    attrs.color = ensureValidCssColor(attrs.color);
+  }
+  attrs = cleanAttrs(attrs);
+  return {
+    type: mark.type,
+    attrs
+  };
+}
 function normalizeMarks(marks) {
   return marks.map(normalizeMark);
 }
+function normalizeMarksForTrackFormat(marks) {
+  return marks.map(normalizeMarkForTrackFormat);
+}
 function normalizeMarksForRendering(marks) {
   return normalizeMarks(marks);
 }
@@ -582,8 +608,8 @@ function createTrackDeleteMark(author = DEFAULT_AUTHOR, id) {
   };
 }
 function createTrackFormatMark(before, after, author = DEFAULT_AUTHOR) {
-  const normalizedBefore = normalizeMarks(before);
-  const normalizedAfter = normalizeMarks(after);
+  const normalizedBefore = normalizeMarksForTrackFormat(before);
+  const normalizedAfter = normalizeMarksForTrackFormat(after);
   return {
     type: "trackFormat",
     attrs: {
@@ -3159,17 +3185,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") {
@@ -3228,14 +3264,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);