From 5612349f6c6d953074a5fc660ee6399745f4f445 Mon Sep 17 00:00:00 2001 From: Kelvin Amoaba <97001695+AmoabaKelvin@users.noreply.github.com> Date: Mon, 16 Nov 2026 21:55:15 +0000 Subject: [PATCH] fix(browser): match toolbar icons to app chrome and make annotate an icon (#43269) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop the address field's 3px focus ring for a hairline border, size the toolbar buttons like other pane headers (24px, 14px muted icons), and replace the Annotate split button with one icon. Grab and Draw move to the icon's right-click menu and the top of the ⋯ menu. --- .../markup-tools/MarkupDrawButton.tsx | 11 +- .../address-bar/BrowserAddressBar.tsx | 4 +- .../assemble-chrome/browser-page-toolbar.tsx | 6 +- .../extensions/browser-extension-toolbar.tsx | 10 +- .../feedback/browser-egress-indicator.tsx | 6 +- .../browser-toolbar-profile-sub.tsx | 8 +- ...n.tsx => browser-annotate-tool-button.tsx} | 197 +++++++++--------- .../browser-chrome-toolbar.fixture.tsx | 116 +++++++++++ .../toolbar/browser-chrome-toolbar.tsx | 40 ++-- .../browser-navigation-control-row.tsx | 21 +- .../toolbar/browser-reload-control.tsx | 7 +- .../toolbar/browser-toolbar-menu-dropdown.tsx | 23 +- .../browser-toolbar-page-display-items.tsx | 4 +- .../toolbar/use-browser-chrome-tool-fold.ts | 9 +- .../remote-browser-page-toolbar.tsx | 15 +- .../doc-preview-artifact-share.tsx | 3 +- .../doc-preview-document-chip.tsx | 4 +- .../doc-preview-overflow-menu.tsx | 9 +- .../workspace-doc/doc-preview-toolbar.tsx | 2 +- .../use-doc-preview-guest-tools.ts | 2 +- src/renderer/src/i18n/locales/en.json | 1 - src/renderer/src/i18n/locales/ja.json | 1 - src/renderer/src/i18n/locales/zh.json | 1 - 23 files changed, 295 insertions(+), 205 deletions(-) rename src/renderer/src/components/browser-pane/assemble-chrome/toolbar/{browser-annotate-split-button.tsx => browser-annotate-tool-button.tsx} (52%) create mode 100644 src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-chrome-toolbar.fixture.tsx diff --git a/src/renderer/src/components/browser-pane/annotate/markup-tools/MarkupDrawButton.tsx b/src/renderer/src/components/browser-pane/annotate/markup-tools/MarkupDrawButton.tsx index 7b560e7c9b3..75654e197d4 100644 --- a/src/renderer/src/components/browser-pane/annotate/markup-tools/MarkupDrawButton.tsx +++ b/src/renderer/src/components/browser-pane/annotate/markup-tools/MarkupDrawButton.tsx @@ -12,7 +12,6 @@ export type MarkupDrawButtonProps = { active?: boolean /** Explicitly gate on pane activity: a hidden trigger anchors portaled content at the viewport origin. */ surfaceActive: boolean - className?: string } /** Standalone Draw for surfaces without the element picker (remote and client-hosted pages). */ @@ -20,8 +19,7 @@ export function MarkupDrawButton({ onClick, disabled, active, - surfaceActive, - className + surfaceActive }: MarkupDrawButtonProps): React.JSX.Element { const t = useTranslate() const label = t('auto.components.browser-pane.markup.drawButton', 'Draw on screenshot') @@ -40,10 +38,9 @@ export function MarkupDrawButton({ {/* Why: wrap in a span so the tooltip still fires when disabled. */} diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/address-bar/BrowserAddressBar.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/address-bar/BrowserAddressBar.tsx index a8f70d33a6c..774191ea412 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/address-bar/BrowserAddressBar.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/address-bar/BrowserAddressBar.tsx @@ -349,7 +349,7 @@ export default function BrowserAddressBar({ ref={setAddressBarFormRef} data-orca-browser-address-bar-overlay={overlay ? 'true' : undefined} className={cn( - 'flex items-center gap-2 rounded-lg bg-muted px-2.5 transition-colors focus-within:bg-background focus-within:ring-[3px] focus-within:ring-ring/50', + 'flex items-center gap-2 rounded-lg border border-transparent bg-muted px-2.5 transition-colors focus-within:border-border', // Position against the toolbar row so the overlay spans it, not the squeezed slot. overlay ? 'absolute inset-x-2 top-1/2 z-30 h-8 -translate-y-1/2 bg-background shadow-[0_10px_24px_rgba(0,0,0,0.18)]' @@ -362,7 +362,7 @@ export default function BrowserAddressBar({ submitTypedValue() }} > - {leadingIcon ?? } + {leadingIcon ?? } - state.activeContextualTourId === 'browser' ? state.activeContextualTourStepIndex : null - ) const localHtmlFilePath = getShareableBrowserArtifactFile(currentBrowserUrl)?.filePath ?? null // Why the URL check first: every other page skips the workspace-owner lookup on each store write. const canOpenSourceFile = useAppStore( @@ -156,7 +153,6 @@ export function BrowserPageToolbar({ ) : ( - + ) } @@ -114,9 +114,9 @@ function PinnedActionButton({ + + + {primaryTooltip} - - - - - - tools.onStartIntent('annotate')} - /> - tools.onStartIntent('copy')} - /> - - {notes && hasNotes ? ( - <> - - - - - ) : null} - - - + + tools.onStartIntent('annotate')} + /> + + {notes && hasNotes ? ( + <> + + + + + ) : null} + + ) diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-chrome-toolbar.fixture.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-chrome-toolbar.fixture.tsx new file mode 100644 index 00000000000..94913fa6fc2 --- /dev/null +++ b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-chrome-toolbar.fixture.tsx @@ -0,0 +1,116 @@ +import { useRef } from 'react' +import { defineFixture } from '../../../../component-fixtures/component-fixture' +import BrowserAddressBar from '../address-bar/BrowserAddressBar' +import { DocPreviewOverflowMenu } from '../../workspace-doc/doc-preview-overflow-menu' +import { BrowserChromeToolbar } from './browser-chrome-toolbar' +import type { GrabIntent } from '../../../../../../shared/browser/element-grab/browser-grab-types' + +const noop = (): void => {} + +function Toolbar({ + annotationCount = 0, + activeIntent = null, + drawing = false +}: { + annotationCount?: number + activeIntent?: GrabIntent | null + drawing?: boolean +}): React.JSX.Element { + const inputRef = useRef(null) + return ( + + } + elementTools={{ + activeIntent, + onStartIntent: noop, + disabled: false, + grabShortcutLabel: '⌘C', + annotateShortcutLabel: '⇧⌘C', + annotationCount + }} + markup={{ active: drawing, disabled: false, onToggle: noop, canShowDiscoveryHint: false }} + notes={{ onCopyAll: noop, onClear: noop }} + overflowMenu={(overflow) => ( + + )} + /> + ) +} + +const settle = (): Promise => new Promise((resolve) => setTimeout(resolve, 150)) + +export const idle = defineFixture({ width: 640, render: () => }) + +export const withNotes = defineFixture({ + width: 640, + render: () => +}) + +export const annotating = defineFixture({ + width: 640, + render: () => +}) + +export const drawing = defineFixture({ width: 640, render: () => }) + +export const addressFocused = defineFixture({ + width: 640, + render: () => , + interact: async (frame) => { + frame.querySelector('[data-orca-browser-address-bar="true"]')?.focus() + await settle() + } +}) + +export const annotateMenu = defineFixture({ + width: 640, + render: () => , + interact: async (frame) => { + frame + .querySelector('button[aria-label="Annotate page element"]') + ?.dispatchEvent(new MouseEvent('contextmenu', { bubbles: true, cancelable: true })) + await settle() + } +}) + +export const overflowMenu = defineFixture({ + width: 640, + render: () => , + interact: async (frame) => { + frame.querySelector('button[aria-label="Preview options"]')?.dispatchEvent( + new PointerEvent('pointerdown', { + bubbles: true, + cancelable: true, + button: 0, + pointerType: 'mouse' + }) + ) + await settle() + } +}) diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-chrome-toolbar.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-chrome-toolbar.tsx index b1b93c33fc3..c44b2d94104 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-chrome-toolbar.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-chrome-toolbar.tsx @@ -5,17 +5,14 @@ import { BrowserNavigationControlRow, type BrowserNavigationControls } from './browser-navigation-control-row' +import { useBrowserChromeToolFold } from './use-browser-chrome-tool-fold' import { - BROWSER_CHROME_FOLD_ORDER, - useBrowserChromeToolFold, - type BrowserChromeFoldStage -} from './use-browser-chrome-tool-fold' -import { - BrowserAnnotateSplitButton, + BrowserAnnotateToolButton, + BrowserAnnotateToolMenuItems, type BrowserChromeElementTools, type BrowserChromeMarkupTool, type BrowserChromeNoteActions -} from './browser-annotate-split-button' +} from './browser-annotate-tool-button' import { useFloatingSplitBrowserClose } from './use-floating-split-browser-close' export type BrowserChromeToolAction = { @@ -29,6 +26,8 @@ export type BrowserChromeOverflowMenuProps = { /** Run after menu close without focus return; focusing the ⋯ trigger would immediately dismiss a new popover or dialog. */ deferUntilClose: (action: () => void) => void onMenuCloseAutoFocus: (event: Event) => void + /** Grab and Draw, which the annotate icon otherwise shows only on right-click. */ + annotateToolItems: React.ReactNode } /** @@ -47,8 +46,7 @@ export function BrowserChromeToolbar({ shareControl, overflowMenu, closeTabOwner, - showTourAnchors = false, - pinAnnotateLabel = false + showTourAnchors = false }: { controls: BrowserNavigationControls addressSlot: React.ReactNode @@ -71,8 +69,6 @@ export function BrowserChromeToolbar({ closeTabOwner: { worktreeId: string; browserPageId: string } /** Only the browsing pane anchors the contextual tour; a second anchor would steal its steps. */ showTourAnchors?: boolean - /** Keeps the tour's target fully labelled while it is pointed at. */ - pinAnnotateLabel?: boolean }): React.JSX.Element { const closeTab = useFloatingSplitBrowserClose( closeTabOwner.worktreeId, @@ -80,14 +76,7 @@ export function BrowserChromeToolbar({ ) const rowRef = useRef(null) const overflowTriggerRef = useRef(null) - const present: Record = { - extensions: extensionActions != null, - 'annotate-label': !pinAnnotateLabel - } - const folded = useBrowserChromeToolFold( - rowRef, - BROWSER_CHROME_FOLD_ORDER.filter((stage) => present[stage]) - ) + const folded = useBrowserChromeToolFold(rowRef, extensionActions == null ? [] : ['extensions']) const afterMenuCloseRef = useRef<(() => void) | null>(null) const deferUntilClose = (action: () => void): void => { @@ -113,11 +102,10 @@ export function BrowserChromeToolbar({ showTourAnchors={showTourAnchors} > {shareControl} - @@ -125,22 +113,22 @@ export function BrowserChromeToolbar({ {overflowMenu({ triggerRef: overflowTriggerRef, deferUntilClose, - onMenuCloseAutoFocus + onMenuCloseAutoFocus, + annotateToolItems: })} {closeTab ? ( <> ) : null} diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-navigation-control-row.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-navigation-control-row.tsx index 6834b1fa5c4..eada2a3e127 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-navigation-control-row.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-navigation-control-row.tsx @@ -49,34 +49,31 @@ export function BrowserNavigationControlRow({ {...(showTourAnchors ? { 'data-contextual-tour-target': 'browser-toolbar' } : {})} > {reloadControl ?? ( )} diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-reload-control.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-reload-control.tsx index aacdb19344c..28a604a526a 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-reload-control.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-reload-control.tsx @@ -45,9 +45,8 @@ export function BrowserReloadControl({ diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-toolbar-menu-dropdown.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-toolbar-menu-dropdown.tsx index c6e347cc68b..9842e70cfbe 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-toolbar-menu-dropdown.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-toolbar-menu-dropdown.tsx @@ -96,9 +96,8 @@ export function BrowserToolbarMenuDropdown({ + {overflow.annotateToolItems} + overflow.deferUntilClose(pageActions.onFind)} > - + {t('browser.toolbar.findOnPage', 'Find on page')} {findShortcut ? {findShortcut} : null} - + {t('auto.components.browser.pane.BrowserToolbarMenu.e5d31de1a9', 'Viewport Size')} @@ -160,21 +161,21 @@ export function BrowserToolbarMenuDropdown({ - + {t('auto.components.browser.pane.BrowserPane.a1f3c2e4b5', 'Hard Reload')} {hardReloadShortcut ? ( {hardReloadShortcut} ) : null} - + {t('auto.components.browser.pane.BrowserPane.ec75d0c412', 'Open browser devtools')} pageActions.onOpenExternal?.()} > - + {t('auto.components.browser.pane.BrowserPane.0f41bf80c7', 'Open in default browser')} @@ -193,7 +194,7 @@ export function BrowserToolbarMenuDropdown({ ) } > - + {t('browser.history.menuItem', 'History')} {historyShortcut ? {historyShortcut} : null} @@ -203,7 +204,7 @@ export function BrowserToolbarMenuDropdown({ useAppStore.getState().openSettingsPage() }} > - + {t('auto.components.browser.pane.BrowserToolbarMenu.a771c2b6c8', 'Browser Settings…')} diff --git a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-toolbar-page-display-items.tsx b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-toolbar-page-display-items.tsx index 6c817010ea7..25b751152c4 100644 --- a/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-toolbar-page-display-items.tsx +++ b/src/renderer/src/components/browser-pane/assemble-chrome/toolbar/browser-toolbar-page-display-items.tsx @@ -57,7 +57,7 @@ export function BrowserToolbarZoomRow({ } }} > - + {t('auto.components.browser.pane.BrowserToolbarMenu.zoom', 'Zoom')} @@ -103,9 +102,8 @@ export function RemoteBrowserPageToolbar({ @@ -130,7 +128,6 @@ export function RemoteBrowserPageToolbar({ disabled={!frameUrl} active={markup.isActive} surfaceActive={isActive} - className="h-7 w-7" /> ) diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx index 106f72969bf..df9b61c9944 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx +++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-artifact-share.tsx @@ -128,7 +128,8 @@ export function buildDocPreviewShareControl( return ( readDocPreviewArtifactRequest(location, filePath, sourceKey)} /> ) diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-chip.tsx b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-chip.tsx index c0b6acb1699..34c11ff257d 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-chip.tsx +++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-document-chip.tsx @@ -36,9 +36,9 @@ export function DocPreviewDocumentChip({ className="@container flex min-w-0 flex-1 items-center gap-2 overflow-hidden rounded-lg bg-muted px-2.5 text-left hover:bg-accent focus-visible:ring-[3px] focus-visible:ring-ring/50 focus-visible:outline-none" > {copied ? ( - + ) : ( - + )} {/* Match file-tree emphasis: muted directory, normal filename. */} diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-overflow-menu.tsx b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-overflow-menu.tsx index 9b64e23c1a1..9cf9ce27d16 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-overflow-menu.tsx +++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-overflow-menu.tsx @@ -35,18 +35,19 @@ export function DocPreviewOverflowMenu({ + {overflow.annotateToolItems} + {t('auto.components.browser.pane.BrowserPane.0e080d820e', 'Reload')} diff --git a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-toolbar.tsx b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-toolbar.tsx index 82b84452eba..71bd1cba5be 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-toolbar.tsx +++ b/src/renderer/src/components/browser-pane/workspace-doc/doc-preview-toolbar.tsx @@ -1,6 +1,6 @@ import { useState } from 'react' import { BrowserChromeToolbar } from '@/components/browser-pane/assemble-chrome/toolbar/browser-chrome-toolbar' -import type { BrowserChromeElementTools } from '@/components/browser-pane/assemble-chrome/toolbar/browser-annotate-split-button' +import type { BrowserChromeElementTools } from '@/components/browser-pane/assemble-chrome/toolbar/browser-annotate-tool-button' import { BrowserReloadControl } from '@/components/browser-pane/assemble-chrome/toolbar/browser-reload-control' import { useTranslate } from '@/i18n/use-translate' import { DocPreviewAddressEdit } from './doc-preview-address-edit' diff --git a/src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.ts b/src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.ts index b855fdca45c..24a41f6538d 100644 --- a/src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.ts +++ b/src/renderer/src/components/browser-pane/workspace-doc/use-doc-preview-guest-tools.ts @@ -8,7 +8,7 @@ import { useBrowserPageGrabAnnotations } from '@/components/browser-pane/annotat import { useBrowserPageMarkupCapture } from '@/components/browser-pane/annotate/capture/use-browser-page-markup-capture' import { useGrabMode } from '@/components/browser-pane/annotate/grab/useGrabMode' import type { BrowserOverlayViewport } from '@/components/browser-pane/describe-page/browser-annotation-geometry' -import type { BrowserChromeElementTools } from '@/components/browser-pane/assemble-chrome/toolbar/browser-annotate-split-button' +import type { BrowserChromeElementTools } from '@/components/browser-pane/assemble-chrome/toolbar/browser-annotate-tool-button' /** Use the stable browser page ID for annotations and tools so replacing the guest grant preserves both. */ export function useDocPreviewGuestTools({ diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 63f7c91aa06..c05e3718514 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -562,7 +562,6 @@ "annotate": "Annotate", "grab": "Grab", "draw": "Draw", - "annotateOptions": "More annotate tools", "copyAllNotes": "Copy all notes", "clearNotes": "Clear notes", "resetZoom": "Reset zoom", diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index 5142a6417fc..81b2efee10b 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -21984,7 +21984,6 @@ "annotate": "注釈", "grab": "取得", "draw": "描き込み", - "annotateOptions": "その他の注釈ツール", "copyAllNotes": "すべてのメモをコピー", "clearNotes": "メモをクリア", "resetZoom": "ズームをリセット", diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index 9f44e2bea6d..8b6de881330 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -22371,7 +22371,6 @@ "annotate": "注释", "grab": "抓取", "draw": "绘制", - "annotateOptions": "更多注释工具", "copyAllNotes": "复制所有注释", "clearNotes": "清除注释", "resetZoom": "重置缩放",