Skip to content

Commit d6d54aa

Browse files
committed
filter fix
1 parent 13402d9 commit d6d54aa

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

src/lib/ReactDataTable/ReactDataTable.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,10 @@ const ReactDataTable = <TData,>(props: ReactDataTableProps<TData>) => {
124124
<Input
125125
type="select"
126126
onChange={(e) => {
127-
header.column.setFilterValue(e.target.value);
127+
header.column.setFilterValue(
128+
meta.dropdownFilter?.options[(e.target as any as HTMLSelectElement).selectedIndex]?.value ??
129+
e.target.value,
130+
);
128131
}}
129132
onKeyUp={({ key }) => {
130133
if (key === "Enter" && onEnter) {

src/lib/useReactDataTable/useReactDataTable.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ const useReactDataTable = <TData,>(props: useReactDataTableProps<TData>): useRea
4545
const effectiveOnPaginationChange = onPaginationChange ?? setPaginationInternal;
4646
const effectiveOnSortingChange = onSortingChange ?? setSortingInternal;
4747

48+
// If we active the manual filtering, we have to unset the filterfunction, else it still does automatic filtering
49+
if (manualFiltering) columns.forEach((x) => (x.filterFn = undefined));
50+
4851
const skeletonColumns = columns.map((column) => ({
4952
...column,
5053
cell: () => <Skeleton />,

0 commit comments

Comments
 (0)