superdoc 1.17.0-next.22 → 1.17.0-next.23

package/dist/chunks/{SuperConverter-D7RZNOcI.cjs → SuperConverter-BWfgkSkt.cjs}

@@ -37016,7 +37016,7 @@ var SuperConverter = class SuperConverter {
 	static getStoredSuperdocVersion(docx) {
 		return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
 	}
-	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.22") {
+	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.23") {
 		return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
 	}
 	static generateWordTimestamp() {

package/dist/chunks/{SuperConverter-Da2sHpq1.es.js → SuperConverter-oE8-K6ec.es.js}

@@ -36996,7 +36996,7 @@ var SuperConverter = class SuperConverter {
 	static getStoredSuperdocVersion(docx) {
 		return SuperConverter.getStoredCustomProperty(docx, "SuperdocVersion");
 	}
-	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.22") {
+	static setStoredSuperdocVersion(docx = this.convertedXml, version = "1.17.0-next.23") {
 		return SuperConverter.setStoredCustomProperty(docx, "SuperdocVersion", version, false);
 	}
 	static generateWordTimestamp() {

package/dist/chunks/{src-B58kawL4.cjs → src-D9mjWvuW.cjs}

@@ -1,5 +1,5 @@
 const require_rolldown_runtime = require("./rolldown-runtime-Dp2H1eGw.cjs");
-const require_SuperConverter = require("./SuperConverter-D7RZNOcI.cjs");
+const require_SuperConverter = require("./SuperConverter-BWfgkSkt.cjs");
 const require_jszip = require("./jszip-DCT9QYaK.cjs");
 const require_uuid = require("./uuid-CHj_rjgt.cjs");
 const require_constants = require("./constants-CpniKo9Z.cjs");
@@ -261,7 +261,7 @@ var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 const COMMUNITY_LICENSE_KEY = "community-and-eval-agplv3";
 function getSuperdocVersion() {
 	try {
-		return "1.17.0-next.22";
+		return "1.17.0-next.23";
 	} catch {
 		return "unknown";
 	}
@@ -20779,7 +20779,7 @@ const canUseDOM = () => {
 		return false;
 	}
 };
-var summaryVersion = "1.17.0-next.22";
+var summaryVersion = "1.17.0-next.23";
 var nodeKeys = [
 	"group",
 	"content",
@@ -36085,7 +36085,7 @@ var Editor = class Editor extends EventEmitter$1 {
 		return migrations.length > 0;
 	}
 	processCollaborationMigrations() {
-		console.debug("[checkVersionMigrations] Current editor version", "1.17.0-next.22");
+		console.debug("[checkVersionMigrations] Current editor version", "1.17.0-next.23");
 		if (!this.options.ydoc) return;
 		let docVersion = this.options.ydoc.getMap("meta").get("version");
 		if (!docVersion) docVersion = "initial";
@@ -82833,47 +82833,73 @@ const TrackChanges = Extension.create({
 				return true;
 			},
 			rejectTrackedChangesBetween: (from$1, to) => ({ state, dispatch, editor }) => {
+				const trackedChangesInSelection = collectTrackedChanges({
+					state,
+					from: from$1,
+					to
+				});
+				const trackedChangesById = getTrackedChangesByTouchedIds(state, trackedChangesInSelection);
+				const trackedChangesWithoutId = trackedChangesInSelection.filter(({ mark }) => !mark?.attrs?.id);
+				const trackedChanges = dedupeTrackedChangeRanges([...trackedChangesById, ...trackedChangesWithoutId]);
 				if (!isTrackedChangeActionAllowed({
 					editor,
 					action: "reject",
-					trackedChanges: collectTrackedChanges({
-						state,
-						from: from$1,
-						to
-					})
+					trackedChanges
 				})) return false;
 				const { tr, doc: doc$2 } = state;
+				const rejectedChangeIds = /* @__PURE__ */ new Set();
 				tr.setMeta("inputType", "acceptReject");
 				const map$2 = new require_SuperConverter.Mapping();
-				doc$2.nodesBetween(from$1, to, (node, pos) => {
-					if (node.marks && node.marks.find((mark) => mark.type.name === "trackDelete")) {
-						const deletionMark = node.marks.find((mark) => mark.type.name === require_SuperConverter.TrackDeleteMarkName);
-						tr.step(new require_SuperConverter.RemoveMarkStep(map$2.map(Math.max(pos, from$1)), map$2.map(Math.min(pos + node.nodeSize, to)), deletionMark));
-					} else if (node.marks && node.marks.find((mark) => mark.type.name === "trackInsert")) {
-						const deletionStep = new require_SuperConverter.ReplaceStep(map$2.map(Math.max(pos, from$1)), map$2.map(Math.min(pos + node.nodeSize, to)), require_SuperConverter.Slice.empty);
-						tr.step(deletionStep);
-						map$2.appendMap(deletionStep.getMap());
-					} else if (node.marks && node.marks.find((mark) => mark.type.name === "trackFormat")) {
-						const formatChangeMark = node.marks.find((mark) => mark.type.name === require_SuperConverter.TrackFormatMarkName);
-						formatChangeMark.attrs.before.forEach((oldMark) => {
-							tr.step(new require_SuperConverter.AddMarkStep(map$2.map(Math.max(pos, from$1)), map$2.map(Math.min(pos + node.nodeSize, to)), state.schema.marks[oldMark.type].create(oldMark.attrs)));
-						});
-						formatChangeMark.attrs.after.forEach((newMark) => {
-							const mappedFrom = map$2.map(Math.max(pos, from$1));
-							const mappedTo = map$2.map(Math.min(pos + node.nodeSize, to));
-							const liveMark = findMarkInRangeBySnapshot({
-								doc: tr.doc,
-								from: mappedFrom,
-								to: mappedTo,
-								snapshot: newMark
+				trackedChanges.forEach(({ from: rangeFrom, to: rangeTo }) => {
+					doc$2.nodesBetween(rangeFrom, rangeTo, (node, pos) => {
+						if (node.marks && node.marks.find((mark) => mark.type.name === "trackDelete")) {
+							const deletionMark = node.marks.find((mark) => mark.type.name === require_SuperConverter.TrackDeleteMarkName);
+							if (deletionMark?.attrs?.id) rejectedChangeIds.add(deletionMark.attrs.id);
+							tr.step(new require_SuperConverter.RemoveMarkStep(map$2.map(Math.max(pos, rangeFrom)), map$2.map(Math.min(pos + node.nodeSize, rangeTo)), deletionMark));
+						} else if (node.marks && node.marks.find((mark) => mark.type.name === "trackInsert")) {
+							const insertionMark = node.marks.find((mark) => mark.type.name === require_SuperConverter.TrackInsertMarkName);
+							if (insertionMark?.attrs?.id) rejectedChangeIds.add(insertionMark.attrs.id);
+							const deletionStep = new require_SuperConverter.ReplaceStep(map$2.map(Math.max(pos, rangeFrom)), map$2.map(Math.min(pos + node.nodeSize, rangeTo)), require_SuperConverter.Slice.empty);
+							tr.step(deletionStep);
+							map$2.appendMap(deletionStep.getMap());
+						} else if (node.marks && node.marks.find((mark) => mark.type.name === "trackFormat")) {
+							const formatChangeMark = node.marks.find((mark) => mark.type.name === require_SuperConverter.TrackFormatMarkName);
+							if (formatChangeMark?.attrs?.id) rejectedChangeIds.add(formatChangeMark.attrs.id);
+							formatChangeMark.attrs.before.forEach((oldMark) => {
+								tr.step(new require_SuperConverter.AddMarkStep(map$2.map(Math.max(pos, rangeFrom)), map$2.map(Math.min(pos + node.nodeSize, rangeTo)), state.schema.marks[oldMark.type].create(oldMark.attrs)));
+							});
+							formatChangeMark.attrs.after.forEach((newMark) => {
+								const mappedFrom = map$2.map(Math.max(pos, rangeFrom));
+								const mappedTo = map$2.map(Math.min(pos + node.nodeSize, rangeTo));
+								const liveMark = findMarkInRangeBySnapshot({
+									doc: tr.doc,
+									from: mappedFrom,
+									to: mappedTo,
+									snapshot: newMark
+								});
+								if (!liveMark) return;
+								tr.step(new require_SuperConverter.RemoveMarkStep(mappedFrom, mappedTo, liveMark));
+							});
+							tr.step(new require_SuperConverter.RemoveMarkStep(map$2.map(Math.max(pos, rangeFrom)), map$2.map(Math.min(pos + node.nodeSize, rangeTo)), formatChangeMark));
+						}
+					});
+				});
+				if (tr.steps.length) {
+					dispatch(tr);
+					if (editor?.emit && rejectedChangeIds.size) {
+						const resolvedByEmail = editor.options?.user?.email;
+						const resolvedByName = editor.options?.user?.name;
+						rejectedChangeIds.forEach((changeId) => {
+							editor.emit("commentsUpdate", {
+								type: "trackedChange",
+								event: "resolve",
+								changeId,
+								resolvedByEmail,
+								resolvedByName
 							});
-							if (!liveMark) return;
-							tr.step(new require_SuperConverter.RemoveMarkStep(mappedFrom, mappedTo, liveMark));
 						});
-						tr.step(new require_SuperConverter.RemoveMarkStep(map$2.map(Math.max(pos, from$1)), map$2.map(Math.min(pos + node.nodeSize, to)), formatChangeMark));
 					}
-				});
-				if (tr.steps.length) dispatch(tr);
+				}
 				return true;
 			},
 			acceptTrackedChange: ({ trackedChange }) => ({ commands: commands$1 }) => {
@@ -83067,6 +83093,25 @@ const TrackChanges = Extension.create({
 		return [TrackChangesBasePlugin()];
 	}
 });
+var dedupeTrackedChangeRanges = (changes = []) => {
+	const byKey = /* @__PURE__ */ new Map();
+	changes.forEach((change) => {
+		if (!change || typeof change.from !== "number" || typeof change.to !== "number") return;
+		const type = change.mark?.type?.name || "";
+		const id = change.mark?.attrs?.id || "";
+		const key$1 = `${change.from}:${change.to}:${type}:${id}`;
+		if (!byKey.has(key$1)) byKey.set(key$1, change);
+	});
+	return Array.from(byKey.values()).sort((left$1, right$1) => {
+		if (left$1.from !== right$1.from) return left$1.from - right$1.from;
+		return left$1.to - right$1.to;
+	});
+};
+var getTrackedChangesByTouchedIds = (state, trackedChanges = []) => {
+	const touchedIds = new Set(trackedChanges.map(({ mark }) => mark?.attrs?.id).filter(Boolean));
+	if (!touchedIds.size) return trackedChanges;
+	return Array.from(touchedIds).flatMap((id) => getChangesByIdToResolve(state, id) || []);
+};
 var getChangesByIdToResolve = (state, id) => {
 	const trackedChanges = getTrackChanges(state);
 	const changeIndex = trackedChanges.findIndex(({ mark }) => mark.attrs.id === id);

package/dist/chunks/{src-nkjmbRm8.es.js → src-Dol3U5lU.es.js}

@@ -1,5 +1,5 @@
 import { a as __toCommonJS, n as __esmMin, r as __export, t as __commonJSMin } from "./rolldown-runtime-B2q5OVn9.es.js";
-import { $ as Selection, A as findChildren$1, At as DOMSerializer, B as findParentNode, C as calculateResolvedParagraphProperties, Ct as resolveTableCellProperties, D as CommandService, Dt as TrackInsertMarkName, E as generateOrderedListIndex, Et as TrackFormatMarkName, F as isNodeActive, Ft as minMax, G as cleanSchemaItem, H as defaultBlockAt$1, I as getSchemaTypeNameByName, It as callOrGet, J as AllSelection, K as getSchemaTypeByName, L as isMarkActive, Lt as getExtensionConfigField, M as findMark, Mt as Mark$1, N as getMarksFromSelection, Nt as Schema$1, O as isInTable, Ot as carbonCopy, P as isActive, Pt as Slice, Q as PluginKey, R as getMarkRange, S as isList, St as resolveRunProperties, T as docxNumberingHelpers, Tt as TrackDeleteMarkName, U as getMarkType, V as findParentNodeClosestToPos, W as getNodeType, X as NodeSelection, Y as EditorState, Z as Plugin, _ as inputRulesPlugin, _t as encodeCSSFromPPr, a as translator, at as ReplaceAroundStep$1, b as changeListLevel, bt as resolveDocxFontFamily, c as updateDOMAttributes, ct as canJoin, d as markdownToPmFragment, dt as joinPoint, et as SelectionRange, f as createDocFromHTML, ft as liftTarget, g as htmlHandler, gt as decodeRPrFromMarks, h as handleClipboardPaste, ht as generateRandomSigned32BitIntStrId, it as RemoveMarkStep, j as getActiveFormatting, jt as Fragment$1, k as posToDOMRect, kt as DOMParser$1, l as processContent, lt as canSplit, m as InputRule, mt as generateDocxRandomId, n as kebabCase$1, nt as AddMarkStep, o as _getReferencedTableStyles, ot as ReplaceStep, p as createCellBorders, pt as replaceStep$1, q as createDocument, r as insertNewRelationship, rt as Mapping, s as helpers_exports, st as Transform, t as SuperConverter, tt as TextSelection$1, u as createDocFromMarkdown, ut as dropPoint, v as unflattenListsInHtml, vt as encodeCSSFromRPr, w as getResolvedParagraphProperties, wt as getUnderlineCssString, x as updateNumberingProperties, xt as resolveParagraphProperties, y as ListHelpers, yt as encodeMarksFromRPr, z as isTextSelection } from "./SuperConverter-Da2sHpq1.es.js";
+import { $ as Selection, A as findChildren$1, At as DOMSerializer, B as findParentNode, C as calculateResolvedParagraphProperties, Ct as resolveTableCellProperties, D as CommandService, Dt as TrackInsertMarkName, E as generateOrderedListIndex, Et as TrackFormatMarkName, F as isNodeActive, Ft as minMax, G as cleanSchemaItem, H as defaultBlockAt$1, I as getSchemaTypeNameByName, It as callOrGet, J as AllSelection, K as getSchemaTypeByName, L as isMarkActive, Lt as getExtensionConfigField, M as findMark, Mt as Mark$1, N as getMarksFromSelection, Nt as Schema$1, O as isInTable, Ot as carbonCopy, P as isActive, Pt as Slice, Q as PluginKey, R as getMarkRange, S as isList, St as resolveRunProperties, T as docxNumberingHelpers, Tt as TrackDeleteMarkName, U as getMarkType, V as findParentNodeClosestToPos, W as getNodeType, X as NodeSelection, Y as EditorState, Z as Plugin, _ as inputRulesPlugin, _t as encodeCSSFromPPr, a as translator, at as ReplaceAroundStep$1, b as changeListLevel, bt as resolveDocxFontFamily, c as updateDOMAttributes, ct as canJoin, d as markdownToPmFragment, dt as joinPoint, et as SelectionRange, f as createDocFromHTML, ft as liftTarget, g as htmlHandler, gt as decodeRPrFromMarks, h as handleClipboardPaste, ht as generateRandomSigned32BitIntStrId, it as RemoveMarkStep, j as getActiveFormatting, jt as Fragment$1, k as posToDOMRect, kt as DOMParser$1, l as processContent, lt as canSplit, m as InputRule, mt as generateDocxRandomId, n as kebabCase$1, nt as AddMarkStep, o as _getReferencedTableStyles, ot as ReplaceStep, p as createCellBorders, pt as replaceStep$1, q as createDocument, r as insertNewRelationship, rt as Mapping, s as helpers_exports, st as Transform, t as SuperConverter, tt as TextSelection$1, u as createDocFromMarkdown, ut as dropPoint, v as unflattenListsInHtml, vt as encodeCSSFromRPr, w as getResolvedParagraphProperties, wt as getUnderlineCssString, x as updateNumberingProperties, xt as resolveParagraphProperties, y as ListHelpers, yt as encodeMarksFromRPr, z as isTextSelection } from "./SuperConverter-oE8-K6ec.es.js";
 import { a as init_dist$2, i as global, n as init_dist, o as Buffer$3, r as process$1, s as init_dist$1 } from "./jszip-ChlR43oI.es.js";
 import { t as v4_default } from "./uuid-2IzDu5nl.es.js";
 import { A as resolveOpcTargetPath, E as pixelsToTwips, F as twipsToLines, I as twipsToPixels, P as twipsToInches, _ as halfPointToPoints, c as convertSizeToCSS, k as ptToTwips, p as getArrayBufferFromUrl, t as COMMENT_FILE_BASENAMES, v as inchesToPixels, x as linesToTwips, y as inchesToTwips } from "./constants-DBKi0Amm.es.js";
@@ -260,7 +260,7 @@ var v_click_outside_default = {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "1.17.0-next.22";
+		return "1.17.0-next.23";
 	} catch {
 		return "unknown";
 	}
@@ -20760,7 +20760,7 @@ const canUseDOM = () => {
 		return false;
 	}
 };
-var summaryVersion = "1.17.0-next.22";
+var summaryVersion = "1.17.0-next.23";
 var nodeKeys = [
 	"group",
 	"content",
@@ -35475,7 +35475,7 @@ var Editor = class Editor extends EventEmitter$1 {
 		return migrations.length > 0;
 	}
 	processCollaborationMigrations() {
-		console.debug("[checkVersionMigrations] Current editor version", "1.17.0-next.22");
+		console.debug("[checkVersionMigrations] Current editor version", "1.17.0-next.23");
 		if (!this.options.ydoc) return;
 		let docVersion = this.options.ydoc.getMap("meta").get("version");
 		if (!docVersion) docVersion = "initial";
@@ -82191,47 +82191,73 @@ const TrackChanges = Extension.create({
 				return true;
 			},
 			rejectTrackedChangesBetween: (from$1, to) => ({ state, dispatch, editor }) => {
+				const trackedChangesInSelection = collectTrackedChanges({
+					state,
+					from: from$1,
+					to
+				});
+				const trackedChangesById = getTrackedChangesByTouchedIds(state, trackedChangesInSelection);
+				const trackedChangesWithoutId = trackedChangesInSelection.filter(({ mark }) => !mark?.attrs?.id);
+				const trackedChanges = dedupeTrackedChangeRanges([...trackedChangesById, ...trackedChangesWithoutId]);
 				if (!isTrackedChangeActionAllowed({
 					editor,
 					action: "reject",
-					trackedChanges: collectTrackedChanges({
-						state,
-						from: from$1,
-						to
-					})
+					trackedChanges
 				})) return false;
 				const { tr, doc: doc$2 } = state;
+				const rejectedChangeIds = /* @__PURE__ */ new Set();
 				tr.setMeta("inputType", "acceptReject");
 				const map$2 = new Mapping();
-				doc$2.nodesBetween(from$1, to, (node, pos) => {
-					if (node.marks && node.marks.find((mark) => mark.type.name === "trackDelete")) {
-						const deletionMark = node.marks.find((mark) => mark.type.name === TrackDeleteMarkName);
-						tr.step(new RemoveMarkStep(map$2.map(Math.max(pos, from$1)), map$2.map(Math.min(pos + node.nodeSize, to)), deletionMark));
-					} else if (node.marks && node.marks.find((mark) => mark.type.name === "trackInsert")) {
-						const deletionStep = new ReplaceStep(map$2.map(Math.max(pos, from$1)), map$2.map(Math.min(pos + node.nodeSize, to)), Slice.empty);
-						tr.step(deletionStep);
-						map$2.appendMap(deletionStep.getMap());
-					} else if (node.marks && node.marks.find((mark) => mark.type.name === "trackFormat")) {
-						const formatChangeMark = node.marks.find((mark) => mark.type.name === TrackFormatMarkName);
-						formatChangeMark.attrs.before.forEach((oldMark) => {
-							tr.step(new AddMarkStep(map$2.map(Math.max(pos, from$1)), map$2.map(Math.min(pos + node.nodeSize, to)), state.schema.marks[oldMark.type].create(oldMark.attrs)));
-						});
-						formatChangeMark.attrs.after.forEach((newMark) => {
-							const mappedFrom = map$2.map(Math.max(pos, from$1));
-							const mappedTo = map$2.map(Math.min(pos + node.nodeSize, to));
-							const liveMark = findMarkInRangeBySnapshot({
-								doc: tr.doc,
-								from: mappedFrom,
-								to: mappedTo,
-								snapshot: newMark
+				trackedChanges.forEach(({ from: rangeFrom, to: rangeTo }) => {
+					doc$2.nodesBetween(rangeFrom, rangeTo, (node, pos) => {
+						if (node.marks && node.marks.find((mark) => mark.type.name === "trackDelete")) {
+							const deletionMark = node.marks.find((mark) => mark.type.name === TrackDeleteMarkName);
+							if (deletionMark?.attrs?.id) rejectedChangeIds.add(deletionMark.attrs.id);
+							tr.step(new RemoveMarkStep(map$2.map(Math.max(pos, rangeFrom)), map$2.map(Math.min(pos + node.nodeSize, rangeTo)), deletionMark));
+						} else if (node.marks && node.marks.find((mark) => mark.type.name === "trackInsert")) {
+							const insertionMark = node.marks.find((mark) => mark.type.name === TrackInsertMarkName);
+							if (insertionMark?.attrs?.id) rejectedChangeIds.add(insertionMark.attrs.id);
+							const deletionStep = new ReplaceStep(map$2.map(Math.max(pos, rangeFrom)), map$2.map(Math.min(pos + node.nodeSize, rangeTo)), Slice.empty);
+							tr.step(deletionStep);
+							map$2.appendMap(deletionStep.getMap());
+						} else if (node.marks && node.marks.find((mark) => mark.type.name === "trackFormat")) {
+							const formatChangeMark = node.marks.find((mark) => mark.type.name === TrackFormatMarkName);
+							if (formatChangeMark?.attrs?.id) rejectedChangeIds.add(formatChangeMark.attrs.id);
+							formatChangeMark.attrs.before.forEach((oldMark) => {
+								tr.step(new AddMarkStep(map$2.map(Math.max(pos, rangeFrom)), map$2.map(Math.min(pos + node.nodeSize, rangeTo)), state.schema.marks[oldMark.type].create(oldMark.attrs)));
+							});
+							formatChangeMark.attrs.after.forEach((newMark) => {
+								const mappedFrom = map$2.map(Math.max(pos, rangeFrom));
+								const mappedTo = map$2.map(Math.min(pos + node.nodeSize, rangeTo));
+								const liveMark = findMarkInRangeBySnapshot({
+									doc: tr.doc,
+									from: mappedFrom,
+									to: mappedTo,
+									snapshot: newMark
+								});
+								if (!liveMark) return;
+								tr.step(new RemoveMarkStep(mappedFrom, mappedTo, liveMark));
+							});
+							tr.step(new RemoveMarkStep(map$2.map(Math.max(pos, rangeFrom)), map$2.map(Math.min(pos + node.nodeSize, rangeTo)), formatChangeMark));
+						}
+					});
+				});
+				if (tr.steps.length) {
+					dispatch(tr);
+					if (editor?.emit && rejectedChangeIds.size) {
+						const resolvedByEmail = editor.options?.user?.email;
+						const resolvedByName = editor.options?.user?.name;
+						rejectedChangeIds.forEach((changeId) => {
+							editor.emit("commentsUpdate", {
+								type: "trackedChange",
+								event: "resolve",
+								changeId,
+								resolvedByEmail,
+								resolvedByName
 							});
-							if (!liveMark) return;
-							tr.step(new RemoveMarkStep(mappedFrom, mappedTo, liveMark));
 						});
-						tr.step(new RemoveMarkStep(map$2.map(Math.max(pos, from$1)), map$2.map(Math.min(pos + node.nodeSize, to)), formatChangeMark));
 					}
-				});
-				if (tr.steps.length) dispatch(tr);
+				}
 				return true;
 			},
 			acceptTrackedChange: ({ trackedChange }) => ({ commands: commands$1 }) => {
@@ -82425,6 +82451,25 @@ const TrackChanges = Extension.create({
 		return [TrackChangesBasePlugin()];
 	}
 });
+var dedupeTrackedChangeRanges = (changes = []) => {
+	const byKey = /* @__PURE__ */ new Map();
+	changes.forEach((change) => {
+		if (!change || typeof change.from !== "number" || typeof change.to !== "number") return;
+		const type = change.mark?.type?.name || "";
+		const id = change.mark?.attrs?.id || "";
+		const key$1 = `${change.from}:${change.to}:${type}:${id}`;
+		if (!byKey.has(key$1)) byKey.set(key$1, change);
+	});
+	return Array.from(byKey.values()).sort((left$1, right$1) => {
+		if (left$1.from !== right$1.from) return left$1.from - right$1.from;
+		return left$1.to - right$1.to;
+	});
+};
+var getTrackedChangesByTouchedIds = (state, trackedChanges = []) => {
+	const touchedIds = new Set(trackedChanges.map(({ mark }) => mark?.attrs?.id).filter(Boolean));
+	if (!touchedIds.size) return trackedChanges;
+	return Array.from(touchedIds).flatMap((id) => getChangesByIdToResolve(state, id) || []);
+};
 var getChangesByIdToResolve = (state, id) => {
 	const trackedChanges = getTrackChanges(state);
 	const changeIndex = trackedChanges.findIndex(({ mark }) => mark.attrs.id === id);

package/dist/super-editor/converter.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("../chunks/rolldown-runtime-Dp2H1eGw.cjs");
-const require_SuperConverter = require("../chunks/SuperConverter-D7RZNOcI.cjs");
+const require_SuperConverter = require("../chunks/SuperConverter-BWfgkSkt.cjs");
 require("../chunks/jszip-DCT9QYaK.cjs");
 require("../chunks/xml-js--DznO7Gk.cjs");
 require("../chunks/constants-CpniKo9Z.cjs");

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

@@ -1,4 +1,4 @@
-import { t as SuperConverter } from "../chunks/SuperConverter-Da2sHpq1.es.js";
+import { t as SuperConverter } from "../chunks/SuperConverter-oE8-K6ec.es.js";
 import "../chunks/jszip-ChlR43oI.es.js";
 import "../chunks/xml-js-DLE8mr0n.es.js";
 import "../chunks/constants-DBKi0Amm.es.js";

package/dist/super-editor/src/extensions/track-changes/track-changes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"track-changes.d.ts","sourceRoot":"","sources":["../../../../../../super-editor/src/extensions/track-changes/track-changes.js"],"names":[],"mappings":"AAaA,mFAidG;0BA9duB,oBAAoB"}
+{"version":3,"file":"track-changes.d.ts","sourceRoot":"","sources":["../../../../../../super-editor/src/extensions/track-changes/track-changes.js"],"names":[],"mappings":"AAaA,mFA+eG;0BA5fuB,oBAAoB"}

package/dist/super-editor.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./chunks/rolldown-runtime-Dp2H1eGw.cjs");
-const require_src = require("./chunks/src-B58kawL4.cjs");
-const require_SuperConverter = require("./chunks/SuperConverter-D7RZNOcI.cjs");
+const require_src = require("./chunks/src-D9mjWvuW.cjs");
+const require_SuperConverter = require("./chunks/SuperConverter-BWfgkSkt.cjs");
 require("./chunks/jszip-DCT9QYaK.cjs");
 require("./chunks/xml-js--DznO7Gk.cjs");
 require("./chunks/constants-CpniKo9Z.cjs");

package/dist/super-editor.es.js

@@ -1,5 +1,5 @@
-import { $ as getAllowedImageDimensions, Bt as defineNode, Ht as assertNodeType, Q as trackChangesHelpers_exports, Ut as isNodeType, Vt as isMarkType, X as getRichTextExtensions, Y as AIWriter_default, Z as getStarterExtensions, a as BasicUpload_default, at as CommentsPluginKey, c as Toolbar_default, et as SectionHelpers, i as SuperEditor_default, it as AnnotatorHelpers, n as SlashMenu, nt as Editor, o as ContextMenu_default, ot as createOrUpdateTrackedChangeComment, r as SuperInput_default, rt as fieldAnnotationHelpers_exports, s as SuperToolbar, st as TrackChangesBasePluginKey, t as Extensions, tt as PresentationEditor, zt as defineMark } from "./chunks/src-nkjmbRm8.es.js";
-import { N as getMarksFromSelection, i as registeredHandlers, j as getActiveFormatting, s as helpers_exports, t as SuperConverter } from "./chunks/SuperConverter-Da2sHpq1.es.js";
+import { $ as getAllowedImageDimensions, Bt as defineNode, Ht as assertNodeType, Q as trackChangesHelpers_exports, Ut as isNodeType, Vt as isMarkType, X as getRichTextExtensions, Y as AIWriter_default, Z as getStarterExtensions, a as BasicUpload_default, at as CommentsPluginKey, c as Toolbar_default, et as SectionHelpers, i as SuperEditor_default, it as AnnotatorHelpers, n as SlashMenu, nt as Editor, o as ContextMenu_default, ot as createOrUpdateTrackedChangeComment, r as SuperInput_default, rt as fieldAnnotationHelpers_exports, s as SuperToolbar, st as TrackChangesBasePluginKey, t as Extensions, tt as PresentationEditor, zt as defineMark } from "./chunks/src-Dol3U5lU.es.js";
+import { N as getMarksFromSelection, i as registeredHandlers, j as getActiveFormatting, s as helpers_exports, t as SuperConverter } from "./chunks/SuperConverter-oE8-K6ec.es.js";
 import "./chunks/jszip-ChlR43oI.es.js";
 import "./chunks/xml-js-DLE8mr0n.es.js";
 import "./chunks/constants-DBKi0Amm.es.js";

package/dist/superdoc/src/stores/comments-store.d.ts.map

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

package/dist/superdoc.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./chunks/rolldown-runtime-Dp2H1eGw.cjs");
-const require_src = require("./chunks/src-B58kawL4.cjs");
-const require_SuperConverter = require("./chunks/SuperConverter-D7RZNOcI.cjs");
+const require_src = require("./chunks/src-D9mjWvuW.cjs");
+const require_SuperConverter = require("./chunks/SuperConverter-BWfgkSkt.cjs");
 const require_jszip = require("./chunks/jszip-DCT9QYaK.cjs");
 require("./chunks/xml-js--DznO7Gk.cjs");
 const require_uuid = require("./chunks/uuid-CHj_rjgt.cjs");
@@ -4477,6 +4477,14 @@ const useCommentsStore = defineStore("comments", () => {
 			};
 			syncCommentsToClients(superdoc, emitData);
 			debounceEmit(changeId, emitData, superdoc);
+		} else if (event === "resolve") {
+			const existingTrackedChange = commentsList.value.find((comment$1) => comment$1.commentId === changeId);
+			if (!existingTrackedChange || existingTrackedChange.resolvedTime) return;
+			existingTrackedChange.resolveComment({
+				email: params.resolvedByEmail ?? superdoc?.user?.email ?? null,
+				name: params.resolvedByName ?? superdoc?.user?.name ?? null,
+				superdoc
+			});
 		}
 	};
 	const debounceEmit = (commentId, event, superdoc, delay = 1e3) => {
@@ -4765,8 +4773,8 @@ const useCommentsStore = defineStore("comments", () => {
 		return Array.isArray(json?.content) ? json.content.filter(Boolean) : [];
 	};
 	const handleEditorLocationsUpdate = (allCommentPositions) => {
-		if ((!allCommentPositions || Object.keys(allCommentPositions).length === 0) && commentsList.value.length > 0) return;
-		editorCommentPositions.value = allCommentPositions || {};
+		if (allCommentPositions == null) return;
+		editorCommentPositions.value = allCommentPositions;
 	};
 	const clearEditorCommentPositions = () => {
 		editorCommentPositions.value = {};
@@ -20321,7 +20329,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		this.config.colors = shuffleArray(this.config.colors);
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "1.17.0-next.22";
+		this.version = "1.17.0-next.23";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || require_uuid.v4_default();
 		this.colors = this.config.colors;

package/dist/superdoc.es.js

@@ -1,5 +1,5 @@
-import { A as isMounted, At as toUint8Array, B as cNotM, C as resolveWrappedSlot, Ct as getUnixTime, D as warnOnce, Dt as readVarUint8Array, E as throwError, Et as readVarUint, F as changeColor, Ft as pow, G as ellipsis_vertical_solid_default, H as insideModal, I as c, It as v_click_outside_default, J as comment_solid_default, K as xmark_solid_default, L as cB, Lt as getFileObject, M as use_memo_default, Mt as writeVarUint8Array, N as on, Nt as create, O as useSsrAdapter, Ot as createEncoder, P as createId, Pt as min, Q as trackChangesHelpers_exports, R as cE, Rt as comments_module_events, S as configProviderInjectionKey, St as setIfUndefined, T as call, Tt as readVarString, U as insidePopover, V as createKey, W as caret_down_solid_default, X as getRichTextExtensions, Y as AIWriter_default, Z as getStarterExtensions, _ as useRtl, _t as applyAwarenessUpdate, at as CommentsPluginKey, b as useThemeClass, bt as map, ct as getTrackChanges, d as Dropdown_default, dt as toBase64, et as SectionHelpers, f as ConfigProvider_default, ft as isNode, g as _common_default$2, gt as Awareness, h as index_cssr_default$5, ht as varStorage, i as SuperEditor_default, it as AnnotatorHelpers, j as useMergedState, jt as writeVarUint, k as createInjectionKey, kt as length, l as messageApiInjectionKey, lt as createUint8ArrayFromArrayBuffer, m as use_theme_default, mt as onChange, nt as Editor, ot as createOrUpdateTrackedChangeComment, p as light_default$1, pt as offChange, q as check_solid_default, r as SuperInput_default, rt as fieldAnnotationHelpers_exports, s as SuperToolbar, t as Extensions, tt as PresentationEditor, u as messageProviderInjectionKey, ut as fromBase64, v as cssrAnchorMetaName, vt as encodeAwarenessUpdate, w as render, wt as createDecoder, x as useConfig, xt as ObservableV2, y as toString_default, yt as removeAwarenessStates, z as cM } from "./chunks/src-nkjmbRm8.es.js";
-import { i as registeredHandlers, s as helpers_exports, t as SuperConverter } from "./chunks/SuperConverter-Da2sHpq1.es.js";
+import { A as isMounted, At as toUint8Array, B as cNotM, C as resolveWrappedSlot, Ct as getUnixTime, D as warnOnce, Dt as readVarUint8Array, E as throwError, Et as readVarUint, F as changeColor, Ft as pow, G as ellipsis_vertical_solid_default, H as insideModal, I as c, It as v_click_outside_default, J as comment_solid_default, K as xmark_solid_default, L as cB, Lt as getFileObject, M as use_memo_default, Mt as writeVarUint8Array, N as on, Nt as create, O as useSsrAdapter, Ot as createEncoder, P as createId, Pt as min, Q as trackChangesHelpers_exports, R as cE, Rt as comments_module_events, S as configProviderInjectionKey, St as setIfUndefined, T as call, Tt as readVarString, U as insidePopover, V as createKey, W as caret_down_solid_default, X as getRichTextExtensions, Y as AIWriter_default, Z as getStarterExtensions, _ as useRtl, _t as applyAwarenessUpdate, at as CommentsPluginKey, b as useThemeClass, bt as map, ct as getTrackChanges, d as Dropdown_default, dt as toBase64, et as SectionHelpers, f as ConfigProvider_default, ft as isNode, g as _common_default$2, gt as Awareness, h as index_cssr_default$5, ht as varStorage, i as SuperEditor_default, it as AnnotatorHelpers, j as useMergedState, jt as writeVarUint, k as createInjectionKey, kt as length, l as messageApiInjectionKey, lt as createUint8ArrayFromArrayBuffer, m as use_theme_default, mt as onChange, nt as Editor, ot as createOrUpdateTrackedChangeComment, p as light_default$1, pt as offChange, q as check_solid_default, r as SuperInput_default, rt as fieldAnnotationHelpers_exports, s as SuperToolbar, t as Extensions, tt as PresentationEditor, u as messageProviderInjectionKey, ut as fromBase64, v as cssrAnchorMetaName, vt as encodeAwarenessUpdate, w as render, wt as createDecoder, x as useConfig, xt as ObservableV2, y as toString_default, yt as removeAwarenessStates, z as cM } from "./chunks/src-Dol3U5lU.es.js";
+import { i as registeredHandlers, s as helpers_exports, t as SuperConverter } from "./chunks/SuperConverter-oE8-K6ec.es.js";
 import { a as init_dist$1, i as global, n as init_dist, r as process$1 } from "./chunks/jszip-ChlR43oI.es.js";
 import "./chunks/xml-js-DLE8mr0n.es.js";
 import { t as v4_default } from "./chunks/uuid-2IzDu5nl.es.js";
@@ -4458,6 +4458,14 @@ const useCommentsStore = defineStore("comments", () => {
 			};
 			syncCommentsToClients(superdoc, emitData);
 			debounceEmit(changeId, emitData, superdoc);
+		} else if (event === "resolve") {
+			const existingTrackedChange = commentsList.value.find((comment$1) => comment$1.commentId === changeId);
+			if (!existingTrackedChange || existingTrackedChange.resolvedTime) return;
+			existingTrackedChange.resolveComment({
+				email: params.resolvedByEmail ?? superdoc?.user?.email ?? null,
+				name: params.resolvedByName ?? superdoc?.user?.name ?? null,
+				superdoc
+			});
 		}
 	};
 	const debounceEmit = (commentId, event, superdoc, delay = 1e3) => {
@@ -4746,8 +4754,8 @@ const useCommentsStore = defineStore("comments", () => {
 		return Array.isArray(json?.content) ? json.content.filter(Boolean) : [];
 	};
 	const handleEditorLocationsUpdate = (allCommentPositions) => {
-		if ((!allCommentPositions || Object.keys(allCommentPositions).length === 0) && commentsList.value.length > 0) return;
-		editorCommentPositions.value = allCommentPositions || {};
+		if (allCommentPositions == null) return;
+		editorCommentPositions.value = allCommentPositions;
 	};
 	const clearEditorCommentPositions = () => {
 		editorCommentPositions.value = {};
@@ -20280,7 +20288,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 		this.config.colors = shuffleArray(this.config.colors);
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "1.17.0-next.22";
+		this.version = "1.17.0-next.23";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || v4_default();
 		this.colors = this.config.colors;