@harbour-enterprises/superdoc 0.24.0 → 0.25.0-next.2

package/dist/chunks/{super-editor.es-BKZvTraR.cjs → super-editor.es-B-E_YaLO.cjs}

@@ -35141,7 +35141,7 @@ const _SuperConverter = class _SuperConverter2 {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.23.0") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.24.0") {
     return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
   }
   /**
@@ -49354,7 +49354,7 @@ const markInsertion = ({ tr, from: from2, to, user, date }) => {
   });
   return insertionMark;
 };
-const markDeletion = ({ tr, from: from2, to, user, date }) => {
+const markDeletion = ({ tr, from: from2, to, user, date, id: providedId }) => {
   let trackedMark = findTrackedMarkBetween({
     tr,
     from: from2,
@@ -49363,7 +49363,9 @@ const markDeletion = ({ tr, from: from2, to, user, date }) => {
     attrs: { authorEmail: user.email }
   });
   let id;
-  if (trackedMark) {
+  if (providedId) {
+    id = providedId;
+  } else if (trackedMark) {
     id = trackedMark.mark.attrs.id;
   } else {
     id = v4();
@@ -50635,7 +50637,8 @@ const replaceStep = ({ state: state2, tr, step, newTr, map: map22, user, date, o
       from: step.from,
       to: step.to,
       user,
-      date
+      date,
+      id: meta.insertedMark?.attrs?.id
     });
     meta.deletionNodes = deletionNodes;
     meta.deletionMark = deletionMark2;
@@ -52563,7 +52566,8 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       customUpdatedFiles: {},
       isHeaderFooterChanged: false,
       isCustomXmlChanged: false,
-      focusTarget: null
+      focusTarget: null,
+      permissionResolver: null
     });
     __privateMethod$1(this, _Editor_instances, initContainerElement_fn).call(this, options);
     __privateMethod$1(this, _Editor_instances, checkHeadless_fn).call(this, options);
@@ -53325,7 +53329,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * @returns {Object | void} Migration results
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "0.23.0");
+    console.debug("[checkVersionMigrations] Current editor version", "0.24.0");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -67321,11 +67325,105 @@ const TrackFormat = Mark2.create({
     return ["span", Attribute2.mergeAttributes(this.options.htmlAttributes, htmlAttributes), 0];
   }
 });
+const PERMISSION_MAP = {
+  accept: {
+    own: "RESOLVE_OWN",
+    other: "RESOLVE_OTHER"
+  },
+  reject: {
+    own: "REJECT_OWN",
+    other: "REJECT_OTHER"
+  }
+};
+const buildKey = (change) => {
+  const id = change.mark?.attrs?.id ?? `${change.from}-${change.to}`;
+  return `${id}:${change.mark?.type?.name ?? "unknown"}`;
+};
+const mergeChange = (bucket, change) => {
+  const key2 = buildKey(change);
+  const existing = bucket.get(key2);
+  if (existing) {
+    existing.from = Math.min(existing.from, change.from);
+    existing.to = Math.max(existing.to, change.to);
+    existing.segments.push({ from: change.from, to: change.to });
+  } else {
+    bucket.set(key2, {
+      id: change.mark?.attrs?.id ?? null,
+      type: change.mark?.type?.name ?? null,
+      attrs: { ...change.mark?.attrs ?? {} },
+      from: change.from,
+      to: change.to,
+      segments: [{ from: change.from, to: change.to }]
+    });
+  }
+};
+const collectTrackedChanges = ({ state: state2, from: from2, to }) => {
+  if (!state2) return [];
+  const collapsed = from2 === to;
+  const changes = getTrackChanges(state2);
+  if (!changes?.length) return [];
+  const bucket = /* @__PURE__ */ new Map();
+  changes.forEach((change) => {
+    const overlaps = collapsed ? change.from <= from2 && change.to >= from2 : change.from < to && change.to > from2;
+    if (!overlaps) return;
+    mergeChange(bucket, change);
+  });
+  return Array.from(bucket.values());
+};
+const derivePermissionKey = ({ action, isOwn }) => {
+  const mapping = PERMISSION_MAP[action];
+  if (!mapping) return null;
+  return isOwn ? mapping.own : mapping.other;
+};
+const resolveChanges = (editor) => {
+  if (!editor) return { role: "editor", isInternal: false, currentUser: null, resolver: null };
+  const role = editor.options?.role ?? "editor";
+  const isInternal = Boolean(editor.options?.isInternal);
+  const currentUser = editor.options?.user ?? null;
+  const resolver = editor.options?.permissionResolver;
+  return { role, isInternal, currentUser, resolver };
+};
+const isTrackedChangeActionAllowed = ({ editor, action, trackedChanges }) => {
+  if (!trackedChanges?.length) return true;
+  const { role, isInternal, currentUser, resolver } = resolveChanges(editor);
+  if (typeof resolver !== "function") return true;
+  const currentEmail = currentUser?.email ?? null;
+  return trackedChanges.every((change) => {
+    const authorEmail = change.attrs?.authorEmail ?? null;
+    const isOwn = Boolean(currentEmail && authorEmail && currentEmail === authorEmail);
+    const permission = derivePermissionKey({ action, isOwn });
+    if (!permission) return true;
+    const payload = {
+      permission,
+      role,
+      isInternal,
+      trackedChange: {
+        id: change.id,
+        type: change.type,
+        attrs: change.attrs,
+        from: change.from,
+        to: change.to,
+        segments: change.segments,
+        commentId: change.id
+      },
+      comment: change.comment ?? null
+    };
+    return resolver(payload) !== false;
+  });
+};
+const collectTrackedChangesForContext = ({ state: state2, pos, trackedChangeId }) => {
+  if (pos == null) return [];
+  const changes = collectTrackedChanges({ state: state2, from: pos, to: pos });
+  if (!trackedChangeId) return changes;
+  return changes.filter((change) => change.id === trackedChangeId);
+};
 const TrackChanges = Extension.create({
   name: "trackChanges",
   addCommands() {
     return {
-      acceptTrackedChangesBetween: (from2, to) => ({ state: state2, dispatch }) => {
+      acceptTrackedChangesBetween: (from2, to) => ({ state: state2, dispatch, editor }) => {
+        const trackedChanges = collectTrackedChanges({ state: state2, from: from2, to });
+        if (!isTrackedChangeActionAllowed({ editor, action: "accept", trackedChanges })) return false;
         let { tr, doc: doc2 } = state2;
         tr.setMeta("acceptReject", true);
         const map22 = new Mapping();
@@ -67363,7 +67461,9 @@ const TrackChanges = Extension.create({
         }
         return true;
       },
-      rejectTrackedChangesBetween: (from2, to) => ({ state: state2, dispatch }) => {
+      rejectTrackedChangesBetween: (from2, to) => ({ state: state2, dispatch, editor }) => {
+        const trackedChanges = collectTrackedChanges({ state: state2, from: from2, to });
+        if (!isTrackedChangeActionAllowed({ editor, action: "reject", trackedChanges })) return false;
         const { tr, doc: doc2 } = state2;
         tr.setMeta("acceptReject", true);
         const map22 = new Mapping();
@@ -83786,7 +83886,7 @@ var __accessCheck = (obj, member, msg2) => member.has(obj) || __typeError("Canno
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 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 _SuperToolbar_instances, initToolbarGroups_fn, _interceptedCommands, makeToolbarItems_fn, initDefaultFonts_fn, updateHighlightColors_fn, deactivateAll_fn, updateToolbarHistory_fn, runCommandWithArgumentOnly_fn;
+var _SuperToolbar_instances, initToolbarGroups_fn, _interceptedCommands, makeToolbarItems_fn, initDefaultFonts_fn, updateHighlightColors_fn, deactivateAll_fn, updateToolbarHistory_fn, enrichTrackedChanges_fn, runCommandWithArgumentOnly_fn;
 var eventemitter3 = { exports: {} };
 var hasRequiredEventemitter3;
 function requireEventemitter3() {
@@ -83838,7 +83938,7 @@ function requireEventemitter3() {
       var evt = prefix2 ? prefix2 + event : event, handlers2 = this._events[evt];
       if (!handlers2) return [];
       if (handlers2.fn) return [handlers2.fn];
-      for (var i2 = 0, l22 = handlers2.length, ee = new Array(l22); i2 < l22; i2++) {
+      for (var i2 = 0, l3 = handlers2.length, ee = new Array(l3); i2 < l3; i2++) {
         ee[i2] = handlers2[i2].fn;
       }
       return ee;
@@ -84994,18 +85094,18 @@ const _sfc_main$7 = {
         }, [
           (vue.openBlock(), vue.createElementBlock(vue.Fragment, null, vue.renderList(5, (i2) => {
             return vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: i2 }, [
-              (vue.openBlock(), vue.createElementBlock(vue.Fragment, null, vue.renderList(5, (n2) => {
+              (vue.openBlock(), vue.createElementBlock(vue.Fragment, null, vue.renderList(5, (n) => {
                 return vue.createBaseVNode("div", {
                   class: "toolbar-table-grid__item",
-                  key: `${i2}_${n2}`,
-                  "data-cols": n2,
+                  key: `${i2}_${n}`,
+                  "data-cols": n,
                   "data-rows": i2,
                   "data-item": "true",
                   ref_for: true,
                   ref_key: "tableGridItems",
                   ref: tableGridItems,
-                  onKeydown: vue.withModifiers((event) => handleKeyDown2(event, n2, i2), ["prevent"]),
-                  onClick: vue.withModifiers(($event) => handleClick2({ cols: n2, rows: i2 }), ["stop", "prevent"])
+                  onKeydown: vue.withModifiers((event) => handleKeyDown2(event, n, i2), ["prevent"]),
+                  onClick: vue.withModifiers(($event) => handleClick2({ cols: n, rows: i2 }), ["stop", "prevent"])
                 }, null, 40, _hoisted_1$6);
               }), 64))
             ], 64);
@@ -86740,10 +86840,31 @@ class SuperToolbar extends EventEmitter2 {
       __privateMethod(this, _SuperToolbar_instances, deactivateAll_fn).call(this);
       return;
     }
+    const { state: state2 } = this.activeEditor;
+    const selection = state2.selection;
+    const selectionTrackedChanges = __privateMethod(this, _SuperToolbar_instances, enrichTrackedChanges_fn).call(this, collectTrackedChanges({ state: state2, from: selection.from, to: selection.to }));
+    const hasTrackedChanges = selectionTrackedChanges.length > 0;
+    const hasValidSelection = hasTrackedChanges;
+    const canAcceptTrackedChanges = hasValidSelection && isTrackedChangeActionAllowed({
+      editor: this.activeEditor,
+      action: "accept",
+      trackedChanges: selectionTrackedChanges
+    });
+    const canRejectTrackedChanges = hasValidSelection && isTrackedChangeActionAllowed({
+      editor: this.activeEditor,
+      action: "reject",
+      trackedChanges: selectionTrackedChanges
+    });
     const marks = getActiveFormatting(this.activeEditor);
     const inTable = isInTable$1(this.activeEditor.state);
     this.toolbarItems.forEach((item) => {
       item.resetDisabled();
+      if (item.name.value === "acceptTrackedChangeBySelection") {
+        item.setDisabled(!canAcceptTrackedChanges);
+      }
+      if (item.name.value === "rejectTrackedChangeOnSelection") {
+        item.setDisabled(!canRejectTrackedChanges);
+      }
       if (item.name.value === "linkedStyles") {
         if (this.activeEditor && !getQuickFormatList(this.activeEditor).length) {
           return item.deactivate();
@@ -86916,6 +87037,19 @@ updateToolbarHistory_fn = function() {
     this.redoDepth = redoDepth(this.activeEditor.state);
   }
 };
+enrichTrackedChanges_fn = function(trackedChanges = []) {
+  if (!trackedChanges?.length) return trackedChanges;
+  const store = this.superdoc?.commentsStore;
+  if (!store?.getComment) return trackedChanges;
+  return trackedChanges.map((change) => {
+    const commentId = change.id;
+    if (!commentId) return change;
+    const storeComment = store.getComment(commentId);
+    if (!storeComment) return change;
+    const comment = typeof storeComment.getValues === "function" ? storeComment.getValues() : storeComment;
+    return { ...change, comment };
+  });
+};
 runCommandWithArgumentOnly_fn = function({ item, argument, noArgumentCallback = false }, callback) {
   if (!argument || !this.activeEditor) return;
   let command2 = item.command;
@@ -87320,6 +87454,7 @@ async function getEditorContext(editor, event) {
     state2.selection.$head.marks().forEach((mark) => activeMarks.push(mark.type.name));
   }
   const isTrackedChange = activeMarks.includes("trackInsert") || activeMarks.includes("trackDelete") || activeMarks.includes("trackFormat");
+  const trackedChanges = event ? collectTrackedChangesForContext({ state: state2, pos, trackedChangeId }) : collectTrackedChanges({ state: state2, from: from2, to });
   const cursorCoords = pos ? view.coordsAtPos(pos) : null;
   const cursorPosition = cursorCoords ? {
     x: cursorCoords.left,
@@ -87353,7 +87488,9 @@ async function getEditorContext(editor, event) {
     event,
     trigger: event ? "click" : "slash",
     // Editor reference for advanced use cases
-    editor
+    editor,
+    // Tracked change metadata
+    trackedChanges
   };
   return context;
 }
@@ -87450,6 +87587,14 @@ const shouldShowItem = (item, context) => {
     }
   }
 };
+const canPerformTrackedChange = (context, action) => {
+  if (!context?.editor) return true;
+  return isTrackedChangeActionAllowed({
+    editor: context.editor,
+    action,
+    trackedChanges: context.trackedChanges ?? []
+  });
+};
 function getItems(context, customItems = [], includeDefaultItems = true) {
   const { selectedText, editor } = context;
   if (arguments.length === 1 && editor?.options?.slashMenuConfig) {
@@ -87507,7 +87652,7 @@ function getItems(context, customItems = [], includeDefaultItems = true) {
           },
           showWhen: (context2) => {
             const { trigger: trigger2, isTrackedChange } = context2;
-            return trigger2 === TRIGGERS.click && isTrackedChange;
+            return trigger2 === TRIGGERS.click && isTrackedChange && canPerformTrackedChange(context2, "accept");
           }
         },
         {
@@ -87524,7 +87669,7 @@ function getItems(context, customItems = [], includeDefaultItems = true) {
           },
           showWhen: (context2) => {
             const { trigger: trigger2, isTrackedChange } = context2;
-            return trigger2 === TRIGGERS.click && isTrackedChange;
+            return trigger2 === TRIGGERS.click && isTrackedChange && canPerformTrackedChange(context2, "reject");
           }
         }
       ]

package/dist/chunks/{super-editor.es-Dz7y81Yr.es.js → super-editor.es-BePxEtE8.es.js}

@@ -35124,7 +35124,7 @@ const _SuperConverter = class _SuperConverter2 {
   static getStoredSuperdocVersion(docx) {
     return _SuperConverter2.getStoredCustomProperty(docx, "SuperdocVersion");
   }
-  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.23.0") {
+  static setStoredSuperdocVersion(docx = this.convertedXml, version2 = "0.24.0") {
     return _SuperConverter2.setStoredCustomProperty(docx, "SuperdocVersion", version2, false);
   }
   /**
@@ -49337,7 +49337,7 @@ const markInsertion = ({ tr, from: from2, to, user, date }) => {
   });
   return insertionMark;
 };
-const markDeletion = ({ tr, from: from2, to, user, date }) => {
+const markDeletion = ({ tr, from: from2, to, user, date, id: providedId }) => {
   let trackedMark = findTrackedMarkBetween({
     tr,
     from: from2,
@@ -49346,7 +49346,9 @@ const markDeletion = ({ tr, from: from2, to, user, date }) => {
     attrs: { authorEmail: user.email }
   });
   let id;
-  if (trackedMark) {
+  if (providedId) {
+    id = providedId;
+  } else if (trackedMark) {
     id = trackedMark.mark.attrs.id;
   } else {
     id = v4();
@@ -50618,7 +50620,8 @@ const replaceStep = ({ state: state2, tr, step, newTr, map: map22, user, date, o
       from: step.from,
       to: step.to,
       user,
-      date
+      date,
+      id: meta.insertedMark?.attrs?.id
     });
     meta.deletionNodes = deletionNodes;
     meta.deletionMark = deletionMark2;
@@ -52546,7 +52549,8 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
       customUpdatedFiles: {},
       isHeaderFooterChanged: false,
       isCustomXmlChanged: false,
-      focusTarget: null
+      focusTarget: null,
+      permissionResolver: null
     });
     __privateMethod$1(this, _Editor_instances, initContainerElement_fn).call(this, options);
     __privateMethod$1(this, _Editor_instances, checkHeadless_fn).call(this, options);
@@ -53308,7 +53312,7 @@ const _Editor = class _Editor2 extends EventEmitter$1 {
    * @returns {Object | void} Migration results
    */
   processCollaborationMigrations() {
-    console.debug("[checkVersionMigrations] Current editor version", "0.23.0");
+    console.debug("[checkVersionMigrations] Current editor version", "0.24.0");
     if (!this.options.ydoc) return;
     const metaMap = this.options.ydoc.getMap("meta");
     let docVersion = metaMap.get("version");
@@ -67304,11 +67308,105 @@ const TrackFormat = Mark2.create({
     return ["span", Attribute2.mergeAttributes(this.options.htmlAttributes, htmlAttributes), 0];
   }
 });
+const PERMISSION_MAP = {
+  accept: {
+    own: "RESOLVE_OWN",
+    other: "RESOLVE_OTHER"
+  },
+  reject: {
+    own: "REJECT_OWN",
+    other: "REJECT_OTHER"
+  }
+};
+const buildKey = (change) => {
+  const id = change.mark?.attrs?.id ?? `${change.from}-${change.to}`;
+  return `${id}:${change.mark?.type?.name ?? "unknown"}`;
+};
+const mergeChange = (bucket, change) => {
+  const key2 = buildKey(change);
+  const existing = bucket.get(key2);
+  if (existing) {
+    existing.from = Math.min(existing.from, change.from);
+    existing.to = Math.max(existing.to, change.to);
+    existing.segments.push({ from: change.from, to: change.to });
+  } else {
+    bucket.set(key2, {
+      id: change.mark?.attrs?.id ?? null,
+      type: change.mark?.type?.name ?? null,
+      attrs: { ...change.mark?.attrs ?? {} },
+      from: change.from,
+      to: change.to,
+      segments: [{ from: change.from, to: change.to }]
+    });
+  }
+};
+const collectTrackedChanges = ({ state: state2, from: from2, to }) => {
+  if (!state2) return [];
+  const collapsed = from2 === to;
+  const changes = getTrackChanges(state2);
+  if (!changes?.length) return [];
+  const bucket = /* @__PURE__ */ new Map();
+  changes.forEach((change) => {
+    const overlaps = collapsed ? change.from <= from2 && change.to >= from2 : change.from < to && change.to > from2;
+    if (!overlaps) return;
+    mergeChange(bucket, change);
+  });
+  return Array.from(bucket.values());
+};
+const derivePermissionKey = ({ action, isOwn }) => {
+  const mapping = PERMISSION_MAP[action];
+  if (!mapping) return null;
+  return isOwn ? mapping.own : mapping.other;
+};
+const resolveChanges = (editor) => {
+  if (!editor) return { role: "editor", isInternal: false, currentUser: null, resolver: null };
+  const role = editor.options?.role ?? "editor";
+  const isInternal = Boolean(editor.options?.isInternal);
+  const currentUser = editor.options?.user ?? null;
+  const resolver = editor.options?.permissionResolver;
+  return { role, isInternal, currentUser, resolver };
+};
+const isTrackedChangeActionAllowed = ({ editor, action, trackedChanges }) => {
+  if (!trackedChanges?.length) return true;
+  const { role, isInternal, currentUser, resolver } = resolveChanges(editor);
+  if (typeof resolver !== "function") return true;
+  const currentEmail = currentUser?.email ?? null;
+  return trackedChanges.every((change) => {
+    const authorEmail = change.attrs?.authorEmail ?? null;
+    const isOwn = Boolean(currentEmail && authorEmail && currentEmail === authorEmail);
+    const permission = derivePermissionKey({ action, isOwn });
+    if (!permission) return true;
+    const payload = {
+      permission,
+      role,
+      isInternal,
+      trackedChange: {
+        id: change.id,
+        type: change.type,
+        attrs: change.attrs,
+        from: change.from,
+        to: change.to,
+        segments: change.segments,
+        commentId: change.id
+      },
+      comment: change.comment ?? null
+    };
+    return resolver(payload) !== false;
+  });
+};
+const collectTrackedChangesForContext = ({ state: state2, pos, trackedChangeId }) => {
+  if (pos == null) return [];
+  const changes = collectTrackedChanges({ state: state2, from: pos, to: pos });
+  if (!trackedChangeId) return changes;
+  return changes.filter((change) => change.id === trackedChangeId);
+};
 const TrackChanges = Extension.create({
   name: "trackChanges",
   addCommands() {
     return {
-      acceptTrackedChangesBetween: (from2, to) => ({ state: state2, dispatch }) => {
+      acceptTrackedChangesBetween: (from2, to) => ({ state: state2, dispatch, editor }) => {
+        const trackedChanges = collectTrackedChanges({ state: state2, from: from2, to });
+        if (!isTrackedChangeActionAllowed({ editor, action: "accept", trackedChanges })) return false;
         let { tr, doc: doc2 } = state2;
         tr.setMeta("acceptReject", true);
         const map22 = new Mapping();
@@ -67346,7 +67444,9 @@ const TrackChanges = Extension.create({
         }
         return true;
       },
-      rejectTrackedChangesBetween: (from2, to) => ({ state: state2, dispatch }) => {
+      rejectTrackedChangesBetween: (from2, to) => ({ state: state2, dispatch, editor }) => {
+        const trackedChanges = collectTrackedChanges({ state: state2, from: from2, to });
+        if (!isTrackedChangeActionAllowed({ editor, action: "reject", trackedChanges })) return false;
         const { tr, doc: doc2 } = state2;
         tr.setMeta("acceptReject", true);
         const map22 = new Mapping();
@@ -83769,7 +83869,7 @@ var __accessCheck = (obj, member, msg2) => member.has(obj) || __typeError("Canno
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 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 _SuperToolbar_instances, initToolbarGroups_fn, _interceptedCommands, makeToolbarItems_fn, initDefaultFonts_fn, updateHighlightColors_fn, deactivateAll_fn, updateToolbarHistory_fn, runCommandWithArgumentOnly_fn;
+var _SuperToolbar_instances, initToolbarGroups_fn, _interceptedCommands, makeToolbarItems_fn, initDefaultFonts_fn, updateHighlightColors_fn, deactivateAll_fn, updateToolbarHistory_fn, enrichTrackedChanges_fn, runCommandWithArgumentOnly_fn;
 var eventemitter3 = { exports: {} };
 var hasRequiredEventemitter3;
 function requireEventemitter3() {
@@ -83821,7 +83921,7 @@ function requireEventemitter3() {
       var evt = prefix2 ? prefix2 + event : event, handlers2 = this._events[evt];
       if (!handlers2) return [];
       if (handlers2.fn) return [handlers2.fn];
-      for (var i2 = 0, l22 = handlers2.length, ee = new Array(l22); i2 < l22; i2++) {
+      for (var i2 = 0, l3 = handlers2.length, ee = new Array(l3); i2 < l3; i2++) {
         ee[i2] = handlers2[i2].fn;
       }
       return ee;
@@ -84977,18 +85077,18 @@ const _sfc_main$7 = {
         }, [
           (openBlock(), createElementBlock(Fragment$1, null, renderList(5, (i2) => {
             return openBlock(), createElementBlock(Fragment$1, { key: i2 }, [
-              (openBlock(), createElementBlock(Fragment$1, null, renderList(5, (n2) => {
+              (openBlock(), createElementBlock(Fragment$1, null, renderList(5, (n) => {
                 return createBaseVNode("div", {
                   class: "toolbar-table-grid__item",
-                  key: `${i2}_${n2}`,
-                  "data-cols": n2,
+                  key: `${i2}_${n}`,
+                  "data-cols": n,
                   "data-rows": i2,
                   "data-item": "true",
                   ref_for: true,
                   ref_key: "tableGridItems",
                   ref: tableGridItems,
-                  onKeydown: withModifiers((event) => handleKeyDown2(event, n2, i2), ["prevent"]),
-                  onClick: withModifiers(($event) => handleClick2({ cols: n2, rows: i2 }), ["stop", "prevent"])
+                  onKeydown: withModifiers((event) => handleKeyDown2(event, n, i2), ["prevent"]),
+                  onClick: withModifiers(($event) => handleClick2({ cols: n, rows: i2 }), ["stop", "prevent"])
                 }, null, 40, _hoisted_1$6);
               }), 64))
             ], 64);
@@ -86723,10 +86823,31 @@ class SuperToolbar extends EventEmitter2 {
       __privateMethod(this, _SuperToolbar_instances, deactivateAll_fn).call(this);
       return;
     }
+    const { state: state2 } = this.activeEditor;
+    const selection = state2.selection;
+    const selectionTrackedChanges = __privateMethod(this, _SuperToolbar_instances, enrichTrackedChanges_fn).call(this, collectTrackedChanges({ state: state2, from: selection.from, to: selection.to }));
+    const hasTrackedChanges = selectionTrackedChanges.length > 0;
+    const hasValidSelection = hasTrackedChanges;
+    const canAcceptTrackedChanges = hasValidSelection && isTrackedChangeActionAllowed({
+      editor: this.activeEditor,
+      action: "accept",
+      trackedChanges: selectionTrackedChanges
+    });
+    const canRejectTrackedChanges = hasValidSelection && isTrackedChangeActionAllowed({
+      editor: this.activeEditor,
+      action: "reject",
+      trackedChanges: selectionTrackedChanges
+    });
     const marks = getActiveFormatting(this.activeEditor);
     const inTable = isInTable$1(this.activeEditor.state);
     this.toolbarItems.forEach((item) => {
       item.resetDisabled();
+      if (item.name.value === "acceptTrackedChangeBySelection") {
+        item.setDisabled(!canAcceptTrackedChanges);
+      }
+      if (item.name.value === "rejectTrackedChangeOnSelection") {
+        item.setDisabled(!canRejectTrackedChanges);
+      }
       if (item.name.value === "linkedStyles") {
         if (this.activeEditor && !getQuickFormatList(this.activeEditor).length) {
           return item.deactivate();
@@ -86899,6 +87020,19 @@ updateToolbarHistory_fn = function() {
     this.redoDepth = redoDepth(this.activeEditor.state);
   }
 };
+enrichTrackedChanges_fn = function(trackedChanges = []) {
+  if (!trackedChanges?.length) return trackedChanges;
+  const store = this.superdoc?.commentsStore;
+  if (!store?.getComment) return trackedChanges;
+  return trackedChanges.map((change) => {
+    const commentId = change.id;
+    if (!commentId) return change;
+    const storeComment = store.getComment(commentId);
+    if (!storeComment) return change;
+    const comment = typeof storeComment.getValues === "function" ? storeComment.getValues() : storeComment;
+    return { ...change, comment };
+  });
+};
 runCommandWithArgumentOnly_fn = function({ item, argument, noArgumentCallback = false }, callback) {
   if (!argument || !this.activeEditor) return;
   let command2 = item.command;
@@ -87303,6 +87437,7 @@ async function getEditorContext(editor, event) {
     state2.selection.$head.marks().forEach((mark) => activeMarks.push(mark.type.name));
   }
   const isTrackedChange = activeMarks.includes("trackInsert") || activeMarks.includes("trackDelete") || activeMarks.includes("trackFormat");
+  const trackedChanges = event ? collectTrackedChangesForContext({ state: state2, pos, trackedChangeId }) : collectTrackedChanges({ state: state2, from: from2, to });
   const cursorCoords = pos ? view.coordsAtPos(pos) : null;
   const cursorPosition = cursorCoords ? {
     x: cursorCoords.left,
@@ -87336,7 +87471,9 @@ async function getEditorContext(editor, event) {
     event,
     trigger: event ? "click" : "slash",
     // Editor reference for advanced use cases
-    editor
+    editor,
+    // Tracked change metadata
+    trackedChanges
   };
   return context;
 }
@@ -87433,6 +87570,14 @@ const shouldShowItem = (item, context) => {
     }
   }
 };
+const canPerformTrackedChange = (context, action) => {
+  if (!context?.editor) return true;
+  return isTrackedChangeActionAllowed({
+    editor: context.editor,
+    action,
+    trackedChanges: context.trackedChanges ?? []
+  });
+};
 function getItems(context, customItems = [], includeDefaultItems = true) {
   const { selectedText, editor } = context;
   if (arguments.length === 1 && editor?.options?.slashMenuConfig) {
@@ -87490,7 +87635,7 @@ function getItems(context, customItems = [], includeDefaultItems = true) {
           },
           showWhen: (context2) => {
             const { trigger: trigger2, isTrackedChange } = context2;
-            return trigger2 === TRIGGERS.click && isTrackedChange;
+            return trigger2 === TRIGGERS.click && isTrackedChange && canPerformTrackedChange(context2, "accept");
           }
         },
         {
@@ -87507,7 +87652,7 @@ function getItems(context, customItems = [], includeDefaultItems = true) {
           },
           showWhen: (context2) => {
             const { trigger: trigger2, isTrackedChange } = context2;
-            return trigger2 === TRIGGERS.click && isTrackedChange;
+            return trigger2 === TRIGGERS.click && isTrackedChange && canPerformTrackedChange(context2, "reject");
           }
         }
       ]

package/dist/core/SuperDoc.d.ts

@@ -134,6 +134,26 @@ export class SuperDoc extends EventEmitter<string | symbol, any> {
      * @returns {void}
      */
     togglePagination(): void;
+    /**
+     * Determine whether the current configuration allows a given permission.
+     * Used by downstream consumers (toolbar, context menu, commands) to keep
+     * tracked-change affordances consistent with customer overrides.
+     *
+     * @param {Object} params
+     * @param {string} params.permission Permission key to evaluate
+     * @param {string} [params.role=this.config.role] Role to evaluate against
+     * @param {boolean} [params.isInternal=this.config.isInternal] Internal/external flag
+     * @param {Object|null} [params.comment] Comment object (if already resolved)
+     * @param {Object|null} [params.trackedChange] Tracked change metadata (id, attrs, etc.)
+     * @returns {boolean}
+     */
+    canPerformPermission({ permission, role, isInternal, comment, trackedChange, }?: {
+        permission: string;
+        role?: string;
+        isInternal?: boolean;
+        comment?: any | null;
+        trackedChange?: any | null;
+    }): boolean;
     toolbarElement: any;
     toolbar: SuperToolbar;
     /**

package/dist/core/SuperDoc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SuperDoc.d.ts","sourceRoot":"","sources":["../../src/core/SuperDoc.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"SuperDoc.d.ts","sourceRoot":"","sources":["../../src/core/SuperDoc.js"],"names":[],"mappings":"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"}