From 46744b64692c5846ee5e21e1faefe91bba8a1597 Mon Sep 17 00:00:00 2001 From: Dax Date: Sat, 14 Nov 2026 16:44:58 -0500 Subject: [PATCH] fix(app): use consistent dialog sizes (#63432) --- package.json | 2 +- .../e2e/regression/command-palette.spec.ts | 2 +- .../regression/mcp-workspace-toggle.spec.ts | 5 ++- .../app/e2e/regression/new-session.spec.ts | 2 +- packages/app/e2e/regression/settings.spec.ts | 5 ++- .../app/src/new-session/location/dialog.css | 14 ------- .../app/src/new-session/location/dialog.tsx | 2 +- .../providers/connect/chatgpt-usage-limit.tsx | 9 +---- .../src/providers/connect/chatgpt-welcome.tsx | 2 +- packages/app/src/providers/connect/dialog.tsx | 21 +++-------- packages/app/src/providers/models/manage.css | 5 --- .../src/providers/models/select-dialog.css | 7 ---- .../src/providers/models/select-dialog.tsx | 2 +- packages/app/src/providers/models/unpaid.tsx | 4 +- .../app/src/session/commands/fork-dialog.tsx | 2 +- .../src/session/commands/jump-to-message.tsx | 2 +- .../app/src/settings/about/notices/dialog.tsx | 2 +- packages/app/src/settings/settings.css | 13 ------- packages/app/src/shell/commands/dialog.css | 24 ------------ packages/app/src/usage/dialog.tsx | 2 +- packages/gui-plugins/src/pairing/page.tsx | 2 +- packages/gui-plugins/src/ssh/ssh.css | 9 ----- .../gui-plugins/src/updater/whats-new.tsx | 6 +-- packages/gui-plugins/src/wsl/dialog.css | 19 ---------- .../session-ui/src/tools/tool-renderer.tsx | 2 +- packages/ui/src/overlays/dialog/dialog.css | 37 ++++++++++++------- .../ui/src/overlays/dialog/dialog.stories.tsx | 7 +++- packages/ui/src/overlays/dialog/dialog.tsx | 11 +++++- script/ast-grep/dialog-size.yml | 18 +++++++++ 29 files changed, 87 insertions(+), 151 deletions(-) create mode 100644 script/ast-grep/dialog-size.yml diff --git a/package.json b/package.json index 181964035d3..a1d4ab0e53b 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "dev:desktop": "bun --cwd packages/desktop dev", "dev:web": "bun --cwd packages/app dev", "dev:site": "bun run --cwd services/site dev", - "lint": "oxlint && ast-grep scan -c script/ast-grep/gui-plugins/sgconfig.yml && bun script/sdk-docs.ts && bun script/check-greys.ts", + "lint": "oxlint && ast-grep scan -c script/ast-grep/gui-plugins/sgconfig.yml && ast-grep scan --rule script/ast-grep/dialog-size.yml packages && bun script/sdk-docs.ts && bun script/check-greys.ts", "lint:changed": "bun script/lint-changed.ts", "lint:effect-patterns": "ast-grep scan -c script/ast-grep/sgconfig.yml packages/util/src packages/core/src packages/server/src packages/protocol/src packages/cli/src", "lint:effect-simplifications": "ast-grep scan -c script/ast-grep/effect-simplifications/sgconfig.yml --off=unused-suppression packages", diff --git a/packages/app/e2e/regression/command-palette.spec.ts b/packages/app/e2e/regression/command-palette.spec.ts index cb4c86c6247..ccaa605a2e5 100644 --- a/packages/app/e2e/regression/command-palette.spec.ts +++ b/packages/app/e2e/regression/command-palette.spec.ts @@ -778,7 +778,7 @@ test("titlebar session search shrinks with results while its field stays anchore await expect(options).toHaveCount(23) const scroll = dialog.locator('[data-slot="search-list-scroll"]') await expect.poll(() => scroll.evaluate((element) => element.scrollHeight - element.clientHeight)).toBeGreaterThan(0) - await expect.poll(async () => (await geometry()).height).toBeLessThanOrEqual(480) + await expect.poll(async () => (await geometry()).height).toBeLessThanOrEqual(600) const last = dialog.getByRole("option", { name: /Compact keeper result 22/ }) await expect(last).not.toBeInViewport() await scroll.hover() diff --git a/packages/app/e2e/regression/mcp-workspace-toggle.spec.ts b/packages/app/e2e/regression/mcp-workspace-toggle.spec.ts index 51e5004fc0c..9d134f08a0f 100644 --- a/packages/app/e2e/regression/mcp-workspace-toggle.spec.ts +++ b/packages/app/e2e/regression/mcp-workspace-toggle.spec.ts @@ -456,7 +456,7 @@ test("the MCP list shrinks with matches and keeps its search anchored while scro const scroll = view.panel.locator('[data-slot="search-list-scroll"]') await expect.poll(() => scroll.evaluate((element) => element.scrollHeight - element.clientHeight)).toBeGreaterThan(0) - await expect.poll(async () => (await geometry()).height).toBeLessThanOrEqual(480) + await expect.poll(async () => (await geometry()).height).toBeLessThanOrEqual(600) await input.press("End") const last = view.panel.getByRole("option", { name: "server-23", exact: true }) @@ -635,7 +635,8 @@ for (const surface of ["popover", "dialog"] as const) { for (const surface of ["popover", "dialog"] as const) { test(`long MCP names keep their status and controls visible in the ${surface}`, async ({ page }) => { const names = ["connected", "disabled", "failed", "needs_auth"].map( - (status) => `long-${status}-mcp-server-for-the-internal-knowledge-base-search`, + (status) => + `long-${status}-mcp-server-for-the-internal-knowledge-base-search-across-every-team-workspace-repository-and-shared-drive`, ) const actions: string[] = [] diff --git a/packages/app/e2e/regression/new-session.spec.ts b/packages/app/e2e/regression/new-session.spec.ts index 0e5150604cc..fb9c48b71fc 100644 --- a/packages/app/e2e/regression/new-session.spec.ts +++ b/packages/app/e2e/regression/new-session.spec.ts @@ -1154,7 +1154,7 @@ test("the location dialog separates added projects from server projects and tags await expect(options.nth(0)).toHaveCSS("height", "28px") 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", "480px") + await expect(dialog.locator("..")).toHaveCSS("width", "880px") await expect(options.nth(0)).toHaveCSS("display", "flex") await expect(names.nth(0).locator(".command-palette-title")).toHaveCSS("font-size", "13px") await expect(names.nth(0).locator(".command-palette-title")).toHaveCSS("white-space", "nowrap") diff --git a/packages/app/e2e/regression/settings.spec.ts b/packages/app/e2e/regression/settings.spec.ts index adc3e0edcd0..5ece2fbfd7e 100644 --- a/packages/app/e2e/regression/settings.spec.ts +++ b/packages/app/e2e/regression/settings.spec.ts @@ -1929,7 +1929,7 @@ test("providers: the free tier upsell opens Go on its own, sized to its content" await expect(dialog.getByPlaceholder("API key")).toBeVisible() // Nothing to go back to: the upsell opened the dialog straight on Go. await expect(dialog.getByRole("navigation").getByRole("button")).toHaveCount(0) - await expect.poll(async () => (await container.boundingBox())?.height).toBeLessThan(512) + await expect.poll(async () => (await container.boundingBox())?.height).toBeLessThan(368) }) test("providers: the connect dialog lists connected providers and manages their accounts", async ({ page }) => { @@ -1981,7 +1981,8 @@ test("providers: the connect dialog lists connected providers and manages their await expect(dialog.locator('[data-provider-id="linear"]')).toHaveCount(0) await expect(dialog.getByText("MCP", { exact: true })).toHaveCount(0) const container = page.locator('[data-slot="dialog-container"]') - await expect.poll(async () => (await container.boundingBox())?.height).toBe(512) + await expect(container).toHaveCSS("width", "480px") + await expect(container).toHaveCSS("max-height", "368px") const picker = await container.boundingBox() await openai.click() diff --git a/packages/app/src/new-session/location/dialog.css b/packages/app/src/new-session/location/dialog.css index 95a1e39b667..e018c32f6a2 100644 --- a/packages/app/src/new-session/location/dialog.css +++ b/packages/app/src/new-session/location/dialog.css @@ -1,17 +1,3 @@ -[data-component="dialog-v2"]:has(.new-session-location) { - align-items: flex-start; -} - -[data-component="dialog-v2"]:has(.new-session-location) [data-slot="dialog-container"] { - width: min(calc(100vw - 24px), 480px); - height: auto; - max-height: min(calc(100vh - 96px), 480px); - min-height: 0; - margin-top: max(48px, calc((100vh - 480px) / 2)); - background: var(--v2-background-bg-base); - box-shadow: var(--v2-elevation-overlay); -} - .new-session-location .palette-menu-search { padding: 6px 6px 0; } diff --git a/packages/app/src/new-session/location/dialog.tsx b/packages/app/src/new-session/location/dialog.tsx index ea156943f50..6429c687f5c 100644 --- a/packages/app/src/new-session/location/dialog.tsx +++ b/packages/app/src/new-session/location/dialog.tsx @@ -482,7 +482,7 @@ function NewSessionLocationDialog(props: { } return ( - +