diff --git a/docs/floating-panels.md b/docs/floating-panels.md index 5937547154..0d49f74b8c 100644 --- a/docs/floating-panels.md +++ b/docs/floating-panels.md @@ -20,6 +20,14 @@ input focused while its scrollable list lives in a Portal. There is no shared "floating panel" primitive yet — when a fifth use case shows up we can revisit; until then prefer copying the closest file and trimming. +## Picker trigger tooltips + +Keep the picker surface outside `TooltipTrigger`. React focus events bubble +through portals, so putting the surface inside the trigger makes focus in its +search field look like focus on the button when a shortcut opens the picker. +For new `ComboboxTrigger` buttons, pass the hint through the `tooltip` prop. An +explicit `TooltipTrigger` wrapper is also safe when it wraps only the button. + ## Popover width contract Combobox desktop popovers are never narrower than their trigger, and they grow diff --git a/packages/app/e2e/browser/composer-control-density.spec.ts b/packages/app/e2e/browser/composer-control-density.spec.ts index 8f10c154d7..9cecfe7545 100644 --- a/packages/app/e2e/browser/composer-control-density.spec.ts +++ b/packages/app/e2e/browser/composer-control-density.spec.ts @@ -363,16 +363,18 @@ test.describe("Composer model and effort shortcuts", () => { await expectComposerVisible(page); await expect(thinkingControl(page, "High")).toBeVisible(); + await test.step("Focus model search without opening its tooltip", async () => { + await toggleModelPickerFromComposer(page); + await expect(page.getByPlaceholder(/Search (all )?models/)).toBeFocused(); + await expect(page.getByRole("tooltip").filter({ hasText: "Change model" })).toBeHidden(); + await expectModelPickerClosesFromSearch(page); + }); + await test.step("Show both shortcuts in the toolbar tooltips", async () => { await expectShortcutHint(page, modelControl(page), "Change model"); await expectShortcutHint(page, thinkingControl(page, "High"), "Thinking mode"); }); - await test.step("Toggle the picker with its search field focused", async () => { - await toggleModelPickerFromComposer(page); - await expectModelPickerClosesFromSearch(page); - }); - await test.step("Wrap from High to Low and advance to Medium", async () => { await cycleComposerEffort(page); await expect(thinkingControl(page, "Low")).toBeVisible(); diff --git a/packages/app/src/components/combined-model-selector.tsx b/packages/app/src/components/combined-model-selector.tsx index 39835185ef..a6fb8c302a 100644 --- a/packages/app/src/components/combined-model-selector.tsx +++ b/packages/app/src/components/combined-model-selector.tsx @@ -1,4 +1,4 @@ -import { useCallback, useEffect, useRef, useState } from "react"; +import { useCallback, useEffect, useRef, useState, type ReactNode } from "react"; import { Pressable, Text, View, type PressableStateCallbackType } from "react-native"; import { useTranslation } from "react-i18next"; import { StyleSheet, withUnistyles } from "react-native-unistyles"; @@ -22,6 +22,7 @@ import { import { useKeyboardToggle, type KeyboardToggleAction } from "@/hooks/use-keyboard-toggle"; const EMPTY_COMBOBOX_OPTIONS: ComboboxOption[] = []; +const DEFAULT_TRIGGER_DECORATION = { showCaret: true, tooltip: undefined }; const ThemedLoadingSpinner = withUnistyles(LoadingSpinner); const foregroundMutedMapping = (theme: Theme) => ({ @@ -70,6 +71,7 @@ interface CombinedModelSelectorProps { toolbar?: { glyph: ToolbarGlyph; showCaret: boolean; + tooltip?: ReactNode; }; } @@ -228,6 +230,8 @@ export function CombinedModelSelector({ ); + const { showCaret, tooltip } = toolbar ?? DEFAULT_TRIGGER_DECORATION; + return ( <> {renderTrigger ? ( @@ -266,7 +270,8 @@ export function CombinedModelSelector({ model: browser.selectedModelLabel, })} testID="combined-model-selector" - chevron={toolbar?.showCaret === false ? null : undefined} + chevron={showCaret === false ? null : undefined} + tooltip={tooltip} > {selectedProvider.trim().length > 0 ? ( diff --git a/packages/app/src/components/ui/combobox-trigger.tsx b/packages/app/src/components/ui/combobox-trigger.tsx index 7bb3683ae4..5cded15437 100644 --- a/packages/app/src/components/ui/combobox-trigger.tsx +++ b/packages/app/src/components/ui/combobox-trigger.tsx @@ -19,6 +19,7 @@ import { import { StyleSheet, withUnistyles } from "react-native-unistyles"; import { ChevronDown } from "lucide-react-native"; import { ICON_SIZE, type Theme } from "@/styles/theme"; +import { Tooltip, TooltipContent, TooltipTrigger } from "./tooltip"; const ThemedChevronDown = withUnistyles(ChevronDown); @@ -38,6 +39,7 @@ interface ComboboxTriggerProps extends Omit(function ComboboxTrigger( - { children, chevron, style, block = false, onFocus, onBlur, ...props }, + { children, chevron, tooltip, style, block = false, onFocus, onBlur, ...props }, ref, ): ReactElement { const [focused, setFocused] = useState(false); @@ -76,7 +78,7 @@ export const ComboboxTrigger = forwardRef(function C const rowStyle = useMemo(() => [styles.row, block && styles.rowBlock], [block]); - return ( + const button = ( (function C ); + + if (!tooltip) return button; + return ( + + {button} + + {tooltip} + + + ); }); const styles = StyleSheet.create((theme) => ({ diff --git a/packages/app/src/composer/agent-controls/index.tsx b/packages/app/src/composer/agent-controls/index.tsx index 5aca3ad754..0b4d1e11b8 100644 --- a/packages/app/src/composer/agent-controls/index.tsx +++ b/packages/app/src/composer/agent-controls/index.tsx @@ -30,7 +30,6 @@ import { type AgentModeControlValue, } from "@/composer/agent-controls/mode-control"; import { AdaptiveModalSheet, type SheetHeader } from "@/components/adaptive-modal-sheet"; -import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip"; import type { AgentOptionControl, JsonValue, @@ -798,9 +797,14 @@ function DesktopAgentControlsContent(props: DesktopAgentControlsContentProps) { modelSelectorServerId, } = props; const { action: toggleAction, keys: modelKeys } = useModelPickerShortcut(disabled); + const modelTooltipLabel = t(getAgentControlHintKey("model")); const modelToolbar = useMemo( - () => ({ glyph: glyphs.label, showCaret: presentation.showCarets }), - [glyphs, presentation.showCarets], + () => ({ + glyph: glyphs.label, + showCaret: presentation.showCarets, + tooltip: , + }), + [glyphs.label, presentation.showCarets, modelTooltipLabel, modelKeys], ); const featuresSheetHeader = useMemo( () => ({ title: t("agentControls.features.title") }), @@ -811,40 +815,30 @@ function DesktopAgentControlsContent(props: DesktopAgentControlsContentProps) { return ( <> {canSelectModel ? ( - - - - - - - - - - + + + ) : null} (function FieldTr ): ReactElement { const style = useFieldTriggerStyle(content.variant, disabled); const shortcutKeys = useShortcutKeys(shortcutAction ?? null); - const trigger = ( + const tooltipContent = useMemo( + () => + content.variant === "badge" && tooltip ? ( + + {tooltip} + {shortcutKeys ? : null} + + ) : undefined, + [content.variant, tooltip, shortcutKeys], + ); + return ( (function FieldTr style={style} accessibilityRole="button" accessibilityLabel={accessibilityLabel ?? content.label} + tooltip={tooltipContent} > ); - if (content.variant === "field" || !tooltip) return trigger; - return ( - - - {trigger} - - - - {tooltip} - {shortcutKeys ? : null} - - - - ); }); // Height of a badge. The desktop row sizes from it.