Skip to content

Commit 59c4de5

Browse files
committed
fix doc links to playground
1 parent 4f3d0e7 commit 59c4de5

File tree

4 files changed

+33
-24
lines changed

4 files changed

+33
-24
lines changed

src/Playground.res

Lines changed: 31 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,9 +1523,11 @@ let make = (~bundleBaseUrl: string, ~versions: array<string>) => {
15231523
| [v] => Some(v) // only single version available. maybe local dev.
15241524
| versions => {
15251525
let lastStableVersion = versions->Array.find(version => version.preRelease->Option.isNone)
1526-
switch searchParams->Object.get((CompilerManagerHook.Version :> string)) {
1527-
| Some(version) => version->Semver.parse
1528-
| None =>
1526+
switch Nullable.make(
1527+
searchParams->WebAPI.URLSearchParams.get((CompilerManagerHook.Version :> string)),
1528+
) {
1529+
| Nullable.Value(version) => version->Semver.parse
1530+
| _ =>
15291531
switch Url.getVersionFromStorage(Playground) {
15301532
| Some(v) => v->Semver.parse
15311533
| None => lastStableVersion
@@ -1534,23 +1536,37 @@ let make = (~bundleBaseUrl: string, ~versions: array<string>) => {
15341536
}
15351537
}
15361538

1537-
let initialLang = switch searchParams->Object.get((CompilerManagerHook.Ext :> string)) {
1538-
| Some("re") => Api.Lang.Reason
1539+
Console.log(("searchParams", searchParams))
1540+
1541+
let initialLang = switch Nullable.make(
1542+
searchParams->WebAPI.URLSearchParams.get((CompilerManagerHook.Ext :> string)),
1543+
) {
1544+
| Nullable.Value("re") => Api.Lang.Reason
15391545
| _ => Api.Lang.Res
15401546
}
15411547

1542-
let initialModuleSystem = searchParams->Object.get((Module :> string))
1543-
let initialJsxPreserveMode = searchParams->Object.get((JsxPreserve :> string))->Option.isSome
1548+
let initialModuleSystem =
1549+
Nullable.make(searchParams->WebAPI.URLSearchParams.get((Module :> string)))->Nullable.toOption
1550+
1551+
let initialJsxPreserveMode = !(
1552+
Nullable.make(
1553+
searchParams->WebAPI.URLSearchParams.get((JsxPreserve :> string)),
1554+
)->Nullable.isNullable
1555+
)
15441556

15451557
let initialExperimentalFeatures =
1546-
searchParams
1547-
->Object.get((Experiments :> string))
1548-
->Option.mapOr([], str => str->String.split(",")->Array.map(String.trim))
1549-
1550-
let initialContent = switch (searchParams->Object.get((Code :> string)), initialLang) {
1551-
| (Some(compressedCode), _) => LzString.lzString.decompressToEncodedURIComponent(compressedCode)
1552-
| (None, Reason) => initialReContent
1553-
| (None, Res) =>
1558+
Nullable.make(
1559+
searchParams->WebAPI.URLSearchParams.get((Experiments :> string)),
1560+
)->Nullable.mapOr([], str => str->String.split(",")->Array.map(String.trim))
1561+
1562+
let initialContent = switch (
1563+
Nullable.make(searchParams->WebAPI.URLSearchParams.get((Code :> string))),
1564+
initialLang,
1565+
) {
1566+
| (Nullable.Value(compressedCode), _) =>
1567+
LzString.lzString.decompressFromEncodedURIComponent(compressedCode)
1568+
| (_, Reason) => initialReContent
1569+
| (_, Res) =>
15541570
switch initialVersion {
15551571
| Some({major: 10, minor}) if minor >= 1 => InitialContent.since_10_1
15561572
| Some({major}) if major > 10 => InitialContent.since_11

src/bindings/ReactRouter.res

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ external navigate: (string, ~options: navigateOptions=?) => unit = "navigate"
88
external useNavigate: unit => string => unit = "useNavigate"
99

1010
@module("react-router")
11-
external useSearchParams: unit => ({..}, {..} => unit) = "useSearchParams"
11+
external useSearchParams: unit => (WebAPI.URLAPI.urlSearchParams, {..} => unit) = "useSearchParams"
1212

1313
@module("react-router")
1414
external useLoaderData: unit => 'a = "useLoaderData"

src/common/LzString.res

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
type t = {
44
compressToEncodedURIComponent: string => string,
5-
decompressToEncodedURIComponent: string => string,
5+
decompressFromEncodedURIComponent: string => string,
66
}
77

88
@module("lz-string")

src/components/CodeMirror.res

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,6 @@ let make = // props relevant for the react wrapper
557557
let windowWidth = useWindowWidth()
558558
let (onMouseOver, onMouseOut, onMouseMove) = useHoverTooltip(~cmStateRef, ~cmRef, ())
559559

560-
Console.debug2("Rendering Codemirror with value:", value)
561-
562560
React.useEffect(() => {
563561
switch inputElement.current->Nullable.toOption {
564562
| Some(el) => Console.debug2("Codemirror input element", el)
@@ -579,8 +577,6 @@ let make = // props relevant for the react wrapper
579577
keyMap: KeyMap.toString(keyMap),
580578
}
581579

582-
Console.debug2("options", options)
583-
584580
let cm = CM.fromTextArea(input, options)
585581

586582
Option.forEach(minHeight, minHeight => {
@@ -608,10 +604,7 @@ let make = // props relevant for the react wrapper
608604

609605
cmRef.current = Some(cm)
610606

611-
Console.debug2("Codemirror instance", cm)
612-
613607
let cleanup = () => {
614-
/* Console.log2("cleanup", options->CM.Options.mode); */
615608
CM.offMouseOver(wrapper, onMouseOver)
616609
CM.offMouseOut(wrapper, onMouseOut)
617610
CM.offMouseMove(wrapper, onMouseMove)

0 commit comments

Comments
 (0)