Skip to content

Commit ac56903

Browse files
committed
fix FilterForm getShownFilters
1 parent 56d3465 commit ac56903

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

packages/ra-ui-materialui/src/list/filter/FilterForm.tsx

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import {
99
useContext,
1010
useEffect,
1111
} from 'react';
12-
import { useFormContext } from 'react-hook-form';
1312

1413
import { FilterContext } from '../FilterContext';
1514
import { FilterFormInput } from './FilterFormInput';
@@ -30,8 +29,11 @@ export type FilterFormProps = FilterFormBaseProps;
3029
export const FilterFormBase = (props: FilterFormBaseProps) => {
3130
const { filters } = props;
3231
const resource = useResourceContext(props);
33-
const form = useFormContext();
34-
const { displayedFilters = {}, hideFilter } = useListContext();
32+
const {
33+
displayedFilters = {},
34+
filterValues,
35+
hideFilter,
36+
} = useListContext();
3537

3638
useEffect(() => {
3739
if (!filters) return;
@@ -46,7 +48,7 @@ export const FilterFormBase = (props: FilterFormBaseProps) => {
4648

4749
const getShownFilters = () => {
4850
if (!filters) return [];
49-
const values = form.getValues();
51+
const values = filterValues;
5052
return filters.filter((filterElement: React.ReactElement) => {
5153
const filterValue = get(values, filterElement.props.source);
5254
return (

0 commit comments

Comments
 (0)