@stll/folio-react 0.29.0 → 0.30.0

package/dist/{renderAsync-D3Bxr14I.js → renderAsync-D6N8PUZ_.js}

@@ -31,7 +31,6 @@ import { executeEditorCommand, executeFirstEditorCommand } from "@stll/folio-cor
 import { insertPageBreak } from "@stll/folio-core/prosemirror/commands/pageBreak";
 import { clearTrackedChanges, getChangedParagraphIds, hasStructuralChanges, hasUntrackedChanges, repackWithEditorSectionRemovals } from "@stll/folio-core/prosemirror/extensions/features/ParagraphChangeTrackerExtension";
 import { createStarterKit } from "@stll/folio-core/prosemirror/extensions/StarterKit";
-import { findInMarkupView, resolveFindMatchRange } from "@stll/folio-core/prosemirror/findReplaceSelection";
 import { createAICitationDecorationsPlugin } from "@stll/folio-core/prosemirror/plugins/aiCitationDecorations";
 import { AI_SUGGESTION_SEVERITY_CLASS, aiSuggestionDecorationsKey, createAISuggestionDecorationsPlugin } from "@stll/folio-core/prosemirror/plugins/aiSuggestionDecorations";
 import { anonymizationDecorationsKey, createAnonymizationDecorationsPlugin, slugAnonymizationLabel } from "@stll/folio-core/prosemirror/plugins/anonymizationDecorations";
@@ -107,7 +106,7 @@ import { getFolioParaIdFromBlockId } from "@stll/folio-core/types/block-id";
 import { getPageTextFromLayout } from "@stll/folio-core/paged-layout/pageText";
 import { allocateCommentId, seedCommentIdAbove } from "@stll/folio-core/prosemirror/commentIdAllocator";
 import { ContentControlWidgetController } from "@stll/folio-core/controller/contentControlWidgetController";
-import { createDefaultFindOptions, findInDocument } from "@stll/folio-core/utils/findReplace";
+import { createDefaultFindOptions, replaceEligibility } from "@stll/folio-core/utils/findReplace";
 import { PANEL_METRICS, computePanelLayout } from "@stll/folio-core/panel-layout";
 import { ErrorManager } from "@stll/folio-core/managers/ErrorManager";
 import { ContextMenuManager } from "@stll/folio-core/managers/ContextMenuManager";
@@ -116,6 +115,9 @@ import { getDocumentLoadSource } from "@stll/folio-core/utils/documentLoaderBeha
 import { DISPLAY_MODES, EditorModeManager, getEditorReadOnlyReason, getReviewViewReadOnlyReason, isTrackChangesMode, toggledTrackChangesMode } from "@stll/folio-core/managers/EditorModeManager";
 import { reviewDisplayModeToDisplayMode } from "@stll/folio-core/managers/reviewDisplayMode";
 import { FindReplaceManager } from "@stll/folio-core/managers/FindReplaceManager";
+import { findInDisplayedDocument } from "@stll/folio-core/prosemirror/findReplaceSelection";
+import { createFindQueryKey, createFindSearchKey, sameFindBodyVersion, sameFindSearchKey } from "@stll/folio-core/utils/findSearchKey";
+import { createFindMatchView, getRenderedSearchStories } from "@stll/folio-core/utils/findMatchView";
 import { createEmptyHeaderFooter, pickActiveHeaderFooterRId, removeHeaderFooter, resolveEffectiveSectionProperties, resolveHeaderFooterContent, saveHeaderFooterContent } from "@stll/folio-core/utils/headerFooter";
 import { createCanonicalHeaderFooterOperation, removeCanonicalHeaderFooterOperations } from "@stll/folio-core/controller/canonicalOperations";
 import { editHyperlinkAtCursor, removeHyperlinkAtCursor } from "@stll/folio-core/prosemirror/commands/hyperlink";
@@ -7529,12 +7531,6 @@ const readFindSelectionSeed = () => {
 	return selection && !selection.isCollapsed ? selection.toString() : "";
 };
 //#endregion
-//#region src/components/dialogs/findReplaceUtils.ts
-const scrollToMatch = (containerElement, match) => {
-	if (!containerElement) return;
-	scrollEditorElementIntoView(containerElement.querySelector(`[data-paragraph-index="${match.paragraphIndex}"]`) ?? containerElement.querySelector(`.layout-paragraph[data-block-id="block-${match.paragraphIndex + 1}"]`) ?? containerElement.querySelectorAll(".layout-paragraph").item(match.paragraphIndex));
-};
-//#endregion
 //#region src/components/dialogs/useFindReplace.ts
 /**
 * useFindReplace Hook
@@ -8348,7 +8344,7 @@ function _temp$10(heading) {
 }
 //#endregion
 //#region src/components/DocxEditorDialogs.tsx
-const FindReplaceDialog = lazy(() => import("./FindReplaceDialog-CUd8xdgd.js").then((n) => n.n).then((m) => ({ default: m.FindReplaceDialog })));
+const FindReplaceDialog = lazy(() => import("./FindReplaceDialog-C3njN6OI.js").then((n) => n.n).then((m) => ({ default: m.FindReplaceDialog })));
 const TablePropertiesDialog = lazy(() => import("./TablePropertiesDialog-uSTmyEcu.js").then((n) => n.n).then((m) => ({ default: m.TablePropertiesDialog })));
 const ImagePositionDialog = lazy(() => import("./ImagePositionDialog-Oap9knQ-.js").then((n) => n.n).then((m) => ({ default: m.ImagePositionDialog })));
 const ImagePropertiesDialog = lazy(() => import("./ImagePropertiesDialog-lLMKHv0u.js").then((n) => n.n).then((m) => ({ default: m.ImagePropertiesDialog })));
@@ -8357,88 +8353,94 @@ const PageSetupDialog = lazy(() => import("./PageSetupDialog-DTWCdPkX.js").then(
 const SetNumberingValueDialog = lazy(() => import("./SetNumberingValueDialog-twVIZMLc.js").then((m) => ({ default: m.SetNumberingValueDialog })));
 const InsertSymbolDialog = lazy(() => import("./InsertSymbolDialog-Drm40-9j.js").then((n) => n.n).then((m) => ({ default: m.InsertSymbolDialog })));
 function DocxEditorDialogs(t0) {
-	const $ = c(52);
+	const $ = c(55);
 	const { findReplace, tableProperties, imagePosition, imageProperties, pageSetup, footnoteProperties, insertSymbol, setNumberingValue } = t0;
 	let t1;
-	if ($[0] !== findReplace.currentResult || $[1] !== findReplace.onClose || $[2] !== findReplace.onFind || $[3] !== findReplace.onFindNext || $[4] !== findReplace.onFindPrevious || $[5] !== findReplace.onReplace || $[6] !== findReplace.onReplaceAll || $[7] !== findReplace.state.dialog.status || $[8] !== findReplace.state.searchText) {
+	if ($[0] !== findReplace.currentSearch || $[1] !== findReplace.onClose || $[2] !== findReplace.onFind || $[3] !== findReplace.onFindNext || $[4] !== findReplace.onFindPrevious || $[5] !== findReplace.onQueryChange || $[6] !== findReplace.onReplace || $[7] !== findReplace.onReplaceAll || $[8] !== findReplace.readOnly || $[9] !== findReplace.state.dialog.mode || $[10] !== findReplace.state.dialog.status || $[11] !== findReplace.state.searchText) {
 		t1 = findReplace.state.dialog.status === "open" && /* @__PURE__ */ jsx(FindReplaceDialog, {
 			isOpen: true,
 			onClose: findReplace.onClose,
 			onFind: findReplace.onFind,
+			onQueryChange: findReplace.onQueryChange,
 			onFindNext: findReplace.onFindNext,
 			onFindPrevious: findReplace.onFindPrevious,
 			onReplace: findReplace.onReplace,
 			onReplaceAll: findReplace.onReplaceAll,
 			initialSearchText: findReplace.state.searchText,
-			currentResult: findReplace.currentResult
+			currentSearch: findReplace.currentSearch,
+			readOnly: findReplace.readOnly,
+			replaceMode: findReplace.state.dialog.mode === "replace"
 		});
-		$[0] = findReplace.currentResult;
+		$[0] = findReplace.currentSearch;
 		$[1] = findReplace.onClose;
 		$[2] = findReplace.onFind;
 		$[3] = findReplace.onFindNext;
 		$[4] = findReplace.onFindPrevious;
-		$[5] = findReplace.onReplace;
-		$[6] = findReplace.onReplaceAll;
-		$[7] = findReplace.state.dialog.status;
-		$[8] = findReplace.state.searchText;
-		$[9] = t1;
-	} else t1 = $[9];
+		$[5] = findReplace.onQueryChange;
+		$[6] = findReplace.onReplace;
+		$[7] = findReplace.onReplaceAll;
+		$[8] = findReplace.readOnly;
+		$[9] = findReplace.state.dialog.mode;
+		$[10] = findReplace.state.dialog.status;
+		$[11] = findReplace.state.searchText;
+		$[12] = t1;
+	} else t1 = $[12];
 	let t2;
-	if ($[10] !== tableProperties.currentProps || $[11] !== tableProperties.isOpen || $[12] !== tableProperties.onApply || $[13] !== tableProperties.onClose) {
+	if ($[13] !== tableProperties.currentProps || $[14] !== tableProperties.isOpen || $[15] !== tableProperties.onApply || $[16] !== tableProperties.onClose) {
 		t2 = tableProperties.isOpen && /* @__PURE__ */ jsx(TablePropertiesDialog, {
 			isOpen: tableProperties.isOpen,
 			onClose: tableProperties.onClose,
 			onApply: tableProperties.onApply,
 			...tableProperties.currentProps ? { currentProps: tableProperties.currentProps } : {}
 		});
-		$[10] = tableProperties.currentProps;
-		$[11] = tableProperties.isOpen;
-		$[12] = tableProperties.onApply;
-		$[13] = tableProperties.onClose;
-		$[14] = t2;
-	} else t2 = $[14];
+		$[13] = tableProperties.currentProps;
+		$[14] = tableProperties.isOpen;
+		$[15] = tableProperties.onApply;
+		$[16] = tableProperties.onClose;
+		$[17] = t2;
+	} else t2 = $[17];
 	let t3;
-	if ($[15] !== imagePosition.isOpen || $[16] !== imagePosition.onApply || $[17] !== imagePosition.onClose) {
+	if ($[18] !== imagePosition.isOpen || $[19] !== imagePosition.onApply || $[20] !== imagePosition.onClose) {
 		t3 = imagePosition.isOpen && /* @__PURE__ */ jsx(ImagePositionDialog, {
 			isOpen: imagePosition.isOpen,
 			onClose: imagePosition.onClose,
 			onApply: imagePosition.onApply
 		});
-		$[15] = imagePosition.isOpen;
-		$[16] = imagePosition.onApply;
-		$[17] = imagePosition.onClose;
-		$[18] = t3;
-	} else t3 = $[18];
+		$[18] = imagePosition.isOpen;
+		$[19] = imagePosition.onApply;
+		$[20] = imagePosition.onClose;
+		$[21] = t3;
+	} else t3 = $[21];
 	let t4;
-	if ($[19] !== imageProperties.currentData || $[20] !== imageProperties.isOpen || $[21] !== imageProperties.onApply || $[22] !== imageProperties.onClose) {
+	if ($[22] !== imageProperties.currentData || $[23] !== imageProperties.isOpen || $[24] !== imageProperties.onApply || $[25] !== imageProperties.onClose) {
 		t4 = imageProperties.isOpen && /* @__PURE__ */ jsx(ImagePropertiesDialog, {
 			isOpen: imageProperties.isOpen,
 			onClose: imageProperties.onClose,
 			onApply: imageProperties.onApply,
 			...imageProperties.currentData ? { currentData: imageProperties.currentData } : {}
 		});
-		$[19] = imageProperties.currentData;
-		$[20] = imageProperties.isOpen;
-		$[21] = imageProperties.onApply;
-		$[22] = imageProperties.onClose;
-		$[23] = t4;
-	} else t4 = $[23];
+		$[22] = imageProperties.currentData;
+		$[23] = imageProperties.isOpen;
+		$[24] = imageProperties.onApply;
+		$[25] = imageProperties.onClose;
+		$[26] = t4;
+	} else t4 = $[26];
 	let t5;
-	if ($[24] !== pageSetup.currentProps || $[25] !== pageSetup.isOpen || $[26] !== pageSetup.onApply || $[27] !== pageSetup.onClose) {
+	if ($[27] !== pageSetup.currentProps || $[28] !== pageSetup.isOpen || $[29] !== pageSetup.onApply || $[30] !== pageSetup.onClose) {
 		t5 = pageSetup.isOpen && /* @__PURE__ */ jsx(PageSetupDialog, {
 			isOpen: pageSetup.isOpen,
 			onClose: pageSetup.onClose,
 			onApply: pageSetup.onApply,
 			...pageSetup.currentProps ? { currentProps: pageSetup.currentProps } : {}
 		});
-		$[24] = pageSetup.currentProps;
-		$[25] = pageSetup.isOpen;
-		$[26] = pageSetup.onApply;
-		$[27] = pageSetup.onClose;
-		$[28] = t5;
-	} else t5 = $[28];
+		$[27] = pageSetup.currentProps;
+		$[28] = pageSetup.isOpen;
+		$[29] = pageSetup.onApply;
+		$[30] = pageSetup.onClose;
+		$[31] = t5;
+	} else t5 = $[31];
 	let t6;
