@commentray/render 0.3.5 → 0.4.1

package/dist/code-browser-client.js

@@ -936,16 +936,16 @@ function emptySearchBrowsePreviewInnerHtml(hint, rows, ctx) {
 function scrollDocToMarkdownLine0(docScrollEl, line0, mdLineCount) {
     const el = docScrollEl.querySelector(`#commentray-md-line-${String(line0)}`);
     if (el instanceof HTMLElement) {
-        const top = Math.round(scrollTopToAlignChildTop(docScrollEl, el, DUAL_PANE_BLOCK_REVEAL_LEAD_CSS_PX));
-        const maxY = Math.round(Math.max(0, docScrollEl.scrollHeight - docScrollEl.clientHeight));
-        docScrollEl.scrollTo({ top: clamp(top, 0, maxY), behavior: "smooth" });
+        applyRevealChildInPane(docScrollEl, el, DUAL_PANE_BLOCK_REVEAL_LEAD_CSS_PX);
         return;
     }
     if (mdLineCount <= 1)
         return;
-    const ratio = line0 / Math.max(1, mdLineCount - 1);
-    const maxScroll = Math.max(0, docScrollEl.scrollHeight - docScrollEl.clientHeight);
-    docScrollEl.scrollTo({ top: ratio * maxScroll, behavior: "smooth" });
+    const lineClamped = clamp(line0, 0, Math.max(0, mdLineCount - 1));
+    const scrollTarget = paneUsesInternalYScroll(docScrollEl) ? docScrollEl : rootScrollingElement();
+    const maxScroll = Math.max(0, scrollTarget.scrollHeight - scrollTarget.clientHeight);
+    const top = clamp((lineClamped / Math.max(1, mdLineCount - 1)) * maxScroll, 0, maxScroll);
+    scrollTarget.scrollTo({ top, behavior: "smooth" });
 }
 function navigateToDocumentedPair(pair, mdLine0) {
     if (pair.staticBrowseUrl?.trim()) {
@@ -1028,7 +1028,10 @@ function handlePathSearchHit(button, deps) {
     const hitSp = (button.getAttribute("data-sp-path") ?? "").trim();
     const pair = findDocumentedPair(deps.mutable.documentedPairs, hitCr, hitSp);
     if (pair && isSameDocumentedPair(pair, deps.filePathLabel, deps.mutable.commentrayPathLabel)) {
-        deps.docScrollEl.scrollTo({ top: 0, behavior: "smooth" });
+        const scrollTarget = paneUsesInternalYScroll(deps.docScrollEl)
+            ? deps.docScrollEl
+            : rootScrollingElement();
+        scrollTarget.scrollTo({ top: 0, behavior: "smooth" });
         return;
     }
     if (pair)
@@ -3290,6 +3293,27 @@ function initialCommentrayScopePathState(shell, scope, filePathLabel, commentray
         : [filePathLabel, commentrayPathLabel].filter((s) => s.trim().length > 0).join("\n");
     return { documentedPairs, pathRowsForOrdering, pathBlobWide };
 }
+function effectiveCommentrayPathLabelFromDocumentedPairs(scope, filePathLabel, commentrayPathLabel, documentedPairs) {
+    if (scope !== "commentray-and-paths")
+        return commentrayPathLabel;
+    const sourcePath = filePathLabel.trim();
+    if (sourcePath.length === 0)
+        return commentrayPathLabel;
+    const pair = findDocumentedPair(documentedPairs, "", sourcePath);
+    if (!pair)
+        return commentrayPathLabel;
+    const fromShell = commentrayPathLabel.trim();
+    const fromPair = pair.commentrayPath.trim();
+    if (fromPair.length === 0)
+        return commentrayPathLabel;
+    if (fromShell.length === 0)
+        return fromPair;
+    // Older hub HTML can carry placeholder `commentray.md` while documentedPairs already has the real path.
+    if (normPosixPath(fromShell) === "commentray.md" && normPosixPath(fromPair) !== "commentray.md") {
+        return fromPair;
+    }
+    return commentrayPathLabel;
+}
 /**
  * Fetched `commentray-nav-search.json` sometimes omits `staticBrowseUrl` on pairs; the hub embed
  * carries browse URLs from the same build — merge so search hits open `_site/browse/…`, not GitHub.
@@ -3518,6 +3542,15 @@ function buildDualPaneSearcherBundle(shell, codePane) {
     const scrollLinksRef = { current: scrollLinks };
     const { scope, filePathLabel, commentrayPathLabel } = readSearchScopeFromShell(shell);
     const pathInit = initialCommentrayScopePathState(shell, scope, filePathLabel, commentrayPathLabel);
+    const effectiveCommentrayPathLabel = effectiveCommentrayPathLabelFromDocumentedPairs(scope, filePathLabel, commentrayPathLabel, pathInit.documentedPairs);
+    if (effectiveCommentrayPathLabel.trim().length > 0) {
+        shell.setAttribute("data-search-commentray-path", effectiveCommentrayPathLabel);
+        const docPathEl = document.getElementById("nav-rail-doc-path");
+        if (docPathEl) {
+            docPathEl.textContent = effectiveCommentrayPathLabel;
+            docPathEl.setAttribute("title", effectiveCommentrayPathLabel);
+        }
+    }
     const indexState = {
         hubNavRows: [],
         documentedPairs: pathInit.documentedPairs,
@@ -3526,7 +3559,7 @@ function buildDualPaneSearcherBundle(shell, codePane) {
     const mutable = {
         rawMd,
         mdLines: rawMd.split("\n"),
-        commentrayPathLabel,
+        commentrayPathLabel: effectiveCommentrayPathLabel,
         searcher: indexSearchLineRows([]),
         pathBlobWide: pathInit.pathBlobWide,
         pathRowsForOrdering: indexState.pathRowsForOrdering,
@@ -3550,7 +3583,7 @@ function buildDualPaneSearcherBundle(shell, codePane) {
         scrollLinksRef,
         scope,
         filePathLabel,
-        commentrayPathLabel,
+        commentrayPathLabel: effectiveCommentrayPathLabel,
         pathInit,
         indexState,
         mutable,