Skip to content
This repository was archived by the owner on Aug 30, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docs/react.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ import { useWalletConnect } from "@thirdweb-dev/react"
| [ThirdwebNftMediaProps](./react.thirdwebnftmediaprops.md) | The props for the [ThirdwebNftMedia](./react.thirdwebnftmedia.md) component. |
| [ThirdwebProviderProps](./react.thirdwebproviderprops.md) | The possible props for the ThirdwebProvider. |
| [ThirdwebSDKProviderProps](./react.thirdwebsdkproviderprops.md) | |
| [ThirdwebSDKProviderWagmiWrapper](./react.thirdwebsdkproviderwagmiwrapper.md) | |

## Variables

Expand Down
8 changes: 3 additions & 5 deletions docs/react.thirdwebsdkproviderprops.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
<b>Signature:</b>

```typescript
export interface ThirdwebSDKProviderProps extends Pick<ThirdwebProviderProps, "desiredChainId" | "sdkOptions" | "storageInterface">
export interface ThirdwebSDKProviderProps extends Omit<ThirdwebSDKProviderWagmiWrapper, "queryClient">
```
<b>Extends:</b> Pick&lt;[ThirdwebProviderProps](./react.thirdwebproviderprops.md)
<b>Extends:</b> Omit&lt;[ThirdwebSDKProviderWagmiWrapper](./react.thirdwebsdkproviderwagmiwrapper.md)

## Properties

| Property | Modifiers | Type | Description |
| --- | --- | --- | --- |
| [provider](./react.thirdwebsdkproviderprops.provider.md) | | ChainOrRpc \| SignerOrProvider | |
| [queryClient](./react.thirdwebsdkproviderprops.queryclient.md) | | QueryClient | |
| [signer?](./react.thirdwebsdkproviderprops.signer.md) | | Signer | <i>(Optional)</i> |
| [queryClient?](./react.thirdwebsdkproviderprops.queryclient.md) | | QueryClient | <i>(Optional)</i> |

2 changes: 1 addition & 1 deletion docs/react.thirdwebsdkproviderprops.queryclient.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
<b>Signature:</b>

```typescript
queryClient: QueryClient;
queryClient?: QueryClient;
```
11 changes: 0 additions & 11 deletions docs/react.thirdwebsdkproviderprops.signer.md

This file was deleted.

21 changes: 21 additions & 0 deletions docs/react.thirdwebsdkproviderwagmiwrapper.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@thirdweb-dev/react](./react.md) &gt; [ThirdwebSDKProviderWagmiWrapper](./react.thirdwebsdkproviderwagmiwrapper.md)

## ThirdwebSDKProviderWagmiWrapper interface

<b>Signature:</b>

```typescript
export interface ThirdwebSDKProviderWagmiWrapper extends Pick<ThirdwebProviderProps, "desiredChainId" | "sdkOptions" | "storageInterface">
```
<b>Extends:</b> Pick&lt;[ThirdwebProviderProps](./react.thirdwebproviderprops.md)

## Properties

| Property | Modifiers | Type | Description |
| --- | --- | --- | --- |
| [provider](./react.thirdwebsdkproviderwagmiwrapper.provider.md) | | ChainOrRpc \| SignerOrProvider | |
| [queryClient?](./react.thirdwebsdkproviderwagmiwrapper.queryclient.md) | | QueryClient | <i>(Optional)</i> |
| [signer?](./react.thirdwebsdkproviderwagmiwrapper.signer.md) | | Signer | <i>(Optional)</i> |

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@thirdweb-dev/react](./react.md) &gt; [ThirdwebSDKProviderProps](./react.thirdwebsdkproviderprops.md) &gt; [provider](./react.thirdwebsdkproviderprops.provider.md)
[Home](./index.md) &gt; [@thirdweb-dev/react](./react.md) &gt; [ThirdwebSDKProviderWagmiWrapper](./react.thirdwebsdkproviderwagmiwrapper.md) &gt; [provider](./react.thirdwebsdkproviderwagmiwrapper.provider.md)

## ThirdwebSDKProviderProps.provider property
## ThirdwebSDKProviderWagmiWrapper.provider property

<b>Signature:</b>

Expand Down
11 changes: 11 additions & 0 deletions docs/react.thirdwebsdkproviderwagmiwrapper.queryclient.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@thirdweb-dev/react](./react.md) &gt; [ThirdwebSDKProviderWagmiWrapper](./react.thirdwebsdkproviderwagmiwrapper.md) &gt; [queryClient](./react.thirdwebsdkproviderwagmiwrapper.queryclient.md)

## ThirdwebSDKProviderWagmiWrapper.queryClient property

