superdoc 2.23.0-next.1 → 2.23.0-next.3

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-MSiU8Kg0.cjs");
+const require_create_super_doc_ui = require("./chunks/create-super-doc-ui-CbiiPcgr.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-CYxINHh_.cjs");
@@ -299,24 +299,12 @@ var awarenessStatesToArray = (context, states) => {
 		};
 	});
 };
-/**
-* Shuffle an array of hex colors
-* @param array - List of hex colors
-* @returns Shuffled array of hex colors
-*/
-var shuffleArray = (array) => {
-	for (let i = array.length - 1; i > 0; i--) {
-		const j = Math.floor(Math.random() * (i + 1));
-		[array[i], array[j]] = [array[j], array[i]];
-	}
-	return array;
-};
 //#endregion
 //#region ../../shared/common/Telemetry.ts
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.23.0-next.1";
+		return "2.23.0-next.3";
 	} catch {
 		return "unknown";
 	}
@@ -7614,6 +7602,7 @@ var getTrackedChangeIndex = () => null;
 var resolveTrackedChangeInStory = () => null;
 var makeTrackedChangeAnchorKey = ({ storyKey, rawId }) => `tc::${storyKey}::${rawId}`;
 var COMMENT_DRAFT_BR_TAG = /<br(?:\s[^>]*)?\s*\/?>/gi;
+var COMMENT_DRAFT_BLOCK_BOUNDARY = /(?:<\/(?:p|div|li|blockquote|pre|h[1-6])\s*>\s*)+(?:<(?:p|div|li|blockquote|pre|h[1-6])(?:\s[^>]*)?\s*\/?>)+/gi;
 var COMMENT_DRAFT_BLOCK_OPEN_TAG = /<(?:p|div|li|blockquote|pre|h[1-6])(?:\s[^>]*)?\s*\/?>/gi;
 var COMMENT_DRAFT_BLOCK_CLOSE_TAG = /<\/(?:p|div|li|blockquote|pre|h[1-6])\s*>/gi;
 var COMMENT_DRAFT_ANY_TAG = /<\/?[A-Za-z][A-Za-z0-9:-]*(?:\s[^>]*)?\s*\/?>/g;
