Keep the model tooltip closed when opening the picker

Pressing the model picker shortcut now focuses search without opening the button tooltip. Attach picker hints to the shared trigger button so focus inside the picker stays independent.
This commit is contained in:
Mohamed Boudra
2026-11-19 17:26:15 +07:00
committed by GitHub
parent ad3c490a52
commit 69c6bd7464
6 changed files with 80 additions and 63 deletions
+8
View File
@@ -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
@@ -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();
@@ -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({
</View>
);
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 ? (
<View style={toolbar ? styles.toolbarGlyph : styles.glyph}>
@@ -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<PressableProps, "style" | "children"
style?: TriggerStyleProp;
children?: ReactNode;
chevron?: ReactNode | null;
tooltip?: ReactNode;
// Fill the Pressable's width and use the standard sidebar-row gap, so the
// trigger reads as a full-width row: the label expands and the chevron pins to
// the trailing edge. Default (false) keeps the content-width pill used by the
@@ -46,7 +48,7 @@ interface ComboboxTriggerProps extends Omit<PressableProps, "style" | "children"
}
export const ComboboxTrigger = forwardRef<View, ComboboxTriggerProps>(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<View, ComboboxTriggerProps>(function C
const rowStyle = useMemo(() => [styles.row, block && styles.rowBlock], [block]);
return (
const button = (
<Pressable
ref={ref}
collapsable={false}
@@ -96,6 +98,16 @@ export const ComboboxTrigger = forwardRef<View, ComboboxTriggerProps>(function C
</View>
</Pressable>
);
if (!tooltip) return button;
return (
<Tooltip>
<TooltipTrigger asChild>{button}</TooltipTrigger>
<TooltipContent side="top" align="center" offset={8}>
{tooltip}
</TooltipContent>
</Tooltip>
);
});
const styles = StyleSheet.create((theme) => ({
@@ -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: <ControlTooltipHint label={modelTooltipLabel} shortcutKeys={modelKeys} />,
}),
[glyphs.label, presentation.showCarets, modelTooltipLabel, modelKeys],
);
const featuresSheetHeader = useMemo<SheetHeader>(
() => ({ title: t("agentControls.features.title") }),
@@ -811,40 +815,30 @@ function DesktopAgentControlsContent(props: DesktopAgentControlsContentProps) {
return (
<>
{canSelectModel ? (
<Tooltip delayDuration={0} enabledOnDesktop enabledOnMobile={false}>
<TooltipTrigger asChild triggerRefProp="ref">
<View style={styles.modelControl}>
<CombinedModelSelector
providers={modelSelectorProviders}
selectedProvider={provider}
selectedModel={selectedModelId ?? ""}
onSelect={handleDesktopModelSelect}
profiles={agentProfiles}
onApplyProfile={onApplyAgentProfile}
onEditProfiles={onEditAgentProfiles}
onCreateProfile={onCreateAgentProfile}
onEditProfile={onEditAgentProfile}
isLoading={isModelLoading}
disabled={disabled}
toggleAction={toggleAction}
onOpen={onModelSelectorOpen}
onClose={onDropdownClose}
onRetryProvider={onRetryModelProvider}
isRetryingProvider={isRetryingModelProvider}
serverId={modelSelectorServerId}
desktopPlacement="top-start"
desktopMinWidth={360}
toolbar={modelToolbar}
/>
</View>
</TooltipTrigger>
<TooltipContent side="top" align="center" offset={8}>
<ControlTooltipHint
label={t(getAgentControlHintKey("model"))}
shortcutKeys={modelKeys}
/>
</TooltipContent>
</Tooltip>
<View style={styles.modelControl}>
<CombinedModelSelector
providers={modelSelectorProviders}
selectedProvider={provider}
selectedModel={selectedModelId ?? ""}
onSelect={handleDesktopModelSelect}
profiles={agentProfiles}
onApplyProfile={onApplyAgentProfile}
onEditProfiles={onEditAgentProfiles}
onCreateProfile={onCreateAgentProfile}
onEditProfile={onEditAgentProfile}
isLoading={isModelLoading}
disabled={disabled}
toggleAction={toggleAction}
onOpen={onModelSelectorOpen}
onClose={onDropdownClose}
onRetryProvider={onRetryModelProvider}
isRetryingProvider={isRetryingModelProvider}
serverId={modelSelectorServerId}
desktopPlacement="top-start"
desktopMinWidth={360}
toolbar={modelToolbar}
/>
</View>
) : null}
<ComposerControls
@@ -1,10 +1,9 @@
import { forwardRef, useCallback, type ReactElement, type ReactNode } from "react";
import { forwardRef, useCallback, useMemo, type ReactElement, type ReactNode } from "react";
import { Text, View, type PressableStateCallbackType } from "react-native";
import { StyleSheet, withUnistyles } from "react-native-unistyles";
import { ChevronDown } from "lucide-react-native";
import { ComboboxTrigger } from "@/components/ui/combobox-trigger";
import { CONTROL_HEIGHTS } from "@/components/ui/control-geometry";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import { Shortcut } from "@/components/ui/shortcut";
import { useShortcutKeys } from "@/hooks/use-shortcut-keys";
import { ICON_SIZE, type Theme } from "@/styles/theme";
@@ -114,7 +113,17 @@ export const FieldTrigger = forwardRef<View, FieldTriggerProps>(function FieldTr
): ReactElement {
const style = useFieldTriggerStyle(content.variant, disabled);
const shortcutKeys = useShortcutKeys(shortcutAction ?? null);
const trigger = (
const tooltipContent = useMemo(
() =>
content.variant === "badge" && tooltip ? (
<View style={styles.tooltipRow}>
<Text style={styles.tooltipText}>{tooltip}</Text>
{shortcutKeys ? <Shortcut chord={shortcutKeys} /> : null}
</View>
) : undefined,
[content.variant, tooltip, shortcutKeys],
);
return (
<ComboboxTrigger
ref={ref}
chevron={null}
@@ -125,24 +134,11 @@ export const FieldTrigger = forwardRef<View, FieldTriggerProps>(function FieldTr
style={style}
accessibilityRole="button"
accessibilityLabel={accessibilityLabel ?? content.label}
tooltip={tooltipContent}
>
<FieldTriggerContent {...content} />
</ComboboxTrigger>
);
if (content.variant === "field" || !tooltip) return trigger;
return (
<Tooltip>
<TooltipTrigger asChild triggerRefProp="ref">
{trigger}
</TooltipTrigger>
<TooltipContent side="top" align="center" offset={8}>
<View style={styles.tooltipRow}>
<Text style={styles.tooltipText}>{tooltip}</Text>
{shortcutKeys ? <Shortcut chord={shortcutKeys} /> : null}
</View>
</TooltipContent>
</Tooltip>
);
});
// Height of a badge. The desktop row sizes from it.