@ant-design/web3-wagmi 2.7.2 → 2.7.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @ant-design/web3-wagmi
 
+## 2.7.4
+
+### Patch Changes
+
+- efbd948: fix(web3-wagmi): Correct spelling of "Factories"
+- Updated dependencies [9bb1ea1]
+  - @ant-design/web3-common@1.13.0
+  - @ant-design/web3-assets@1.10.2
+
+## 2.7.3
+
+### Patch Changes
+
+- 615d403: fix(web3-wagmi): Ensure AntDesignWeb3ConfigProvider component renders correctly when Wagmi config ssr is true
+- 8760a03: feat(web3-wagmi): Add 'initialState' and 'reconnectOnMount' props to WagmiWeb3ConfigProviderProps
+
 ## 2.7.2
 
 ### Patch Changes

package/dist/esm/wagmi-provider/config-provider.d.ts

@@ -1,17 +1,15 @@
 import React from 'react';
 import { type Chain, type Locale } from '@ant-design/web3-common';
-import type { Chain as WagmiChain } from 'viem';
-import { type Connector as WagmiConnector } from 'wagmi';
+import type { Config as WagmiConfig } from 'wagmi';
 import type { EIP6963Config, WalletFactory } from '../interface';
 export interface AntDesignWeb3ConfigProviderProps {
     chainAssets: Chain[];
-    walletFactorys: WalletFactory[];
+    walletFactories: WalletFactory[];
     locale?: Locale;
     children?: React.ReactNode;
     ens?: boolean;
     balance?: boolean;
     eip6963?: EIP6963Config;
-    readonly availableChains: readonly WagmiChain[];
-    readonly availableConnectors: readonly WagmiConnector[];
+    wagimConfig: WagmiConfig;
 }
 export declare const AntDesignWeb3ConfigProvider: React.FC<AntDesignWeb3ConfigProviderProps>;

package/dist/esm/wagmi-provider/config-provider.js

