@harbour-enterprises/superdoc 0.6.112 → 0.6.113

package/dist/chunks/{super-editor.es-B8fXoY6P.js → super-editor.es-C3Y2h-1x.js}

@@ -15959,6 +15959,13 @@ function isValidHexColor(color) {
       return false;
   }
 }
+const componentToHex = (val) => {
+  const a = Number(val).toString(16);
+  return a.length === 1 ? "0" + a : a;
+};
+const rgbToHex = (rgb) => {
+  return "#" + rgb.match(/\d+/g).map(componentToHex).join("");
+};
 function generateDocxRandomId(length = 8) {
   const characters = "0123456789abcdef";
   let id = [];
@@ -17251,7 +17258,8 @@ const getCommentDefinition = (comment, commentId, allComments) => {
     "w:date": toIsoNoFractional(comment.createdTime),
     "w:initials": getInitials(comment.creatorName),
     "w:done": comment.resolvedTime ? "1" : "0",
-    "w15:paraId": comment.commentParaId
+    "w15:paraId": comment.commentParaId,
+    "custom:internalId": comment.commentId || comment.internalId
   };
   if (comment?.parentCommentId) {
     const parentComment = allComments.find((c2) => c2.commentId === comment.parentCommentId);
@@ -17285,7 +17293,9 @@ const updateCommentsXml = (commentDefs = [], commentsXml) => {
       "w:id": commentDef.attributes["w:id"],
       "w:author": commentDef.attributes["w:author"],
       "w:date": commentDef.attributes["w:date"],
-      "w:initials": commentDef.attributes["w:initials"]
+      "w:initials": commentDef.attributes["w:initials"],
+      "custom:internalId": commentDef.attributes["custom:internalId"],
+      "xmlns:custom": "http://schemas.openxmlformats.org/wordprocessingml/2006/main"
     };
   });
   newCommentsXml.elements[0].elements = commentDefs;
@@ -17301,8 +17311,7 @@ const updateCommentsExtendedXml = (comments = [], commentsExtendedXml) => {
     const parentId = comment.parentCommentId;
     if (parentId) {
       const parentComment = comments.find((c2) => c2.commentId === parentId);
-      const parentParaId = parentComment.commentParaId;
-      attributes["w15:paraIdParent"] = parentParaId;
+      attributes["w15:paraIdParent"] = parentComment.commentParaId;
     }
     return {
       type: "element",
@@ -18113,6 +18122,9 @@ function translateMark(mark) {
       break;
     case "color":
       let processedColor = attrs.color.replace(/^#/, "").replace(/;$/, "");
+      if (processedColor.startsWith("rgb")) {
+        processedColor = rgbToHex(processedColor);
+      }
       markElement.attributes["w:val"] = processedColor;
       break;
     case "textAlign":
@@ -20203,6 +20215,7 @@ function importCommentData({ docx }) {
     const authorEmail = attributes["w:email"];
     const initials = attributes["w:initials"];
     const createdDate = attributes["w:date"];
+    const internalId = attributes["custom:internalId"];
     const date = new Date(createdDate);
     const unixTimestampMs = date.getTime();
     const { elements: elements2 } = el;
@@ -20216,7 +20229,7 @@ function importCommentData({ docx }) {
     const { attrs } = parsedComment[0];
     const paraId = attrs["w14:paraId"];
     return {
-      commentId: v4(),
+      commentId: internalId || v4(),
       importedId,
       creatorName: authorName,
       creatorEmail: authorEmail,
@@ -20238,14 +20251,13 @@ const generateCommentsWithExtendedData = ({ docx, comments }) => {
   return comments.map((comment) => {
     const extendedDef = commentEx.find((ce) => ce.attributes["w15:paraId"] === comment.paraId);
     if (!extendedDef) return { ...comment };
-    const { isDone, paraIdParent, superdocCommentId } = getExtendedDetails(extendedDef);
+    const { isDone, paraIdParent } = getExtendedDetails(extendedDef);
     let parentComment;
     if (paraIdParent) parentComment = comments.find((c2) => c2.paraId === paraIdParent);
     const newComment = {
       ...comment,
-      commentId: superdocCommentId || v4(),
       isDone,
-      parentCommentId: parentComment?.id
+      parentCommentId: parentComment?.commentId
     };
     return newComment;
   });
@@ -20255,8 +20267,7 @@ const getExtendedDetails = (commentEx) => {
   const paraId = attributes["w15:paraId"];
   const isDone = attributes["w15:done"] === "1" ? true : false;
   const paraIdParent = attributes["w15:paraIdParent"];
-  const superdocCommentId = attributes["w:rsid"];
-  return { paraId, isDone, paraIdParent, superdocCommentId };
+  return { paraId, isDone, paraIdParent };
 };
 const createDocumentJson = (docx, converter, editor) => {
   const json = carbonCopy(getInitialJSON(docx));
@@ -20630,7 +20641,7 @@ const _SuperConverter = class _SuperConverter2 {
       return;
     }
   }
-  static updateDocumentVersion(docx = this.convertedXml, version = "0.6.112") {
+  static updateDocumentVersion(docx = this.convertedXml, version = "0.6.113") {
     const customLocation = "docProps/custom.xml";
     if (!docx[customLocation]) {
       docx[customLocation] = generateCustomXml();
@@ -20903,7 +20914,7 @@ function storeSuperdocVersion(docx) {
 function generateCustomXml() {
   return DEFAULT_CUSTOM_XML;
 }
-function generateSuperdocVersion(pid = 2, version = "0.6.112") {
+function generateSuperdocVersion(pid = 2, version = "0.6.113") {
   return {
     type: "element",
     name: "property",
@@ -33951,10 +33962,11 @@ const prepareCommentsForExport = (doc2, tr, schema, comments = []) => {
         });
         const parentId = commentId;
         if (parentId) {
-          const childComments = comments.filter((c2) => c2.parentCommentId == parentId || c2.parentCommentId == parentId).sort((a, b) => a.createdTime - b.createdTime);
+          const childComments = comments.filter((c2) => c2.parentCommentId === parentId).sort((a, b) => a.createdTime - b.createdTime);
           childComments.forEach((c2) => {
             const childMark = getPreparedComment(c2);
             const childStartNode = schema.nodes.commentRangeStart.create(childMark);
+            seen.add(c2.commentId);
             startNodes.push({
               pos,
               node: childStartNode
@@ -35130,7 +35142,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * @returns {Y.Doc | undefined} Updated Y.Doc if any, otherwise undefined
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "0.6.112");
+    console.debug("[checkVersionMigrations] Current editor version", "0.6.113");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -58634,4 +58646,4 @@ export {
   helpers as k,
   index as l
 };
-//# sourceMappingURL=super-editor.es-B8fXoY6P.js.map
+//# sourceMappingURL=super-editor.es-C3Y2h-1x.js.map