Skip to content

Commit 871bb98

Browse files
zoomote[bot]roomoteedelauna
authored
[Fix] Chat controls fade into light IDE themes (#1298)
* fix(webview): adapt chat controls to IDE themes * test(webview): cover theme-aware control states * test(webview): add visual regression screenshots for theme-aware chat controls --------- Co-authored-by: Roomote <[email protected]> Co-authored-by: Elliott de Launay <[email protected]>
1 parent 21d35c4 commit 871bb98

17 files changed

Lines changed: 252 additions & 80 deletions

‎webview-ui/playwright/vscode-theme-light.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
--vscode-list-activeSelectionBackground: #0060c0;
2323
--vscode-list-activeSelectionForeground: #ffffff;
2424
--vscode-toolbar-hoverBackground: #e8e8e8;
25+
--vscode-panel-border: #cecece;
2526
--vscode-widget-border: #d4d4d4;
2627
--vscode-widget-shadow: #00000029;
2728
--vscode-menu-foreground: #3b3b3b;

‎webview-ui/src/components/chat/ApiConfigSelector.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { useState, useMemo, useCallback } from "react"
22
import { Fzf } from "fzf"
33

44
import { cn } from "@/lib/utils"
5+
import { enabledSelectorTriggerClassName, selectorTriggerClassName } from "@/components/ui/selectorTriggerStyles"
56
import { useRooPortal } from "@/components/ui/hooks/useRooPortal"
67
import { Popover, PopoverContent, PopoverTrigger, StandardTooltip } from "@/components/ui"
78
import { useAppTranslation } from "@/i18n/TranslationContext"
@@ -153,11 +154,8 @@ export const ApiConfigSelector = ({
153154
data-testid="dropdown-trigger"
154155
className={cn(
155156
"min-w-0 inline-flex items-center relative whitespace-nowrap px-1.5 py-1 text-xs",
156-
"bg-transparent border border-[rgba(255,255,255,0.08)] rounded-md text-vscode-foreground",
157-
"transition-all duration-150 focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder focus-visible:ring-inset",
158-
disabled
159-
? "opacity-50 cursor-not-allowed"
160-
: "opacity-90 hover:opacity-100 hover:bg-[rgba(255,255,255,0.03)] hover:border-[rgba(255,255,255,0.15)] cursor-pointer",
157+
selectorTriggerClassName,
158+
disabled ? "opacity-50 cursor-not-allowed" : enabledSelectorTriggerClassName,
161159
triggerClassName,
162160
)}>
163161
<span className="truncate">{displayName}</span>

‎webview-ui/src/components/chat/AutoApproveDropdown.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { ListChecks, LayoutList, Settings, CheckCheck, X } from "lucide-react"
44
import { vscode } from "@/utils/vscode"
55

66
import { cn } from "@/lib/utils"
7+
import { enabledSelectorTriggerClassName, selectorTriggerClassName } from "@/components/ui/selectorTriggerStyles"
78

89
import { useExtensionState } from "@/context/ExtensionStateContext"
910

@@ -152,12 +153,9 @@ export const AutoApproveDropdown = ({ disabled = false, triggerClassName = "" }:
152153
data-testid="auto-approve-dropdown-trigger"
153154
className={cn(
154155
"inline-flex items-center gap-1.5 relative whitespace-nowrap px-1.5 py-1 text-xs",
155-
"bg-transparent border border-[rgba(255,255,255,0.08)] rounded-md text-vscode-foreground",
156-
"transition-all duration-150 focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder focus-visible:ring-inset",
156+
selectorTriggerClassName,
157157
"max-[300px]:shrink-0",
158-
disabled
159-
? "opacity-50 cursor-not-allowed"
160-
: "opacity-90 hover:opacity-100 hover:bg-[rgba(255,255,255,0.03)] hover:border-[rgba(255,255,255,0.15)] cursor-pointer",
158+
disabled ? "opacity-50 cursor-not-allowed" : enabledSelectorTriggerClassName,
161159
triggerClassName,
162160
)}>
163161
{!effectiveAutoApprovalEnabled ? (

‎webview-ui/src/components/chat/ModeSelector.tsx‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { type Mode, getAllModes, defaultModeSlug } from "@roo/modes"
99
import { vscode } from "@/utils/vscode"
1010
import { telemetryClient } from "@/utils/TelemetryClient"
1111
import { cn } from "@/lib/utils"
12+
import { enabledSelectorTriggerClassName, selectorTriggerClassName } from "@/components/ui/selectorTriggerStyles"
1213
import { useExtensionState } from "@/context/ExtensionStateContext"
1314
import { useAppTranslation } from "@/i18n/TranslationContext"
1415
import { useRooPortal } from "@/components/ui/hooks/useRooPortal"
@@ -223,11 +224,8 @@ export const ModeSelector = ({
223224
data-testid="mode-selector-trigger"
224225
className={cn(
225226
"inline-flex items-center relative whitespace-nowrap px-1.5 py-1 text-xs",
226-
"bg-transparent border border-[rgba(255,255,255,0.08)] rounded-md text-vscode-foreground",
227-
"transition-all duration-150 focus:outline-none focus-visible:ring-1 focus-visible:ring-vscode-focusBorder focus-visible:ring-inset",
228-
disabled
229-
? "opacity-50 cursor-not-allowed"
230-
: "opacity-90 hover:opacity-100 hover:bg-[rgba(255,255,255,0.03)] hover:border-[rgba(255,255,255,0.15)] cursor-pointer",
227+
selectorTriggerClassName,
228+
disabled ? "opacity-50 cursor-not-allowed" : enabledSelectorTriggerClassName,
231229
triggerClassName,
232230
!disabled && !hasOpenedModeSelector
233231
? "bg-primary opacity-90 hover:bg-primary-hover text-vscode-button-foreground"

‎webview-ui/src/components/chat/UpdateTodoListToolBlock.tsx‎

Lines changed: 27 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
import React, { useState, useEffect, useRef } from "react"
22
import { ToolUseBlock, ToolUseBlockHeader } from "../common/ToolUseBlock"
33
import MarkdownBlock from "../common/MarkdownBlock"
4+
import {
5+
AlertDialog,
6+
AlertDialogAction,
7+
AlertDialogCancel,
8+
AlertDialogContent,
9+
AlertDialogDescription,
10+
AlertDialogFooter,
11+
AlertDialogTitle,
12+
} from "@/components/ui"
413

514
interface TodoItem {
615
id?: string
@@ -430,67 +439,25 @@ const UpdateTodoListToolBlock: React.FC<UpdateTodoListToolBlockProps> = ({
430439
<MarkdownBlock markdown={content} />
431440
)}
432441
</div>
433-
{/* Delete confirmation dialog */}
434-
{deleteId && (
435-
<div
436-
style={{
437-
position: "fixed",
438-
left: 0,
439-
top: 0,
440-
right: 0,
441-
bottom: 0,
442-
background: "rgba(0,0,0,0.15)",
443-
zIndex: 9999,
444-
display: "flex",
445-
alignItems: "center",
446-
justifyContent: "center",
447-
}}
448-
onClick={cancelDelete}>
449-
<div
450-
style={{
451-
background: "#fff",
452-
borderRadius: 8,
453-
boxShadow: "0 2px 16px rgba(0,0,0,0.15)",
454-
padding: "16px 20px",
455-
minWidth: 200,
456-
zIndex: 10000,
457-
}}
458-
onClick={(e) => e.stopPropagation()}>
459-
<div style={{ marginBottom: 12, fontSize: 14, color: "#333" }}>
460-
Are you sure you want to delete this todo item?
461-
</div>
462-
<div style={{ display: "flex", justifyContent: "flex-end", gap: 8 }}>
463-
<button
464-
onClick={cancelDelete}
465-
style={{
466-
border: "1px solid #bbb",
467-
background: "transparent",
468-
color: "#888",
469-
borderRadius: 4,
470-
padding: "2px 10px",
471-
cursor: "pointer",
472-
fontSize: 12,
473-
}}>
474-
Cancel
475-
</button>
476-
<button
477-
onClick={confirmDelete}
478-
style={{
479-
border: "1px solid #f14c4c",
480-
background: "#f14c4c",
481-
color: "#fff",
482-
borderRadius: 4,
483-
padding: "2px 10px",
484-
cursor: "pointer",
485-
fontSize: 12,
486-
}}>
487-
Delete
488-
</button>
489-
</div>
490-
</div>
491-
</div>
492-
)}
493442
</ToolUseBlock>
443+
<AlertDialog open={deleteId !== null} onOpenChange={cancelDelete}>
444+
<AlertDialogContent className="max-w-xs">
445+
<AlertDialogTitle className="sr-only">Delete todo item</AlertDialogTitle>
446+
<AlertDialogDescription>Are you sure you want to delete this todo item?</AlertDialogDescription>
447+
<AlertDialogFooter>
448+
<AlertDialogCancel
449+
onClick={cancelDelete}
450+
className="bg-transparent text-vscode-foreground border-vscode-dropdown-border hover:bg-vscode-toolbar-hoverBackground">
451+
Cancel
452+
</AlertDialogCancel>
453+
<AlertDialogAction
454+
onClick={confirmDelete}
455+
className="bg-transparent text-vscode-errorForeground border-vscode-errorForeground hover:bg-vscode-toolbar-hoverBackground">
456+
Delete
457+
</AlertDialogAction>
458+
</AlertDialogFooter>
459+
</AlertDialogContent>
460+
</AlertDialog>
494461
</>
495462
)
496463
}
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
import { render, screen } from "@/utils/test-utils"
2+
import { describe, expect, test, vi } from "vitest"
3+
4+
import { AutoApproveDropdown } from "../AutoApproveDropdown"
5+
6+
vi.mock("@/utils/vscode", () => ({ vscode: { postMessage: vi.fn() } }))
7+
8+
vi.mock("@/context/ExtensionStateContext", () => ({
9+
useExtensionState: () => ({
10+
autoApprovalEnabled: false,
11+
setAutoApprovalEnabled: vi.fn(),
12+
setAlwaysAllowReadOnly: vi.fn(),
13+
setAlwaysAllowWrite: vi.fn(),
14+
setAlwaysAllowExecute: vi.fn(),
15+
setAlwaysAllowMcp: vi.fn(),
16+
setAlwaysAllowModeSwitch: vi.fn(),
17+
setAlwaysAllowSubtasks: vi.fn(),
18+
setAlwaysAllowFollowupQuestions: vi.fn(),
19+
}),
20+
}))
21+
22+
vi.mock("@/i18n/TranslationContext", () => ({
23+
useAppTranslation: () => ({ t: (key: string) => key }),
24+
}))
25+
26+
vi.mock("@/hooks/useAutoApprovalToggles", () => ({
27+
useAutoApprovalToggles: () => ({
28+
alwaysAllowReadOnly: false,
29+
alwaysAllowWrite: false,
30+
alwaysAllowExecute: false,
31+
alwaysAllowMcp: false,
32+
alwaysAllowModeSwitch: false,
33+
alwaysAllowSubtasks: false,
34+
alwaysAllowFollowupQuestions: false,
35+
}),
36+
}))
37+
38+
vi.mock("@/hooks/useAutoApprovalState", () => ({
39+
useAutoApprovalState: () => ({ effectiveAutoApprovalEnabled: false }),
40+
}))
41+
42+
vi.mock("@/components/ui/hooks/useRooPortal", () => ({
43+
useRooPortal: () => document.body,
44+
}))
45+
46+
describe("AutoApproveDropdown", () => {
47+
test("enables the trigger by default", () => {
48+
render(<AutoApproveDropdown />)
49+
50+
expect(screen.getByTestId("auto-approve-dropdown-trigger")).toBeEnabled()
51+
})
52+
53+
test("disables the trigger when auto-approval controls are unavailable", () => {
54+
render(<AutoApproveDropdown disabled />)
55+
56+
expect(screen.getByTestId("auto-approve-dropdown-trigger")).toBeDisabled()
57+
})
58+
})

‎webview-ui/src/components/chat/__tests__/ModeSelector.spec.tsx‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,20 @@ describe("ModeSelector", () => {
7676
expect(screen.getByTestId("mode-selector-trigger")).toBeInTheDocument()
7777
})
7878

79+
test("disables the trigger when mode selection is unavailable", () => {
80+
render(
81+
<ModeSelector
82+
title="Mode Selector"
83+
value={"code" as Mode}
84+
onChange={vi.fn()}
85+
modeShortcutText="Ctrl+M"
86+
disabled
87+
/>,
88+
)
89+
90+
expect(screen.getByTestId("mode-selector-trigger")).toBeDisabled()
91+
})
92+
7993
test("shows search bar when there are more than 6 modes", () => {
8094
mockModes = Array.from({ length: 7 }, (_, i) => ({
8195
slug: `mode-${i}`,
Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
import React from "react"
2+
3+
import { expect, test } from "../../../../playwright/coverage-fixture"
4+
import UpdateTodoListToolBlock from "../UpdateTodoListToolBlock"
5+
import { SelectDropdown } from "@/components/ui/select-dropdown"
6+
7+
const themes = [
8+
{
9+
name: "dark",
10+
bodyClass: "vscode-dark",
11+
themeId: "Default Dark Modern",
12+
expected: {
13+
background: "rgb(30, 30, 30)",
14+
description: "rgb(157, 157, 157)",
15+
dropdownBorder: "rgb(60, 60, 60)",
16+
hoverBackground: "rgb(42, 45, 46)",
17+
focusBorder: "rgb(0, 127, 212)",
18+
error: "rgb(244, 135, 113)",
19+
panelBorder: "rgb(43, 43, 43)",
20+
},
21+
},
22+
{
23+
name: "light",
24+
bodyClass: "vscode-light",
25+
themeId: "Default Light Modern",
26+
expected: {
27+
background: "rgb(255, 255, 255)",
28+
description: "rgb(113, 113, 113)",
29+
dropdownBorder: "rgb(206, 206, 206)",
30+
hoverBackground: "rgb(232, 232, 232)",
31+
focusBorder: "rgb(0, 144, 241)",
32+
error: "rgb(161, 38, 13)",
33+
panelBorder: "rgb(206, 206, 206)",
34+
},
35+
},
36+
] as const
37+
38+
for (const theme of themes) {
39+
test(`renders selectors and confirmation dialogs in the VS Code ${theme.name} theme`, async ({ mount, page }) => {
40+
await page.evaluate(({ bodyClass, themeId }) => {
41+
document.documentElement.className = bodyClass
42+
document.body.className = bodyClass
43+
document.body.dataset.vscodeThemeId = themeId
44+
}, theme)
45+
46+
const component = await mount(
47+
<div className="flex flex-col gap-4 w-96">
48+
<SelectDropdown value="code" options={[{ value: "code", label: "Code" }]} onChange={() => undefined} />
49+
<UpdateTodoListToolBlock
50+
todos={[{ id: "todo-1", content: "Ship the follow-up", status: "in_progress" }]}
51+
onChange={() => undefined}
52+
/>
53+
</div>,
54+
)
55+
56+
await component.evaluate(async () => {
57+
await document.fonts.ready
58+
await new Promise<void>((resolve) => requestAnimationFrame(() => resolve()))
59+
})
60+
61+
await expect(component).toHaveScreenshot(`chat-controls-resting-${theme.name}.png`)
62+
63+
const trigger = component.getByTestId("dropdown-trigger")
64+
await expect(trigger).toHaveCSS("border-color", theme.expected.dropdownBorder)
65+
await trigger.hover()
66+
await expect(trigger).toHaveCSS("background-color", theme.expected.hoverBackground)
67+
await expect(trigger).toHaveCSS("border-color", theme.expected.focusBorder)
68+
await page.keyboard.press("Tab")
69+
await expect(trigger).toBeFocused()
70+
await expect
71+
.poll(() => trigger.evaluate((element) => getComputedStyle(element).boxShadow))
72+
.toContain(theme.expected.focusBorder)
73+
74+
await expect(component).toHaveScreenshot(`chat-controls-focus-${theme.name}.png`)
75+
76+
await component.getByRole("button", { name: "Edit" }).click()
77+
await component.getByTitle("Remove").click()
78+
const dialog = page.getByRole("alertdialog")
79+
await expect(dialog).toBeVisible()
80+
await expect(dialog).toHaveCSS("background-color", theme.expected.background)
81+
await expect(dialog).toHaveCSS("border-color", theme.expected.panelBorder)
82+
await expect(page.getByText("Are you sure you want to delete this todo item?")).toHaveCSS(
83+
"color",
84+
theme.expected.description,
85+
)
86+
await expect(page.getByRole("button", { name: "Delete" })).toHaveCSS("color", theme.expected.error)
87+
88+
await expect(dialog).toHaveScreenshot(`chat-controls-delete-dialog-${theme.name}.png`)
89+
})
90+
}
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import { fireEvent, render, screen, waitFor } from "@testing-library/react"
2+
import { beforeEach, describe, expect, it, vi } from "vitest"
3+
4+
import UpdateTodoListToolBlock from "../UpdateTodoListToolBlock"
5+
6+
describe("UpdateTodoListToolBlock", () => {
7+
const onChange = vi.fn()
8+
9+
beforeEach(() => {
10+
vi.clearAllMocks()
11+
})
12+
13+
function renderEditableList() {
14+
return render(
15+
<UpdateTodoListToolBlock
16+
todos={[{ id: "todo-1", content: "Ship the follow-up", status: "in_progress" }]}
17+
onChange={onChange}
18+
/>,
19+
)
20+
}
21+
22+
it("cancels deletion without changing the todo list", async () => {
23+
renderEditableList()
24+
fireEvent.click(screen.getByRole("button", { name: "Edit" }))
25+
fireEvent.click(screen.getByTitle("Remove"))
26+
27+
expect(screen.getByRole("alertdialog")).toBeInTheDocument()
28+
expect(screen.getByText("Are you sure you want to delete this todo item?")).toBeInTheDocument()
29+
fireEvent.click(screen.getByRole("button", { name: "Cancel" }))
30+
31+
await waitFor(() => expect(screen.queryByRole("alertdialog")).not.toBeInTheDocument())
32+
expect(onChange).not.toHaveBeenCalled()
33+
})
34+
35+
it("deletes the selected todo after confirmation", async () => {
36+
renderEditableList()
37+
fireEvent.click(screen.getByRole("button", { name: "Edit" }))
38+
fireEvent.click(screen.getByTitle("Remove"))
39+
fireEvent.click(screen.getByRole("button", { name: "Delete" }))
40+
41+
await waitFor(() => expect(screen.queryByRole("alertdialog")).not.toBeInTheDocument())
42+
expect(onChange).toHaveBeenCalledWith([])
43+
})
44+
})
4.83 KB
Loading

0 commit comments

Comments
 (0)