Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@

import { cx } from '../../lib/cx';

import type { ComponentChildren, ComponentProps, Renderer } from '../../types';
import type {
ComponentChildren,
ComponentProps,
MutableRef,
Renderer,
} from '../../types';

export type AutocompleteProps = Omit<ComponentProps<'div'>, 'children'> & {
children?: ComponentChildren;
classNames?: Partial<AutocompleteClassNames>;
rootRef?: MutableRef<HTMLDivElement | null>;
};

export type AutocompleteClassNames = {
Expand Down Expand Up @@ -54,10 +60,14 @@ export type AutocompleteClassNames = {

export function createAutocompleteComponent({ createElement }: Renderer) {
return function Autocomplete(userProps: AutocompleteProps) {
const { children, classNames = {}, ...props } = userProps;
const { children, classNames = {}, rootRef, ...props } = userProps;

return (
<div className={cx('ais-Autocomplete', classNames.root)} {...props}>
<div
className={cx('ais-Autocomplete', classNames.root)}
ref={rootRef}
{...props}
>
{children}
</div>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -842,10 +842,11 @@ function AutocompleteWrapper<TItem extends BaseHit>({
),
}
: cssClasses;
const { ref: rootRef, ...rootProps } = getRootProps();

if (isDetached) {
return (
<Autocomplete {...getRootProps()} classNames={cssClasses}>
<Autocomplete {...rootProps} rootRef={rootRef} classNames={cssClasses}>
<AutocompleteDetachedSearchButton
query={localQuery}
placeholder={placeholder}
Expand Down Expand Up @@ -890,7 +891,7 @@ function AutocompleteWrapper<TItem extends BaseHit>({

// Normal (non-detached) rendering
return (
<Autocomplete {...getRootProps()} classNames={cssClasses}>
<Autocomplete {...rootProps} rootRef={rootRef} classNames={cssClasses}>
{searchBoxContent}
{panelContent}
</Autocomplete>
Expand Down
15 changes: 13 additions & 2 deletions packages/react-instantsearch/src/widgets/Autocomplete.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -898,10 +898,16 @@ function InnerAutocomplete<TItem extends BaseHit = BaseHit>({
),
}
: classNames;
const { ref: rootRef, ...rootProps } = getRootProps();

if (isDetached) {
return (
<Autocomplete {...props} {...getRootProps()} classNames={classNames}>
<Autocomplete
{...props}
{...rootProps}
rootRef={rootRef}
classNames={classNames}
>
<AutocompleteDetachedSearchButton
query={currentRefinement || indexUiState.query || ''}
placeholder={placeholder}
Expand Down Expand Up @@ -947,7 +953,12 @@ function InnerAutocomplete<TItem extends BaseHit = BaseHit>({

// Normal (non-detached) rendering
return (
<Autocomplete {...props} {...getRootProps()} classNames={classNames}>
<Autocomplete
{...props}
{...rootProps}
rootRef={rootRef}
classNames={classNames}
>
{searchBoxContent}
{panelContent}
</Autocomplete>
Expand Down