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.

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

[DataGrid] Header filter design improvements #15991

Merged
merged 25 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
e6c629e
change header filter variant and update styling
KenanYusuf Dec 9, 2024
c61dbd1
Merge branch 'master' into header-filter-design
KenanYusuf Dec 10, 2024
73bcdde
small inputs
KenanYusuf Dec 11, 2024
0b704af
Merge branch 'master' into header-filter-design
KenanYusuf Dec 23, 2024
ebea8b3
update clear button design
KenanYusuf Dec 23, 2024
7bfafa2
Merge branch 'master' into header-filter-design
KenanYusuf Dec 23, 2024
cebcb87
apply styles to header filter class
KenanYusuf Dec 23, 2024
e9d3fcd
update styles
KenanYusuf Dec 24, 2024
c96bdc9
update demos
KenanYusuf Dec 24, 2024
b0621f9
Merge branch 'master' into header-filter-design
KenanYusuf Dec 24, 2024
85c15f6
add test
KenanYusuf Dec 24, 2024
6efe0da
Merge branch 'master' into header-filter-design
KenanYusuf Jan 2, 2025
ea0db1d
fix keyboard navigation
KenanYusuf Jan 2, 2025
0502511
updates
KenanYusuf Jan 2, 2025
d357d84
Merge branch 'master' into header-filter-design
KenanYusuf Jan 2, 2025
0d13012
update headerFilterHeight test
KenanYusuf Jan 2, 2025
00e0397
clarify doc
KenanYusuf Jan 2, 2025
5969b6d
Merge branch 'master' into header-filter-design
KenanYusuf Jan 3, 2025
248dcfb
update migration guide
KenanYusuf Jan 8, 2025
4f1980e
show clear button with initial filter model
KenanYusuf Jan 8, 2025
760b478
fix disabled state
KenanYusuf Jan 8, 2025
585e71d
Run script
MBilalShafi Jan 13, 2025
fb67602
Merge branch 'master' into header-filter-design
KenanYusuf Jan 14, 2025
5f960b1
render label instead of disabled input for no-input filter operators
KenanYusuf Jan 15, 2025
d96b3c6
Merge branch 'master' into header-filter-design
KenanYusuf Jan 16, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,28 +32,17 @@ function RatingInputValue(
};

return (
<React.Fragment>
<Box sx={{ display: 'flex', justifyContent: 'flex-end', width: '100%' }}>
<Rating
name="custom-rating-filter-operator"
value={Number(item.value)}
onChange={handleFilterChange}
precision={0.5}
ref={ratingRef}
/>
{headerFilterMenu}
<Box
sx={{
display: 'inline-flex',
flexDirection: 'row',
alignItems: 'center',
height: '100%',
pl: '10px',
bl: '1px solid lightgrey',
}}
>
<Rating
name="custom-rating-filter-operator"
value={Number(item.value)}
onChange={handleFilterChange}
precision={0.5}
ref={ratingRef}
/>
</Box>
{clearButton}
</React.Fragment>
</Box>
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,12 @@ function AdminFilter(props: GridRenderHeaderFilterProps) {
const label = !value ? 'Filter' : 'Is admin';

return (
<FormControl variant="standard" sx={{ m: 1, minWidth: 120 }} fullWidth>
<FormControl
variant="outlined"
size="small"
sx={{ '.MuiOutlinedInput-input': { fontSize: 14 } }}
fullWidth
>
<InputLabel id="select-is-admin-label">{label}</InputLabel>
<Select
labelId="select-is-admin-label"
Expand Down
Loading
Loading