Skip to content

Commit

Permalink
Merge pull request #7833 from kevinperaza/remove-duplicate-children-p…
Browse files Browse the repository at this point in the history
…roperty

Remove  `children` type override
  • Loading branch information
jcreighton committed Mar 15, 2021
2 parents 49b45e3 + d2f3036 commit 048f3b1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
- Maintain serial ordering of `asyncMap` mapping function calls, and prevent potential unhandled `Promise` rejection errors. <br/>
[@benjamn](https://github.com/benjamn) in [#7818](https://github.com/apollographql/apollo-client/pull/7818)

- Remove `children` type override in MockedProviderProps <br />
[@kevinperaza](https://github.com/kevinperaza) in [#7833](https://github.com/apollographql/apollo-client/pull/7833)

## Apollo Client 3.3.11

### Bug fixes
Expand Down
4 changes: 2 additions & 2 deletions src/utilities/testing/mocking/MockedProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export interface MockedProviderProps<TSerializedCache = {}> {
cache?: ApolloCache<TSerializedCache>;
resolvers?: Resolvers;
childProps?: object;
children?: React.ReactElement;
children?: any;
link?: ApolloLink;
}

Expand Down Expand Up @@ -57,7 +57,7 @@ export class MockedProvider extends React.Component<

public render() {
const { children, childProps } = this.props;
return children ? (
return React.isValidElement(children) ? (
<ApolloProvider client={this.state.client}>
{React.cloneElement(React.Children.only(children), { ...childProps })}
</ApolloProvider>
Expand Down

0 comments on commit 048f3b1

Please sign in to comment.