superdoc 2.20.0 → 2.20.1-next.10

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, i as registerFirstPartyCommandMutation, l as resolveImageSrc, m as recordInteraction, n as executeFirstPartyCommandAsync, o as applyV2CommentInvalidationFromMutation, p as createInteractionHistory, r as readFirstPartyPageNumbers, s as getV2TrackedChangeMutationImpact, t as createSuperDocUI } from "./chunks/create-super-doc-ui-D5VrP4Dx.es.js";
+import { c as createImageFilePicker, d as DOM_CLASS_NAMES, f as closeInteractionHistory, i as registerFirstPartyCommandMutation, l as resolveImageSrc, m as recordInteraction, n as executeFirstPartyCommandAsync, o as applyV2CommentInvalidationFromMutation, p as createInteractionHistory, r as readFirstPartyPageNumbers, s as getV2TrackedChangeMutationImpact, t as createSuperDocUI } from "./chunks/create-super-doc-ui-Cfwszc3b.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";
@@ -314,7 +314,7 @@ var shuffleArray = (array) => {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.20.0";
+		return "2.20.1-next.10";
 	} catch {
 		return "unknown";
 	}
@@ -8921,6 +8921,11 @@ var useCommentsStore = defineStore("comments", () => {
 		}
 		superdoc?.activeEditor?.commands?.removeComment({ commentId: "pending" });
 	};
