Skip to content

Commit

Permalink
Merge branch 'master' into hwillson/clear-query-store-errors
Browse files Browse the repository at this point in the history
  • Loading branch information
hwillson committed Jun 17, 2019
2 parents ef12265 + a0e14f3 commit 50d4a61
Show file tree
Hide file tree
Showing 7 changed files with 639 additions and 653 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
- A new `ObservableQuery.resetQueryStoreErrors()` method is now available that
can be used to clear out `ObservableQuery` query store errors. <br/>
[@hwillson](https://github.com/hwillson) in [#4941](https://github.com/apollographql/apollo-client/pull/4941)
- Documentation updates. <br/>
[@michael-watson](https://github.com/michael-watson) in [#4940](https://github.com/apollographql/apollo-client/pull/4940) <br/>
[@hwillson](https://github.com/hwillson) in [#4969](https://github.com/apollographql/apollo-client/pull/4969)


## Apollo Client (2.6.2)
Expand Down
299 changes: 122 additions & 177 deletions docs/package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"types": "cd ../packages/apollo-client && typedoc --json ../../docs/docs.json --ignoreCompilerErrors ./src/index.ts"
},
"dependencies": {
"gatsby": "2.8.6",
"gatsby-theme-apollo-docs": "1.0.4"
"gatsby": "2.9.4",
"gatsby-theme-apollo-docs": "1.0.11"
},
"devDependencies": {
"typedoc": "0.14.2",
Expand Down
2 changes: 2 additions & 0 deletions docs/source/api/react-apollo.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ The Query component accepts the following props. Only `query` and `children` are
<dd>If `true`, perform a query `refetch` if the query result is marked as being partial, and the returned data is reset to an empty Object by the Apollo Client `QueryManager` (due to a cache miss). The default value is `false` for backwards-compatibility's sake, but should be changed to true for most use-cases.</dd>
<dt>`client`: ApolloClient</dt>
<dd>An `ApolloClient` instance. By default `Query` uses the client passed down via context, but a different client can be passed in.</dd>
<dt>`returnPartialData`: boolean</dt>
<dd>Opt into receiving partial results from the cache for queries that are not fully satisfied by the cache. `false` by default.</dd>
</dl>

### Render prop function
Expand Down
4 changes: 3 additions & 1 deletion docs/source/essentials/queries.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,8 @@ The Query component accepts the following props. Only `query` and `children` are
<dd>Shared context between your Query component and your network interface (Apollo Link). Useful for setting headers from props or sending information to the <code>request</code> function of Apollo Boost.</dd>
<dt><code>partialRefetch</code>: boolean</dt>
<dd>If <code>true</code>, perform a query <code>refetch</code> if the query result is marked as being partial, and the returned data is reset to an empty Object by the Apollo Client <code>QueryManager</code> (due to a cache miss). The default value is <code>false</code> for backwards-compatibility's sake, but should be changed to true for most use-cases.</dd>
<dt><code>returnPartialData</code>: boolean</dt>
<dd>Opt into receiving partial results from the cache for queries that are not fully satisfied by the cache. <code>false</code> by default.</dd>
</dl>

### Render prop function
Expand All @@ -279,7 +281,7 @@ The render prop function that you pass to the `children` prop of `Query` is call

<dl>
<dt><code>data</code>: TData</dt>
<dd>An object containing the result of your GraphQL query. Defaults to an empty object.</dd>
<dd>An object containing the result of your GraphQL query. Defaults to <code>undefined</code>.</dd>
<dt><code>loading</code>: boolean</dt>
<dd>A boolean that indicates whether the request is in flight</dd>
<dt><code>error</code>: ApolloError</dt>
Expand Down
Loading

0 comments on commit 50d4a61

Please sign in to comment.