Skip to content
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

Jump to bottom

fix: setState after unmount #7655

Merged
merged 11 commits into from
Feb 9, 2021
Merged

fix: setState after unmount #7655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8349429
fix: setState after unmount
DylanVann Feb 4, 2021
9ef74b1
add some semis
DylanVann Feb 4, 2021
e2d3323
more semi
DylanVann Feb 4, 2021
3b45aeb
fix SSR
DylanVann Feb 4, 2021
62497d3
better comment
DylanVann Feb 4, 2021
cbdef64
Check for queryDataRef.current before forcing an update
Feb 9, 2021
bae8c66
Merge branch 'main' into fix-setstate-after-unmount
jcreighton Feb 9, 2021
3185c35
Merge branch 'main' into fix-setstate-after-unmount
jcreighton Feb 9, 2021
88c990c
Put that ref back where it belongs
Feb 9, 2021
94642f6
Update CHANGELOG
Feb 9, 2021
3683673
typo
Feb 9, 2021
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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

### Improvements

- Avoid calling `forceUpdate` when component is unmounted. <br/>
[@DylanVann](https://github.com/DylanVann) in [#7655](https://github.com/apollographql/apollo-client/pull/7655)

- The `codemods/` top-level directory has been moved into the `scripts/` directory. <br/>
[@benjamn](https://github.com/benjamn) in [#7675](https://github.com/apollographql/apollo-client/pull/7675)

Expand Down
2 changes: 1 addition & 1 deletion src/react/hooks/utils/useBaseQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function useBaseQuery<TData = any, TVariables = OperationVariables>(
options: updatedOptions as QueryDataOptions<TData, TVariables>,
context,
onNewData() {
if (!queryData.ssrInitiated()) {
if (!queryData.ssrInitiated() && queryDataRef.current) {
// When new data is received from the `QueryData` object, we want to
// force a re-render to make sure the new data is displayed. We can't
// force that re-render if we're already rendering however so to be
Expand Down