+	const getV2CreatedComment = ({ outcome, reconciled, documentId }) => {
+		const createdId = normalizeCommentId(outcome?.createdCommentId);
+		if (!createdId) return reconciled?.added ?? null;
+		return commentsList.value.find((row) => String(row.commentId) === createdId && (documentId == null || String(row.fileId) === String(documentId))) ?? null;
+	};
 	/**
 	* Add a new comment to the document
 	*
@@ -8974,20 +8979,25 @@ var useCommentsStore = defineStore("comments", () => {
 					documentId: v2Adapter.documentId,
 					items: outcome.items
 				});
+				const created = getV2CreatedComment({
+					outcome,
+					reconciled,
+					documentId: v2Adapter.documentId
+				});
 				const hadPendingComment = !!pendingComment.value;
 				if (hadPendingComment) removePendingComment(superdoc);
-				const createdId = reconciled?.added?.commentId ?? null;
+				const createdId = created?.commentId ?? null;
 				if (hadPendingComment && createdId) {
 					setActiveComment(superdoc, createdId);
 					setActiveFloatingCommentInstance(createdId);
 				}
 				if (broadcastChanges) superdoc.emit("comments-update", {
 					type: COMMENT_EVENTS.ADD,
-					comment: reconciled?.added?.getValues?.() ?? null
+					comment: created?.getValues?.() ?? null
 				});
 				return {
 					ok: true,
-					comment: reconciled?.added ?? null
+					comment: created
 				};
 			});
 		}
@@ -9546,9 +9556,13 @@ var useCommentsStore = defineStore("comments", () => {
 			eventType: COMMENT_EVENTS.ADD,
 			rejectionFallbackReason: "v2-reply-failed",
 			rejectionEventExtras: parent ? { comment: getCommentEventPayload(parent) } : {},
-			successEventBuilder: ({ reconciled }) => ({
+			successEventBuilder: ({ outcome, reconciled }) => ({
 				type: COMMENT_EVENTS.ADD,
-				comment: reconciled?.added?.getValues?.() ?? null
+				comment: getV2CreatedComment({
+					outcome,
+					reconciled,
+					documentId: v2Adapter.documentId
+				})?.getValues?.() ?? null
 			})
 		});
 	};
@@ -13160,51 +13174,53 @@ var _hoisted_26 = { key: 7 };
 var _hoisted_27 = { class: "tracked-change-text is-deleted" };
 var _hoisted_28 = { class: "tracked-change-text is-inserted" };
 var _hoisted_29 = { key: 8 };
-var _hoisted_30 = { class: "tracked-change-text is-deleted" };
-var _hoisted_31 = { key: 9 };
-var _hoisted_32 = { class: "tracked-change-text is-inserted" };
-var _hoisted_33 = ["data-track-change-image-preview-role"];
-var _hoisted_34 = ["src", "alt"];
-var _hoisted_35 = {
+var _hoisted_30 = { key: 9 };
+var _hoisted_31 = { key: 10 };
+var _hoisted_32 = { class: "tracked-change-text is-deleted" };
+var _hoisted_33 = { key: 11 };
+var _hoisted_34 = { class: "tracked-change-text is-inserted" };
+var _hoisted_35 = ["data-track-change-image-preview-role"];
+var _hoisted_36 = ["src", "alt"];
+var _hoisted_37 = {
 	key: 1,
 	class: "card-section comment-body"
 };
-var _hoisted_36 = ["innerHTML"];
-var _hoisted_37 = {
+var _hoisted_38 = ["innerHTML"];
+var _hoisted_39 = {
 	key: 1,
 	class: "comment"
 };
-var _hoisted_38 = {
+var _hoisted_40 = {
 	key: 2,
 	class: "reply-expanded"
 };
-var _hoisted_39 = { class: "reply-input-wrapper" };
-var _hoisted_40 = { class: "reply-actions" };
-var _hoisted_41 = ["onClick"];
-var _hoisted_42 = [
+var _hoisted_41 = { class: "reply-input-wrapper" };
+var _hoisted_42 = { class: "reply-actions" };
+var _hoisted_43 = ["onClick"];
+var _hoisted_44 = [
 	"onClick",
 	"disabled",
 	"data-disabled-reason"
 ];
-var _hoisted_43 = { class: "collapsed-avatars" };
-var _hoisted_44 = {
+var _hoisted_45 = { class: "collapsed-avatars" };
+var _hoisted_46 = {
 	key: 3,
 	class: "comment-separator"
 };
-var _hoisted_45 = {
+var _hoisted_47 = {
 	key: 2,
 	class: "tracked-change-decision-alert",
 	role: "alert"
 };
-var _hoisted_46 = { class: "tracked-change-decision-alert__message" };
-var _hoisted_47 = ["disabled", "data-disabled-reason"];
-var _hoisted_48 = {
+var _hoisted_48 = { class: "tracked-change-decision-alert__message" };
+var _hoisted_49 = ["disabled", "data-disabled-reason"];
+var _hoisted_50 = {
 	key: 1,
 	class: "reply-expanded"
 };
-var _hoisted_49 = { class: "reply-input-wrapper" };
-var _hoisted_50 = { class: "reply-actions" };
-var _hoisted_51 = ["disabled", "data-disabled-reason"];
+var _hoisted_51 = { class: "reply-input-wrapper" };
+var _hoisted_52 = { class: "reply-actions" };
+var _hoisted_53 = ["disabled", "data-disabled-reason"];
 var CLICK_OUTSIDE_HIT_TOLERANCE_PX = 3;
 var TRACKED_CHANGE_PREVIEW_MAX_PX = 90;
 var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
@@ -14214,8 +14230,8 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 								createElementVNode("span", _hoisted_27, "\"" + toDisplayString(comment.deletedText) + "\"", 1),
 								_cache[9] || (_cache[9] = createElementVNode("span", { class: "change-type" }, " with ", -1)),
 								createElementVNode("span", _hoisted_28, "\"" + toDisplayString(comment.trackedChangeText) + "\"", 1)
-							])) : comment.deletedText ? (openBlock(), createElementBlock("div", _hoisted_29, [_cache[10] || (_cache[10] = createElementVNode("span", { class: "change-type" }, "Deleted ", -1)), createElementVNode("span", _hoisted_30, "\"" + toDisplayString(comment.deletedText) + "\"", 1)])) : comment.trackedChangeText ? (openBlock(), createElementBlock("div", _hoisted_31, [_cache[11] || (_cache[11] = createElementVNode("span", { class: "change-type" }, "Added ", -1)), createElementVNode("span", _hoisted_32, "\"" + toDisplayString(comment.trackedChangeText) + "\"", 1)])) : createCommentVNode("", true), comment.trackedChangeImagePreview?.src ? (openBlock(), createElementBlock("div", {
-								key: 10,
+							])) : comment.deletedText && comment.deletedText === "\n" ? (openBlock(), createElementBlock("div", _hoisted_29, [..._cache[10] || (_cache[10] = [createElementVNode("span", { class: "change-type" }, "Deleted line break", -1)])])) : comment.trackedChangeText && comment.trackedChangeText === "\n" ? (openBlock(), createElementBlock("div", _hoisted_30, [..._cache[11] || (_cache[11] = [createElementVNode("span", { class: "change-type" }, "Added line break", -1)])])) : comment.deletedText ? (openBlock(), createElementBlock("div", _hoisted_31, [_cache[12] || (_cache[12] = createElementVNode("span", { class: "change-type" }, "Deleted ", -1)), createElementVNode("span", _hoisted_32, "\"" + toDisplayString(comment.deletedText) + "\"", 1)])) : comment.trackedChangeText ? (openBlock(), createElementBlock("div", _hoisted_33, [_cache[13] || (_cache[13] = createElementVNode("span", { class: "change-type" }, "Added ", -1)), createElementVNode("span", _hoisted_34, "\"" + toDisplayString(comment.trackedChangeText) + "\"", 1)])) : createCommentVNode("", true), comment.trackedChangeImagePreview?.src ? (openBlock(), createElementBlock("div", {
+								key: 12,
 								class: "tracked-change-image-preview",
 								"data-track-change-image-preview-role": comment.trackedChangeImagePreview.role ?? void 0
 							}, [createElementVNode("img", {
@@ -14225,7 +14241,7 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 								style: normalizeStyle(trackedChangeImagePreviewStyle(comment.trackedChangeImagePreview)),
 								loading: "lazy",
 								decoding: "async"
-							}, null, 12, _hoisted_34)], 8, _hoisted_33)) : createCommentVNode("", true)], 10, _hoisted_10$3),
+							}, null, 12, _hoisted_36)], 8, _hoisted_35)) : createCommentVNode("", true)], 10, _hoisted_10$3),
 							shouldTruncate.value && isTextOverflowing.value && index === 0 ? (openBlock(), createElementBlock("div", {
 								key: 0,
 								class: "show-more-toggle",
@@ -14237,29 +14253,29 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 								onClick: withModifiers(toggleTruncation, ["stop", "prevent"])
 							}, " Show less ")) : createCommentVNode("", true)
 						])) : createCommentVNode("", true),
-						!comment.trackedChange ? (openBlock(), createElementBlock("div", _hoisted_35, [
+						!comment.trackedChange ? (openBlock(), createElementBlock("div", _hoisted_37, [
 							!unref(isDebugging) && !isEditingThisComment.value(comment) ? (openBlock(), createElementBlock("div", {
 								key: 0,
 								class: normalizeClass(["comment", index === 0 ? bodyOverflowClass.value : void 0]),
 								ref_for: true,
 								ref: index === 0 ? setParentBodyRef : void 0,
 								innerHTML: comment.commentText
-							}, null, 10, _hoisted_36)) : unref(isDebugging) && !isEditingThisComment.value(comment) ? (openBlock(), createElementBlock("div", _hoisted_37, toDisplayString(unref(editorCommentPositions)[comment.importedId !== void 0 ? comment.importedId : comment.commentId]?.bounds), 1)) : (openBlock(), createElementBlock("div", _hoisted_38, [createElementVNode("div", _hoisted_39, [createVNode(CommentInput_default, {
+							}, null, 10, _hoisted_38)) : unref(isDebugging) && !isEditingThisComment.value(comment) ? (openBlock(), createElementBlock("div", _hoisted_39, toDisplayString(unref(editorCommentPositions)[comment.importedId !== void 0 ? comment.importedId : comment.commentId]?.bounds), 1)) : (openBlock(), createElementBlock("div", _hoisted_40, [createElementVNode("div", _hoisted_41, [createVNode(CommentInput_default, {
 								ref_for: true,
 								ref: setEditCommentInputRef(comment.commentId),
 								users: [],
 								config: unref(getConfig),
 								"include-header": false,
 								comment
-							}, null, 8, ["config", "comment"])]), createElementVNode("div", _hoisted_40, [createElementVNode("button", {
+							}, null, 8, ["config", "comment"])]), createElementVNode("div", _hoisted_42, [createElementVNode("button", {
 								class: "sd-button reply-btn-cancel",
 								onClick: withModifiers(($event) => handleCancel(comment), ["stop", "prevent"])
-							}, "Cancel", 8, _hoisted_41), createElementVNode("button", {
+							}, "Cancel", 8, _hoisted_43), createElementVNode("button", {
 								class: normalizeClass(["sd-button primary reply-btn-primary", { "sd-is-disabled": !hasTextContent.value || isV2WriteDisabled.value }]),
 								onClick: withModifiers(($event) => handleCommentUpdate(comment), ["stop", "prevent"]),
 								disabled: !hasTextContent.value || isV2WriteDisabled.value,
 								"data-disabled-reason": isV2WriteDisabled.value ? v2WriteCapability.value?.reason ?? null : null
-							}, " Update ", 10, _hoisted_42)])])),
+							}, " Update ", 10, _hoisted_44)])])),
 							shouldTruncate.value && isTextOverflowing.value && index === 0 && !isEditingThisComment.value(comment) ? (openBlock(), createElementBlock("div", {
 								key: 3,
 								class: "show-more-toggle",
@@ -14271,20 +14287,20 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 								onClick: withModifiers(toggleTruncation, ["stop", "prevent"])
 							}, " Show less ")) : createCommentVNode("", true)
 						])) : createCommentVNode("", true),
-						shouldCollapseThread.value && index === 0 ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [_cache[12] || (_cache[12] = createElementVNode("div", { class: "comment-separator" }, null, -1)), createElementVNode("div", {
+						shouldCollapseThread.value && index === 0 ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [_cache[14] || (_cache[14] = createElementVNode("div", { class: "comment-separator" }, null, -1)), createElementVNode("div", {
 							class: "collapsed-replies",
 							onClick: withModifiers(expandThread, ["stop", "prevent"])
-						}, [createElementVNode("div", _hoisted_43, [(openBlock(true), createElementBlock(Fragment, null, renderList(collapsedReplyAuthors.value, (author) => {
+						}, [createElementVNode("div", _hoisted_45, [(openBlock(true), createElementBlock(Fragment, null, renderList(collapsedReplyAuthors.value, (author) => {
 							return openBlock(), createBlock(Avatar_default, {
 								key: author.email || author.name,
 								user: author,
 								class: "mini-avatar"
 							}, null, 8, ["user"]);
 						}), 128))]), createElementVNode("span", null, toDisplayString(collapsedReplyCount.value) + " more " + toDisplayString(collapsedReplyCount.value === 1 ? "reply" : "replies"), 1)])], 64)) : createCommentVNode("", true),
-						showSeparator.value(index) ? (openBlock(), createElementBlock("div", _hoisted_44)) : createCommentVNode("", true)
+						showSeparator.value(index) ? (openBlock(), createElementBlock("div", _hoisted_46)) : createCommentVNode("", true)
 					]);
 				}), 128)),
-				trackedChangeDecisionFailure.value ? (openBlock(), createElementBlock("div", _hoisted_45, [createElementVNode("span", _hoisted_46, toDisplayString(trackedChangeDecisionFailureMessage.value), 1), createElementVNode("button", {
+				trackedChangeDecisionFailure.value ? (openBlock(), createElementBlock("div", _hoisted_47, [createElementVNode("span", _hoisted_48, toDisplayString(trackedChangeDecisionFailureMessage.value), 1), createElementVNode("button", {
 					type: "button",
 					class: "sd-button tracked-change-decision-alert__retry",
 					onClick: withModifiers(retryTrackedChangeDecision, ["stop", "prevent"])
@@ -14296,7 +14312,7 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 					onClick: withModifiers(startReply, ["stop", "prevent"]),
 					disabled: isV2WriteDisabled.value,
 					"data-disabled-reason": isV2WriteDisabled.value ? v2WriteCapability.value?.reason ?? null : null
-				}, " Reply or add others with @ ", 10, _hoisted_47)) : (openBlock(), createElementBlock("div", _hoisted_48, [createElementVNode("div", _hoisted_49, [createVNode(CommentInput_default, {
+				}, " Reply or add others with @ ", 10, _hoisted_49)) : (openBlock(), createElementBlock("div", _hoisted_50, [createElementVNode("div", _hoisted_51, [createVNode(CommentInput_default, {
 					ref_key: "commentInput",
 					ref: commentInput,
 					users: usersFiltered.value,
@@ -14307,7 +14323,7 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 					"users",
 					"config",
 					"comment"
-				])]), createElementVNode("div", _hoisted_50, [createElementVNode("button", {
+				])]), createElementVNode("div", _hoisted_52, [createElementVNode("button", {
 					class: "sd-button reply-btn-cancel",
 					onClick: withModifiers(handleCancel, ["stop", "prevent"])
 				}, "Cancel"), createElementVNode("button", {
@@ -14315,11 +14331,11 @@ var CommentDialog_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 					onClick: withModifiers(handleAddComment, ["stop", "prevent"]),
 					disabled: !hasTextContent.value || isV2WriteDisabled.value || isSubmittingReply.value,
 					"data-disabled-reason": v2ReplyDisabledReason.value
-				}, " Reply ", 10, _hoisted_51)])]))], 64)) : createCommentVNode("", true)
+				}, " Reply ", 10, _hoisted_53)])]))], 64)) : createCommentVNode("", true)
 			], 64))], 14, _hoisted_1$27)), [[_directive_click_outside, handleClickOutside]]);
 		};
 	}
-}, [["__scopeId", "data-v-bc46ac97"]]);
+}, [["__scopeId", "data-v-eefd4750"]]);
 //#endregion
 //#region src/components/CommentsLayer/commentsList/ReviewDirectoryListItem.vue
 var _hoisted_1$26 = [
@@ -22135,6 +22151,7 @@ var SuperDoc_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			if (!documentId) return;
 			clearV2CommandShortcutBinding(documentId);
 			if (typeof bindEditShortcuts !== "function") return;
+			getSuperDocUI();
 			const openLinkWorkflow = resolveV2LinkWorkflowOpener();
 			const unbind = bindEditShortcuts({
 				commandRoute: {
@@ -24479,7 +24496,7 @@ var SuperDoc_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			], 38);
 		};
 	}
-}, [["__scopeId", "data-v-7bbf01da"]]);
+}, [["__scopeId", "data-v-e476c448"]]);
 //#endregion
 //#region src/core/create-app.js
 var PINIA_DEVTOOLS_SETUP_EVENT = "devtools-plugin:setup";
@@ -40494,6 +40511,7 @@ var ToolbarComboBox_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 					ref_key: "popupRef",
 					ref: popupRef,
 					role: "listbox",
+					"data-sd-part": "dropdown-menu",
 					id: listboxId.value,
 					"aria-label": ariaLabel.value,
 					class: normalizeClass(["sd-font-combobox__listbox", { "high-contrast": unref(isHighContrastMode) }]),
@@ -40522,7 +40540,7 @@ var ToolbarComboBox_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			], 14, _hoisted_1$12);
 		};
 	}
-}, [["__scopeId", "data-v-53e0af20"]]);
+}, [["__scopeId", "data-v-e288ef9f"]]);
 //#endregion
 //#region src/internal/toolbar/built-in/FontFamilyCombobox.vue
 var _sfc_main$14 = {
@@ -41558,10 +41576,9 @@ var Toolbar_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 		});
 		const showLeftSide = proxy.$toolbar.config?.toolbarGroups?.includes("left");
 		const showRightSide = proxy.$toolbar.config?.toolbarGroups?.includes("right");
-		const excludeButtonsList = proxy.$toolbar.config?.toolbarButtonsExclude || [];
 		const getFilteredItems = (position) => {
 			toolbarStateVersion.value;
-			return proxy.$toolbar.getToolbarItemByGroup(position).filter((item) => !excludeButtonsList.includes(item.name.value));
+			return proxy.$toolbar.getToolbarItemByGroup(position);
 		};
 		const updateCompactSideGroups = () => {
 			compactSideGroups.value = proxy.$toolbar.getAvailableWidth() <= RESPONSIVE_BREAKPOINTS.lg;
@@ -41735,7 +41752,7 @@ var Toolbar_default = /*#__PURE__*/ _plugin_vue_export_helper_default({
 			], 32);
 		};
 	}
