docx-diff-editor 1.0.47 → 1.0.50

package/dist/index.d.mts

@@ -513,6 +513,11 @@ declare function createTrackInsertMark(author?: TrackChangeAuthor, id?: string):
 declare function createTrackDeleteMark(author?: TrackChangeAuthor, id?: string): ProseMirrorMark;
 /**
  * Create a trackFormat mark.
+ *
+ * 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.
  */
 declare function createTrackFormatMark(before: ProseMirrorMark[], after: ProseMirrorMark[], author?: TrackChangeAuthor): ProseMirrorMark;
 

package/dist/index.d.ts

@@ -513,6 +513,11 @@ declare function createTrackInsertMark(author?: TrackChangeAuthor, id?: string):
 declare function createTrackDeleteMark(author?: TrackChangeAuthor, id?: string): ProseMirrorMark;
 /**
  * Create a trackFormat mark.
+ *
+ * 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.
  */
 declare function createTrackFormatMark(before: ProseMirrorMark[], after: ProseMirrorMark[], author?: TrackChangeAuthor): ProseMirrorMark;
 

package/dist/index.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var react = require('react');
 var jsxRuntime = require('react/jsx-runtime');
-var DiffMatchPatch = require('diff-match-patch');
 var uuid = require('uuid');
+var DiffMatchPatch = require('diff-match-patch');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -452,14 +452,212 @@ var TIMEOUTS = {
   /** Cleanup delay (ms) */
   CLEANUP_DELAY: 100
 };
+var CSS_NAMED_COLORS = {
+  // Basic colors
+  black: "#000000",
+  white: "#ffffff",
+  red: "#ff0000",
+  green: "#008000",
+  blue: "#0000ff",
+  yellow: "#ffff00",
+  cyan: "#00ffff",
+  magenta: "#ff00ff",
+  // Extended colors
+  orange: "#ffa500",
+  pink: "#ffc0cb",
+  purple: "#800080",
+  violet: "#ee82ee",
+  brown: "#a52a2a",
+  gray: "#808080",
+  grey: "#808080",
+  // Light variants
+  lightblue: "#add8e6",
+  lightgreen: "#90ee90",
+  lightgray: "#d3d3d3",
+  lightgrey: "#d3d3d3",
+  lightpink: "#ffb6c1",
+  lightyellow: "#ffffe0",
+  // Dark variants
+  darkblue: "#00008b",
+  darkgreen: "#006400",
+  darkgray: "#a9a9a9",
+  darkgrey: "#a9a9a9",
+  darkred: "#8b0000",
+  // Other common colors
+  navy: "#000080",
+  teal: "#008080",
+  maroon: "#800000",
+  olive: "#808000",
+  silver: "#c0c0c0",
+  aqua: "#00ffff",
+  fuchsia: "#ff00ff",
+  lime: "#00ff00",
+  coral: "#ff7f50",
+  salmon: "#fa8072",
+  gold: "#ffd700",
+  indigo: "#4b0082",
+  crimson: "#dc143c",
+  tomato: "#ff6347",
+  chocolate: "#d2691e",
+  tan: "#d2b48c",
+  beige: "#f5f5dc",
+  ivory: "#fffff0",
+  khaki: "#f0e68c",
+  lavender: "#e6e6fa",
+  plum: "#dda0dd",
+  orchid: "#da70d6",
+  turquoise: "#40e0d0",
+  skyblue: "#87ceeb",
+  steelblue: "#4682b4",
+  slategray: "#708090",
+  slategrey: "#708090"
+};
+function ensureValidCssColor(color) {
+  if (typeof color !== "string" || !color) {
+    return void 0;
+  }
+  const trimmed = color.trim();
+  const lowerColor = trimmed.toLowerCase();
+  if (CSS_NAMED_COLORS[lowerColor]) {
+    return CSS_NAMED_COLORS[lowerColor];
+  }
+  if (/^[0-9a-fA-F]{6}$/.test(trimmed)) {
+    return `#${trimmed}`;
+  }
+  if (/^[0-9a-fA-F]{3}$/.test(trimmed)) {
+    return `#${trimmed}`;
+  }
+  return trimmed;
+}
+function normalizeMark(mark) {
+  const attrs = { ...mark.attrs || {} };
+  if (attrs.color !== void 0) {
+    attrs.color = ensureValidCssColor(attrs.color);
+  }
+  return {
+    type: mark.type,
+    attrs
+  };
+}
+function normalizeMarks(marks) {
+  return marks.map(normalizeMark);
+}
+function normalizeMarksForRendering(marks) {
+  return normalizeMarks(marks);
+}
+function createTrackInsertMark(author = DEFAULT_AUTHOR, id) {
+  return {
+    type: "trackInsert",
+    attrs: {
+      id: id ?? uuid.v4(),
+      author: author.name,
+      authorEmail: author.email,
+      authorImage: "",
+      date: (/* @__PURE__ */ new Date()).toISOString()
+    }
+  };
+}
+function createTrackDeleteMark(author = DEFAULT_AUTHOR, id) {
+  return {
+    type: "trackDelete",
+    attrs: {
+      id: id ?? uuid.v4(),
+      author: author.name,
+      authorEmail: author.email,
+      authorImage: "",
+      date: (/* @__PURE__ */ new Date()).toISOString()
+    }
+  };
+}
+function createTrackFormatMark(before, after, author = DEFAULT_AUTHOR) {
+  const normalizedBefore = normalizeMarks(before);
+  const normalizedAfter = normalizeMarks(after);
+  return {
+    type: "trackFormat",
+    attrs: {
+      id: uuid.v4(),
+      author: author.name,
+      authorEmail: author.email,
+      authorImage: "",
+      date: (/* @__PURE__ */ new Date()).toISOString(),
+      before: normalizedBefore,
+      after: normalizedAfter
+    }
+  };
+}
 
 // src/services/runPropertiesSync.ts
 var PT_TO_TWIPS = 20;