<b>Signature:</b>

```typescript
queryClient?: QueryClient;
```
11 changes: 11 additions & 0 deletions docs/react.thirdwebsdkproviderwagmiwrapper.signer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@thirdweb-dev/react](./react.md) &gt; [ThirdwebSDKProviderWagmiWrapper](./react.thirdwebsdkproviderwagmiwrapper.md) &gt; [signer](./react.thirdwebsdkproviderwagmiwrapper.signer.md)

## ThirdwebSDKProviderWagmiWrapper.signer property

<b>Signature:</b>

```typescript
signer?: Signer;
```
10 changes: 8 additions & 2 deletions etc/react.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -290,11 +290,17 @@ export interface ThirdwebProviderProps<TSupportedChain extends SupportedChain =
export const ThirdwebSDKProvider: React_2.FC<React_2.PropsWithChildren<ThirdwebSDKProviderProps>>;

// @public (undocumented)
export interface ThirdwebSDKProviderProps extends Pick<ThirdwebProviderProps, "desiredChainId" | "sdkOptions" | "storageInterface"> {
export interface ThirdwebSDKProviderProps extends Omit<ThirdwebSDKProviderWagmiWrapper, "queryClient"> {
// (undocumented)
queryClient?: QueryClient;
}

// @public (undocumented)
export interface ThirdwebSDKProviderWagmiWrapper extends Pick<ThirdwebProviderProps, "desiredChainId" | "sdkOptions" | "storageInterface"> {
// (undocumented)
provider: ChainOrRpc | SignerOrProvider;
// (undocumented)
queryClient: QueryClient;
queryClient?: QueryClient;
// (undocumented)
signer?: Signer;
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@thirdweb-dev/react",
"version": "2.6.1",
"version": "2.6.2-0",
"repository": {
"type": "git",
"url": "git+https://github.com:thirdweb-dev/react.git"
Expand Down
25 changes: 16 additions & 9 deletions src/Provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -403,17 +403,13 @@ export const ThirdwebProvider = <
};
}, [sdkOptions, readonlySettings]);

const queryClientWithDefault: QueryClient = useMemo(() => {
return queryClient ? queryClient : new QueryClient();
}, [queryClient]);

return (
<ThirdwebConfigProvider
value={{ rpcUrlMap: _rpcUrlMap, supportedChains: _supporrtedChains }}
>
<WagmiProvider {...wagmiProps}>
<ThirdwebSDKProviderWagmiWrapper
queryClient={queryClientWithDefault}
queryClient={queryClient}
desiredChainId={desiredChainId}
sdkOptions={sdkOptionsWithDefaults}
storageInterface={storageInterface}
Expand All @@ -425,18 +421,20 @@ export const ThirdwebProvider = <
);
};

export interface ThirdwebSDKProviderProps
export interface ThirdwebSDKProviderWagmiWrapper
extends Pick<
ThirdwebProviderProps,
"desiredChainId" | "sdkOptions" | "storageInterface"
> {
signer?: Signer;
provider: ChainOrRpc | SignerOrProvider;
queryClient: QueryClient;
queryClient?: QueryClient;
}

const ThirdwebSDKProviderWagmiWrapper: React.FC<
React.PropsWithChildren<Omit<ThirdwebSDKProviderProps, "signer" | "provider">>
React.PropsWithChildren<
Omit<ThirdwebSDKProviderWagmiWrapper, "signer" | "provider">
>
> = ({ children, ...props }) => {
const provider = useProvider();
const signer = useSigner();
Expand All @@ -455,6 +453,11 @@ interface SDKContext {

const ThirdwebSDKContext = createContext<SDKContext>({ desiredChainId: -1 });

export interface ThirdwebSDKProviderProps
extends Omit<ThirdwebSDKProviderWagmiWrapper, "queryClient"> {
queryClient?: QueryClient;
}

/**
* A barebones wrapper around the Thirdweb SDK.
*
Expand All @@ -475,6 +478,10 @@ export const ThirdwebSDKProvider: React.FC<
queryClient,
children,
}) => {
const queryClientWithDefault: QueryClient = useMemo(() => {
return queryClient ? queryClient : new QueryClient();
}, [queryClient]);

const sdk = useMemo(() => {
if (!desiredChainId || typeof window === "undefined") {
return undefined;
Expand All @@ -500,7 +507,7 @@ export const ThirdwebSDKProvider: React.FC<
);

return (
<QueryClientProvider client={queryClient}>
<QueryClientProvider client={queryClientWithDefault}>
<ThirdwebSDKContext.Provider value={ctxValue}>
{children}
</ThirdwebSDKContext.Provider>
Expand Down