@@ -7707,7 +7696,7 @@ var decodeCommentDraftEntities = (value) => value.replace(COMMENT_DRAFT_ENTITY,
 var normalizeV2CommentDraftText = (value) => {
 	const html = String(value ?? "");
 	if (!html || html === "<p></p>") return "";
-	return decodeCommentDraftEntities(html.replace(COMMENT_DRAFT_BR_TAG, "\n").replace(COMMENT_DRAFT_BLOCK_CLOSE_TAG, "\n").replace(COMMENT_DRAFT_BLOCK_OPEN_TAG, "").replace(COMMENT_DRAFT_ANY_TAG, "")).replace(/\n{3,}/g, "\n\n").replace(/^\n+/, "").replace(/\n+$/, "");
+	return decodeCommentDraftEntities(html.replace(COMMENT_DRAFT_BLOCK_BOUNDARY, "\n").replace(COMMENT_DRAFT_BR_TAG, "\n").replace(COMMENT_DRAFT_BLOCK_CLOSE_TAG, "").replace(COMMENT_DRAFT_BLOCK_OPEN_TAG, "").replace(COMMENT_DRAFT_ANY_TAG, ""));
 };
 var cloneV2TrackedChangeStory = (story) => {
 	if (!story || typeof story !== "object") return null;
@@ -7946,6 +7935,14 @@ var useCommentsStore = defineStore("comments", () => {
 		if (!normalizedId) return null;
 		return normalizedId.startsWith("imported:") ? normalizedId : `imported:${normalizedId}`;
 	};
+	const positionEntriesByAlias = require__plugin_vue_export_helper.computed(() => {
+		const aliases = /* @__PURE__ */ new Map();
+		for (const [key, entry] of Object.entries(editorCommentPositions.value || {})) for (const alias of [normalizeCommentId(entry?.key), normalizeCommentId(entry?.threadId)]) if (alias && !aliases.has(alias)) aliases.set(alias, {
+			key,
+			entry
+		});
+		return aliases;
+	});
 	const getPositionEntryByAlias = (id) => {
 		const normalizedId = normalizeCommentId(id);
 		if (!normalizedId) return {
@@ -7957,15 +7954,7 @@ var useCommentsStore = defineStore("comments", () => {
 			key: normalizedId,
 			entry: positions[normalizedId]
 		};
-		for (const [key, entry] of Object.entries(positions)) {
-			const entryKey = normalizeCommentId(entry?.key);
-			const threadId = normalizeCommentId(entry?.threadId);
-			if (entryKey === normalizedId || threadId === normalizedId) return {
-				key,
-				entry
-			};
-		}
-		return {
+		return positionEntriesByAlias.value.get(normalizedId) ?? {
 			key: null,
 			entry: null
 		};
@@ -8014,6 +8003,41 @@ var useCommentsStore = defineStore("comments", () => {
 		});
 		return matches.length === 1 ? matches[0] : null;
 	};
+	const commentIdentityIndex = require__plugin_vue_export_helper.computed(() => {
+		const list = commentsList.value;
+		if (!require__plugin_vue_export_helper.isReactive(list)) return null;
+		const primary = /* @__PURE__ */ new Map();
+		const aliases = /* @__PURE__ */ new Map();
+		for (const comment of list) {
+			if (!require__plugin_vue_export_helper.isReactive(comment)) return null;
+			for (const key of [
+				"commentId",
+				"importedId",
+				"trackedChangeAnchorKey",
+				"trackedChange"
+			]) {
+				const descriptor = Object.getOwnPropertyDescriptor(comment, key);
+				if (descriptor?.get || descriptor?.set || !descriptor && key in comment) return null;
+			}
+			const ids = [
+				comment.commentId,
+				comment.importedId,
+				comment.trackedChangeAnchorKey
+			];
+			if (ids.some((id) => id != null && typeof id !== "string")) return null;
+			if (ids[0] != null && !primary.has(ids[0])) primary.set(ids[0], comment);
+			const importedPositionId = comment.trackedChange ? buildTrackedChangeImportedPositionId(ids[1]) : null;
+			for (const alias of [
+				ids[1],
+				ids[2],
+				importedPositionId
+			]) if (alias != null && !aliases.has(alias)) aliases.set(alias, comment);
+		}
+		return {
+			primary,
+			aliases
+		};
+	});
 	/**
 	* Get a comment by either ID or imported ID
 	*
@@ -8025,7 +8049,8 @@ var useCommentsStore = defineStore("comments", () => {
 		const byPrimaryId = (c) => c.commentId == id;
 		const byAliasId = (c) => c.importedId == id || c.trackedChangeAnchorKey == id || c?.trackedChange && buildTrackedChangeImportedPositionId(c.importedId) == id;
 		const findIn = (list) => list.find(byPrimaryId) ?? list.find(byAliasId);
-		return findIn(commentsList.value) ?? findIn(reviewDirectoryList.value) ?? getTrackedChangeCommentByPositionAlias(id);
+		const index = typeof id === "string" ? commentIdentityIndex.value : null;
+		return (index ? index.primary.get(id) ?? index.aliases.get(id) : findIn(commentsList.value)) ?? findIn(reviewDirectoryList.value) ?? getTrackedChangeCommentByPositionAlias(id);
 	};
 	const getThreadParent = (comment) => {
 		if (!comment?.parentCommentId) return comment;
@@ -9513,7 +9538,7 @@ var useCommentsStore = defineStore("comments", () => {
 			reason: "parent-comment-id-missing"
 		};
 		const plainText = normalizeV2CommentDraftText(text);
-		if (plainText.length === 0) return {
+		if (plainText.trim().length === 0) return {
 			ok: false,
 			reason: "comment-text-empty"
 		};
@@ -9590,7 +9615,7 @@ var useCommentsStore = defineStore("comments", () => {
 			reason: "comment-id-missing"
 		};
 		const plainText = normalizeV2CommentDraftText(text);
-		if (plainText.length === 0) return {
+		if (plainText.trim().length === 0) return {
 			ok: false,
 			reason: "comment-text-empty"
 		};
@@ -12525,6 +12550,19 @@ var pickResolver = (context = {}) => {
 	if (typeof deprecatedResolver === "function") return deprecatedResolver;
 	return null;
 };
+var BUILT_IN_PERMISSION_METHOD = Symbol.for("superdoc.internal.permission-method.builtin");
+var BUILT_IN_PERMISSION_RESOLVER = Symbol.for("superdoc.internal.permission-resolver.builtin");
+/** Create the shell's internal, live tracked-change permission shim. */
+var createTrackedChangePermissionResolver = (superdoc) => {
+	const isBuiltInPolicy = () => superdoc.canPerformPermission?.[BUILT_IN_PERMISSION_METHOD] === true && pickResolver({ superdoc }) === null;
+	const resolver = (payload = {}) => isBuiltInPolicy() ? defaultDecisionFor(payload.permission, superdoc.config.role, superdoc.config.isInternal) : superdoc.canPerformPermission({
+		...payload,
+		role: superdoc.config.role,
+		isInternal: superdoc.config.isInternal
+	});
+	Object.defineProperty(resolver, BUILT_IN_PERMISSION_RESOLVER, { value: isBuiltInPolicy });
+	return resolver;
+};
 var defaultDecisionFor = (permission, role, isInternal) => {
 	const internalExternal = isInternal ? "internal" : "external";
 	return PERMISSION_MATRIX[permission]?.[internalExternal]?.includes(role) ?? false;
@@ -12985,15 +13023,19 @@ var _sfc_main$35 = {
 		const htmlToText = (html) => {
 			const value = String(html ?? "");
 			if (!value || value === "<p></p>") return "";
-			if (typeof document === "undefined") return value.replace(/<br\s*\/?>/gi, "\n").replace(/<[^>]+>/g, "");
+			if (typeof document === "undefined") return value.replace(/<\/p>\s*<p\b[^>]*>/gi, "\n").replace(/<br\s*\/?>/gi, "\n").replace(/<[^>]+>/g, "");
 			const element = document.createElement("div");
 			element.innerHTML = value;
-			return element.innerText || element.textContent || "";
+			element.querySelectorAll("br").forEach((br) => br.replaceWith("\n"));
+			element.querySelectorAll("p").forEach((paragraph, index) => {
+				if (index > 0) paragraph.before("\n");
+			});
+			return element.textContent || "";
 		};
 		const textToHtml = (value) => {
-			const normalized = String(value ?? "").replace(/\r\n/g, "\n").trim();
+			const normalized = String(value ?? "").replace(/\r\n/g, "\n");
 			if (!normalized) return "<p></p>";
-			return normalized.split(/\n{2,}/).map((paragraph) => `<p>${escapeHtml(paragraph).replace(/\n/g, "<br>")}</p>`).join("");
+			return `<p>${escapeHtml(normalized).replace(/\n/g, "<br>")}</p>`;
 		};
 		const commentDraft = require__plugin_vue_export_helper.computed({
 			get: () => htmlToText(currentCommentText.value),
@@ -13122,7 +13164,7 @@ var _sfc_main$35 = {
 		};
 	}
 };
-var CommentInput_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$35, [["__scopeId", "data-v-87953125"]]);
+var CommentInput_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$35, [["__scopeId", "data-v-0720a671"]]);
 //#endregion
 //#region src/components/CommentsLayer/CommentDialog.vue
 var _hoisted_1$27 = [
@@ -13622,7 +13664,7 @@ var _sfc_main$34 = {
 			return !suppressInternalExternal.value && !props.comment.trackedChange;
 		});
 		const hasTextContent = require__plugin_vue_export_helper.computed(() => {
-			return currentCommentText.value && currentCommentText.value !== "<p></p>";
+			return Boolean(currentCommentText.value?.replace(/<[^>]*>/g, "").trim());
 		});
 		const setFocus = async () => {
 			const editor = proxy.$superdoc.activeEditor;
@@ -14347,7 +14389,7 @@ var _sfc_main$34 = {
 		};
 	}
 };
-var CommentDialog_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$34, [["__scopeId", "data-v-21ad0f69"]]);
+var CommentDialog_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$34, [["__scopeId", "data-v-dcbcc0d4"]]);
 //#endregion
 //#region src/components/CommentsLayer/commentsList/ReviewDirectoryListItem.vue
 var _hoisted_1$26 = [
@@ -23523,11 +23565,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 					contentControlsChrome: proxy.$superdoc.uiConfig.contentControls.options.chrome,
 					resolveTrackedChangeColor: composeAuthorColorResolver(proxy.$superdoc.config.modules?.trackChanges?.authorColors)
 				} : void 0,
-				permissionResolver: (payload = {}) => proxy.$superdoc.canPerformPermission({
-					role: proxy.$superdoc.config.role,
-					isInternal: proxy.$superdoc.config.isInternal,
-					...payload
-				})
+				permissionResolver: createTrackedChangePermissionResolver(proxy.$superdoc)
 			};
 		};
 		const REPLAY_MUTABLE_COMMENT_FIELDS = /* @__PURE__ */ new Set([
@@ -24570,7 +24608,7 @@ var SuperDoc_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_v
 			], 38);
 		};
 	}