+var CSS_NAMED_COLORS_HEX = {
+  // Basic colors
+  black: "000000",
+  white: "ffffff",
+  red: "ff0000",
+  green: "008000",
+  blue: "0000ff",
+  yellow: "ffff00",
+  cyan: "00ffff",
+  magenta: "ff00ff",
+  // Extended colors
+  orange: "ffa500",
+  pink: "ffc0cb",
+  purple: "800080",
+  violet: "ee82ee",
+  brown: "a52a2a",
+  gray: "808080",
+  grey: "808080",
+  // Light variants
+  lightblue: "add8e6",
+  lightgreen: "90ee90",
+  lightgray: "d3d3d3",
+  lightgrey: "d3d3d3",
+  lightpink: "ffb6c1",
+  lightyellow: "ffffe0",
+  // Dark variants
+  darkblue: "00008b",
+  darkgreen: "006400",
+  darkgray: "a9a9a9",
+  darkgrey: "a9a9a9",
+  darkred: "8b0000",
+  // Other common colors
+  navy: "000080",
+  teal: "008080",
+  maroon: "800000",
+  olive: "808000",
+  silver: "c0c0c0",
+  aqua: "00ffff",
+  fuchsia: "ff00ff",
+  lime: "00ff00",
+  coral: "ff7f50",
+  salmon: "fa8072",
+  gold: "ffd700",
+  indigo: "4b0082",
+  crimson: "dc143c",
+  tomato: "ff6347",
+  chocolate: "d2691e",
+  tan: "d2b48c",
+  beige: "f5f5dc",
+  ivory: "fffff0",
+  khaki: "f0e68c",
+  lavender: "e6e6fa",
+  plum: "dda0dd",
+  orchid: "da70d6",
+  turquoise: "40e0d0",
+  skyblue: "87ceeb",
+  steelblue: "4682b4",
+  slategray: "708090",
+  slategrey: "708090"
+};
 function ptToTwips(ptValue) {
   return Math.round(ptValue * PT_TO_TWIPS);
 }
