@harbour-enterprises/superdoc 0.6.47 → 0.6.48

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

@@ -20570,7 +20570,7 @@ const _SuperConverter = class _SuperConverter2 {
       return;
     }
   }
-  static updateDocumentVersion(docx = this.convertedXml, version = "0.6.47") {
+  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.47") {
+function generateSuperdocVersion(version = "0.6.48") {
   return {
     type: "element",
     name: "property",
@@ -34852,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.47");
+    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");
@@ -42259,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);
@@ -42271,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);
@@ -42358,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() {
@@ -58295,4 +58310,4 @@ export {
   helpers as k,
   index as l
 };
-//# sourceMappingURL=super-editor.es-BimqHKz4.js.map
+//# sourceMappingURL=super-editor.es-p63iZpv1.js.map