-}, [["__scopeId", "data-v-99399849"]]);
+}, [["__scopeId", "data-v-3a8081b4"]]);
 //#endregion
 //#region src/core/create-app.js
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
@@ -40887,6 +40925,9 @@ var _sfc_main$12 = /*@__PURE__*/ Object.assign({ inheritAttrs: false }, {
 		const handleEscape = (event) => {
 			if (event.key === "Escape") close();
 		};
+		const handleTriggerKeydown = (event) => {
+			if (event.key === "Enter" || event.key === " ") close();
+		};
 		require__plugin_vue_export_helper.watch(() => props.disabled, (disabled) => {
 			if (disabled) close();
 		});
@@ -40917,8 +40958,13 @@ var _sfc_main$12 = /*@__PURE__*/ Object.assign({ inheritAttrs: false }, {
 				onMouseenter: handleTriggerMouseEnter,
 				onMouseleave: handleTriggerMouseLeave,
 				onFocusin: handleTriggerMouseEnter,
-				onFocusout: handleTriggerMouseLeave
-			}, [require__plugin_vue_export_helper.renderSlot(_ctx.$slots, "trigger", {}, void 0, true)], 544), (require__plugin_vue_export_helper.openBlock(), require__plugin_vue_export_helper.createBlock(require__plugin_vue_export_helper.Teleport, { to: "body" }, [require__plugin_vue_export_helper.createVNode(require__plugin_vue_export_helper.Transition, { name: "fade-in-scale-up-transition" }, {
+				onFocusout: handleTriggerMouseLeave,
+				onClickCapture: close,
+				onKeydownCapture: handleTriggerKeydown
+			}, [require__plugin_vue_export_helper.renderSlot(_ctx.$slots, "trigger", {}, void 0, true)], 544), (require__plugin_vue_export_helper.openBlock(), require__plugin_vue_export_helper.createBlock(require__plugin_vue_export_helper.Teleport, { to: "body" }, [require__plugin_vue_export_helper.createVNode(require__plugin_vue_export_helper.Transition, {
+				name: "fade-in-scale-up-transition",
+				css: isOpen.value
+			}, {
 				default: require__plugin_vue_export_helper.withCtx(() => [isOpen.value && !__props.disabled ? (require__plugin_vue_export_helper.openBlock(), require__plugin_vue_export_helper.createElementBlock("div", {
 					key: 0,
 					ref_key: "contentRef",
@@ -40933,11 +40979,11 @@ var _sfc_main$12 = /*@__PURE__*/ Object.assign({ inheritAttrs: false }, {
 					"aria-hidden": "true"
 				}, null, -1)), require__plugin_vue_export_helper.renderSlot(_ctx.$slots, "default", {}, void 0, true)], 46, _hoisted_1$11)) : require__plugin_vue_export_helper.createCommentVNode("", true)]),
 				_: 3
-			})]))], 64);
+			}, 8, ["css"])]))], 64);
 		};
 	}
 });
