Skip to content

Commit 71e8a95

Browse files
prestonwebdevclaude
andcommitted
refactor(mosaic): split the combobox clear button from the trigger
Adds a Combobox.Clear part that renders only while there is text or a selection, so the trigger stays a plain toggle with its own label and ARIA state. Opening on input click now uses Floating UI's useClick, and the styled combobox, not InputGroup, opens the list when the group padding is clicked. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
1 parent 12acdb5 commit 71e8a95

14 files changed

Lines changed: 185 additions & 116 deletions

File tree

‎packages/mosaic/src/components/combobox/combobox.styles.ts‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ export const styles = stylex.create({
127127

128128
export const trigger = stylex.create({
129129
base: {
130-
placeItems: 'center',
131130
backgroundColor: 'transparent',
132131
color: {
133132
default: colorVars['--cl-color-input-placeholder'],
@@ -136,32 +135,21 @@ export const trigger = stylex.create({
136135
[stylex.when.ancestor(':hover', inputGroupScope)]: colorVars['--cl-color-foreground'],
137136
},
138137
},
139-
display: 'inline-grid',
140138
},
141-
icon: {
142-
gridColumn: '1',
143-
gridRow: '1',
144-
transitionDuration: {
145-
default: durationVars['--cl-duration-base'],
146-
'@media (prefers-reduced-motion: reduce)': durationVars['--cl-duration-instant'],
147-
},
148-
transitionProperty: 'opacity, transform',
149-
transitionTimingFunction: easingVars['--cl-ease-enter'],
139+
clear: {
140+
marginInlineEnd: `calc(-1 * ${space['2']})`,
141+
width: space['5.5'],
150142
},
151143
chevron: {
152-
opacity: {
153-
default: 1,
154-
[stylex.when.ancestor('[data-clearing]', comboboxTriggerScope)]: 0,
155-
},
156144
transform: {
157145
default: null,
158146
[stylex.when.ancestor('[data-open]', comboboxTriggerScope)]: 'rotate(180deg)',
159147
},
160-
},
161-
clear: {
162-
opacity: {
163-
default: 0,
164-
[stylex.when.ancestor('[data-clearing]', comboboxTriggerScope)]: 1,
148+
transitionDuration: {
149+
default: durationVars['--cl-duration-base'],
150+
'@media (prefers-reduced-motion: reduce)': durationVars['--cl-duration-instant'],
165151
},
152+
transitionProperty: 'transform',
153+
transitionTimingFunction: easingVars['--cl-ease-enter'],
166154
},
167155
});

‎packages/mosaic/src/components/combobox/combobox.test.tsx‎

Lines changed: 63 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -356,22 +356,18 @@ describe('Mosaic Combobox', () => {
356356
expect(screen.getByText('No matches')).toHaveClass('cl-combobox-empty');
357357
});
358358

359-
it('clears the input and selection from a clearable trigger', async () => {
360-
const user = userEvent.setup();
361-
const onValueChange = vi.fn();
362-
render(
359+
function ClearableCombobox(props?: { onValueChange?: (value: string | null) => void }) {
360+
return (
363361
<Combobox.Root
364362
defaultValue='apple'
365363
defaultInputValue='Apple'
366-
onValueChange={onValueChange}
364+
onValueChange={props?.onValueChange}
367365
>
368366
<InputGroup.Root>
369367
<Combobox.Input aria-label='Fruit' />
370368
<InputGroup.End>
371-
<Combobox.Trigger
372-
clearable
373-
aria-label='Toggle fruit options'
374-
/>
369+
<Combobox.Clear />
370+
<Combobox.Trigger aria-label='Toggle fruit options' />
375371
</InputGroup.End>
376372
</InputGroup.Root>
377373
<Combobox.Popup>
@@ -382,22 +378,75 @@ describe('Mosaic Combobox', () => {
382378
Apple
383379
</Combobox.Option>
384380
</Combobox.Popup>
385-
</Combobox.Root>,
381+
</Combobox.Root>
386382
);
383+
}
384+
385+
it('clears the input and selection from the Clear button and keeps focus on the input', async () => {
386+
const user = userEvent.setup();
387+
const onValueChange = vi.fn();
388+
render(<ClearableCombobox onValueChange={onValueChange} />);
387389

388390
await user.click(screen.getByRole('button', { name: 'Clear' }));
389391

390392
expect(onValueChange).toHaveBeenCalledWith(null);
391393
expect(screen.getByRole('combobox', { name: 'Fruit' })).toHaveValue('');
392394
expect(screen.getByRole('combobox', { name: 'Fruit' })).toHaveFocus();
393-
expect(screen.getByRole('button', { name: 'Toggle fruit options' })).toBeInTheDocument();
394395
});
395396

396-
it('keeps toggling the list when the trigger is not clearable', async () => {
397+
it('renders Clear only while there is an input value or a selection', async () => {
397398
const user = userEvent.setup();
398-
render(<FloatingCombobox />);
399+
render(
400+
<Combobox.Root>
401+
<InputGroup.Root>
402+
<Combobox.Input aria-label='Fruit' />
403+
<InputGroup.End>
404+
<Combobox.Clear />
405+
</InputGroup.End>
406+
</InputGroup.Root>
407+
</Combobox.Root>,
408+
);
399409

400-
await user.type(screen.getByRole('combobox', { name: 'Fruit' }), 'ap');
401410
expect(screen.queryByRole('button', { name: 'Clear' })).not.toBeInTheDocument();
411+
await user.type(screen.getByRole('combobox', { name: 'Fruit' }), 'a');
412+
expect(screen.getByRole('button', { name: 'Clear' })).toBeInTheDocument();
413+
});
414+
415+
it('opens the list when the padding of its input group is clicked', async () => {
416+
const user = userEvent.setup();
417+
render(
418+
<Combobox.Root>
419+
<InputGroup.Root data-testid='fruit-group'>
420+
<Combobox.Input aria-label='Fruit' />
421+
</InputGroup.Root>
422+
<Combobox.Popup>
423+
<Combobox.Option
424+
value='apple'
425+
label='Apple'
426+
>
427+
Apple
428+
</Combobox.Option>
429+
</Combobox.Popup>
430+
</Combobox.Root>,
431+
);
432+
433+
await user.click(screen.getByTestId('fruit-group'));
434+
435+
expect(await screen.findByRole('listbox')).toBeInTheDocument();
436+
expect(screen.getByRole('combobox', { name: 'Fruit' })).toHaveFocus();
437+
});
438+
439+
it('keeps the trigger toggling the list with its own name while there is text', async () => {
440+
const user = userEvent.setup();
441+
render(<ClearableCombobox />);
442+
443+
const trigger = screen.getByRole('button', { name: 'Toggle fruit options' });
444+
expect(trigger).toHaveAttribute('aria-expanded', 'false');
445+
446+
await user.click(trigger);
447+
expect(trigger).toHaveAttribute('aria-expanded', 'true');
448+
449+
await user.click(trigger);
450+
expect(trigger).toHaveAttribute('aria-expanded', 'false');
402451
});
403452
});

‎packages/mosaic/src/components/combobox/combobox.tsx‎

Lines changed: 57 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@ import { styles, trigger } from './combobox.styles';
2222

2323
export type ComboboxRootProps = ComboboxProps;
2424
export type ComboboxSize = 'sm' | 'md' | 'lg';
25-
export interface ComboboxTriggerProps extends MosaicComponentProps<'button'> {
26-
/** Swaps the chevron for a clear button while the input has text or a selection. */
27-
clearable?: boolean;
28-
/** Accessible name while the trigger clears. Defaults to `Clear`. */
29-
clearLabel?: string;
30-
}
25+
export type ComboboxTriggerProps = MosaicComponentProps<'button'>;
26+
export type ComboboxClearProps = MosaicComponentProps<'button'>;
3127
export const ComboboxCollection = HeadlessCombobox.Collection;
3228

3329
const ComboboxAnchorContext = React.createContext<{
@@ -38,6 +34,23 @@ const ComboboxAnchorContext = React.createContext<{
3834
export function ComboboxRoot({ sideOffset = 8, openOnInputClick = true, ...props }: ComboboxRootProps) {
3935
const [anchor, setAnchor] = React.useState<HTMLElement | null>(null);
4036
const context = React.useMemo(() => ({ anchor, setAnchor }), [anchor]);
37+
React.useEffect(() => {
38+
if (!anchor || !openOnInputClick || props.inline) {
39+
return;
40+
}
41+
const openFromPadding = (event: MouseEvent) => {
42+
if (event.defaultPrevented || !(event.target instanceof Element)) {
43+
return;
44+
}
45+
const interactive = event.target.closest('input, button, a[href], select, textarea');
46+
if (interactive && anchor.contains(interactive)) {
47+
return;
48+
}
49+
anchor.querySelector('input')?.click();
50+
};
51+
anchor.addEventListener('click', openFromPadding);
52+
return () => anchor.removeEventListener('click', openFromPadding);
53+
}, [anchor, openOnInputClick, props.inline]);
4154
return (
4255
<ComboboxAnchorContext.Provider value={context}>
4356
<HeadlessCombobox.Root
@@ -50,50 +63,61 @@ export function ComboboxRoot({ sideOffset = 8, openOnInputClick = true, ...props
5063
}
5164

5265
export const ComboboxTrigger = React.forwardRef<HTMLButtonElement, ComboboxTriggerProps>(function MosaicComboboxTrigger(
53-
{ xstyle, clearable, render, children, ...rest },
66+
{ xstyle, render, children, ...rest },
5467
ref,
5568
) {
56-
const defaultRender: ComboboxTriggerProps['render'] =
57-
render ??
58-
(children === undefined
59-
? props => (
69+
return (
70+
<HeadlessCombobox.Trigger
71+
ref={ref}
72+
render={
73+
render ??
74+
(props => (
6075
<Button
6176
xstyle={[trigger.base, comboboxTriggerScope]}
6277
{...props}
6378
/>
64-
)
65-
: undefined);
66-
67-
return (
68-
<HeadlessCombobox.Trigger
69-
ref={ref}
70-
clearable={clearable}
71-
render={defaultRender}
79+
))
80+
}
7281
{...mergeStyleProps(themeProps('combobox-trigger'), stylex.props(xstyle), rest)}
7382
>
74-
{children ?? <ComboboxTriggerIcons clearable={clearable} />}
83+
{children ?? (
84+
<Icon
85+
glyph={ChevronDown}
86+
size='md'
87+
xstyle={trigger.chevron}
88+
/>
89+
)}
7590
</HeadlessCombobox.Trigger>
7691
);
7792
});
7893

79-
function ComboboxTriggerIcons({ clearable }: { clearable?: boolean }) {
94+
export const ComboboxClear = React.forwardRef<HTMLButtonElement, ComboboxClearProps>(function MosaicComboboxClear(
95+
{ xstyle, render, children, ...rest },
96+
ref,
97+
) {
8098
return (
81-
<>
82-
<Icon
83-
glyph={ChevronDown}
84-
size='md'
85-
xstyle={[trigger.icon, trigger.chevron]}
86-
/>
87-
{clearable ? (
99+
<HeadlessCombobox.Clear
100+
ref={ref}
101+
render={
102+
render ??
103+
(props => (
104+
<Button
105+
xstyle={[trigger.base, trigger.clear]}
106+
{...props}
107+
/>
108+
))
109+
}
110+
{...mergeStyleProps(themeProps('combobox-clear'), stylex.props(xstyle), rest)}
111+
>
112+
{children ?? (
88113
<Icon
89114
glyph={X}
90115
size='md'
91-
xstyle={[trigger.icon, trigger.clear]}
92116
/>
93-
) : null}
94-
</>
117+
)}
118+
</HeadlessCombobox.Clear>
95119
);
96-
}
120+
});
97121

98122
export interface ComboboxInputProps extends Omit<MosaicComponentProps<'input'>, 'size'> {
99123
size?: ComboboxSize;
@@ -249,6 +273,7 @@ export const Combobox = {
249273
Collection: ComboboxCollection,
250274
Input: ComboboxInput,
251275
Trigger: ComboboxTrigger,
276+
Clear: ComboboxClear,
252277
Popup: ComboboxPopup,
253278
List: ComboboxList,
254279
Option: ComboboxOption,

‎packages/mosaic/src/components/combobox/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
export {
22
Combobox,
3+
ComboboxClear,
34
ComboboxCollection,
45
ComboboxEmpty,
56
ComboboxInput,
@@ -11,6 +12,7 @@ export {
1112
ComboboxTrigger,
1213
} from './combobox';
1314
export type {
15+
ComboboxClearProps,
1416
ComboboxEmptyProps,
1517
ComboboxInputProps,
1618
ComboboxListProps,

‎packages/mosaic/src/components/input-group/input-group.tsx‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ const Root = React.forwardRef<HTMLDivElement, InputGroupRootProps>(function Mosa
7171
return;
7272
}
7373
inputElementRef.current?.focus();
74-
inputElementRef.current?.click();
7574
},
7675
},
7776
});
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
'use client';
2+
3+
import React from 'react';
4+
5+
import { type ComponentProps, type DefaultProps, mergeProps, useRender } from '../utils';
6+
import { useComboboxContext } from './combobox-context';
7+
8+
export type ComboboxClearProps = ComponentProps<'button'>;
9+
10+
export const ComboboxClear = React.forwardRef<HTMLButtonElement, ComboboxClearProps>(
11+
function ComboboxClear(props, ref) {
12+
const { render, ...otherProps } = props;
13+
const { inputValue, selectedValue, clear } = useComboboxContext();
14+
15+
const defaultProps = {
16+
type: 'button',
17+
tabIndex: -1,
18+
'aria-label': 'Clear',
19+
onPointerDown(event: React.PointerEvent<HTMLButtonElement>) {
20+
event.preventDefault();
21+
},
22+
onClick() {
23+
clear();
24+
},
25+
} satisfies DefaultProps<'button'>;
26+
27+
const element = useRender({
28+
defaultTagName: 'button',
29+
render,
30+
ref,
31+
props: mergeProps<'button'>(defaultProps, otherProps),
32+
});
33+
34+
return inputValue !== '' || selectedValue !== null ? element : null;
35+
},
36+
);

‎packages/mosaic/src/primitives/combobox/combobox-context.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import type { TransitionProps } from '../hooks/use-transition';
1111

1212
export interface ComboboxContextValue {
1313
open: boolean;
14-
hasValue: boolean;
1514
clear: () => void;
1615
inputValue: string;
1716
filterQuery: string;
@@ -34,7 +33,6 @@ export interface ComboboxContextValue {
3433
handleSelect: (value: string, index: number, label: string) => void;
3534
handleInputChange: (value: string) => void;
3635
setOpen: (open: boolean) => void;
37-
openOnInputClick: boolean;
3836
focusInput: () => void;
3937
popupId: string | undefined;
4038
mounted: boolean;

‎packages/mosaic/src/primitives/combobox/combobox-input.tsx‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ export const ComboboxInput = React.forwardRef<HTMLInputElement, ComboboxInputPro
1515
activeIndex,
1616
refs,
1717
getReferenceProps,
18-
openOnInputClick,
19-
setOpen,
2018
handleInputChange,
2119
handleSelect,
2220
labelsRef,
@@ -32,11 +30,6 @@ export const ComboboxInput = React.forwardRef<HTMLInputElement, ComboboxInputPro
3230
onChange(event: React.ChangeEvent<HTMLInputElement>) {
3331
handleInputChange(event.target.value);
3432
},
35-
onClick() {
36-
if (openOnInputClick) {
37-
setOpen(true);
38-
}
39-
},
4033
onKeyDown(event: React.KeyboardEvent<HTMLInputElement>) {
4134
if (event.key === 'Enter' && activeIndex != null) {
4235
const value = valuesByIndexRef.current.get(activeIndex);

0 commit comments

Comments
 (0)