@stll/folio-react 0.11.0 → 0.12.0

package/dist/{renderAsync-BjqXaR0h.js → renderAsync-DFwDFNB9.js}

@@ -12,7 +12,7 @@ import { normalizeBaseDirection } from "@stll/folio-core/docx/normalizeBaseDirec
 import { getCachedNumberingMap } from "@stll/folio-core/docx/numberingParser";
 import { computeScrollPageInfo, updateScrollPageTotal } from "@stll/folio-core/paged-layout/scrollPageInfo";
 import { TextSelection, addColumnLeft, addColumnRight, addRowAbove, addRowBelow, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, captureFormatMarks, clearFormatting, clearTextColor, createStyleResolver, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, extractSelectionState, getSelectedText, getTableContext, increaseIndent, increaseListLevel, mergeCells, removeTabStop, removeTableBorders, schema, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setOutsideTableBorders, setRowHeight, setRtl, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableProperties, setTextColor, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "@stll/folio-core/prosemirror";
-import { acceptAIEditRevision, acceptChange, findAIEditRevisionRange, findChangeAtPosition, findNextChange, findParagraphBoundaryChangeAtPosition, findPreviousChange, rejectAIEditRevision, rejectChange } from "@stll/folio-core/prosemirror/commands/comments";
+import { acceptAIEditRevision, acceptChange, acceptSuggestion, findAIEditRevisionRange, findChangeAtPosition, findNextChange, findParagraphBoundaryChangeAtPosition, findPreviousChange, findSuggestionRange, getSuggestions, rejectAIEditRevision, rejectChange, rejectSuggestion } from "@stll/folio-core/prosemirror/commands/comments";
 import { blockSdtAttrsToSdtProperties, findBlockSdtMatch, findBlockSdtMatches, removeContentControlTr, setContentControlContentTr, setContentControlValueTr } from "@stll/folio-core/prosemirror/commands/contentControls";
 import { setContentControlContentBlocksTr } from "@stll/folio-core/prosemirror/commands/contentControlsBlockFill";
 import { CLIPBOARD_READ_ERROR_EVENT, buildPlainTextSlice } from "@stll/folio-core/prosemirror/commands/pastePlainText";
@@ -59,6 +59,7 @@ import { findNoteStoryForTarget } from "@stll/folio-core/layout-bridge/dom/noteS
 import { clickToPosition } from "@stll/folio-core/layout-bridge/engine/clickToPosition";
 import { getPageTop, hitTestFragment, hitTestTableCell } from "@stll/folio-core/layout-bridge/engine/hitTest";
 import { clearAllCaches, resetCanvasContext } from "@stll/folio-core/layout-bridge/engine/measuring";
+import { setEmbeddedFontFamilyMap } from "@stll/folio-core/utils/fontResolver";
 import { resolveSectionHeaderFooterRefs } from "@stll/folio-core/layout-engine";
 import { recordLayoutPhase } from "@stll/folio-core/layout-engine/layoutInstrumentation";
 import { LayoutPainter } from "@stll/folio-core/layout-painter";
@@ -75,7 +76,7 @@ import { tableInsertButtonOffset } from "@stll/folio-core/paged-layout/tableInse
 import { getTransactionDirtyRange } from "@stll/folio-core/paged-layout/transactionDirtyRange";
 import { findStartPosForParaId } from "@stll/folio-core/prosemirror/utils/findParagraphByParaId";
 import { expectImageAttrs, expectTableAttrs, expectTableCellAttrs, mergeImageAttrs, mergeTableAttrs, mergeTableCellAttrs, mergeTableRowAttrs } from "@stll/folio-core/prosemirror/attrs";
-import { extractEmbeddedFonts } from "@stll/folio-core/fonts/embeddedFonts";
+import { buildEmbeddedFontFamilyMap, extractEmbeddedFonts } from "@stll/folio-core/fonts/embeddedFonts";
 import { panic } from "better-result";
 import { collectRemoteSelections, createHiddenEditorManager, createHiddenEditorState } from "@stll/folio-core/controller/hiddenEditorManager";
 import { loadCollaborationModules } from "@stll/folio-core/controller/collaborationModules";
@@ -97,6 +98,7 @@ import { applyImagePosition, applyImageProperties, applyImageTransform, applyIma
 import { classifyEditorKeydown, deleteSelectedTable, isFocusInInputLike, isMacPlatform } from "@stll/folio-core/managers/editorShortcuts";
 import { getScrollTopForZoomAnchor, getViewportCenterZoomAnchorForZoomChange } from "@stll/folio-core/paged-layout/zoomScrollAnchor";
 import { ZOOM_MAX, ZOOM_MIN, ZOOM_STEP } from "@stll/folio-core/utils/zoom";
+import { isValidHexId } from "@stll/folio-core/utils/hexId";
 import { createRoot } from "react-dom/client";
 //#region src/hooks/useHistory.ts
 /**
@@ -1005,6 +1007,10 @@ function _temp$9(rect, idx) {
 * `FontFace` handles so the caller can remove them on document change/unmount,
 * preventing one document's embedded family from bleeding into the next.
 */
+const EMPTY_LOADED_EMBEDDED_FONTS = {
+	faces: [],
+	familyMap: /* @__PURE__ */ new Map()
+};
 function getDocumentFontSet$1() {
 	if (typeof document === "undefined" || !("fonts" in document)) return null;
 	return document.fonts;
@@ -1037,14 +1043,14 @@ async function registerFontFace(fontSet, family, source, descriptors) {
 */
 async function loadEmbeddedFontFaces(buffer) {
 	const fontSet = getDocumentFontSet$1();
-	if (!fontSet) return [];
+	if (!fontSet) return EMPTY_LOADED_EMBEDDED_FONTS;
 	let fonts;
 	try {
 		fonts = await extractEmbeddedFonts(buffer);
 	} catch {
-		return [];
+		return EMPTY_LOADED_EMBEDDED_FONTS;
 	}
-	if (fonts.length === 0) return [];
+	if (fonts.length === 0) return EMPTY_LOADED_EMBEDDED_FONTS;
 	const loaded = [];
 	await Promise.all(fonts.map(async (font) => {
 		const face = await registerFontFace(fontSet, font.family, font.bytes, {
@@ -1053,7 +1059,10 @@ async function loadEmbeddedFontFaces(buffer) {
 		});
 		if (face) loaded.push(face);
 	}));
-	return loaded;
+	return {
+		faces: loaded,
+		familyMap: buildEmbeddedFontFamilyMap(fonts)
+	};
 }
 /** Remove previously registered faces from the document font set. */
 function removeFontFaces(faces) {
@@ -4341,7 +4350,10 @@ const PagedEditor = forwardRef(function PagedEditor(props, ref) {
 			e.preventDefault();
 			return;
 		}
-		if (e.button !== 0) return;
+		if (e.button !== 0) {
+			if ((e.target instanceof HTMLElement ? e.target : null)?.closest("a[href]") instanceof HTMLAnchorElement) e.preventDefault();
+			return;
+		}
 		setTableInsertButton(null);
 		clearTableInsertTimer();
 		const target_1 = e.target instanceof HTMLElement ? e.target : null;
@@ -5572,13 +5584,14 @@ const PagedEditor = forwardRef(function PagedEditor(props, ref) {
 		if (!embeddedFontBuffer) return;
 		let cancelled_1 = false;
 		let registered = [];
-		loadEmbeddedFontFaces(embeddedFontBuffer).then((faces) => {
+		loadEmbeddedFontFaces(embeddedFontBuffer).then(({ faces, familyMap }) => {
 			if (cancelled_1) {
 				removeFontFaces(faces);
 				return;
 			}
 			registered = faces;
-			if (faces.length === 0) return;
+			if (faces.length === 0 && familyMap.size === 0) return;
+			setEmbeddedFontFamilyMap(familyMap.size > 0 ? familyMap : null);
 			const view_23 = hiddenPMRef.current?.getView();
 			if (!view_23) return;
 			resetCanvasContext();
@@ -5589,6 +5602,7 @@ const PagedEditor = forwardRef(function PagedEditor(props, ref) {
 		return () => {
 			cancelled_1 = true;
 			removeFontFaces(registered);
+			setEmbeddedFontFamilyMap(null);
 		};
 	}, [embeddedFontBuffer]);
 	useEffect(() => {
@@ -12186,13 +12200,52 @@ const getBuiltinTableStyle = (styleId) => BUILTIN_STYLES.find((s) => s.id === st
 * (`replaceComments`/`updateComments`) stay in the component because they
 * depend on its document-build pipeline.
 */
+/**
+* Sanitize a `paraId`/`textId`-bearing paragraph: drop either field when it
+* isn't a well-formed OOXML long-hex id (see `isValidHexId`), leaving
+* everything else untouched. Comment paragraphs from a controlled
+* `commentsProp` come from the host app rather than our own parser/
+* serializer, so they aren't guaranteed to satisfy the id shape those trust.
+*/
+function sanitizeCommentParagraph(paragraph) {
+	const paraIdValid = paragraph.paraId === void 0 || isValidHexId(paragraph.paraId);
+	const textIdValid = paragraph.textId === void 0 || isValidHexId(paragraph.textId);
+	if (paraIdValid && textIdValid) return paragraph;
+	const { paraId, textId, ...rest } = paragraph;
+	return {
+		...rest,
+		...paraIdValid && paraId !== void 0 ? { paraId } : {},
+		...textIdValid && textId !== void 0 ? { textId } : {}
+	};
+}
+/**
+* Validate a controlled `commentsProp` at the boundary before it becomes
+* editor state. A host app (or a collaboration payload relayed through it)
+* can hand back arbitrary JSON, so `id` isn't guaranteed numeric and
+* paragraph `paraId`/`textId` aren't guaranteed to be real Word ids — both
+* eventually reach XML/CSS-adjacent serialization (comment threading,
+* `[data-comment-id]` selectors). Comments with a non-finite `id` are
+* dropped entirely; malformed paraId/textId are stripped in place.
+*/
+function sanitizeControlledComments(comments) {
+	const sanitized = [];
+	for (const comment of comments) {
+		if (!Number.isFinite(comment.id)) continue;
+		sanitized.push({
+			...comment,
+			content: comment.content.map(sanitizeCommentParagraph)
+		});
+	}
+	return sanitized;
+}
 function useFolioComments({ doc, autoOpenReviewSidebar, anchorPositions, editorContentRef, commentsProp, onCommentsChange }) {
 	const [showCommentsSidebar, setShowCommentsSidebar] = useState(false);
 	const [visibleCommentAuthors, setVisibleCommentAuthors] = useState(null);
 	const [activeCommentId, setActiveCommentId] = useState(null);
 	const [internalComments, setInternalComments] = useState([]);
-	const isControlledComments = commentsProp !== void 0;
-	const comments = isControlledComments ? commentsProp : internalComments;
+	const sanitizedCommentsProp = useMemo(() => commentsProp !== void 0 ? sanitizeControlledComments(commentsProp) : void 0, [commentsProp]);
+	const isControlledComments = sanitizedCommentsProp !== void 0;
+	const comments = isControlledComments ? sanitizedCommentsProp : internalComments;
 	const commentsDirtyRef = useRef(false);
 	const commentsRef = useRef(comments);
 	commentsRef.current = comments;
@@ -12347,7 +12400,7 @@ function useFolioComments({ doc, autoOpenReviewSidebar, anchorPositions, editorC
 * - Error boundary
 * - Loading states
 */
-const CommentsSidebar = lazy(() => import("./CommentsSidebar-ml91aGZ1.js").then((m) => ({ default: m.CommentsSidebar })));
+const CommentsSidebar = lazy(() => import("./CommentsSidebar-mwa9JsIj.js").then((m) => ({ default: m.CommentsSidebar })));
 const TextContextMenu = lazy(() => import("./TextContextMenu-Ci7-M4oU.js").then((m) => ({ default: m.TextContextMenu })));
 const loadAttemptSelectiveSave = async () => {
 	const { attemptSelectiveSave } = await import("@stll/folio-core/docx/selectiveSave");
@@ -12445,6 +12498,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	showOutlineRef.current = showOutline;
 	const [outlineHeadings, setHeadingInfos] = useState([]);
 	const [, setTrackedChanges] = useState([]);
+	const trackedChangesRef = useRef([]);
 	const [anchorPositions, setAnchorPositions] = useState(EMPTY_ANCHOR_POSITIONS);
 	const { editingMode, readOnly, trackChangesOn, toggleTrackChanges, displayMode, setDisplayMode } = useEditorMode({
 		modeProp,
@@ -12484,6 +12538,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				last.to = entry_0.to;
 			} else merged.push({ ...entry_0 });
 		}
+		trackedChangesRef.current = merged;
 		setTrackedChanges(merged);
 	}, []);
 	useEffect(() => () => {
@@ -14012,7 +14067,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				undoHandle,
 				reason: "documentChanged"
 			};
-			if (!(pagedEditorRef.current?.undo() ?? false)) return {
+			if (!undo(view_21.state, view_21.dispatch)) return {
 				status: "rejected",
 				undoHandle,
 				reason: "documentChanged"
@@ -14169,82 +14224,118 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			});
 			return true;
 		},
-		getTrackedChanges: () => {
+		getSuggestions: () => {
 			const view_29 = pagedEditorRef.current?.getView();
-			return view_29 ? getTrackedChangesFromDoc(view_29.state.doc) : [];
+			return view_29 ? getSuggestions(view_29.state) : [];
 		},
-		getCommentAnchors: () => {
+		acceptSuggestion: (suggestionId, options_2) => {
 			const view_30 = pagedEditorRef.current?.getView();
-			return view_30 ? getCommentAnchorsFromDoc(view_30.state.doc) : [];
+			if (!view_30) return {
+				accepted: false,
+				appliedAs: null
+			};
+			const appliedAs = getSuggestions(view_30.state).find((s_0) => s_0.suggestionId === suggestionId)?.appliedAs ?? null;
+			const accepted = acceptSuggestion(suggestionId, { author: options_2?.author ?? author })(view_30.state, view_30.dispatch);
+			return {
+				accepted,
+				appliedAs: accepted ? appliedAs : null
+			};
 		},
-		getSelectionText: () => {
+		rejectSuggestion: (suggestionId_0) => {
 			const view_31 = pagedEditorRef.current?.getView();
-			return view_31 ? getSelectedText(view_31.state) : "";
+			if (!view_31) return false;
+			return rejectSuggestion(suggestionId_0)(view_31.state, view_31.dispatch);
 		},
-		getPageText: (page_0) => {
+		scrollToSuggestion: (suggestionId_1) => {
 			const view_32 = pagedEditorRef.current?.getView();
-			if (!view_32) return null;
-			return getPageTextFromLayout(pagedEditorRef.current?.getEditor()?.getLayout() ?? null, view_32.state.doc, page_0);
+			if (!view_32) return false;
+			const range_5 = findSuggestionRange(view_32.state, suggestionId_1);
+			if (!range_5) return false;
+			const { from: from_12, to: to_12 } = clampRangeToDocSize(view_32.state.doc.content.size, range_5);
+			const $from_3 = view_32.state.doc.resolve(from_12);
+			const $to_3 = view_32.state.doc.resolve(to_12);
+			view_32.dispatch(view_32.state.tr.setSelection(TextSelection.between($from_3, $to_3)));
+			requestAnimationFrame(() => {
+				pagedEditorRef.current?.scrollToPosition(from_12);
+			});
+			return true;
 		},
-		getTargetPage: (target_2, snapshot_4) => {
+		getTrackedChanges: () => {
 			const view_33 = pagedEditorRef.current?.getView();
-			if (!view_33) return null;
-			const range_5 = target_2.type === "textRange" ? resolveFolioAITextRange({
+			return view_33 ? getTrackedChangesFromDoc(view_33.state.doc) : [];
+		},
+		getCommentAnchors: () => {
+			const view_34 = pagedEditorRef.current?.getView();
+			return view_34 ? getCommentAnchorsFromDoc(view_34.state.doc) : [];
+		},
+		getSelectionText: () => {
+			const view_35 = pagedEditorRef.current?.getView();
+			return view_35 ? getSelectedText(view_35.state) : "";
+		},
+		getPageText: (page_0) => {
+			const view_36 = pagedEditorRef.current?.getView();
+			if (!view_36) return null;
+			return getPageTextFromLayout(pagedEditorRef.current?.getEditor()?.getLayout() ?? null, view_36.state.doc, page_0);
+		},
+		getTargetPage: (target_2, snapshot_4) => {
+			const view_37 = pagedEditorRef.current?.getView();
+			if (!view_37) return null;
+			const range_6 = target_2.type === "textRange" ? resolveFolioAITextRange({
 				range: target_2,
-				doc: view_33.state.doc,
+				doc: view_37.state.doc,
 				snapshot: snapshot_4
 			}) : resolveFolioAIBlockRange({
 				blockId: target_2.blockId,
-				doc: view_33.state.doc,
+				doc: view_37.state.doc,
 				snapshot: snapshot_4
 			});
-			if (range_5 === null) return null;
-			return pagedEditorRef.current?.getPageNumberForPmPos(range_5.from) ?? null;
+			if (range_6 === null) return null;
+			return pagedEditorRef.current?.getPageNumberForPmPos(range_6.from) ?? null;
 		},
 		getContentControls: (filter = {}) => {
-			const view_34 = pagedEditorRef.current?.getView();
-			if (!view_34) return [];
-			return findBlockSdtMatches(view_34.state.doc, filter).map((match_0) => ({
+			const view_38 = pagedEditorRef.current?.getView();
+			if (!view_38) return [];
+			return findBlockSdtMatches(view_38.state.doc, filter).map((match_0) => ({
 				properties: blockSdtAttrsToSdtProperties(match_0.node),
 				path: match_0.path,
 				pmPos: match_0.pos
 			}));
 		},
 		scrollToContentControl: (filter_0) => {
-			const view_35 = pagedEditorRef.current?.getView();
-			if (!view_35) return false;
-			const match_1 = findBlockSdtMatch(view_35.state.doc, filter_0);
+			const view_39 = pagedEditorRef.current?.getView();
+			if (!view_39) return false;
+			const match_1 = findBlockSdtMatch(view_39.state.doc, filter_0);
 			if (!match_1) return false;
 			const inside = match_1.pos + 1;
-			const $pos = view_35.state.doc.resolve(inside);
-			view_35.dispatch(view_35.state.tr.setSelection(TextSelection.near($pos)));
+			const $pos = view_39.state.doc.resolve(inside);
+			view_39.dispatch(view_39.state.tr.setSelection(TextSelection.near($pos)));
 			requestAnimationFrame(() => {
 				pagedEditorRef.current?.scrollToPosition(inside);
 			});
 			return true;
 		},
-		setContentControlContent: (filter_1, input, options_2 = {}) => {
-			const view_36 = pagedEditorRef.current?.getView();
-			if (!view_36) return false;
-			const tr_0 = typeof input === "string" ? setContentControlContentTr(view_36.state, filter_1, input, options_2) : setContentControlContentBlocksTr(view_36.state, filter_1, input, options_2);
+		setContentControlContent: (filter_1, input, options_3 = {}) => {
+			const view_40 = pagedEditorRef.current?.getView();
+			if (!view_40) return false;
+			const tr_0 = typeof input === "string" ? setContentControlContentTr(view_40.state, filter_1, input, options_3) : setContentControlContentBlocksTr(view_40.state, filter_1, input, options_3);
 			if (!tr_0) return false;
-			view_36.dispatch(tr_0);
+			view_40.dispatch(tr_0);
 			return true;
 		},
-		setContentControlValue: (filter_2, input_0, options_3 = {}) => {
-			const view_37 = pagedEditorRef.current?.getView();
-			if (!view_37) return false;
-			const tr_1 = setContentControlValueTr(view_37.state, filter_2, input_0, options_3);
+		setContentControlValue: (filter_2, input_0, options_4 = {}) => {
+			const view_41 = pagedEditorRef.current?.getView();
+			if (!view_41) return false;
+			const tr_1 = setContentControlValueTr(view_41.state, filter_2, input_0, options_4);
 			if (!tr_1) return false;
-			view_37.dispatch(tr_1);
+			view_41.dispatch(tr_1);
 			return true;
 		},
-		removeContentControl: (filter_3, options_4 = {}) => {
-			const view_38 = pagedEditorRef.current?.getView();
-			if (!view_38) return false;
-			const tr_2 = removeContentControlTr(view_38.state, filter_3, options_4);
+		removeContentControl: (filter_3, options_5 = {}) => {
+			const view_42 = pagedEditorRef.current?.getView();
+			if (!view_42) return false;
+			const tr_2 = removeContentControlTr(view_42.state, filter_3, options_5);
 			if (!tr_2) return false;
-			view_38.dispatch(tr_2);
+			view_42.dispatch(tr_2);
 			return true;
 		}
 	}), [
@@ -14326,39 +14417,39 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		if (isDisplayMode(value)) setDisplayMode(value);
 	}, [setDisplayMode]);
 	const handleAcceptActiveChange = useCallback(() => {
-		const view_39 = pagedEditorRef.current?.getView();
-		if (!view_39) return;
-		const { from: from_12, to: to_12 } = view_39.state.selection;
-		const range_6 = findChangeAtPosition(view_39.state, from_12, to_12);
-		acceptChange(range_6.from, range_6.to)(view_39.state, view_39.dispatch);
+		const view_43 = pagedEditorRef.current?.getView();
+		if (!view_43) return;
+		const { from: from_13, to: to_13 } = view_43.state.selection;
+		const range_7 = findChangeAtPosition(view_43.state, from_13, to_13);
+		acceptChange(range_7.from, range_7.to)(view_43.state, view_43.dispatch);
 	}, []);
 	const handleRejectActiveChange = useCallback(() => {
-		const view_40 = pagedEditorRef.current?.getView();
-		if (!view_40) return;
-		const { from: from_13, to: to_13 } = view_40.state.selection;
-		const range_7 = findChangeAtPosition(view_40.state, from_13, to_13);
-		rejectChange(range_7.from, range_7.to)(view_40.state, view_40.dispatch);
+		const view_44 = pagedEditorRef.current?.getView();
+		if (!view_44) return;
+		const { from: from_14, to: to_14 } = view_44.state.selection;
+		const range_8 = findChangeAtPosition(view_44.state, from_14, to_14);
+		rejectChange(range_8.from, range_8.to)(view_44.state, view_44.dispatch);
 	}, []);
 	const handlePreviousChange = useCallback(() => {
-		const view_41 = pagedEditorRef.current?.getView();
-		if (!view_41) return;
-		const { from: from_14 } = view_41.state.selection;
-		const change = findPreviousChange(view_41.state, from_14);
+		const view_45 = pagedEditorRef.current?.getView();
+		if (!view_45) return;
+		const { from: from_15 } = view_45.state.selection;
+		const change = findPreviousChange(view_45.state, from_15);
 		if (!change) return;
-		view_41.dispatch(view_41.state.tr.setSelection(TextSelection.create(view_41.state.doc, change.from, change.to)));
-		view_41.focus();
+		view_45.dispatch(view_45.state.tr.setSelection(TextSelection.create(view_45.state.doc, change.from, change.to)));
+		view_45.focus();
 		requestAnimationFrame(() => {
 			pagedEditorRef.current?.scrollToPosition(change.from);
 		});
 	}, []);
 	const handleNextChange = useCallback(() => {
-		const view_42 = pagedEditorRef.current?.getView();
-		if (!view_42) return;
-		const { to: to_14 } = view_42.state.selection;
-		const change_0 = findNextChange(view_42.state, to_14);
+		const view_46 = pagedEditorRef.current?.getView();
+		if (!view_46) return;
+		const { to: to_15 } = view_46.state.selection;
+		const change_0 = findNextChange(view_46.state, to_15);
 		if (!change_0) return;
-		view_42.dispatch(view_42.state.tr.setSelection(TextSelection.create(view_42.state.doc, change_0.from, change_0.to)));
-		view_42.focus();
+		view_46.dispatch(view_46.state.tr.setSelection(TextSelection.create(view_46.state.doc, change_0.from, change_0.to)));
+		view_46.focus();
 		requestAnimationFrame(() => {
 			pagedEditorRef.current?.scrollToPosition(change_0.from);
 		});
@@ -14528,8 +14619,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		requestAnimationFrame(syncCommentHighlightStyles);
 	}, [onScrollTopChange, syncCommentHighlightStyles]);
 	const handlePagedSelectionChange = useCallback((_from, _to) => {
-		const view_43 = getActiveEditorView() ?? pagedEditorRef.current?.getView() ?? null;
-		handleSelectionChange(view_43 ? extractSelectionState(view_43.state) : null);
+		const view_47 = getActiveEditorView() ?? pagedEditorRef.current?.getView() ?? null;
+		handleSelectionChange(view_47 ? extractSelectionState(view_47.state) : null);
 	}, [getActiveEditorView, handleSelectionChange]);
 	const handleTotalPagesChange = useCallback((totalPages) => {
 		setScrollPageInfo((previous) => updateScrollPageTotal(previous, totalPages));
@@ -14554,9 +14645,9 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	}, [author, updateComments]);
 	const handleAddComment = useCallback((addText) => {
 		const comment_3 = createComment(addText, author);
-		const view_44 = pagedEditorRef.current?.getView();
-		if (!view_44 || !commentSelectionRange) return false;
-		if (!applyCommentMarkRange(view_44, commentSelectionRange, comment_3.id, { replacePending: true })) return false;
+		const view_48 = pagedEditorRef.current?.getView();
+		if (!view_48 || !commentSelectionRange) return false;
+		if (!applyCommentMarkRange(view_48, commentSelectionRange, comment_3.id, { replacePending: true })) return false;
 		const commentAuthor_2 = getCommentAuthorKey(comment_3.author);
 		setVisibleCommentAuthors((current) => {
 			if (current === null) return null;
@@ -14590,8 +14681,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		updateComments((previous_4) => [...previous_4, createComment(text_7, author, revisionId_2)]);
 	}, [author, updateComments]);
 	const handleCancelAddComment = useCallback(() => {
-		const view_45 = pagedEditorRef.current?.getView();
-		if (view_45 && commentSelectionRange) removePendingCommentMarkRange(view_45, commentSelectionRange);
+		const view_49 = pagedEditorRef.current?.getView();
+		if (view_49 && commentSelectionRange) removePendingCommentMarkRange(view_49, commentSelectionRange);
 		setIsAddingComment(false);
 		setCommentSelectionRange(null);
 		setAddCommentYPosition(null);
@@ -14601,18 +14692,27 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		setCommentSelectionRange,
 		setIsAddingComment
 	]);
-	const handleSidebarAcceptChange = useCallback((from_15, to_15) => {
-		const view_46 = pagedEditorRef.current?.getView();
-		if (!view_46) return;
-		acceptChange(from_15, to_15)(view_46.state, view_46.dispatch);
+	const resolveSidebarChangeRevisionId = useCallback((from_16, to_16) => {
+		return trackedChangesRef.current.find((candidate) => {
+			return candidate.from === from_16 && candidate.to === to_16;
+		})?.revisionId ?? null;
+	}, []);
+	const handleSidebarAcceptChange = useCallback((from_17, to_17) => {
+		const view_50 = pagedEditorRef.current?.getView();
+		if (!view_50) return;
+		const revisionId_3 = resolveSidebarChangeRevisionId(from_17, to_17);
+		if (revisionId_3 === null) return;
+		acceptAIEditRevision(revisionId_3)(view_50.state, view_50.dispatch);
 		extractTrackedChanges();
-	}, [extractTrackedChanges]);
-	const handleSidebarRejectChange = useCallback((from_16, to_16) => {
-		const view_47 = pagedEditorRef.current?.getView();
-		if (!view_47) return;
-		rejectChange(from_16, to_16)(view_47.state, view_47.dispatch);
+	}, [extractTrackedChanges, resolveSidebarChangeRevisionId]);
+	const handleSidebarRejectChange = useCallback((from_18, to_18) => {
+		const view_51 = pagedEditorRef.current?.getView();
+		if (!view_51) return;
+		const revisionId_4 = resolveSidebarChangeRevisionId(from_18, to_18);
+		if (revisionId_4 === null) return;
+		rejectAIEditRevision(revisionId_4)(view_51.state, view_51.dispatch);
 		extractTrackedChanges();
-	}, [extractTrackedChanges]);
+	}, [extractTrackedChanges, resolveSidebarChangeRevisionId]);
 	const commentsPageWidth = history.state?.package.document.finalSectionProperties?.pageWidth;
 	const commentsSidebarOverlay = useMemo(() => {
 		if (!showCommentsSidebar) return;
@@ -14686,8 +14786,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	}, [readOnly]);
 	const closeTableProperties = useCallback(() => setTablePropsOpen(false), []);
 	const applyTableProperties = useCallback((props_0) => {
-		const view_48 = getActiveEditorView();
-		if (view_48) setTableProperties(props_0)(view_48.state, view_48.dispatch);
+		const view_52 = getActiveEditorView();
+		if (view_52) setTableProperties(props_0)(view_52.state, view_52.dispatch);
 	}, [getActiveEditorView]);
 	const closeImagePosition = useCallback(() => setImagePositionOpen(false), [setImagePositionOpen]);
 	const closeImageProperties = useCallback(() => setImagePropsOpen(false), [setImagePropsOpen]);
@@ -14695,8 +14795,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	const closeFootnoteProperties = useCallback(() => setFootnotePropsOpen(false), []);
 	const closeInsertSymbol = useCallback(() => setShowInsertSymbol(false), []);
 	const insertSymbol = useCallback((symbol) => {
-		const view_49 = getActiveEditorView();
-		if (view_49) view_49.dispatch(view_49.state.tr.insertText(symbol).scrollIntoView());
+		const view_53 = getActiveEditorView();
+		if (view_53) view_53.dispatch(view_53.state.tr.insertText(symbol).scrollIntoView());
 	}, [getActiveEditorView]);
 	const imagePropertiesCurrentData = useMemo(() => buildImagePropertiesData(state.pmImageContext), [state.pmImageContext]);
 	const currentFindResult = findResultRef.current;
@@ -15031,8 +15131,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 														onMouseDown: (e_1) => {
 															e_1.preventDefault();
 															e_1.stopPropagation();
-															const view_50 = pagedEditorRef.current?.getView();
-															if (!view_50) {
+															const view_54 = pagedEditorRef.current?.getView();
+															if (!view_54) {
 																setFloatingCommentBtn(null);
 																return;
 															}
@@ -15040,9 +15140,9 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 																from: floatingCommentBtn.from,
 																to: floatingCommentBtn.to
 															};
-															const currentSelection = view_50.state.selection;
+															const currentSelection = view_54.state.selection;
 															const safeRange = resolveCommentCreationRange({
-																docSize: view_50.state.doc.content.size,
+																docSize: view_54.state.doc.content.size,
 																capturedRange,
 																currentRange: {
 																	from: currentSelection.from,
@@ -15056,7 +15156,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 																return;
 															}
 															setCommentSelectionRange(safeRange);
-															if (!applyCommentMarkRange(view_50, safeRange, -1, { selectEnd: true })) {
+															if (!applyCommentMarkRange(view_54, safeRange, -1, { selectEnd: true })) {
 																setCommentSelectionRange(null);
 																setFloatingCommentBtn(null);
 																return;