Skip to content

[DataGridPro] Fix duplicate nested rows for dynamically updated row IDs #18526

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
+53 −2
Open

[DataGridPro] Fix duplicate nested rows for dynamically updated row IDs #18526

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad3a7eb
[DataGridPro] Fix duplicate nested rows for dynamically updated row IDs
MBilalShafi Jun 25, 2025
382bbc7
Lint
MBilalShafi Jun 25, 2025
770ddb8
Merge branch 'master' into fix/data-source-dynamic-children
MBilalShafi Jun 25, 2025
fab847a
Make insertedRows an optional param
MBilalShafi Jun 26, 2025
5e7502b
Use concat
MBilalShafi Jun 27, 2025
1063c36
Prettier
MBilalShafi Jun 28, 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: 6 additions & 1 deletion packages/x-data-grid/src/hooks/features/rows/gridRowsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ export function computeRowsUpdates(
getRowId: DataGridProcessedProps['getRowId'],
) {
const nonPinnedRowsUpdates: GridRowModelUpdate[] = [];
const insertedNodes = new Set<GridRowId>();

updates.forEach((update) => {
const id = getRowIdFromRowModel(
Expand All @@ -416,9 +417,13 @@ export function computeRowsUpdates(
}
} else {
nonPinnedRowsUpdates.push(update);
// eslint-disable-next-line no-underscore-dangle
if (update._action !== 'delete') {
insertedNodes.add(id);
}
}
});
return nonPinnedRowsUpdates;
return { nonPinnedRowsUpdates, insertedNodes };
}

let warnedOnceInvalidRowHeight = false;
Expand Down
51 changes: 48 additions & 3 deletions packages/x-data-grid/src/hooks/features/rows/useGridRows.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ export const useGridRows = (
return;
}

const nonPinnedRowsUpdates = computeRowsUpdates(apiRef, updates, props.getRowId);
const { nonPinnedRowsUpdates } = computeRowsUpdates(apiRef, updates, props.getRowId);

const cache = updateCacheWithNewRows({
updates: nonPinnedRowsUpdates,
Expand All @@ -215,10 +215,55 @@ export const useGridRows = (

const updateNestedRows = React.useCallback<GridRowProPrivateApi['updateNestedRows']>(
(updates, groupKeys) => {
const nonPinnedRowsUpdates = computeRowsUpdates(apiRef, updates, props.getRowId);
const { nonPinnedRowsUpdates, insertedNodes } = computeRowsUpdates(
apiRef,
updates,
props.getRowId,
);

const tree = gridRowTreeSelector(apiRef);
const removedNodes = new Set<GridRowId>();

if (groupKeys && groupKeys.length > 0) {
const rootNode = tree[GRID_ROOT_GROUP_ID];
let parentNode = rootNode;
for (let i = 0; i < groupKeys.length; i += 1) {
const childrenFromPath = (parentNode as GridGroupNode).childrenFromPath;
const nodeId = childrenFromPath[Object.keys(childrenFromPath)[0]]?.[groupKeys[i]];
if (nodeId) {
parentNode = tree[nodeId];
}
}

const traverse = (node: GridGroupNode) => {
Comment on lines +229 to +240
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this whole traverse necessary?

Copy link
Member Author

@MBilalShafi MBilalShafi Jun 27, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is to check if the children of the row being fetched are outdated and need to be removed before adding new ones.

Regarding the part where parent group's ID is derived from groupKeys: we could update the function signature to directly accept parent id. However, since the current approach isn’t expensive (by leveraging childrenFromPath), I chose not to modify the signature. What do you think about this approach vs changing the function signature (will be a non-breaking change as the function is private)?

if (!node) {
return;
}
for (const childId of node.children) {
if (!insertedNodes.has(childId)) {
removedNodes.add(childId);
if (tree[childId].type === 'group') {
traverse(tree[childId] as GridGroupNode);
}
}
}
};

if (parentNode !== rootNode) {
traverse(parentNode as GridGroupNode);
}
}

const cacheUpdates = [
...nonPinnedRowsUpdates,
...Array.from(removedNodes).map((rowId) => ({
id: rowId,
_action: 'delete' as const,
})),
];

const cache = updateCacheWithNewRows({
updates: nonPinnedRowsUpdates,
updates: cacheUpdates,
getRowId: props.getRowId,
previousCache: apiRef.current.caches.rows,
groupKeys: groupKeys ?? [],
Expand Down