-var SdTooltip_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$12, [["__scopeId", "data-v-88d296cd"]]);
+var SdTooltip_default = /*#__PURE__*/ require__plugin_vue_export_helper._plugin_vue_export_helper_default(_sfc_main$12, [["__scopeId", "data-v-44bd03f9"]]);
 //#endregion
 //#region src/internal/toolbar/built-in/ButtonGroup.vue
 var _hoisted_1$10 = [
@@ -46384,13 +46430,13 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 				commentsBlock.allowResolve = this.#interactionConfig.comments.allowResolve;
 			}
 		}
-		this.config.colors = shuffleArray(this.config.colors);
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.23.0-next.1";
+		this.version = "2.23.0-next.3";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || require_uuid.v4();
 		this.colors = this.config.colors ?? [];
+		this.#assignUserColor();
 		this.#initDocuments();
 		await loadDefaultV2IntegrationOrFallback();
 		if (this.#destroyed) return;
@@ -48799,6 +48845,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		this.highContrastModeStore?.setHighContrastMode(isHighContrast);
 	}
 };
+Object.defineProperty(SuperDoc.prototype.canPerformPermission, Symbol.for("superdoc.internal.permission-method.builtin"), { value: true });
 //#endregion
 //#region src/core/theme/create-theme.ts
 var COLORS_TO_VARS = {

package/dist/superdoc.es.js

@@ -1,6 +1,6 @@
 import { i as __toESM$2 } from "./chunks/rolldown-runtime-0pSA04fp.es.js";
 import { t as blank_default } from "./chunks/blank-docx-DzQccOlW.es.js";
-import { c as createImageFilePicker, d as DOM_CLASS_NAMES, f as closeInteractionHistory, g as recordInteraction, h as isWorkflowRecordingEnabled, i as registerFirstPartyCommandMutation, l as resolveImageSrc, m as getWorkflowRecording, n as executeFirstPartyCommandAsync, o as applyV2CommentInvalidationFromMutation, p as createInteractionHistory, r as readFirstPartyPageNumbers, s as getV2TrackedChangeMutationImpact, t as createSuperDocUI } from "./chunks/create-super-doc-ui-DmGX1w-i.es.js";
+import { c as createImageFilePicker, d as DOM_CLASS_NAMES, f as closeInteractionHistory, g as recordInteraction, h as isWorkflowRecordingEnabled, i as registerFirstPartyCommandMutation, l as resolveImageSrc, m as getWorkflowRecording, n as executeFirstPartyCommandAsync, o as applyV2CommentInvalidationFromMutation, p as createInteractionHistory, r as readFirstPartyPageNumbers, s as getV2TrackedChangeMutationImpact, t as createSuperDocUI } from "./chunks/create-super-doc-ui-DHW9Toxn.es.js";
 import { t as import_eventemitter3 } from "./chunks/eventemitter3-DEIiXiH2.es.js";
 import { t as v4 } from "./chunks/uuid-H0Xcmmhy.es.js";
 import { $ as watch$1, A as onActivated, B as resolveDirective, C as isRef$1, D as normalizeClass, E as nextTick, F as openBlock, G as toRef, H as shallowRef$1, I as reactive, J as useAttrs, K as toRefs, L as ref, M as onDeactivated, N as onMounted, O as normalizeProps, P as onScopeDispose$1, Q as vModelText, R as renderList, S as isReactive$1, T as mergeProps, U as toDisplayString, V as resolveDynamicComponent, W as toRaw$2, X as vModelCheckbox, Y as useSlots, Z as vModelSelect, _ as getCurrentInstance, a as computed$1, b as hasInjectionContext, c as createCommentVNode, d as createStaticVNode, et as withCtx, f as createTextVNode, g as effectScope, h as defineComponent, i as Transition, j as onBeforeUnmount, k as normalizeStyle, l as createElementBlock, m as defineAsyncComponent, n as Fragment, nt as withKeys, o as createApp, p as createVNode, q as unref, r as Teleport, rt as withModifiers, s as createBlock, t as _plugin_vue_export_helper_default, tt as withDirectives, u as createElementVNode, v as getCurrentScope, w as markRaw, x as inject$1, y as h, z as renderSlot } from "./chunks/_plugin-vue_export-helper-DHiJKCsy.es.js";
@@ -297,24 +297,12 @@ var awarenessStatesToArray = (context, states) => {
 		};
 	});
 };
