@stll/folio-react 0.24.1 → 0.24.2

package/dist/{CommentsSidebar-D0TBbrpB.js → CommentsSidebar-Bk5pQ_2C.js}

@@ -1,7 +1,8 @@
-import { f as containedHandler, u as useDrawerFocus } from "./renderAsync-DqldIlJu.js";
+import { f as containedHandler, u as useDrawerFocus } from "./renderAsync-6eWf0MfZ.js";
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { CheckIcon, MoreVerticalIcon } from "lucide-react";
 import { useLocale, useTranslations } from "use-intl";
+import { scrollEditorTo } from "@stll/folio-core/paged-layout/editorScrollRoot";
 import { closestHtmlElement, queryHtmlElement } from "@stll/folio-core/utils/domGuards";
 import { jsx, jsxs } from "react/jsx-runtime";
 import { PANEL_METRICS } from "@stll/folio-core/panel-layout";
@@ -369,7 +370,10 @@ const CommentsSidebar = ({ comments, onCommentClick, activeCommentId = null, onC
 		const scrollEl_1 = editorContainerRef?.current;
 		const anchorY = lastKnownCardPositionsRef.current.get(cardId_1) ?? anchorPositions?.get(cardId_1);
 		if (!scrollEl_1 || anchorY === void 0) return;
-		scrollEl_1.scrollTop = Math.max(0, anchorY - scrollEl_1.clientHeight / 3);
+		scrollEditorTo(scrollEl_1, {
+			top: Math.max(0, anchorY - scrollEl_1.clientHeight / 3),
+			behavior: "instant"
+		});
 	};
 	const hasPositions = !isDrawer && cardPositions.size > 0;
 	const avatarStyle = (name, size = 28) => ({

package/dist/compat/eigenpal.js

@@ -1,4 +1,4 @@
-import { n as DocxEditor$1, t as renderAsync } from "../renderAsync-DqldIlJu.js";
+import { n as DocxEditor$1, t as renderAsync } from "../renderAsync-6eWf0MfZ.js";
 import { t as messages_exports } from "../messages.js";
 import { c } from "react-compiler-runtime";
 import { forwardRef } from "react";

package/dist/index.js

@@ -1,4 +1,4 @@
-import { a as formatZoom, c as FormattingBar, d as AutocompleteCaretOverlay, i as clampZoom, l as ZoomControl, n as DocxEditor, o as parseZoom, r as ZOOM_PRESETS, s as useWheelZoom, t as renderAsync } from "./renderAsync-DqldIlJu.js";
+import { a as formatZoom, c as FormattingBar, d as AutocompleteCaretOverlay, i as clampZoom, l as ZoomControl, n as DocxEditor, o as parseZoom, r as ZOOM_PRESETS, s as useWheelZoom, t as renderAsync } from "./renderAsync-6eWf0MfZ.js";
 import { n as FolioUIProvider } from "./folio-ui-DO95voaI.js";
 import { t as FindReplaceDialog } from "./FindReplaceDialog-BUwFQWaq.js";
 import { t as FootnotePropertiesDialog } from "./FootnotePropertiesDialog-6XdO0zBH.js";

package/dist/{renderAsync-DqldIlJu.js → renderAsync-6eWf0MfZ.js}

@@ -14,6 +14,7 @@ import { cloneDocumentWithParagraphPropertySources } from "@stll/folio-core/docx
 import { normalizeBaseDirection } from "@stll/folio-core/docx/normalizeBaseDirection";
 import { getCachedNumberingMap } from "@stll/folio-core/docx/numberingParser";
 import { classifyEditorKeydown, deleteSelectedTable, historyShortcutOwner, isFocusInInputLike, isKeydownInShortcutScope, isMacPlatform } from "@stll/folio-core/managers/editorShortcuts";
+import { getEditorScrollRoot, scrollEditorBy, scrollEditorElementIntoView, scrollEditorTo } from "@stll/folio-core/paged-layout/editorScrollRoot";
 import { computeScrollPageInfo, updateScrollPageTotal } from "@stll/folio-core/paged-layout/scrollPageInfo";
 import { NO_LIST_STATE, TextSelection, addColumnLeft, addColumnRight, addRowAbove, addRowBelow, applyFormatMarks, applyStyle, applyTableStyle, autoFitContents, captureFormatMarks, clearFormatting, clearTextColor, continueNumbering, createStyleResolver, decreaseIndent, decreaseListLevel, deleteColumn, deleteRow, deleteTable, distributeColumns, extractSelectionState, getDocumentBuiltInStyles, getSelectedText, getTableContext, increaseIndent, increaseListLevel, listStateLevel, mergeCells, removeTabStop, removeTableBorders, restartNumbering, sameListState, schema, selectColumn, selectRow, selectTable, setAlignment, setAllTableBorders, setCellBorder, setCellFillColor, setCellMargins, setCellTextDirection, setCellVerticalAlign, setFontFamily, setFontSize, setHighlight, setIndentFirstLine, setIndentLeft, setIndentRight, setInsideTableBorders, setLineSpacing, setLtr, setNumberingValue, setOutsideTableBorders, setRowHeight, setRtl, setTableBorderColor, setTableBorderPreset, setTableBorderWidth, setTableProperties, setTextColor, splitCell, toggleBidi, toggleBold, toggleBulletList, toggleHeaderRow, toggleItalic, toggleNoWrap, toggleNumberedList, toggleStrike, toggleSubscript, toggleSuperscript, toggleUnderline } from "@stll/folio-core/prosemirror";
 import { acceptAIEditRevision, acceptChange, acceptSuggestion, findAIEditRevisionRange, findChangeAtPosition, findNextChange, findParagraphBoundaryChangeAtPosition, findPreviousChange, findSuggestionRange, getSuggestions, rejectAIEditRevision, rejectChange, rejectSuggestion } from "@stll/folio-core/prosemirror/commands/comments";
@@ -80,7 +81,7 @@ import { onPaintedLayoutChange, readBlockRects } from "@stll/folio-core/paged-la
 import { LayoutSelectionGate } from "@stll/folio-core/paged-layout/LayoutSelectionGate";
 import { collectRunFontsAtPmPositions, measureDirectiveGutter, projectRangesToRects } from "@stll/folio-core/paged-layout/rangeProjection";
 import { isReadOnlyEditKey } from "@stll/folio-core/paged-layout/readOnlyEditAttempt";
-import { getPageScrollTarget, prefersReducedMotionBehavior } from "@stll/folio-core/paged-layout/scrollNavigation";
+import { getPageScrollTarget } from "@stll/folio-core/paged-layout/scrollNavigation";
 import { PAGES_CONTAINER_CLASS, scrollPagesToPmPosition } from "@stll/folio-core/paged-layout/scrollToPmPosition";
 import { flashParagraphFragmentsByParaId } from "@stll/folio-core/paged-layout/paragraphFlash";
 import { resizeColumnPair } from "@stll/folio-core/paged-layout/tableColumnResize";
@@ -96,6 +97,7 @@ import { createVisualLineState, handleVisualLineKeyDown } from "@stll/folio-core
 import { clampRangeToDocSize, resolveFolioAIBlockRange, resolveFolioAITextRange, resolvePassageRange } from "@stll/folio-core/ai-edits/blockRange";
 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 { PANEL_METRICS, computePanelLayout } from "@stll/folio-core/panel-layout";
@@ -853,10 +855,7 @@ const AnonymizationRectsOverlay = ({ groups, onTermClick, selectedCanonical = nu
 			index: nextIndex
 		};
 		const el = spans[nextIndex];
-		if (el) el.scrollIntoView({
-			block: "center",
-			behavior: prefersReducedMotionBehavior()
-		});
+		if (el) scrollEditorElementIntoView(el);
 	}, [selectedCanonical, selectionSeq]);
 	const overlayRef = useRef(null);
 	useEffect(() => {
@@ -2170,18 +2169,6 @@ const TemplateDirectivesOverlay = (t0) => {
 const EDGE_ZONE = 40;
 /** Maximum scroll speed in pixels per frame (~60fps). */
 const MAX_SPEED = 12;
-/**
-* Find the nearest scrollable ancestor.
-*/
-function findScrollParent(el) {
-	let parent = el.parentElement;
-	while (parent && parent !== document.documentElement) {
-		const { overflowY } = getComputedStyle(parent);
-		if ((overflowY === "auto" || overflowY === "scroll") && parent.scrollHeight > parent.clientHeight) return parent;
-		parent = parent.parentElement;
-	}
-	return null;
-}
 function useDragAutoScroll({ pagesContainerRef, onScrollExtendSelection }) {
 	const rafIdRef = useRef(null);
 	const lastMouseRef = useRef({
@@ -2189,14 +2176,7 @@ function useDragAutoScroll({ pagesContainerRef, onScrollExtendSelection }) {
 		y: 0
 	});
 	const activeRef = useRef(false);
-	const scrollParentRef = useRef(null);
-	const getScrollParent = useCallback(() => {
-		if (scrollParentRef.current) return scrollParentRef.current;
-		const pages = pagesContainerRef.current;
-		if (!pages) return null;
-		scrollParentRef.current = findScrollParent(pages);
-		return scrollParentRef.current;
-	}, [pagesContainerRef]);
+	const getScrollParent = useCallback(() => getEditorScrollRoot(pagesContainerRef.current), [pagesContainerRef]);
 	const stopAutoScroll = useCallback(() => {
 		activeRef.current = false;
 		if (rafIdRef.current !== null) {
@@ -2219,7 +2199,7 @@ function useDragAutoScroll({ pagesContainerRef, onScrollExtendSelection }) {
 			scrollDelta = Math.min(MAX_SPEED, proximity_0 / EDGE_ZONE * MAX_SPEED);
 		}
 		if (scrollDelta !== 0) {
-			container.scrollTop += scrollDelta;
+			scrollEditorBy(container, scrollDelta);
 			onScrollExtendSelection(mx, my);
 		}
 		rafIdRef.current = requestAnimationFrame(tick);
@@ -2841,11 +2821,18 @@ function buildFootnoteRenderItems(pageFootnoteMap, footnoteContentMap, doc) {
 const PagedEditor = forwardRef(function PagedEditor(props, ref) {
 	const { document, documentIO, documentIdentity, fonts: hostFonts, styles, theme: _theme, sectionProperties, headerContent, footerContent, firstPageHeaderContent, firstPageFooterContent, headerContentRId, footerContentRId, firstPageHeaderContentRId, firstPageFooterContentRId, readOnly = false, pageGap = 24, zoom = 1, pageRenderer, markupView, showMarginGuides = false, marginGuideColor, onDocumentChange, onReadOnlyEditAttempt, onCopy, onCut, onPaste, onSelectionChange, onSelectionTextChange, onEditorViewReady, externalPlugins = EMPTY_PLUGINS, showTemplateDirectives = true, collaboration, extensionManager, suggestionModeActive = false, suggestionAuthor, onActiveNoteStoryChange, onHeaderFooterDoubleClick, hfEditMode, activeHeaderFooterRId, onBodyClick, className, style, pageEndGutter = 0, sidebarOverlay, scrollContainerRef: scrollContainerRefProp, onHyperlinkClick, onContextMenu, onAnchorPositionsChange, onTotalPagesChange, onError, anchorPositionMode = "comments-and-revisions", onAnonymizationTermClick, selectedAnonymizationCanonical = null, anonymizationSelectionSeq } = props;
 	const getScrollContainer = useCallback(() => {
-		if (scrollContainerRefProp && typeof scrollContainerRefProp === "object") return scrollContainerRefProp.current;
-		return containerRef.current;
+		if (scrollContainerRefProp && typeof scrollContainerRefProp === "object") return getEditorScrollRoot(scrollContainerRefProp.current);
+		return getEditorScrollRoot(containerRef.current);
 	}, [scrollContainerRefProp]);
 	const containerRef = useRef(null);
 	const pagesContainerRef = useRef(null);
+	useLayoutEffect(() => {
+		if (!scrollContainerRefProp || typeof scrollContainerRefProp !== "object") return;
+		const root = scrollContainerRefProp.current;
+		if (!root || root.hasAttribute("data-folio-scroll")) return;
+		root.setAttribute("data-folio-scroll", "");
+		return () => root.removeAttribute("data-folio-scroll");
+	}, [scrollContainerRefProp]);
 	const folioEmitterRef = useRef(createFolioEditorEmitter());
 	const hiddenPMRef = useRef(null);
 	const hfPMsRef = useRef(null);
@@ -4029,10 +4016,8 @@ const PagedEditor = forwardRef(function PagedEditor(props, ref) {
 			scrollToPositionImpl(target_0.pmPos);
 			return;
 		}
-		(pagesContainerRef.current?.querySelector(`[data-page-number="${String(target_0.pageIndex + 1)}"]`))?.scrollIntoView({
-			block: "center",
-			inline: "nearest"
-		});
+		const shell = pagesContainerRef.current?.querySelector(`[data-page-number="${String(target_0.pageIndex + 1)}"]`);
+		scrollEditorElementIntoView(shell ?? null);
 	}, [layout, scrollToPositionImpl]);
 	const scrollToParaIdImpl = useCallback((paraId, options_2) => {
 		const state_7 = hiddenPMRef.current?.getState();
@@ -5100,11 +5085,17 @@ const PagedEditor = forwardRef(function PagedEditor(props, ref) {
 		if (["PageUp", "PageDown"].includes(e_7.key) && !e_7.metaKey && !e_7.ctrlKey) {}
 		if (e_7.key === "Home" && (e_7.metaKey || e_7.ctrlKey)) {
 			const sc = getScrollContainer();
-			if (sc) sc.scrollTop = 0;
+			if (sc) scrollEditorTo(sc, {
+				top: 0,
+				behavior: "instant"
+			});
 		}
 		if (e_7.key === "End" && (e_7.metaKey || e_7.ctrlKey)) {
 			const sc_0 = getScrollContainer();
-			if (sc_0) sc_0.scrollTop = sc_0.scrollHeight;
+			if (sc_0) scrollEditorTo(sc_0, {
+				top: sc_0.scrollHeight,
+				behavior: "instant"
+			});
 		}
 	}, [
 		copySelectionText,
@@ -5451,20 +5442,22 @@ const PagedEditor = forwardRef(function PagedEditor(props, ref) {
 		undo() {
 			const target_5 = getActiveEditorStory();
 			if (target_5.type === "none") return false;
-			return undo(target_5.view.state, target_5.view.dispatch);
+			return target_5.type === "body" ? hiddenPMRef.current?.undo() ?? false : undo(target_5.view.state, target_5.view.dispatch);
 		},
 		redo() {
 			const target_6 = getActiveEditorStory();
 			if (target_6.type === "none") return false;
-			return redo(target_6.view.state, target_6.view.dispatch);
+			return target_6.type === "body" ? hiddenPMRef.current?.redo() ?? false : redo(target_6.view.state, target_6.view.dispatch);
 		},
 		canUndo() {
 			const target_7 = getActiveEditorStory();
-			return target_7.type === "none" ? false : undo(target_7.view.state);
+			if (target_7.type === "none") return false;
+			return target_7.type === "body" ? hiddenPMRef.current?.canUndo() ?? false : undo(target_7.view.state);
 		},
 		canRedo() {
 			const target_8 = getActiveEditorStory();
-			return target_8.type === "none" ? false : redo(target_8.view.state);
+			if (target_8.type === "none") return false;
+			return target_8.type === "body" ? hiddenPMRef.current?.canRedo() ?? false : redo(target_8.view.state);
 		},
 		setSelection(anchor_3, head_1) {
 			folioEditor.setSelection(anchor_3, head_1);
@@ -5603,6 +5596,7 @@ const PagedEditor = forwardRef(function PagedEditor(props, ref) {
 	};
 	return /* @__PURE__ */ jsxs("div", {
 		ref: containerRef,
+		"data-folio-scroll": scrollContainerRefProp && typeof scrollContainerRefProp === "object" ? void 0 : "",
 		className: `folio-root paged-editor ${className ?? ""}`,
 		style: {
 			...containerStyles,
@@ -6804,20 +6798,6 @@ const toast = (msg) => {
 };
 /** Stable empty anchor positions Map used as the initial state. */
 const EMPTY_ANCHOR_POSITIONS = /* @__PURE__ */ new Map();
-let nextCommentId = Date.now();
-function allocateCommentId() {
-	return nextCommentId++;
-}
-/**
-* Bump the in-process comment-id counter above `id` so a later
-* `allocateCommentId()` can never re-mint an id that was adopted from an
-* external source-of-truth model. No-op when `id` is already below the
-* current counter. Mirrors the allocator-seeding behaviour of upstream
-* docx-editor's `CommentIdAllocator.seedAbove` (05f2ab84).
-*/
-function seedCommentIdAbove(id) {
-	if (id >= nextCommentId) nextCommentId = id + 1;
-}
 function getCommentAuthorKey(author) {
 	const trimmed = author?.trim();
 	return trimmed && trimmed.length > 0 ? trimmed : "Unknown";
@@ -7176,10 +7156,7 @@ const readFindSelectionSeed = () => {
 //#region src/components/dialogs/findReplaceUtils.ts
 const scrollToMatch = (containerElement, match) => {
 	if (!containerElement) return;
-	(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)).scrollIntoView({
-		behavior: prefersReducedMotionBehavior(),
-		block: "center"
-	});
+	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
@@ -10083,9 +10060,10 @@ function useContextMenu(t0) {
 * callbacks each render.
 */
 const useDocumentLoader = (t0) => {
-	const $ = c(21);
+	const $ = c(22);
 	const { documentBuffer, initialDocument, password, history, onError, onCompatibilityChange, onReset, setDocumentLoadState } = t0;
 	const originalBufferRef = useRef(null);
+	const originalBufferIdentityRef = useRef(null);
 	const [loadedDocumentIdentity, setLoadedDocumentIdentity] = useState("0");
 	let t1;
 	if ($[0] !== history || $[1] !== onCompatibilityChange || $[2] !== onError || $[3] !== onReset || $[4] !== setDocumentLoadState) {
@@ -10158,26 +10136,33 @@ const useDocumentLoader = (t0) => {
 	useEffect(t3, t4);
 	let t5;
 	let t6;
-	if ($[12] !== documentBuffer || $[13] !== history.state) {
+	if ($[12] !== documentBuffer || $[13] !== history.state || $[14] !== loadedDocumentIdentity) {
 		t5 = () => {
+			if (originalBufferIdentityRef.current === loadedDocumentIdentity) return;
+			originalBufferIdentityRef.current = loadedDocumentIdentity;
 			if (history.state?.originalBuffer) {
 				originalBufferRef.current = history.state.originalBuffer;
 				return;
 			}
-			if (documentBuffer instanceof ArrayBuffer) originalBufferRef.current = documentBuffer;
+			originalBufferRef.current = documentBuffer instanceof ArrayBuffer ? documentBuffer : null;
 		};
-		t6 = [history.state, documentBuffer];
+		t6 = [
+			history.state,
+			documentBuffer,
+			loadedDocumentIdentity
+		];
 		$[12] = documentBuffer;
 		$[13] = history.state;
-		$[14] = t5;
-		$[15] = t6;
+		$[14] = loadedDocumentIdentity;
+		$[15] = t5;
+		$[16] = t6;
 	} else {
-		t5 = $[14];
-		t6 = $[15];
+		t5 = $[15];
+		t6 = $[16];
 	}
 	useEffect(t5, t6);
 	let t7;
-	if ($[16] !== api.loadBuffer || $[17] !== api.loadParsedDocument || $[18] !== api.resetForNewDocument || $[19] !== loadedDocumentIdentity) {
+	if ($[17] !== api.loadBuffer || $[18] !== api.loadParsedDocument || $[19] !== api.resetForNewDocument || $[20] !== loadedDocumentIdentity) {
 		t7 = {
 			loadBuffer: api.loadBuffer,
 			loadParsedDocument: api.loadParsedDocument,
@@ -10185,12 +10170,12 @@ const useDocumentLoader = (t0) => {
 			originalBufferRef,
 			loadedDocumentIdentity
 		};
-		$[16] = api.loadBuffer;
-		$[17] = api.loadParsedDocument;
-		$[18] = api.resetForNewDocument;
-		$[19] = loadedDocumentIdentity;
-		$[20] = t7;
-	} else t7 = $[20];
+		$[17] = api.loadBuffer;
+		$[18] = api.loadParsedDocument;
+		$[19] = api.resetForNewDocument;
+		$[20] = loadedDocumentIdentity;
+		$[21] = t7;
+	} else t7 = $[21];
 	return t7;
 };
 //#endregion
@@ -11019,7 +11004,10 @@ function useZoomAndPageInfo({ scrollContainerRef, pagedEditorRef, initialZoom })
 		if (anchor.zoom === zoom) return;
 		const scrollContainer_1 = scrollContainerRef.current;
 		if (!scrollContainer_1) return;
-		scrollContainer_1.scrollTop = getScrollTopForZoomAnchor(anchor, zoom);
+		scrollEditorTo(scrollContainer_1, {
+			top: getScrollTopForZoomAnchor(anchor, zoom),
+			behavior: "instant"
+		});
 		updateScrollPageInfo(scrollContainer_1);
 		scheduleScrollPageInfoFade();
 	}, [
@@ -12637,15 +12625,25 @@ function useFolioComments({ doc, autoOpenReviewSidebar, anchorPositions, editorC
 	const sanitizedCommentsProp = useMemo(() => commentsProp !== void 0 ? sanitizeControlledComments(commentsProp) : void 0, [commentsProp]);
 	const isControlledComments = sanitizedCommentsProp !== void 0;
 	const comments = isControlledComments ? sanitizedCommentsProp : internalComments;
+	useLayoutEffect(() => {
+		for (const { id } of doc?.package.document.comments ?? []) seedCommentIdAbove(id);
+		for (const { id: id_0 } of comments) seedCommentIdAbove(id_0);
+	}, [comments, doc]);
 	const commentsDirtyRef = useRef(false);
 	const commentsRef = useRef(comments);
 	commentsRef.current = comments;
 	const readonlyCommentsRef = commentsRef;
 	const onCommentsChangeRef = useRef(onCommentsChange);
 	onCommentsChangeRef.current = onCommentsChange;
+	const createComment$1 = useCallback((text, author, parentId) => {
+		for (const { id: id_1 } of doc?.package.document.comments ?? []) seedCommentIdAbove(id_1);
+		for (const { id: id_2 } of commentsRef.current) seedCommentIdAbove(id_2);
+		return createComment(text, author, parentId);
+	}, [doc]);
 	const setComments = useCallback((next) => {
 		const resolved = typeof next === "function" ? next(commentsRef.current) : next;
 		if (resolved === commentsRef.current) return;
+		for (const { id: id_3 } of resolved) seedCommentIdAbove(id_3);
 		commentsRef.current = resolved;
 		if (!isControlledComments) setInternalComments(resolved);
 		onCommentsChangeRef.current?.(resolved);
@@ -12693,13 +12691,13 @@ function useFolioComments({ doc, autoOpenReviewSidebar, anchorPositions, editorC
 	const visibleComments = useMemo(() => {
 		const visibleRootIds = /* @__PURE__ */ new Set();
 		for (const comment_1 of comments) {
-			const parentId = getCommentParentId(comment_1);
-			if (parentId === null || parentId === void 0 || !visibleCommentIds.has(comment_1.id)) continue;
-			visibleRootIds.add(parentId);
+			const parentId_0 = getCommentParentId(comment_1);
+			if (parentId_0 === null || parentId_0 === void 0 || !visibleCommentIds.has(comment_1.id)) continue;
+			visibleRootIds.add(parentId_0);
 		}
 		return comments.filter((comment_2) => {
-			const parentId_0 = getCommentParentId(comment_2);
-			if (parentId_0 !== null && parentId_0 !== void 0) return visibleCommentIds.has(comment_2.id);
+			const parentId_1 = getCommentParentId(comment_2);
+			if (parentId_1 !== null && parentId_1 !== void 0) return visibleCommentIds.has(comment_2.id);
 			return visibleCommentIds.has(comment_2.id) || visibleRootIds.has(comment_2.id);
 		});
 	}, [comments, visibleCommentIds]);
@@ -12712,7 +12710,7 @@ function useFolioComments({ doc, autoOpenReviewSidebar, anchorPositions, editorC
 		if (!root) return;
 		const nodes = root.querySelectorAll(`.layout-run-text${COMMENT_ANCHOR_SELECTOR}`);
 		for (const node of nodes) {
-			const commentIds = commentAnchorIds(node).map((id) => Number.parseInt(id, 10));
+			const commentIds = commentAnchorIds(node).map((id_4) => Number.parseInt(id_4, 10));
 			if (!commentIds.some((commentId) => commentId === -1 || visibleCommentIds.has(commentId))) {
 				node.style.backgroundColor = "transparent";
 				node.style.borderBottom = "2px solid transparent";
@@ -12757,6 +12755,7 @@ function useFolioComments({ doc, autoOpenReviewSidebar, anchorPositions, editorC
 	return {
 		comments,
 		setComments,
+		createComment: createComment$1,
 		isControlledComments,
 		commentsRef: readonlyCommentsRef,
 		commentsDirtyRef,
@@ -12794,7 +12793,7 @@ function useFolioComments({ doc, autoOpenReviewSidebar, anchorPositions, editorC
 */
 /** No headings to track while the outline is not shown. */
 const NO_HEADINGS = [];
-const CommentsSidebar = lazy(() => import("./CommentsSidebar-D0TBbrpB.js").then((m) => ({ default: m.CommentsSidebar })));
+const CommentsSidebar = lazy(() => import("./CommentsSidebar-Bk5pQ_2C.js").then((m) => ({ default: m.CommentsSidebar })));
 const TextContextMenu = lazy(() => import("./TextContextMenu-Bqth8itn.js").then((m) => ({ default: m.TextContextMenu })));
 const loadAttemptSelectiveSave = async () => {
 	const { attemptSelectiveSave } = await import("@stll/folio-core/docx/selectiveSave");
@@ -13017,8 +13016,30 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		if (!onEditorViewReady) return;
 		if (lastReportedViewRef.current === view_0) return;
 		lastReportedViewRef.current = view_0;
+		if (view_0 && initialScrollTop !== void 0) {
+			const initialScroll = initialScrollRef.current;
+			switch (initialScroll.status) {
+				case "scheduled":
+					cancelAnimationFrame(initialScroll.frame);
+					scrollEditorTo(scrollContainerRef.current, {
+						top: initialScrollTop,
+						behavior: "instant"
+					});
+					initialScrollRef.current = { status: "applied" };
+					break;
+				case "waiting":
+					scrollEditorTo(scrollContainerRef.current, {
+						top: initialScrollTop,
+						behavior: "instant"
+					});
+					initialScrollRef.current = { status: "applied" };
+					break;
+				case "applied": break;
+				default: return initialScroll;
+			}
+		}
 		onEditorViewReady(view_0);
-	}, [onEditorViewReady]);
+	}, [onEditorViewReady, initialScrollTop]);
 	useLayoutEffect(() => {
 		if (!onEditorViewReady) return;
 		const view_1 = pagedEditorRef.current?.getView() ?? null;
@@ -13077,7 +13098,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	const imageInputRef = useRef(null);
 	const editorContentRef = useRef(null);
 	const scrollContainerRef = useRef(null);
-	const initialScrollAppliedRef = useRef(false);
+	const initialScrollRef = useRef({ status: "waiting" });
 	const [widestLaidOutPageWidth, setWidestLaidOutPageWidth] = useState(null);
 	const hasDocument = history.state !== null;
 	useEffect(() => {
@@ -13118,7 +13139,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		size: 4,
 		color: { rgb: "000000" }
 	});
-	const { comments, setComments, commentsRef, commentsDirtyRef, commentsLoadedRef, showCommentsSidebar, setShowCommentsSidebar, setVisibleCommentAuthors, activeCommentId, setActiveCommentId, isAddingComment, setIsAddingComment, commentSelectionRange, setCommentSelectionRange, addCommentYPosition, setAddCommentYPosition, floatingCommentBtn, setFloatingCommentBtn, commentAuthors, visibleCommentAuthorSet, visibleComments, syncCommentHighlightStyles } = useFolioComments({
+	const { comments, createComment, setComments, commentsRef, commentsDirtyRef, commentsLoadedRef, showCommentsSidebar, setShowCommentsSidebar, setVisibleCommentAuthors, activeCommentId, setActiveCommentId, isAddingComment, setIsAddingComment, commentSelectionRange, setCommentSelectionRange, addCommentYPosition, setAddCommentYPosition, floatingCommentBtn, setFloatingCommentBtn, commentAuthors, visibleCommentAuthorSet, visibleComments, syncCommentHighlightStyles } = useFolioComments({
 		doc: history.state,
 		autoOpenReviewSidebar,
 		anchorPositions,
@@ -13243,11 +13264,14 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		onError,
 		onCompatibilityChange,
 		onReset: useCallback(() => {
-			initialScrollAppliedRef.current = false;
-			if (scrollContainerRef.current) {
-				scrollContainerRef.current.scrollTop = 0;
-				scrollContainerRef.current.scrollLeft = 0;
-			}
+			const initialScroll_0 = initialScrollRef.current;
+			if (initialScroll_0.status === "scheduled") cancelAnimationFrame(initialScroll_0.frame);
+			initialScrollRef.current = { status: "waiting" };
+			if (scrollContainerRef.current) scrollEditorTo(scrollContainerRef.current, {
+				top: 0,
+				left: 0,
+				behavior: "instant"
+			});
 			commentsDirtyRef.current = false;
 			commentsLoadedRef.current = false;
 			setComments([]);
@@ -13303,13 +13327,24 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		extractTrackedChanges
 	]);
 	useEffect(() => {
-		if (initialScrollTop === void 0 || state.documentLoad.status !== "ready" || initialScrollAppliedRef.current) return;
-		initialScrollAppliedRef.current = true;
+		if (initialScrollTop === void 0 || state.documentLoad.status !== "ready" || initialScrollRef.current.status !== "waiting") return;
 		const frame = requestAnimationFrame(() => {
-			if (scrollContainerRef.current) scrollContainerRef.current.scrollTop = initialScrollTop;
+			initialScrollRef.current = { status: "applied" };
+			scrollEditorTo(scrollContainerRef.current, {
+				top: initialScrollTop,
+				behavior: "instant"
+			});
 		});
+		initialScrollRef.current = {
+			status: "scheduled",
+			frame
+		};
 		return () => {
-			cancelAnimationFrame(frame);
+			const initialScroll_1 = initialScrollRef.current;
+			if (initialScroll_1.status === "scheduled" && initialScroll_1.frame === frame) {
+				cancelAnimationFrame(frame);
+				initialScrollRef.current = { status: "waiting" };
+			}
 		};
 	}, [
 		initialScrollTop,
@@ -14362,6 +14397,9 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		let tripwireResult = null;
 		let savedBuffer = null;
 		try {
+			const view_18 = pagedEditorRef.current?.getView();
+			const editorState = view_18?.state;
+			const baselineBuffer = originalBufferRef.current;
 			const current = buildCurrentDocument();
 			const doc_1 = current ? withoutUnreferencedNotes(current) : null;
 			if (!doc_1) return null;
@@ -14369,18 +14407,13 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			const flags = resolveSelectiveSaveFlags(featureFlags);
 			const useSelectiveForSave = flags.selectiveSave && options?.mode !== FOLIO_DOCX_SERIALIZATION_MODE.full;
 			const shouldAttemptSelective = useSelectiveForSave || flags.selectiveSaveTripwire;
-			const view_18 = pagedEditorRef.current?.getView();
-			const baselineBuffer = originalBufferRef.current;
 			let selectiveBuffer = null;
-			if (shouldAttemptSelective && view_18 && baselineBuffer) {
-				const editorState = view_18.state;
-				selectiveBuffer = await (await loadAttemptSelectiveSave())(doc_1, baselineBuffer, {
-					changedParaIds: getChangedParagraphIds(editorState),
-					structuralChange: hasStructuralChanges(editorState),
-					hasUntrackedChanges: hasUntrackedChanges(editorState),
-					maxBytes: flags.selectiveSaveMaxBytes
-				});
-			}
+			if (shouldAttemptSelective && editorState && baselineBuffer) selectiveBuffer = await (await loadAttemptSelectiveSave())(doc_1, baselineBuffer, {
+				changedParaIds: getChangedParagraphIds(editorState),
+				structuralChange: hasStructuralChanges(editorState),
+				hasUntrackedChanges: hasUntrackedChanges(editorState),
+				maxBytes: flags.selectiveSaveMaxBytes
+			});
 			let buffer = useSelectiveForSave ? selectiveBuffer : null;
 			let fullBuffer = null;
 			const repackSourceDoc = baselineBuffer ? {
@@ -14390,8 +14423,8 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 			const repackFull = async () => {
 				const repackDocx = await loadRepackDocx();
 				const repack = () => repackDocx(repackSourceDoc);
-				return view_18 ? repackWithEditorSectionRemovals({
-					state: view_18.state,
+				return editorState ? repackWithEditorSectionRemovals({
+					state: editorState,
 					document: repackSourceDoc,
 					repack
 				}) : repack();
@@ -14406,7 +14439,7 @@ 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_18) {
+			if (view_18 && pagedEditorRef.current?.getView() === view_18 && view_18.state.doc === editorState?.doc) {
 				originalBufferRef.current = buffer;
 				view_18.dispatch(clearTrackedChanges(view_18.state));
 			}
@@ -14940,6 +14973,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 		loadBuffer,
 		updateComments,
 		replaceComments,
+		createComment,
 		commentsRef,
 		commentsDirtyRef,
 		getActiveEditorStory,
@@ -15232,7 +15266,11 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	]);
 	const handleCommentReply = useCallback((id_2, text_6) => {
 		updateComments((previous_2) => [...previous_2, createComment(text_6, author, id_2)]);
-	}, [author, updateComments]);
+	}, [
+		author,
+		createComment,
+		updateComments
+	]);
 	const handleAddComment = useCallback((addText) => {
 		const comment_4 = createComment(addText, author);
 		const view_54 = pagedEditorRef.current?.getView();
@@ -15259,6 +15297,7 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	}, [
 		author,
 		commentSelectionRange,
+		createComment,
 		setActiveCommentId,
 		setAddCommentYPosition,
 		setCommentSelectionRange,
@@ -15269,7 +15308,11 @@ const DocxEditor = forwardRef(function DocxEditor({ documentBuffer, password, do
 	]);
 	const handleTrackedChangeReply = useCallback((revisionId_2, text_7) => {
 		updateComments((previous_4) => [...previous_4, createComment(text_7, author, revisionId_2)]);
-	}, [author, updateComments]);
+	}, [
+		author,
+		createComment,
+		updateComments
+	]);
 	const handleCancelAddComment = useCallback(() => {
 		const view_55 = pagedEditorRef.current?.getView();
 		if (view_55 && commentSelectionRange) removePendingCommentMarkRange(view_55, commentSelectionRange);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-react",
-  "version": "0.24.1",
+  "version": "0.24.2",
   "description": "React editor for folio: a Word-document (.docx) editor for the browser, built on @stll/folio-core and ProseMirror.",
   "keywords": [
     "document-editor",
@@ -75,7 +75,7 @@
     "@fontsource/noto-sans-arabic": "^5.2.7",
     "@fontsource/source-sans-3": "^5.2.9",
     "@fontsource/tinos": "^5.2.7",
-    "@stll/folio-core": "^0.54.0",
+    "@stll/folio-core": "^0.54.2",
     "better-result": "3.0.1",
     "lucide-react": "1.24.0",
     "prosemirror-history": "^1.5.0",