superdoc 2.24.0-next.4 → 2.24.0-next.5

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.24.0-next.4",
+	superdocVersion: "2.24.0-next.5",
 	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.24.0-next.4",
+	superdocVersion: "2.24.0-next.5",
 	roomSchemaVersion: Object.freeze({ ...PRIVATE_ENGINE_INFO.roomSchemaVersion }),
 	supportedBundleVersions: SUPPORTED_COLLABORATION_UPGRADE_BUNDLE_VERSIONS,
 	supportedV1ReaderContractVersions: SUPPORTED_V1_READER_CONTRACT_VERSIONS

package/dist/superdoc.cjs

@@ -304,7 +304,7 @@ var awarenessStatesToArray = (context, states) => {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.24.0-next.4";
+		return "2.24.0-next.5";
 	} catch {
 		return "unknown";
 	}
@@ -19735,6 +19735,11 @@ function textTargetFromQueryMatch(doc, text, blockId) {
 function isTocEntryLinkElement(element) {
 	return Boolean(element && typeof element.closest === "function" && element.closest(".superdoc-toc-entry"));
 }
+/** @param {Element | null | undefined} element */
+function isNoteCrossReferenceLinkElement(element) {
+	const kind = element?.getAttribute("data-sd-note-cross-reference");
+	return (kind === "ref" || kind === "noteRef") && Boolean(element?.closest("[data-sd-note-role=\"body\"]"));
+}
 /**
 * @param {Object} options
 * @param {() => SurfaceManager | null | undefined} options.getSurfaceManager
@@ -19878,9 +19883,9 @@ function useLinkPopover({ getSurfaceManager, getActiveEditor, getUi, getActivati
 	* Navigate to a body bookmark through its model address. A mounted-anchor
 	* fallback is reserved for runtimes without a callable bookmark model.
 	* @param {string | null | undefined} anchorUrl
-	* @param {{ placeCaret?: boolean }} [options]
+	* @param {{ placeCaret?: boolean, revalidateCaretAfterReveal?: boolean }} [options]
 	*/
-	async function navigateToAnchor(anchorUrl, { placeCaret = false } = {}) {
+	async function navigateToAnchor(anchorUrl, { placeCaret = false, revalidateCaretAfterReveal = false } = {}) {
 		if (typeof anchorUrl !== "string" || !anchorUrl.startsWith("#")) return false;
 		const anchorName = decodeAnchorFragment(anchorUrl.slice(1));
 		const editor = getActiveEditor();
@@ -19897,48 +19902,65 @@ function useLinkPopover({ getSurfaceManager, getActiveEditor, getUi, getActivati
 			});
 			return true;
 		}
-		/** @type {BookmarkGetResult | null} */
-		let bookmark = null;
-		try {
-			const list = doc?.bookmarks?.list;
-			if (typeof list === "function") {
-				if ((await Promise.resolve(list.call(doc.bookmarks)))?.items?.filter((item) => item.name === anchorName).length !== 1) return false;
+		async function readBodyBookmark() {
+			try {
+				const list = doc?.bookmarks?.list;
+				if (typeof list === "function") {
+					if ((await Promise.resolve(list.call(doc.bookmarks)))?.items?.filter((item) => item.name === anchorName).length !== 1) return null;
+				}
+				const bookmark = await Promise.resolve(bookmarkGet.call(doc.bookmarks, { target: {
+					kind: "entity",
+					entityType: "bookmark",
+					name: anchorName
+				} }));
+				if (editor !== getActiveEditor() || generation !== openGeneration) return null;
+				const story = bookmark?.address?.story;
+				if (story && story.storyType !== "body" || bookmark?.tableColumn) return null;
+				const blockId = bookmark?.range?.from?.blockId;
+				const offset = bookmark?.range?.from?.offset ?? 0;
+				if (typeof blockId !== "string" || !Number.isInteger(offset) || offset < 0) return null;
+				return {
+					blockId,
+					offset
+				};
+			} catch {
+				return null;
 			}
-			bookmark = await Promise.resolve(bookmarkGet.call(doc.bookmarks, { target: {
-				kind: "entity",
-				entityType: "bookmark",
-				name: anchorName
-			} }));
-			bookmark ??= null;
-		} catch {
-			return false;
 		}
-		if (editor !== getActiveEditor() || generation !== openGeneration) return false;
-		const story = bookmark?.address?.story;
-		if (story && story.storyType !== "body" || bookmark?.tableColumn) return false;
-		const blockId = bookmark?.range?.from?.blockId;
-		const offset = bookmark?.range?.from?.offset ?? 0;
-		if (typeof blockId !== "string" || !Number.isInteger(offset) || offset < 0) return false;
-		if (placeCaret) await placeCaretAtBookmark(blockId, offset);
+		let position = await readBodyBookmark();
+		if (!position) return false;
+		if (placeCaret && !revalidateCaretAfterReveal) await placeCaretAtBookmark(position.blockId, position.offset);
 		const viewport = getUi()?.viewport;
 		const scrollIntoView = viewport?.scrollIntoView;
 		if (typeof scrollIntoView !== "function") return false;
-		const target = {
-			kind: "text",
-			blockId,
-			range: {
-				start: offset,
-				end: offset
-			}
-		};
 		for (let step = 0; step < MAX_ANCHOR_NAVIGATION_STEPS; step += 1) try {
+			const target = {
+				kind: "text",
+				blockId: position.blockId,
+				range: {
+					start: position.offset,
+					end: position.offset
+				}
+			};
 			const result = await Promise.resolve(scrollIntoView.call(viewport, {
 				target,
 				block: "start",
 				behavior: "instant"
 			}));
 			if (editor !== getActiveEditor() || generation !== openGeneration) return false;
-			if (result?.success !== false) return true;
+			if (result?.success !== false) {
+				if (revalidateCaretAfterReveal) {
+					const current = await readBodyBookmark();
+					if (!current) return false;
+					if (current.blockId !== position.blockId || current.offset !== position.offset) {
+						position = current;
+						continue;
+					}
+					if (placeCaret) await placeCaretAtBookmark(current.blockId, current.offset);
+					if (editor !== getActiveEditor() || generation !== openGeneration) return false;
+				}
+				return true;
+			}
 		} catch {
 			return false;
 		}
@@ -20064,8 +20086,13 @@ function useLinkPopover({ getSurfaceManager, getActiveEditor, getUi, getActivati
 			return;
 		}
 		if (ctx.defaultAction === "navigate") {
-			if (ctx.isAnchorLink) navigateToAnchor(ctx.href);
-			else if (ctx.href) {
+			if (ctx.isAnchorLink) {
+				const noteReference = isNoteCrossReferenceLinkElement(ctx.element);
+				navigateToAnchor(ctx.href, {
+					placeCaret: noteReference && ctx.documentMode !== "viewing",
+					revalidateCaretAfterReveal: noteReference && ctx.documentMode !== "viewing"
+				});
+			} else if (ctx.href) {
 				const target = ctx.target || "_self";
 				const features = linkOpenFeaturesForTarget(ctx.rel, target);
 				if (features) window.open(ctx.href, target, features);
@@ -46564,7 +46591,7 @@ var SuperDoc = class extends require_eventemitter3.import_eventemitter3.default
 		}
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.24.0-next.4";
+		this.version = "2.24.0-next.5";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || require_uuid.v4();
 		this.colors = this.config.colors ?? [];

package/dist/superdoc.es.js

@@ -302,7 +302,7 @@ var awarenessStatesToArray = (context, states) => {
 var DEFAULT_ENDPOINT = "https://ingest.superdoc.dev/v1/collect";
 function getSuperdocVersion() {
 	try {
-		return "2.24.0-next.4";
+		return "2.24.0-next.5";
 	} catch {
 		return "unknown";
 	}
@@ -19702,6 +19702,11 @@ function textTargetFromQueryMatch(doc, text, blockId) {
 function isTocEntryLinkElement(element) {
 	return Boolean(element && typeof element.closest === "function" && element.closest(".superdoc-toc-entry"));
 }
+/** @param {Element | null | undefined} element */
+function isNoteCrossReferenceLinkElement(element) {
+	const kind = element?.getAttribute("data-sd-note-cross-reference");
+	return (kind === "ref" || kind === "noteRef") && Boolean(element?.closest("[data-sd-note-role=\"body\"]"));
+}
 /**
 * @param {Object} options
 * @param {() => SurfaceManager | null | undefined} options.getSurfaceManager
@@ -19845,9 +19850,9 @@ function useLinkPopover({ getSurfaceManager, getActiveEditor, getUi, getActivati
 	* Navigate to a body bookmark through its model address. A mounted-anchor
 	* fallback is reserved for runtimes without a callable bookmark model.
 	* @param {string | null | undefined} anchorUrl
-	* @param {{ placeCaret?: boolean }} [options]
+	* @param {{ placeCaret?: boolean, revalidateCaretAfterReveal?: boolean }} [options]
 	*/
-	async function navigateToAnchor(anchorUrl, { placeCaret = false } = {}) {
+	async function navigateToAnchor(anchorUrl, { placeCaret = false, revalidateCaretAfterReveal = false } = {}) {
 		if (typeof anchorUrl !== "string" || !anchorUrl.startsWith("#")) return false;
 		const anchorName = decodeAnchorFragment(anchorUrl.slice(1));
 		const editor = getActiveEditor();
@@ -19864,48 +19869,65 @@ function useLinkPopover({ getSurfaceManager, getActiveEditor, getUi, getActivati
 			});
 			return true;
 		}
-		/** @type {BookmarkGetResult | null} */
-		let bookmark = null;
-		try {
-			const list = doc?.bookmarks?.list;
-			if (typeof list === "function") {
-				if ((await Promise.resolve(list.call(doc.bookmarks)))?.items?.filter((item) => item.name === anchorName).length !== 1) return false;
+		async function readBodyBookmark() {
+			try {
+				const list = doc?.bookmarks?.list;
+				if (typeof list === "function") {
+					if ((await Promise.resolve(list.call(doc.bookmarks)))?.items?.filter((item) => item.name === anchorName).length !== 1) return null;
+				}
+				const bookmark = await Promise.resolve(bookmarkGet.call(doc.bookmarks, { target: {
+					kind: "entity",
+					entityType: "bookmark",
+					name: anchorName
+				} }));
+				if (editor !== getActiveEditor() || generation !== openGeneration) return null;
+				const story = bookmark?.address?.story;
+				if (story && story.storyType !== "body" || bookmark?.tableColumn) return null;
+				const blockId = bookmark?.range?.from?.blockId;
+				const offset = bookmark?.range?.from?.offset ?? 0;
+				if (typeof blockId !== "string" || !Number.isInteger(offset) || offset < 0) return null;
+				return {
+					blockId,
+					offset
+				};
+			} catch {
+				return null;
 			}
-			bookmark = await Promise.resolve(bookmarkGet.call(doc.bookmarks, { target: {
-				kind: "entity",
-				entityType: "bookmark",
-				name: anchorName
-			} }));
-			bookmark ??= null;
-		} catch {
-			return false;
 		}
-		if (editor !== getActiveEditor() || generation !== openGeneration) return false;
-		const story = bookmark?.address?.story;
-		if (story && story.storyType !== "body" || bookmark?.tableColumn) return false;
-		const blockId = bookmark?.range?.from?.blockId;
-		const offset = bookmark?.range?.from?.offset ?? 0;
-		if (typeof blockId !== "string" || !Number.isInteger(offset) || offset < 0) return false;
-		if (placeCaret) await placeCaretAtBookmark(blockId, offset);
+		let position = await readBodyBookmark();
+		if (!position) return false;
+		if (placeCaret && !revalidateCaretAfterReveal) await placeCaretAtBookmark(position.blockId, position.offset);
 		const viewport = getUi()?.viewport;
 		const scrollIntoView = viewport?.scrollIntoView;
 		if (typeof scrollIntoView !== "function") return false;
-		const target = {
-			kind: "text",
-			blockId,
-			range: {
-				start: offset,
-				end: offset
-			}
-		};
 		for (let step = 0; step < MAX_ANCHOR_NAVIGATION_STEPS; step += 1) try {
+			const target = {
+				kind: "text",
+				blockId: position.blockId,
+				range: {
+					start: position.offset,
+					end: position.offset
+				}
+			};
 			const result = await Promise.resolve(scrollIntoView.call(viewport, {
 				target,
 				block: "start",
 				behavior: "instant"
 			}));
 			if (editor !== getActiveEditor() || generation !== openGeneration) return false;
-			if (result?.success !== false) return true;
+			if (result?.success !== false) {
+				if (revalidateCaretAfterReveal) {
+					const current = await readBodyBookmark();
+					if (!current) return false;
+					if (current.blockId !== position.blockId || current.offset !== position.offset) {
+						position = current;
+						continue;
+					}
+					if (placeCaret) await placeCaretAtBookmark(current.blockId, current.offset);
+					if (editor !== getActiveEditor() || generation !== openGeneration) return false;
+				}
+				return true;
+			}
 		} catch {
 			return false;
 		}
@@ -20031,8 +20053,13 @@ function useLinkPopover({ getSurfaceManager, getActiveEditor, getUi, getActivati
 			return;
 		}
 		if (ctx.defaultAction === "navigate") {
-			if (ctx.isAnchorLink) navigateToAnchor(ctx.href);
-			else if (ctx.href) {
+			if (ctx.isAnchorLink) {
+				const noteReference = isNoteCrossReferenceLinkElement(ctx.element);
+				navigateToAnchor(ctx.href, {
+					placeCaret: noteReference && ctx.documentMode !== "viewing",
+					revalidateCaretAfterReveal: noteReference && ctx.documentMode !== "viewing"
+				});
+			} else if (ctx.href) {
 				const target = ctx.target || "_self";
 				const features = linkOpenFeaturesForTarget(ctx.rel, target);
 				if (features) window.open(ctx.href, target, features);
@@ -46493,7 +46520,7 @@ var SuperDoc = class extends import_eventemitter3.default {
 		}
 		this.userColorMap = /* @__PURE__ */ new Map();
 		this.colorIndex = 0;
-		this.version = "2.24.0-next.4";
+		this.version = "2.24.0-next.5";
 		this.#log("🦋 [superdoc] Using SuperDoc version:", this.version);
 		this.superdocId = config.superdocId || v4();
 		this.colors = this.config.colors ?? [];