@@ -22,12 +22,8 @@ import { styles, trigger } from './combobox.styles';
2222
2323export type ComboboxRootProps = ComboboxProps ;
2424export 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' > ;
3127export const ComboboxCollection = HeadlessCombobox . Collection ;
3228
3329const ComboboxAnchorContext = React . createContext < {
@@ -38,6 +34,23 @@ const ComboboxAnchorContext = React.createContext<{
3834export 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
5265export 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
98122export 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 ,
0 commit comments