Skip to content

Ensure using @defer or @stream with fetchMore rerenders with incremental results #12925

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 20 commits into from
Nov 14, 2025
+473 −1,199
Merged

Ensure using @defer or @stream with fetchMore rerenders with incremental results #12925

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6f3d007
Turn off non tracking renders
jerelmiller Sep 16, 2025
08d4681
Remove duplicate test and enable failing test
jerelmiller Sep 16, 2025
e785c17
it -> test
jerelmiller Sep 16, 2025
d764fc7
Fix fetchMore with incremental results by emitting incremental results
jerelmiller Sep 16, 2025
904f007
Use ===
jerelmiller Sep 16, 2025
3ec0bc3
Re-enable fetchMore with incremental results for defer20220824 tests
jerelmiller Sep 16, 2025
426bcd2
Ensure stream results that emit hasNext: false only set network status
jerelmiller Sep 16, 2025
528b963
Enable stream tests with fetchMore incremental rendering
jerelmiller Sep 16, 2025
d722351
Add changeset
jerelmiller Sep 16, 2025
f991476
Update size limits
jerelmiller Sep 16, 2025
50536f2
Remove unused import
jerelmiller Sep 16, 2025
4efc11f
Remove commented code
jerelmiller Sep 16, 2025
b8d571a
Tweak to be more like original
jerelmiller Sep 16, 2025
4836370
Remove unneeded markAsStreaming
jerelmiller Sep 17, 2025
5e942ed
Reset wasUpdated only on processed messages
jerelmiller Sep 17, 2025
05f103d
Use filter
jerelmiller Sep 17, 2025
3ea69d9
Update api report
jerelmiller Sep 17, 2025
43b7ea0
Add private get for cache in ObservableQuery
jerelmiller Sep 17, 2025
9f4a44d
Let cache watch handle final result
jerelmiller Sep 17, 2025
ebb4e3e
Update api report
jerelmiller Sep 17, 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 .api-reports/api-report-core.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,7 @@ export type WatchQueryOptions<TVariables extends OperationVariables = OperationV
// Warnings were encountered during analysis:
//
// src/core/ApolloClient.ts:353:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
// src/core/ObservableQuery.ts:361:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
// src/core/ObservableQuery.ts:368:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
// src/core/QueryManager.ts:180:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts

// (No @packageDocumentation comment for this package)
Expand Down
2 changes: 1 addition & 1 deletion .api-reports/api-report.api.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2713,7 +2713,7 @@ interface WriteContext extends ReadMergeModifyContext {
// src/cache/inmemory/types.ts:134:3 - (ae-forgotten-export) The symbol "KeyFieldsFunction" needs to be exported by the entry point index.d.ts
// src/core/ApolloClient.ts:159:5 - (ae-forgotten-export) The symbol "IgnoreModifier" needs to be exported by the entry point index.d.ts
// src/core/ApolloClient.ts:353:5 - (ae-forgotten-export) The symbol "NextFetchPolicyContext" needs to be exported by the entry point index.d.ts
// src/core/ObservableQuery.ts:361:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
// src/core/ObservableQuery.ts:368:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
// src/core/QueryManager.ts:180:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
// src/local-state/LocalState.ts:147:5 - (ae-forgotten-export) The symbol "LocalState" needs to be exported by the entry point index.d.ts
// src/local-state/LocalState.ts:200:7 - (ae-forgotten-export) The symbol "LocalState" needs to be exported by the entry point index.d.ts
Expand Down
5 changes: 5 additions & 0 deletions .changeset/funny-bats-hammer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@apollo/client": patch
---

Fix an issue where calling `fetchMore` with `@defer` or `@stream` would not rerender incremental results as they were streamed.
8 changes: 4 additions & 4 deletions .size-limits.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (CJS)": 44386,
"import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production) (CJS)": 39203,
"import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\"": 33554,
"import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production)": 27582
"import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (CJS)": 44530,
"import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production) (CJS)": 39381,
"import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\"": 33704,
"import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production)": 27701
}
Loading
Loading