@harbour-enterprises/superdoc 0.6.46 → 0.6.48

package/dist/super-editor/chunks/{editor-CvcoDtGI.js → editor-CCtFqUDA.js}

@@ -12,9 +12,9 @@ var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "acce
 var _events, _Attribute_static, getGlobalAttributes_fn, getNodeAndMarksAttributes_fn, _Schema_static, createNodesSchema_fn, createMarksSchema_fn, _ExtensionService_instances, setupExtensions_fn, attachEditorEvents_fn, _commandService, _css, _Editor_instances, init_fn, initRichText_fn, onFocus_fn, checkHeadless_fn, insertNewFileData_fn, registerPluginByNameIfNotExists_fn, createExtensionService_fn, createCommandService_fn, createConverter_fn, initMedia_fn, createSchema_fn, generatePmData_fn, createView_fn, onCollaborationReady_fn, initComments_fn, initPagination_fn, dispatchTransaction_fn, prepareDocumentForImport_fn, prepareDocumentForExport_fn, endCollaboration_fn, _FieldAnnotationView_instances, createAnnotation_fn;
 import * as Y from "yjs";
 import { UndoManager, Item as Item$1, ContentType, Text as Text$1, XmlElement } from "yjs";
-import { P as PluginKey, a as Plugin, M as Mapping, N as NodeSelection, S as Selection, T as TextSelection, b as Slice, D as DOMSerializer, F as Fragment, c as DOMParser$1, d as Mark$1, e as dropPoint, A as AllSelection, p as process$1, f as Schema$1, g as canSplit, l as liftTarget, h as canJoin, j as joinPoint, r as replaceStep$1, R as ReplaceAroundStep, o as objectIncludes, i as ReplaceStep, k as NodeRange, m as findWrapping, n as TrackDeleteMarkName, q as TrackInsertMarkName, v as v4, s as generateDocxRandomId, t as TrackFormatMarkName, u as AddMarkStep, w as RemoveMarkStep, x as comments_module_events, y as twipsToLines, z as pixelsToTwips, B as SuperConverter, E as EditorState, C as toKebabCase, G as kebabCase, H as SelectionRange, I as Transform } from "./converter-dVflwKUy.js";
+import { P as PluginKey, a as Plugin, M as Mapping, N as NodeSelection, S as Selection, T as TextSelection, b as Slice, D as DOMSerializer, F as Fragment, c as DOMParser$1, d as Mark$1, e as dropPoint, A as AllSelection, p as process$1, f as Schema$1, g as canSplit, l as liftTarget, h as canJoin, j as joinPoint, r as replaceStep$1, R as ReplaceAroundStep, o as objectIncludes, i as ReplaceStep, k as NodeRange, m as findWrapping, n as TrackDeleteMarkName, q as TrackInsertMarkName, v as v4, s as generateDocxRandomId, t as TrackFormatMarkName, u as AddMarkStep, w as RemoveMarkStep, x as comments_module_events, y as twipsToLines, z as pixelsToTwips, B as SuperConverter, E as EditorState, C as toKebabCase, G as kebabCase, H as SelectionRange, I as Transform } from "./converter-Da2eBI5z.js";
 import { ref, computed, createElementBlock, openBlock, withModifiers, Fragment as Fragment$1, renderList, normalizeClass, toDisplayString, createApp } from "vue";
-import { D as DocxZipper } from "./docx-zipper-Co5Kj5Y8.js";
+import { D as DocxZipper } from "./docx-zipper-7Erxkj2M.js";
 function getMarksFromSelection(state) {
   const { from: from2, to, empty: empty2 } = state.selection;
   const marks = [];
@@ -10750,19 +10750,18 @@ const prepareCommentsForImport = (doc2, tr, schema) => {
   doc2.descendants((node, pos) => {
     const { type } = node;
     if (type.name === "commentRangeStart") {
-      const startPos = {
+      toMark.push({
         "w:id": node.attrs["w:id"],
         internal: node.attrs.internal,
         start: pos
-      };
-      toMark.push(startPos);
-      toDelete.push({ start: pos - 1, end: pos });
+      });
+      toDelete.push({ start: pos, end: pos + 1 });
     } else if (type.name === "commentRangeEnd") {
       const itemToMark = toMark.find((p) => p["w:id"] === node.attrs["w:id"]);
       if (!itemToMark) return;
       const { start: start2 } = itemToMark;
       const markAttrs = {
-        importedId: itemToMark["w:id"],
+        importedId: node.attrs["w:id"],
         internal: itemToMark.internal
       };
       tr.addMark(start2, pos + 1, schema.marks[CommentMarkName].create(markAttrs));
@@ -10771,10 +10770,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");
@@ -11549,7 +11546,7 @@ const _Editor = class _Editor extends EventEmitter {
    * @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");
@@ -19004,8 +19001,8 @@ const TrackChanges = Extension.create({
         return commands2.acceptTrackedChangesBetween(from2, to);
       },
       acceptTrackedChangeById: (id) => ({ state, tr, commands: commands2 }) => {
-        const trackedChanges = getTrackChanges(state, id);
-        return trackedChanges.map(({ from: from2, to }) => {
+        const toResolve = getChangesByIdToResolve(state, id);
+        return toResolve.map(({ from: from2, to }) => {
           let mappedFrom = tr.mapping.map(from2);
           let mappedTo = tr.mapping.map(to);
           return commands2.acceptTrackedChangesBetween(mappedFrom, mappedTo);
@@ -19016,8 +19013,8 @@ const TrackChanges = Extension.create({
         return commands2.acceptTrackedChangesBetween(from2, to);
       },
       rejectTrackedChangeById: (id) => ({ state, tr, commands: commands2 }) => {
-        const trackedChanges = getTrackChanges(state, id);
-        return trackedChanges.map(({ from: from2, to }) => {
+        const toReject = getChangesByIdToResolve(state, id);
+        return toReject.map(({ from: from2, to }) => {
           let mappedFrom = tr.mapping.map(from2);
           let mappedTo = tr.mapping.map(to);
           return commands2.rejectTrackedChangesBetween(mappedFrom, mappedTo);
@@ -19103,6 +19100,21 @@ const TrackChanges = Extension.create({
     return [TrackChangesBasePlugin()];
   }
 });
+const getChangesByIdToResolve = (state, id) => {
+  const trackedChanges = getTrackChanges(state);
+  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() {
@@ -22411,4 +22423,4 @@ export {
   redoDepth as r,
   undoDepth as u
 };
-//# sourceMappingURL=editor-CvcoDtGI.js.map
+//# sourceMappingURL=editor-CCtFqUDA.js.map