Skip to content

[DataGridPro] Fix expandable rows detail content height updates #17394

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

Merged
merged 5 commits into from
Apr 23, 2025
Merged

[DataGridPro] Fix expandable rows detail content height updates #17394

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a10d259
Wait for the new rows meta before using details panel hook
arminmeh Apr 16, 2025
a6e0191
revert hook move
arminmeh Apr 22, 2025
78975f4
use expanded rows selector directly
arminmeh Apr 22, 2025
b7f2687
process row height after toggle
arminmeh Apr 22, 2025
2298973
apply pipe processor after the state change
arminmeh Apr 23, 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
7 changes: 4 additions & 3 deletions packages/x-data-grid-pro/src/hooks/features/detailPanel/useGridDetailPanel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ export const useGridDetailPanel = (
| 'onDetailPanelExpandedRowIdsChange'
>,
): void => {
const expandedRowIds = useGridSelector(apiRef, gridDetailPanelExpandedRowIdsSelector);
const contentCache = useGridSelector(apiRef, gridDetailPanelExpandedRowsContentCacheSelector);

const handleCellClick = React.useCallback<GridEventListener<'cellClick'>>(
Expand Down Expand Up @@ -176,6 +175,7 @@ export const useGridDetailPanel = (
},
};
});
apiRef.current.requestPipeProcessorsApplication('rowHeight');
},
[apiRef],
);
Expand Down Expand Up @@ -283,7 +283,8 @@ export const useGridDetailPanel = (

const addDetailHeight = React.useCallback<GridPipeProcessor<'rowHeight'>>(
(initialValue, row) => {
if (!expandedRowIds || expandedRowIds.size === 0 || !expandedRowIds.has(row.id)) {
const expandedRowIds = gridDetailPanelExpandedRowIdsSelector(apiRef);
if (!expandedRowIds || !expandedRowIds.has(row.id)) {
initialValue.detail = 0;
return initialValue;
}
Expand All @@ -295,7 +296,7 @@ export const useGridDetailPanel = (
initialValue.detail = heightCache[row.id].height ?? 0; // Fallback to zero because the cache might not be ready yet (for example page was changed)
return initialValue;
},
[apiRef, expandedRowIds, updateCachesIfNeeded],
[apiRef, updateCachesIfNeeded],
);

const enabled = props.getDetailPanelContent !== undefined;
Expand Down