@@ -10,13 +10,12 @@ export const AntDesignWeb3ConfigProvider = props => {
   const {
     children,
     chainAssets,
-    walletFactorys,
-    availableChains,
-    availableConnectors,
+    walletFactories,
     ens = true,
     balance,
     locale,
-    eip6963
+    eip6963,
+    wagimConfig
   } = props;
   const {
     address,
@@ -51,26 +50,26 @@ export const AntDesignWeb3ConfigProvider = props => {
     avatar: ensAvatar ?? undefined
   } : undefined;
   const findConnectorByName = name => {
-    const commonConnector = availableConnectors.find(item => item.name === name && !isEIP6963Connector(item));
+    const commonConnector = wagimConfig.connectors.find(item => item.name === name && !isEIP6963Connector(item));
     if (!eip6963) {
       return commonConnector;
     }
-    const eip6963Connector = availableConnectors.find(item => item.name === name && isEIP6963Connector(item));
+    const eip6963Connector = wagimConfig.connectors.find(item => item.name === name && isEIP6963Connector(item));
     return eip6963Connector || commonConnector;
   };
   const wallets = React.useMemo(() => {
     const autoAddEIP6963Wallets = [];
-    availableConnectors.forEach(connector => {
+    wagimConfig.connectors.forEach(connector => {
       if (isEIP6963Connector(connector)) {
         // check is need auto add eip6963 wallet
-        if (typeof eip6963 === 'object' && eip6963?.autoAddInjectedWallets && !walletFactorys.find(item => item.connectors.includes(connector.name))) {
+        if (typeof eip6963 === 'object' && eip6963?.autoAddInjectedWallets && !walletFactories.find(item => item.connectors.includes(connector.name))) {
           // not config wallet and find the wallet in connectors, auto add it
           autoAddEIP6963Wallets.push(EIP6963Wallet().create([connector]));
         }
         // Do not need check eip6963 wallet
         return;
       }
-      const walletFactory = walletFactorys.find(factory => factory.connectors.includes(connector.name));
+      const walletFactory = walletFactories.find(factory => factory.connectors.includes(connector.name));
       if (!walletFactory?.create) {
         // check user wallets config and console.error for alert
         console.error(`Can not find wallet factory for ${connector.name}, you should config it in WagmiWeb3ConfigProvider 'wallets'.`);
@@ -78,7 +77,7 @@ export const AntDesignWeb3ConfigProvider = props => {
     });
 
     // Generate Wallet for @ant-design/web3
-    const supportWallets = walletFactorys.map(factory => {
+    const supportWallets = walletFactories.map(factory => {
       const connectors = factory.connectors.map(findConnectorByName).filter(item => !!item);
       if (connectors.length === 0 && !eip6963) {
         // Not config connector for this wallet factory and not use eip6963, ignore it.
@@ -88,9 +87,9 @@ export const AntDesignWeb3ConfigProvider = props => {
       return factory.create(connectors);
     }).filter(item => item !== null);
     return [...supportWallets, ...autoAddEIP6963Wallets];
-  }, [availableConnectors, walletFactorys, eip6963]);
+  }, [wagimConfig.connectors, walletFactories, eip6963]);
   const chainList = React.useMemo(() => {
-    return availableChains.map(item => {
+    return wagimConfig.chains.map(item => {
       const c = chainAssets?.find(asset => {
         return asset.id === item.id;
       });
@@ -104,9 +103,9 @@ export const AntDesignWeb3ConfigProvider = props => {
       console.error(`Can not find chain ${item.id}, you should config it in WagmiWeb3ConfigProvider 'chains'.`);
       return null;
     }).filter(item => item !== null);
-  }, [availableChains, chainAssets]);
-  const chainId = chain?.id || availableChains?.[0]?.id;
-  const chainName = chain?.name || availableChains?.[0]?.name;
+  }, [wagimConfig.chains, chainAssets]);
+  const chainId = chain?.id || wagimConfig.chains?.[0]?.id;
+  const chainName = chain?.name || wagimConfig.chains?.[0]?.name;
   const [currentChain, setCurrentChain] = React.useState(undefined);
   React.useEffect(() => {
     setCurrentChain(prevChain => {
@@ -120,7 +119,7 @@ export const AntDesignWeb3ConfigProvider = props => {
       }
       return newChain || prevChain;
     });
-  }, [chainAssets, availableChains, chainId, chainName]);
+  }, [chainAssets, wagimConfig.chains, chainId, chainName]);
   const currency = currentChain?.nativeCurrency;
   const getNFTMetadataFunc = React.useCallback(async ({
     address: contractAddress,

package/dist/esm/wagmi-provider/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { Chain, Locale } from '@ant-design/web3-common';
 import { QueryClient } from '@tanstack/react-query';
-import type { Config } from 'wagmi';
+import type { Config, State } from 'wagmi';
 import type { EIP6963Config, WalletFactory } from '../interface';
 export type WagmiWeb3ConfigProviderProps = {
     config: Config;
@@ -12,5 +12,7 @@ export type WagmiWeb3ConfigProviderProps = {
     queryClient?: QueryClient;
     balance?: boolean;
     eip6963?: EIP6963Config;
+    initialState?: State;
+    reconnectOnMount?: boolean;
 };
-export declare function WagmiWeb3ConfigProvider({ children, wallets, chains, ens, locale, balance, config, queryClient, eip6963, ...restProps }: React.PropsWithChildren<WagmiWeb3ConfigProviderProps>): React.ReactElement;
+export declare function WagmiWeb3ConfigProvider({ children, config, locale, wallets, chains, ens, queryClient, balance, eip6963, ...restProps }: React.PropsWithChildren<WagmiWeb3ConfigProviderProps>): React.ReactElement;

package/dist/esm/wagmi-provider/index.js

@@ -7,13 +7,13 @@ import { AntDesignWeb3ConfigProvider } from "./config-provider";
 import { jsx as _jsx } from "react/jsx-runtime";
 export function WagmiWeb3ConfigProvider({
   children,
+  config,
+  locale,
   wallets = [],
   chains = [],
   ens,
-  locale,
-  balance,
-  config,
   queryClient,
+  balance,
   eip6963,
   ...restProps
 }) {
@@ -29,12 +29,11 @@ export function WagmiWeb3ConfigProvider({
       children: /*#__PURE__*/_jsx(AntDesignWeb3ConfigProvider, {
         locale: locale,
         chainAssets: chainAssets,
-        walletFactorys: wallets,
-        availableChains: config.chains,
-        availableConnectors: config.connectors,
+        walletFactories: wallets,
         ens: ens,
         balance: balance,
         eip6963: eip6963,
+        wagimConfig: config,
         children: children
       })
     })

package/dist/lib/wagmi-provider/config-provider.d.ts

@@ -1,17 +1,15 @@
 import React from 'react';
 import { type Chain, type Locale } from '@ant-design/web3-common';
-import type { Chain as WagmiChain } from 'viem';
-import { type Connector as WagmiConnector } from 'wagmi';
+import type { Config as WagmiConfig } from 'wagmi';
 import type { EIP6963Config, WalletFactory } from '../interface';
 export interface AntDesignWeb3ConfigProviderProps {
     chainAssets: Chain[];
-    walletFactorys: WalletFactory[];
+    walletFactories: WalletFactory[];
     locale?: Locale;
     children?: React.ReactNode;
     ens?: boolean;
     balance?: boolean;
     eip6963?: EIP6963Config;
-    readonly availableChains: readonly WagmiChain[];
-    readonly availableConnectors: readonly WagmiConnector[];
+    wagimConfig: WagmiConfig;
 }
 export declare const AntDesignWeb3ConfigProvider: React.FC<AntDesignWeb3ConfigProviderProps>;

package/dist/lib/wagmi-provider/config-provider.js

@@ -17,13 +17,12 @@ const AntDesignWeb3ConfigProvider = props => {
   const {
     children,
     chainAssets,
-    walletFactorys,
-    availableChains,
-    availableConnectors,
+    walletFactories,
     ens = true,
     balance,
     locale,
-    eip6963
+    eip6963,
+    wagimConfig
   } = props;
   const {
     address,
@@ -58,26 +57,26 @@ const AntDesignWeb3ConfigProvider = props => {
     avatar: ensAvatar ?? undefined
   } : undefined;
   const findConnectorByName = name => {
-    const commonConnector = availableConnectors.find(item => item.name === name && !(0, _utils.isEIP6963Connector)(item));
+    const commonConnector = wagimConfig.connectors.find(item => item.name === name && !(0, _utils.isEIP6963Connector)(item));
     if (!eip6963) {
       return commonConnector;
     }
-    const eip6963Connector = availableConnectors.find(item => item.name === name && (0, _utils.isEIP6963Connector)(item));
+    const eip6963Connector = wagimConfig.connectors.find(item => item.name === name && (0, _utils.isEIP6963Connector)(item));
     return eip6963Connector || commonConnector;
   };
   const wallets = _react.default.useMemo(() => {
     const autoAddEIP6963Wallets = [];
-    availableConnectors.forEach(connector => {
+    wagimConfig.connectors.forEach(connector => {
       if ((0, _utils.isEIP6963Connector)(connector)) {
         // check is need auto add eip6963 wallet
-        if (typeof eip6963 === 'object' && eip6963?.autoAddInjectedWallets && !walletFactorys.find(item => item.connectors.includes(connector.name))) {
+        if (typeof eip6963 === 'object' && eip6963?.autoAddInjectedWallets && !walletFactories.find(item => item.connectors.includes(connector.name))) {
           // not config wallet and find the wallet in connectors, auto add it
           autoAddEIP6963Wallets.push((0, _eip.EIP6963Wallet)().create([connector]));
         }
         // Do not need check eip6963 wallet
         return;
       }
-      const walletFactory = walletFactorys.find(factory => factory.connectors.includes(connector.name));
+      const walletFactory = walletFactories.find(factory => factory.connectors.includes(connector.name));
       if (!walletFactory?.create) {
         // check user wallets config and console.error for alert
         console.error(`Can not find wallet factory for ${connector.name}, you should config it in WagmiWeb3ConfigProvider 'wallets'.`);
@@ -85,7 +84,7 @@ const AntDesignWeb3ConfigProvider = props => {
     });
 
     // Generate Wallet for @ant-design/web3
-    const supportWallets = walletFactorys.map(factory => {
+    const supportWallets = walletFactories.map(factory => {
       const connectors = factory.connectors.map(findConnectorByName).filter(item => !!item);
       if (connectors.length === 0 && !eip6963) {
         // Not config connector for this wallet factory and not use eip6963, ignore it.
@@ -95,9 +94,9 @@ const AntDesignWeb3ConfigProvider = props => {
       return factory.create(connectors);
     }).filter(item => item !== null);
     return [...supportWallets, ...autoAddEIP6963Wallets];
-  }, [availableConnectors, walletFactorys, eip6963]);
+  }, [wagimConfig.connectors, walletFactories, eip6963]);
   const chainList = _react.default.useMemo(() => {
-    return availableChains.map(item => {
+    return wagimConfig.chains.map(item => {
       const c = chainAssets?.find(asset => {
         return asset.id === item.id;
       });
@@ -111,9 +110,9 @@ const AntDesignWeb3ConfigProvider = props => {
       console.error(`Can not find chain ${item.id}, you should config it in WagmiWeb3ConfigProvider 'chains'.`);
       return null;
     }).filter(item => item !== null);
-  }, [availableChains, chainAssets]);
-  const chainId = chain?.id || availableChains?.[0]?.id;
-  const chainName = chain?.name || availableChains?.[0]?.name;
+  }, [wagimConfig.chains, chainAssets]);
+  const chainId = chain?.id || wagimConfig.chains?.[0]?.id;
+  const chainName = chain?.name || wagimConfig.chains?.[0]?.name;
   const [currentChain, setCurrentChain] = _react.default.useState(undefined);
   _react.default.useEffect(() => {
     setCurrentChain(prevChain => {
@@ -127,7 +126,7 @@ const AntDesignWeb3ConfigProvider = props => {
       }
       return newChain || prevChain;
     });
-  }, [chainAssets, availableChains, chainId, chainName]);
+  }, [chainAssets, wagimConfig.chains, chainId, chainName]);
   const currency = currentChain?.nativeCurrency;
   const getNFTMetadataFunc = _react.default.useCallback(async ({
     address: contractAddress,

package/dist/lib/wagmi-provider/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import type { Chain, Locale } from '@ant-design/web3-common';
 import { QueryClient } from '@tanstack/react-query';
-import type { Config } from 'wagmi';
+import type { Config, State } from 'wagmi';
 import type { EIP6963Config, WalletFactory } from '../interface';
 export type WagmiWeb3ConfigProviderProps = {
     config: Config;
@@ -12,5 +12,7 @@ export type WagmiWeb3ConfigProviderProps = {
     queryClient?: QueryClient;
     balance?: boolean;
     eip6963?: EIP6963Config;
+    initialState?: State;
+    reconnectOnMount?: boolean;
 };
-export declare function WagmiWeb3ConfigProvider({ children, wallets, chains, ens, locale, balance, config, queryClient, eip6963, ...restProps }: React.PropsWithChildren<WagmiWeb3ConfigProviderProps>): React.ReactElement;
+export declare function WagmiWeb3ConfigProvider({ children, config, locale, wallets, chains, ens, queryClient, balance, eip6963, ...restProps }: React.PropsWithChildren<WagmiWeb3ConfigProviderProps>): React.ReactElement;

package/dist/lib/wagmi-provider/index.js

@@ -15,13 +15,13 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function WagmiWeb3ConfigProvider({
   children,
+  config,
+  locale,
   wallets = [],
   chains = [],
   ens,
-  locale,
-  balance,
-  config,
   queryClient,
+  balance,
   eip6963,
   ...restProps
 }) {
@@ -37,12 +37,11 @@ function WagmiWeb3ConfigProvider({
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_configProvider.AntDesignWeb3ConfigProvider, {
         locale: locale,
         chainAssets: chainAssets,
-        walletFactorys: wallets,
-        availableChains: config.chains,
-        availableConnectors: config.connectors,
+        walletFactories: wallets,
         ens: ens,
         balance: balance,
         eip6963: eip6963,
+        wagimConfig: config,
         children: children
       })
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/web3-wagmi",
-  "version": "2.7.2",
+  "version": "2.7.4",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -38,8 +38,8 @@
   },
   "dependencies": {
     "debug": "^4.3.5",
-    "@ant-design/web3-assets": "1.10.1",
-    "@ant-design/web3-common": "1.12.1"
+    "@ant-design/web3-assets": "1.10.2",
+    "@ant-design/web3-common": "1.13.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",