@solana/connector 0.2.0 → 0.2.1

package/dist/{chunk-RTXUS5KG.mjs → chunk-MDR4Y37Z.mjs}

@@ -1,6 +1,6 @@
 import { installPolyfills, isMainnetCluster, isDevnetCluster, isTestnetCluster, isLocalCluster, getClusterExplorerUrl, getClusterType, formatAddress, copyAddressToClipboard, createConnectorId, createTransactionSigner, createKitTransactionSigner, formatLamportsToSolSafe, getTransactionUrl, ConnectorClient, formatBigIntBalance, formatBigIntUsd } from './chunk-IDTUFDNB.mjs';
 import { createLogger, __publicField, WalletErrorType, createSolanaClient, NetworkError, prepareTransaction, isConnectorError } from './chunk-ZZTY3O4N.mjs';
-import React2, { createContext, Component, useTransition, useState, useCallback, useMemo, useRef, useEffect, useContext, useSyncExternalStore } from 'react';
+import React4, { createContext, Component, useTransition, useState, useCallback, useMemo, useRef, useEffect, useContext, useSyncExternalStore } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { address } from '@solana/addresses';
 import { signature } from '@solana/keys';
@@ -315,7 +315,7 @@ function ConnectorProviderInternal({
   config,
   mobile
 }) {
-  let clientRef = useRef(null), client = React2.useCallback(() => {
+  let clientRef = useRef(null), client = React4.useCallback(() => {
     if (!clientRef.current)
       try {
         clientRef.current = new ConnectorClient(config), typeof window < "u" && (window.__connectorClient = clientRef.current), config?.debug && logger2.info("Client initialized successfully");
@@ -330,7 +330,7 @@ function ConnectorProviderInternal({
       }
     return clientRef.current;
   }, [config])();
-  return React2.useEffect(() => {
+  return React4.useEffect(() => {
     let currentClient = clientRef.current;
     if (currentClient) {
       let privateClient = currentClient;
@@ -339,7 +339,7 @@ function ConnectorProviderInternal({
     return () => {
       typeof window < "u" && (window.__connectorClient = void 0), currentClient && typeof currentClient.destroy == "function" && currentClient.destroy();
     };
-  }, []), React2.useEffect(() => {
+  }, []), React4.useEffect(() => {
     if (!mobile) return;
     let cancelled = false;
     return (async () => {
@@ -394,9 +394,9 @@ function useConnector() {
       "useConnector must be used within ConnectorProvider. Wrap your app with <ConnectorProvider> or <UnifiedProvider> to use connector hooks."
     );
   let { uri: walletConnectUri, clearUri: clearWalletConnectUri } = useWalletConnectUri(), state = useSyncExternalStore(
-    React2.useCallback((cb) => client.subscribe(cb), [client]),
-    React2.useCallback(() => client.getSnapshot(), [client]),
-    React2.useCallback(() => client.getSnapshot(), [client])
+    React4.useCallback((cb) => client.subscribe(cb), [client]),
+    React4.useCallback(() => client.getSnapshot(), [client]),
+    React4.useCallback(() => client.getSnapshot(), [client])
   ), methods = useMemo(
     () => ({
       // Legacy (kept for backwards compatibility)
@@ -576,7 +576,7 @@ function useCluster() {
   }, [cluster, clusters, setCluster]);
 }
 function useAccount() {
-  let { selectedAccount, accounts, connected, selectAccount } = useConnector(), [copied, setCopied] = useState(false), copyTimeoutRef = React2.useRef(void 0), account = useMemo(
+  let { selectedAccount, accounts, connected, selectAccount } = useConnector(), [copied, setCopied] = useState(false), copyTimeoutRef = React4.useRef(void 0), account = useMemo(
     () => accounts.find((a) => a.address === selectedAccount) ?? null,
     [accounts, selectedAccount]
   ), formatted = useMemo(() => selectedAccount ? formatAddress(selectedAccount) : "", [selectedAccount]), copy = useCallback(async () => selectedAccount ? (copyTimeoutRef.current && clearTimeout(copyTimeoutRef.current), await copyAddressToClipboard(selectedAccount, {
@@ -588,7 +588,7 @@ function useAccount() {
     error: "empty_value" /* EMPTY_VALUE */,
     errorMessage: "No account selected"
   }, [selectedAccount]);
-  return React2.useEffect(() => () => {
+  return React4.useEffect(() => () => {
     copyTimeoutRef.current && clearTimeout(copyTimeoutRef.current);
   }, []), useMemo(
     () => ({
@@ -991,13 +991,13 @@ function useWalletAssets(options = {}) {
     refetchIntervalMs = false,
     client: clientOverride,
     select
-  } = options, { address: address$1, connected } = useAccount(), { client: providerClient } = useSolanaClient(), rpcClient = clientOverride ?? providerClient, key = useMemo(() => {
-    if (!enabled || !connected || !address$1 || !rpcClient) return null;
+  } = options, { account, isConnected: isConnected2 } = useWallet(), address$1 = account ? String(account) : null, { client: providerClient } = useSolanaClient(), rpcClient = clientOverride ?? providerClient, key = useMemo(() => {
+    if (!enabled || !isConnected2 || !address$1 || !rpcClient) return null;
     let rpcUrl = rpcClient.urlOrMoniker instanceof URL ? rpcClient.urlOrMoniker.toString() : String(rpcClient.urlOrMoniker);
     return getWalletAssetsQueryKey(rpcUrl, address$1);
-  }, [enabled, connected, address$1, rpcClient]), queryFn = useCallback(
+  }, [enabled, isConnected2, address$1, rpcClient]), queryFn = useCallback(
     async (signal) => {
-      if (!connected || !address$1 || !rpcClient)
+      if (!isConnected2 || !address$1 || !rpcClient)
         return { lamports: 0n, tokenAccounts: [] };
       if (signal.aborted)
         throw new DOMException("Query aborted", "AbortError");
@@ -1013,12 +1013,12 @@ function useWalletAssets(options = {}) {
       if (signal.aborted)
         throw new DOMException("Query aborted", "AbortError");
       let tokenAccounts = [];
-      for (let account of tokenAccountsResult.value) {
-        let parsed = parseTokenAccount(account, "token");
+      for (let account2 of tokenAccountsResult.value) {
+        let parsed = parseTokenAccount(account2, "token");
         parsed && tokenAccounts.push(parsed);
       }
-      for (let account of token2022AccountsResult.value) {
-        let parsed = parseTokenAccount(account, "token-2022");
+      for (let account2 of token2022AccountsResult.value) {
+        let parsed = parseTokenAccount(account2, "token-2022");
         parsed && tokenAccounts.push(parsed);
       }
       return {
@@ -1026,7 +1026,7 @@ function useWalletAssets(options = {}) {
         tokenAccounts
       };
     },
-    [connected, address$1, rpcClient]
+    [isConnected2, address$1, rpcClient]
   ), { data, error, status, updatedAt, isFetching, refetch, abort } = useSharedQuery(
     key,
     queryFn,
@@ -1484,7 +1484,7 @@ function useTransactions(options = {}) {
     // 5 minutes
     refetchOnMount = "stale",
     client: clientOverride
-  } = options, { address: address$1, connected } = useAccount(), { cluster } = useCluster(), { client: providerClient } = useSolanaClient(), connectorClient = useConnectorClient(), [paginatedTransactions, setPaginatedTransactions] = useState([]), [isPaginationLoading, setIsPaginationLoading] = useState(false), [hasMore, setHasMore] = useState(true), beforeSignatureRef = useRef(void 0), rpcClient = clientOverride ?? providerClient, connectorConfig = connectorClient?.getConfig(), imageProxy = connectorConfig?.imageProxy, programLabels = connectorConfig?.programLabels, parseTransaction = useCallback(
+  } = options, { account, isConnected: isConnected2 } = useWallet(), address$1 = useMemo(() => account ? String(account) : null, [account]), { cluster } = useCluster(), { client: providerClient } = useSolanaClient(), connectorClient = useConnectorClient(), [paginatedTransactions, setPaginatedTransactions] = useState([]), [isPaginationLoading, setIsPaginationLoading] = useState(false), [hasMore, setHasMore] = useState(true), beforeSignatureRef = useRef(void 0), rpcClient = clientOverride ?? providerClient, connectorConfig = connectorClient?.getConfig(), imageProxy = connectorConfig?.imageProxy, programLabels = connectorConfig?.programLabels, parseTransaction = useCallback(
     (tx, walletAddress, sig, blockTime, slot, err, explorerUrl) => {
       let { date, time } = formatDate(blockTime), baseInfo = {
         signature: sig,
@@ -1536,10 +1536,10 @@ function useTransactions(options = {}) {
     },
     [programLabels]
   ), key = useMemo(() => {
-    if (!enabled || !connected || !address$1 || !rpcClient || !cluster) return null;
+    if (!enabled || !isConnected2 || !address$1 || !rpcClient || !cluster) return null;
     let rpcUrl = rpcClient.urlOrMoniker instanceof URL ? rpcClient.urlOrMoniker.toString() : String(rpcClient.urlOrMoniker);
     return getTransactionsQueryKey({ rpcUrl, address: address$1, clusterId: cluster.id, limit, fetchDetails });
-  }, [enabled, connected, address$1, rpcClient, cluster, limit, fetchDetails]);
+  }, [enabled, isConnected2, address$1, rpcClient, cluster, limit, fetchDetails]);
   useEffect(() => {
     beforeSignatureRef.current = void 0, setPaginatedTransactions([]), setIsPaginationLoading(false), setHasMore(true);
   }, [key]);
@@ -1647,13 +1647,13 @@ function useTransactions(options = {}) {
     [rpcClient, address$1, limit, fetchDetails, detailsConcurrency, parseTransaction, imageProxy]
   ), queryFn = useCallback(
     async (signal) => {
-      if (!connected || !address$1 || !rpcClient || !cluster)
+      if (!isConnected2 || !address$1 || !rpcClient || !cluster)
         return [];
       throwIfAborted(signal);
       let result = await fetchAndEnrichTransactions(void 0, cluster, signal);
       return throwIfAborted(signal), result.transactions;
     },
-    [connected, address$1, rpcClient, cluster, fetchAndEnrichTransactions]
+    [isConnected2, address$1, rpcClient, cluster, fetchAndEnrichTransactions]
   ), {
     data: initialTransactions,
     error,
@@ -1914,7 +1914,7 @@ function useTokens(options = {}) {
     // 5 minutes
     refetchOnMount = "stale",
     client: clientOverride
-  } = options, { address, connected } = useAccount(), { type: clusterType } = useCluster(), connectorConfig = useConnectorClient()?.getConfig(), imageProxy = connectorConfig?.imageProxy, coingeckoConfig = connectorConfig?.coingecko, selectFn = useCallback(
+  } = options, { account, isConnected: isConnected2 } = useWallet(), address = useMemo(() => account ? String(account) : null, [account]), { type: clusterType } = useCluster(), connectorConfig = useConnectorClient()?.getConfig(), imageProxy = connectorConfig?.imageProxy, coingeckoConfig = connectorConfig?.coingecko, selectFn = useCallback(
     (assets) => selectTokens(assets, address ?? ""),
     [address]
   ), {
@@ -1943,16 +1943,16 @@ function useTokens(options = {}) {
       isFrozen: false,
       owner: walletAddress
     });
-    for (let account of tokenAccounts)
-      !includeZeroBalance && account.amount === 0n || result.push({
-        mint: account.mint,
-        tokenAccount: account.pubkey,
-        amount: account.amount,
-        decimals: account.decimals,
-        formatted: formatBalance(account.amount, account.decimals),
-        isFrozen: account.isFrozen,
-        owner: account.owner,
-        programId: account.programId
+    for (let account2 of tokenAccounts)
+      !includeZeroBalance && account2.amount === 0n || result.push({
+        mint: account2.mint,
+        tokenAccount: account2.pubkey,
+        amount: account2.amount,
+        decimals: account2.decimals,
+        formatted: formatBalance(account2.amount, account2.decimals),
+        isFrozen: account2.isFrozen,
+        owner: account2.owner,
+        programId: account2.programId
       });
     return result;
   }, [lamports, tokenAccounts, walletAddress, includeNativeSol, includeZeroBalance]), mints = useMemo(() => {
@@ -1994,10 +1994,10 @@ function useTokens(options = {}) {
     };
   }).sort(sortByValueDesc) : baseTokens.slice().sort(sortByValueDesc), [baseTokens, fetchMetadata, imageProxy, metadataVersion]), totalAccounts = tokenAccounts.length + (includeNativeSol ? 1 : 0);
   useEffect(() => (startCacheCleanup(), () => stopCacheCleanup()), []);
-  let wasConnectedRef = useRef(connected);
+  let wasConnectedRef = useRef(isConnected2);
   useEffect(() => {
-    wasConnectedRef.current && !connected && clearTokenCaches(), wasConnectedRef.current = connected;
-  }, [connected]);
+    wasConnectedRef.current && !isConnected2 && clearTokenCaches(), wasConnectedRef.current = isConnected2;
+  }, [isConnected2]);
   let visibleError = updatedAt ? null : error, refetch = useCallback(
     async (opts) => {
       await sharedRefetch(opts);
@@ -2026,17 +2026,12 @@ function DisconnectElement({
   onDisconnect,
   render
 }) {
-  let { disconnect, connecting } = useConnector(), [disconnecting, setDisconnecting] = React2.useState(false), handleDisconnect = async () => {
-    setDisconnecting(true);
-    try {
-      await disconnect(), onDisconnect?.();
-    } finally {
-      setDisconnecting(false);
-    }
+  let { isConnecting: isConnecting2 } = useWallet(), { disconnect, isDisconnecting } = useDisconnectWallet(), handleDisconnect = async () => {
+    await disconnect(), onDisconnect?.();
   };
   if (render)
-    return /* @__PURE__ */ jsx(Fragment, { children: render({ disconnect: handleDisconnect, disconnecting }) });
-  let isDisabled = connecting || disconnecting, content = /* @__PURE__ */ jsxs(Fragment, { children: [
+    return /* @__PURE__ */ jsx(Fragment, { children: render({ disconnect: handleDisconnect, disconnecting: isDisconnecting }) });
+  let isDisabled = isConnecting2 || isDisconnecting, content = /* @__PURE__ */ jsxs(Fragment, { children: [
     showIcon && (icon || showIcon && !icon && /* @__PURE__ */ jsxs(
       "svg",
       {
@@ -2068,7 +2063,7 @@ function DisconnectElement({
       disabled: isDisabled,
       "data-slot": "disconnect-element",
       "data-variant": "button",
-      "data-disconnecting": disconnecting,
+      "data-disconnecting": isDisconnecting,
       children: content
     }
   ) : variant === "link" ? /* @__PURE__ */ jsx(
@@ -2080,7 +2075,7 @@ function DisconnectElement({
       disabled: isDisabled,
       "data-slot": "disconnect-element",
       "data-variant": "link",
-      "data-disconnecting": disconnecting,
+      "data-disconnecting": isDisconnecting,
       children: content
     }
   ) : /* @__PURE__ */ jsx(
@@ -2093,7 +2088,7 @@ function DisconnectElement({
       disabled: isDisabled,
       "data-slot": "disconnect-element",
       "data-variant": "menuitem",
-      "data-disconnecting": disconnecting,
+      "data-disconnecting": isDisconnecting,
       children: content
     }
   );
@@ -2108,8 +2103,16 @@ function AccountElement({
   variant = "compact",
   render
 }) {
-  let { address, formatted, copy, copied } = useAccount(), { name: walletName, icon: walletIcon } = useWalletInfo();
-  if (render)
+  let { account, connectorId } = useWallet(), connectors = useWalletConnectors(), address = React4.useMemo(() => account ? String(account) : null, [account]), formatted = React4.useMemo(() => address ? formatAddress(address) : "", [address]), connector = React4.useMemo(() => connectorId ? connectors.find((c) => c.id === connectorId) ?? null : null, [connectors, connectorId]), walletName = connector?.name ?? null, walletIcon = connector?.icon ? connector.icon : null, [copied, setCopied] = React4.useState(false), copyTimeoutRef = React4.useRef(void 0), copy = React4.useCallback(async () => address ? (copyTimeoutRef.current && clearTimeout(copyTimeoutRef.current), await copyAddressToClipboard(address, {
+    onSuccess: () => {
+      setCopied(true), copyTimeoutRef.current = setTimeout(() => setCopied(false), 2e3);
+    }
+  })) : {
+    success: false
+  }, [address]);
+  if (React4.useEffect(() => () => {
+    copyTimeoutRef.current && clearTimeout(copyTimeoutRef.current);
+  }, []), render)
     return /* @__PURE__ */ jsx(Fragment, { children: render({ address, formatted, walletName, walletIcon, copy, copied }) });
   if (!address) return null;
   let displayAddress = showFullAddress ? address : formatted, handleCopy = async (e) => {
@@ -2270,7 +2273,7 @@ function ClusterElement({
   labels = {},
   render
 }) {
-  let { cluster, clusters, setCluster, isMainnet, isDevnet, isTestnet, isLocal } = useCluster(), [isOpen, setIsOpen] = React2.useState(false);
+  let { cluster, clusters, setCluster, isMainnet, isDevnet, isTestnet, isLocal } = useCluster(), [isOpen, setIsOpen] = React4.useState(false);
   if (render)
     return /* @__PURE__ */ jsx(Fragment, { children: render({ cluster, clusters, setCluster, isMainnet, isDevnet, isTestnet, isLocal }) });
   if (!cluster) return null;
@@ -2481,19 +2484,28 @@ function WalletListElement({
   render,
   renderWallet
 }) {
-  let { wallets, connecting } = useWalletInfo(), { select } = useConnector(), installedWallets = wallets.filter((w) => w.installed), displayWallets = installedOnly ? installedWallets : wallets, handleSelect = async (walletName) => {
-    await select(walletName), onSelect?.(walletName);
-  }, handleConnectById = async (connectorId) => {
-    let wallet = wallets.find((w) => w.connectorId === connectorId);
+  let connectors = useWalletConnectors(), { isConnecting: isConnectingGlobal } = useWallet(), { connect, isConnecting: isConnectingLocal } = useConnectWallet(), connecting = isConnectingGlobal || isConnectingLocal, wallets = React4.useMemo(
+    () => connectors.map((c) => ({
+      name: c.name,
+      connectorId: c.id,
+      icon: c.icon || void 0,
+      installed: c.ready,
+      connectable: c.ready
+    })),
+    [connectors]
+  ), installedWallets = wallets.filter((w) => w.installed), displayWallets = installedOnly ? installedWallets : wallets, handleSelect = async (walletName) => {
+    let wallet = wallets.find((w) => w.name === walletName);
     if (!wallet) {
-      let availableConnectorIds = wallets.map((w) => w.connectorId);
+      let availableWalletNames = wallets.map((w) => w.name);
       console.warn(
-        `[WalletListElement] Wallet not found for connectorId: ${connectorId}. Available connectorIds (${availableConnectorIds.length}):`,
-        availableConnectorIds
+        `[WalletListElement] Wallet not found for walletName: ${walletName}. Available wallets (${availableWalletNames.length}):`,
+        availableWalletNames
       );
       return;
     }
-    await select(wallet.name), onConnect?.(connectorId);
+    await connect(wallet.connectorId), onSelect?.(walletName), onConnect?.(wallet.connectorId);
+  }, handleConnectById = async (connectorId) => {
+    await connect(connectorId), onConnect?.(connectorId);
   };
   if (render)
     return /* @__PURE__ */ jsx(Fragment, { children: render({
@@ -2562,7 +2574,7 @@ function WalletListElement({
       "data-variant": "grid",
       children: displayWallets.map((wallet) => {
         let handleWalletConnect = () => handleConnectById(wallet.connectorId);
-        return renderWallet ? /* @__PURE__ */ jsx(React2.Fragment, { children: renderWallet({
+        return renderWallet ? /* @__PURE__ */ jsx(React4.Fragment, { children: renderWallet({
           wallet,
           select: handleWalletConnect,
           connect: handleWalletConnect,
@@ -2573,7 +2585,7 @@ function WalletListElement({
             type: "button",
             className: "ck-wallet-list-item ck-wallet-list-item--grid",
             onClick: handleWalletConnect,
-            disabled: connecting || !wallet.installed && installedOnly,
+            disabled: connecting || !wallet.connectable,
             "data-slot": "wallet-list-item",
             "data-wallet": wallet.name,
             "data-connector-id": wallet.connectorId,
@@ -2596,7 +2608,7 @@ function WalletListElement({
       "data-variant": "compact",
       children: displayWallets.map((wallet) => {
         let handleWalletConnect = () => handleConnectById(wallet.connectorId);
-        return renderWallet ? /* @__PURE__ */ jsx(React2.Fragment, { children: renderWallet({
+        return renderWallet ? /* @__PURE__ */ jsx(React4.Fragment, { children: renderWallet({
           wallet,
           select: handleWalletConnect,
           connect: handleWalletConnect,
@@ -2607,7 +2619,7 @@ function WalletListElement({
             type: "button",
             className: "ck-wallet-list-item ck-wallet-list-item--compact",
             onClick: handleWalletConnect,
-            disabled: connecting || !wallet.installed && installedOnly,
+            disabled: connecting || !wallet.connectable,
             "data-slot": "wallet-list-item",
             "data-wallet": wallet.name,
             "data-connector-id": wallet.connectorId,
@@ -2629,7 +2641,7 @@ function WalletListElement({
       "data-variant": "list",
       children: displayWallets.map((wallet) => {
         let handleWalletConnect = () => handleConnectById(wallet.connectorId);
-        return renderWallet ? /* @__PURE__ */ jsx(React2.Fragment, { children: renderWallet({
+        return renderWallet ? /* @__PURE__ */ jsx(React4.Fragment, { children: renderWallet({
           wallet,
           select: handleWalletConnect,
           connect: handleWalletConnect,
@@ -2640,7 +2652,7 @@ function WalletListElement({
             type: "button",
             className: "ck-wallet-list-item ck-wallet-list-item--list",
             onClick: handleWalletConnect,
-            disabled: connecting || !wallet.installed && installedOnly,
+            disabled: connecting || !wallet.connectable,
             "data-slot": "wallet-list-item",
             "data-wallet": wallet.name,
             "data-connector-id": wallet.connectorId,
@@ -2716,7 +2728,7 @@ function injectStyles() {
   }
 }
 function SkeletonShine() {
-  return React2.useEffect(() => {
+  return React4.useEffect(() => {
     injectStyles();
   }, []), /* @__PURE__ */ jsx("div", { className: "ck-skeleton-shine", "data-slot": "skeleton-shine" });
 }
@@ -3251,5 +3263,5 @@ function TokenListElement({
 TokenListElement.displayName = "TokenListElement";
 
 export { AccountElement, AppProvider, BalanceElement, ClusterElement, ConnectorErrorBoundary, ConnectorProvider, DisconnectElement, SkeletonShine, TokenListElement, TransactionHistoryElement, UnifiedProvider, WalletConnectProvider, WalletListElement, clearSharedQueryCache, clearTokenCaches, getBalanceQueryKey, getTokensQueryKey, getTransactionsQueryKey, getWalletAssetsQueryKey, invalidateSharedQuery, useAccount, useBalance, useCluster, useConnectWallet, useConnector, useConnectorClient, useDisconnectWallet, useGillSolanaClient, useGillTransactionSigner, useKitTransactionSigner, useSolanaClient, useTokens, useTransactionPreparer, useTransactionSigner, useTransactions, useWallet, useWalletConnectUri, useWalletConnectors, useWalletInfo, withErrorBoundary };
-//# sourceMappingURL=chunk-RTXUS5KG.mjs.map
-//# sourceMappingURL=chunk-RTXUS5KG.mjs.map
+//# sourceMappingURL=chunk-MDR4Y37Z.mjs.map
+//# sourceMappingURL=chunk-MDR4Y37Z.mjs.map