@harbour-enterprises/superdoc 0.6.46 → 0.6.48

package/dist/super-editor/converter.es.js

@@ -1,4 +1,4 @@
-import { B } from "./chunks/converter-dVflwKUy.js";
+import { B } from "./chunks/converter-Da2eBI5z.js";
 export {
   B as SuperConverter
 };

package/dist/super-editor/docx-zipper.es.js

@@ -1,5 +1,5 @@
-import "./chunks/converter-dVflwKUy.js";
-import { D } from "./chunks/docx-zipper-Co5Kj5Y8.js";
+import "./chunks/converter-Da2eBI5z.js";
+import { D } from "./chunks/docx-zipper-7Erxkj2M.js";
 export {
   D as default
 };

package/dist/super-editor/editor.es.js

@@ -1,6 +1,6 @@
-import { E } from "./chunks/editor-CvcoDtGI.js";
-import "./chunks/converter-dVflwKUy.js";
-import "./chunks/docx-zipper-Co5Kj5Y8.js";
+import { E } from "./chunks/editor-CCtFqUDA.js";
+import "./chunks/converter-Da2eBI5z.js";
+import "./chunks/docx-zipper-7Erxkj2M.js";
 export {
   E as Editor
 };

package/dist/super-editor/extensions/comment/comments-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comments-helpers.d.ts","sourceRoot":"","sources":["../../../src/extensions/comment/comments-helpers.js"],"names":[],"mappings":"AAeO,mFAPJ;IAAuB,SAAS,EAAxB,MAAM;IACS,UAAU,EAAzB,MAAM;CACd,GAGU,IAAI,CAUhB;AAWM,oFAHI,OAAO,mBAAmB,EAAE,IAAI,SAmB1C;AAWM,8CANI,OAAO,mBAAmB,EAAE,IAAI,MAChC,OAAO,mBAAmB,EAAE,WAAW,UACvC,OAAO,mBAAmB,EAAE,MAAM,mBAEhC,IAAI,CA+DhB;AASM,oDAMN;AAWM,8CALI,OAAO,mBAAmB,EAAE,IAAI,MAChC,OAAO,mBAAmB,EAAE,WAAW,UACvC,OAAO,mBAAmB,EAAE,MAAM,GAChC,IAAI,CAgDhB"}
+{"version":3,"file":"comments-helpers.d.ts","sourceRoot":"","sources":["../../../src/extensions/comment/comments-helpers.js"],"names":[],"mappings":"AAeO,mFAPJ;IAAuB,SAAS,EAAxB,MAAM;IACS,UAAU,EAAzB,MAAM;CACd,GAGU,IAAI,CAUhB;AAWM,oFAHI,OAAO,mBAAmB,EAAE,IAAI,SAmB1C;AAWM,8CANI,OAAO,mBAAmB,EAAE,IAAI,MAChC,OAAO,mBAAmB,EAAE,WAAW,UACvC,OAAO,mBAAmB,EAAE,MAAM,mBAEhC,IAAI,CA+DhB;AASM,oDAMN;AAWM,8CALI,OAAO,mBAAmB,EAAE,IAAI,MAChC,OAAO,mBAAmB,EAAE,WAAW,UACvC,OAAO,mBAAmB,EAAE,MAAM,GAChC,IAAI,CAiDhB"}

package/dist/super-editor/file-zipper.es.js

