superdoc 2.28.0-next.16 → 2.28.0-next.18

package/dist/superdoc.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_rolldown_runtime = require("./chunks/rolldown-runtime-74VwNCz7.cjs");
 const require_blank_docx = require("./chunks/blank-docx-BuFAbRjs.cjs");
-const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-DfSPIhxs.cjs");
+const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-DOnTWcx7.cjs");
 const require_eventemitter3 = require("./chunks/eventemitter3-C_TAnXOl.cjs");
 const require_uuid = require("./chunks/uuid-BhG0ngwk.cjs");
 const require__plugin_vue_export_helper = require("./chunks/_plugin-vue_export-helper-BUdjGKyl.cjs");
@@ -9,8 +9,6 @@ const require_jszip = require("./chunks/jszip-D8mAFF-r.cjs");
 const require_constants = require("./chunks/constants-DpXuDx_g.cjs");
 let superdoc_entry_vue = require("vue");
 superdoc_entry_vue = require_rolldown_runtime.__toESM(superdoc_entry_vue, 1);
-require("y-websocket");
-require("@hocuspocus/provider");
 let yjs = require("yjs");
 //#region src/core/v2-integration/browser-peer-runtime.js
 var SUPERDOC_V2_BROWSER_RUNTIME_GLOBAL_KEY = "__SUPERDOC_V2_BROWSER_RUNTIME__";
@@ -260,7 +258,7 @@ var v_click_outside_default = {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.28.0-next.16";
+		return "2.28.0-next.18";
 	} catch {
 		return "unknown";
 	}