-}, [["__scopeId", "data-v-9418cc7d"]]);
+}, [["__scopeId", "data-v-0d00bc5b"]]);
 //#endregion
 //#region src/internal/toolbar/built-in/font-options.js
 /**
@@ -43477,6 +43494,35 @@ var getToolbarItemWidth = (item, controlSizes) => {
 	if (item.type === "separator") return controlSizes.get("separator");
 	return controlSizes.get(item.name.value) || controlSizes.get("default");
 };
+var collapseSeparatorRun = (items) => {
+	const result = [];
+	for (const item of items) {
+		if (item.type === "separator") {
+			const previous = result[result.length - 1];
+			if (!previous || previous.type === "separator") continue;
+		}
+		result.push(item);
+	}
+	while (result.length && result[result.length - 1].type === "separator") result.pop();
+	return result;
+};
+var normalizeSeparators = (items) => {
+	const byGroup = /* @__PURE__ */ new Map();
+	for (const item of items) {
+		const group = item.group?.value || "center";
+		if (!byGroup.has(group)) byGroup.set(group, []);
+		byGroup.get(group).push(item);
+	}
+	const kept = /* @__PURE__ */ new Set();
+	for (const groupItems of byGroup.values()) for (const item of collapseSeparatorRun(groupItems)) kept.add(item);
+	return items.filter((item) => kept.has(item));
+};
+var normalizeSeparatorsIgnoringOverflow = (items) => {
+	const overflowTrigger = items.find((item) => item.type === "overflow");
+	const withoutOverflow = items.filter((item) => item !== overflowTrigger);
+	const kept = new Set(normalizeSeparators(withoutOverflow));
+	return items.filter((item) => item === overflowTrigger || kept.has(item));
+};
 /**
 * Set or clear the link item's `href` without disturbing the rest of its
 * attributes. The static configuration (`ariaLabel`, and anything added later)
@@ -43531,7 +43577,7 @@ function hasAiModule(superToolbar) {
 function aiModuleConfig(superToolbar) {
 	return superToolbar.config?.superdoc?.config?.modules?.ai ?? superToolbar.superdoc?.config?.modules?.ai ?? {};
 }
-var makeDefaultItems = ({ superToolbar, toolbarIcons, toolbarTexts, toolbarFonts, hideButtons, availableWidth, role, isDev = false, configuredItemNames, excludedItemNames, additionalItems = [] } = {}) => {
+var makeDefaultItems = ({ superToolbar, toolbarIcons, toolbarTexts, toolbarFonts, hideButtons, availableWidth, role, isDev = false, configuredItemNames, configuredItemOrder, excludedItemNames, additionalItems = [] } = {}) => {
 	const bold = useToolbarItem({
 		type: "button",
 		name: "bold",
@@ -44641,9 +44687,15 @@ var makeDefaultItems = ({ superToolbar, toolbarIcons, toolbarTexts, toolbarFonts
 	}
 	if (configuredItemNames) toolbarItems = toolbarItems.filter((item) => item.name.value === "overflow" || item.isCustomToolbarItem || configuredItemNames.has(item.name.value));
 	if (excludedItemNames?.size) toolbarItems = toolbarItems.filter((item) => !excludedItemNames.has(item.name.value));
+	toolbarItems = normalizeSeparatorsIgnoringOverflow(toolbarItems);
 	const isStickyItem = (item) => stickyItemNames.includes(item.name.value);
 	const overflowTrigger = toolbarItems.find((item) => item.name.value === "overflow");
 	const layoutItems = toolbarItems.filter((item) => item !== overflowTrigger);
+	if (configuredItemOrder) {
+		const orderIndex = new Map(configuredItemOrder.map((name, index) => [name, index]));
+		const rank = (item) => orderIndex.get(item.name.value) ?? Number.MAX_SAFE_INTEGER;
+		layoutItems.sort((a, b) => rank(a) - rank(b));
+	}
 	const partitionItems = (reserveOverflowTrigger) => {
 		const overflowItems = [];
 		const visibleItems = [];
@@ -44685,6 +44737,7 @@ var makeDefaultItems = ({ superToolbar, toolbarIcons, toolbarTexts, toolbarFonts
 		if (insertAt === -1) visibleItems.push(overflowTrigger);
 		else visibleItems.splice(insertAt, 0, overflowTrigger);
 	}
+	visibleItems = normalizeSeparators(visibleItems);
 	return {
 		defaultItems: visibleItems,
 		overflowItems: overflowItems.filter((item) => item.type !== "separator")
@@ -44905,6 +44958,7 @@ var BuiltInToolbar = class extends import_eventemitter3.default {
 		responsiveToContainer: false,
 		mode: "docx",
 		excludeItems: [],
+		toolbarButtonsExclude: [],
 		groups: null,
 		customButtons: [],
 		showFormattingMarksButton: false,
@@ -45070,7 +45124,7 @@ var BuiltInToolbar = class extends import_eventemitter3.default {
 		const selectedCustomOptions = new Map(this.#getAllToolbarItems().filter((item) => item.isCustomToolbarItem && item.type === "dropdown").map((item) => [item.name.value, item.selectedValue.value]));
 		const hasExplicitGroupComposition = this.config.groups && !Array.isArray(this.config.groups) && Object.keys(this.config.groups).length > 0;
 		const configuredItemNames = hasExplicitGroupComposition ? new Set(Object.values(this.config.groups).flatMap((items) => items)) : null;
-		const excludedItemNames = new Set(this.config.excludeItems);
+		const excludedItemNames = /* @__PURE__ */ new Set([...this.config.excludeItems ?? [], ...this.config.toolbarButtonsExclude ?? []]);
 		const customItems = this.config.customButtons || [];
 		const takenNames = new Set(RESERVED_TOOLBAR_ITEM_NAMES);
 		const customToolbarItems = customItems.map((item, index) => {
@@ -45091,6 +45145,12 @@ var BuiltInToolbar = class extends import_eventemitter3.default {
 		}).filter(Boolean);
 		const configuredGroups = hasExplicitGroupComposition ? new Set(Object.keys(this.config.groups)) : null;
 		const layoutCustomItems = configuredGroups ? customToolbarItems.filter((item) => configuredGroups.has(item.group?.value || "center")) : customToolbarItems;
+		let allConfigItems = null;
+		if (hasExplicitGroupComposition) {
+			const groupedItems = Object.values(this.config.groups).flatMap((item) => item);
+			const groupedCustomItems = customToolbarItems.filter((item) => configuredGroups.has(item.group?.value || "center")).map((item) => item.name.value);
+			allConfigItems = [.../* @__PURE__ */ new Set([...groupedItems, ...groupedCustomItems])];
+		}
 		const { defaultItems, overflowItems } = makeDefaultItems({
 			superToolbar: this,
 			toolbarIcons: this.config.icons,
@@ -45101,18 +45161,29 @@ var BuiltInToolbar = class extends import_eventemitter3.default {
 			role: this.role,
 			isDev: this.isDev,
 			configuredItemNames,
+			configuredItemOrder: allConfigItems,
 			excludedItemNames,
 			additionalItems: layoutCustomItems
 		});
-		let allConfigItems = [...defaultItems.map((item) => item.name.value), ...overflowItems.map((item) => item.name.value)];
-		if (hasExplicitGroupComposition) {
-			const groupedItems = Object.values(this.config.groups).flatMap((item) => item);
-			const groupedCustomItems = customToolbarItems.filter((item) => configuredGroups.has(item.group?.value || "center")).map((item) => item.name.value);
-			allConfigItems = [.../* @__PURE__ */ new Set([...groupedItems, ...groupedCustomItems])];
-		}
+		if (!hasExplicitGroupComposition) allConfigItems = [...defaultItems.map((item) => item.name.value), ...overflowItems.map((item) => item.name.value)];
 		const configuredOverflowItems = overflowItems.filter((item) => allConfigItems.includes(item.name.value) && !excludedItemNames.has(item.name.value));
 		const visibleItemNames = configuredOverflowItems.length ? [...allConfigItems, "overflow"] : allConfigItems;
 		const filteredItems = defaultItems.filter((item) => visibleItemNames.includes(item.name.value)).filter((item) => !excludedItemNames.has(item.name.value));
+		if (hasExplicitGroupComposition) {
+			const orderIndex = new Map(allConfigItems.map((name, index) => [name, index]));
+			const rank = (item) => orderIndex.get(item.name.value) ?? Number.MAX_SAFE_INTEGER;
+			const overflowTrigger = filteredItems.find((item) => item.name.value === "overflow");
+			const originalIndex = new Map(filteredItems.map((item, index) => [item, index]));
+			const reordered = filteredItems.filter((item) => item !== overflowTrigger);
+			reordered.sort((a, b) => rank(a) - rank(b));
+			if (overflowTrigger) {
+				const triggerOriginalIndex = originalIndex.get(overflowTrigger);
+				const insertAt = reordered.findIndex((item) => originalIndex.get(item) > triggerOriginalIndex);
+				insertAt === -1 ? reordered.push(overflowTrigger) : reordered.splice(insertAt, 0, overflowTrigger);
+			}
+			filteredItems.splice(0, filteredItems.length, ...reordered);
+			configuredOverflowItems.sort((a, b) => rank(a) - rank(b));
+		}
 		if (hasExplicitGroupComposition) {
 			for (const [group, names] of Object.entries(this.config.groups)) for (const item of filteredItems) if (names.includes(item.name.value)) item.group.value = group;
 		}
@@ -46212,7 +46283,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 = "2.20.0";
+		this.version = "2.20.1-next.10";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || v4();
 		this.colors = this.config.colors ?? [];