Repository navigation
feat(web): add appearance contrast control #7906
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| import { describe, expect, it, vi } from "vite-plus/test"; | ||
|
|
||
| import { applyAppearanceContrast } from "./appearanceContrast"; | ||
|
|
||
| function makeRoot() { | ||
| const setProperty = vi.fn(); | ||
| const toggleAttribute = vi.fn(); | ||
| return { | ||
| root: { style: { setProperty }, toggleAttribute } as unknown as HTMLElement, | ||
| setProperty, | ||
| toggleAttribute, | ||
| }; | ||
| } | ||
|
|
||
| describe("applyAppearanceContrast", () => { | ||
| it("boosts semantic contrast above the default", () => { | ||
| const { root, setProperty, toggleAttribute } = makeRoot(); | ||
|
|
||
| applyAppearanceContrast(root, 135); | ||
|
|
||
| expect(setProperty).toHaveBeenCalledWith("--appearance-contrast-base", "100%"); | ||
| expect(setProperty).toHaveBeenCalledWith("--appearance-contrast-boost", "35%"); | ||
| expect(toggleAttribute).toHaveBeenCalledWith("data-appearance-contrast", true); | ||
| }); | ||
|
|
||
| it("softens semantic contrast below the default", () => { | ||
| const { root, setProperty, toggleAttribute } = makeRoot(); | ||
|
|
||
| applyAppearanceContrast(root, 70); | ||
|
|
||
| expect(setProperty).toHaveBeenCalledWith("--appearance-contrast-base", "70%"); | ||
| expect(setProperty).toHaveBeenCalledWith("--appearance-contrast-boost", "0%"); | ||
| expect(toggleAttribute).toHaveBeenCalledWith("data-appearance-contrast", true); | ||
| }); | ||
|
|
||
| it("disables contrast mixing at the default", () => { | ||
| const { root, setProperty, toggleAttribute } = makeRoot(); | ||
|
|
||
| applyAppearanceContrast(root, 100); | ||
|
|
||
| expect(setProperty).toHaveBeenCalledWith("--appearance-contrast-base", "100%"); | ||
| expect(setProperty).toHaveBeenCalledWith("--appearance-contrast-boost", "0%"); | ||
| expect(toggleAttribute).toHaveBeenCalledWith("data-appearance-contrast", false); | ||
| }); | ||
| }); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| import type { AppearanceContrast } from "@t3tools/contracts/settings"; | ||
|
|
||
| export function applyAppearanceContrast(root: HTMLElement, contrast: AppearanceContrast): void { | ||
| root.style.setProperty("--appearance-contrast-base", `${Math.min(contrast, 100)}%`); | ||
| root.style.setProperty("--appearance-contrast-boost", `${Math.max(contrast - 100, 0)}%`); | ||
| root.toggleAttribute("data-appearance-contrast", contrast !== 100); | ||
|
macroscopeapp[bot] marked this conversation as resolved.
Outdated
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,13 +20,15 @@ import { | |
| DEFAULT_ENVIRONMENT_IDENTIFICATION_MODE, | ||
| DEFAULT_UNIFIED_SETTINGS, | ||
| type EnvironmentIdentificationMode, | ||
| MAX_APPEARANCE_CONTRAST, | ||
| MAX_CODE_FONT_SIZE, | ||
| MAX_GLASS_OPACITY, | ||
| MAX_INTERFACE_FONT_SIZE, | ||
| MAX_PROMPT_FONT_SIZE, | ||
| MAX_SIDEBAR_AUTO_SETTLE_AFTER_DAYS, | ||
| MAX_TERMINAL_FONT_SIZE, | ||
| MIN_CODE_FONT_SIZE, | ||
| MIN_APPEARANCE_CONTRAST, | ||
|
cursor[bot] marked this conversation as resolved.
|
||
| MIN_GLASS_OPACITY, | ||
| MIN_INTERFACE_FONT_SIZE, | ||
| MIN_PROMPT_FONT_SIZE, | ||
|
|
@@ -475,6 +477,9 @@ export function useSettingsRestore(onRestored?: () => void) { | |
| ...(theme !== "system" ? ["Theme"] : []), | ||
| ...(!followSystem ? ["Follow system"] : []), | ||
| ...(themeHalves !== null ? ["Theme mix"] : []), | ||
| ...(settings.appearanceContrast !== DEFAULT_UNIFIED_SETTINGS.appearanceContrast | ||
| ? ["Contrast"] | ||
| : []), | ||
| ...(settings.glassOpacity !== DEFAULT_UNIFIED_SETTINGS.glassOpacity ? ["Glass opacity"] : []), | ||
| ...(settings.environmentIdentificationMode !== | ||
| DEFAULT_UNIFIED_SETTINGS.environmentIdentificationMode | ||
|
|
@@ -543,6 +548,7 @@ export function useSettingsRestore(onRestored?: () => void) { | |
| settings.browserDefaultZoomFactor, | ||
| settings.browserDefaultAppearance, | ||
| settings.browserAutoShowFloatingPreview, | ||
| settings.appearanceContrast, | ||
| settings.enableAgentBrowserAccess, | ||
| settings.confirmQuit, | ||
| settings.confirmThreadArchive, | ||
|
|
@@ -638,6 +644,7 @@ export function useSettingsRestore(onRestored?: () => void) { | |
| return; | ||
| } | ||
| updateSettings({ | ||
| appearanceContrast: DEFAULT_UNIFIED_SETTINGS.appearanceContrast, | ||
| timestampFormat: DEFAULT_UNIFIED_SETTINGS.timestampFormat, | ||
| wordWrap: DEFAULT_UNIFIED_SETTINGS.wordWrap, | ||
| diffIgnoreWhitespace: DEFAULT_UNIFIED_SETTINGS.diffIgnoreWhitespace, | ||
|
|
@@ -986,6 +993,13 @@ export function AppearanceSettingsPanel() { | |
| "--settings-slider-progress": `${glassOpacityRatio * 100}%`, | ||
| "--settings-slider-fill-offset": `${0.5 - glassOpacityRatio}rem`, | ||
| } as CSSProperties; | ||
| const appearanceContrastRatio = | ||
| (settings.appearanceContrast - MIN_APPEARANCE_CONTRAST) / | ||
| (MAX_APPEARANCE_CONTRAST - MIN_APPEARANCE_CONTRAST); | ||
| const appearanceContrastSliderStyle = { | ||
| "--settings-slider-progress": `${appearanceContrastRatio * 100}%`, | ||
| "--settings-slider-fill-offset": `${0.5 - appearanceContrastRatio}rem`, | ||
| } as CSSProperties; | ||
|
Comment on lines
+996
to
+1002
Contributor
There was a problem hiding this comment. This is now the third call site (glass opacity, volume, contrast) duplicating the same slider treatment: the ratio math, the Posted via Macroscope — UI Consistency
Contributor
Author
There was a problem hiding this comment. i checked the current tree and there are two settings-slider call sites: glass opacity and contrast. i kept the established local pattern rather than adding a shared api with only two owners. happy to extract it once a third live owner appears. |
||
|
|
||
| return ( | ||
| <SettingsPageContainer> | ||
|
|
@@ -1006,6 +1020,54 @@ export function AppearanceSettingsPanel() { | |
| /> | ||
| </div> | ||
|
|
||
| <SettingsRow | ||
| {...searchableSetting("setting-appearance-contrast")} | ||
| description="Adjust the contrast of colors and borders across the interface." | ||
| resetAction={ | ||
| settings.appearanceContrast !== DEFAULT_UNIFIED_SETTINGS.appearanceContrast ? ( | ||
| <SettingResetButton | ||
| label="contrast" | ||
| onClick={() => | ||
| updateSettings({ | ||
| appearanceContrast: DEFAULT_UNIFIED_SETTINGS.appearanceContrast, | ||
| }) | ||
| } | ||
| /> | ||
| ) : null | ||
| } | ||
| control={ | ||
| <div className="flex w-full items-center gap-3 sm:w-52"> | ||
| <output | ||
| className="min-w-12 rounded-md bg-muted px-2 py-1 text-center font-mono text-xs font-medium tabular-nums text-foreground" | ||
| htmlFor="appearance-contrast" | ||
| > | ||
| {settings.appearanceContrast}% | ||
| </output> | ||
| <input | ||
| aria-label="Contrast" | ||
| className="settings-slider min-w-0 flex-1" | ||
| id="appearance-contrast" | ||
| max={MAX_APPEARANCE_CONTRAST} | ||
| min={MIN_APPEARANCE_CONTRAST} | ||
| onChange={(event) => { | ||
| const appearanceContrast = Number(event.currentTarget.value); | ||
| if ( | ||
| Number.isInteger(appearanceContrast) && | ||
| appearanceContrast >= MIN_APPEARANCE_CONTRAST && | ||
| appearanceContrast <= MAX_APPEARANCE_CONTRAST | ||
| ) { | ||
| updateSettings({ appearanceContrast }); | ||
| } | ||
| }} | ||
| step={5} | ||
| style={appearanceContrastSliderStyle} | ||
| type="range" | ||
| value={settings.appearanceContrast} | ||
| /> | ||
| </div> | ||
| } | ||
| /> | ||
|
|
||
| <SettingsRow | ||
| {...searchableSetting("setting-glass-opacity")} | ||
| description="Control how transparent glass surfaces are. Higher values make menus, dialogs, and the composer more solid." | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.