-/**
-* Shuffle an array of hex colors
-* @param array - List of hex colors
-* @returns Shuffled array of hex colors
-*/
-var shuffleArray = (array) => {
-	for (let i = array.length - 1; i > 0; i--) {
-		const j = Math.floor(Math.random() * (i + 1));
-		[array[i], array[j]] = [array[j], array[i]];
-	}
-	return array;
-};
 //#endregion
 //#region ../../shared/common/Telemetry.ts
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.23.0-next.1";
+		return "2.23.0-next.3";
 	} catch {
 		return "unknown";
 	}
@@ -7612,6 +7600,7 @@ var getTrackedChangeIndex = () => null;
 var resolveTrackedChangeInStory = () => null;
 var makeTrackedChangeAnchorKey = ({ storyKey, rawId }) => `tc::${storyKey}::${rawId}`;
 var COMMENT_DRAFT_BR_TAG = /<br(?:\s[^>]*)?\s*\/?>/gi;
+var COMMENT_DRAFT_BLOCK_BOUNDARY = /(?:<\/(?:p|div|li|blockquote|pre|h[1-6])\s*>\s*)+(?:<(?:p|div|li|blockquote|pre|h[1-6])(?:\s[^>]*)?\s*\/?>)+/gi;
 var COMMENT_DRAFT_BLOCK_OPEN_TAG = /<(?:p|div|li|blockquote|pre|h[1-6])(?:\s[^>]*)?\s*\/?>/gi;
 var COMMENT_DRAFT_BLOCK_CLOSE_TAG = /<\/(?:p|div|li|blockquote|pre|h[1-6])\s*>/gi;
 var COMMENT_DRAFT_ANY_TAG = /<\/?[A-Za-z][A-Za-z0-9:-]*(?:\s[^>]*)?\s*\/?>/g;
