rescript-lang
diff --git a/‎app/root.res‎
Lines changed: 3 additions & 7 deletions b/‎app/root.res‎
Lines changed: 3 additions & 7 deletions
diff --git a/‎generate-route-types.mjs‎
Lines changed: 1 addition & 0 deletions b/‎generate-route-types.mjs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/ApiDocs.res‎
Lines changed: 13 additions & 7 deletions b/‎src/ApiDocs.res‎
Lines changed: 13 additions & 7 deletions
@@ -52,17 +52,13 @@ let default = () => {
   <html>
     <head>
       <style> {React.string("html {opacity:0;}")} </style>
-      <link rel="preload" href={mainCss} as_="css" />
-      // Preload the fonts used for the above the fold on the homepage
-      <link rel="preload" href="/fonts/subset-Inter-Bold.woff2" as_="font" />
-      <link rel="preload" href="/fonts/subset-Inter-Regular.woff2" as_="font" />
+      <link rel="preload" href={mainCss} as_="style" />
       <link rel="stylesheet" href={mainCss} />
-
-      <Links />
-      <Meta />
       <link rel="stylesheet" href={hljsCss} />
       <link rel="stylesheet" href={utilsCss} />
       <link rel="icon" href="/favicon.ico" />
+      <Links />
+      <Meta />
       <meta
         name="viewport"
         content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, minimal-ui"
 
@@ -18,6 +18,7 @@ const paths = routes.map((route) => `#"/${route.path}"`).join(" |\n");
 await fs.writeFile(
   "src/Path.res",
   `type t = [
+#"/" |
 ${paths}
 ]
 `,
 
@@ -46,7 +46,7 @@ type item =
 
 module RightSidebar = {
   @react.component
-  let make = (~items: array<item>) => {
+  let make = (~items: array<item>, ~onClick) => {
     items
     ->Array.map(item => {
       switch item {
@@ -67,10 +67,11 @@ module RightSidebar = {
         let title = `${Option.isSome(deprecatedIcon) ? "Deprecated " : ""}` ++ name
         let result =
           <li className="my-3" key={href}>
-            <a
+            <ReactRouter.Link.String
               title
               className="flex items-center w-full font-normal text-14 text-gray-40 leading-tight hover:text-gray-80"
-              href
+              to=href
+              onClick={_ => onClick()}
             >
               <div
                 className={`${bgColor} min-w-[20px] min-h-[20px] w-5 h-5 mr-3 flex justify-center items-center rounded-xl`}
@@ -84,7 +85,7 @@ module RightSidebar = {
               | Some(icon) => icon
               | None => React.null
               }}
-            </a>
+            </ReactRouter.Link.String>
           </li>
         result
       }
@@ -115,7 +116,7 @@ module SidebarTree = {
     | true =>
       <div className={"xl:hidden ml-5"} dataTestId={`submenu-${node.name}`}>
         <ul className={"list-none py-0.5"}>
-          <RightSidebar items />
+          <RightSidebar items onClick=toggle />
         </ul>
       </div>
     | false => React.null
@@ -286,9 +287,14 @@ module DocstringsStylize = {
 }
 
 let make = (props: props) => {
+  let (_, setScrollLock) = ScrollLockContext.useScrollLock()
   let (isSidebarOpen, setSidebarOpen) = React.useState(_ => true)
 
-  let toggleSidebar = () => setSidebarOpen(prev => !prev)
+  let toggleSidebar = () =>
+    setSidebarOpen(prev => {
+      setScrollLock(_ => !prev)
+      !prev
+    })
 
   let children = {
     open Markdown
@@ -337,7 +343,7 @@ let make = (props: props) => {
           {"Types and values"->React.string}
         </div>
         <ul>
-          <RightSidebar items />
+          <RightSidebar items onClick=toggleSidebar />
         </ul>
       </aside>
     </div>
Original file line number	Diff line number	Diff line change
@@ -18,6 +18,7 @@ const paths = routes.map((route) => `#"/${route.path}"`).join(" \|\n");
`18`	`18`	`await fs.writeFile(`
`19`	`19`	`"src/Path.res",`
`20`	`20`	`type t = [
	`21`	`+#"/" \|`
`21`	`22`	`${paths}`
`22`	`23`	`]`
`23`	`24`	`,