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

Swap filter select variant icons #1008

Closed
wants to merge 5 commits into from
Closed

Swap filter select variant icons #1008

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c80968e
filterSelectOptions filter tooltip displays label
loughlinclaus3 Feb 21, 2024
ce9779a
Swaps `select`/`multi-select` filterVariant icons
loughlinclaus3 Feb 26, 2024
e5d49ee
Merge branch 'v2' into swap-filterSelectVariant-Icons
loughlinclaus3 Feb 26, 2024
e403693
removed unused useMemo from prior commit
loughlinclaus3 Feb 26, 2024
18af8af
removed `pr` automatically added in filter select
loughlinclaus3 Feb 27, 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: 4 additions & 5 deletions packages/material-react-table/src/components/inputs/MRT_FilterTextField.tsx
View file
Open in desktop
Expand Up @@ -57,7 +57,7 @@ export const MRT_FilterTextField = <TData extends MRT_RowData>({
const {
options: {
enableColumnFilterModes,
icons: { CloseIcon, FilterListIcon },
icons: { ArrowDropDownIcon, CloseIcon, FilterListIcon },
localization,
manualFiltering,
muiFilterAutocompleteProps,
Expand Down Expand Up @@ -263,10 +263,7 @@ export const MRT_FilterTextField = <TData extends MRT_RowData>({

const endAdornment =
!isAutocompleteFilter && !isDateFilter && !filterChipLabel ? (
<InputAdornment
position="end"
sx={{ mr: isSelectFilter || isMultiSelectFilter ? '20px' : undefined }}
>
<InputAdornment position="end">
<Tooltip placement="right" title={localization.clearFilter ?? ''}>
<span>
<IconButton
Expand Down Expand Up @@ -471,6 +468,8 @@ export const MRT_FilterTextField = <TData extends MRT_RowData>({
MenuProps: { disableScrollLock: true },
displayEmpty: true,
multiple: isMultiSelectFilter,
SelectDisplayProps: { style: { paddingRight: 0 } },
IconComponent: () => <ArrowDropDownIcon />,
renderValue: isMultiSelectFilter
? (selected: any) =>
!selected?.length ? (
Expand Down
2 changes: 2 additions & 0 deletions packages/material-react-table/src/icons.ts
View file
Open in desktop
@@ -1,4 +1,5 @@
import ArrowDownwardIcon from '@mui/icons-material/ArrowDownward';
import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
import ArrowRightIcon from '@mui/icons-material/ArrowRight';
import CancelIcon from '@mui/icons-material/Cancel';
import ChevronLeftIcon from '@mui/icons-material/ChevronLeft';
Expand Down Expand Up @@ -35,6 +36,7 @@ import VisibilityOffIcon from '@mui/icons-material/VisibilityOff';

export const MRT_Default_Icons = {
ArrowDownwardIcon,
ArrowDropDownIcon,
ArrowRightIcon,
CancelIcon,
ChevronLeftIcon,
Expand Down