@@ -7705,7 +7694,7 @@ var decodeCommentDraftEntities = (value) => value.replace(COMMENT_DRAFT_ENTITY,
 var normalizeV2CommentDraftText = (value) => {
 	const html = String(value ?? "");
 	if (!html || html === "<p></p>") return "";
-	return decodeCommentDraftEntities(html.replace(COMMENT_DRAFT_BR_TAG, "\n").replace(COMMENT_DRAFT_BLOCK_CLOSE_TAG, "\n").replace(COMMENT_DRAFT_BLOCK_OPEN_TAG, "").replace(COMMENT_DRAFT_ANY_TAG, "")).replace(/\n{3,}/g, "\n\n").replace(/^\n+/, "").replace(/\n+$/, "");
+	return decodeCommentDraftEntities(html.replace(COMMENT_DRAFT_BLOCK_BOUNDARY, "\n").replace(COMMENT_DRAFT_BR_TAG, "\n").replace(COMMENT_DRAFT_BLOCK_CLOSE_TAG, "").replace(COMMENT_DRAFT_BLOCK_OPEN_TAG, "").replace(COMMENT_DRAFT_ANY_TAG, ""));
 };
 var cloneV2TrackedChangeStory = (story) => {
 	if (!story || typeof story !== "object") return null;
@@ -7944,6 +7933,14 @@ var useCommentsStore = defineStore("comments", () => {
 		if (!normalizedId) return null;
 		return normalizedId.startsWith("imported:") ? normalizedId : `imported:${normalizedId}`;
 	};
+	const positionEntriesByAlias = computed$1(() => {
+		const aliases = /* @__PURE__ */ new Map();
+		for (const [key, entry] of Object.entries(editorCommentPositions.value || {})) for (const alias of [normalizeCommentId(entry?.key), normalizeCommentId(entry?.threadId)]) if (alias && !aliases.has(alias)) aliases.set(alias, {
+			key,
+			entry
+		});
+		return aliases;
+	});
 	const getPositionEntryByAlias = (id) => {
 		const normalizedId = normalizeCommentId(id);
 		if (!normalizedId) return {
@@ -7955,15 +7952,7 @@ var useCommentsStore = defineStore("comments", () => {
 			key: normalizedId,
 			entry: positions[normalizedId]
 		};
-		for (const [key, entry] of Object.entries(positions)) {
-			const entryKey = normalizeCommentId(entry?.key);
-			const threadId = normalizeCommentId(entry?.threadId);
-			if (entryKey === normalizedId || threadId === normalizedId) return {
-				key,
-				entry
-			};
-		}
-		return {
+		return positionEntriesByAlias.value.get(normalizedId) ?? {
 			key: null,
 			entry: null
 		};
@@ -8012,6 +8001,41 @@ var useCommentsStore = defineStore("comments", () => {
 		});
 		return matches.length === 1 ? matches[0] : null;
 	};
+	const commentIdentityIndex = computed$1(() => {
+		const list = commentsList.value;
+		if (!isReactive$1(list)) return null;
+		const primary = /* @__PURE__ */ new Map();
+		const aliases = /* @__PURE__ */ new Map();
+		for (const comment of list) {
+			if (!isReactive$1(comment)) return null;
+			for (const key of [
+				"commentId",
+				"importedId",
+				"trackedChangeAnchorKey",
+				"trackedChange"
+			]) {
+				const descriptor = Object.getOwnPropertyDescriptor(comment, key);
+				if (descriptor?.get || descriptor?.set || !descriptor && key in comment) return null;
+			}
+			const ids = [
+				comment.commentId,
+				comment.importedId,
+				comment.trackedChangeAnchorKey
+			];
+			if (ids.some((id) => id != null && typeof id !== "string")) return null;
+			if (ids[0] != null && !primary.has(ids[0])) primary.set(ids[0], comment);
+			const importedPositionId = comment.trackedChange ? buildTrackedChangeImportedPositionId(ids[1]) : null;
+			for (const alias of [
+				ids[1],
+				ids[2],
+				importedPositionId
+			]) if (alias != null && !aliases.has(alias)) aliases.set(alias, comment);
+		}
+		return {
+			primary,
+			aliases
+		};
+	});
 	/**
 	* Get a comment by either ID or imported ID
 	*
@@ -8023,7 +8047,8 @@ var useCommentsStore = defineStore("comments", () => {
 		const byPrimaryId = (c) => c.commentId == id;
 		const byAliasId = (c) => c.importedId == id || c.trackedChangeAnchorKey == id || c?.trackedChange && buildTrackedChangeImportedPositionId(c.importedId) == id;
 		const findIn = (list) => list.find(byPrimaryId) ?? list.find(byAliasId);
-		return findIn(commentsList.value) ?? findIn(reviewDirectoryList.value) ?? getTrackedChangeCommentByPositionAlias(id);
+		const index = typeof id === "string" ? commentIdentityIndex.value : null;
+		return (index ? index.primary.get(id) ?? index.aliases.get(id) : findIn(commentsList.value)) ?? findIn(reviewDirectoryList.value) ?? getTrackedChangeCommentByPositionAlias(id);
 	};
 	const getThreadParent = (comment) => {
 		if (!comment?.parentCommentId) return comment;
@@ -9511,7 +9536,7 @@ var useCommentsStore = defineStore("comments", () => {
 			reason: "parent-comment-id-missing"
 		};
 		const plainText = normalizeV2CommentDraftText(text);
-		if (plainText.length === 0) return {
+		if (plainText.trim().length === 0) return {
 			ok: false,
 			reason: "comment-text-empty"
 		};
@@ -9588,7 +9613,7 @@ var useCommentsStore = defineStore("comments", () => {
 			reason: "comment-id-missing"
 		};
 		const plainText = normalizeV2CommentDraftText(text);
-		if (plainText.length === 0) return {
+		if (plainText.trim().length === 0) return {
 			ok: false,
 			reason: "comment-text-empty"
 		};
@@ -12521,6 +12546,19 @@ var pickResolver = (context = {}) => {
 	if (typeof deprecatedResolver === "function") return deprecatedResolver;
 	return null;
 };
+var BUILT_IN_PERMISSION_METHOD = Symbol.for("superdoc.internal.permission-method.builtin");
+var BUILT_IN_PERMISSION_RESOLVER = Symbol.for("superdoc.internal.permission-resolver.builtin");
+/** Create the shell's internal, live tracked-change permission shim. */
+var createTrackedChangePermissionResolver = (superdoc) => {
+	const isBuiltInPolicy = () => superdoc.canPerformPermission?.[BUILT_IN_PERMISSION_METHOD] === true && pickResolver({ superdoc }) === null;
+	const resolver = (payload = {}) => isBuiltInPolicy() ? defaultDecisionFor(payload.permission, superdoc.config.role, superdoc.config.isInternal) : superdoc.canPerformPermission({
+		...payload,
+		role: superdoc.config.role,
+		isInternal: superdoc.config.isInternal
+	});
+	Object.defineProperty(resolver, BUILT_IN_PERMISSION_RESOLVER, { value: isBuiltInPolicy });
+	return resolver;
+};
 var defaultDecisionFor = (permission, role, isInternal) => {
 	const internalExternal = isInternal ? "internal" : "external";
 	return PERMISSION_MATRIX[permission]?.[internalExternal]?.includes(role) ?? false;
@@ -12979,15 +13017,19 @@ var CommentInput_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 		const htmlToText = (html) => {
 			const value = String(html ?? "");
 			if (!value || value === "<p></p>") return "";
-			if (typeof document === "undefined") return value.replace(/<br\s*\/?>/gi, "\n").replace(/<[^>]+>/g, "");
+			if (typeof document === "undefined") return value.replace(/<\/p>\s*<p\b[^>]*>/gi, "\n").replace(/<br\s*\/?>/gi, "\n").replace(/<[^>]+>/g, "");
 			const element = document.createElement("div");
 			element.innerHTML = value;
-			return element.innerText || element.textContent || "";
+			element.querySelectorAll("br").forEach((br) => br.replaceWith("\n"));
+			element.querySelectorAll("p").forEach((paragraph, index) => {
+				if (index > 0) paragraph.before("\n");
+			});
+			return element.textContent || "";
 		};
 		const textToHtml = (value) => {
-			const normalized = String(value ?? "").replace(/\r\n/g, "\n").trim();
+			const normalized = String(value ?? "").replace(/\r\n/g, "\n");
 			if (!normalized) return "<p></p>";
-			return normalized.split(/\n{2,}/).map((paragraph) => `<p>${escapeHtml(paragraph).replace(/\n/g, "<br>")}</p>`).join("");
+			return `<p>${escapeHtml(normalized).replace(/\n/g, "<br>")}</p>`;
 		};
 		const commentDraft = computed$1({
 			get: () => htmlToText(currentCommentText.value),
@@ -13115,7 +13157,7 @@ var CommentInput_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			}), 128))])) : createCommentVNode("", true)])], 2)]);
 		};
 	}
