@harbour-enterprises/superdoc 0.6.46 → 0.6.48

package/dist/chunks/{super-editor.es-DuHNfcMJ.js → super-editor.es-p63iZpv1.js}

@@ -20570,7 +20570,7 @@ const _SuperConverter = class _SuperConverter2 {
       return;
     }
   }
-  static updateDocumentVersion(docx = this.convertedXml, version = "0.6.46") {
+  static updateDocumentVersion(docx = this.convertedXml, version = "0.6.48") {
     const customLocation = "docProps/custom.xml";
     if (!docx[customLocation]) {
       docx[customLocation] = generateCustomXml();
@@ -20828,7 +20828,7 @@ function storeSuperdocVersion(docx) {
 function generateCustomXml() {
   return DEFAULT_CUSTOM_XML;
 }
-function generateSuperdocVersion(version = "0.6.46") {
+function generateSuperdocVersion(version = "0.6.48") {
   return {
     type: "element",
     name: "property",
@@ -34056,19 +34056,18 @@ const prepareCommentsForImport = (doc2, tr, schema) => {
   doc2.descendants((node2, pos) => {
     const { type: type2 } = node2;
     if (type2.name === "commentRangeStart") {
-      const startPos = {
+      toMark.push({
         "w:id": node2.attrs["w:id"],
         internal: node2.attrs.internal,
         start: pos
-      };
-      toMark.push(startPos);
-      toDelete.push({ start: pos - 1, end: pos });
+      });
+      toDelete.push({ start: pos, end: pos + 1 });
     } else if (type2.name === "commentRangeEnd") {
       const itemToMark = toMark.find((p) => p["w:id"] === node2.attrs["w:id"]);
       if (!itemToMark) return;
       const { start: start2 } = itemToMark;
       const markAttrs = {
-        importedId: itemToMark["w:id"],
+        importedId: node2.attrs["w:id"],
         internal: itemToMark.internal
       };
       tr.addMark(start2, pos + 1, schema.marks[CommentMarkName].create(markAttrs));
@@ -34077,10 +34076,8 @@ const prepareCommentsForImport = (doc2, tr, schema) => {
       toDelete.push({ start: pos, end: pos + 1 });
     }
   });
-  toDelete.sort((a, b) => b.end - a.end).forEach((item) => {
-    const { start: start2, end: end2 } = item;
-    tr.delete(end2, end2 + 1);
-    tr.delete(start2, start2 + 1);
+  toDelete.sort((a, b) => b.start - a.start).forEach(({ start: start2, end: end2 }) => {
+    tr.delete(start2, end2);
   });
 };
 const CommentsPluginKey = new PluginKey("comments");
@@ -34855,7 +34852,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.46");
+    console.debug("[checkVersionMigrations] Current editor version", "0.6.48");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -42262,8 +42259,8 @@ const TrackChanges = Extension.create({
         return commands2.acceptTrackedChangesBetween(from2, to);
       },
       acceptTrackedChangeById: (id) => ({ state: state2, tr, commands: commands2 }) => {
-        const trackedChanges = getTrackChanges(state2, id);
-        return trackedChanges.map(({ from: from2, to }) => {
+        const toResolve = getChangesByIdToResolve(state2, id);
+        return toResolve.map(({ from: from2, to }) => {
           let mappedFrom = tr.mapping.map(from2);
           let mappedTo = tr.mapping.map(to);
           return commands2.acceptTrackedChangesBetween(mappedFrom, mappedTo);
@@ -42274,8 +42271,8 @@ const TrackChanges = Extension.create({
         return commands2.acceptTrackedChangesBetween(from2, to);
       },
       rejectTrackedChangeById: (id) => ({ state: state2, tr, commands: commands2 }) => {
-        const trackedChanges = getTrackChanges(state2, id);
-        return trackedChanges.map(({ from: from2, to }) => {
+        const toReject = getChangesByIdToResolve(state2, id);
+        return toReject.map(({ from: from2, to }) => {
           let mappedFrom = tr.mapping.map(from2);
           let mappedTo = tr.mapping.map(to);
           return commands2.rejectTrackedChangesBetween(mappedFrom, mappedTo);
@@ -42361,6 +42358,21 @@ const TrackChanges = Extension.create({
     return [TrackChangesBasePlugin()];
   }
 });
+const getChangesByIdToResolve = (state2, id) => {
+  const trackedChanges = getTrackChanges(state2);
+  const changeIndex = trackedChanges.findIndex(({ mark }) => mark.attrs.id === id);
+  if (changeIndex === -1) return;
+  const matchingChange = trackedChanges[changeIndex];
+  const prev = trackedChanges[changeIndex - 1];
+  const next = trackedChanges[changeIndex + 1];
+  let linkedChange;
+  if (prev && matchingChange.start === prev.end) {
+    linkedChange = prev;
+  } else if (next && matchingChange.end === next.start) {
+    linkedChange = next;
+  }
+  return [matchingChange, linkedChange].filter(Boolean);
+};
 const Placeholder = Extension.create({
   name: "placeholder",
   addOptions() {
@@ -58298,4 +58310,4 @@ export {
   helpers as k,
   index as l
 };
-//# sourceMappingURL=super-editor.es-DuHNfcMJ.js.map
+//# sourceMappingURL=super-editor.es-p63iZpv1.js.map