Skip to content

fix(query-core): ensure combine re-executes after cache restoration with memoized combine #9592

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
TkDodo merged 13 commits into from
Sep 2, 2025
Merged

fix(query-core): ensure combine re-executes after cache restoration with memoized combine #9592

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7953639
fix(query-core): ensure combine re-executes after cache restoration w…
joseph0926 Aug 26, 2025
7eaaad7
fix(query-core): add error field to result change detection
joseph0926 Aug 26, 2025
f860b8d
test(query-core): add test for QueriesObserver early return notification
joseph0926 Aug 26, 2025
5227bc3
test(query-core): improve test for QueriesObserver early return notif…
joseph0926 Aug 26, 2025
5540f61
Merge branch 'main' into fix/memoized-combine-persist-restore
joseph0926 Aug 31, 2025
e5a60aa
Merge branch 'main' into fix/memoized-combine-persist-restore
joseph0926 Sep 1, 2025
32a55ad
refactor(query-core): use shallowEqualObjects for result comparison
joseph0926 Sep 2, 2025
e351336
Merge branch 'main' into fix/memoized-combine-persist-restore
TkDodo Sep 2, 2025
999c8d2
refactor(query-core): improve setQueries flow and fix persist/restore…
joseph0926 Sep 2, 2025
c4db285
refactor(query-core): improve setQueries flow and remove log
joseph0926 Sep 2, 2025
4bc297b
test(react-query): update useQueries expectations for metadata change…
joseph0926 Sep 2, 2025
6a20d93
test(react-query): fix test comments
joseph0926 Sep 2, 2025
44bfedb
test(react-query): add test for stable combine optimization on unrela…
joseph0926 Sep 2, 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
Prev Previous commit
Next Next commit
test(react-query): update useQueries expectations for metadata change… 
… detection
  • Loading branch information
@joseph0926
joseph0926 committed Sep 2, 2025
commit 4bc297b538476c69ad2a48809193e4bf5be3c703
6 changes: 3 additions & 3 deletions packages/react-query/src/__tests__/useQueries.test.tsx
View file
Open in desktop
Copy link
Copy Markdown
Collaborator

@TkDodo TkDodo Sep 2, 2025

Choose a reason for hiding this comment

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

please add another test that verifies that combine isn’t called when an unrelated re-render happens

Copy link
Copy Markdown
Contributor Author

@joseph0926 joseph0926 Sep 2, 2025

Choose a reason for hiding this comment

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

please add another test that verifies that combine isn’t called when an unrelated re-render happens

44bfedb

I have added the test.
Comments have been appropriately added by referring to existing other tests.

Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ describe('useQueries', () => {

const length = results.length

expect([4, 5]).toContain(results.length)
expect([4, 5, 6]).toContain(results.length)

expect(results[results.length - 1]).toStrictEqual({
combined: true,
Expand Down Expand Up @@ -1380,7 +1380,7 @@ describe('useQueries', () => {
fireEvent.click(rendered.getByRole('button', { name: /rerender/i }))

// no increase because just a re-render
expect(spy).toHaveBeenCalledTimes(3)
expect(spy).toHaveBeenCalledTimes(4)

value = 1

Expand All @@ -1392,7 +1392,7 @@ describe('useQueries', () => {
).toBeInTheDocument()

// two value changes = two re-renders
expect(spy).toHaveBeenCalledTimes(5)
expect(spy).toHaveBeenCalledTimes(7)
})

it('should re-run combine if the functional reference changes', async () => {
Expand Down
Loading