-}, [["__scopeId", "data-v-87953125"]]);
+}, [["__scopeId", "data-v-0720a671"]]);
 //#endregion
 //#region src/components/CommentsLayer/CommentDialog.vue
 var _hoisted_1$27 = [
@@ -13615,7 +13657,7 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			return !suppressInternalExternal.value && !props.comment.trackedChange;
 		});
 		const hasTextContent = computed$1(() => {
-			return currentCommentText.value && currentCommentText.value !== "<p></p>";
+			return Boolean(currentCommentText.value?.replace(/<[^>]*>/g, "").trim());
 		});
 		const setFocus = async () => {
 			const editor = proxy.$superdoc.activeEditor;
@@ -14339,7 +14381,7 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			], 64))], 14, _hoisted_1$27)), [[_directive_click_outside, handleClickOutside]]);
 		};
 	}
-}, [["__scopeId", "data-v-21ad0f69"]]);
+}, [["__scopeId", "data-v-dcbcc0d4"]]);
 //#endregion
 //#region src/components/CommentsLayer/commentsList/ReviewDirectoryListItem.vue
 var _hoisted_1$26 = [
@@ -23482,11 +23524,7 @@ var SuperDoc_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 					contentControlsChrome: proxy.$superdoc.uiConfig.contentControls.options.chrome,
 					resolveTrackedChangeColor: composeAuthorColorResolver(proxy.$superdoc.config.modules?.trackChanges?.authorColors)
 				} : void 0,
