From aee1c9d989e0776986122dc89ee6722fde274a63 Mon Sep 17 00:00:00 2001
From: Pedro Castro <aspeddro@gmail.com>
Date: Fri, 20 Jun 2025 18:04:52 -0300
Subject: [PATCH] Remove duplicate title and fix left sidebar position

---
 src/ApiDocs.res                   |  5 ++---
 src/layouts/ApiLayout.res         |  1 -
 src/layouts/ApiOverviewLayout.res |  3 +--
 src/layouts/CommunityLayout.res   |  4 +---
 src/layouts/DocsLayout.res        | 25 +++++++------------------
 src/layouts/DocsLayout.resi       |  6 ++----
 src/layouts/ManualDocsLayout.res  | 12 +-----------
 src/layouts/ReactDocsLayout.res   |  8 --------
 src/layouts/SidebarLayout.res     |  5 ++---
 9 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/src/ApiDocs.res b/src/ApiDocs.res
index 5f253dcfe..47380f964 100644
--- a/src/ApiDocs.res
+++ b/src/ApiDocs.res
@@ -164,7 +164,6 @@ module SidebarTree = {
 
     let preludeSection =
       <div className="flex justify-between text-fire font-medium items-baseline">
-        {React.string(node.name ++ " Module")}
         {switch url {
         | Some(url) =>
           let onChange = evt => {
@@ -207,7 +206,7 @@ module SidebarTree = {
       ) ++ " md:block md:w-48 md:-ml-4 lg:w-1/5 md:h-auto md:relative overflow-y-visible bg-white"}>
       <aside
         id="sidebar-content"
-        className="relative top-0 px-4 w-full block md:top-16 md:pt-16 md:sticky border-r border-gray-20 overflow-y-auto pb-24 h-[calc(100vh-4.5rem)]">
+        className="relative top-0 px-4 w-full block md:top-[7rem] md:pt-10 md:sticky border-r border-gray-20 overflow-y-auto pb-24 h-[calc(100vh-7rem)]">
         <div className="flex justify-between">
           <div className="w-3/4 md:w-full"> React.null </div>
           <button
@@ -350,7 +349,7 @@ let default = (props: props) => {
   | Ok({module_: {items}}) if Array.length(items) > 0 =>
     <div className="hidden xl:block lg:w-1/5 md:h-auto md:relative overflow-y-visible bg-white">
       <aside
-        className="relative top-0 pl-4 w-full block md:top-16 md:pt-16 md:sticky border-l border-gray-20 overflow-y-auto pb-24 h-[calc(100vh-4.5rem)]">
+        className="relative top-0 pl-4 w-full block md:top-[7rem] md:pt-4 md:sticky border-l border-gray-20 overflow-y-auto pb-24 h-[calc(100vh-7rem)]">
         <div className="hl-overline block text-gray-80 mt-16 mb-2">
           {"Types and values"->React.string}
         </div>
diff --git a/src/layouts/ApiLayout.res b/src/layouts/ApiLayout.res
index add865201..04289ee33 100644
--- a/src/layouts/ApiLayout.res
+++ b/src/layouts/ApiLayout.res
@@ -98,7 +98,6 @@ let make = (
 
   let preludeSection =
     <div className="flex justify-between text-fire font-medium items-baseline">
-      {React.string(title)}
       {switch version {
       | Some(version) =>
         let onChange = evt => {
diff --git a/src/layouts/ApiOverviewLayout.res b/src/layouts/ApiOverviewLayout.res
index ebfc2087e..4c4e9b40b 100644
--- a/src/layouts/ApiOverviewLayout.res
+++ b/src/layouts/ApiOverviewLayout.res
@@ -25,9 +25,8 @@ let makeCategories: string => array<Sidebar.Category.t> = version => [
 module Docs = {
   @react.component
   let make = (~version, ~components=ApiMarkdown.default, ~children) => {
-    let title = "API"
     let categories = makeCategories(version)
 
-    <ApiLayout title categories version components> children </ApiLayout>
+    <ApiLayout categories version components> children </ApiLayout>
   }
 }
diff --git a/src/layouts/CommunityLayout.res b/src/layouts/CommunityLayout.res
index c81e76a21..ae319d58e 100644
--- a/src/layouts/CommunityLayout.res
+++ b/src/layouts/CommunityLayout.res
@@ -7,10 +7,8 @@ module CommunityLayout = DocsLayout.Make({
 let make = (~frontmatter=?, ~components=MarkdownComponents.default, ~children) => {
   let breadcrumbs = list{{Url.name: "Community", href: "/community"}}
 
-  let title = "Community"
-
   <CommunityLayout
-    theme=#Reason components metaTitleCategory="ReScript Community" title breadcrumbs ?frontmatter>
+    theme=#Reason components metaTitleCategory="ReScript Community" breadcrumbs ?frontmatter>
     children
   </CommunityLayout>
 }
diff --git a/src/layouts/DocsLayout.res b/src/layouts/DocsLayout.res
index 7f54300df..828bdd127 100644
--- a/src/layouts/DocsLayout.res
+++ b/src/layouts/DocsLayout.res
@@ -49,8 +49,7 @@ let makeBreadcrumbs = (~basePath: string, route: string): list<Url.breadcrumb> =
 @react.component
 let make = (
   ~breadcrumbs: option<list<Url.breadcrumb>>=?,
-  ~title: string,
-  ~metaTitleCategory: option<string>=?, // e.g. Introduction | My Meta Title Category
+  ~metaTitleCategory: string, // e.g. Introduction | My Meta Title Category
   ~frontmatter=?,
   ~version: option<string>=?,
   ~availableVersions: option<array<(string, string)>>=?,
@@ -86,7 +85,6 @@ let make = (
 
   let preludeSection =
     <div className="flex flex-col justify-between text-fire font-medium items-baseline">
-      {React.string(title)}
       {switch version {
       | Some(version) =>
         switch availableVersions {
@@ -111,14 +109,9 @@ let make = (
     </div>
 
   let sidebar =
-    <Sidebar
-      isOpen=isSidebarOpen toggle=toggleSidebar preludeSection title ?activeToc categories route
-    />
+    <Sidebar isOpen=isSidebarOpen toggle=toggleSidebar preludeSection ?activeToc categories route />
 
-  let metaTitle = switch metaTitleCategory {
-  | Some(titleCategory) => titleCategory ++ (" | " ++ "ReScript Documentation")
-  | None => title
-  }
+  let metaTitle = metaTitleCategory ++ (" | " ++ "ReScript Documentation")
 
   let (metaElement, editHref) = switch frontmatter {
   | Some(frontmatter) =>
@@ -126,15 +119,13 @@ let make = (
     | Some(fm) =>
       let canonical = Null.toOption(fm.canonical)
       let description = Null.toOption(fm.description)
-      let title = switch metaTitleCategory {
-      | Some(titleCategory) =>
+      let title = {
         // We will prefer an existing metaTitle over just a title
         let metaTitle = switch Null.toOption(fm.metaTitle) {
         | Some(metaTitle) => metaTitle
         | None => fm.title
         }
-        metaTitle ++ (" | " ++ titleCategory)
-      | None => title
+        metaTitle ++ (" | " ++ metaTitleCategory)
       }
       let meta = <Meta title ?description ?canonical version=Url.parse(router.route).version />
 
@@ -173,8 +164,7 @@ module Make = (Content: StaticContent) => {
   let make = (
     // base breadcrumbs without the very last element (the currently shown document)
     ~breadcrumbs: option<list<Url.breadcrumb>>=?,
-    ~title: string,
-    ~metaTitleCategory: option<string>=?,
+    ~metaTitleCategory: string,
     ~frontmatter=?,
     ~version: option<string>=?,
     ~availableVersions: option<array<(string, string)>>=?,
@@ -235,8 +225,7 @@ module Make = (Content: StaticContent) => {
 
     make({
       ?breadcrumbs,
-      title,
-      ?metaTitleCategory,
+      metaTitleCategory,
       ?frontmatter,
       ?version,
       ?availableVersions,
diff --git a/src/layouts/DocsLayout.resi b/src/layouts/DocsLayout.resi
index a237a71ab..1536074a8 100644
--- a/src/layouts/DocsLayout.resi
+++ b/src/layouts/DocsLayout.resi
@@ -4,8 +4,7 @@ let makeBreadcrumbs: (~basePath: string, string) => list<Url.breadcrumb>
 @react.component
 let make: (
   ~breadcrumbs: list<Url.breadcrumb>=?,
-  ~title: string,
-  ~metaTitleCategory: string=?, // e.g. Introduction | My Meta Title Category
+  ~metaTitleCategory: string, // e.g. Introduction | My Meta Title Category
   ~frontmatter: JSON.t=?,
   ~version: string=?,
   ~availableVersions: array<(string, string)>=?,
@@ -27,8 +26,7 @@ module Make: (Content: StaticContent) =>
   @react.component
   let make: (
     ~breadcrumbs: list<Url.breadcrumb>=?,
-    ~title: string,
-    ~metaTitleCategory: string=?,
+    ~metaTitleCategory: string,
     ~frontmatter: JSON.t=?,
     ~version: string=?,
     ~availableVersions: array<(string, string)>=?,
diff --git a/src/layouts/ManualDocsLayout.res b/src/layouts/ManualDocsLayout.res
index 5c65f0fbd..7680ac48d 100644
--- a/src/layouts/ManualDocsLayout.res
+++ b/src/layouts/ManualDocsLayout.res
@@ -26,7 +26,6 @@ module V1200Layout = DocsLayout.Make({
 module V1200 = {
   @react.component
   let make = (~frontmatter=?, ~components=MarkdownComponents.default, ~children) => {
-    let title = "Language Manual"
     let router = Next.Router.useRouter()
     let url = router.route->Url.parse
     let version = url->Url.getVersionString
@@ -59,7 +58,6 @@ module V1200 = {
       theme=#Reason
       components
       version
-      title
       metaTitleCategory="ReScript Language Manual"
       availableVersions=Constants.allManualVersions
       nextVersion=?Constants.nextVersion
@@ -74,7 +72,6 @@ module V1200 = {
 module V1100 = {
   @react.component
   let make = (~frontmatter=?, ~components=MarkdownComponents.default, ~children) => {
-    let title = "Language Manual"
     let router = Next.Router.useRouter()
     let version = router.route->Url.parse->Url.getVersionString
 
@@ -87,7 +84,6 @@ module V1100 = {
       theme=#Reason
       components
       version
-      title
       metaTitleCategory="ReScript Language Manual"
       availableVersions=Constants.allManualVersions
       nextVersion=?Constants.nextVersion
@@ -122,13 +118,12 @@ module V1000 = {
       },
     }
 
-    let title = "Language Manual"
+    // let title = "Language Manual"
 
     <V1000Layout
       theme=#Reason
       components
       version
-      title
       metaTitleCategory="ReScript Language Manual"
       availableVersions=Constants.allManualVersions
       nextVersion=?Constants.nextVersion
@@ -167,13 +162,10 @@ module V900 = {
       },
     }
 
-    let title = "Language Manual"
-
     <V900Layout
       theme=#Reason
       components
       version
-      title
       metaTitleCategory="ReScript Language Manual"
       availableVersions=Constants.allManualVersions
       nextVersion=?Constants.nextVersion
@@ -208,7 +200,6 @@ module V800 = {
       },
     }
 
-    let title = "Language Manual"
     let version = "v8.0.0"
 
     let warnBanner = {
@@ -249,7 +240,6 @@ module V800 = {
       theme=#Reason
       components
       version
-      title
       metaTitleCategory="ReScript Language Manual"
       availableVersions=Constants.allManualVersions
       nextVersion=?Constants.nextVersion
diff --git a/src/layouts/ReactDocsLayout.res b/src/layouts/ReactDocsLayout.res
index 59ea6669c..4c6290ef0 100644
--- a/src/layouts/ReactDocsLayout.res
+++ b/src/layouts/ReactDocsLayout.res
@@ -36,7 +36,6 @@ module Latest = {
       {name: "rescript-react", href: "/docs/react/" ++ (version ++ "/introduction")},
     }
 
-    let title = "rescript-react"
     let version = "latest"
 
     <LatestLayout
@@ -45,7 +44,6 @@ module Latest = {
       metaTitleCategory="React"
       availableVersions=Constants.allReactVersions
       version
-      title
       breadcrumbs
       ?frontmatter>
       children
@@ -70,15 +68,12 @@ module V0110 = {
       {name: "rescript-react", href: "/docs/react/" ++ (version ++ "/introduction")},
     }
 
-    let title = "rescript-react"
-
     <V0110Layout
       theme=#Reason
       components
       metaTitleCategory="React"
       availableVersions=Constants.allReactVersions
       version
-      title
       breadcrumbs
       ?frontmatter>
       children
@@ -103,15 +98,12 @@ module V0100 = {
       {name: "rescript-react", href: "/docs/react/" ++ (version ++ "/introduction")},
     }
 
-    let title = "rescript-react"
-
     <V0100Layout
       theme=#Reason
       components
       metaTitleCategory="React"
       availableVersions=Constants.allReactVersions
       version
-      title
       breadcrumbs
       ?frontmatter>
       children
diff --git a/src/layouts/SidebarLayout.res b/src/layouts/SidebarLayout.res
index 9ee651864..c9dc85d15 100644
--- a/src/layouts/SidebarLayout.res
+++ b/src/layouts/SidebarLayout.res
@@ -138,11 +138,10 @@ module Sidebar = {
         id="sidebar"
         className={(
           isOpen ? "fixed w-full left-0 h-full z-20 min-w-320" : "hidden "
-        ) ++ " overflow-x-hidden md:block md:w-48 md:-ml-4 lg:w-1/5 md:h-auto md:relative overflow-y-visible bg-white mt-28 md:mt-0"}>
+        ) ++ " md:block md:w-48 md:-ml-4 lg:w-1/5 md:h-auto md:relative overflow-y-visible bg-white mt-28 md:mt-0"}>
         <aside
           id="sidebar-content"
-          className="relative top-0 px-4 w-full block md:top-16 md:pt-4 md:sticky border-r border-gray-20 overflow-y-auto pb-24"
-          style={ReactDOMStyle.make(~height="calc(100vh - 4.5rem", ())}>
+          className="relative top-0 px-4 w-full block md:top-[7rem] md:pt-10 md:sticky border-r border-gray-20 overflow-y-auto pb-24 h-[calc(100vh-7rem)]">
           <button
             onClick={evt => {
               ReactEvent.Mouse.preventDefault(evt)