@farming-labs/next 0.2.47 → 0.2.48

package/dist/changelog-rail-search.mjs

@@ -1,7 +1,7 @@
 "use client";
 
 import Link from "next/link";
-import { useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useRef, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 
 //#region src/changelog-rail-search.tsx
@@ -106,13 +106,10 @@ function getHashTargetElement(href) {
 function ChangelogTOC({ title, items, variant = "releases" }) {
 	const tocId = `fd-changelog-toc-${variant}-${title.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`;
 	const [activeHref, setActiveHref] = useState(items[0]?.href ?? "");
+	const activeSourceRef = useRef("hash");
 	useEffect(() => {
-		if (items.length === 0) {
-			setActiveHref("");
-			return;
-		}
 		let frameId = 0;
-		const updateActiveHref = () => {
+		const updateActiveHrefFromScroll = () => {
 			const threshold = Math.max(140, window.innerHeight * .18);
 			let nextActiveHref = items[0]?.href ?? "";
 			for (const item of items) {
@@ -122,30 +119,60 @@ function ChangelogTOC({ title, items, variant = "releases" }) {
 				if (top <= threshold) nextActiveHref = item.href;
 				else break;
 			}
-			if (window.location.hash) {
-				const hashHref = `#${decodeHashValue(window.location.hash.slice(1))}`;
-				if (items.some((item) => item.href === hashHref)) nextActiveHref = hashHref;
+			const scrollingElement = document.scrollingElement ?? document.documentElement;
+			if (scrollingElement.scrollTop > 0 && scrollingElement.scrollHeight - scrollingElement.scrollTop - scrollingElement.clientHeight <= 2) for (let index = items.length - 1; index >= 0; index -= 1) {
+				const item = items[index];
+				if (item && getHashTargetElement(item.href)) {
+					nextActiveHref = item.href;
+					break;
+				}
 			}
 			setActiveHref(nextActiveHref);
 		};
-		const scheduleUpdate = () => {
+		const updateActiveHrefFromHash = () => {
+			if (!window.location.hash) return false;
+			const hashHref = `#${decodeHashValue(window.location.hash.slice(1))}`;
+			if (items.some((item) => item.href === hashHref)) {
+				setActiveHref(hashHref);
+				return true;
+			}
+			return false;
+		};
+		const syncActiveHref = () => {
+			if (activeSourceRef.current === "hash" && updateActiveHrefFromHash()) return;
+			activeSourceRef.current = "scroll";
+			updateActiveHrefFromScroll();
+		};
+		const scheduleActiveHrefUpdate = () => {
 			if (frameId !== 0) return;
 			frameId = window.requestAnimationFrame(() => {
 				frameId = 0;
-				updateActiveHref();
+				syncActiveHref();
 			});
 		};
-		updateActiveHref();
-		window.setTimeout(updateActiveHref, 0);
-		window.setTimeout(updateActiveHref, 250);
-		window.addEventListener("scroll", scheduleUpdate, { passive: true });
-		window.addEventListener("resize", scheduleUpdate);
-		window.addEventListener("hashchange", scheduleUpdate);
+		const handleScroll = () => {
+			activeSourceRef.current = "scroll";
+			scheduleActiveHrefUpdate();
+		};
+		const handleHashChange = () => {
+			activeSourceRef.current = "hash";
+			if (updateActiveHrefFromHash()) return;
+			activeSourceRef.current = "scroll";
+			scheduleActiveHrefUpdate();
+		};
+		syncActiveHref();
+		const initialUpdateId = window.setTimeout(syncActiveHref, 0);
+		const settledUpdateId = window.setTimeout(syncActiveHref, 250);
+		window.addEventListener("scroll", handleScroll, { passive: true });
+		window.addEventListener("resize", scheduleActiveHrefUpdate);
+		window.addEventListener("hashchange", handleHashChange);
 		return () => {
+			window.clearTimeout(initialUpdateId);
+			window.clearTimeout(settledUpdateId);
 			if (frameId !== 0) window.cancelAnimationFrame(frameId);
-			window.removeEventListener("scroll", scheduleUpdate);
-			window.removeEventListener("resize", scheduleUpdate);
-			window.removeEventListener("hashchange", scheduleUpdate);
+			window.removeEventListener("scroll", handleScroll);
+			window.removeEventListener("resize", scheduleActiveHrefUpdate);
+			window.removeEventListener("hashchange", handleHashChange);
 		};
 	}, [items]);
 	if (items.length === 0) return null;
@@ -403,10 +430,10 @@ function ChangelogDirectory({ title, description, entries, searchEnabled, action
 						entry,
 						isLast: index === filteredEntries.length - 1
 					}, entry.slug))] }) : /* @__PURE__ */ jsx(EmptyResults, { query })
-				}), hasResults ? /* @__PURE__ */ jsx(ChangelogTOC, {
+				}), /* @__PURE__ */ jsx(ChangelogTOC, {
 					title: "Releases",
 					items: tocItems
-				}) : null]
+				})]
 			})
 		]
 	});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farming-labs/next",
-  "version": "0.2.47",
+  "version": "0.2.48",
   "description": "Next.js adapter for @farming-labs/docs — MDX config wrapper",
   "keywords": [
     "docs",
@@ -106,8 +106,8 @@
     "tsdown": "^0.20.3",
     "typescript": "^5.9.3",
     "vitest": "^4.1.8",
-    "@farming-labs/docs": "0.2.47",
-    "@farming-labs/theme": "0.2.47"
+    "@farming-labs/docs": "0.2.48",
+    "@farming-labs/theme": "0.2.48"
   },
   "peerDependencies": {
     "@farming-labs/docs": ">=0.0.1",