-	if ($[29] !== footnoteProperties.endnotePr || $[30] !== footnoteProperties.footnotePr || $[31] !== footnoteProperties.isOpen || $[32] !== footnoteProperties.onApply || $[33] !== footnoteProperties.onClose) {
+	if ($[32] !== footnoteProperties.endnotePr || $[33] !== footnoteProperties.footnotePr || $[34] !== footnoteProperties.isOpen || $[35] !== footnoteProperties.onApply || $[36] !== footnoteProperties.onClose) {
 		t6 = footnoteProperties.isOpen && /* @__PURE__ */ jsx(FootnotePropertiesDialog, {
 			isOpen: footnoteProperties.isOpen,
 			onClose: footnoteProperties.onClose,
@@ -8446,39 +8448,39 @@ function DocxEditorDialogs(t0) {
 			...footnoteProperties.footnotePr ? { footnotePr: footnoteProperties.footnotePr } : {},
 			...footnoteProperties.endnotePr ? { endnotePr: footnoteProperties.endnotePr } : {}
 		});
-		$[29] = footnoteProperties.endnotePr;
-		$[30] = footnoteProperties.footnotePr;
-		$[31] = footnoteProperties.isOpen;
-		$[32] = footnoteProperties.onApply;
-		$[33] = footnoteProperties.onClose;
-		$[34] = t6;
-	} else t6 = $[34];
+		$[32] = footnoteProperties.endnotePr;
+		$[33] = footnoteProperties.footnotePr;
+		$[34] = footnoteProperties.isOpen;
+		$[35] = footnoteProperties.onApply;
+		$[36] = footnoteProperties.onClose;
+		$[37] = t6;
+	} else t6 = $[37];
 	let t7;
-	if ($[35] !== insertSymbol.isOpen || $[36] !== insertSymbol.onClose || $[37] !== insertSymbol.onInsert) {
+	if ($[38] !== insertSymbol.isOpen || $[39] !== insertSymbol.onClose || $[40] !== insertSymbol.onInsert) {
 		t7 = insertSymbol.isOpen && /* @__PURE__ */ jsx(InsertSymbolDialog, {
 			isOpen: insertSymbol.isOpen,
 			onClose: insertSymbol.onClose,
 			onInsert: insertSymbol.onInsert
 		});
-		$[35] = insertSymbol.isOpen;
-		$[36] = insertSymbol.onClose;
-		$[37] = insertSymbol.onInsert;
-		$[38] = t7;
-	} else t7 = $[38];
+		$[38] = insertSymbol.isOpen;
+		$[39] = insertSymbol.onClose;
+		$[40] = insertSymbol.onInsert;
+		$[41] = t7;
+	} else t7 = $[41];
 	let t8;
-	if ($[39] !== setNumberingValue.isOpen || $[40] !== setNumberingValue.onApply || $[41] !== setNumberingValue.onClose) {
+	if ($[42] !== setNumberingValue.isOpen || $[43] !== setNumberingValue.onApply || $[44] !== setNumberingValue.onClose) {
 		t8 = setNumberingValue.isOpen && /* @__PURE__ */ jsx(SetNumberingValueDialog, {
 			isOpen: setNumberingValue.isOpen,
 			onClose: setNumberingValue.onClose,
 			onApply: setNumberingValue.onApply
 		});
-		$[39] = setNumberingValue.isOpen;
-		$[40] = setNumberingValue.onApply;
-		$[41] = setNumberingValue.onClose;
-		$[42] = t8;
-	} else t8 = $[42];
+		$[42] = setNumberingValue.isOpen;
+		$[43] = setNumberingValue.onApply;
+		$[44] = setNumberingValue.onClose;
+		$[45] = t8;
+	} else t8 = $[45];
 	let t9;
-	if ($[43] !== t1 || $[44] !== t2 || $[45] !== t3 || $[46] !== t4 || $[47] !== t5 || $[48] !== t6 || $[49] !== t7 || $[50] !== t8) {
+	if ($[46] !== t1 || $[47] !== t2 || $[48] !== t3 || $[49] !== t4 || $[50] !== t5 || $[51] !== t6 || $[52] !== t7 || $[53] !== t8) {
 		t9 = /* @__PURE__ */ jsxs(Suspense, {
 			fallback: null,
 			children: [
@@ -8492,16 +8494,16 @@ function DocxEditorDialogs(t0) {
 				t8
 			]
 		});
-		$[43] = t1;
-		$[44] = t2;
-		$[45] = t3;
-		$[46] = t4;
-		$[47] = t5;
-		$[48] = t6;
-		$[49] = t7;
-		$[50] = t8;
-		$[51] = t9;
-	} else t9 = $[51];
+		$[46] = t1;
+		$[47] = t2;
+		$[48] = t3;
+		$[49] = t4;
+		$[50] = t5;
+		$[51] = t6;
+		$[52] = t7;
+		$[53] = t8;
+		$[54] = t9;
+	} else t9 = $[54];
 	return t9;
 }
 //#endregion
@@ -10904,22 +10906,13 @@ function useEditorMode(t0) {
 * from `dialogs/useFindReplace.ts`; this hook layers the document-aware
 * operations (find, replace, scroll-to-match) on top.
 */
-const toEditorFindMatch = ({ from, to, ...match }) => ({
-	...match,
-	contentIndex: 0,
-	authoredRange: {
-		from,
-		to
-	}
-});
 function useFindReplace(t0) {
-	const $ = c(49);
-	const { documentState, getDocumentState, getEditorState, markupView: markupViewProp, containerRef, handleDocumentChange, findReplace, selectMatch, readOnlyReason, onReadonlyEditAttempt } = t0;
-	const markupView = markupViewProp ?? "all-markup";
+	const $ = c(89);
+	const { documentState, getDocumentState, getEditorState, containerRef, handleDocumentChange, findReplace, selectMatch, getBodyDoc, getLayout, displayMode, onFindResultChange, readOnlyReason, onReadonlyEditAttempt } = t0;
 	let t1;
-	if ($[0] !== markupView || $[1] !== readOnlyReason) {
-		t1 = getReviewViewReadOnlyReason(markupView) ?? readOnlyReason ?? null;
-		$[0] = markupView;
+	if ($[0] !== displayMode || $[1] !== readOnlyReason) {
+		t1 = getReviewViewReadOnlyReason(displayMode ?? "all-markup") ?? readOnlyReason ?? null;
+		$[0] = displayMode;
 		$[1] = readOnlyReason;
 		$[2] = t1;
 	} else t1 = $[2];
@@ -10930,208 +10923,476 @@ function useFindReplace(t0) {
 		$[3] = t2;
 	} else t2 = $[3];
 	const manager = t2;
-	const [currentResult, setCurrentResult] = useState(null);
-	const activeSearch = useRef(null);
-	const { setMatches, goToMatch } = findReplace;
 	let t3;
-	if ($[4] !== setMatches) {
-		t3 = () => {
-			activeSearch.current = null;
+	if ($[4] === Symbol.for("react.memo_cache_sentinel")) {
+		t3 = { status: "cleared" };
+		$[4] = t3;
+	} else t3 = $[4];
+	const [publishedResult, setPublishedResult] = useState(t3);
+	const { setMatches, goToMatch } = findReplace;
+	const matchView = useRef(null);
+	const query = useRef(null);
+	const searchSource = useRef(null);
+	let t4;
+	if ($[5] === Symbol.for("react.memo_cache_sentinel")) {
+		t4 = { status: "ready" };
+		$[5] = t4;
+	} else t4 = $[5];
+	const replacementGate = useRef(t4);
+	const resultCallback = useRef(onFindResultChange);
+	let t5;
+	let t6;
+	if ($[6] !== onFindResultChange) {
+		t5 = () => {
+			resultCallback.current = onFindResultChange;
+		};
+		t6 = [onFindResultChange];
+		$[6] = onFindResultChange;
+		$[7] = t5;
+		$[8] = t6;
+	} else {
+		t5 = $[7];
+		t6 = $[8];
+	}
+	useEffect(t5, t6);
+	let t7;
+	if ($[9] === Symbol.for("react.memo_cache_sentinel")) {
+		t7 = (result) => {
+			if (result) {
+				const source = searchSource.current;
+				if (!source) panic("Find result published without a search key");
+				setPublishedResult({
+					status: "ready",
+					queryKey: source.intentKey,
+					result
+				});
+			} else setPublishedResult({ status: "cleared" });
+			resultCallback.current?.(result);
+		};
+		$[9] = t7;
+	} else t7 = $[9];
+	const publish = t7;
+	let t8;
+	let t9;
+	if ($[10] === Symbol.for("react.memo_cache_sentinel")) {
+		t8 = () => () => matchView.current?.destroy();
+		t9 = [];
+		$[10] = t8;
+		$[11] = t9;
+	} else {
+		t8 = $[10];
+		t9 = $[11];
+	}
+	useEffect(t8, t9);
+	let t10;
+	if ($[12] !== setMatches) {
+		t10 = () => {
 			manager.clear();
-			setCurrentResult(null);
+			searchSource.current = null;
+			matchView.current?.destroy();
+			matchView.current = null;
+			publish(null);
 			setMatches([], 0);
 		};
-		$[4] = setMatches;
-		$[5] = t3;
-	} else t3 = $[5];
-	const resetFindResult = t3;
-	let t4;
-	if ($[6] !== documentState || $[7] !== getDocumentState) {
-		t4 = () => getDocumentState?.() ?? documentState ?? null;
-		$[6] = documentState;
-		$[7] = getDocumentState;
-		$[8] = t4;
-	} else t4 = $[8];
-	const readDocumentState = t4;
-	let t5;
-	if ($[9] !== containerRef || $[10] !== selectMatch) {
-		t5 = (match) => {
-			if (!selectMatch?.(match) && containerRef.current) scrollToMatch(containerRef.current, match);
+		$[12] = setMatches;
+		$[13] = t10;
+	} else t10 = $[13];
+	const clearFindResult = t10;
+	let t11;
+	if ($[14] !== clearFindResult) {
+		t11 = () => {
+			query.current = null;
+			clearFindResult();
 		};
-		$[9] = containerRef;
-		$[10] = selectMatch;
-		$[11] = t5;
-	} else t5 = $[11];
-	const revealMatch = t5;
-	let t6;
-	if ($[12] !== getEditorState || $[13] !== markupView || $[14] !== readDocumentState || $[15] !== resetFindResult || $[16] !== revealMatch || $[17] !== setMatches) {
-		t6 = (searchText, options) => {
-			const currentDocument = readDocumentState();
-			if (!currentDocument || !searchText.trim()) {
+		$[14] = clearFindResult;
+		$[15] = t11;
+	} else t11 = $[15];
+	const resetFindResult = t11;
+	let t12;
+	if ($[16] !== documentState || $[17] !== getDocumentState) {
+		t12 = () => getDocumentState?.() ?? documentState ?? null;
+		$[16] = documentState;
+		$[17] = getDocumentState;
+		$[18] = t12;
+	} else t12 = $[18];
+	const readDocumentState = t12;
+	let t13;
+	if ($[19] !== getEditorState) {
+		t13 = (currentDocument, searchText, options, context) => findInDisplayedDocument({
+			document: currentDocument,
+			...getEditorState && { state: getEditorState() },
+			searchText,
+			options,
+			context
+		});
+		$[19] = getEditorState;
+		$[20] = t13;
+	} else t13 = $[20];
+	const findDisplayedMatches = t13;
+	let t14;
+	if ($[21] !== selectMatch) {
+		t14 = (match) => {
+			const index = manager.getResult()?.currentIndex ?? 0;
+			matchView.current?.navigate(index, () => selectMatch?.(match));
+		};
+		$[21] = selectMatch;
+		$[22] = t14;
+	} else t14 = $[22];
+	const revealMatch = t14;
+	let t15;
+	if ($[23] === Symbol.for("react.memo_cache_sentinel")) {
+		t15 = (text, options_0) => {
+			query.current = {
+				text,
+				options: options_0
+			};
+		};
+		$[23] = t15;
+	} else t15 = $[23];
+	const handleQueryChange = t15;
+	let t16;
+	if ($[24] !== clearFindResult || $[25] !== containerRef || $[26] !== displayMode || $[27] !== findDisplayedMatches || $[28] !== getBodyDoc || $[29] !== getLayout || $[30] !== readDocumentState || $[31] !== resetFindResult || $[32] !== revealMatch || $[33] !== setMatches) {
+		t16 = (searchText_0, options_1) => {
+			const currentDocument_0 = readDocumentState();
+			if (!currentDocument_0 || !searchText_0.trim()) {
 				resetFindResult();
 				return null;
 			}
-			const editorState = getEditorState?.();
-			let matches;
-			if (markupView === "all-markup") matches = findInDocument(currentDocument, searchText, options);
-			else {
-				if (!editorState) {
-					resetFindResult();
-					return null;
-				}
-				matches = findInMarkupView({
-					state: editorState,
-					markupView,
-					searchText,
-					options
-				}).map(toEditorFindMatch);
+			const bodyDoc = getBodyDoc?.();
+			const effectiveOptions = {
+				...options_1,
+				includeComments: true,
+				...displayMode && { displayMode }
+			};
+			const context_0 = getLayout ? { renderedStories: getRenderedSearchStories(getLayout()) } : void 0;
+			const matches = findDisplayedMatches(currentDocument_0, searchText_0, effectiveOptions, context_0);
+			if (matches === null) {
+				query.current = {
+					text: searchText_0,
+					options: options_1
+				};
+				clearFindResult();
+				return null;
 			}
-			activeSearch.current = {
-				searchText,
-				options
+			const nextSource = createFindSearchKey({
+				query: searchText_0,
+				options: effectiveOptions,
+				document: currentDocument_0,
+				...bodyDoc && { bodyVersion: bodyDoc },
+				...context_0 && { context: context_0 }
+			});
+			const refresh = searchSource.current?.query === nextSource.query;
+			const currentIndex = refresh ? manager.getResult()?.currentIndex ?? 0 : 0;
+			query.current = {
+				text: searchText_0,
+				options: options_1
 			};
-			const result = manager.setMatches(matches);
-			setCurrentResult(result);
-			setMatches(matches, 0);
-			if (matches.length > 0) revealMatch(matches[0]);
-			return result;
+			searchSource.current = {
+				...nextSource,
+				intentKey: createFindQueryKey(searchText_0, options_1)
+			};
+			const result_0 = manager.setMatches(matches, currentIndex);
+			matchView.current?.destroy();
+			const container = containerRef.current;
+			matchView.current = container ? createFindMatchView({
+				container,
+				document: currentDocument_0,
+				bodyDoc,
+				matches,
+				layout: getLayout?.()
+			}) : null;
+			publish(result_0);
+			setMatches(matches, result_0.currentIndex);
+			matchView.current?.paint(result_0.currentIndex);
+			if (matches.length > 0 && !refresh) revealMatch(matches[0]);
+			return result_0;
 		};
-		$[12] = getEditorState;
-		$[13] = markupView;
-		$[14] = readDocumentState;
-		$[15] = resetFindResult;
-		$[16] = revealMatch;
-		$[17] = setMatches;
-		$[18] = t6;
-	} else t6 = $[18];
-	const handleFind = t6;
-	const previousMarkupView = useRef(markupView);
-	let t7;
-	let t8;
-	if ($[19] !== handleFind || $[20] !== markupView) {
-		t7 = () => {
-			if (previousMarkupView.current === markupView) return;
-			previousMarkupView.current = markupView;
-			const search = activeSearch.current;
-			if (search) handleFind(search.searchText, search.options);
+		$[24] = clearFindResult;
+		$[25] = containerRef;
+		$[26] = displayMode;
+		$[27] = findDisplayedMatches;
+		$[28] = getBodyDoc;
+		$[29] = getLayout;
+		$[30] = readDocumentState;
+		$[31] = resetFindResult;
+		$[32] = revealMatch;
+		$[33] = setMatches;
+		$[34] = t16;
+	} else t16 = $[34];
+	const handleFind = t16;
+	let t17;
+	let t18;
+	if ($[35] !== handleFind) {
+		t17 = () => {
+			if (!query.current) return;
+			const timer = setTimeout(() => {
+				const active = query.current;
+				if (active) handleFind(active.text, active.options);
+			}, 200);
+			return () => clearTimeout(timer);
 		};
-		t8 = [markupView, handleFind];
-		$[19] = handleFind;
-		$[20] = markupView;
-		$[21] = t7;
-		$[22] = t8;
+		t18 = [handleFind];
+		$[35] = handleFind;
+		$[36] = t17;
+		$[37] = t18;
 	} else {
-		t7 = $[21];
-		t8 = $[22];
+		t17 = $[36];
+		t18 = $[37];
 	}
-	useEffect(t7, t8);
-	let t9;
-	if ($[23] !== goToMatch || $[24] !== revealMatch) {
-		t9 = () => {
+	useEffect(t17, t18);
+	const previousDisplayMode = useRef(displayMode);
+	let t19;
+	let t20;
+	if ($[38] !== displayMode || $[39] !== handleFind) {
+		t19 = () => {
+			if (previousDisplayMode.current === displayMode) return;
+			previousDisplayMode.current = displayMode;
+			const active_0 = query.current;
+			if (active_0) handleFind(active_0.text, active_0.options);
+		};
+		t20 = [displayMode, handleFind];
+		$[38] = displayMode;
+		$[39] = handleFind;
+		$[40] = t19;
+		$[41] = t20;
+	} else {
+		t19 = $[40];
+		t20 = $[41];
+	}
+	useEffect(t19, t20);
+	let t21;
+	if ($[42] !== goToMatch || $[43] !== revealMatch) {
+		t21 = () => {
 			const stepped = manager.navigate("next");
 			if (!stepped) return null;
-			setCurrentResult(manager.getResult());
+			publish(manager.getResult());
 			goToMatch(stepped.index);
 			revealMatch(stepped.match);
 			return stepped.match;
 		};
-		$[23] = goToMatch;
-		$[24] = revealMatch;
-		$[25] = t9;
-	} else t9 = $[25];
-	const handleFindNext = t9;
-	let t10;
-	if ($[26] !== goToMatch || $[27] !== revealMatch) {
-		t10 = () => {
+		$[42] = goToMatch;
+		$[43] = revealMatch;
+		$[44] = t21;
+	} else t21 = $[44];
+	const handleFindNext = t21;
+	let t22;
+	if ($[45] !== goToMatch || $[46] !== revealMatch) {
+		t22 = () => {
 			const stepped_0 = manager.navigate("previous");
 			if (!stepped_0) return null;
-			setCurrentResult(manager.getResult());
+			publish(manager.getResult());
 			goToMatch(stepped_0.index);
 			revealMatch(stepped_0.match);
 			return stepped_0.match;
 		};
-		$[26] = goToMatch;
-		$[27] = revealMatch;
-		$[28] = t10;
-	} else t10 = $[28];
-	const handleFindPrevious = t10;
-	let t11;
-	if ($[29] !== handleDocumentChange || $[30] !== readDocumentState) {
-		t11 = (replaceText) => {
-			const currentDocument_0 = readDocumentState();
-			if (!currentDocument_0) return false;
-			const newDoc = manager.replaceCurrent(currentDocument_0, replaceText);
+		$[45] = goToMatch;
+		$[46] = revealMatch;
+		$[47] = t22;
+	} else t22 = $[47];
+	const handleFindPrevious = t22;
+	let t23;
+	if ($[48] !== displayMode || $[49] !== getBodyDoc || $[50] !== getLayout || $[51] !== handleFind) {
+		t23 = (currentDocument_1) => {
+			const active_1 = query.current;
+			if (!active_1) return false;
+			const bodyDoc_0 = getBodyDoc?.();
+			const context_1 = getLayout ? { renderedStories: getRenderedSearchStories(getLayout()) } : void 0;
+			const currentSource = createFindSearchKey({
+				query: active_1.text,
+				options: {
+					...active_1.options,
+					includeComments: true,
+					...displayMode && { displayMode }
+				},
+				document: currentDocument_1,
+				...bodyDoc_0 && { bodyVersion: bodyDoc_0 },
+				...context_1 && { context: context_1 }
+			});
+			bb215: switch (replacementGate.current.status) {
+				case "awaiting-document":
+					if (sameFindBodyVersion(replacementGate.current.source, currentSource)) return true;
+					replacementGate.current = { status: "ready" };
+					break bb215;
+				case "ready": break bb215;
+				default: return replacementGate.current;
+			}
+			if (sameFindSearchKey(searchSource.current, currentSource)) return false;
+			handleFind(active_1.text, active_1.options);
+			return true;
+		};
+		$[48] = displayMode;
+		$[49] = getBodyDoc;
+		$[50] = getLayout;
+		$[51] = handleFind;
+		$[52] = t23;
+	} else t23 = $[52];
+	const refreshChangedSource = t23;
+	let t24;
+	if ($[53] !== clearFindResult || $[54] !== handleDocumentChange) {
+		t24 = (nextDocument) => {
+			const source_0 = searchSource.current;
+			if (!source_0) panic("Replacement accepted without a search key");
+			replacementGate.current = {
+				status: "awaiting-document",
+				source: source_0
+			};
+			clearFindResult();
+			handleDocumentChange(nextDocument);
+		};
+		$[53] = clearFindResult;
+		$[54] = handleDocumentChange;
+		$[55] = t24;
+	} else t24 = $[55];
+	const acceptReplacement = t24;
+	let t25;
+	if ($[56] !== acceptReplacement || $[57] !== readDocumentState || $[58] !== refreshChangedSource) {
+		t25 = (replaceText) => {
+			const currentDocument_2 = readDocumentState();
+			if (!currentDocument_2) return false;
+			if (refreshChangedSource(currentDocument_2)) return false;
+			const result_1 = manager.getResult();
+			const match_0 = result_1?.matches.at(result_1.currentIndex);
+			if (!match_0 || replaceEligibility(match_0).status === "blocked") return false;
+			if (match_0.text === replaceText) return true;
+			const newDoc = manager.replaceCurrent(currentDocument_2, replaceText);
 			if (!newDoc) return false;
-			handleDocumentChange(newDoc);
+			acceptReplacement(newDoc);
 			return true;
 		};
-		$[29] = handleDocumentChange;
-		$[30] = readDocumentState;
-		$[31] = t11;
-	} else t11 = $[31];
-	const handleReplace = t11;
-	let t12;
-	if ($[32] !== handleDocumentChange || $[33] !== readDocumentState || $[34] !== resetFindResult) {
-		t12 = (searchText_0, replaceText_0, options_0) => {
-			const currentDocument_1 = readDocumentState();
-			if (!currentDocument_1 || !searchText_0.trim()) return 0;
-			const matches_0 = findInDocument(currentDocument_1, searchText_0, options_0);
-			const outcome = manager.replaceAll(currentDocument_1, matches_0, replaceText_0);
-			if (!outcome) return 0;
-			handleDocumentChange(outcome.document);
-			resetFindResult();
-			return outcome.replacedCount;
+		$[56] = acceptReplacement;
+		$[57] = readDocumentState;
+		$[58] = refreshChangedSource;
+		$[59] = t25;
+	} else t25 = $[59];
+	const handleReplace = t25;
+	let t26;
+	if ($[60] !== acceptReplacement || $[61] !== displayMode || $[62] !== findDisplayedMatches || $[63] !== getLayout || $[64] !== readDocumentState || $[65] !== refreshChangedSource) {
+		t26 = (searchText_1, replaceText_0, options_2) => {
+			const currentDocument_3 = readDocumentState();
+			if (!currentDocument_3 || !searchText_1.trim()) return {
+				replacedCount: 0,
+				skippedCount: 0
+			};
+			const previousCount = manager.getResult()?.matches.length ?? 0;
+			handleQueryChange(searchText_1, options_2);
+			if (refreshChangedSource(currentDocument_3)) return {
+				replacedCount: 0,
+				skippedCount: previousCount
+			};
+			const matches_0 = findDisplayedMatches(currentDocument_3, searchText_1, {
+				...options_2,
+				includeComments: true,
+				...displayMode && { displayMode }
+			}, getLayout ? { renderedStories: getRenderedSearchStories(getLayout()) } : void 0);
+			if (matches_0 === null) return {
+				replacedCount: 0,
+				skippedCount: previousCount
+			};
+			const mutationMatches = matches_0.filter((match_1) => replaceEligibility(match_1).status === "blocked" || match_1.text !== replaceText_0);
+			const unchangedCount = matches_0.length - mutationMatches.length;
+			if (mutationMatches.length === 0) return {
+				replacedCount: unchangedCount,
+				skippedCount: 0
+			};
+			const outcome = manager.replaceAll(currentDocument_3, mutationMatches, replaceText_0);
+			if (!outcome) return {
+				replacedCount: 0,
+				skippedCount: 0
+			};
+			if (outcome.replacedCount > 0) acceptReplacement(outcome.document);
+			return {
+				replacedCount: outcome.replacedCount + unchangedCount,
+				skippedCount: outcome.skippedCount
+			};
 		};
-		$[32] = handleDocumentChange;
-		$[33] = readDocumentState;
-		$[34] = resetFindResult;
-		$[35] = t12;
-	} else t12 = $[35];
-	const handleReplaceAll = t12;
-	let t13;
-	if ($[36] !== onReadonlyEditAttempt || $[37] !== replacementRefusal) {
-		t13 = () => {
+		$[60] = acceptReplacement;
+		$[61] = displayMode;
+		$[62] = findDisplayedMatches;
+		$[63] = getLayout;
+		$[64] = readDocumentState;
+		$[65] = refreshChangedSource;
+		$[66] = t26;
+	} else t26 = $[66];
+	const handleReplaceAll = t26;
+	let t27;
+	if ($[67] !== onReadonlyEditAttempt || $[68] !== replacementRefusal) {
+		t27 = () => {
 			if (replacementRefusal) onReadonlyEditAttempt?.(replacementRefusal);
 			return false;
 		};
-		$[36] = onReadonlyEditAttempt;
-		$[37] = replacementRefusal;
-		$[38] = t13;
-	} else t13 = $[38];
-	const refuseReplace = t13;
-	let t14;
-	if ($[39] !== refuseReplace) {
-		t14 = () => {
+		$[67] = onReadonlyEditAttempt;
+		$[68] = replacementRefusal;
+		$[69] = t27;
+	} else t27 = $[69];
+	const refuseReplace = t27;
+	let t28;
+	if ($[70] !== refuseReplace) {
+		t28 = () => {
 			refuseReplace();
-			return 0;
+			return {
+				replacedCount: 0,
+				skippedCount: manager.getResult()?.totalCount ?? 0
+			};
 		};
-		$[39] = refuseReplace;
-		$[40] = t14;
-	} else t14 = $[40];
-	const refuseReplaceAll = t14;
-	const t15 = replacementRefusal ? refuseReplace : handleReplace;
-	const t16 = replacementRefusal ? refuseReplaceAll : handleReplaceAll;
-	let t17;
-	if ($[41] !== currentResult || $[42] !== handleFind || $[43] !== handleFindNext || $[44] !== handleFindPrevious || $[45] !== resetFindResult || $[46] !== t15 || $[47] !== t16) {
-		t17 = {
-			currentResult,
+		$[70] = refuseReplace;
+		$[71] = t28;
+	} else t28 = $[71];
+	const refuseReplaceAll = t28;
+	const t29 = publishedResult.status === "ready" ? publishedResult.result : null;
+	let t30;
+	if ($[72] !== publishedResult.queryKey || $[73] !== publishedResult.result || $[74] !== publishedResult.status) {
+		t30 = publishedResult.status === "ready" ? {
+			queryKey: publishedResult.queryKey,
+			result: publishedResult.result
+		} : null;
+		$[72] = publishedResult.queryKey;
+		$[73] = publishedResult.result;
+		$[74] = publishedResult.status;
+		$[75] = t30;
+	} else t30 = $[75];
+	const t31 = replacementRefusal ? refuseReplace : handleReplace;
+	const t32 = replacementRefusal ? refuseReplaceAll : handleReplaceAll;
+	let t33;
+	if ($[76] === Symbol.for("react.memo_cache_sentinel")) {
+		t33 = () => manager.getResult();
+		$[76] = t33;
+	} else t33 = $[76];
+	let t34;
+	if ($[77] !== handleFind) {
+		t34 = () => {
+			const active_2 = query.current;
+			if (active_2) handleFind(active_2.text, active_2.options);
+		};
+		$[77] = handleFind;
+		$[78] = t34;
+	} else t34 = $[78];
+	let t35;
+	if ($[79] !== handleFind || $[80] !== handleFindNext || $[81] !== handleFindPrevious || $[82] !== resetFindResult || $[83] !== t29 || $[84] !== t30 || $[85] !== t31 || $[86] !== t32 || $[87] !== t34) {
+		t35 = {
+			currentResult: t29,
+			currentSearch: t30,
 			resetFindResult,
 			handleFind,
+			handleQueryChange,
 			handleFindNext,
 			handleFindPrevious,
-			handleReplace: t15,
-			handleReplaceAll: t16
+			handleReplace: t31,
+			handleReplaceAll: t32,
+			getFindResult: t33,
+			refreshFind: t34
 		};
-		$[41] = currentResult;
-		$[42] = handleFind;
-		$[43] = handleFindNext;
-		$[44] = handleFindPrevious;
-		$[45] = resetFindResult;
-		$[46] = t15;
-		$[47] = t16;
-		$[48] = t17;
-	} else t17 = $[48];
-	return t17;
+		$[79] = handleFind;
+		$[80] = handleFindNext;
+		$[81] = handleFindPrevious;
+		$[82] = resetFindResult;
+		$[83] = t29;
+		$[84] = t30;
+		$[85] = t31;
+		$[86] = t32;
+		$[87] = t34;
+		$[88] = t35;
+	} else t35 = $[88];
+	return t35;
 }
 //#endregion
 //#region src/components/hooks/useHeaderFooterEditor.ts
@@ -13925,7 +14186,7 @@ function _temp(id_4) {
 */
 /** No headings to track while the outline is not shown. */
 const NO_HEADINGS = [];
-const CommentsSidebar = lazy(() => import("./CommentsSidebar-D7eTgHpL.js").then((m) => ({ default: m.CommentsSidebar })));
+const CommentsSidebar = lazy(() => import("./CommentsSidebar-6K9GbqAA.js").then((m) => ({ default: m.CommentsSidebar })));
 const TextContextMenu = lazy(() => import("./TextContextMenu-DZ3AUFKh.js").then((m) => ({ default: m.TextContextMenu })));
 const loadAttemptSelectiveSave = async () => {
 	const { attemptSelectiveSave } = await import("@stll/folio-core/docx/selectiveSave");
@@ -14027,7 +14288,7 @@ const createPagedEditorBinding = () => {
 /**
 * DocxEditor - Complete DOCX editor component
 */
-const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, document: initialDocument, onSave, author = "User", onChange, onSelectionChange, onSelectionTextChange, onError, onFontsLoaded: onFontsLoadedCallback, fontFamilies, fonts, theme, showToolbar = true, showZoomControl = true, showReviewControls = true, showHeaderFooterEditing = true, pageRenderer, showMarginGuides = false, marginGuideColor, showRuler: showRulerProp = false, rulerUnit = "inch", initialZoom = 1, enableWheelZoom = true, keyboardShortcuts = DEFAULT_KEYBOARD_SHORTCUT_SCOPE, hostShortcuts: hostShortcutsProp, readOnly: readOnlyProp = false, reviewDisplayMode, showCommentHighlights = true, autoOpenReviewSidebar = true, components, toolbarExtra, className = "", style, placeholder, loadingIndicator, preserveDocumentWhileLoading = false, initialScrollTop, onScrollTopChange, showOutline: showOutlineProp = true, outlineDepth: outlineDepthProp, onOutlineDepthChange, onPrint, onInsertImage, onInsertTable, showTableInsert = true, onInsertPageBreak, onInsertTOC, onCopy, onCut, onPaste, mode: modeProp, onModeChange, onReadonlyEditAttempt, onCompatibilityChange, onEditorViewReady, onAnonymizationMatchesChange, onAnonymizationTermClick, selectedAnonymizationCanonical = null, anonymizationSelectionSeq, showTemplateDirectives = false, onSlashMenuChange, onSlashMenuKeyAction, customContextMenuItems, onCustomContextAction, comments: commentsProp, onCommentsChange, collaboration, plugins, featureFlags, experimentalSession, onSelectiveSaveTripwire }, ref) {
+const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, document: initialDocument, onSave, author = "User", onChange, onFindResultChange, onSelectionChange, onSelectionTextChange, onError, onFontsLoaded: onFontsLoadedCallback, fontFamilies, fonts, theme, showToolbar = true, showZoomControl = true, showReviewControls = true, showHeaderFooterEditing = true, pageRenderer, showMarginGuides = false, marginGuideColor, showRuler: showRulerProp = false, rulerUnit = "inch", initialZoom = 1, enableWheelZoom = true, keyboardShortcuts = DEFAULT_KEYBOARD_SHORTCUT_SCOPE, hostShortcuts: hostShortcutsProp, readOnly: readOnlyProp = false, reviewDisplayMode, showCommentHighlights = true, autoOpenReviewSidebar = true, components, toolbarExtra, className = "", style, placeholder, loadingIndicator, preserveDocumentWhileLoading = false, initialScrollTop, onScrollTopChange, showOutline: showOutlineProp = true, outlineDepth: outlineDepthProp, onOutlineDepthChange, onPrint, onInsertImage, onInsertTable, showTableInsert = true, onInsertPageBreak, onInsertTOC, onCopy, onCut, onPaste, mode: modeProp, onModeChange, onReadonlyEditAttempt, onCompatibilityChange, onEditorViewReady, onAnonymizationMatchesChange, onAnonymizationTermClick, selectedAnonymizationCanonical = null, anonymizationSelectionSeq, showTemplateDirectives = false, onSlashMenuChange, onSlashMenuKeyAction, customContextMenuItems, onCustomContextAction, comments: commentsProp, onCommentsChange, collaboration, plugins, featureFlags, experimentalSession, onSelectiveSaveTripwire }, ref) {
 	const pagedEditorRef = useRef(null);
 	const [pagedEditorBinding] = useState(createPagedEditorBinding);
 	const scrollContainerRef = useRef(null);
@@ -14786,46 +15047,86 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		onCommentsChange
 	]);
 	const selectFindMatch = useCallback((match) => {
-		const editor_1 = pagedEditorRef.current;
-		const view_8 = editor_1?.getView();
-		if (!editor_1 || !view_8) return false;
-		const range = match.authoredRange ?? resolveFindMatchRange(view_8.state.doc, match);
-		if (!range) return false;
-		editor_1.setSelection(range.from, range.to);
-		requestAnimationFrame(() => {
-			editor_1.scrollToPosition(range.from);
-		});
-		return true;
+		if (match.commentId !== void 0) {
+			setVisibleCommentAuthors(null);
+			setShowCommentsSidebar(true);
+			setActiveCommentId(commentsRef.current.find(({ id }) => id === match.commentId)?.parentId ?? match.commentId);
+			return true;
+		}
+		return false;
+	}, [
+		setActiveCommentId,
+		setVisibleCommentAuthors,
+		setShowCommentsSidebar,
+		commentsRef
+	]);
+	const getFindEditorState = useCallback(() => {
+		pagedEditorRef.current?.ensureView({ focus: false });
+		return pagedEditorRef.current?.getView()?.state ?? null;
 	}, []);
+	const getFindBodyDoc = useCallback(() => getFindEditorState()?.doc, [getFindEditorState]);
+	const getFindLayout = useCallback(() => pagedEditorRef.current?.getLayout() ?? null, []);
 	const notifyReadonlyEditAttempt = useCallback(() => {
 		if (readOnlyReason) onReadonlyEditAttempt?.(readOnlyReason);
 	}, [readOnlyReason, onReadonlyEditAttempt]);
-	const { currentResult: currentFindResult, resetFindResult, handleFind, handleFindNext, handleFindPrevious, handleReplace, handleReplaceAll } = useFindReplace({
+	const { currentSearch: currentFindSearch, resetFindResult, handleFind, handleQueryChange, handleFindNext, handleFindPrevious, handleReplace, handleReplaceAll, getFindResult, refreshFind } = useFindReplace({
+		documentState: history.state,
 		getDocumentState: buildCurrentDocument,
-		getEditorState: () => pagedEditorRef.current?.getView()?.state ?? null,
-		markupView: displayMode,
+		getEditorState: getFindEditorState,
 		containerRef,
 		handleDocumentChange,
 		findReplace,
 		selectMatch: selectFindMatch,
+		getBodyDoc: getFindBodyDoc,
+		getLayout: getFindLayout,
+		displayMode,
+		onFindResultChange,
 		readOnlyReason,
 		onReadonlyEditAttempt
 	});
+	const refreshFindRef = useRef(refreshFind);
+	useLayoutEffect(() => {
+		refreshFindRef.current = refreshFind;
+	}, [refreshFind]);
+	useEffect(() => {
+		if (bodyViewEpoch === 0) return;
+		const editor_1 = pagedEditorRef.current?.getEditor();
+		if (!editor_1) return;
+		let timer_1 = null;
+		const schedule = () => {
+			if (timer_1 !== null) clearTimeout(timer_1);
+			timer_1 = setTimeout(() => refreshFindRef.current(), 200);
+		};
+		const unsubscribe = editor_1.on("docChange", schedule);
+		const unsubscribeLayout = editor_1.on("layoutComplete", schedule);
+		return () => {
+			unsubscribe();
+			unsubscribeLayout();
+			if (timer_1 !== null) clearTimeout(timer_1);
+		};
+	}, [bodyViewEpoch]);
+	useEffect(() => {
+		const snapshot = comments;
+		const timer_2 = setTimeout(() => {
+			if (commentsRef.current === snapshot) refreshFindRef.current();
+		}, 200);
+		return () => clearTimeout(timer_2);
+	}, [comments, commentsRef]);
 	useLayoutEffect(() => {
 		resetFindResultRef.current = resetFindResult;
 	}, [resetFindResult]);
 	const handleSelectionChange = useCallback((selectionState) => {
-		const view_9 = getActiveEditorView();
-		if (view_9) {
-			const { from, to } = view_9.state.selection;
+		const view_8 = getActiveEditorView();
+		if (view_8) {
+			const { from, to } = view_8.state.selection;
 			lastSelectionRef.current = {
 				from,
 				to
 			};
 		}
 		let pmTableCtx = null;
-		if (view_9) {
-			pmTableCtx = getTableContext(view_9.state);
+		if (view_8) {
+			pmTableCtx = getTableContext(view_8.state);
 			if (!pmTableCtx.isInTable) pmTableCtx = null;
 		}
 		if (pmTableCtx?.cellBorderColor) {
@@ -14837,8 +15138,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				color: { rgb }
 			};
 		}
-		const pmImageCtx = view_9 ? detectImageContext(view_9.state) : null;
-		const trackedChange = view_9 ? detectActiveTrackedChange(view_9.state) : null;
+		const pmImageCtx = view_8 ? detectImageContext(view_8.state) : null;
+		const trackedChange = view_8 ? detectActiveTrackedChange(view_8.state) : null;
 		if (!selectionState) {
 			setFloatingCommentBtn(null);
 			setState((prev_1) => {
@@ -14901,10 +15202,10 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				activeTrackedChange: activeTrackedChange_0
 			};
 		});
-		if (view_9 && selectionState.hasSelection && !isAddingComment && !readOnly) {
+		if (view_8 && selectionState.hasSelection && !isAddingComment && !readOnly) {
 			const container = scrollContainerRef.current;
 			const parentEl = editorContentRef.current;
-			const { from: selFrom } = view_9.state.selection;
+			const { from: selFrom } = view_8.state.selection;
 			const top = findSelectionYPosition(container, parentEl, selFrom);
 			if (top !== null && container && parentEl) {
 				const pagesEl = container.querySelector(".paged-editor__pages");
@@ -14912,7 +15213,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				const parentRect = parentEl.getBoundingClientRect();
 				const rawLeft = pageEl ? pageEl.getBoundingClientRect().right - parentRect.left + 12 : parentRect.width / 2 + 408;
 				const left = Math.max(16, Math.min(rawLeft, parentRect.width - 16));
-				const { from: from_0, to: to_0 } = view_9.state.selection;
+				const { from: from_0, to: to_0 } = view_8.state.selection;
 				if (from_0 !== to_0) setFloatingCommentBtn({
 					top,
 					left,
@@ -15075,98 +15376,98 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		refuseCanonicalModelEdit
 	]);
 	const handleTableAction = useCallback((action_0) => {
-		const view_10 = getActiveEditorView();
-		if (!view_10) return;
+		const view_9 = getActiveEditorView();
+		if (!view_9) return;
 		switch (action_0) {
 			case "addRowAbove":
-				addRowAbove(view_10.state, view_10.dispatch);
+				addRowAbove(view_9.state, view_9.dispatch);
 				break;
 			case "addRowBelow":
-				addRowBelow(view_10.state, view_10.dispatch);
+				addRowBelow(view_9.state, view_9.dispatch);
 				break;
 			case "addColumnLeft":
-				addColumnLeft(view_10.state, view_10.dispatch);
+				addColumnLeft(view_9.state, view_9.dispatch);
 				break;
 			case "addColumnRight":
-				addColumnRight(view_10.state, view_10.dispatch);
+				addColumnRight(view_9.state, view_9.dispatch);
 				break;
 			case "deleteRow":
-				deleteRow(view_10.state, view_10.dispatch);
+				deleteRow(view_9.state, view_9.dispatch);
 				break;
 			case "deleteColumn":
-				deleteColumn(view_10.state, view_10.dispatch);
+				deleteColumn(view_9.state, view_9.dispatch);
 				break;
 			case "deleteTable":
-				deleteTable(view_10.state, view_10.dispatch);
+				deleteTable(view_9.state, view_9.dispatch);
 				break;
 			case "selectTable":
-				selectTable(view_10.state, view_10.dispatch);
+				selectTable(view_9.state, view_9.dispatch);
 				break;
 			case "selectRow":
-				selectRow(view_10.state, view_10.dispatch);
+				selectRow(view_9.state, view_9.dispatch);
 				break;
 			case "selectColumn":
-				selectColumn(view_10.state, view_10.dispatch);
+				selectColumn(view_9.state, view_9.dispatch);
 				break;
 			case "mergeCells":
-				mergeCells(view_10.state, view_10.dispatch);
+				mergeCells(view_9.state, view_9.dispatch);
 				break;
 			case "splitCell":
-				splitCell(view_10.state, view_10.dispatch);
+				splitCell(view_9.state, view_9.dispatch);
 				break;
 			case "borderAll":
-				setAllTableBorders(view_10.state, view_10.dispatch, borderSpecRef.current);
+				setAllTableBorders(view_9.state, view_9.dispatch, borderSpecRef.current);
 				break;
 			case "borderOutside":
-				setOutsideTableBorders(view_10.state, view_10.dispatch, borderSpecRef.current);
+				setOutsideTableBorders(view_9.state, view_9.dispatch, borderSpecRef.current);
 				break;
 			case "borderInside":
-				setInsideTableBorders(view_10.state, view_10.dispatch, borderSpecRef.current);
+				setInsideTableBorders(view_9.state, view_9.dispatch, borderSpecRef.current);
 				break;
 			case "borderNone":
-				removeTableBorders(view_10.state, view_10.dispatch);
+				removeTableBorders(view_9.state, view_9.dispatch);
 				break;
 			case "borderTop":
-				setCellBorder("top", borderSpecRef.current, true)(view_10.state, view_10.dispatch);
+				setCellBorder("top", borderSpecRef.current, true)(view_9.state, view_9.dispatch);
 				break;
 			case "borderBottom":
-				setCellBorder("bottom", borderSpecRef.current, true)(view_10.state, view_10.dispatch);
+				setCellBorder("bottom", borderSpecRef.current, true)(view_9.state, view_9.dispatch);
 				break;
 			case "borderLeft":
-				setCellBorder("left", borderSpecRef.current, true)(view_10.state, view_10.dispatch);
+				setCellBorder("left", borderSpecRef.current, true)(view_9.state, view_9.dispatch);
 				break;
 			case "borderRight":
-				setCellBorder("right", borderSpecRef.current, true)(view_10.state, view_10.dispatch);
+				setCellBorder("right", borderSpecRef.current, true)(view_9.state, view_9.dispatch);
 				break;
-			default: if (typeof action_0 === "object") if (action_0.type === "cellFillColor") setCellFillColor(action_0.color)(view_10.state, view_10.dispatch);
+			default: if (typeof action_0 === "object") if (action_0.type === "cellFillColor") setCellFillColor(action_0.color)(view_9.state, view_9.dispatch);
 			else if (action_0.type === "borderColor") {
 				const rgb_0 = action_0.color.replace(/^#/u, "");
 				borderSpecRef.current = {
 					...borderSpecRef.current,
 					color: { rgb: rgb_0 }
 				};
-				setTableBorderColor(action_0.color)(view_10.state, view_10.dispatch);
+				setTableBorderColor(action_0.color)(view_9.state, view_9.dispatch);
 			} else if (action_0.type === "borderWidth") {
 				borderSpecRef.current = {
 					...borderSpecRef.current,
 					size: action_0.size
 				};
-				setTableBorderWidth(action_0.size)(view_10.state, view_10.dispatch);
+				setTableBorderWidth(action_0.size)(view_9.state, view_9.dispatch);
 			} else if (action_0.type === "cellBorder") setCellBorder(action_0.side, {
 				style: action_0.style,
 				size: action_0.size,
 				color: { rgb: action_0.color.replace(/^#/u, "") }
-			})(view_10.state, view_10.dispatch);
-			else if (action_0.type === "cellVerticalAlign") setCellVerticalAlign(action_0.align)(view_10.state, view_10.dispatch);
-			else if (action_0.type === "cellMargins") setCellMargins(action_0.margins)(view_10.state, view_10.dispatch);
-			else if (action_0.type === "cellTextDirection") setCellTextDirection(action_0.direction)(view_10.state, view_10.dispatch);
-			else if (action_0.type === "toggleNoWrap") toggleNoWrap()(view_10.state, view_10.dispatch);
-			else if (action_0.type === "rowHeight") setRowHeight(action_0.height, action_0.rule)(view_10.state, view_10.dispatch);
-			else if (action_0.type === "toggleHeaderRow") toggleHeaderRow()(view_10.state, view_10.dispatch);
-			else if (action_0.type === "distributeColumns") distributeColumns()(view_10.state, view_10.dispatch);
-			else if (action_0.type === "autoFitContents") autoFitContents()(view_10.state, view_10.dispatch);
+			})(view_9.state, view_9.dispatch);
+			else if (action_0.type === "cellVerticalAlign") setCellVerticalAlign(action_0.align)(view_9.state, view_9.dispatch);
+			else if (action_0.type === "cellMargins") setCellMargins(action_0.margins)(view_9.state, view_9.dispatch);
+			else if (action_0.type === "cellTextDirection") setCellTextDirection(action_0.direction)(view_9.state, view_9.dispatch);
+			else if (action_0.type === "toggleNoWrap") toggleNoWrap()(view_9.state, view_9.dispatch);
+			else if (action_0.type === "rowHeight") setRowHeight(action_0.height, action_0.rule)(view_9.state, view_9.dispatch);
+			else if (action_0.type === "toggleHeaderRow") toggleHeaderRow()(view_9.state, view_9.dispatch);
+			else if (action_0.type === "distributeColumns") distributeColumns()(view_9.state, view_9.dispatch);
+			else if (action_0.type === "autoFitContents") autoFitContents()(view_9.state, view_9.dispatch);
 			else if (action_0.type === "openTableProperties") setTablePropsOpen(true);
-			else if (action_0.type === "tableProperties") setTableProperties(action_0.props)(view_10.state, view_10.dispatch);
+			else if (action_0.type === "tableProperties") setTableProperties(action_0.props)(view_9.state, view_9.dispatch);
 			else {
 				let preset = getBuiltinTableStyle(action_0.styleId);
 				const currentDocForTable = historyStateRef.current;
@@ -15237,7 +15538,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 					if (preset.tableBorders) styleArg.tableBorders = preset.tableBorders;
 					if (preset.conditionals) styleArg.conditionals = preset.conditionals;
 					if (preset.look) styleArg.look = preset.look;
-					applyTableStyle(styleArg)(view_10.state, view_10.dispatch);
+					applyTableStyle(styleArg)(view_9.state, view_9.dispatch);
 				}
 			}
 			else tableSelection.handleAction(action_0);
@@ -15258,86 +15559,86 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		});
 	}, [openContextMenu]);
 	const handleFormat = useCallback((action_1) => {
-		const view_11 = getActiveEditorView();
-		if (!view_11) return;
-		view_11.focus();
-		const isBodyEditor = view_11 === pagedEditorRef.current?.getView();
-		const { from: from_1, to: to_1 } = view_11.state.selection;
+		const view_10 = getActiveEditorView();
+		if (!view_10) return;
+		view_10.focus();
+		const isBodyEditor = view_10 === pagedEditorRef.current?.getView();
+		const { from: from_1, to: to_1 } = view_10.state.selection;
 		const savedSelection = lastSelectionRef.current;
 		if (isBodyEditor && savedSelection && (from_1 !== savedSelection.from || to_1 !== savedSelection.to)) try {
-			const tr = view_11.state.tr.setSelection(TextSelection.create(view_11.state.doc, savedSelection.from, savedSelection.to));
-			view_11.dispatch(tr);
+			const tr = view_10.state.tr.setSelection(TextSelection.create(view_10.state.doc, savedSelection.from, savedSelection.to));
+			view_10.dispatch(tr);
 		} catch {}
 		if (action_1 === "bold") {
-			executeEditorCommand(view_11, toggleBold);
+			executeEditorCommand(view_10, toggleBold);
 			return;
 		}
 		if (action_1 === "italic") {
-			executeEditorCommand(view_11, toggleItalic);
+			executeEditorCommand(view_10, toggleItalic);
 			return;
 		}
 		if (action_1 === "underline") {
-			executeEditorCommand(view_11, toggleUnderline);
+			executeEditorCommand(view_10, toggleUnderline);
 			return;
 		}
 		if (action_1 === "strikethrough") {
-			executeEditorCommand(view_11, toggleStrike);
+			executeEditorCommand(view_10, toggleStrike);
 			return;
 		}
 		if (action_1 === "superscript") {
-			executeEditorCommand(view_11, toggleSuperscript);
+			executeEditorCommand(view_10, toggleSuperscript);
 			return;
 		}
 		if (action_1 === "subscript") {
-			executeEditorCommand(view_11, toggleSubscript);
+			executeEditorCommand(view_10, toggleSubscript);
 			return;
 		}
 		if (action_1 === "bulletList") {
-			executeEditorCommand(view_11, toggleBulletList);
+			executeEditorCommand(view_10, toggleBulletList);
 			return;
 		}
 		if (action_1 === "numberedList") {
-			executeEditorCommand(view_11, toggleNumberedList);
+			executeEditorCommand(view_10, toggleNumberedList);
 			return;
 		}
 		if (action_1 === "indent") {
-			executeFirstEditorCommand(view_11, [increaseListLevel, increaseIndent()]);
+			executeFirstEditorCommand(view_10, [increaseListLevel, increaseIndent()]);
 			return;
 		}
 		if (action_1 === "outdent") {
-			executeFirstEditorCommand(view_11, [decreaseListLevel, decreaseIndent()]);
+			executeFirstEditorCommand(view_10, [decreaseListLevel, decreaseIndent()]);
 			return;
 		}
 		if (action_1 === "clearFormatting") {
-			executeEditorCommand(view_11, clearFormatting);
+			executeEditorCommand(view_10, clearFormatting);
 			return;
 		}
 		if (action_1 === "setRtl") {
-			executeEditorCommand(view_11, setRtl);
+			executeEditorCommand(view_10, setRtl);
 			return;
 		}
 		if (action_1 === "setLtr") {
-			executeEditorCommand(view_11, setLtr);
+			executeEditorCommand(view_10, setLtr);
 			return;
 		}
 		if (action_1 === "insertPageBreak") {
-			executeEditorCommand(view_11, insertPageBreak);
+			executeEditorCommand(view_10, insertPageBreak);
 			return;
 		}
 		if (typeof action_1 === "object") switch (action_1.type) {
 			case "alignment":
-				executeEditorCommand(view_11, setAlignment(action_1.value));
+				executeEditorCommand(view_10, setAlignment(action_1.value));
 				break;
 			case "toggleDirection":
-				executeEditorCommand(view_11, toggleBidi);
+				executeEditorCommand(view_10, toggleBidi);
 				break;
 			case "textColor": {
 				const colorVal_0 = action_1.value;
-				if (typeof colorVal_0 === "string") executeEditorCommand(view_11, setTextColor({ rgb: colorVal_0.replace("#", "") }));
-				else if (colorVal_0.auto) executeEditorCommand(view_11, clearTextColor);
+				if (typeof colorVal_0 === "string") executeEditorCommand(view_10, setTextColor({ rgb: colorVal_0.replace("#", "") }));
+				else if (colorVal_0.auto) executeEditorCommand(view_10, clearTextColor);
 				else {
 					const themeColor = typeof colorVal_0.themeColor === "string" ? colorVal_0.themeColor : void 0;
-					executeEditorCommand(view_11, setTextColor({
+					executeEditorCommand(view_10, setTextColor({
 						...colorVal_0.rgb === void 0 ? {} : { rgb: colorVal_0.rgb },
 						...themeColor ? { themeColor } : {},
 						...colorVal_0.themeTint === void 0 ? {} : { themeTint: colorVal_0.themeTint },
@@ -15347,16 +15648,16 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				break;
 			}
 			case "highlightColor":
-				executeEditorCommand(view_11, setHighlight((action_1.value ? mapHexToHighlightName(action_1.value) : "") || action_1.value));
+				executeEditorCommand(view_10, setHighlight((action_1.value ? mapHexToHighlightName(action_1.value) : "") || action_1.value));
 				break;
 			case "fontSize":
-				executeEditorCommand(view_11, setFontSize(pointsToHalfPoints(action_1.value)));
+				executeEditorCommand(view_10, setFontSize(pointsToHalfPoints(action_1.value)));
 				break;
 			case "fontFamily":
-				executeEditorCommand(view_11, setFontFamily(action_1.value));
+				executeEditorCommand(view_10, setFontFamily(action_1.value));
 				break;
 			case "lineSpacing":
-				executeEditorCommand(view_11, setLineSpacing(action_1.value));
+				executeEditorCommand(view_10, setLineSpacing(action_1.value));
 				break;
 			case "applyStyle": {
 				const currentDoc_0 = historyStateRef.current;
@@ -15369,22 +15670,22 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 					const styleName = styleResolver_0.getStyle(action_1.value)?.name;
 					if (styleName) styleAttrs.styleName = styleName;
 					styleAttrs.numbering = currentDoc_0?.package.numbering ? getCachedNumberingMap(currentDoc_0.package.numbering) : null;
-					executeEditorCommand(view_11, applyStyle(action_1.value, styleAttrs));
-				} else executeEditorCommand(view_11, applyStyle(action_1.value));
+					executeEditorCommand(view_10, applyStyle(action_1.value, styleAttrs));
+				} else executeEditorCommand(view_10, applyStyle(action_1.value));
 				break;
 			}
 			default: break;
 		}
 	}, [getActiveEditorView, getCachedStyleResolver]);
 	const captureFormatPainter = useCallback(() => {
-		const view_12 = getActiveEditorView();
-		capturedFormatMarksRef.current = view_12 ? captureFormatMarks(view_12.state) : null;
+		const view_11 = getActiveEditorView();
+		capturedFormatMarksRef.current = view_11 ? captureFormatMarks(view_11.state) : null;
 	}, [getActiveEditorView]);
 	const paintFormatToSelection = useCallback(() => {
-		const view_13 = getActiveEditorView();
-		if (!view_13) return false;
-		const applied = applyFormatMarks(capturedFormatMarksRef.current)(view_13.state, view_13.dispatch);
-		if (applied) requestAnimationFrame(() => view_13.focus());
+		const view_12 = getActiveEditorView();
+		if (!view_12) return false;
+		const applied = applyFormatMarks(capturedFormatMarksRef.current)(view_12.state, view_12.dispatch);
+		if (applied) requestAnimationFrame(() => view_12.focus());
 		return applied;
 	}, [getActiveEditorView]);
 	const handleFormatPainter = useCallback((sticky) => {
@@ -15563,15 +15864,15 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	]);
 	const { from: contextSelectionFrom, to: contextSelectionTo } = contextMenu.selectionRange;
 	const handleContextMenuAction = useCallback(async (action_2) => {
-		const view_14 = getActiveEditorView();
-		if (!view_14) return;
+		const view_13 = getActiveEditorView();
+		if (!view_13) return;
 		focusActiveEditor();
 		if (readOnly && action_2 !== "copy" && action_2 !== "selectAll") return;
 		if (action_2.startsWith("custom:")) {
 			const { from: from_2, to: to_2 } = contextSelectionFrom !== contextSelectionTo ? {
 				from: contextSelectionFrom,
 				to: contextSelectionTo
-			} : view_14.state.selection;
+			} : view_13.state.selection;
 			onCustomContextAction?.(action_2.slice(7), {
 				from: from_2,
 				to: to_2
@@ -15581,16 +15882,16 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		switch (action_2) {
 			case "cut": {
 				if (readOnly) return;
-				const { from: from_7, to: to_7 } = view_14.state.selection;
-				const text_2 = view_14.state.doc.textBetween(from_7, to_7, "\n");
+				const { from: from_7, to: to_7 } = view_13.state.selection;
+				const text_2 = view_13.state.doc.textBetween(from_7, to_7, "\n");
 				navigator.clipboard.writeText(text_2).catch(() => void 0);
-				if (!deleteSelectionAsSuggestion(view_14.state, view_14.dispatch)) view_14.dispatch(view_14.state.tr.deleteSelection());
+				if (!deleteSelectionAsSuggestion(view_13.state, view_13.dispatch)) view_13.dispatch(view_13.state.tr.deleteSelection());
 				onCut?.();
 				break;
 			}
 			case "copy": {
-				const { from: cf, to: ct } = view_14.state.selection;
-				const copied = view_14.state.doc.textBetween(cf, ct, "\n");
+				const { from: cf, to: ct } = view_13.state.selection;
+				const copied = view_13.state.doc.textBetween(cf, ct, "\n");
 				navigator.clipboard.writeText(copied).catch(() => void 0);
 				onCopy?.();
 				break;
@@ -15613,12 +15914,12 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 						bubbles: true,
 						cancelable: true
 					});
-					view_14.dom.dispatchEvent(pasteEvent);
+					view_13.dom.dispatchEvent(pasteEvent);
 				} catch {
 					try {
 						const text_0 = await navigator.clipboard.readText();
 						if (text_0) {
-							view_14.dispatch(view_14.state.tr.insertText(text_0));
+							view_13.dispatch(view_13.state.tr.insertText(text_0));
 							onPaste?.();
 						}
 					} catch {}
@@ -15627,9 +15928,9 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			case "pasteAsPlainText":
 				try {
 					const text = await navigator.clipboard.readText();
-					if (text && !view_14.isDestroyed) {
-						const slice = buildPlainTextSlice(text, view_14.state.schema);
-						view_14.dispatch(view_14.state.tr.replaceSelection(slice).scrollIntoView());
+					if (text && !view_13.isDestroyed) {
+						const slice = buildPlainTextSlice(text, view_13.state.schema);
+						view_13.dispatch(view_13.state.tr.replaceSelection(slice).scrollIntoView());
 						onPaste?.();
 					}
 				} catch {
@@ -15637,42 +15938,42 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				}
 				break;
 			case "delete": {
-				const { from: from_6, to: to_6 } = view_14.state.selection;
-				if (from_6 !== to_6) view_14.dispatch(view_14.state.tr.deleteRange(from_6, to_6));
+				const { from: from_6, to: to_6 } = view_13.state.selection;
+				if (from_6 !== to_6) view_13.dispatch(view_13.state.tr.deleteRange(from_6, to_6));
 				break;
 			}
 			case "selectAll":
-				view_14.dispatch(view_14.state.tr.setSelection(TextSelection.create(view_14.state.doc, 0, view_14.state.doc.content.size)));
+				view_13.dispatch(view_13.state.tr.setSelection(TextSelection.create(view_13.state.doc, 0, view_13.state.doc.content.size)));
 				break;
 			case "addRowAbove":
-				addRowAbove(view_14.state, view_14.dispatch);
+				addRowAbove(view_13.state, view_13.dispatch);
 				break;
 			case "addRowBelow":
-				addRowBelow(view_14.state, view_14.dispatch);
+				addRowBelow(view_13.state, view_13.dispatch);
 				break;
 			case "deleteRow":
-				deleteRow(view_14.state, view_14.dispatch);
+				deleteRow(view_13.state, view_13.dispatch);
 				break;
 			case "addColumnLeft":
-				addColumnLeft(view_14.state, view_14.dispatch);
+				addColumnLeft(view_13.state, view_13.dispatch);
 				break;
 			case "addColumnRight":
-				addColumnRight(view_14.state, view_14.dispatch);
+				addColumnRight(view_13.state, view_13.dispatch);
 				break;
 			case "deleteColumn":
-				deleteColumn(view_14.state, view_14.dispatch);
+				deleteColumn(view_13.state, view_13.dispatch);
 				break;
 			case "tableBordersAll":
-				setTableBorderPreset("all")(view_14.state, view_14.dispatch);
+				setTableBorderPreset("all")(view_13.state, view_13.dispatch);
 				break;
 			case "tableBordersNone":
-				setTableBorderPreset("none")(view_14.state, view_14.dispatch);
+				setTableBorderPreset("none")(view_13.state, view_13.dispatch);
 				break;
 			case "addComment": {
 				const { from: from_5, to: to_5 } = contextSelectionFrom !== contextSelectionTo ? {
 					from: contextSelectionFrom,
 					to: contextSelectionTo
-				} : view_14.state.selection;
+				} : view_13.state.selection;
 				if (from_5 === to_5) break;
 				const commentY = findSelectionYPosition(scrollContainerRef.current, editorContentRef.current, from_5) ?? getFallbackCommentYPosition(scrollContainerRef.current);
 				setCommentSelectionRange({
@@ -15680,7 +15981,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 					to: to_5
 				});
 				if (commentDraftMode === "prosemirror") {
-					if (!applyCommentMarkRange(view_14, {
+					if (!applyCommentMarkRange(view_13, {
 						from: from_5,
 						to: to_5
 					}, -1, { selectEnd: true })) break;
@@ -15692,30 +15993,30 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				break;
 			}
 			case "acceptChange": {
-				const { from: from_4, to: to_4 } = view_14.state.selection;
-				const range_1 = findChangeAtPosition(view_14.state, from_4, to_4);
+				const { from: from_4, to: to_4 } = view_13.state.selection;
+				const range_0 = findChangeAtPosition(view_13.state, from_4, to_4);
 				if (resolveCanonicalReviewRange({
 					editor: pagedEditorRef.current?.getEditor(),
-					...range_1,
+					...range_0,
 					resolution: "accept"
-				}) === null) acceptChange(range_1.from, range_1.to)(view_14.state, view_14.dispatch);
+				}) === null) acceptChange(range_0.from, range_0.to)(view_13.state, view_13.dispatch);
 				break;
 			}
 			case "rejectChange": {
-				const { from: from_3, to: to_3 } = view_14.state.selection;
-				const range_0 = findChangeAtPosition(view_14.state, from_3, to_3);
+				const { from: from_3, to: to_3 } = view_13.state.selection;
+				const range = findChangeAtPosition(view_13.state, from_3, to_3);
 				if (resolveCanonicalReviewRange({
 					editor: pagedEditorRef.current?.getEditor(),
-					...range_0,
+					...range,
 					resolution: "reject"
-				}) === null) rejectChange(range_0.from, range_0.to)(view_14.state, view_14.dispatch);
+				}) === null) rejectChange(range.from, range.to)(view_13.state, view_13.dispatch);
 				break;
 			}
 			case "restartNumbering":
-				restartNumbering(view_14.state, view_14.dispatch);
+				restartNumbering(view_13.state, view_13.dispatch);
 				break;
 			case "continueNumbering":
-				continueNumbering(view_14.state, view_14.dispatch);
+				continueNumbering(view_13.state, view_13.dispatch);
 				break;
 			case "setNumberingValue":
 				setNumberingValueDialogOpen(true);
@@ -15775,37 +16076,37 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	const handleTopMarginChange = useCallback((twips_1) => handlePageSetupApply({ marginTop: twips_1 }), [handlePageSetupApply]);
 	const handleBottomMarginChange = useCallback((twips_2) => handlePageSetupApply({ marginBottom: twips_2 }), [handlePageSetupApply]);
 	const handleIndentLeftChange = useCallback((twips_3) => {
+		const view_14 = getActiveEditorView();
+		if (!view_14) return;
+		setIndentLeft(twips_3)(view_14.state, view_14.dispatch);
+	}, [getActiveEditorView]);
+	const handleIndentRightChange = useCallback((twips_4) => {
 		const view_15 = getActiveEditorView();
 		if (!view_15) return;
-		setIndentLeft(twips_3)(view_15.state, view_15.dispatch);
+		setIndentRight(twips_4)(view_15.state, view_15.dispatch);
 	}, [getActiveEditorView]);
-	const handleIndentRightChange = useCallback((twips_4) => {
+	const handleFirstLineIndentChange = useCallback((twips_5) => {
 		const view_16 = getActiveEditorView();
 		if (!view_16) return;
-		setIndentRight(twips_4)(view_16.state, view_16.dispatch);
+		if (twips_5 < 0) setIndentFirstLine(-twips_5, true)(view_16.state, view_16.dispatch);
+		else setIndentFirstLine(twips_5, false)(view_16.state, view_16.dispatch);
 	}, [getActiveEditorView]);
-	const handleFirstLineIndentChange = useCallback((twips_5) => {
+	const handleTabStopRemove = useCallback((positionTwips) => {
 		const view_17 = getActiveEditorView();
 		if (!view_17) return;
-		if (twips_5 < 0) setIndentFirstLine(-twips_5, true)(view_17.state, view_17.dispatch);
-		else setIndentFirstLine(twips_5, false)(view_17.state, view_17.dispatch);
-	}, [getActiveEditorView]);
-	const handleTabStopRemove = useCallback((positionTwips) => {
-		const view_18 = getActiveEditorView();
-		if (!view_18) return;
-		removeTabStop(positionTwips)(view_18.state, view_18.dispatch);
+		removeTabStop(positionTwips)(view_17.state, view_17.dispatch);
 	}, [getActiveEditorView]);
 	const serializeCurrentDocx = useCallback(async (options) => {
 		let tripwireResult = null;
 		let savedBuffer = null;
 		try {
 			const editor_2 = pagedEditorRef.current?.getEditor();
-			const snapshot = editor_2?.captureCanonicalSave();
-			if (snapshot && editor_2) {
-				const view_19 = editor_2.getView();
-				const editorState = view_19?.state;
+			const snapshot_0 = editor_2?.captureCanonicalSave();
+			if (snapshot_0 && editor_2) {
+				const view_18 = editor_2.getView();
+				const editorState = view_18?.state;
 				const result_2 = await serializeCanonicalSave({
-					snapshot,
+					snapshot: snapshot_0,
 					options,
 					featureFlags
 				});
@@ -15815,12 +16116,12 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 					message: `Canonical save used a fidelity fallback: ${diagnostic.type} (${diagnostic.part}).`
 				}));
 				tripwireResult = result_2.tripwireResult;
-				if (view_19 && pagedEditorRef.current?.getEditor() === editor_2 && editor_2.getView() === view_19 && view_19.state.doc === editorState?.doc && editor_2.isCanonicalSaveCurrent(snapshot.version)) view_19.dispatch(clearTrackedChanges(view_19.state));
+				if (view_18 && pagedEditorRef.current?.getEditor() === editor_2 && editor_2.getView() === view_18 && view_18.state.doc === editorState?.doc && editor_2.isCanonicalSaveCurrent(snapshot_0.version)) view_18.dispatch(clearTrackedChanges(view_18.state));
 				savedBuffer = result_2.buffer;
 			} else {
 				if (usesCanonicalSession(experimentalSession, CANONICAL_GAP.save)) return null;
-				const view_20 = pagedEditorRef.current?.getView();
-				const editorState_0 = view_20?.state;
+				const view_19 = pagedEditorRef.current?.getView();
+				const editorState_0 = view_19?.state;
 				const baselineBuffer = originalBufferRef.current;
 				const current = buildCurrentDocument();
 				const doc_1 = current ? withoutUnreferencedNotes(current) : null;
@@ -15861,9 +16162,9 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 					const { compareSelectiveVsFull } = await import("@stll/folio-core/docx/selectiveSaveTripwire");
 					tripwireResult = await compareSelectiveVsFull(selectiveBuffer, fullBuffer);
 				} catch {}
-				if (view_20 && pagedEditorRef.current?.getView() === view_20 && view_20.state.doc === editorState_0?.doc) {
+				if (view_19 && pagedEditorRef.current?.getView() === view_19 && view_19.state.doc === editorState_0?.doc) {
 					originalBufferRef.current = buffer;
-					view_20.dispatch(clearTrackedChanges(view_20.state));
+					view_19.dispatch(clearTrackedChanges(view_19.state));
 				}
 				savedBuffer = buffer;
 			}
@@ -15910,10 +16211,18 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	useImperativeHandle(ref, () => ({
 		getReadOnlyReason: () => readOnlyReason,
 		getDocument: () => buildCurrentDocument(),
+		find: (searchText, options_1) => handleFind(searchText, {
+			...createDefaultFindOptions(),
+			...options_1
+		}),
+		findNext: handleFindNext,
+		findPrevious: handleFindPrevious,
+		getFindResult,
+		clearFind: resetFindResult,
 		hasPendingChanges: () => {
-			const view_21 = pagedEditorRef.current?.getView();
-			if (!view_21) return false;
-			return getCommentsDirty() || getChangedParagraphIds(view_21.state).size > 0 || hasStructuralChanges(view_21.state) || hasUntrackedChanges(view_21.state);
+			const view_20 = pagedEditorRef.current?.getView();
+			if (!view_20) return false;
+			return getCommentsDirty() || getChangedParagraphIds(view_20.state).size > 0 || hasStructuralChanges(view_20.state) || hasUntrackedChanges(view_20.state);
 		},
 		getEditorRef: () => pagedEditorRef.current,
 		getEditor: () => pagedEditorRef.current?.getEditor() ?? null,
@@ -15928,7 +16237,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		scrollToPage: (pageNumber_0) => {
 			pagedEditorRef.current?.scrollToPage(pageNumber_0);
 		},
-		scrollToParaId: (paraId, options_1) => pagedEditorRef.current?.scrollToParaId(paraId, options_1) ?? false,
+		scrollToParaId: (paraId, options_2) => pagedEditorRef.current?.scrollToParaId(paraId, options_2) ?? false,
 		openPrintPreview: handleDirectPrint,
 		print: handleDirectPrint,
 		openFind: () => {
@@ -15954,17 +16263,17 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			pendingSuggestionRegistryRef.current.clear();
 			return pagedEditorRef.current?.getEditor().loadDocx(buffer_1) ?? loadBuffer(buffer_1);
 		},
-		ensureEditorView: (options_2) => {
-			pagedEditorRef.current?.ensureView(options_2);
+		ensureEditorView: (options_3) => {
+			pagedEditorRef.current?.ensureView(options_3);
 		},
 		createAIEditSnapshot: () => {
-			const view_22 = pagedEditorRef.current?.getView();
-			return view_22 ? createFolioAIEditSnapshot(view_22.state.doc) : null;
+			const view_21 = pagedEditorRef.current?.getView();
+			return view_21 ? createFolioAIEditSnapshot(view_21.state.doc) : null;
 		},
-		applyDocumentOperations: ({ undefinedReferences, snapshot: snapshot_0, batch, author: operationAuthor = author }) => {
+		applyDocumentOperations: ({ undefinedReferences, snapshot: snapshot_1, batch, author: operationAuthor = author }) => {
 			assertSupportedFolioDocumentOperationVersion(batch.version);
-			const view_23 = pagedEditorRef.current?.getView();
-			if (!view_23) {
+			const view_22 = pagedEditorRef.current?.getView();
+			if (!view_22) {
 				let status = "committed";
 				if (batch.dryRun === true) status = "previewed";
 				else if (batch.atomic === true) status = "rejected";
@@ -15984,27 +16293,27 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			}
 			const canonical_1 = getCanonicalApi()?.applyCanonicalDocumentOperations({
 				undefinedReferences,
-				snapshot: snapshot_0,
+				snapshot: snapshot_1,
 				batch,
 				author: operationAuthor
 			});
 			if (canonical_1) return canonical_1;
 			const existingUndoEntry = documentOperationUndoEntriesRef.current.at(-1);
-			if (existingUndoEntry && (!view_23.state.doc.eq(existingUndoEntry.afterState.doc) || canonicalJson(commentsRef.current) !== existingUndoEntry.commentsAfterJson)) documentOperationUndoEntriesRef.current.length = 0;
+			if (existingUndoEntry && (!view_22.state.doc.eq(existingUndoEntry.afterState.doc) || canonicalJson(commentsRef.current) !== existingUndoEntry.commentsAfterJson)) documentOperationUndoEntriesRef.current.length = 0;
 			const commentsBefore = commentsRef.current;
 			const createdComments = [];
 			const operationView = {
-				state: view_23.state,
+				state: view_22.state,
 				dispatch: (transaction) => {
-					view_23.dispatch(closeHistory(transaction));
-					operationView.state = view_23.state;
+					view_22.dispatch(closeHistory(transaction));
+					operationView.state = view_22.state;
 				}
 			};
-			const activeSuggestionIds = new Set(getSuggestions(view_23.state).map((s_0) => s_0.suggestionId));
+			const activeSuggestionIds = new Set(getSuggestions(view_22.state).map((s_0) => s_0.suggestionId));
 			const result_3 = applyFolioDocumentOperations({
 				undefinedReferences,
 				view: operationView,
-				snapshot: snapshot_0,
+				snapshot: snapshot_1,
 				batch,
 				author: operationAuthor,
 				createCommentId: (text_3) => {
@@ -16018,7 +16327,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				})
 			});
 			if (batch.mode === "suggested" && result_3.status === "committed") pendingSuggestionRegistryRef.current.recordApplied({
-				snapshot: snapshot_0,
+				snapshot: snapshot_1,
 				story: { type: "main" },
 				operations: batch.operations,
 				applied: result_3.applied,
@@ -16030,7 +16339,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			if (batchComments.length > 0) replaceComments(commentsAfter);
 			if (result_3.undoHandle !== null) documentOperationUndoEntriesRef.current.push({
 				undoHandle: result_3.undoHandle,
-				afterState: view_23.state,
+				afterState: view_22.state,
 				commentsBefore,
 				commentsAfterJson: canonicalJson(commentsAfter)
 			});
@@ -16052,18 +16361,18 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				reason: "notLatest"
 			};
 			const entry_3 = entries_0.at(-1);
-			const view_24 = pagedEditorRef.current?.getView();
-			if (!entry_3 || !view_24) return {
+			const view_23 = pagedEditorRef.current?.getView();
+			if (!entry_3 || !view_23) return {
 				status: "rejected",
 				undoHandle,
 				reason: "unknownHandle"
 			};
-			if (!view_24.state.doc.eq(entry_3.afterState.doc) || canonicalJson(commentsRef.current) !== entry_3.commentsAfterJson) return {
+			if (!view_23.state.doc.eq(entry_3.afterState.doc) || canonicalJson(commentsRef.current) !== entry_3.commentsAfterJson) return {
 				status: "rejected",
 				undoHandle,
 				reason: "documentChanged"
 			};
-			if (!undo(view_24.state, view_24.dispatch)) return {
+			if (!undo(view_23.state, view_23.dispatch)) return {
 				status: "rejected",
 				undoHandle,
 				reason: "documentChanged"
@@ -16076,9 +16385,9 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				undoHandle
 			};
 		},
-		applyAIEditOperations: ({ undefinedReferences: undefinedReferences_0, snapshot: snapshot_1, operations, mode = "tracked-changes", author: operationAuthor_0 = author }) => {
-			const view_25 = pagedEditorRef.current?.getView();
-			if (!view_25) return {
+		applyAIEditOperations: ({ undefinedReferences: undefinedReferences_0, snapshot: snapshot_2, operations, mode = "tracked-changes", author: operationAuthor_0 = author }) => {
+			const view_24 = pagedEditorRef.current?.getView();
+			if (!view_24) return {
 				applied: [],
 				skipped: operations.map((operation_0) => ({
 					id: operation_0.id,
@@ -16087,7 +16396,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			};
 			const canonical_3 = getCanonicalApi()?.applyCanonicalDocumentOperations({
 				undefinedReferences: undefinedReferences_0,
-				snapshot: snapshot_1,
+				snapshot: snapshot_2,
 				batch: {
 					version: FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION,
 					operations,
@@ -16097,11 +16406,11 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			});
 			if (canonical_3) return canonical_3;
 			const createdComments_0 = [];
-			const activeSuggestionIds_0 = new Set(getSuggestions(view_25.state).map((s_1) => s_1.suggestionId));
+			const activeSuggestionIds_0 = new Set(getSuggestions(view_24.state).map((s_1) => s_1.suggestionId));
 			const { applied: applied_0, skipped: skipped_0 } = applyFolioDocumentOperations({
 				undefinedReferences: undefinedReferences_0,
-				view: view_25,
-				snapshot: snapshot_1,
+				view: view_24,
+				snapshot: snapshot_2,
 				batch: {
 					version: FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION,
 					operations,
@@ -16117,7 +16426,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			const batchComments_0 = appliedOperationComments(createdComments_0, applied_0);
 			if (batchComments_0.length > 0) updateComments((currentComments_0) => [...currentComments_0, ...batchComments_0]);
 			if (mode === "suggested") pendingSuggestionRegistryRef.current.recordApplied({
-				snapshot: snapshot_1,
+				snapshot: snapshot_2,
 				story: { type: "main" },
 				operations,
 				applied: applied_0,
@@ -16130,18 +16439,18 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			};
 		},
 		acceptAIEditOperation: (revisionId) => {
-			const view_26 = pagedEditorRef.current?.getView();
-			if (!view_26) return false;
+			const view_25 = pagedEditorRef.current?.getView();
+			if (!view_25) return false;
 			const editor_5 = pagedEditorRef.current?.getEditor();
 			if (editor_5?.getCanonicalDocument()) return editor_5.resolveCanonicalRevisions(typeof revisionId === "number" ? [revisionId] : revisionId, "accept");
-			return acceptAIEditRevision(revisionId)(view_26.state, view_26.dispatch);
+			return acceptAIEditRevision(revisionId)(view_25.state, view_25.dispatch);
 		},
 		rejectAIEditOperation: (revisionId_0) => {
-			const view_27 = pagedEditorRef.current?.getView();
-			if (!view_27) return false;
+			const view_26 = pagedEditorRef.current?.getView();
+			if (!view_26) return false;
 			const editor_6 = pagedEditorRef.current?.getEditor();
 			if (editor_6?.getCanonicalDocument()) return editor_6.resolveCanonicalRevisions(typeof revisionId_0 === "number" ? [revisionId_0] : revisionId_0, "reject");
-			return rejectAIEditRevision(revisionId_0)(view_27.state, view_27.dispatch);
+			return rejectAIEditRevision(revisionId_0)(view_26.state, view_26.dispatch);
 		},
 		undo: () => {
 			if (!usesCanonicalSession(experimentalSession, CANONICAL_GAP.authorityRouting) && getActiveEditorStory().type === "headerFooter" && hfEditorRef.current) return hfEditorRef.current.undo();
@@ -16156,45 +16465,45 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			return redone;
 		},
 		scrollToAIEditOperation: (revisionId_1) => {
-			const view_28 = pagedEditorRef.current?.getView();
-			if (!view_28) return false;
-			const range_2 = findAIEditRevisionRange(view_28.state, revisionId_1);
-			if (!range_2) return false;
-			const { from: from_8, to: to_8 } = clampRangeToDocSize(view_28.state.doc.content.size, range_2);
-			const $from = view_28.state.doc.resolve(from_8);
-			const $to = view_28.state.doc.resolve(to_8);
-			view_28.dispatch(view_28.state.tr.setSelection(TextSelection.between($from, $to)));
+			const view_27 = pagedEditorRef.current?.getView();
+			if (!view_27) return false;
+			const range_1 = findAIEditRevisionRange(view_27.state, revisionId_1);
+			if (!range_1) return false;
+			const { from: from_8, to: to_8 } = clampRangeToDocSize(view_27.state.doc.content.size, range_1);
+			const $from = view_27.state.doc.resolve(from_8);
+			const $to = view_27.state.doc.resolve(to_8);
+			view_27.dispatch(view_27.state.tr.setSelection(TextSelection.between($from, $to)));
 			requestAnimationFrame(() => {
 				pagedEditorRef.current?.scrollToPosition(from_8);
 			});
 			return true;
 		},
-		scrollToBlock: (blockId, snapshot_2) => {
-			const view_29 = pagedEditorRef.current?.getView();
-			if (!view_29) return false;
-			const range_3 = resolveFolioAIBlockRange({
+		scrollToBlock: (blockId, snapshot_3) => {
+			const view_28 = pagedEditorRef.current?.getView();
+			if (!view_28) return false;
+			const range_2 = resolveFolioAIBlockRange({
 				blockId,
-				doc: view_29.state.doc,
-				snapshot: snapshot_2
+				doc: view_28.state.doc,
+				snapshot: snapshot_3
 			});
-			if (range_3 === null) return false;
-			const { from: from_9, to: to_9 } = range_3;
-			const $from_0 = view_29.state.doc.resolve(from_9);
-			const $to_0 = view_29.state.doc.resolve(to_9);
-			view_29.dispatch(view_29.state.tr.setSelection(TextSelection.between($from_0, $to_0)));
+			if (range_2 === null) return false;
+			const { from: from_9, to: to_9 } = range_2;
+			const $from_0 = view_28.state.doc.resolve(from_9);
+			const $to_0 = view_28.state.doc.resolve(to_9);
+			view_28.dispatch(view_28.state.tr.setSelection(TextSelection.between($from_0, $to_0)));
 			requestAnimationFrame(() => {
 				pagedEditorRef.current?.scrollToPosition(from_9);
 			});
 			return true;
 		},
-		highlightPassage: ({ blockId: blockId_0, text: text_5, snapshot: snapshot_3 }) => {
-			const view_30 = pagedEditorRef.current?.getView();
-			if (!view_30) return "none";
+		highlightPassage: ({ blockId: blockId_0, text: text_5, snapshot: snapshot_4 }) => {
+			const view_29 = pagedEditorRef.current?.getView();
+			if (!view_29) return "none";
 			const passageRange = resolvePassageRange({
 				blockId: blockId_0,
 				text: text_5,
-				doc: view_30.state.doc,
-				snapshot: snapshot_3
+				doc: view_29.state.doc,
+				snapshot: snapshot_4
 			});
 			if (passageRange !== null) {
 				pagedEditorRef.current?.setPassageHighlight(passageRange);
@@ -16206,16 +16515,16 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			pagedEditorRef.current?.setPassageHighlight(null);
 			const blockRange = resolveFolioAIBlockRange({
 				blockId: blockId_0,
-				doc: view_30.state.doc,
-				snapshot: snapshot_3
+				doc: view_29.state.doc,
+				snapshot: snapshot_4
 			});
 			if (blockRange === null) return "none";
 			const paraId_0 = getFolioParaIdFromBlockId(blockId_0);
 			if (paraId_0 !== null && pagedEditorRef.current?.scrollToParaId(paraId_0, { highlight: {} })) return "block";
 			const { from: from_10, to: to_10 } = blockRange;
-			const $from_1 = view_30.state.doc.resolve(from_10);
-			const $to_1 = view_30.state.doc.resolve(to_10);
-			view_30.dispatch(view_30.state.tr.setSelection(TextSelection.between($from_1, $to_1)));
+			const $from_1 = view_29.state.doc.resolve(from_10);
+			const $to_1 = view_29.state.doc.resolve(to_10);
+			view_29.dispatch(view_29.state.tr.setSelection(TextSelection.between($from_1, $to_1)));
 			requestAnimationFrame(() => {
 				pagedEditorRef.current?.scrollToPosition(from_10);
 			});
@@ -16224,59 +16533,59 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		clearPassageHighlight: () => {
 			pagedEditorRef.current?.setPassageHighlight(null);
 		},
-		showInDocument: (target_1, snapshot_4) => {
-			const view_31 = pagedEditorRef.current?.getView();
-			if (!view_31) return false;
-			const range_4 = target_1.type === "textRange" ? resolveFolioAITextRange({
+		showInDocument: (target_1, snapshot_5) => {
+			const view_30 = pagedEditorRef.current?.getView();
+			if (!view_30) return false;
+			const range_3 = target_1.type === "textRange" ? resolveFolioAITextRange({
 				range: target_1,
-				doc: view_31.state.doc,
-				snapshot: snapshot_4
+				doc: view_30.state.doc,
+				snapshot: snapshot_5
 			}) : resolveFolioAIBlockRange({
 				blockId: target_1.blockId,
-				doc: view_31.state.doc,
-				snapshot: snapshot_4
+				doc: view_30.state.doc,
+				snapshot: snapshot_5
 			});
-			if (range_4 === null) return false;
-			const { from: from_11, to: to_11 } = range_4;
-			const $from_2 = view_31.state.doc.resolve(from_11);
-			const $to_2 = view_31.state.doc.resolve(to_11);
-			view_31.dispatch(view_31.state.tr.setSelection(TextSelection.between($from_2, $to_2)));
+			if (range_3 === null) return false;
+			const { from: from_11, to: to_11 } = range_3;
+			const $from_2 = view_30.state.doc.resolve(from_11);
+			const $to_2 = view_30.state.doc.resolve(to_11);
+			view_30.dispatch(view_30.state.tr.setSelection(TextSelection.between($from_2, $to_2)));
 			requestAnimationFrame(() => {
 				pagedEditorRef.current?.scrollToPosition(from_11);
 			});
 			return true;
 		},
 		getSuggestions: () => {
-			const view_32 = pagedEditorRef.current?.getView();
-			return view_32 ? getSuggestions(view_32.state) : [];
+			const view_31 = pagedEditorRef.current?.getView();
+			return view_31 ? getSuggestions(view_31.state) : [];
 		},
 		exportPendingSuggestions: () => {
-			const view_33 = pagedEditorRef.current?.getView();
-			const activeIds = new Set(view_33 ? getSuggestions(view_33.state).map((s_2) => s_2.suggestionId) : []);
+			const view_32 = pagedEditorRef.current?.getView();
+			const activeIds = new Set(view_32 ? getSuggestions(view_32.state).map((s_2) => s_2.suggestionId) : []);
 			return pendingSuggestionRegistryRef.current.exportPendingSuggestions({
 				activeSuggestionIds: activeIds,
-				snapshotForStory: (story_0, commentIds) => story_0.type === "main" && view_33 ? createPendingSuggestionSourceSnapshot(view_33.state, commentIds) : null
+				snapshotForStory: (story_0, commentIds) => story_0.type === "main" && view_32 ? createPendingSuggestionSourceSnapshot(view_32.state, commentIds) : null
 			});
 		},
 		loadPendingSuggestions: (records) => pendingSuggestionRegistryRef.current.loadPendingSuggestions({
 			records,
 			snapshotForStory: (story_1) => {
-				const view_34 = pagedEditorRef.current?.getView();
-				return story_1.type === "main" && view_34 ? createFolioAIEditSnapshot(view_34.state.doc) : null;
+				const view_33 = pagedEditorRef.current?.getView();
+				return story_1.type === "main" && view_33 ? createFolioAIEditSnapshot(view_33.state.doc) : null;
 			},
 			sourceSnapshotForStory: (story_2, commentIds_0) => {
-				const view_35 = pagedEditorRef.current?.getView();
-				return story_2.type === "main" && view_35 ? createPendingSuggestionSourceSnapshot(view_35.state, commentIds_0) : null;
+				const view_34 = pagedEditorRef.current?.getView();
+				return story_2.type === "main" && view_34 ? createPendingSuggestionSourceSnapshot(view_34.state, commentIds_0) : null;
 			},
-			apply: (record, snapshot_5) => {
-				const view_36 = pagedEditorRef.current?.getView();
-				if (!view_36) return {
+			apply: (record, snapshot_6) => {
+				const view_35 = pagedEditorRef.current?.getView();
+				if (!view_35) return {
 					applied: [],
 					skipped: []
 				};
 				const canonical_4 = getCanonicalApi()?.applyCanonicalDocumentOperations({
 					undefinedReferences: "refuse",
-					snapshot: snapshot_5,
+					snapshot: snapshot_6,
 					batch: {
 						version: FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION,
 						operations: [record.operation],
@@ -16288,8 +16597,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				const createdComments_1 = [];
 				const result_4 = applyFolioDocumentOperations({
 					undefinedReferences: "refuse",
-					view: view_36,
-					snapshot: snapshot_5,
+					view: view_35,
+					snapshot: snapshot_6,
 					batch: {
 						version: FOLIO_DOCUMENT_OPERATION_CONTRACT_VERSION,
 						operations: [record.operation],
@@ -16310,127 +16619,127 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 				};
 			},
 			activeSuggestionIds: () => {
-				const view_37 = pagedEditorRef.current?.getView();
-				return new Set(view_37 ? getSuggestions(view_37.state).map((s_3) => s_3.suggestionId) : []);
+				const view_36 = pagedEditorRef.current?.getView();
+				return new Set(view_36 ? getSuggestions(view_36.state).map((s_3) => s_3.suggestionId) : []);
 			}
 		}),
-		acceptSuggestion: (suggestionId, options_3) => {
-			const view_38 = pagedEditorRef.current?.getView();
-			if (!view_38) return {
+		acceptSuggestion: (suggestionId, options_4) => {
+			const view_37 = pagedEditorRef.current?.getView();
+			if (!view_37) return {
 				accepted: false,
 				appliedAs: null
 			};
-			const appliedAs = getSuggestions(view_38.state).find((s_4) => s_4.suggestionId === suggestionId)?.appliedAs ?? null;
-			const accepted = acceptSuggestion(suggestionId, { author: options_3?.author ?? author })(view_38.state, view_38.dispatch);
+			const appliedAs = getSuggestions(view_37.state).find((s_4) => s_4.suggestionId === suggestionId)?.appliedAs ?? null;
+			const accepted = acceptSuggestion(suggestionId, { author: options_4?.author ?? author })(view_37.state, view_37.dispatch);
 			return {
 				accepted,
 				appliedAs: accepted ? appliedAs : null
 			};
 		},
 		rejectSuggestion: (suggestionId_0) => {
-			const view_39 = pagedEditorRef.current?.getView();
-			if (!view_39) return false;
-			return rejectSuggestion(suggestionId_0)(view_39.state, view_39.dispatch);
+			const view_38 = pagedEditorRef.current?.getView();
+			if (!view_38) return false;
+			return rejectSuggestion(suggestionId_0)(view_38.state, view_38.dispatch);
 		},
 		scrollToSuggestion: (suggestionId_1) => {
-			const view_40 = pagedEditorRef.current?.getView();
-			if (!view_40) return false;
-			const range_5 = findSuggestionRange(view_40.state, suggestionId_1);
-			if (!range_5) return false;
-			const { from: from_12, to: to_12 } = clampRangeToDocSize(view_40.state.doc.content.size, range_5);
-			const $from_3 = view_40.state.doc.resolve(from_12);
-			const $to_3 = view_40.state.doc.resolve(to_12);
-			view_40.dispatch(view_40.state.tr.setSelection(TextSelection.between($from_3, $to_3)));
+			const view_39 = pagedEditorRef.current?.getView();
+			if (!view_39) return false;
+			const range_4 = findSuggestionRange(view_39.state, suggestionId_1);
+			if (!range_4) return false;
+			const { from: from_12, to: to_12 } = clampRangeToDocSize(view_39.state.doc.content.size, range_4);
+			const $from_3 = view_39.state.doc.resolve(from_12);
+			const $to_3 = view_39.state.doc.resolve(to_12);
+			view_39.dispatch(view_39.state.tr.setSelection(TextSelection.between($from_3, $to_3)));
 			requestAnimationFrame(() => {
 				pagedEditorRef.current?.scrollToPosition(from_12);
 			});
 			return true;
 		},
 		getTrackedChanges: () => {
-			const view_41 = pagedEditorRef.current?.getView();
-			return view_41 ? getTrackedChangesFromDoc(view_41.state.doc) : [];
+			const view_40 = pagedEditorRef.current?.getView();
+			return view_40 ? getTrackedChangesFromDoc(view_40.state.doc) : [];
 		},
 		getCommentAnchors: () => {
-			const view_42 = pagedEditorRef.current?.getView();
-			return view_42 ? getCommentAnchorsFromDoc(view_42.state.doc) : [];
+			const view_41 = pagedEditorRef.current?.getView();
+			return view_41 ? getCommentAnchorsFromDoc(view_41.state.doc) : [];
 		},
 		getSelectionText: () => {
-			const view_43 = pagedEditorRef.current?.getView();
-			return view_43 ? getSelectedText(view_43.state) : "";
+			const view_42 = pagedEditorRef.current?.getView();
+			return view_42 ? getSelectedText(view_42.state) : "";
 		},
 		getPageText: (page_1) => {
-			const view_44 = pagedEditorRef.current?.getView();
-			if (!view_44) return null;
+			const view_43 = pagedEditorRef.current?.getView();
+			if (!view_43) return null;
 			return getPageTextFromLayout({
 				layout: pagedEditorRef.current?.getEditor()?.getLayout() ?? null,
-				doc: view_44.state.doc,
+				doc: view_43.state.doc,
 				page: page_1,
-				projection: projectMarkupView(view_44.state, displayMode)
+				projection: projectMarkupView(view_43.state, displayMode)
 			});
 		},
-		getTargetPage: (target_2, snapshot_6) => {
-			const view_45 = pagedEditorRef.current?.getView();
-			if (!view_45) return null;
-			const range_6 = target_2.type === "textRange" ? resolveFolioAITextRange({
+		getTargetPage: (target_2, snapshot_7) => {
+			const view_44 = pagedEditorRef.current?.getView();
+			if (!view_44) return null;
+			const range_5 = target_2.type === "textRange" ? resolveFolioAITextRange({
 				range: target_2,
-				doc: view_45.state.doc,
-				snapshot: snapshot_6
+				doc: view_44.state.doc,
+				snapshot: snapshot_7
 			}) : resolveFolioAIBlockRange({
 				blockId: target_2.blockId,
-				doc: view_45.state.doc,
-				snapshot: snapshot_6
+				doc: view_44.state.doc,
+				snapshot: snapshot_7
 			});
-			if (range_6 === null) return null;
-			return pagedEditorRef.current?.getPageNumberForPmPos(range_6.from) ?? null;
+			if (range_5 === null) return null;
+			return pagedEditorRef.current?.getPageNumberForPmPos(range_5.from) ?? null;
 		},
 		getBlockRect: (blockId_1) => pagedEditorRef.current?.getBlockRect(blockId_1) ?? null,
 		getBlockRects: (blockIds) => pagedEditorRef.current?.getBlockRects(blockIds) ?? /* @__PURE__ */ new Map(),
 		getScrollRoot: () => pagedEditorRef.current?.getScrollRoot() ?? null,
 		onLayoutChange: (listener) => pagedEditorRef.current?.onLayoutChange(listener) ?? (() => {}),
 		getContentControls: (filter = {}) => {
-			const view_46 = pagedEditorRef.current?.getView();
-			if (!view_46) return [];
-			return findBlockSdtMatches(view_46.state.doc, filter).map((match_0) => ({
+			const view_45 = pagedEditorRef.current?.getView();
+			if (!view_45) return [];
+			return findBlockSdtMatches(view_45.state.doc, filter).map((match_0) => ({
 				properties: blockSdtAttrsToSdtProperties(match_0.node),
 				path: match_0.path,
 				pmPos: match_0.pos
 			}));
 		},
 		scrollToContentControl: (filter_0) => {
-			const view_47 = pagedEditorRef.current?.getView();
-			if (!view_47) return false;
-			const match_1 = findBlockSdtMatch(view_47.state.doc, filter_0);
+			const view_46 = pagedEditorRef.current?.getView();
+			if (!view_46) return false;
+			const match_1 = findBlockSdtMatch(view_46.state.doc, filter_0);
 			if (!match_1) return false;
 			const inside = match_1.pos + 1;
-			const $pos = view_47.state.doc.resolve(inside);
-			view_47.dispatch(view_47.state.tr.setSelection(TextSelection.near($pos)));
+			const $pos = view_46.state.doc.resolve(inside);
+			view_46.dispatch(view_46.state.tr.setSelection(TextSelection.near($pos)));
 			requestAnimationFrame(() => {
 				pagedEditorRef.current?.scrollToPosition(inside);
 			});
 			return true;
 		},
-		setContentControlContent: (filter_1, input, options_4 = {}) => {
-			const view_48 = pagedEditorRef.current?.getView();
-			if (!view_48) return false;
-			const tr_0 = typeof input === "string" ? setContentControlContentTr(view_48.state, filter_1, input, options_4) : setContentControlContentBlocksTr(view_48.state, filter_1, input, options_4);
+		setContentControlContent: (filter_1, input, options_5 = {}) => {
+			const view_47 = pagedEditorRef.current?.getView();
+			if (!view_47) return false;
+			const tr_0 = typeof input === "string" ? setContentControlContentTr(view_47.state, filter_1, input, options_5) : setContentControlContentBlocksTr(view_47.state, filter_1, input, options_5);
 			if (!tr_0) return false;
-			view_48.dispatch(tr_0);
+			view_47.dispatch(tr_0);
 			return true;
 		},
-		setContentControlValue: (filter_2, input_0, options_5 = {}) => {
-			const view_49 = pagedEditorRef.current?.getView();
-			if (!view_49) return false;
-			const tr_1 = setContentControlValueTr(view_49.state, filter_2, input_0, options_5);
+		setContentControlValue: (filter_2, input_0, options_6 = {}) => {
+			const view_48 = pagedEditorRef.current?.getView();
+			if (!view_48) return false;
+			const tr_1 = setContentControlValueTr(view_48.state, filter_2, input_0, options_6);
 			if (!tr_1) return false;
-			view_49.dispatch(tr_1);
+			view_48.dispatch(tr_1);
 			return true;
 		},
-		removeContentControl: (filter_3, options_6 = {}) => {
-			const view_50 = pagedEditorRef.current?.getView();
-			if (!view_50) return false;
-			const tr_2 = removeContentControlTr(view_50.state, filter_3, options_6);
+		removeContentControl: (filter_3, options_7 = {}) => {
+			const view_49 = pagedEditorRef.current?.getView();
+			if (!view_49) return false;
+			const tr_2 = removeContentControlTr(view_49.state, filter_3, options_7);
 			if (!tr_2) return false;
-			view_50.dispatch(tr_2);
+			view_49.dispatch(tr_2);
 			return true;
 		}
 	}), [
@@ -16440,6 +16749,11 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		readOnlyReason,
 		notifyReadonlyEditAttempt,
 		scrollPageInfo,
+		handleFind,
+		handleFindNext,
+		handleFindPrevious,
+		getFindResult,
+		resetFindResult,
 		handleSave,
 		setZoomWithViewportAnchor,
 		zoomRef,
@@ -16518,47 +16832,47 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		if (isDisplayMode(value)) setDisplayMode(value);
 	}, [setDisplayMode]);
 	const handleAcceptActiveChange = useCallback(() => {
-		const view_51 = pagedEditorRef.current?.getView();
-		if (!view_51) return;
-		const { from: from_13, to: to_13 } = view_51.state.selection;
-		const range_7 = findChangeAtPosition(view_51.state, from_13, to_13);
+		const view_50 = pagedEditorRef.current?.getView();
+		if (!view_50) return;
+		const { from: from_13, to: to_13 } = view_50.state.selection;
+		const range_6 = findChangeAtPosition(view_50.state, from_13, to_13);
 		if (resolveCanonicalReviewRange({
 			editor: pagedEditorRef.current?.getEditor(),
-			...range_7,
+			...range_6,
 			resolution: "accept"
-		}) === null) acceptChange(range_7.from, range_7.to)(view_51.state, view_51.dispatch);
+		}) === null) acceptChange(range_6.from, range_6.to)(view_50.state, view_50.dispatch);
 	}, []);
 	const handleRejectActiveChange = useCallback(() => {
-		const view_52 = pagedEditorRef.current?.getView();
-		if (!view_52) return;
-		const { from: from_14, to: to_14 } = view_52.state.selection;
-		const range_8 = findChangeAtPosition(view_52.state, from_14, to_14);
+		const view_51 = pagedEditorRef.current?.getView();
+		if (!view_51) return;
+		const { from: from_14, to: to_14 } = view_51.state.selection;
+		const range_7 = findChangeAtPosition(view_51.state, from_14, to_14);
 		if (resolveCanonicalReviewRange({
 			editor: pagedEditorRef.current?.getEditor(),
-			...range_8,
+			...range_7,
 			resolution: "reject"
-		}) === null) rejectChange(range_8.from, range_8.to)(view_52.state, view_52.dispatch);
+		}) === null) rejectChange(range_7.from, range_7.to)(view_51.state, view_51.dispatch);
 	}, []);
 	const handlePreviousChange = useCallback(() => {
-		const view_53 = pagedEditorRef.current?.getView();
-		if (!view_53) return;
-		const { from: from_15 } = view_53.state.selection;
-		const change = findPreviousChange(view_53.state, from_15);
+		const view_52 = pagedEditorRef.current?.getView();
+		if (!view_52) return;
+		const { from: from_15 } = view_52.state.selection;
+		const change = findPreviousChange(view_52.state, from_15);
 		if (!change) return;
-		view_53.dispatch(view_53.state.tr.setSelection(TextSelection.create(view_53.state.doc, change.from, change.to)));
-		view_53.focus();
+		view_52.dispatch(view_52.state.tr.setSelection(TextSelection.create(view_52.state.doc, change.from, change.to)));
+		view_52.focus();
 		requestAnimationFrame(() => {
 			pagedEditorRef.current?.scrollToPosition(change.from);
 		});
 	}, []);
 	const handleNextChange = useCallback(() => {
-		const view_54 = pagedEditorRef.current?.getView();
-		if (!view_54) return;
-		const { to: to_15 } = view_54.state.selection;
-		const change_0 = findNextChange(view_54.state, to_15);
+		const view_53 = pagedEditorRef.current?.getView();
+		if (!view_53) return;
+		const { to: to_15 } = view_53.state.selection;
+		const change_0 = findNextChange(view_53.state, to_15);
 		if (!change_0) return;
-		view_54.dispatch(view_54.state.tr.setSelection(TextSelection.create(view_54.state.doc, change_0.from, change_0.to)));
-		view_54.focus();
+		view_53.dispatch(view_53.state.tr.setSelection(TextSelection.create(view_53.state.doc, change_0.from, change_0.to)));
+		view_53.focus();
 		requestAnimationFrame(() => {
 			pagedEditorRef.current?.scrollToPosition(change_0.from);
 		});
@@ -16728,52 +17042,52 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		requestAnimationFrame(syncCommentHighlightStyles);
 	}, [onScrollTopChange, syncCommentHighlightStyles]);
 	const handlePagedSelectionChange = useCallback((_from, _to) => {
-		const view_55 = getActiveEditorView() ?? pagedEditorRef.current?.getView() ?? null;
-		handleSelectionChange(view_55 ? extractSelectionState(view_55.state) : null);
+		const view_54 = getActiveEditorView() ?? pagedEditorRef.current?.getView() ?? null;
+		handleSelectionChange(view_54 ? extractSelectionState(view_54.state) : null);
 	}, [getActiveEditorView, handleSelectionChange]);
 	const handleTotalPagesChange = useCallback((totalPages) => {
 		setScrollPageInfo((previous) => updateScrollPageTotal(previous, totalPages));
 	}, [setScrollPageInfo]);
-	const handleCommentClick = useCallback((id) => setActiveCommentId(id), [setActiveCommentId]);
-	const handleCommentResolve = useCallback((id_0) => {
+	const handleCommentClick = useCallback((id_0) => setActiveCommentId(id_0), [setActiveCommentId]);
+	const handleCommentResolve = useCallback((id_1) => {
 		if (applyCanonicalComment({
 			type: "resolve",
-			id: id_0,
+			id: id_1,
 			status: "resolved"
 		}) !== null) return;
-		updateComments((previous_0) => previous_0.map((comment_2) => comment_2.id === id_0 ? {
+		updateComments((previous_0) => previous_0.map((comment_2) => comment_2.id === id_1 ? {
 			...comment_2,
 			done: true
 		} : comment_2));
 	}, [applyCanonicalComment, updateComments]);
-	const handleCommentDelete = useCallback((id_1) => {
+	const handleCommentDelete = useCallback((id_2) => {
 		const result_5 = applyCanonicalComment({
 			type: "delete",
-			id: id_1
+			id: id_2
 		});
 		if (result_5 !== null) {
-			if (result_5.status === "applied" && activeCommentId === id_1) setActiveCommentId(null);
+			if (result_5.status === "applied" && activeCommentId === id_2) setActiveCommentId(null);
 			return;
 		}
-		updateComments((previous_1) => previous_1.filter((comment_3) => comment_3.id !== id_1 && comment_3.parentId !== id_1));
-		if (activeCommentId === id_1) setActiveCommentId(null);
+		updateComments((previous_1) => previous_1.filter((comment_3) => comment_3.id !== id_2 && comment_3.parentId !== id_2));
+		if (activeCommentId === id_2) setActiveCommentId(null);
 	}, [
 		activeCommentId,
 		applyCanonicalComment,
 		setActiveCommentId,
 		updateComments
 	]);
-	const handleCommentReply = useCallback((id_2, text_6) => {
+	const handleCommentReply = useCallback((id_3, text_6) => {
 		if (applyCanonicalComment({
 			type: "create",
 			text: text_6,
 			author,
 			anchor: {
 				kind: "reply",
-				parentId: id_2
+				parentId: id_3
 			}
 		}) !== null) return;
-		updateComments((previous_2) => [...previous_2, createComment(text_6, author, id_2)]);
+		updateComments((previous_2) => [...previous_2, createComment(text_6, author, id_3)]);
 	}, [
 		applyCanonicalComment,
 		author,
@@ -16781,8 +17095,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		updateComments
 	]);
 	const handleAddComment = useCallback((addText) => {
-		const view_56 = pagedEditorRef.current?.getView();
-		if (!view_56 || !commentSelectionRange) return false;
+		const view_55 = pagedEditorRef.current?.getView();
+		if (!view_55 || !commentSelectionRange) return false;
 		const result_6 = applyCanonicalComment({
 			type: "create",
 			text: addText,
@@ -16798,7 +17112,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			setVisibleCommentAuthors((current_0) => {
 				if (current_0 === null) return null;
 				const next_1 = new Set(current_0);
-				const created = result_6.comments.find(({ id: id_3 }) => id_3 === result_6.commentId);
+				const created = result_6.comments.find(({ id: id_4 }) => id_4 === result_6.commentId);
 				if (created) next_1.add(getCommentAuthorKey(created.author));
 				return next_1;
 			});
@@ -16809,7 +17123,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			return true;
 		}
 		const comment_4 = createComment(addText, author);
-		if (!applyCommentMarkRange(view_56, commentSelectionRange, comment_4.id, { replacePending: true })) return false;
+		if (!applyCommentMarkRange(view_55, commentSelectionRange, comment_4.id, { replacePending: true })) return false;
 		const commentAuthor_2 = getCommentAuthorKey(comment_4.author);
 		setVisibleCommentAuthors((current_1) => {
 			if (current_1 === null) return null;
@@ -16860,8 +17174,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		updateComments
 	]);
 	const handleCancelAddComment = useCallback(() => {
-		const view_57 = pagedEditorRef.current?.getView();
-		if (view_57 && commentSelectionRange && commentDraftMode === "prosemirror") removePendingCommentMarkRange(view_57, commentSelectionRange);
+		const view_56 = pagedEditorRef.current?.getView();
+		if (view_56 && commentSelectionRange && commentDraftMode === "prosemirror") removePendingCommentMarkRange(view_56, commentSelectionRange);
 		setIsAddingComment(false);
 		setCommentSelectionRange(null);
 		setAddCommentYPosition(null);
@@ -16878,23 +17192,23 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		})?.revisionId ?? null;
 	}, []);
 	const handleSidebarAcceptChange = useCallback((from_17, to_17) => {
-		const view_58 = pagedEditorRef.current?.getView();
-		if (!view_58) return;
+		const view_57 = pagedEditorRef.current?.getView();
+		if (!view_57) return;
 		const revisionId_3 = resolveSidebarChangeRevisionId(from_17, to_17);
 		if (revisionId_3 === null) return;
 		const editor_7 = pagedEditorRef.current?.getEditor();
 		if (editor_7?.getCanonicalDocument()) editor_7.resolveCanonicalRevisions([revisionId_3], "accept");
-		else acceptAIEditRevision(revisionId_3)(view_58.state, view_58.dispatch);
+		else acceptAIEditRevision(revisionId_3)(view_57.state, view_57.dispatch);
 		extractTrackedChanges();
 	}, [extractTrackedChanges, resolveSidebarChangeRevisionId]);
 	const handleSidebarRejectChange = useCallback((from_18, to_18) => {
-		const view_59 = pagedEditorRef.current?.getView();
-		if (!view_59) return;
+		const view_58 = pagedEditorRef.current?.getView();
+		if (!view_58) return;
 		const revisionId_4 = resolveSidebarChangeRevisionId(from_18, to_18);
 		if (revisionId_4 === null) return;
 		const editor_8 = pagedEditorRef.current?.getEditor();
 		if (editor_8?.getCanonicalDocument()) editor_8.resolveCanonicalRevisions([revisionId_4], "reject");
-		else rejectAIEditRevision(revisionId_4)(view_59.state, view_59.dispatch);
+		else rejectAIEditRevision(revisionId_4)(view_58.state, view_58.dispatch);
 		extractTrackedChanges();
 	}, [extractTrackedChanges, resolveSidebarChangeRevisionId]);
 	const commentsPageWidth = history.state?.package.document.finalSectionProperties?.pageWidth;
@@ -17029,9 +17343,9 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		};
 		requestAnimationFrame(flash);
 	}, []);
-	const handleOutlineJump = useCallback((id_4) => {
-		markHeadingJumped(id_4);
-		handleOutlineHeadingClick(Number(id_4));
+	const handleOutlineJump = useCallback((id_5) => {
+		markHeadingJumped(id_5);
+		handleOutlineHeadingClick(Number(id_5));
 	}, [handleOutlineHeadingClick, markHeadingJumped]);
 	const handleTextContextAction = useCallback((action_3) => {
 		handleContextMenuAction(action_3);
@@ -17044,8 +17358,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	}, [readOnly]);
 	const closeTableProperties = useCallback(() => setTablePropsOpen(false), []);
 	const applyTableProperties = useCallback((props_0) => {
-		const view_60 = getActiveEditorView();
-		if (view_60) setTableProperties(props_0)(view_60.state, view_60.dispatch);
+		const view_59 = getActiveEditorView();
+		if (view_59) setTableProperties(props_0)(view_59.state, view_59.dispatch);
 	}, [getActiveEditorView]);
 	const closeImagePosition = useCallback(() => setImagePositionOpen(false), [setImagePositionOpen]);
 	const closeImageProperties = useCallback(() => setImagePropsOpen(false), [setImagePropsOpen]);
@@ -17053,28 +17367,37 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	const closeFootnoteProperties = useCallback(() => setFootnotePropsOpen(false), []);
 	const closeInsertSymbol = useCallback(() => setShowInsertSymbol(false), []);
 	const insertSymbol = useCallback((symbol) => {
-		const view_61 = getActiveEditorView();
-		if (view_61) view_61.dispatch(view_61.state.tr.insertText(symbol).scrollIntoView());
+		const view_60 = getActiveEditorView();
+		if (view_60) view_60.dispatch(view_60.state.tr.insertText(symbol).scrollIntoView());
 	}, [getActiveEditorView]);
 	const imagePropertiesCurrentData = useMemo(() => buildImagePropertiesData(state.pmImageContext), [state.pmImageContext]);
+	const { close: closeFindDialog } = findReplace;
 	const findReplaceDialog = useMemo(() => ({
 		state: findReplace.state,
-		onClose: findReplace.close,
+		onClose: () => {
+			closeFindDialog();
+			resetFindResult();
+		},
 		onFind: handleFind,
+		onQueryChange: handleQueryChange,
 		onFindNext: handleFindNext,
 		onFindPrevious: handleFindPrevious,
 		onReplace: handleReplace,
 		onReplaceAll: handleReplaceAll,
-		currentResult: currentFindResult
+		currentSearch: currentFindSearch,
+		readOnly
 	}), [
-		currentFindResult,
-		findReplace.close,
+		currentFindSearch,
+		readOnly,
+		closeFindDialog,
 		findReplace.state,
 		handleFind,
+		handleQueryChange,
 		handleFindNext,
 		handleFindPrevious,
 		handleReplace,
-		handleReplaceAll
+		handleReplaceAll,
+		resetFindResult
 	]);
 	const tablePropertiesDialog = useMemo(() => {
 		const table = state.pmTableContext?.table;
@@ -17136,8 +17459,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	]);
 	const closeNumberingValueDialog = useCallback(() => setNumberingValueDialogOpen(false), []);
 	const applyNumberingValue = useCallback((value_0) => {
-		const view_62 = getActiveEditorView();
-		if (view_62) setNumberingValue(value_0)(view_62.state, view_62.dispatch);
+		const view_61 = getActiveEditorView();
+		if (view_61) setNumberingValue(value_0)(view_61.state, view_61.dispatch);
 	}, [getActiveEditorView]);
 	const numberingValueDialog = useMemo(() => ({
 		isOpen: numberingValueDialogOpen,
@@ -17158,6 +17481,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		showInsertSymbol
 	]);
 	const containerStyle = {
+		position: "relative",
 		display: "flex",
 		flexDirection: "column",
 		height: "100%",
@@ -17437,8 +17761,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 																onMouseDown: (e_1) => {
 																	e_1.preventDefault();
 																	e_1.stopPropagation();
-																	const view_63 = pagedEditorRef.current?.getView();
-																	if (!view_63) {
+																	const view_62 = pagedEditorRef.current?.getView();
+																	if (!view_62) {
 																		setFloatingCommentBtn(null);
 																		return;
 																	}
@@ -17446,9 +17770,9 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 																		from: floatingCommentBtn.from,
 																		to: floatingCommentBtn.to
 																	};
-																	const currentSelection = view_63.state.selection;
+																	const currentSelection = view_62.state.selection;
 																	const safeRange = resolveCommentCreationRange({
-																		docSize: view_63.state.doc.content.size,
+																		docSize: view_62.state.doc.content.size,
 																		capturedRange,
 																		currentRange: {
 																			from: currentSelection.from,
@@ -17463,7 +17787,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 																	}
 																	setCommentSelectionRange(safeRange);
 																	if (commentDraftMode === "prosemirror") {
-																		if (!applyCommentMarkRange(view_63, safeRange, -1, { selectEnd: true })) {
+																		if (!applyCommentMarkRange(view_62, safeRange, -1, { selectEnd: true })) {
 																			setCommentSelectionRange(null);
 																			setFloatingCommentBtn(null);
 																			return;