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

[DataGridPro] Allow to group rows based on column value #3277

Merged
merged 51 commits into from
Jan 18, 2022
Merged

[DataGridPro] Allow to group rows based on column value #3277

Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
39fa577
[DataGridPro] Allow to group rows based on column value
flaviendelangle Dec 14, 2021
48545cd
Code review: stop hiding grouped column for 2 most basic examples
flaviendelangle Dec 14, 2021
a30ecb2
Merge
flaviendelangle Dec 14, 2021
350780e
Merge
flaviendelangle Dec 14, 2021
9d40e67
Merge branch 'master' into row-grouping
flaviendelangle Dec 15, 2021
bbfbe2c
Merge
flaviendelangle Dec 15, 2021
62a778e
Merge
flaviendelangle Dec 15, 2021
4421c67
Rename feature 'Grouping columns' => 'Row grouping'
flaviendelangle Dec 15, 2021
4b52f79
Code review: remove 'grouping columns' last occurences
flaviendelangle Dec 16, 2021
03f6818
Work
flaviendelangle Dec 16, 2021
86a163b
Merge
flaviendelangle Dec 16, 2021
596abab
Merge
flaviendelangle Dec 20, 2021
f64cf41
Code review: grouapable + default doc
flaviendelangle Dec 20, 2021
4127ec5
Work
flaviendelangle Dec 21, 2021
b7248d4
Merge and add example isGroupExpandedByDefault
flaviendelangle Dec 21, 2021
25fe393
Fix
flaviendelangle Dec 21, 2021
258b3c1
Translations for ptBR
m4theushw Dec 24, 2021
c50bd93
yarn prettier
m4theushw Dec 25, 2021
8062956
Merge
flaviendelangle Jan 3, 2022
c670b28
Code review: Matheus
flaviendelangle Jan 3, 2022
16de536
Work
flaviendelangle Jan 3, 2022
2760d13
Code review: Matheus
flaviendelangle Jan 3, 2022
f5d75ed
Merge
flaviendelangle Jan 5, 2022
32c991e
Update packages/grid/_modules_/grid/components/cell/GridGroupingCrite…
flaviendelangle Jan 6, 2022
5dee1fb
Code review: Matheus
flaviendelangle Jan 6, 2022
e63926d
Fix lint
flaviendelangle Jan 6, 2022
57aa1d7
Merge branch 'master' into row-grouping
flaviendelangle Jan 6, 2022
c3a1a38
Work
flaviendelangle Jan 6, 2022
8b6d03f
Merge branch 'master' into row-grouping
flaviendelangle Jan 11, 2022
cb1a082
Merge
flaviendelangle Jan 11, 2022
3d5d965
Fix
flaviendelangle Jan 11, 2022
e451433
Md lint
flaviendelangle Jan 11, 2022
4df0de5
Merge
flaviendelangle Jan 11, 2022
6fcdecc
Work
flaviendelangle Jan 11, 2022
57bf755
Code review: Alexandre
flaviendelangle Jan 12, 2022
392ddeb
Work
flaviendelangle Jan 12, 2022
bd0e66b
Work
flaviendelangle Jan 12, 2022
849699c
Fix
flaviendelangle Jan 12, 2022
f2df6e1
Merge
flaviendelangle Jan 12, 2022
f6c10a9
Code review: Jose & Matheus part 1
flaviendelangle Jan 13, 2022
1151f3b
Merge branch 'master' into row-grouping
flaviendelangle Jan 14, 2022
b47bef6
Code review
flaviendelangle Jan 14, 2022
7c98de8
Fix
flaviendelangle Jan 14, 2022
3662e83
Work
flaviendelangle Jan 14, 2022
fa64fb4
Work
flaviendelangle Jan 14, 2022
54c2c70
Merge branch 'master' into row-grouping
flaviendelangle Jan 18, 2022
837260e
Code review: José
flaviendelangle Jan 18, 2022
408af80
Code review: José
flaviendelangle Jan 18, 2022
11f77c9
Work
flaviendelangle Jan 18, 2022
1eb7dc7
Code review: José
flaviendelangle Jan 18, 2022
ff53580
Work
flaviendelangle Jan 18, 2022
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
22 changes: 20 additions & 2 deletions docs/pages/api-docs/data-grid/data-grid-pro.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
"disableMultipleColumnsFiltering": { "type": { "name": "bool" } },
"disableMultipleColumnsSorting": { "type": { "name": "bool" } },
"disableMultipleSelection": { "type": { "name": "bool" } },
"disableRowGrouping": { "type": { "name": "bool" } },
"disableSelectionOnClick": { "type": { "name": "bool" } },
"disableVirtualization": { "type": { "name": "bool" } },
"editMode": {
Expand All @@ -53,6 +54,9 @@
},
"editRowsModel": { "type": { "name": "object" } },
"error": { "type": { "name": "any" } },
"experimentalFeatures": {
"type": { "name": "shape", "description": "{ rowGrouping?: bool }" }
},
"filterMode": {
"type": { "name": "custom", "description": "'client'<br>&#124;&nbsp;'server'" },
"default": "\"client\""
Expand Down Expand Up @@ -131,6 +135,7 @@
"onRowEditCommit": { "type": { "name": "func" } },
"onRowEditStart": { "type": { "name": "func" } },
"onRowEditStop": { "type": { "name": "func" } },
"onRowGroupingModelChange": { "type": { "name": "func" } },
"onRowsScrollEnd": { "type": { "name": "func" } },
"onSelectionModelChange": { "type": { "name": "func" } },
"onSortModelChange": { "type": { "name": "func" } },
Expand All @@ -150,6 +155,11 @@
},
"rowBuffer": { "type": { "name": "number" }, "default": "3" },
"rowCount": { "type": { "name": "number" } },
"rowGroupingColumnMode": {
"type": { "name": "enum", "description": "'multiple'<br>&#124;&nbsp;'single'" },
"default": "'single'"
},
"rowGroupingModel": { "type": { "name": "arrayOf", "description": "Array&lt;string&gt;" } },
"rowHeight": { "type": { "name": "number" }, "default": "52" },
"rowsPerPageOptions": {
"type": { "name": "arrayOf", "description": "Array&lt;number&gt;" },
Expand Down Expand Up @@ -232,6 +242,14 @@
"ExportIcon": { "default": "GridSaveAltIcon", "type": { "name": "elementType" } },
"FilterPanel": { "default": "GridFilterPanel", "type": { "name": "elementType" } },
"Footer": { "default": "GridFooter", "type": { "name": "elementType" } },
"GroupingCriteriaCollapseIcon": {
"default": "GridExpandMoreIcon",
"type": { "name": "elementType" }
},
"GroupingCriteriaExpandIcon": {
"default": "GridKeyboardArrowRight",
"type": { "name": "elementType" }
},
"Header": { "default": "GridHeader", "type": { "name": "elementType" } },
"LoadingOverlay": { "default": "GridLoadingOverlay", "type": { "name": "elementType" } },
"MoreActionsIcon": { "default": "GridMoreVertIcon", "type": { "name": "elementType" } },
Expand All @@ -243,8 +261,8 @@
"PreferencesPanel": { "default": "GridPreferencesPanel", "type": { "name": "elementType" } },
"Row": { "type": { "name": "elementType" } },
"Toolbar": { "default": "null", "type": { "name": "elementType | null" } },
"TreeDataCollapseIcon": { "type": { "name": "elementType" } },
"TreeDataExpandIcon": { "type": { "name": "elementType" } }
"TreeDataCollapseIcon": { "default": "GridExpandMoreIcon", "type": { "name": "elementType" } },
"TreeDataExpandIcon": { "default": "GridKeyboardArrowRight", "type": { "name": "elementType" } }
},
"name": "DataGridPro",
"styles": {
Expand Down
12 changes: 10 additions & 2 deletions docs/pages/api-docs/data-grid/data-grid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,14 @@
"ExportIcon": { "default": "GridSaveAltIcon", "type": { "name": "elementType" } },
"FilterPanel": { "default": "GridFilterPanel", "type": { "name": "elementType" } },
"Footer": { "default": "GridFooter", "type": { "name": "elementType" } },
"GroupingCriteriaCollapseIcon": {
"default": "GridExpandMoreIcon",
"type": { "name": "elementType" }
},
"GroupingCriteriaExpandIcon": {
"default": "GridKeyboardArrowRight",
"type": { "name": "elementType" }
},
"Header": { "default": "GridHeader", "type": { "name": "elementType" } },
"LoadingOverlay": { "default": "GridLoadingOverlay", "type": { "name": "elementType" } },
"MoreActionsIcon": { "default": "GridMoreVertIcon", "type": { "name": "elementType" } },
Expand All @@ -200,8 +208,8 @@
"PreferencesPanel": { "default": "GridPreferencesPanel", "type": { "name": "elementType" } },
"Row": { "type": { "name": "elementType" } },
"Toolbar": { "default": "null", "type": { "name": "elementType | null" } },
"TreeDataCollapseIcon": { "type": { "name": "elementType" } },
"TreeDataExpandIcon": { "type": { "name": "elementType" } }
"TreeDataCollapseIcon": { "default": "GridExpandMoreIcon", "type": { "name": "elementType" } },
"TreeDataExpandIcon": { "default": "GridKeyboardArrowRight", "type": { "name": "elementType" } }
},
"name": "DataGrid",
"styles": {
Expand Down
Loading