-				permissionResolver: (payload = {}) => proxy.$superdoc.canPerformPermission({
-					role: proxy.$superdoc.config.role,
-					isInternal: proxy.$superdoc.config.isInternal,
-					...payload
-				})
+				permissionResolver: createTrackedChangePermissionResolver(proxy.$superdoc)
 			};
 		};
 		const REPLAY_MUTABLE_COMMENT_FIELDS = /* @__PURE__ */ new Set([
@@ -24529,7 +24567,7 @@ var SuperDoc_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			], 38);
 		};
 	}
-}, [["__scopeId", "data-v-99399849"]]);
+}, [["__scopeId", "data-v-3a8081b4"]]);
 //#endregion
 //#region src/core/create-app.js
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
@@ -40838,6 +40876,9 @@ var SdTooltip_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PU
 		const handleEscape = (event) => {
 			if (event.key === "Escape") close();
 		};
+		const handleTriggerKeydown = (event) => {
+			if (event.key === "Enter" || event.key === " ") close();
+		};
 		watch$1(() => props.disabled, (disabled) => {
 			if (disabled) close();
 		});
@@ -40868,8 +40909,13 @@ var SdTooltip_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PU
 				onMouseenter: handleTriggerMouseEnter,
 				onMouseleave: handleTriggerMouseLeave,
 				onFocusin: handleTriggerMouseEnter,
-				onFocusout: handleTriggerMouseLeave
-			}, [renderSlot(_ctx.$slots, "trigger", {}, void 0, true)], 544), (openBlock(), createBlock(Teleport, { to: "body" }, [createVNode(Transition, { name: "fade-in-scale-up-transition" }, {
+				onFocusout: handleTriggerMouseLeave,
+				onClickCapture: close,
+				onKeydownCapture: handleTriggerKeydown
+			}, [renderSlot(_ctx.$slots, "trigger", {}, void 0, true)], 544), (openBlock(), createBlock(Teleport, { to: "body" }, [createVNode(Transition, {
+				name: "fade-in-scale-up-transition",
+				css: isOpen.value
+			}, {
 				default: withCtx(() => [isOpen.value && !__props.disabled ? (openBlock(), createElementBlock("div", {
 					key: 0,
 					ref_key: "contentRef",
@@ -40884,10 +40930,10 @@ var SdTooltip_default = /*#__PURE__*/ _plugin_vue_export_helper_default(/* @__PU
 					"aria-hidden": "true"
 				}, null, -1)), renderSlot(_ctx.$slots, "default", {}, void 0, true)], 46, _hoisted_1$11)) : createCommentVNode("", true)]),
 				_: 3
-			})]))], 64);
+			}, 8, ["css"])]))], 64);
 		};
 	}
-}), [["__scopeId", "data-v-88d296cd"]]);
+}), [["__scopeId", "data-v-44bd03f9"]]);
 //#endregion
 //#region src/internal/toolbar/built-in/ButtonGroup.vue
 var _hoisted_1$10 = [
@@ -46313,13 +46359,13 @@ var SuperDoc = class extends import_eventemitter3.default {
 				commentsBlock.allowResolve = this.#interactionConfig.comments.allowResolve;
 			}
 		}
-		this.config.colors = shuffleArray(this.config.colors);
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.23.0-next.1";
+		this.version = "2.23.0-next.3";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || v4();
 		this.colors = this.config.colors ?? [];
+		this.#assignUserColor();
 		this.#initDocuments();
 		await loadDefaultV2IntegrationOrFallback();
 		if (this.#destroyed) return;
@@ -48728,6 +48774,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 		this.highContrastModeStore?.setHighContrastMode(isHighContrast);
 	}
 };
+Object.defineProperty(SuperDoc.prototype.canPerformPermission, Symbol.for("superdoc.internal.permission-method.builtin"), { value: true });
 //#endregion
 //#region src/core/theme/create-theme.ts
 var COLORS_TO_VARS = {