@@ -7604,6 +7602,11 @@ var useCommentsStore = defineStore("comments", () => {
 	const suppressInternalExternal = require__plugin_vue_export_helper.ref(true);
 	const currentCommentText = require__plugin_vue_export_helper.ref("");
 	const currentCommentMentions = require__plugin_vue_export_helper.ref([]);
+	let commentDraftRevision = 0;
+	require__plugin_vue_export_helper.watch([currentCommentText, currentCommentMentions], () => commentDraftRevision++, {
+		deep: true,
+		flush: "sync"
+	});
 	const commentsList = require__plugin_vue_export_helper.ref([]);
 	const reviewDirectoryList = require__plugin_vue_export_helper.shallowRef([]);
 	let priorTrackedChangeThreadIndex = /* @__PURE__ */ new Map();
@@ -7937,17 +7940,6 @@ var useCommentsStore = defineStore("comments", () => {
 		comment.resolvedByName = null;
 		comment.trackedChangeDecision = null;
 	};
-	const restoreResolvedMetadata = (comment) => {
-		if (!comment) return false;
-		const snapshot = trackedChangeResolutionSnapshots.get(comment);
-		if (!snapshot) return false;
-		comment.resolvedTime = snapshot.resolvedTime ?? Date.now();
-		comment.resolvedById = snapshot.resolvedById ?? null;
-		comment.resolvedByEmail = snapshot.resolvedByEmail ?? null;
-		comment.resolvedByName = snapshot.resolvedByName ?? null;
-		comment.trackedChangeDecision = snapshot.trackedChangeDecision ?? null;
-		return true;
-	};
 	const getCommentEventPayload = (comment) => typeof comment?.getValues === "function" ? comment.getValues() : { ...comment };
 	/**
 	* Check if a comment originated from the document editor (or has no explicit source).
@@ -7962,63 +7954,14 @@ var useCommentsStore = defineStore("comments", () => {
 		return source === DOCUMENT_EDITOR_SELECTION_SOURCE;
 	};
 	const isTrackedChangeThread = (comment) => Boolean(comment?.trackedChange) || Boolean(trackedChangeThreadParentIdForComment$1(comment));
-	const collectStandardCommentDocumentState = (editor) => {
-		const doc = editor?.state?.doc;
-		if (!doc || typeof doc.descendants !== "function") return null;
-		const liveMarkIds = /* @__PURE__ */ new Set();
-		const resolvedAnchorIds = /* @__PURE__ */ new Set();
-		doc.descendants((node) => {
-			node.marks?.filter((mark) => mark?.type?.name === "commentMark").forEach((mark) => {
-				[mark.attrs?.commentId, mark.attrs?.importedId].map((id) => normalizeCommentId(id)).filter(Boolean).forEach((id) => liveMarkIds.add(id));
-			});
-			const typeName = node.type?.name;
-			if (typeName !== "commentRangeStart" && typeName !== "commentRangeEnd") return;
-			const anchorId = normalizeCommentId(node.attrs?.["w:id"]);
-			if (anchorId) resolvedAnchorIds.add(anchorId);
-		});
-		return {
-			liveMarkIds,
-			resolvedAnchorIds
-		};
-	};
-	/**
-	* Fall back to a live editor when the caller has none (the store watchers).
-	* `editorCommentPositions` refreshes asynchronously, so a positions-based
-	* decision taken mid-undo/redo can act on STALE keys — e.g. clearing the
-	* resolved metadata that the redo restore just wrote back. The document
-	* itself is the source of truth; prefer it whenever an editor is reachable.
-	*/
-	const getFallbackCommentsEditor = () => {
-		const docs = superdocStore.documents;
-		if (!Array.isArray(docs)) return null;
-		for (const doc of docs) {
-			const editor = typeof doc?.getEditor === "function" ? doc.getEditor() : null;
-			if (editor?.state?.doc) return editor;
-		}
-		return null;
-	};
-	const syncResolvedCommentsWithDocument = ({ editor } = {}) => {
+	const syncResolvedCommentsWithDocument = () => {
 		if (v2CommentsAdapter.value) return 0;
-		const effectiveEditor = editor ?? getFallbackCommentsEditor();
-		const documentState = collectStandardCommentDocumentState(effectiveEditor);
 		const docPositions = editorCommentPositions.value || {};
 		const activeKeys = new Set(Object.keys(docPositions));
-		if (!documentState && !activeKeys.size) return 0;
+		if (!activeKeys.size) return 0;
 		let changed = 0;
 		commentsList.value.forEach((comment) => {
 			if (!isEditorBackedComment(comment) || isTrackedChangeThread(comment)) return;
-			if (documentState) {
-				const aliasIds = getCommentAliasIds(comment);
-				const hasLiveMark = aliasIds.some((id) => documentState.liveMarkIds.has(id));
-				const hasResolvedAnchor = aliasIds.some((id) => documentState.resolvedAnchorIds.has(id));
-				if (hasLiveMark && comment.resolvedTime != null) {
-					clearResolvedMetadata(comment);
-					changed += 1;
-					return;
-				}
-				if (!hasLiveMark && hasResolvedAnchor && comment.resolvedTime == null && restoreResolvedMetadata(comment)) changed += 1;
-				return;
-			}
 			const { key } = resolveCommentPositionEntry(comment);
 			if (!key) return;
 			if (activeKeys.has(String(key)) && comment.resolvedTime != null) {
@@ -8036,23 +7979,6 @@ var useCommentsStore = defineStore("comments", () => {
 		syncResolvedCommentsWithDocument();
 	}, { deep: false });
 	/**
-	* Normalize a position object to a consistent { start, end } format.
-	* Handles different editor position schemas (start/end, pos/to, from/to).
-	*
-	* @param {Object | null | undefined} position The position object
-	* @returns {{ start: number, end: number } | null} The normalized range or null
-	*/
-	const getCommentPositionRange = (position) => {
-		if (!position) return null;
-		const start = position.start ?? position.pos ?? position.from;
-		const end = position.end ?? position.to ?? start;
-		if (!Number.isFinite(start) || !Number.isFinite(end)) return null;
-		return {
-			start,
-			end
-		};
-	};
-	/**
 	* Get the editor position data for a comment.
 	*
 	* @param {Object | string} commentOrId The comment object or comment ID
@@ -8061,44 +7987,6 @@ var useCommentsStore = defineStore("comments", () => {
 	const getCommentPosition = (commentOrId) => {
 		return resolveCommentPositionEntry(commentOrId).entry ?? null;
 	};
-	/**
-	* Get the text that a comment is anchored to in the document.
-	*
-	* @param {Object | string} commentOrId The comment object or comment ID
-	* @param {Object} [options] Options for text extraction
-	* @param {string} [options.separator=' '] Separator for textBetween when crossing nodes
-	* @param {boolean} [options.trim=true] Whether to trim whitespace from the result
-	* @returns {string | null} The anchored text or null if unavailable
-	*/
-	const getCommentAnchoredText = (commentOrId, options = {}) => {
-		const comment = typeof commentOrId === "object" ? commentOrId : getComment(commentOrId);
-		if (!comment) return null;
-		const position = resolveCommentPositionEntry(commentOrId).entry ?? null;
-		const range = getCommentPositionRange(position);
-		if (!range) return null;
-		const docNode = (superdocStore.getDocument(comment.fileId)?.getEditor?.())?.state?.doc;
-		if (!docNode?.textBetween) return null;
-		const separator = options.separator ?? " ";
-		const text = docNode.textBetween(range.start, range.end, separator, separator);
-		return options.trim === false ? text : text?.trim();
-	};
-	/**
-	* Get both position and anchored text data for a comment.
-	*
-	* @param {Object | string} commentOrId The comment object or comment ID
-	* @param {Object} [options] Options passed to getCommentAnchoredText
-	* @param {string} [options.separator=' '] Separator for textBetween when crossing nodes
-	* @param {boolean} [options.trim=true] Whether to trim whitespace from the result
-	* @returns {{ position: Object, anchoredText: string | null } | null} The anchor data or null
-	*/
-	const getCommentAnchorData = (commentOrId, options = {}) => {
-		const position = getCommentPosition(commentOrId);
-		if (!position) return null;
-		return {
-			position,
-			anchoredText: getCommentAnchoredText(commentOrId, options)
-		};
-	};
 	const isThreadVisible = (comment) => {
 		if (!isViewingMode.value) return true;
 		const parent = getThreadParent(comment);
@@ -8688,9 +8576,12 @@ var useCommentsStore = defineStore("comments", () => {
 		if (commentsAreReadOnly() && !isHydration) return readOnlyMutationOutcome();
 		const v2Adapter = !skipEditorUpdate && !isHydration ? getV2CommentsAdapter(superdoc) : null;
 		if (v2Adapter && !comment.trackedChange) {
-			const submittedPendingComment = pendingComment.value;
+			const pendingDraft = pendingComment.value;
+			const draftRevision = commentDraftRevision;
+			const draftActiveComment = activeComment.value;
+			const draftActiveInstance = activeFloatingCommentInstanceId.value;
 			const submittedPendingRequest = pendingCommentRequest;
-			const text = normalizeV2CommentDraftText(submittedPendingComment ? currentCommentText.value : comment.commentText);
+			const text = normalizeV2CommentDraftText(pendingDraft ? currentCommentText.value : comment.commentText);
 			const mentions = pendingComment.value ? currentCommentMentions.value : comment.mentions ?? [];
 			const target = pendingComment.value ? pendingV2CommentTarget.value : null;
 			const parentCommentId = comment.parentCommentId ? String(comment.parentCommentId) : pendingComment.value ? null : null;
@@ -8726,6 +8617,7 @@ var useCommentsStore = defineStore("comments", () => {
 					});
 					return outcome;
 				}
+				const ownsActiveDraftBeforeReconcile = activeComment.value === draftActiveComment && activeFloatingCommentInstanceId.value === draftActiveInstance;
 				const reconciled = reconcileCommentsFromV2({
 					superdoc,
 					adapter: v2Adapter,
@@ -8737,14 +8629,17 @@ var useCommentsStore = defineStore("comments", () => {
 					reconciled,
 					documentId: v2Adapter.documentId
 				});
-				const hadPendingComment = submittedPendingComment != null && pendingComment.value?.commentId === submittedPendingComment.commentId;
+				const createdId = created?.commentId ?? null;
+				const createdIsActive = createdId !== null && activeComment.value === createdId;
+				const createdInstance = createdIsActive ? activeFloatingCommentInstanceId.value : null;
 				const ownsSubmittedRequest = pendingCommentRequest === submittedPendingRequest;
-				if (hadPendingComment) if (ownsSubmittedRequest) removePendingComment(superdoc);
+				const reconciliationClearedActiveDraft = ownsActiveDraftBeforeReconcile && activeComment.value === null && activeFloatingCommentInstanceId.value === null;
+				const ownsPendingDraft = pendingDraft !== null && pendingComment.value === pendingDraft && commentDraftRevision === draftRevision && (createdIsActive || reconciliationClearedActiveDraft || activeComment.value === draftActiveComment && activeFloatingCommentInstanceId.value === draftActiveInstance);
+				if (ownsPendingDraft) if (ownsSubmittedRequest) removePendingComment(superdoc);
 				else resetPendingCommentState(superdoc, false);
-				const createdId = created?.commentId ?? null;
-				if (hadPendingComment && ownsSubmittedRequest && createdId) {
+				if (ownsPendingDraft && ownsSubmittedRequest && createdId) {
 					setActiveComment(superdoc, createdId);
-					setActiveFloatingCommentInstance(createdId);
+					setActiveFloatingCommentInstance(createdInstance ?? createdId);
 				}
 				if (broadcastChanges) superdoc.emit("comments-update", {
 					type: COMMENT_EVENTS.ADD,
@@ -11009,8 +10904,6 @@ var useCommentsStore = defineStore("comments", () => {
 		getTrackedChangeThread,
 		getCommentPositionKey,
 		getCommentPosition,
-		getCommentAnchoredText,
-		getCommentAnchorData,
 		resolveCommentPositionEntry,
 		getCommentDocumentId,
 		belongsToDocument,
@@ -12383,6 +12276,7 @@ var _hoisted_53 = { class: "reply-input-wrapper" };
 var _hoisted_54 = { class: "reply-actions" };
 var _hoisted_55 = ["disabled", "data-disabled-reason"];
 var commentEditSessions = /* @__PURE__ */ new WeakMap();
+var commentReplySessions = /* @__PURE__ */ new WeakMap();
 var _sfc_main$33 = {
 	__name: "CommentDialog",
 	props: {
@@ -12432,9 +12326,13 @@ var _sfc_main$33 = {
 		const superdocStore = useSuperdocStore();
 		const commentsStore = useCommentsStore();
 		const editSessionOwner = {};
+		const replySessionOwner = {};
 		const retireOwnEditSession = () => {
 			if (commentEditSessions.get(commentsStore)?.owner === editSessionOwner) commentEditSessions.delete(commentsStore);
 		};
+		const retireOwnReplySession = () => {
+			if (commentReplySessions.get(commentsStore)?.owner === replySessionOwner) commentReplySessions.delete(commentsStore);
+		};
 		const { addComment, cancelComment, deleteComment, getCommentAliasIds, removePendingComment, getCommentDocumentId, requestInstantSidebarAlignment, resolveCommentPositionEntry, clearInstantSidebarAlignment, setActiveFloatingCommentInstance } = commentsStore;
 		const { suppressInternalExternal, getConfig, activeComment, activeFloatingCommentInstanceId, floatingCommentsOffset, pendingComment, currentCommentText, currentCommentMentions, isDebugging, editingCommentId, editorCommentPositions, isCommentHighlighted } = storeToRefs(commentsStore);
 		const isInternal = require__plugin_vue_export_helper.ref(true);
@@ -12635,6 +12533,11 @@ var _sfc_main$33 = {
 		const isReplying = require__plugin_vue_export_helper.ref(false);
 		const isSubmittingReply = require__plugin_vue_export_helper.ref(false);
 		const isSubmittingNewComment = require__plugin_vue_export_helper.ref(false);
+		let replyDraftRevision = 0;
+		require__plugin_vue_export_helper.watch([currentCommentText, currentCommentMentions], () => replyDraftRevision++, {
+			deep: true,
+			flush: "sync"
+		});
 		const commentSaveFailure = require__plugin_vue_export_helper.ref("");
 		const commentSaveFailureMessage = (outcome, hasDraft = true) => {
 			return `Your comment could not be saved${outcome?.detail === "document-mode-read-only" ? " because the document or connection is read-only" : outcome?.code === "PERMISSION_DENIED" ? " because you do not have permission" : ""}.${hasDraft ? " Your draft is still here. Try again or cancel." : " Try again."}`;
@@ -12645,6 +12548,7 @@ var _sfc_main$33 = {
 				ok: false,
 				reason: v2WriteCapability.value?.reason ?? "v2-write-unavailable"
 			};
+			commentReplySessions.set(commentsStore, { owner: replySessionOwner });
 			commentSaveFailure.value = "";
 			isReplying.value = true;
 			require__plugin_vue_export_helper.nextTick(() => {
@@ -12883,6 +12787,15 @@ var _sfc_main$33 = {
 			commentsStore.setActiveComment(proxy.$superdoc, activeComment.value);
 			isCommentHighlighted.value = false;
 		};
+		const captureCommentEditorOwner = () => {
+			const editor = proxy.$superdoc.activeEditor;
+			const adapter = editor.v2Comments;
+			const document = editor.doc;
+			return {
+				adapter,
+				isCurrent: () => proxy.$superdoc.activeEditor === editor && editor.v2Comments === adapter && editor.doc === document
+			};
+		};
 		const handleAddComment = async () => {
 			if (commentsAreReadOnly()) return readOnlyMutationOutcome();
 			if (isV2WriteDisabled.value) return {
@@ -12897,6 +12810,13 @@ var _sfc_main$33 = {
 				isSubmittingReply.value = true;
 				commentSaveFailure.value = "";
 				try {
+					const session = commentReplySessions.get(commentsStore);
+					const draftRevision = replyDraftRevision;
+					const editorOwner = captureCommentEditorOwner();
+					const threadId = props.comment.commentId;
+					const fileId = props.comment.fileId;
+					const pendingDraft = pendingComment.value;
+					const edit = editingCommentId.value;
 					const parentCommentId = getV2ExistingReplyParentId(props.comment);
 					const trackedChangeTarget = getV2TrackedChangeCommentTarget(props.comment);
 					const outcome = await commentsStore.replyCommentV2({
@@ -12911,6 +12831,8 @@ var _sfc_main$33 = {
 						require__plugin_vue_export_helper.nextTick(() => emit("resize"));
 						return outcome;
 					}
+					if (session?.owner !== replySessionOwner || commentReplySessions.get(commentsStore) !== session || replyDraftRevision !== draftRevision || !editorOwner.isCurrent() || props.comment.commentId !== threadId || props.comment.fileId !== fileId || pendingComment.value !== pendingDraft || editingCommentId.value !== edit || !isDialogActive.value || !isReplying.value) return outcome;
+					retireOwnReplySession();
 					isReplying.value = false;
 					currentCommentText.value = "";
 					currentCommentMentions.value = [];
@@ -13257,10 +13179,8 @@ var _sfc_main$33 = {
 				const session = commentEditSessions.get(commentsStore);
 				const submission = Symbol("comment-edit-submission");
 				if (session?.owner === editSessionOwner) session.submission = submission;
-				const editor = proxy.$superdoc.activeEditor;
-				const adapter = editor.v2Comments;
-				const documentId = adapter.documentId;
-				const document = editor.doc;
+				const editorOwner = captureCommentEditorOwner();
+				const documentId = editorOwner.adapter.documentId;
 				const thread = props.comment;
 				const draft = currentCommentText.value;
 				const outcome = await commentsStore.editCommentV2({
@@ -13268,7 +13188,7 @@ var _sfc_main$33 = {
 					commentId: comment.commentId,
 					text: draft
 				});
-				if (session?.owner !== editSessionOwner || commentEditSessions.get(commentsStore) !== session || session.submission !== submission || proxy.$superdoc.activeEditor !== editor || editor.v2Comments !== adapter || adapter.documentId !== documentId || editor.doc !== document || props.comment !== thread || editingCommentId.value !== comment.commentId || currentCommentText.value !== draft) return outcome;
+				if (session?.owner !== editSessionOwner || commentEditSessions.get(commentsStore) !== session || session.submission !== submission || !editorOwner.isCurrent() || editorOwner.adapter.documentId !== documentId || props.comment !== thread || editingCommentId.value !== comment.commentId || currentCommentText.value !== draft) return outcome;
 				if (!outcome?.ok) {
 					commentSaveFailure.value = commentSaveFailureMessage(outcome);
 					return outcome;
@@ -13307,6 +13227,7 @@ var _sfc_main$33 = {
 		const handleCancel = (comment) => {
 			commentSaveFailure.value = "";
 			retireOwnEditSession();
+			retireOwnReplySession();
 			editingCommentId.value = null;
 			isReplying.value = false;
 			cancelComment(proxy.$superdoc);
@@ -13333,6 +13254,7 @@ var _sfc_main$33 = {
 		});
 		require__plugin_vue_export_helper.onBeforeUnmount(() => {
 			retireOwnEditSession();
+			retireOwnReplySession();
 			proxy.$superdoc?.off?.("active-editor-change", refreshActiveEditor);
 		});
 		require__plugin_vue_export_helper.watch(showInputSection, (isVisible) => {
@@ -13584,7 +13506,7 @@ var _sfc_main$33 = {
 		};
 	}
 };
-var CommentDialog_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$33, [["__scopeId", "data-v-f8b79c74"]]);
+var CommentDialog_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$33, [["__scopeId", "data-v-239e0310"]]);
 //#endregion
 //#region src/components/CommentsLayer/commentsList/ReviewDirectoryListItem.vue
 var _hoisted_1$25 = [
@@ -19711,6 +19633,7 @@ function createV2EditorRuntimeAdapter(options) {
 		}
 		const result = await host.dispatch(mapped);
 		switch (result.status) {
+			case "selected": return { status: "selected" };
 			case "committed":
 				invalidatePositionTokens();
 				return {
@@ -22249,7 +22172,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			if (event.type === "mutation:committed") {
 				const bulkDecisionEvent = toV2BulkDecisionEvent(documentId, event.trackedChangeBulkDecision);
 				if (bulkDecisionEvent) proxy.$superdoc.emit("tracked-changes:bulk-decision", bulkDecisionEvent);
-				emitV2EditorUpdate();
+				if (require_create_super_doc_ui.mutationCommittedEventChangedDocument(event)) emitV2EditorUpdate();
 			}
 			if (event.type !== "mutation:committed") return;
 			if (event.origin === "history") v2ReviewWindowController.refreshCommittedWindow(`history-${event.direction}`);
@@ -23626,7 +23549,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			], 46, _hoisted_1$17);
 		};
 	}
-}, [["__scopeId", "data-v-9c1ff6d7"]]);
+}, [["__scopeId", "data-v-2c57eaa1"]]);
 //#endregion
 //#region src/core/create-app.js
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
@@ -45358,7 +45281,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		}
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.28.0-next.16";
+		this.version = "2.28.0-next.18";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || require_uuid.v4();
 		this.colors = this.config.colors ?? [];