Merge branch 'main' into update/use-submission

solidjs · Oct 24, 2024 · b9c7a33 · b9c7a33
2 parents f8b2732 + c827a4c
commit b9c7a33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/scripts/collections/build-file-tree.mjs b/scripts/collections/build-file-tree.mjs
@@ -24,11 +24,21 @@ export async function buildFileTree(entry = COLLECTIONS_ROOT) {
 				})
 			);
 
+			const children = entryPath.includes("/reference/")
+				? nested
+						.filter(Boolean)
+						.sort((firstChild, secondChild) =>
+							firstChild.title
+								.toLowerCase()
+								.localeCompare(secondChild.title.toLowerCase())
+						)
+				: nested.filter(Boolean);
+
 			return {
 				type: "section",
 				title: info.title,
 				pages: info.pages,
-				children: nested.filter(Boolean),
+				children,
 			};
 		} else if (!entryPath.includes("data.json")) {
 			const file = await fs.readFile(entryPath, "utf-8");

diff --git a/src/ui/docs-layout.tsx b/src/ui/docs-layout.tsx
@@ -14,14 +14,13 @@ interface DocsLayoutProps {
 export const DocsLayout = (props: DocsLayoutProps) => {
 	const location = useLocation();
 
-	const lastSegmentPath = () => location.pathname.split("/").reverse()[0];
 	const collection = () =>
 		location.pathname.includes("/reference/")
 			? props.entries.reference
 			: props.entries.learn;
 
 	const entryIndex = () =>
-		collection()!.findIndex((element) => lastSegmentPath() === element.slug);
+		collection()!.findIndex((element) => location.pathname === element.path);
 
 	const titles = () => {
 		const fullEntry = collection