From 1358aaab50f8c7d31bb6ef803b0c3d17e02f7c58 Mon Sep 17 00:00:00 2001 From: Aarav Sareen <96787824+arvsrn@users.noreply.github.com> Date: Fri, 23 Oct 2026 17:38:22 +0530 Subject: [PATCH] fix(app): restyle the browser site information popover and options menu (#58441) --- .../app/component-tests/browser-pane.spec.ts | 3 - packages/gui-extensions/src/browser/bar.css | 40 ++++++++--- .../gui-extensions/src/browser/i18n/en.ts | 5 +- packages/gui-extensions/src/browser/panel.tsx | 69 +++++++++++++------ 4 files changed, 82 insertions(+), 35 deletions(-) diff --git a/packages/app/component-tests/browser-pane.spec.ts b/packages/app/component-tests/browser-pane.spec.ts index 98d8ddc2e3e..769484a2175 100644 --- a/packages/app/component-tests/browser-pane.spec.ts +++ b/packages/app/component-tests/browser-pane.spec.ts @@ -618,9 +618,6 @@ story("zooms the page from the browser options in view and keeps its zoom in the const zoom = root.getByRole("button", { name: "110%", exact: true }) await expect(zoom).toBeVisible() - await options.click() - await expect(page.getByRole("menuitem", { name: /^Reset zoom/ })).toContainText("110%") - await page.keyboard.press("Escape") await zoom.click() await expect(root.getByText("Zoom: 100", { exact: true })).toBeVisible() await expect(zoom).toBeHidden() diff --git a/packages/gui-extensions/src/browser/bar.css b/packages/gui-extensions/src/browser/bar.css index 41a4bd8ef08..151f15a510f 100644 --- a/packages/gui-extensions/src/browser/bar.css +++ b/packages/gui-extensions/src/browser/bar.css @@ -240,37 +240,58 @@ z-index: 60; display: flex; flex-direction: column; - gap: 12px; - width: 320px; - padding: 12px; - border-radius: 12px; - background: var(--v2-background-bg-base); + gap: 2px; + width: 261px; + max-width: calc(100vw - 16px); + padding: 4px; + border-radius: 8px; + background: var(--v2-background-bg-layer-01); box-shadow: var(--v2-elevation-floating); outline: none; color: var(--v2-text-text-base); font-size: 13px; font-weight: 440; - line-height: var(--line-height-compact); + line-height: var(--line-height-base); letter-spacing: -0.04px; + user-select: none; transform-origin: var(--kb-popover-content-transform-origin); [data-slot="browser-site-host"] { + flex: 1; min-width: 0; margin: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - font-size: inherit; - font-weight: 530; + font: inherit; } [data-slot="browser-site-row"] { display: flex; gap: 8px; align-items: flex-start; + padding: 4px 8px; + border-radius: 4px; + } + + /* Centers the icon on the first line of the row's text. */ + [data-slot="browser-site-icon"] { + display: flex; + flex: none; + align-items: center; + height: 20px; color: var(--v2-icon-icon-muted); } + /* Spans the card edge to edge over its padding; a 1px line scaled to a hairline. */ + [data-slot="browser-site-separator"] { + flex: none; + height: 1px; + margin: 2px -4px; + background: var(--v2-border-border-base); + transform: scaleY(0.5); + } + /* An action beside a row's text, centered on it. */ [data-slot="browser-site-row"] > [data-component="button-v2"] { flex: none; @@ -278,6 +299,9 @@ } [data-slot="browser-site-detail"] { + font-size: 11px; + line-height: var(--line-height-compact); + letter-spacing: 0.05px; color: var(--v2-text-text-muted); } } diff --git a/packages/gui-extensions/src/browser/i18n/en.ts b/packages/gui-extensions/src/browser/i18n/en.ts index 14a5b26a3f6..ed86aa1076d 100644 --- a/packages/gui-extensions/src/browser/i18n/en.ts +++ b/packages/gui-extensions/src/browser/i18n/en.ts @@ -40,11 +40,12 @@ export default { "site.cookies.clear": "Clear", "site.permissions": "Permissions are blocked", "site.permissions.description": "Camera, microphone, location, and notifications don't work in this browser.", - "site.agent": "The agent can use this page", + "site.agent": "Agent can use this page", "site.agent.description": "It can read the page, run scripts, and fill in forms.", "page.add": "Add page to session", "page.placeholder": "Add context about this page", "external.open": "Open in system browser", + "external.menu": "Open in browser", "external.unavailable": "This address only works on the server's machine.", options: "Browser options", "zoom.in": "Zoom in", @@ -52,5 +53,5 @@ export default { "zoom.reset": "Reset zoom", "zoom.percent": "{{percent}}%", "link.copy": "Copy link", - "history.clear": "Clear browsing history", + "history.clear": "Clear history", } diff --git a/packages/gui-extensions/src/browser/panel.tsx b/packages/gui-extensions/src/browser/panel.tsx index dd7e05937f3..aae22123fff 100644 --- a/packages/gui-extensions/src/browser/panel.tsx +++ b/packages/gui-extensions/src/browser/panel.tsx @@ -821,29 +821,25 @@ export default function SessionBrowserPane(props: { /> - + {/* Zooming closes the menu: the page stays a still while the menu covers it, so a zoom would show only once it closed. The address field shows any zoom but 100% afterwards. */} zoomPage("in")} - shortcut={} + shortcut={} > {extension.t("zoom.in")} zoomPage("out")} - shortcut={} + shortcut={} > {extension.t("zoom.out")} - zoomPage("reset")} - badge={extension.t("zoom.percent", { percent: Math.round((page()?.zoom ?? 1) * 100) })} - > + zoomPage("reset")}> {extension.t("zoom.reset")} @@ -852,7 +848,7 @@ export default function SessionBrowserPane(props: { {extension.t("link.copy")} system.openExternal(address())}> - {extension.t("external.open")} + {extension.t("external.menu")} props.model.clearHistory()}> @@ -1128,12 +1124,21 @@ function SiteInformation(props: { const extension = useExtension() // `load` counts openings and clears, so a count for an earlier one never replaces a later one. - const [state, setState] = createStore<{ open: boolean; cookies?: number; clearing: boolean; load: number }>({ + const [state, setState] = createStore<{ + open: boolean + pointer: boolean + cookies?: number + clearing: boolean + load: number + }>({ open: false, + pointer: false, clearing: false, load: 0, }) + let trigger: HTMLButtonElement | undefined + const kind = () => { const value = connection(props.url) @@ -1173,6 +1178,7 @@ function SiteInformation(props: { open={state.open} placement="bottom-start" gutter={8} + shift={-10} modal={false} onOpenChange={(open) => { setState("open", open) @@ -1182,8 +1188,11 @@ function SiteInformation(props: { > setState("pointer", true)} + onKeyDown={() => setState("pointer", false)} variant="ghost-muted" size="small" aria-label={extension.t("site.info")} @@ -1199,21 +1208,26 @@ function SiteInformation(props: { if (event.currentTarget instanceof HTMLElement) event.currentTarget.focus() }} + // Focus returns to the trigger on close, which Chromium rings after Escape; a pointer opening keeps it unringed. + onCloseAutoFocus={(event: Event) => { + if (!state.pointer) return + event.preventDefault() + const active = document.activeElement + + // An outside press already moved focus where it belongs. + if (active && active !== document.body && !active.closest('[data-component="browser-site"]')) return + trigger?.focus({ preventScroll: true, focusVisible: false }) + }} > -
+
+ + + {addressParts(props.url).host || props.url} - {/* A plain button: Kobalte's close button carries the open popover's data-expanded, which icon buttons - draw as pressed. */} - } - onClick={() => setState("open", false)} - />
+