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

Fixed Show clear filter menu if emptyModes filter fns is selected #914

Merged
merged 4 commits into from
Jan 5, 2024
Merged

Fixed Show clear filter menu if emptyModes filter fns is selected #914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eeb8fe2
Hide clear filter menu
alexzrp Jan 4, 2024
c93b423
sort
KevinVandy Jan 5, 2024
a8fb70c
Merge branch 'v2' into patch-1
KevinVandy Jan 5, 2024
8f008f6
fix clear menu item instead of remove
KevinVandy Jan 5, 2024
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
9 changes: 8 additions & 1 deletion packages/material-react-table/src/menus/MRT_ColumnActionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export const MRT_ColumnActionMenu = <TData extends MRT_RowData>({
renderColumnActionsMenuItems,
},
refs: { filterInputRefs },
setColumnFilterFns,
setColumnOrder,
setColumnSizingInfo,
setShowColumnFilters,
Expand Down Expand Up @@ -119,8 +120,14 @@ export const MRT_ColumnActionMenu = <TData extends MRT_RowData>({
};

const handleClearFilter = () => {
column.setFilterValue('');
column.setFilterValue(undefined);
setAnchorEl(null);
if (['empty', 'notEmpty'].includes(columnDef._filterFn)) {
setColumnFilterFns((prev) => ({
...prev,
[header.id]: allowedColumnFilterOptions?.[0] ?? 'fuzzy',
}));
}
};

const handleFilterByColumn = () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/material-react-table/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ export type MRT_RowSelectionState = RowSelectionState;
export type MRT_SortingState = SortingState;
export type MRT_Updater<T> = Updater<T>;
export type MRT_VirtualItem = VirtualItem;
export type MRT_VisibilityState = VisibilityState;

export type MRT_VirtualizerOptions<
TScrollElement extends Element | Window = Element | Window,
TItemElement extends Element = Element,
> = VirtualizerOptions<TScrollElement, TItemElement>;
export type MRT_VisibilityState = VisibilityState;

export type MRT_ColumnVirtualizer<
TScrollElement extends Element | Window = HTMLDivElement,
Expand Down