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

[DataGrid] Header filter design improvements #15991

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

[DataGrid] Header filter design improvements #15991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 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
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
2 changes: 1 addition & 1 deletion docs/data/data-grid/filtering/CustomHeaderFilterDataGridPro.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function CustomHeaderFilter(props) {
<Stack
sx={[
{
borderTop: `1px solid var(--DataGrid-rowBorderColor)`,
borderBottom: `1px solid var(--DataGrid-rowBorderColor)`,
},
hasFocus
? {
Expand Down
2 changes: 1 addition & 1 deletion docs/data/data-grid/filtering/CustomHeaderFilterDataGridPro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function CustomHeaderFilter(props: GridHeaderFilterCellProps) {
<Stack
sx={[
{
borderTop: `1px solid var(--DataGrid-rowBorderColor)`,
borderBottom: `1px solid var(--DataGrid-rowBorderColor)`,
},
hasFocus
? {
Expand Down
29 changes: 9 additions & 20 deletions docs/data/data-grid/filtering/CustomHeaderFilterOperatorDataGridPro.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,28 +23,17 @@ function RatingInputValue(props) {
};

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
29 changes: 9 additions & 20 deletions docs/data/data-grid/filtering/CustomHeaderFilterOperatorDataGridPro.tsx
View file
Open in desktop
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
3 changes: 2 additions & 1 deletion docs/data/data-grid/filtering/CustomHeaderFilterSingleDataGridPro.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,15 @@ function AdminFilter(props) {
const label = !value ? 'Filter' : 'Is admin';

return (
<FormControl variant="standard" sx={{ m: 1, minWidth: 120 }} fullWidth>
<FormControl variant="outlined" size="small" fullWidth>
<InputLabel id="select-is-admin-label">{label}</InputLabel>
<Select
labelId="select-is-admin-label"
id="select-is-admin"
value={value}
onChange={handleChange}
label={label}
inputProps={{ sx: { fontSize: 14 } }}
>
<MenuItem value="">
<em>None</em>
Expand Down
3 changes: 2 additions & 1 deletion docs/data/data-grid/filtering/CustomHeaderFilterSingleDataGridPro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,15 @@ 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" fullWidth>
<InputLabel id="select-is-admin-label">{label}</InputLabel>
<Select
labelId="select-is-admin-label"
id="select-is-admin"
value={value}
onChange={handleChange}
label={label}
inputProps={{ sx: { fontSize: 14 } }}
>
<MenuItem value="">
<em>None</em>
Expand Down
Loading
Loading