superdoc 2.25.0-next.5 → 2.25.0-next.6

package/dist/chunks/{create-super-doc-ui-B-A8sK47.cjs → create-super-doc-ui-ABeUNZlq.cjs}

@@ -8197,6 +8197,15 @@ function createSuperDocUI(options) {
 		const fromWorker = values?.[key];
 		return fromWorker !== void 0 ? fromWorker : null;
 	};
+	const inlineToggleStateIsCurrent = (commandId, selection) => {
+		const mark = getCommandDescriptor(commandId)?.activeMark;
+		if (!mark || !EFFECTIVE_MARK_KEYS.includes(mark)) return true;
+		if (resolveEffectiveMarkValuesFromLayout(selection)[mark] !== void 0) return true;
+		if (!resolveDocOperation(getDoc(), "format.readEffectiveInlineUniformity")) return true;
+		const { status } = readEffectiveInlineUniformityCached(selection);
+		const key = effectiveInlineUniformityCacheKey(selection);
+		return status === "ready" || key != null && asyncReads.get(key)?.failedToken === contentToken();
+	};
 	const readEffectiveInlineUniformityNow = async (input) => {
 		if (!input) return null;
 		const op = resolveDocOperation(getDoc(), "format.readEffectiveInlineUniformity");
@@ -9519,8 +9528,8 @@ function createSuperDocUI(options) {
 		if (selection.status === "ready") pruneSelectionScopedAsyncReads(selection);
 		reconcilePendingInlineFormat(selection);
 		const selectionSignature = selectionInlineValueSignature(selection);
-		for (const [commandId, optimistic] of optimisticInlineToggles) if (!selectionSignature || optimistic.selectionSignature !== selectionSignature) optimisticInlineToggles.delete(commandId);
-		else if (optimistic.settled && selection.status === "ready") optimisticInlineToggles.delete(commandId);
+		for (const [commandId, optimistic] of optimisticInlineToggles) if (!selectionSignature || optimistic.selectionSignature !== selectionSignature || optimistic.editorSource !== getEditor() || optimistic.documentSource !== getEditor()?.doc || optimistic.documentMode !== documentMode) optimisticInlineToggles.delete(commandId);
+		else if (optimistic.settled && selection.status === "ready" && inlineToggleStateIsCurrent(commandId, selection)) optimisticInlineToggles.delete(commandId);
 		const nextState = {
 			ready: getEditor() != null,
 			documentMode,
@@ -9689,6 +9698,7 @@ function createSuperDocUI(options) {
 		return null;
 	};
 	let trackedChangeNavigationInFlight = 0;
+	let lastPublishedHostReviewTarget;
 	const syncTrackedChangeFocusFromHostReviewTarget = (rawTarget, rawSnapshot) => {
 		const rejection = (rawSnapshot && typeof rawSnapshot === "object" ? rawSnapshot : null)?.lastInteractionRejection;
 		if (rawTarget == null && rejection && typeof rejection === "object" && rejection.code === "review-target-invalidated" && rejection.detail === "not-painted" && explicitActiveChange) return false;
@@ -9716,7 +9726,18 @@ function createSuperDocUI(options) {
 			};
 		}
 		if (rawTarget == null && next == null && explicitActiveChange != null && hasPendingTrackChangeRevealFocus(explicitActiveChange)) return false;
+		const previousPublication = lastPublishedHostReviewTarget;
+		if (previousPublication && (rawTarget === previousPublication.raw || target?.origin === "panel" && previousPublication.origin === "panel" && next && previousPublication.focus && explicitActiveChangesEqual(previousPublication.focus, next))) return false;
+		lastPublishedHostReviewTarget = {
+			raw: rawTarget,
+			focus: next,
+			origin: target?.origin
+		};
 		if (explicitActiveChangesEqual(explicitActiveChange, next)) return false;
+		if (target?.origin === "panel" && explicitActiveChange && next && explicitActiveChange.id === next.id && storyLocatorSignature(explicitActiveChange.story) === storyLocatorSignature(next.story) && !explicitActiveChange.paintedEntityId && next.paintedEntityId) {
+			explicitActiveChange.paintedEntityId = next.paintedEntityId;
+			return false;
+		}
 		setExplicitActiveChange(next);
 		return true;
 	};
@@ -9728,6 +9749,7 @@ function createSuperDocUI(options) {
 			detachHostReview = null;
 		}
 		currentHostReviewSource = next;
+		lastPublishedHostReviewTarget = void 0;
 		if (!next) {
 			syncTrackedChangeFocusFromHostReviewTarget(null);
 			return;
@@ -9800,6 +9822,9 @@ function createSuperDocUI(options) {
 			const off = next.subscribe((event) => {
 				const type = event?.type;
 				const isStandaloneDocumentMutation = type === "document:mutated" && event.hasCommitEvent !== true;
+				if (type === "collaboration:document-replaced" || isStandaloneDocumentMutation || type === "mutation:committed" && mutationCommittedEventChangedDocument(event) || type === "collaboration:remote-changed") {
+					for (const [commandId, optimistic] of optimisticInlineToggles) if (optimistic.settled || type === "collaboration:document-replaced") optimisticInlineToggles.delete(commandId);
+				}
 				if (isStandaloneDocumentMutation || type === "mutation:committed" && mutationCommittedEventChangedDocument(event) || type === "collaboration:remote-changed" && Array.isArray(event.changedStoryIds) && event.changedStoryIds.length > 0) scheduleActiveSearchRefresh();
 				if ((type === "document:mutated" || type === "mutation:committed" && mutationCommittedEventChangedDocument(event)) && host && !dirtyHosts.has(host)) {
 					dirtyHosts.add(host);
@@ -9966,6 +9991,7 @@ function createSuperDocUI(options) {
 					hostSeededMutationRevision.delete(replacedDirtyHost);
 				}
 				runDocumentResetHooks();
+				optimisticInlineToggles.clear();
 				asyncReads.clear();
 				invalidateDocumentContent();
 				recompute();
@@ -10459,7 +10485,10 @@ function createSuperDocUI(options) {
 			selectionSignature,
 			active: input.value === true,
 			generation,
-			settled: false
+			settled: false,
+			editorSource: getEditor(),
+			documentSource: getEditor()?.doc,
+			documentMode: readDocumentMode()
 		});
 		recompute();
 		return generation;

package/dist/chunks/{create-super-doc-ui-CrH79xw6.es.js → create-super-doc-ui-CCNvH6mr.es.js}

@@ -8196,6 +8196,15 @@ function createSuperDocUI(options) {
 		const fromWorker = values?.[key];
 		return fromWorker !== void 0 ? fromWorker : null;
 	};
+	const inlineToggleStateIsCurrent = (commandId, selection) => {
+		const mark = getCommandDescriptor(commandId)?.activeMark;
+		if (!mark || !EFFECTIVE_MARK_KEYS.includes(mark)) return true;
+		if (resolveEffectiveMarkValuesFromLayout(selection)[mark] !== void 0) return true;
+		if (!resolveDocOperation(getDoc(), "format.readEffectiveInlineUniformity")) return true;
+		const { status } = readEffectiveInlineUniformityCached(selection);
+		const key = effectiveInlineUniformityCacheKey(selection);
+		return status === "ready" || key != null && asyncReads.get(key)?.failedToken === contentToken();
+	};
 	const readEffectiveInlineUniformityNow = async (input) => {
 		if (!input) return null;
 		const op = resolveDocOperation(getDoc(), "format.readEffectiveInlineUniformity");
@@ -9518,8 +9527,8 @@ function createSuperDocUI(options) {
 		if (selection.status === "ready") pruneSelectionScopedAsyncReads(selection);
 		reconcilePendingInlineFormat(selection);
 		const selectionSignature = selectionInlineValueSignature(selection);
-		for (const [commandId, optimistic] of optimisticInlineToggles) if (!selectionSignature || optimistic.selectionSignature !== selectionSignature) optimisticInlineToggles.delete(commandId);
-		else if (optimistic.settled && selection.status === "ready") optimisticInlineToggles.delete(commandId);
+		for (const [commandId, optimistic] of optimisticInlineToggles) if (!selectionSignature || optimistic.selectionSignature !== selectionSignature || optimistic.editorSource !== getEditor() || optimistic.documentSource !== getEditor()?.doc || optimistic.documentMode !== documentMode) optimisticInlineToggles.delete(commandId);
+		else if (optimistic.settled && selection.status === "ready" && inlineToggleStateIsCurrent(commandId, selection)) optimisticInlineToggles.delete(commandId);
 		const nextState = {
 			ready: getEditor() != null,
 			documentMode,
@@ -9688,6 +9697,7 @@ function createSuperDocUI(options) {
 		return null;
 	};
 	let trackedChangeNavigationInFlight = 0;
+	let lastPublishedHostReviewTarget;
 	const syncTrackedChangeFocusFromHostReviewTarget = (rawTarget, rawSnapshot) => {
 		const rejection = (rawSnapshot && typeof rawSnapshot === "object" ? rawSnapshot : null)?.lastInteractionRejection;
 		if (rawTarget == null && rejection && typeof rejection === "object" && rejection.code === "review-target-invalidated" && rejection.detail === "not-painted" && explicitActiveChange) return false;
@@ -9715,7 +9725,18 @@ function createSuperDocUI(options) {
 			};
 		}
 		if (rawTarget == null && next == null && explicitActiveChange != null && hasPendingTrackChangeRevealFocus(explicitActiveChange)) return false;
+		const previousPublication = lastPublishedHostReviewTarget;
+		if (previousPublication && (rawTarget === previousPublication.raw || target?.origin === "panel" && previousPublication.origin === "panel" && next && previousPublication.focus && explicitActiveChangesEqual(previousPublication.focus, next))) return false;
+		lastPublishedHostReviewTarget = {
+			raw: rawTarget,
+			focus: next,
+			origin: target?.origin
+		};
 		if (explicitActiveChangesEqual(explicitActiveChange, next)) return false;
+		if (target?.origin === "panel" && explicitActiveChange && next && explicitActiveChange.id === next.id && storyLocatorSignature(explicitActiveChange.story) === storyLocatorSignature(next.story) && !explicitActiveChange.paintedEntityId && next.paintedEntityId) {
+			explicitActiveChange.paintedEntityId = next.paintedEntityId;
+			return false;
+		}
 		setExplicitActiveChange(next);
 		return true;
 	};
@@ -9727,6 +9748,7 @@ function createSuperDocUI(options) {
 			detachHostReview = null;
 		}
 		currentHostReviewSource = next;
+		lastPublishedHostReviewTarget = void 0;
 		if (!next) {
 			syncTrackedChangeFocusFromHostReviewTarget(null);
 			return;
@@ -9799,6 +9821,9 @@ function createSuperDocUI(options) {
 			const off = next.subscribe((event) => {
 				const type = event?.type;
 				const isStandaloneDocumentMutation = type === "document:mutated" && event.hasCommitEvent !== true;
+				if (type === "collaboration:document-replaced" || isStandaloneDocumentMutation || type === "mutation:committed" && mutationCommittedEventChangedDocument(event) || type === "collaboration:remote-changed") {
+					for (const [commandId, optimistic] of optimisticInlineToggles) if (optimistic.settled || type === "collaboration:document-replaced") optimisticInlineToggles.delete(commandId);
+				}
 				if (isStandaloneDocumentMutation || type === "mutation:committed" && mutationCommittedEventChangedDocument(event) || type === "collaboration:remote-changed" && Array.isArray(event.changedStoryIds) && event.changedStoryIds.length > 0) scheduleActiveSearchRefresh();
 				if ((type === "document:mutated" || type === "mutation:committed" && mutationCommittedEventChangedDocument(event)) && host && !dirtyHosts.has(host)) {
 					dirtyHosts.add(host);
@@ -9965,6 +9990,7 @@ function createSuperDocUI(options) {
 					hostSeededMutationRevision.delete(replacedDirtyHost);
 				}
 				runDocumentResetHooks();
+				optimisticInlineToggles.clear();
 				asyncReads.clear();
 				invalidateDocumentContent();
 				recompute();
@@ -10458,7 +10484,10 @@ function createSuperDocUI(options) {
 			selectionSignature,
 			active: input.value === true,
 			generation,
-			settled: false
+			settled: false,
+			editorSource: getEditor(),
+			documentSource: getEditor()?.doc,
+			documentMode: readDocumentMode()
 		});
 		recompute();
 		return generation;

package/dist/collaboration-upgrade-engine.cjs

@@ -19,7 +19,7 @@ var COLLABORATION_UPGRADE_ENGINE_MINIMUM_NODE_MAJOR = 20;
 var PRIVATE_ENGINE_INFO = (0, _superdoc_docx_engine_collaboration_upgrade_engine.getCollaborationUpgradeEngineInfo)();
 var ENGINE_INFO = Object.freeze({
 	...PRIVATE_ENGINE_INFO,
-	superdocVersion: "2.25.0-next.5",
+	superdocVersion: "2.25.0-next.6",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS

package/dist/collaboration-upgrade-engine.es.js

@@ -18,7 +18,7 @@ var COLLABORATION_UPGRADE_ENGINE_MINIMUM_NODE_MAJOR = 20;
 var PRIVATE_ENGINE_INFO = getCollaborationUpgradeEngineInfo$1();
 var ENGINE_INFO = Object.freeze({
 	...PRIVATE_ENGINE_INFO,
-	superdocVersion: "2.25.0-next.5",
+	superdocVersion: "2.25.0-next.6",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS

package/dist/layout-engine/painters/dom/src/decoration-geometry.d.ts

@@ -0,0 +1,17 @@
+import { Fragment, ResolvedPage, ResolvedPaintItem } from '../../../contracts/src/index.js';
+import { PageDecorationPayload } from './renderer.js';
+export type DecorationPageGeometry = Pick<ResolvedPage, 'height' | 'margins' | 'baseMargins' | 'footnoteReserved' | 'index'>;
+export declare function resolveDecorationBandGeometry(data: PageDecorationPayload, kind: 'header' | 'footer'): {
+    effectiveHeight: number;
+    effectiveOffset: number;
+    footerYOffset: number;
+};
+/** Page-local coordinates shared by canonical painting and neutral edit geometry. */
+export declare function resolveDecorationFragmentPosition(page: DecorationPageGeometry, kind: 'header' | 'footer', data: PageDecorationPayload, fragment: Fragment, item: ResolvedPaintItem | undefined, band?: {
+    effectiveHeight: number;
+    effectiveOffset: number;
+    footerYOffset: number;
+}, behindDocument?: boolean): {
+    x: number;
+    y: number;
+};

package/dist/layout-engine/painters/dom/src/index.d.ts

@@ -137,3 +137,4 @@ export { resolveRunTypographyStyles, resolveRunDecorationStyles } from './runs/t
 export { resolveTrackedChangeDecorationFacts, getTrackedChangeLayers, resolveTrackedChangesConfig, } from './runs/tracked-changes.js';
 export { buildLinkRenderData } from './runs/links.js';
 export { INLINE_TRACKED_CHANGE_DEFAULTS } from './styles.js';
+export { resolveDecorationFragmentPosition } from './decoration-geometry.js';

package/dist/layout-engine/painters/dom/src/renderer.d.ts

@@ -433,26 +433,6 @@ export declare class DomPainter {
     private resolveSeparatorColumnGeometry;
     private renderDecorationsForPage;
     private renderDecorationsForPageWork;
-    /**
-     * Check if a fragment is vertically anchored to the page.
-     * Used to determine special Y positioning for page-relative anchored content
-     * in header/footer decoration sections.
-     */
-    private isPageRelativeAnchoredFragment;
-    private isPageRelativeParagraphFrame;
-    private isPageRelativeHorizontalAnchoredFragment;
-    /**
-     * Header/footer layout emits normalized anchor Y coordinates:
-     * - headers: local to the header container origin
-     * - footers: local to the top of the footer band (pageHeight - bottomMargin)
-     *
-     * Footer containers can grow upward when content overflows the reserved footer
-     * band, so their top edge is not always the same as the footer band origin.
-     * This helper returns the page-space origin that normalized anchor Y values
-     * are measured from.
-     */
-    private getDecorationAnchorPageOriginY;
-    private getFooterFragmentAnchorPageOriginY;
     private renderDecorationSectionWork;
     private resetState;
     dispose(): void;
@@ -681,15 +661,4 @@ export declare class DomPainter {
     private applyFragmentWrapperZIndex;
     private applyResolvedFragmentFrame;
     private applyFragmentColumnOwnership;
-    /**
-     * Estimates the height of a fragment when explicit height is not available.
-     *
-     * This method provides fallback height calculations for footer bottom-alignment
-     * from resolved layout data, or using the fragment's height property for
-     * tables, images, and drawings.
-     *
-     * @param fragment - The fragment to estimate height for
-     * @returns Estimated height in pixels, or 0 if height cannot be determined
-     */
-    private estimateFragmentHeight;
 }

package/dist/public/ui-react.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-B-A8sK47.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-ABeUNZlq.cjs");
 const require_slice_source = require("../chunks/slice-source-CFaqq0Vo.cjs");
 let react = require("react");
 //#region src/public/ui/react.ts

package/dist/public/ui-react.es.js

@@ -1,4 +1,4 @@
-import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-CrH79xw6.es.js";
+import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-CCNvH6mr.es.js";
 import { t as toSliceSource } from "../chunks/slice-source-gfOhG2MW.es.js";
 import { createContext, createElement, useCallback, useContext, useEffect, useRef, useState } from "react";
 //#region src/public/ui/react.ts

package/dist/public/ui-vue.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-B-A8sK47.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-ABeUNZlq.cjs");
 const require_slice_source = require("../chunks/slice-source-CFaqq0Vo.cjs");
 let superdoc_entry_vue = require("vue");
 //#region src/public/ui/vue.ts

package/dist/public/ui-vue.es.js

@@ -1,4 +1,4 @@
-import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-CrH79xw6.es.js";
+import { t as createSuperDocUI } from "../chunks/create-super-doc-ui-CCNvH6mr.es.js";
 import { t as toSliceSource } from "../chunks/slice-source-gfOhG2MW.es.js";
 import { computed, inject, onScopeDispose, provide, shallowRef, toRaw, toValue, watch } from "vue";
 //#region src/public/ui/vue.ts

package/dist/public/ui.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-B-A8sK47.cjs");
+const require_create_super_doc_ui = require("../chunks/create-super-doc-ui-ABeUNZlq.cjs");
 exports.BUILT_IN_COMMAND_IDS = require_create_super_doc_ui.BUILT_IN_COMMAND_IDS;
 exports.createSuperDocUI = require_create_super_doc_ui.createSuperDocUI;
 exports.shallowEqual = require_create_super_doc_ui.shallowEqual;

package/dist/public/ui.es.js

@@ -1,2 +1,2 @@
-import { a as BUILT_IN_COMMAND_IDS, t as createSuperDocUI, u as shallowEqual } from "../chunks/create-super-doc-ui-CrH79xw6.es.js";
+import { a as BUILT_IN_COMMAND_IDS, t as createSuperDocUI, u as shallowEqual } from "../chunks/create-super-doc-ui-CCNvH6mr.es.js";
 export { BUILT_IN_COMMAND_IDS, createSuperDocUI, shallowEqual };