Skip to content

Commit 4ce9205

Browse files
only21milcodex
andauthored
fix(web): support Home and End on hue sliders (#23465)
Co-authored-by: GPT-6.1 Sol <[email protected]>
1 parent 8bbe5aa commit 4ce9205

2 files changed

Lines changed: 28 additions & 1 deletion

File tree

‎apps/web/src/components/settings/colorPickers.browser.test.tsx‎

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { describe, expect, it, vi } from "vite-plus/test";
22
import { userEvent } from "vite-plus/test/browser";
33

4-
import type { ReactNode } from "react";
4+
import { useState, type ReactNode } from "react";
55

66
import { act, render } from "../../../test/render";
77
import { ProviderAccentColorPicker } from "./ProviderAccentColorPicker";
@@ -69,7 +69,29 @@ async function renderThemeField(value: string) {
6969
});
7070
}
7171

72+
function ControlledThemeField() {
73+
const [value, setValue] = useState("#408080");
74+
return <ThemeColorField role="accent" value={value} onChange={(_, next) => setValue(next)} />;
75+
}
76+
7277
describe("theme color field", () => {
78+
it("jumps hue to both endpoints without changing saturation or brightness", async () => {
79+
await using _screen = await render(<ControlledThemeField />);
80+
await open("Choose Accent color color");
81+
82+
await press(HUE, "Home");
83+
expect(slider(HUE).getAttribute("aria-valuenow")).toBe("0");
84+
expect(byLabel<HTMLInputElement>("Accent color picker hex value").value).toBe("#804040");
85+
86+
await press(HUE, "End");
87+
expect(slider(HUE).getAttribute("aria-valuenow")).toBe("360");
88+
expect(byLabel<HTMLInputElement>("Accent color picker hex value").value).toBe("#804040");
89+
90+
await press(HUE, "ArrowRight", true);
91+
expect(slider(HUE).getAttribute("aria-valuenow")).toBe("10");
92+
expect(byLabel<HTMLInputElement>("Accent color picker hex value").value).toBe("#804b40");
93+
});
94+
7395
it("keeps the selected hue when a grey color is echoed back from theme settings", async () => {
7496
await using screen = await renderThemeField("#ff0000");
7597
const { onChange, echo } = screen;

‎apps/web/src/components/ui/color-picker.tsx‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ export function ColorHueSlider({
182182
}, onInteractionEnd);
183183

184184
const handleKeyDown = (event: KeyboardEvent<HTMLDivElement>) => {
185+
if (event.key === "Home" || event.key === "End") {
186+
event.preventDefault();
187+
onChange(event.key === "Home" ? 0 : 360);
188+
return;
189+
}
185190
if (!["ArrowDown", "ArrowLeft", "ArrowRight", "ArrowUp"].includes(event.key)) return;
186191
event.preventDefault();
187192
const step = event.shiftKey ? 10 : 1;

0 commit comments

Comments
 (0)