-function stripHashFromColor(color) {
-  return color.replace(/^#/, "");
+function colorToHexWithoutHash(color) {
+  const trimmed = color.trim();
+  const lowerColor = trimmed.toLowerCase();
+  if (CSS_NAMED_COLORS_HEX[lowerColor]) {
+    return CSS_NAMED_COLORS_HEX[lowerColor];
+  }
+  return trimmed.replace(/^#/, "");
 }
 function parseFontSizeToPoints(fontSize) {
   if (typeof fontSize === "number") {
@@ -503,7 +701,7 @@ function marksToRunProperties(marks) {
           underlineAttrs["w:val"] = "single";
         }
         if (attrs.underlineColor) {
-          underlineAttrs["w:color"] = stripHashFromColor(String(attrs.underlineColor));
+          underlineAttrs["w:color"] = colorToHexWithoutHash(String(attrs.underlineColor));
         }
         if (Object.keys(underlineAttrs).length > 0) {
           runProperties.underline = underlineAttrs;
@@ -526,7 +724,7 @@ function marksToRunProperties(marks) {
       case "textStyle": {
         if (attrs.color != null) {
           runProperties.color = {
-            val: stripHashFromColor(String(attrs.color))
+            val: colorToHexWithoutHash(String(attrs.color))
           };
         }
         if (attrs.fontSize != null) {
@@ -584,8 +782,17 @@ function collectMarksFromRunChildren(runNode) {
   return Array.from(marksByType.values());
 }
 function normalizeNode(node) {
+  if (node.type === "text" && node.marks && Array.isArray(node.marks)) {
+    const normalizedMarks = normalizeMarksForRendering(node.marks);
+    return {
+      ...node,
+      marks: normalizedMarks
+    };
+  }
   if (node.type === "run") {
-    const marks = collectMarksFromRunChildren(node);
+    const normalizedContent = node.content?.map(normalizeNode);
+    const normalizedNode = { ...node, content: normalizedContent };
+    const marks = collectMarksFromRunChildren(normalizedNode);
     if (marks.length > 0) {
       const runPropsFromMarks = marksToRunProperties(marks);
       const existingRunProps = node.attrs?.runProperties || {};
@@ -594,15 +801,14 @@ function normalizeNode(node) {
         ...runPropsFromMarks
       };
       return {
-        ...node,
+        ...normalizedNode,
         attrs: {
-          ...node.attrs,
+          ...normalizedNode.attrs,
           runProperties: mergedRunProps
-        },
-        // Also recursively process children (though runs usually just have text)
-        content: node.content?.map(normalizeNode)
+        }
       };
     }
+    return normalizedNode;
   }
   if (node.content && Array.isArray(node.content)) {
     return {
@@ -1303,44 +1509,6 @@ function groupReplacements(changes) {
   }
   return result;
 }
-function createTrackInsertMark(author = DEFAULT_AUTHOR, id) {
-  return {
-    type: "trackInsert",
-    attrs: {
-      id: id ?? uuid.v4(),
-      author: author.name,
-      authorEmail: author.email,
-      authorImage: "",
-      date: (/* @__PURE__ */ new Date()).toISOString()
-    }
-  };
-}
-function createTrackDeleteMark(author = DEFAULT_AUTHOR, id) {
-  return {
-    type: "trackDelete",
-    attrs: {
-      id: id ?? uuid.v4(),
-      author: author.name,
-      authorEmail: author.email,
-      authorImage: "",
-      date: (/* @__PURE__ */ new Date()).toISOString()
-    }
-  };
-}
-function createTrackFormatMark(before, after, author = DEFAULT_AUTHOR) {
-  return {
-    type: "trackFormat",
-    attrs: {
-      id: uuid.v4(),
-      author: author.name,
-      authorEmail: author.email,
-      authorImage: "",
-      date: (/* @__PURE__ */ new Date()).toISOString(),
-      before,
-      after
-    }
-  };
-}
 
 // src/services/nodeAligner.ts
 init_nodeFingerprint();
@@ -1569,7 +1737,8 @@ function createInsertedTextNodes(text, posB, spansB, author, replacementId) {
     }
     if (span.relEnd > span.relStart) {
       const spanText = text.substring(span.relStart, span.relEnd);
-      const marks = [...span.marks, trackMark];
+      const normalizedSpanMarks = normalizeMarksForRendering(span.marks);
+      const marks = [...normalizedSpanMarks, trackMark];
       result.push({
         type: "text",
         text: spanText,
@@ -1677,7 +1846,8 @@ function mergeDocuments(docA, docB, diffResult, author = DEFAULT_AUTHOR) {
               currentFormatChange.after,
               author
             );
-            marks = [...currentFormatChange.after, trackFormatMark];
+            const normalizedAfterMarks = normalizeMarksForRendering(currentFormatChange.after);
+            marks = [...normalizedAfterMarks, trackFormatMark];
           }
         }
         result.push({
@@ -2266,9 +2436,10 @@ function cloneNode2(node) {
 }
 function markAllTextAsInserted(node, sharedId, author) {
   if (node.type === "text") {
+    const existingMarks = normalizeMarksForRendering(node.marks || []);
     return {
       ...node,
-      marks: [...node.marks || [], createTrackInsertMark(author, sharedId)]
+      marks: [...existingMarks, createTrackInsertMark(author, sharedId)]
     };
   }
   if (node.content && Array.isArray(node.content)) {
@@ -2283,9 +2454,10 @@ function markAllTextAsInserted(node, sharedId, author) {
 }
 function markAllTextAsDeleted(node, sharedId, author) {
   if (node.type === "text") {
+    const existingMarks = normalizeMarksForRendering(node.marks || []);
     return {
       ...node,
-      marks: [...node.marks || [], createTrackDeleteMark(author, sharedId)]
+      marks: [...existingMarks, createTrackDeleteMark(author, sharedId)]
     };
   }
   if (node.content && Array.isArray(node.content)) {
@@ -3546,9 +3718,10 @@ var DocxDiffEditor_default = DocxDiffEditor;
 init_nodeFingerprint();
 function markAllTextAsInserted2(node, sharedId, author) {
   if (node.type === "text") {
+    const existingMarks = normalizeMarksForRendering(node.marks || []);
     return {
       ...node,
-      marks: [...node.marks || [], createTrackInsertMark(author, sharedId)]
+      marks: [...existingMarks, createTrackInsertMark(author, sharedId)]
     };
   }
   if (node.content && Array.isArray(node.content)) {
@@ -3563,9 +3736,10 @@ function markAllTextAsInserted2(node, sharedId, author) {
 }
 function markAllTextAsDeleted2(node, sharedId, author) {
   if (node.type === "text") {
+    const existingMarks = normalizeMarksForRendering(node.marks || []);
     return {
       ...node,
-      marks: [...node.marks || [], createTrackDeleteMark(author, sharedId)]
+      marks: [...existingMarks, createTrackDeleteMark(author, sharedId)]
     };
   }
   if (node.content && Array.isArray(node.content)) {