@@ -1,4 +1,4 @@
-import { J as JSZip } from "./chunks/docx-zipper-Co5Kj5Y8.js";
+import { J as JSZip } from "./chunks/docx-zipper-7Erxkj2M.js";
 async function createZip(blobs, fileNames) {
   const zip = new JSZip();
   blobs.forEach((blob, index) => {

package/dist/super-editor/super-editor.es.js

@@ -9,13 +9,13 @@ var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read fr
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateMethod = (obj, member, method) => (__accessCheck(obj, member, "access private method"), method);
 var _interceptedCommands, _SuperToolbar_instances, makeToolbarItems_fn, initDefaultFonts_fn, updateHighlightColors_fn, deactivateAll_fn, updateToolbarHistory_fn, runCommandWithArgumentOnly_fn;
-import { _ as _export_sfc, a as getQuickFormatList, b as generateLinkedStyleString, I as ImagePlaceholderPluginKey, f as findPlaceholder, c as findParentNode, d as getActiveFormatting, i as isInTable, u as undoDepth, r as redoDepth, E as Editor, e as getStarterExtensions, P as Placeholder, h as getRichTextExtensions } from "./chunks/editor-CvcoDtGI.js";
-import { k, m, j, l } from "./chunks/editor-CvcoDtGI.js";
-import { L as getDefaultExportFromCjs, v as v4, T as TextSelection, Q as vClickOutside } from "./chunks/converter-dVflwKUy.js";
-import { B } from "./chunks/converter-dVflwKUy.js";
+import { _ as _export_sfc, a as getQuickFormatList, b as generateLinkedStyleString, I as ImagePlaceholderPluginKey, f as findPlaceholder, c as findParentNode, d as getActiveFormatting, i as isInTable, u as undoDepth, r as redoDepth, E as Editor, e as getStarterExtensions, P as Placeholder, h as getRichTextExtensions } from "./chunks/editor-CCtFqUDA.js";
+import { k, m, j, l } from "./chunks/editor-CCtFqUDA.js";
+import { L as getDefaultExportFromCjs, v as v4, T as TextSelection, Q as vClickOutside } from "./chunks/converter-Da2eBI5z.js";
+import { B } from "./chunks/converter-Da2eBI5z.js";
 import { ref, createElementBlock, openBlock, createElementVNode, unref, getCurrentInstance, computed, watch, onMounted, createCommentVNode, withDirectives, withKeys, normalizeClass, withModifiers, vModelText, createTextVNode, toDisplayString, Fragment, renderList, normalizeStyle, createVNode, h, createApp, reactive, onUnmounted, shallowRef, onBeforeUnmount, createBlock } from "vue";
-import { t as toolbarIcons, s as sanitizeNumber, T as Toolbar, N as NSkeleton } from "./chunks/toolbar-CY_a4I-4.js";
-import { D } from "./chunks/docx-zipper-Co5Kj5Y8.js";
+import { t as toolbarIcons, s as sanitizeNumber, T as Toolbar, N as NSkeleton } from "./chunks/toolbar-B-lxW404.js";
+import { D } from "./chunks/docx-zipper-7Erxkj2M.js";
 import { createZip } from "./file-zipper.es.js";
 var eventemitter3 = { exports: {} };
 (function(module) {

package/dist/super-editor/toolbar.es.js

@@ -1,6 +1,6 @@
 import "vue";
-import { T } from "./chunks/toolbar-CY_a4I-4.js";
-import "./chunks/editor-CvcoDtGI.js";
+import { T } from "./chunks/toolbar-B-lxW404.js";
+import "./chunks/editor-CCtFqUDA.js";
 export {
   T as default
 };

package/dist/super-editor.es.js

@@ -1,4 +1,4 @@
-import { _, D, E, S, a, b, c, T, d, i, g, e, f, h, j, k, l } from "./chunks/super-editor.es-DuHNfcMJ.js";
+import { _, D, E, S, a, b, c, T, d, i, g, e, f, h, j, k, l } from "./chunks/super-editor.es-p63iZpv1.js";
 import "./chunks/vue-CUQGd1xF.js";
 export {
   _ as BasicUpload,

package/dist/superdoc.es.js

@@ -1,5 +1,5 @@
-import { E as Editor, h as getRichTextExtensions, b as SuperInput, a as SuperEditor, c as SuperToolbar, d as createZip } from "./chunks/super-editor.es-DuHNfcMJ.js";
-import { S, i, k, l } from "./chunks/super-editor.es-DuHNfcMJ.js";
+import { E as Editor, h as getRichTextExtensions, b as SuperInput, a as SuperEditor, c as SuperToolbar, d as createZip } from "./chunks/super-editor.es-p63iZpv1.js";
+import { S, i, k, l } from "./chunks/super-editor.es-p63iZpv1.js";
 import { Y as effectScope, r as ref, Z as markRaw, p as process$1, _ as toRaw, a as computed, $ as isRef, a0 as isReactive, B as toRef, i as inject, l as getCurrentInstance, j as watch, v as unref, a1 as hasInjectionContext, L as reactive, R as nextTick, a2 as getCurrentScope, a3 as onScopeDispose, a4 as toRefs, g as global$1, N as shallowRef, M as readonly, f as onMounted, h as onBeforeUnmount, e as onBeforeMount, U as onActivated, m as onDeactivated, y as createTextVNode, F as Fragment, Q as Comment, k as defineComponent, C as provide, G as withDirectives, A as h, V as Teleport, S as renderSlot, W as isVNode, K as watchEffect, O as Transition, D as mergeProps, P as vShow, J as cloneVNode, T as Text, b as createElementBlock, o as openBlock, t as toDisplayString, u as createVNode, x as withCtx, E as createBaseVNode, z as normalizeStyle, s as createCommentVNode, q as createBlock, w as withModifiers, n as normalizeClass, a5 as resolveDirective, d as renderList, c as createApp, a6 as resolveDynamicComponent } from "./chunks/vue-CUQGd1xF.js";
 import { B as Buffer$2 } from "./chunks/jszip-DlHbx6j5.js";
 import { b } from "./chunks/blank-docx-BagxM198.js";
@@ -45541,7 +45541,7 @@ class SuperDoc extends EventEmitter {
     this.config.colors = shuffleArray(this.config.colors);
     this.userColorMap = /* @__PURE__ */ new Map();
     this.colorIndex = 0;
-    this.version = "0.6.46";
+    this.version = "0.6.48";
     console.debug("🦋 [superdoc] Using SuperDoc version:", this.version);
     this.superdocId = config.superdocId || v4();
     this.colors = this.config.colors;

package/dist/superdoc.umd.js

@@ -27907,7 +27907,7 @@
         return;
       }
     }
-    static updateDocumentVersion(docx = this.convertedXml, version2 = "0.6.46") {
+    static updateDocumentVersion(docx = this.convertedXml, version2 = "0.6.48") {
       const customLocation = "docProps/custom.xml";
       if (!docx[customLocation]) {
         docx[customLocation] = generateCustomXml();
@@ -28165,7 +28165,7 @@
   function generateCustomXml() {
     return DEFAULT_CUSTOM_XML;
   }
-  function generateSuperdocVersion(version2 = "0.6.46") {
+  function generateSuperdocVersion(version2 = "0.6.48") {
     return {
       type: "element",
       name: "property",
@@ -41393,19 +41393,18 @@
     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((p2) => p2["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));
@@ -41414,10 +41413,8 @@
         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");
@@ -42192,7 +42189,7 @@
      * @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");
@@ -49599,8 +49596,8 @@
           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);
@@ -49611,8 +49608,8 @@
           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);
@@ -49698,6 +49695,21 @@
       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() {
@@ -110151,7 +110163,7 @@ ${style2}
       this.config.colors = shuffleArray(this.config.colors);
       this.userColorMap = /* @__PURE__ */ new Map();
       this.colorIndex = 0;
-      this.version = "0.6.46";
+      this.version = "0.6.48";
       console.debug("🦋 [superdoc] Using SuperDoc version:", this.version);
       this.superdocId = config.superdocId || v4();
       this.colors = this.config.colors;