Repository navigation
[data grid] Stop the data source polling after the grid unmounts - #23709
Merged
LukasTy merged 5 commits intoSep 30, 2026
Merged
Conversation
A request that settles after the grid unmounts calls `startPolling()`. No cleanup clears the new interval, so the unmounted grid keeps calling `getRows()`. `startPolling()` now does nothing after the unmount. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
LukasTy
added
type: bug
Deploy previewBundle size
Check out the code infra dashboard for more information about this PR. |
Contributor
There was a problem hiding this comment.
Copilot review overview
🟡 Changes recommended
The two lazy-loader guards lack direct regression coverage for requests settling after unmount.
Review effort: Balanced
Findings: 2
Open (2)
What changed in this PR
Prevents data-source polling from restarting after grid unmount.
Changes:
- Adds unmount-aware polling guards across data-source implementations.
- Adds a regression test and removes test workarounds.
| File | Description |
|---|---|
packages/x-data-grid/src/tests/dataSource.DataGrid.test.tsx |
Tests polling after unmount. |
packages/x-data-grid/src/hooks/features/dataSource/useGridDataSourceBase.ts |
Guards standard polling. |
packages/x-data-grid-pro/src/tests/dataSourceTreeData.DataGridPro.test.tsx |
Removes polling workarounds. |
packages/x-data-grid-pro/src/hooks/features/serverSideLazyLoader/useGridDataSourceNestedLazyLoader.ts |
Guards nested lazy polling. |
packages/x-data-grid-pro/src/hooks/features/serverSideLazyLoader/useGridDataSourceLazyLoader.ts |
Guards flat lazy polling. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A revalidation that `debouncedFetchRows` queued still sent `getRows()` after the grid unmounted. Clear it on a real unmount. A hidden `<Activity>` keeps the root connected, so its queued fetch still runs. The tests now restore real timers in the test body, because `onTestFinished` runs after the global `afterEach`. A new test covers the queued fetch while an `<Activity>` is hidden. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
michelengelen
approved these changes
Sep 30, 2026
michelengelen
left a comment
michelengelen
left a comment
Member
There was a problem hiding this comment.
LGTM... the only suggestion from my side would be to extract the repetitive useEffect into a custom hook that can be imported
Member
Author
I'll look at addressing this separately. |
1 task done
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
With
dataSourceRevalidateMsset, each response callsstartPolling(). A request that settles after the grid unmounts restarts the polling. No cleanup clears the new interval, so the unmounted grid keeps callinggetRows()until the page reloads.Changes in
useGridDataSourceBase,useGridDataSourceLazyLoaderanduseGridDataSourceNestedLazyLoader:startPolling()does nothing after the unmount and while an<Activity>is hidden.<Activity>becomes visible again. Before, it did not resume.<Activity>keeps the root connected, so its queued fetch still runs.setProps({ dataSourceRevalidateMs: 0 })workaround from [test] Fix flaky Data Grid Pro data source tree data tests #22659. It worked around the same leak in the tree data tests only.This leak also causes CI flakes. The browser tests run with
isolate: false, so a leaked 1ms poller stays alive in the later test files of the same page. There, eachvi.runAllTimersAsync()spins until it throwsAborting after running 10000 timers, assuming an infinite loop!. In the last 14 days:test_browserandtest_browser_react_18jobs failed insorting.DataGridPro(for example this job on master).columnHeaders.DataGridPro.test.tsx(about 20runAllTimersAsync()calls) never finished (for example this job on master).The tests cover the unmount case for all three hooks, the Activity pause and resume, and the queued fetch while an
<Activity>is hidden. Each test fails when its part of the fix is removed. With allx-data-grid-protest files in one page, no interval stays alive after any file.Generated with Claude Code