Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/ApiDocs.res
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ module SidebarTree = {
open Url
ReactEvent.Form.preventDefault(evt)
let version = (evt->ReactEvent.Form.target)["value"]
WebAPI.Storage.setItem(localStorage, ~key=(Manual :> string), ~value=version)
let url = Url.parse(router.asPath)
switch url.pagepath[1] {
| Some("core") | Some("stdlib") =>
Expand Down
27 changes: 0 additions & 27 deletions src/DocsOverview.res
Original file line number Diff line number Diff line change
Expand Up @@ -30,35 +30,8 @@ let default = (~showVersionSelect=true) => {
("Reanalyze", "https://github.com/rescript-lang/reanalyze"),
]

let versionSelect = if showVersionSelect {
let onChange = evt => {
open Url
ReactEvent.Form.preventDefault(evt)
let version = (evt->ReactEvent.Form.target)["value"]
let url = Url.parse(router.route)

let targetUrl =
"/" ++
(Array.join(url.base, "/") ++
("/" ++ (version ++ ("/" ++ Array.join(url.pagepath, "/")))))
router->Next.Router.push(targetUrl)
}

<div className="text-fire">
<VersionSelect
availableVersions=Constants.allManualVersions
nextVersion=?Constants.nextVersion
onChange
version
/>
</div>
} else {
React.null
}

<>
<div>
versionSelect
<div className="mb-6" />
<Markdown.H1> {React.string("Docs")} </Markdown.H1>
</div>
Expand Down
10 changes: 8 additions & 2 deletions src/Playground.res
Original file line number Diff line number Diff line change
Expand Up @@ -886,7 +886,9 @@ module Settings = {
ReactEvent.Form.preventDefault(evt)
let id: string = (evt->ReactEvent.Form.target)["value"]
switch id->Semver.parse {
| Some(v) => onCompilerSelect(v)
| Some(v) =>
onCompilerSelect(v)
WebAPI.Storage.setItem(localStorage, ~key=(Url.Playground :> string), ~value=id)
| None => ()
}
}}>
Expand Down Expand Up @@ -1417,7 +1419,11 @@ let make = (~versions: array<string>) => {

let initialVersion = switch Dict.get(router.query, "version") {
| Some(version) => version->Semver.parse
| None => lastStableVersion
| None =>
switch Url.getVersionFromStorage(Playground) {
| Some(v) => v->Semver.parse
| None => lastStableVersion
}
}

let initialLang = switch Dict.get(router.query, "ext") {
Expand Down
14 changes: 14 additions & 0 deletions src/common/Url.res
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,20 @@ let parse = (route: string): t => {
{fullpath, base, version, pagepath}
}

@unboxed
type storageKey =
| @as("manual_version") Manual
| @as("react_version") React
| @as("playground_version") Playground

let getVersionFromStorage = (key: storageKey) => {
try {
WebAPI.Storage.getItem(window.localStorage, (key :> string))->Null.toOption
} catch {
| JsExn(_) => None
}
}

let getVersionString = url =>
switch url.version {
| Next => Constants.versions.next
Expand Down
8 changes: 8 additions & 0 deletions src/common/Url.resi
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,12 @@ let parse: string => t

let prettyString: string => string

@unboxed
type storageKey =
| @as("manual_version") Manual
| @as("react_version") React
| @as("playground_version") Playground

let getVersionFromStorage: storageKey => option<string>

let getVersionString: t => string
7 changes: 5 additions & 2 deletions src/components/Navigation.res
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,10 @@ let make = (~fixed=true, ~isOverlayOpen: bool, ~setOverlayOpen: (bool => bool) =
let router = Next.Router.useRouter()
let route = router.route
let url = router.route->Url.parse
let version = url->Url.getVersionString
let verionFromUrl = url->Url.getVersionString

let version = Url.getVersionFromStorage(Manual)->Option.getOr(Constants.versions.latest)
let reactVersion = Url.getVersionFromStorage(React)->Option.getOr(verionFromUrl)

let toggleOverlay = () => {
setOverlayOpen(prev => !prev)
Expand Down Expand Up @@ -188,7 +191,7 @@ let make = (~fixed=true, ~isOverlayOpen: bool, ~setOverlayOpen: (bool => bool) =
{React.string("Syntax Lookup")}
</Link>
<Link
href={`/docs/react/latest/introduction`}
href={`/docs/react/${reactVersion}/introduction`}
className={isActiveLink(~includes="/docs/react/", ~route)}>
{React.string("React")}
</Link>
Expand Down
1 change: 1 addition & 0 deletions src/layouts/ApiLayout.res
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ let make = (
ReactEvent.Form.preventDefault(evt)
let version = (evt->ReactEvent.Form.target)["value"]
let url = Url.parse(route)
WebAPI.Storage.setItem(localStorage, ~key=(Url.Manual :> string), ~value=version)

let targetUrl =
"/" ++
Expand Down
8 changes: 8 additions & 0 deletions src/layouts/DocsLayout.res
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,14 @@ let make = (
ReactEvent.Form.preventDefault(evt)
let version = (evt->ReactEvent.Form.target)["value"]
let url = Url.parse(route)
WebAPI.Storage.setItem(
localStorage,
~key=switch metaTitleCategory {
| "React" => (React :> string)
| _ => (Manual :> string)
},
~value=version,
)

let targetUrl =
"/" ++
Expand Down