@harbour-enterprises/superdoc 0.6.112 → 0.6.113

package/dist/super-editor/chunks/{converter-s9yhBEHO.js → converter-DcfRQ1B4.js}

@@ -15978,6 +15978,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 = [];
@@ -17270,7 +17277,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((c) => c.commentId === comment.parentCommentId);
@@ -17304,7 +17312,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;
@@ -17320,8 +17330,7 @@ const updateCommentsExtendedXml = (comments = [], commentsExtendedXml) => {
     const parentId = comment.parentCommentId;
     if (parentId) {
       const parentComment = comments.find((c) => c.commentId === parentId);
-      const parentParaId = parentComment.commentParaId;
-      attributes["w15:paraIdParent"] = parentParaId;
+      attributes["w15:paraIdParent"] = parentComment.commentParaId;
     }
     return {
       type: "element",
@@ -18132,6 +18141,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":
@@ -20222,6 +20234,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;
@@ -20235,7 +20248,7 @@ function importCommentData({ docx }) {
     const { attrs } = parsedComment[0];
     const paraId = attrs["w14:paraId"];
     return {
-      commentId: v4(),
+      commentId: internalId || v4(),
       importedId,
       creatorName: authorName,
       creatorEmail: authorEmail,
@@ -20257,14 +20270,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((c) => c.paraId === paraIdParent);
     const newComment = {
       ...comment,
-      commentId: superdocCommentId || v4(),
       isDone,
-      parentCommentId: parentComment?.id
+      parentCommentId: parentComment?.commentId
     };
     return newComment;
   });
@@ -20274,8 +20286,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));
@@ -20649,7 +20660,7 @@ const _SuperConverter = class _SuperConverter {
       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();
@@ -20925,7 +20936,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",
@@ -20997,4 +21008,4 @@ export {
   RemoveMarkStep as y,
   twipsToLines as z
 };
-//# sourceMappingURL=converter-s9yhBEHO.js.map
+//# sourceMappingURL=converter-DcfRQ1B4.js.map