Skip to content

Fix white playground border #1137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fhammerschmidt merged 4 commits into from
Nov 25, 2025
Merged

Fix white playground border #1137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
60d3bff
Fix white playground border
fhammerschmidt Nov 24, 2025
bcdecd2
Merge remote-tracking branch 'rescript/master' into fix-white-playgro…
fhammerschmidt Nov 24, 2025
42fc719
Remove unnecessary outer scrollbar
fhammerschmidt Nov 24, 2025
76673b5
No overflow rules needed on main
fhammerschmidt Nov 24, 2025
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
20 changes: 13 additions & 7 deletions src/Playground.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ module ResultPane = {
~focusedRowCol: option<(int, int)>=?,
~result: FinalResult.t,
) =>
<div className="pt-4 bg-0 overflow-y-auto">
<div className="pt-4 bg-0 overflow-y-auto playground-scrollbar">
<div className="flex items-center text-16 font-medium px-4">
<div className="pr-4"> {renderTitle(result)} </div>
</div>
Expand Down Expand Up @@ -765,7 +765,7 @@ module WarningFlagsWidget = {
Option.map(suggestions, elements =>
<div
ref={ReactDOM.Ref.domRef((Obj.magic(listboxRef): React.ref<Nullable.t<Dom.element>>))}
className="p-2 absolute overflow-auto z-50 border-b rounded border-l border-r block w-full bg-gray-100 max-h-60"
className="p-2 absolute overflow-auto playground-scrollbar z-50 border-b rounded border-l border-r block w-full bg-gray-100 max-h-60"
>
elements
</div>
Expand Down Expand Up @@ -1523,6 +1523,12 @@ let make = (~bundleBaseUrl: string, ~versions: array<string>) => {
let (searchParams, _) = ReactRouter.useSearchParams()
let containerRef = React.useRef(Nullable.null)
let editorRef: React.ref<option<CodeMirror.editorInstance>> = React.useRef(None)
let (_, setScrollLock) = ScrollLockContext.useScrollLock()

React.useEffect(() => {
setScrollLock(_ => true)
None
}, [])

let versions =
versions
Expand Down Expand Up @@ -1990,7 +1996,7 @@ let make = (~bundleBaseUrl: string, ~versions: array<string>) => {
<button key={Int.toString(i)} onClick className disabled> {title} </button>
})

<main className={"flex flex-col bg-gray-100 text-gray-40 text-14 overflow-scroll mt-16"}>
<main className={"flex flex-col bg-gray-100 text-gray-40 text-14 mt-16"}>
<ControlPanel
actionIndicatorKey={Int.toString(actionCount)}
state=compilerState
Expand All @@ -2005,9 +2011,9 @@ let make = (~bundleBaseUrl: string, ~versions: array<string>) => {
// Left Panel
<div
ref={ReactDOM.Ref.domRef((Obj.magic(leftPanelRef): React.ref<Nullable.t<Dom.element>>))}
className={`overflow-scroll ${layout == Column ? "h-2/4" : "h-full!"} ${layout == Column
? "w-full"
: "w-[50%]"}`}
className={`overflow-scroll playground-scrollbar ${layout == Column
? "h-2/4"
: "h-full!"} ${layout == Column ? "w-full" : "w-[50%]"}`}
>
<div
className="bg-gray-100 h-full"
Expand Down Expand Up @@ -2042,7 +2048,7 @@ let make = (~bundleBaseUrl: string, ~versions: array<string>) => {
</div>
<div
ref={ReactDOM.Ref.domRef((Obj.magic(subPanelRef): React.ref<Nullable.t<Dom.element>>))}
className="overflow-auto"
className="overflow-auto playground-scrollbar"
>
<OutputPanel
currentTab compilerDispatch compilerState editorCode keyMapState={(keyMap, setKeyMap)}
Expand Down
25 changes: 25 additions & 0 deletions styles/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,31 @@
/* Chrome/Safari/Webkit */
}

.playground-scrollbar {
scrollbar-width: thin;
scrollbar-color: var(--color-gray-70) var(--color-gray-100);
scrollbar-gutter: stable; /* Reserve only at the scrollbar edge to avoid padding shifts */
}

.playground-scrollbar::-webkit-scrollbar {
width: 0.65rem;
height: 0.65rem;
}

.playground-scrollbar::-webkit-scrollbar-track {
background: var(--color-gray-100);
}

.playground-scrollbar::-webkit-scrollbar-thumb {
background-color: var(--color-gray-70);
border-radius: 9999px;
border: 2px solid var(--color-gray-100);
}

.playground-scrollbar::-webkit-scrollbar-thumb:hover {
background-color: var(--color-gray-60);
}

a > code {
@apply text-fire;
}
Expand Down