From 56625a3e1f8ab68487dee4e723270876d6e840fc Mon Sep 17 00:00:00 2001 From: Aarav Sareen <96787824+arvsrn@users.noreply.github.com> Date: Mon, 16 Nov 2026 18:42:40 +0530 Subject: [PATCH] fix(app): unify dialog styles (#64216) --- .../e2e/regression/command-palette.spec.ts | 2 +- .../app/e2e/regression/new-session.spec.ts | 34 ++++++--- .../app/src/new-session/location/dialog.css | 58 ++++++++++----- .../app/src/new-session/location/dialog.tsx | 17 ++++- .../app/src/new-session/location/machine.ts | 6 +- packages/app/src/providers/connect/dialog.tsx | 1 + .../src/providers/models/select-dialog.css | 10 +-- packages/app/src/runtime/i18n/en.ts | 1 + packages/app/src/servers/connect/dialog.tsx | 2 + packages/app/src/servers/connect/method.tsx | 5 +- .../app/src/shell/commands/command-search.tsx | 1 + packages/app/src/shell/commands/dialog.css | 53 +++++++++++--- packages/app/src/shell/commands/dialog.tsx | 9 ++- .../app/src/shell/commands/session-search.tsx | 1 + packages/app/src/shell/search-list.css | 30 +++----- packages/app/src/usage/dialog.tsx | 73 +++++++++++-------- packages/gui-plugins/src/wsl/dialog.css | 1 - packages/ui/src/overlays/dialog/dialog.css | 3 +- 18 files changed, 204 insertions(+), 103 deletions(-) diff --git a/packages/app/e2e/regression/command-palette.spec.ts b/packages/app/e2e/regression/command-palette.spec.ts index ccaa605a2e5..610a7e38404 100644 --- a/packages/app/e2e/regression/command-palette.spec.ts +++ b/packages/app/e2e/regression/command-palette.spec.ts @@ -120,7 +120,7 @@ test("titlebar search lists recent sessions and opens the typed match", async ({ const input = dialog.getByRole("combobox") await expect(input).toBeFocused() await expect(input).toHaveAttribute("placeholder", "Search sessions") - await expect(dialog.getByText("Recent sessions", { exact: true })).toBeVisible() + await expect(dialog.getByText("Recent sessions", { exact: true })).toBeHidden() await expect(dialog.getByRole("option", { name: /Palette fixture session/ })).toHaveAttribute("aria-selected", "true") // Session search lists sessions only, never commands. await input.fill("settings") diff --git a/packages/app/e2e/regression/new-session.spec.ts b/packages/app/e2e/regression/new-session.spec.ts index 648c561d5e6..0066e107db0 100644 --- a/packages/app/e2e/regression/new-session.spec.ts +++ b/packages/app/e2e/regression/new-session.spec.ts @@ -1133,7 +1133,10 @@ test("the location dialog separates added projects from server projects and tags const rows = options.filter({ has: page.locator(".new-session-location-name") }) const names = options.locator(".new-session-location-name") const paths = options.locator(".command-palette-description") - const back = dialog.getByRole("button", { name: "Back to projects", exact: true }) + const back = dialog.locator(".new-session-location-back") + const arrow = dialog.locator(".new-session-location-search-back") + const leading = dialog.locator("[data-slot='text-input-v2-leading-icon']") + const input = dialog.locator("[data-slot='text-input-v2-input']") // Only the projects added to this client open expanded; other ready-server projects remain discoverable. await expect(names).toHaveText(["opencodeapollo", "opencode"]) await expect(paths).toHaveText(["/home/dax/opencode", "C:/work/opencode"]) @@ -1150,8 +1153,8 @@ test("the location dialog separates added projects from server projects and tags // It opens on the first row, not on the draft's current project (the second row). await expect(options.nth(0)).toHaveAttribute("aria-selected", "true") - // The picker shares the palette's full-width search, compact rows, and single-line titles. - await expect(options.nth(0)).toHaveCSS("height", "28px") + // The picker shares the palette's full-width search, 32px rows, and single-line titles. + await expect(options.nth(0)).toHaveCSS("height", "32px") await expect(dialog.locator(".palette-menu-search [data-component='text-input-v2']")).toHaveCSS("height", "28px") await expect(dialog.locator(".new-session-location-hints")).toHaveCount(0) await expect(dialog.locator("..")).toHaveCSS("width", "720px") @@ -1174,12 +1177,23 @@ test("the location dialog separates added projects from server projects and tags }) .toBeLessThanOrEqual(1) + await expect(arrow).toHaveCount(0) + const leadingBox = await leading.boundingBox() + const inputBox = await input.boundingBox() + await others.click() + await expect(names).toHaveText(["console", "sstapollo"]) + await expect(back).toHaveCount(0) + await expect(arrow).toBeVisible() + await expect(search).toHaveAttribute("placeholder", "Search other projects") + expect(await leading.boundingBox()).toEqual(leadingBox) + expect(await input.boundingBox()).toEqual(inputBox) + await arrow.click() + await expect(names).toHaveText(["opencodeapollo", "opencode"]) + await expect(search).toBeFocused() await others.click() await expect(names).toHaveText(["console", "sstapollo"]) - await expect(back).toHaveText("Other projects") await search.fill("no-project-matches") await expect(options).toHaveCount(0) - await expect(back).toBeVisible() await search.fill("") await expect(names).toHaveText(["console", "sstapollo"]) await search.press("ArrowLeft") @@ -1191,9 +1205,6 @@ test("the location dialog separates added projects from server projects and tags await expect(names).toHaveText(["console", "sstapollo"]) await search.press("Escape") await expect(names).toHaveText(["opencodeapollo", "opencode"]) - await others.click() - await back.click() - await expect(names).toHaveText(["opencodeapollo", "opencode"]) await search.fill("apollo") await expect(names).toHaveText(["opencodeapollo", "sstapollo"]) @@ -1225,7 +1236,8 @@ test("the location dialog separates added projects from server projects and tags const open = (await page.evaluate(() => navigator.platform.includes("Mac"))) ? "Meta+o" : "Control+o" await search.fill("open") await page.keyboard.press(open) - await expect(back).toHaveText("Servers") + await expect(back).toHaveCount(0) + await expect(search).toHaveAttribute("placeholder", "Search servers") await expect(search).toHaveValue("") await page.keyboard.press("Escape") await expect(back).toHaveText("Run session in") @@ -1249,10 +1261,10 @@ test("the location dialog separates added projects from server projects and tags await page.keyboard.press("ArrowUp") await expect(options.nth(3)).toHaveAttribute("aria-selected", "true") await page.keyboard.press(open) - await expect(back).toHaveText("Servers") + await expect(back).toHaveCount(0) // The server the app runs beside shows its hostname and "This computer" instead of its address. await expect(options).toHaveText(["hailmaryThis computer", "apollo"]) - await back.click() + await search.press("Escape") await options.filter({ hasText: "Add project" }).click() await expect(options).toHaveText(["hailmaryThis computer", "apollo"]) await options.filter({ hasText: "apollo" }).click() diff --git a/packages/app/src/new-session/location/dialog.css b/packages/app/src/new-session/location/dialog.css index e018c32f6a2..503193bc911 100644 --- a/packages/app/src/new-session/location/dialog.css +++ b/packages/app/src/new-session/location/dialog.css @@ -16,24 +16,36 @@ padding-inline-start: 6px; } +/* The negative margin cancels the padding, so the button takes the icon's space. */ +.new-session-location-search-back { + display: flex; + align-items: center; + justify-content: center; + margin: -4px; + padding: 4px; + border: 0; + border-radius: 4px; + background: transparent; + color: inherit; + cursor: default; + + &:is(:hover, :focus-visible) { + background: var(--v2-overlay-simple-overlay-hover); + outline: none; + } +} + .new-session-location .palette-menu-search [data-slot="text-input-v2-input"]::placeholder { color: var(--v2-text-text-base); opacity: 0.5; } .new-session-location-divider { - position: relative; - height: 9px; + height: 1px; flex-shrink: 0; - margin-block: 4px; -} - -.new-session-location-divider::after { - position: absolute; - inset-inline: 0; - top: 4px; - border-top: 0.5px solid var(--v2-border-border-base); - content: ""; + margin-block: 6px 2px; + background: var(--v2-border-border-base); + transform: scaleY(0.5); } .new-session-location .command-palette-results { @@ -42,7 +54,11 @@ } .new-session-location .command-palette-group { - gap: 4px; + gap: 2px; +} + +.new-session-location .command-palette-group:not(:has(> .command-palette-group-title:first-child)) { + padding-top: 4px; } .new-session-location-action-divider { @@ -50,19 +66,20 @@ flex-shrink: 0; margin-block: 2px; margin-inline: -6px; - background: var(--v2-border-border-muted); + background: var(--v2-border-border-base); transform: scaleY(0.5); } .new-session-location .command-palette-group-title { display: flex; - height: 28px; flex-shrink: 0; align-items: center; margin: 0; - padding: 0 6px; - color: var(--v2-text-text-muted); - line-height: var(--line-height-compact); + padding: 10px 8px 2px; + color: var(--v2-text-text-faint); + font-size: 12px; + line-height: 18px; + letter-spacing: 0.05px; } .new-session-location-back { @@ -81,7 +98,12 @@ } .new-session-location .palette-menu-row[data-size="compact"] { - padding-inline: 6px; + height: 32px; + padding-inline: 8px 6px; +} + +.new-session-location .palette-menu-title { + font-weight: 440; } .new-session-location .palette-menu-row:is([data-active], :focus-visible) { diff --git a/packages/app/src/new-session/location/dialog.tsx b/packages/app/src/new-session/location/dialog.tsx index 6429c687f5c..cc2f2531bbf 100644 --- a/packages/app/src/new-session/location/dialog.tsx +++ b/packages/app/src/new-session/location/dialog.tsx @@ -12,6 +12,7 @@ import { ProjectAvatar, } from "@opencode/ui/project-avatar" import { TextInput } from "@opencode/ui/text-input" +import { Tooltip } from "@opencode/ui/tooltip" import { createTypeahead } from "@opencode/ui/typeahead" import { createEventListener } from "@solid-primitives/event-listener" import { getFilename } from "@opencode/util/path" @@ -494,7 +495,21 @@ function NewSessionLocationDialog(props: { appearance="large" aria-label={placeholder()} placeholder={placeholder()} - leadingIcon={} + leadingIcon={ + }> + + + + + } role="combobox" aria-expanded="true" aria-busy={step().type === "branches" && selectBranchBusy(picker()) ? "true" : undefined} diff --git a/packages/app/src/new-session/location/machine.ts b/packages/app/src/new-session/location/machine.ts index fad19558eb2..12812c6beb9 100644 --- a/packages/app/src/new-session/location/machine.ts +++ b/packages/app/src/new-session/location/machine.ts @@ -289,15 +289,15 @@ export function locationDialogView(state: LocationDialogState) { case "others": return { drilled: undefined, - titleKey: "session.new.location.otherProjects", - placeholderKey: "session.new.project.search", + titleKey: undefined, + placeholderKey: "session.new.project.other.search", ownsEscape: true, otherGroupHeader: false, } as const case "servers": return { drilled: undefined, - titleKey: "session.new.location.servers", + titleKey: undefined, placeholderKey: "session.new.location.servers.search", ownsEscape: true, otherGroupHeader: false, diff --git a/packages/app/src/providers/connect/dialog.tsx b/packages/app/src/providers/connect/dialog.tsx index d5df5cb546d..658ca2938a5 100644 --- a/packages/app/src/providers/connect/dialog.tsx +++ b/packages/app/src/providers/connect/dialog.tsx @@ -110,6 +110,7 @@ export const DialogConnectProvider: Component<{ size="normal" fit anchored + containerClass="!bg-v2-background-bg-base" preventBackdropDismiss={view().preventBackdropDismiss} onCloseAutoFocus={(event) => { if (view().completed && props.selection && props.onDone) { diff --git a/packages/app/src/providers/models/select-dialog.css b/packages/app/src/providers/models/select-dialog.css index 97c681c6d16..723003f41a2 100644 --- a/packages/app/src/providers/models/select-dialog.css +++ b/packages/app/src/providers/models/select-dialog.css @@ -53,7 +53,7 @@ &::after { height: 1px; margin-inline: -6px; - background: var(--v2-border-border-muted); + background: var(--v2-border-border-base); content: ""; transform: scaleY(0.5); } @@ -99,7 +99,7 @@ } [data-component="search-list"] [data-slot="search-list-results"] { - gap: 4px; + gap: 2px; padding: 0 6px 6px; } @@ -118,7 +118,7 @@ [data-component="search-list"] [data-slot="search-list-header"] { height: auto; padding-block: 16px 2px; - padding-inline: 34px 6px; + padding-inline: 36px 6px; background: var(--v2-background-bg-base); color: var(--v2-text-text-faint); font-size: 12px; @@ -170,8 +170,8 @@ [data-component="search-list"] [data-slot="search-list-row"] { justify-content: flex-start; gap: 6px; - height: 28px; - padding-inline: 6px 3px; + height: 32px; + padding-inline: 8px 3px; border-radius: 6px; font-size: 13px; font-weight: 440; diff --git a/packages/app/src/runtime/i18n/en.ts b/packages/app/src/runtime/i18n/en.ts index 559f18c7451..cde5a0e0e6c 100644 --- a/packages/app/src/runtime/i18n/en.ts +++ b/packages/app/src/runtime/i18n/en.ts @@ -722,6 +722,7 @@ export const dict = { "session.new.project.new": "New project", "session.new.project.search": "Search projects", + "session.new.project.other.search": "Search other projects", "session.new.project.add": "Add project", "session.new.project.trigger.tooltip": "Choose project", "session.new.worktree.creating": "Creating worktree", diff --git a/packages/app/src/servers/connect/dialog.tsx b/packages/app/src/servers/connect/dialog.tsx index fa5d6ff07ff..989b74b64ab 100644 --- a/packages/app/src/servers/connect/dialog.tsx +++ b/packages/app/src/servers/connect/dialog.tsx @@ -205,6 +205,8 @@ export function DialogServer(props: { form.dispatch({ type: "method.changed", method })} /> diff --git a/packages/app/src/servers/connect/method.tsx b/packages/app/src/servers/connect/method.tsx index 01ae27953eb..9b82f2df354 100644 --- a/packages/app/src/servers/connect/method.tsx +++ b/packages/app/src/servers/connect/method.tsx @@ -7,6 +7,8 @@ export type ConnectMethod = "link" | "password" export function ConnectMethodSwitch(props: { method: ConnectMethod disabled?: boolean + align?: "start" | "center" + class?: string onChange: (method: ConnectMethod) => void }) { const language = useLanguage() @@ -15,7 +17,8 @@ export function ConnectMethodSwitch(props: { return (
{language.t(props.method === "link" ? "server.connect.password.prompt" : "server.connect.link.prompt")} diff --git a/packages/app/src/shell/commands/command-search.tsx b/packages/app/src/shell/commands/command-search.tsx index 10d60cf2cb9..a85a9cd0f30 100644 --- a/packages/app/src/shell/commands/command-search.tsx +++ b/packages/app/src/shell/commands/command-search.tsx @@ -32,6 +32,7 @@ export function DialogCommandSearch() { placeholder={language.t("command.commands.search")} items={(query) => entries().filter((entry) => matchesCommandPaletteEntry(entry, query))} sources={[]} + bare highlight={preview.highlight} select={select} close={() => dialog.close()} diff --git a/packages/app/src/shell/commands/dialog.css b/packages/app/src/shell/commands/dialog.css index d46a4c79e2a..fb68a9f41fd 100644 --- a/packages/app/src/shell/commands/dialog.css +++ b/packages/app/src/shell/commands/dialog.css @@ -76,6 +76,8 @@ .command-palette-meta { flex-shrink: 0; + font-size: 11px; + letter-spacing: 0.05px; font-variant-numeric: tabular-nums; } @@ -100,7 +102,7 @@ .command-palette-file-name { flex-shrink: 0; color: var(--v2-text-text-base); - font-weight: 530; + font-weight: 440; white-space: nowrap; } @@ -128,17 +130,31 @@ } } +/* A list with one category needs no header naming it; the header returns once a second section shows. */ +.command-palette-bare + [data-slot="search-list-results"]:not(:has(> [data-slot="search-list-section"] ~ [data-slot="search-list-section"])) + [data-slot="search-list-header"] { + display: none; +} + +.command-palette-bare + [data-slot="search-list-results"]:not(:has(> [data-slot="search-list-section"] ~ [data-slot="search-list-section"])) { + padding-top: 4px; +} + .command-palette-compact { [data-slot="search-list-search"] { - position: relative; - padding: 6px 6px 17px; + display: flex; + flex-direction: column; + gap: 6px; + padding: 6px 6px 2px; &::after { - position: absolute; - inset-inline: 0; - bottom: 8px; - border-top: 0.5px solid var(--v2-border-border-base); + height: 1px; + margin-inline: -6px; + background: var(--v2-border-border-base); content: ""; + transform: scaleY(0.5); } [data-component="text-input-v2"] { @@ -170,19 +186,28 @@ } [data-slot="search-list-section"] { - gap: 4px; + gap: 2px; &:not(:last-child) { padding-bottom: 4px; } } - [data-slot="search-list-header"] { - padding-inline: 12px; + &.command-palette [data-slot="search-list-header"] { + height: auto; + padding-block: 10px 2px; + padding-inline: 14px; + color: var(--v2-text-text-faint); + font-size: 12px; + line-height: 18px; + letter-spacing: 0.05px; } - [data-slot="search-list-row"] { - padding-inline: 6px; + /* Outranks the list's compact row height. */ + &.command-palette [data-slot="search-list-row"], + &.command-palette [data-slot="search-list-row"][data-size="compact"] { + height: 32px; + padding-inline: 8px 6px; &:is([data-active], :focus-visible) { background: var(--v2-overlay-simple-overlay-hover); @@ -190,6 +215,10 @@ } } + .palette-menu-title { + font-weight: 440; + } + .command-palette-row-text { flex: 1; } diff --git a/packages/app/src/shell/commands/dialog.tsx b/packages/app/src/shell/commands/dialog.tsx index 6c0e40890b9..d9475980486 100644 --- a/packages/app/src/shell/commands/dialog.tsx +++ b/packages/app/src/shell/commands/dialog.tsx @@ -71,6 +71,8 @@ export function CommandPaletteView(props: { /** The row whose selection is still in progress, such as an archived session being restored. */ busyEntryID?: string unhide?: (entry: CommandPaletteEntry) => (() => void) | undefined + /** Drops the heading of a list that only ever has one category. */ + bare?: boolean }) { const language = useLanguage() const tabs = useTabs() @@ -91,7 +93,12 @@ export function CommandPaletteView(props: { }) return ( - + dialog.close(layer?.id)} busyEntryID={selectSessionRestoreEntryID(searchState())} + bare={!props.archived} unhide={(entry) => { const server = entry.server const id = entry.sessionID diff --git a/packages/app/src/shell/search-list.css b/packages/app/src/shell/search-list.css index d68f0c52fdf..1992733eddb 100644 --- a/packages/app/src/shell/search-list.css +++ b/packages/app/src/shell/search-list.css @@ -138,7 +138,7 @@ .mcp-dialog-name { color: var(--v2-text-text-base); font-size: 13px; - font-weight: 530; + font-weight: 440; line-height: var(--line-height-compact); letter-spacing: -0.04px; } @@ -226,13 +226,6 @@ } .fork-dialog [data-slot="search-list-search"] { - padding: 6px 6px 9px; - - &::after { - bottom: 0; - border-color: var(--v2-border-border-muted); - } - [data-slot="text-input-v2-value"] { gap: 8px; } @@ -244,15 +237,14 @@ .fork-dialog-section { display: flex; - min-height: 28px; flex-shrink: 0; align-items: center; - padding: 4px 14px; - color: var(--v2-text-text-muted); - font-size: 13px; + padding: 10px 14px 2px; + color: var(--v2-text-text-faint); + font-size: 12px; font-weight: 440; - line-height: var(--line-height-compact); - letter-spacing: -0.04px; + line-height: 18px; + letter-spacing: 0.05px; [data-slot="dialog-description"] { margin: 0; @@ -266,12 +258,14 @@ } .fork-dialog [data-slot="search-list-row"] { - height: 28px; + height: 32px; gap: 12px; - padding-inline: 8px; + padding-inline: 8px 6px; } .fork-dialog .search-list-trailing { + font-size: 11px; + letter-spacing: 0.05px; font-variant-numeric: tabular-nums; } @@ -328,7 +322,7 @@ &::after { height: 1px; margin-inline: -6px; - background: var(--v2-border-border-muted); + background: var(--v2-border-border-base); content: ""; transform: scaleY(0.5); } @@ -351,6 +345,6 @@ flex-shrink: 0; height: 1px; margin: 4px -6px 6px; - background: var(--v2-border-border-muted); + background: var(--v2-border-border-base); transform: scaleY(0.5); } diff --git a/packages/app/src/usage/dialog.tsx b/packages/app/src/usage/dialog.tsx index 7fde402be6f..01cb4f483ca 100644 --- a/packages/app/src/usage/dialog.tsx +++ b/packages/app/src/usage/dialog.tsx @@ -129,31 +129,37 @@ export function DialogUsage(props: { when={ready()} fallback={ -
- - - - - -
- - {language.t("usage.error")} - - -
-
- + + +
- - {language.t("usage.signedOut.title")} - {language.t("usage.signedOut.body")} - + - - -
+
+ + +
+ + + + + +
+ + {language.t("usage.error")} + + +
+
+
+
+
+
} > @@ -375,12 +381,10 @@ export function UsageDialogContent(props: { when={view().budgets.length > 0} fallback={ - - {language.t("usage.empty.title")} - - {language.t("usage.empty.body", { workspace: workspace() })} - - + } > @@ -495,6 +499,17 @@ function Item(props: { children: JSX.Element }) { return
{props.children}
} +function Message(props: { title: string; body: string }) { + return ( +
+ {props.title} +

+ {props.body} +

+
+ ) +} + function Divider() { return
} diff --git a/packages/gui-plugins/src/wsl/dialog.css b/packages/gui-plugins/src/wsl/dialog.css index 1d44d56972e..d573193f73d 100644 --- a/packages/gui-plugins/src/wsl/dialog.css +++ b/packages/gui-plugins/src/wsl/dialog.css @@ -36,7 +36,6 @@ [data-component="dialog-v2"].settings-wsl-not-installed-dialog [data-slot="dialog-content"] { align-items: stretch; - border-radius: 10px; overflow: hidden; } diff --git a/packages/ui/src/overlays/dialog/dialog.css b/packages/ui/src/overlays/dialog/dialog.css index 36624f2ba1f..a5105d1b5cd 100644 --- a/packages/ui/src/overlays/dialog/dialog.css +++ b/packages/ui/src/overlays/dialog/dialog.css @@ -26,7 +26,7 @@ max-height: calc(100vh - 32px); background: var(--v2-background-bg-layer-01); box-shadow: var(--v2-elevation-overlay); - border-radius: 6px; + border-radius: 12px; overflow: hidden; pointer-events: auto; @@ -173,7 +173,6 @@ --dialog-height: min(calc(100vh - 96px), 600px); width: min(calc(100vw - 32px), 720px); background: var(--v2-background-bg-base); - border-radius: 12px; } &[data-size="x-large"] [data-slot="dialog-container"] {