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

[DataGridPremium] Fix loading issue + add skeleton overlay #16282

Merged
merged 23 commits into from
Feb 11, 2025
Merged

[DataGridPremium] Fix loading issue + add skeleton overlay #16282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3099587
[DataGridPremium] Fix initial loading state not being displayed
MBilalShafi Jan 21, 2025
e647eee
Add skeleton overlay on the aggregation footer row
MBilalShafi Jan 29, 2025
5b38c6b
Merge master into 'fix-loading-issues'
MBilalShafi Jan 29, 2025
d40282f
Update
MBilalShafi Jan 29, 2025
aca2d7a
Fix static
MBilalShafi Jan 29, 2025
7257900
Test hardcoded skeleton row count
MBilalShafi Jan 30, 2025
321d497
Fix a couple issues
MBilalShafi Jan 30, 2025
2d65b6f
Fix pinned column border issue
MBilalShafi Jan 30, 2025
dc3a32c
prettier
MBilalShafi Jan 30, 2025
c154f42
Merge branch 'master' into fix-loading-issue
MBilalShafi Jan 31, 2025
c7a9fa8
Merge branch 'master' into fix-loading-issue
MBilalShafi Feb 3, 2025
ad4d229
Merge branch 'master' into fix-loading-issue
MBilalShafi Feb 6, 2025
21dea11
Extract as type
MBilalShafi Feb 6, 2025
ec28872
Update
MBilalShafi Feb 6, 2025
dbd233a
Try to show the skeleton row
MBilalShafi Feb 7, 2025
090f7b2
Try making bottom container a slot
MBilalShafi Feb 9, 2025
695836b
Revert the unnecessary chnage
MBilalShafi Feb 9, 2025
eed9fae
Script
MBilalShafi Feb 9, 2025
099800d
Update a description
MBilalShafi Feb 9, 2025
933ff4a
Conditionally render pinned rows when aggregation is active
MBilalShafi Feb 9, 2025
dffdbc6
Remove extra instance of the hook
MBilalShafi Feb 10, 2025
863115a
Merge branch 'master' into fix-loading-issue
MBilalShafi Feb 10, 2025
1b494f3
Add pinned styling
MBilalShafi Feb 10, 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
2 changes: 1 addition & 1 deletion packages/x-data-grid-premium/src/DataGridPremium/useDataGridPremiumComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ export const useDataGridPremiumComponent = (
useGridRowGrouping(apiRef, props);
useGridHeaderFiltering(apiRef, props);
useGridTreeData(apiRef, props);
useGridDataSource(apiRef, props);
useGridAggregation(apiRef, props);
useGridKeyboardNavigation(apiRef, props);
useGridRowSelection(apiRef, props);
Expand Down Expand Up @@ -191,6 +190,7 @@ export const useDataGridPremiumComponent = (
useGridDimensions(apiRef, props);
useGridEvents(apiRef, props);
useGridStatePersistence(apiRef);
useGridDataSource(apiRef, props);
useGridVirtualization(apiRef, props);
useGridListView(apiRef, props);

Expand Down
2 changes: 1 addition & 1 deletion packages/x-data-grid-premium/src/hooks/features/aggregation/createAggregationLookup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const getGroupAggregatedValueDataSource = (

groupAggregationLookup[aggregatedField] = {
position,
value: apiRef.current.resolveGroupAggregation(groupId, aggregatedField),
value: apiRef.current.resolveGroupAggregation?.(groupId, aggregatedField) ?? '-',
};
}

Expand Down
Loading