* Studio: scale menu, toast, chat and composer icons with the UI font size Glyphs that sit beside scaled labels now follow the preference: the shared --icon-size token (nav, settings tabs, chat action bars, code block actions), classed svgs inside dropdown, select, context, menubar, popover and command surfaces, toasts, the chat thread and both composers, and the composer pill glyph slot. Sonner toast text is unpinned from its injected 13px. Hit targets, paddings and surface geometry stay fixed and every value is identity at the default size. * Studio: icons scale at half the UI font size rate; cover review gaps Icons now follow the preference at half the rate of the text, matching the logo lockup: base + (setting - 16) / 2. The menu specific rules that outranked the scoped block (app-user-menu, unsloth-plus-menu, unsloth-tick) carry the scale too, which also restores the plus menu's intended 1.15rem glyph base at the default size. From review: closed select triggers join the scoped surfaces so their chevron tracks the label, sonner action button labels scale at full text rate alongside the title and description, and the unused built-in sonner loader gets a defensive size override. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Studio: icons match the text scale below the default, half rate above Piecewise icon scaling: below the 16px default icons follow the UI font size at the full text rate, above it they move at half the rate so glyphs stay slightly smaller than the text. Written as min(full, half) since the smaller branch is correct on each side. Applies to the shared --icon-size token, the scoped menu, toast, chat and composer overrides, and the menu rules that outrank them. * Studio: cap icons at their default size above the 16px setting Below the default icons still match the text scale; above it they now keep their default size instead of growing at half rate, so enlarged text dominates and glyphs read slightly smaller than the text. The curve is min(full rate, base). * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Studio: icons above the default scale at half rate, not capped A 16px glyph at setting 20 renders 18px, as if the setting were 18: above the default icons move at half the rate of the text, below it they match the text scale. The curve is min(full rate, half rate). * Studio: standard icons render at the UI font size itself One shared --ui-icon-size token replaces the per-base curves for every glyph with a 16px or larger base: icons match the UI font size below the default and grow at half the change above it, so setting 12 gives 12px icons, 16 gives 16px and 20 gives 18px, slightly smaller than the enlarged text. Sub 16px glyphs keep their proportions through the same curve as a factor. This also slims the previous 18px to 21px icon bases down to the font size at the default setting. * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Studio: icon scale review fixes for ticks, comboboxes and art glyphs From review: thinking ticks keep their own size inside plus menus (the important menu rule now excludes them), combobox popups and triggers join the scoped surfaces, 24px size-6 art glyphs such as attachment tile icons go back to proportional scaling instead of the uniform token, branch picker 36px chevrons scale proportionally beside their counter, and buttons that default un-classed icons to size-4 get the shared token (xs buttons keep their pinned small icons). Sonner cancel labels already scale: sonner renders cancel with data-button set, so the existing override reaches it. * Studio: keep the toast close glyph compact The button icon fallback matched Sonner's close button, whose unclassed 12px X then rendered at the shared icon size inside its fixed control. Exclude data-close-button from the fallback. * Studio: use text-ui-11 for the new chat settings sheet caption The raw px guard caught a text-[11px] added on main; raw px text ignores the UI font size preference. --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
189 lines
7.9 KiB
Python
189 lines
7.9 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-only
|
|
# Copyright 2026-present the Unsloth AI Inc. team. All rights reserved. See /studio/LICENSE.AGPL-3.0
|
|
|
|
"""UI font size scaling contracts (Settings > Appearance).
|
|
|
|
The preference must scale typography through the --ui-font-scale tokens,
|
|
never by mutating the root font size, so rem-based layout stays put. These
|
|
contracts also act as the guard against reintroducing raw pixel typography
|
|
that would silently ignore the preference.
|
|
"""
|
|
|
|
import re
|
|
from pathlib import Path
|
|
|
|
REPO = Path(__file__).resolve().parents[2]
|
|
SRC = REPO / "studio/frontend/src"
|
|
INDEX_CSS = (SRC / "index.css").read_text(encoding = "utf-8")
|
|
STORE = (SRC / "features/settings/stores/appearance-custom-store.ts").read_text(encoding = "utf-8")
|
|
SELECT = (SRC / "components/ui/select.tsx").read_text(encoding = "utf-8")
|
|
UTILS = (SRC / "lib/utils.ts").read_text(encoding = "utf-8")
|
|
|
|
# Raw numeric fontSize props are only allowed where a scaled stylesheet rule
|
|
# (.recharts-text) overrides the presentation attribute at render time.
|
|
FONTSIZE_PROP_ALLOWED_DIRS = (
|
|
"features/studio/sections/charts",
|
|
"features/studio/sections/training-section.tsx",
|
|
)
|
|
|
|
# Non-visible typography that intentionally stays fixed.
|
|
FONTSIZE_STYLE_ALLOWLIST = {
|
|
# Offscreen textarea; 12pt+ suppresses the iOS focus zoom. Never rendered.
|
|
"lib/copy-to-clipboard.ts",
|
|
}
|
|
|
|
|
|
def _frontend_sources():
|
|
for path in sorted(SRC.rglob("*")):
|
|
if path.suffix in {".ts", ".tsx", ".css"}:
|
|
yield path
|
|
|
|
|
|
def test_preference_writes_a_scale_not_the_root_font_size():
|
|
assert 'setVar("--ui-font-scale"' in STORE
|
|
assert 'el.setAttribute("data-ui-font-size"' in STORE
|
|
# Older builds set an inline root font-size; the applier must clear it.
|
|
assert 'style.removeProperty("font-size")' in STORE
|
|
assert "style.fontSize" not in STORE
|
|
|
|
|
|
def test_named_text_tokens_scale():
|
|
for token, rem in (
|
|
("--text-xs", "0.75rem"),
|
|
("--text-sm", "0.875rem"),
|
|
("--text-base", "1rem"),
|
|
("--text-lg", "1.125rem"),
|
|
):
|
|
assert f"{token}: calc({rem} * var(--ui-font-scale, 1));" in INDEX_CSS
|
|
|
|
|
|
def test_numeric_leading_scales_with_the_preference():
|
|
for n, rem in ((3, "0.75rem"), (5, "1.25rem"), (6, "1.5rem")):
|
|
assert f"--leading-{n}: calc({rem} * var(--ui-font-scale, 1));" in INDEX_CSS
|
|
|
|
|
|
def test_ui_token_families_exist():
|
|
assert "--text-ui-11: calc(0.6875rem * var(--ui-font-scale, 1));" in INDEX_CSS
|
|
assert "--text-ui-10p5: calc(0.65625rem * var(--ui-font-scale, 1));" in INDEX_CSS
|
|
assert "--leading-ui-17: calc(1.0625rem * var(--ui-font-scale, 1));" in INDEX_CSS
|
|
|
|
|
|
def test_explicit_code_font_size_is_never_multiplied():
|
|
match = re.search(r"html\[data-code-font-size\][^{]*\{([^}]*)\}", INDEX_CSS)
|
|
assert match is not None
|
|
body = match.group(1)
|
|
assert "var(--custom-code-font-size)" in body
|
|
assert "--ui-font-scale" not in body
|
|
|
|
|
|
def test_radix_select_viewport_owns_the_scroll_state():
|
|
viewport = SELECT[SELECT.index("SelectPrimitive.Viewport") :]
|
|
assert "overflow-y-auto" in viewport.split("</SelectPrimitive.Viewport>")[0]
|
|
# The rounded surface itself must not scroll (WebKit squares its corners).
|
|
content_cls = re.search(
|
|
r"SelectPrimitive\.Content[\s\S]*?className=\{cn\(\s*\"([^\"]+)\"", SELECT
|
|
)
|
|
assert content_cls is not None
|
|
assert "overflow-hidden" in content_cls.group(1)
|
|
assert "overflow-y-auto" not in content_cls.group(1)
|
|
|
|
|
|
def test_cn_knows_the_ui_typography_tokens():
|
|
"""Stock tailwind-merge classifies text-ui-* as a text color and deletes
|
|
it whenever a real color class follows in the same cn() call, so the
|
|
element falls back to the unscaled inherited font size."""
|
|
assert "extendTailwindMerge" in UTILS
|
|
assert '"font-size": [{ text: [isUiToken] }]' in UTILS
|
|
assert "leading: [{ leading: [isUiToken] }]" in UTILS
|
|
assert "/^ui-\\d+(p5)?$/.test(value)" in UTILS
|
|
|
|
|
|
def test_icons_follow_the_ui_font_size_itself():
|
|
"""Standard glyphs render at --ui-icon-size, which follows the UI font
|
|
size itself: matches it below the 16px default and grows at half the
|
|
change above it (setting 20 gives 18px icons), so icons track the text
|
|
when shrinking and read slightly smaller than it when growing. Sub 16px
|
|
glyphs keep their proportions through the same curve as a factor.
|
|
Sonner toast text and action labels are text, so they follow at full
|
|
rate everywhere."""
|
|
assert (
|
|
"--ui-icon-size: min(calc(1rem * var(--ui-font-scale, 1)), "
|
|
"calc(0.5rem + 0.5rem * var(--ui-font-scale, 1)));"
|
|
) in INDEX_CSS
|
|
assert "--icon-size: var(--ui-icon-size);" in INDEX_CSS
|
|
assert "& svg.size-4 { width: var(--ui-icon-size); height: var(--ui-icon-size); }" in INDEX_CSS
|
|
assert "font-size: calc(13px * var(--ui-font-scale, 1)) !important;" in INDEX_CSS
|
|
assert "font-size: calc(12px * var(--ui-font-scale, 1)) !important;" in INDEX_CSS
|
|
# Menu rules that outrank the scoped block must carry the token too,
|
|
# without flattening the smaller thinking ticks.
|
|
assert "width: var(--ui-icon-size) !important;" in INDEX_CSS
|
|
assert "svg:not(.unsloth-tick) {" in INDEX_CSS
|
|
# Oversized art glyphs stay proportional instead of uniform.
|
|
assert "& svg.size-6 { width: min(calc(1.5rem" in INDEX_CSS
|
|
for scope in (
|
|
"[data-slot='dropdown-menu-content']",
|
|
"[data-slot='select-content']",
|
|
"[data-slot='select-trigger']",
|
|
"[data-slot='combobox-content']",
|
|
"[data-sonner-toast]",
|
|
".aui-root",
|
|
):
|
|
assert scope in INDEX_CSS
|
|
|
|
|
|
def test_no_raw_pixel_text_utilities():
|
|
offenders = []
|
|
for path in _frontend_sources():
|
|
text = path.read_text(encoding = "utf-8")
|
|
for m in re.finditer(r"(?<![\w-])(?:text|leading)-\[[0-9.]+px\]", text):
|
|
offenders.append(f"{path.relative_to(SRC)}: {m.group(0)}")
|
|
assert offenders == [], (
|
|
"Raw px text utilities ignore the UI font size preference; use the "
|
|
f"text-ui-* / leading-ui-* tokens in index.css instead: {offenders[:10]}"
|
|
)
|
|
|
|
|
|
def test_css_font_sizes_reference_the_scale():
|
|
offenders = []
|
|
for path in _frontend_sources():
|
|
if path.suffix != ".css":
|
|
continue
|
|
text = path.read_text(encoding = "utf-8")
|
|
for m in re.finditer(r"(font-size|line-height):[^;{}]*;", text):
|
|
decl = m.group(0)
|
|
if re.search(r"[0-9.]+(px|rem)", decl) is None:
|
|
continue # unitless ratios and vars scale naturally
|
|
if "--ui-font-scale" in decl:
|
|
continue
|
|
if "1px" in decl:
|
|
continue # library layout tricks (KaTeX-style), not text
|
|
offenders.append(f"{path.relative_to(SRC)}: {decl.strip()[:80]}")
|
|
assert offenders == [], (
|
|
"CSS typography must multiply by var(--ui-font-scale, 1) or be "
|
|
f"allowlisted here with a reason: {offenders[:10]}"
|
|
)
|
|
|
|
|
|
def test_inline_font_size_styles_reference_the_scale():
|
|
offenders = []
|
|
for path in _frontend_sources():
|
|
rel = str(path.relative_to(SRC))
|
|
if rel in FONTSIZE_STYLE_ALLOWLIST:
|
|
continue
|
|
text = path.read_text(encoding = "utf-8")
|
|
for m in re.finditer(r"fontSize:\s*([\"'][^\"']+[\"']|[0-9.]+)", text):
|
|
value = m.group(1)
|
|
if "--ui-font-scale" in value:
|
|
continue
|
|
if value.replace(".", "").isdigit() and any(
|
|
rel.startswith(d) for d in FONTSIZE_PROP_ALLOWED_DIRS
|
|
):
|
|
continue # covered by the .recharts-text override
|
|
offenders.append(f"{rel}: fontSize {value}")
|
|
for m in re.finditer(r"fontSize=\{?([0-9.]+)\}?", text):
|
|
if not any(rel.startswith(d) for d in FONTSIZE_PROP_ALLOWED_DIRS):
|
|
offenders.append(f"{rel}: fontSize={m.group(1)}")
|
|
assert offenders == [], (
|
|
"Inline font sizes must scale with var(--ui-font-scale, 1) or be "
|
|
f"documented in the allowlist: {offenders[:10]}"
|
|
)
|