Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display label in autocomplete filter text input, not value #972

Merged
merged 1 commit into from Feb 5, 2024
Merged

Display label in autocomplete filter text input, not value #972

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
65 changes: 35 additions & 30 deletions packages/material-react-table/src/components/inputs/MRT_FilterTextField.tsx
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@ import {
type TimePickerProps,
} from '@mui/x-date-pickers/TimePicker';
import {
type DropdownOption,
type MRT_Header,
type MRT_RowData,
type MRT_TableInstance,
Expand Down Expand Up @@ -433,37 +434,41 @@ export const MRT_FilterTextField = <TData extends MRT_RowData>({
},
}}
/>
) : isAutocompleteFilter ? (
<Autocomplete
freeSolo
getOptionLabel={(option) => getValueAndLabel(option).label}
onChange={(_e, newValue) =>
handleChange(getValueAndLabel(newValue).value)
}
options={
dropdownOptions?.map((option) => getValueAndLabel(option)) ?? []
}
{...autocompleteProps}
renderInput={(builtinTextFieldProps) => (
<TextField
{...builtinTextFieldProps}
{...commonTextFieldProps}
InputProps={{
...builtinTextFieldProps.InputProps,
startAdornment:
) : isAutocompleteFilter ? (() => {
const [autocompleteValue, setAutocompleteValue] = useState<DropdownOption | null>(null);
const handleAutocompleteChange = (newValue: DropdownOption) => {
setAutocompleteValue(newValue);
handleChange(getValueAndLabel(newValue).value);
};
return <Autocomplete
freeSolo
getOptionLabel={(option) => getValueAndLabel(option).label}
onChange={(_e, newValue) => handleAutocompleteChange(newValue)}
options={
dropdownOptions?.map((option) => getValueAndLabel(option)) ?? []
}
{...autocompleteProps}
renderInput={(builtinTextFieldProps) => (
<TextField
{...builtinTextFieldProps}
{...commonTextFieldProps}
InputProps={{
...builtinTextFieldProps.InputProps,
startAdornment:
commonTextFieldProps?.InputProps?.startAdornment,
}}
inputProps={{
...builtinTextFieldProps.inputProps,
...commonTextFieldProps?.inputProps,
}}
onChange={handleTextFieldChange}
onClick={(e: MouseEvent<HTMLInputElement>) => e.stopPropagation()}
/>
)}
value={filterValue}
/>
) : (
}}
inputProps={{
...builtinTextFieldProps.inputProps,
...commonTextFieldProps?.inputProps,
}}
onChange={handleTextFieldChange}
onClick={(e: MouseEvent<HTMLInputElement>) => e.stopPropagation()}
/>
)}
value={autocompleteValue}
/>;
}
)() : (
<TextField
select={isSelectFilter || isMultiSelectFilter}
{...commonTextFieldProps}
Expand Down