Skip to content

Local UI to run and train LLMs and diffusion models. Supports GGUF, MLX, Qwen3.8, DeepSeek-V4.1, MiniMax-H3, Gemma 4, FLUX and more.

Studio: media rails keep their width when the scrollbar appears (#15522)

Michael Hancba798bdaf08
diff --git a/studio/frontend/src/features/audio/audio-page.tsx b/studio/frontend/src/features/audio/audio-page.tsx
index 0789804872f..c5e42d0470f 100644
--- a/studio/frontend/src/features/audio/audio-page.tsx
+++ b/studio/frontend/src/features/audio/audio-page.tsx
@@ -2017,7 +2017,7 @@ export function AudioPage({
ref={attachSettingsScroll}
onScroll={onSettingsScroll}
className={cn(
- "hover-scrollbar flex min-h-0 flex-1 flex-col gap-4 px-10 max-sm:px-5 pt-9 pb-6 @[50rem]:overflow-y-auto",
+ "hover-scrollbar flex min-h-0 flex-1 flex-col gap-4 px-10 max-sm:px-5 pt-9 pb-6 @[50rem]:overflow-y-auto @[50rem]:[scrollbar-gutter:stable] @[50rem]:pr-[calc(var(--spacing)*10-var(--classic-scrollbar-width,0px))]",
mode === "speak"
? "panel-scroll-fade-action"
: "panel-scroll-fade",
diff --git a/studio/frontend/src/features/images/images-page.tsx b/studio/frontend/src/features/images/images-page.tsx
index 3f1a27847bf..aefa09f49a9 100644
--- a/studio/frontend/src/features/images/images-page.tsx
+++ b/studio/frontend/src/features/images/images-page.tsx
@@ -6008,7 +6008,7 @@ export function ImagesPage({
ref={attachSettingsScroll}
onScroll={onSettingsScroll}
className={cn(
- "hover-scrollbar panel-scroll-fade-action flex min-h-0 flex-1 flex-col gap-4 px-10 max-sm:px-5 pt-9 pb-6 @[50rem]:overflow-y-auto",
+ "hover-scrollbar panel-scroll-fade-action flex min-h-0 flex-1 flex-col gap-4 px-10 max-sm:px-5 pt-9 pb-6 @[50rem]:overflow-y-auto @[50rem]:[scrollbar-gutter:stable] @[50rem]:pr-[calc(var(--spacing)*10-var(--classic-scrollbar-width,0px))]",
settingsFadeClass,
)}
>
diff --git a/studio/frontend/src/features/video/video-page.tsx b/studio/frontend/src/features/video/video-page.tsx
index f5505728106..227dcc62ea5 100644
--- a/studio/frontend/src/features/video/video-page.tsx
+++ b/studio/frontend/src/features/video/video-page.tsx
@@ -3906,7 +3906,7 @@ function VideoGenerator({
ref={attachSettingsScroll}
onScroll={onSettingsScroll}
className={cn(
- "hover-scrollbar panel-scroll-fade-action flex min-h-0 flex-1 flex-col gap-4 px-10 max-sm:px-5 pt-9 pb-6 @[50rem]:overflow-y-auto",
+ "hover-scrollbar panel-scroll-fade-action flex min-h-0 flex-1 flex-col gap-4 px-10 max-sm:px-5 pt-9 pb-6 @[50rem]:overflow-y-auto @[50rem]:[scrollbar-gutter:stable] @[50rem]:pr-[calc(var(--spacing)*10-var(--classic-scrollbar-width,0px))]",
settingsFadeClass,
)}
>
diff --git a/studio/frontend/src/lib/overlay-scrollbar.ts b/studio/frontend/src/lib/overlay-scrollbar.ts
index fbd841631fe..d69f1cab2e3 100644
--- a/studio/frontend/src/lib/overlay-scrollbar.ts
+++ b/studio/frontend/src/lib/overlay-scrollbar.ts
@@ -4,18 +4,20 @@
/** Classic scrollbars take layout space, so their gutter stays unset. */
export const OVERLAY_SCROLLBAR_GUTTER_VAR = "--overlay-scrollbar-gutter";
+/** For a padding-reserved gutter; unset for overlay scrollbars. */
+export const CLASSIC_SCROLLBAR_WIDTH_VAR = "--classic-scrollbar-width";
const MAX_GUTTER_PX = 48;
/** Re-measuring forces layout, so resize bursts are coalesced. */
const RESIZE_SETTLE_MS = 200;
-type Measurement = { gutter: number; reliable: boolean };
+type Measurement = { gutter: number; classic: number; reliable: boolean };
function measure(doc: Document): Measurement {
const body = doc.body;
if (!body) {
- return { gutter: 0, reliable: false };
+ return { gutter: 0, classic: 0, reliable: false };
}
const probe = doc.createElement("div");
@@ -28,8 +30,9 @@ function measure(doc: Document): Measurement {
body.appendChild(probe);
try {
- if (probe.offsetWidth - probe.clientWidth > 0) {
- return { gutter: 0, reliable: true };
+ const classic = probe.offsetWidth - probe.clientWidth;
+ if (classic > 0) {
+ return { gutter: 0, classic, reliable: true };
}
// Reveal scrollbars configured to appear only while scrolling.
@@ -42,11 +45,11 @@ function measure(doc: Document): Measurement {
let gutter = 0;
for (let offset = 1; offset <= MAX_GUTTER_PX; offset++) {
if (doc.elementFromPoint(right - offset, y) === content) {
- return { gutter, reliable: true };
+ return { gutter, classic: 0, reliable: true };
}
gutter = offset;
}
- return { gutter: 0, reliable: false };
+ return { gutter: 0, classic: 0, reliable: false };
} finally {
body.removeChild(probe);
}
@@ -57,7 +60,7 @@ export function measureOverlayScrollbarGutter(doc: Document): number {
}
export function applyOverlayScrollbarGutter(doc: Document): number {
- const { gutter, reliable } = measure(doc);
+ const { gutter, classic, reliable } = measure(doc);
const root = doc.documentElement;
if (!reliable) {
// Keep the last good gutter: one unreadable sweep must not shift rows.
@@ -72,6 +75,11 @@ export function applyOverlayScrollbarGutter(doc: Document): number {
} else {
root.style.removeProperty(OVERLAY_SCROLLBAR_GUTTER_VAR);
}
+ if (classic > 0) {
+ root.style.setProperty(CLASSIC_SCROLLBAR_WIDTH_VAR, `${classic}px`);
+ } else {
+ root.style.removeProperty(CLASSIC_SCROLLBAR_WIDTH_VAR);
+ }
return gutter;
}
diff --git a/studio/frontend/tests/media-rail-scrollbar.test.ts b/studio/frontend/tests/media-rail-scrollbar.test.ts
new file mode 100644
index 00000000000..3478d340078
--- /dev/null
+++ b/studio/frontend/tests/media-rail-scrollbar.test.ts
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: AGPL-3.0-only
+// Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0
+
+import assert from "node:assert/strict";
+import test from "node:test";
+
+import { readSrc } from "./helpers/kit.ts";
+
+test("media rails reserve a classic scrollbar out of their right padding, not their content", () => {
+ for (const page of ["images/images-page.tsx", "video/video-page.tsx", "audio/audio-page.tsx"]) {
+ assert.match(
+ readSrc(`features/${page}`),
+ /px-10 max-sm:px-5 pt-9 pb-6 @\[50rem\]:overflow-y-auto @\[50rem\]:\[scrollbar-gutter:stable\] @\[50rem\]:pr-\[calc\(var\(--spacing\)\*10-var\(--classic-scrollbar-width,0px\)\)\]/,
+ page,
+ );
+ }
+});
+
+test("the classic scrollbar's width is published, and cleared for overlay scrollbars", () => {
+ const lib = readSrc("lib/overlay-scrollbar.ts");
+ assert.match(lib, /const classic = probe\.offsetWidth - probe\.clientWidth;/);
+ assert.match(
+ lib,
+ /if \(classic > 0\) \{\s*root\.style\.setProperty\(CLASSIC_SCROLLBAR_WIDTH_VAR, `\$\{classic\}px`\);\s*\} else \{\s*root\.style\.removeProperty\(CLASSIC_SCROLLBAR_WIDTH_VAR\);/,
+ );
+});