@mysten/dapp-kit 0.5.0 → 0.7.0

package/dist/esm/index.js

@@ -103,16 +103,23 @@ function useConnectWallet({
   ...mutationOptions
 } = {}) {
   const setWalletConnected = useWalletStore((state) => state.setWalletConnected);
+  const setConnectionStatus = useWalletStore((state) => state.setConnectionStatus);
   return useMutation({
     mutationKey: walletMutationKeys.connectWallet(mutationKey),
-    mutationFn: async ({ wallet, accountAddress, ...standardConnectInput }) => {
-      const connectResult = await wallet.features["standard:connect"].connect(standardConnectInput);
-      const connectedSuiAccounts = connectResult.accounts.filter(
-        (account) => account.chains.some((chain) => chain.split(":")[0] === "sui")
-      );
-      const selectedAccount = getSelectedAccount(connectedSuiAccounts, accountAddress);
-      setWalletConnected(wallet, connectedSuiAccounts, selectedAccount);
-      return { accounts: connectedSuiAccounts };
+    mutationFn: async ({ wallet, accountAddress, ...connectArgs }) => {
+      try {
+        setConnectionStatus("connecting");
+        const connectResult = await wallet.features["standard:connect"].connect(connectArgs);
+        const connectedSuiAccounts = connectResult.accounts.filter(
+          (account) => account.chains.some((chain) => chain.split(":")[0] === "sui")
+        );
+        const selectedAccount = getSelectedAccount(connectedSuiAccounts, accountAddress);
+        setWalletConnected(wallet, connectedSuiAccounts, selectedAccount);
+        return { accounts: connectedSuiAccounts };
+      } catch (error) {
+        setConnectionStatus("disconnected");
+        throw error;
+      }
     },
     ...mutationOptions
   });
@@ -506,7 +513,7 @@ function ConnectModal({ trigger, open, defaultOpen, onOpenChange }) {
       modalContent = /* @__PURE__ */ jsx15(WhatIsAWallet, {});
   }
   return /* @__PURE__ */ jsxs7(Dialog.Root, { open: open ?? isModalOpen, onOpenChange: handleOpenChange, children: [
-    /* @__PURE__ */ jsx15(StyleMarker, { children: /* @__PURE__ */ jsx15(Dialog.Trigger, { asChild: true, children: trigger }) }),
+    /* @__PURE__ */ jsx15(Dialog.Trigger, { asChild: true, children: trigger }),
     /* @__PURE__ */ jsx15(Dialog.Portal, { children: /* @__PURE__ */ jsx15(StyleMarker, { children: /* @__PURE__ */ jsx15(Dialog.Overlay, { className: overlay, children: /* @__PURE__ */ jsxs7(Dialog.Content, { className: content, "aria-describedby": void 0, children: [
       /* @__PURE__ */ jsxs7(
         "div",
@@ -650,20 +657,20 @@ function useSuiClientQuery(...args) {
 
 // src/hooks/useResolveSuiNSNames.ts
 function useResolveSuiNSName(address, options) {
-  const { data, ...rest } = useSuiClientQuery(
+  return useSuiClientQuery(
     "resolveNameServiceNames",
     {
       address,
       limit: 1
     },
     {
+      ...options,
       refetchOnWindowFocus: false,
       retry: false,
-      ...options,
+      select: (data) => data.data.length > 0 ? data.data[0] : null,
       enabled: !!address && options?.enabled !== false
     }
   );
-  return { data: data?.data?.[0] ?? null, ...rest };
 }
 
 // src/hooks/wallet/useAccounts.ts
@@ -686,7 +693,35 @@ var WalletAccountNotFoundError = class extends Error {
 
 // src/hooks/wallet/useCurrentWallet.ts
 function useCurrentWallet() {
-  return useWalletStore((state) => state.currentWallet);
+  const currentWallet = useWalletStore((state) => state.currentWallet);
+  const connectionStatus2 = useWalletStore((state) => state.connectionStatus);
+  switch (connectionStatus2) {
+    case "connecting":
+      return {
+        connectionStatus: connectionStatus2,
+        currentWallet: null,
+        isDisconnected: false,
+        isConnecting: true,
+        isConnected: false
+      };
+    case "disconnected":
+      return {
+        connectionStatus: connectionStatus2,
+        currentWallet: null,
+        isDisconnected: true,
+        isConnecting: false,
+        isConnected: false
+      };
+    case "connected": {
+      return {
+        connectionStatus: connectionStatus2,
+        currentWallet,
+        isDisconnected: false,
+        isConnecting: false,
+        isConnected: true
+      };
+    }
+  }
 }
 
 // src/hooks/wallet/useDisconnectWallet.ts
@@ -694,7 +729,7 @@ function useDisconnectWallet({
   mutationKey,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const setWalletDisconnected = useWalletStore((state) => state.setWalletDisconnected);
   return useMutation2({
     mutationKey: walletMutationKeys.disconnectWallet(mutationKey),
@@ -719,7 +754,7 @@ function useSwitchAccount({
   mutationKey,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const setAccountSwitched = useWalletStore((state) => state.setAccountSwitched);
   return useMutation3({
     mutationKey: walletMutationKeys.switchAccount(mutationKey),
@@ -835,7 +870,12 @@ function ConnectButton({
   ...buttonProps
 }) {
   const currentAccount = useCurrentAccount();
-  return currentAccount ? /* @__PURE__ */ jsx20(AccountDropdownMenu, { currentAccount }) : /* @__PURE__ */ jsx20(ConnectModal, { trigger: /* @__PURE__ */ jsx20(Button, { ...buttonProps, children: connectText }) });
+  return currentAccount ? /* @__PURE__ */ jsx20(AccountDropdownMenu, { currentAccount }) : /* @__PURE__ */ jsx20(
+    ConnectModal,
+    {
+      trigger: /* @__PURE__ */ jsx20(StyleMarker, { children: /* @__PURE__ */ jsx20(Button, { ...buttonProps, children: connectText }) })
+    }
+  );
 }
 
 // src/components/WalletProvider.tsx
@@ -845,25 +885,35 @@ import { useRef } from "react";
 import { useEffect } from "react";
 function useAutoConnectWallet(autoConnectEnabled) {
   const { mutate: connectWallet } = useConnectWallet();
-  const wallets = useWallets();
+  const setAutoConnectionStatus = useWalletStore((state) => state.setAutoConnectionStatus);
   const lastConnectedWalletName = useWalletStore((state) => state.lastConnectedWalletName);
   const lastConnectedAccountAddress = useWalletStore((state) => state.lastConnectedAccountAddress);
+  const wallets = useWallets();
+  const { isDisconnected } = useCurrentWallet();
   useEffect(() => {
-    if (!autoConnectEnabled || !lastConnectedWalletName)
+    if (!autoConnectEnabled || !lastConnectedWalletName || !lastConnectedAccountAddress || !isDisconnected) {
       return;
+    }
     const wallet = wallets.find((wallet2) => wallet2.name === lastConnectedWalletName);
     if (wallet) {
-      connectWallet({
-        wallet,
-        accountAddress: lastConnectedAccountAddress || void 0,
-        silent: true
-      });
+      connectWallet(
+        {
+          wallet,
+          accountAddress: lastConnectedAccountAddress,
+          silent: true
+        },
+        {
+          onSettled: () => setAutoConnectionStatus("settled")
+        }
+      );
     }
   }, [
     autoConnectEnabled,
     connectWallet,
+    isDisconnected,
     lastConnectedAccountAddress,
     lastConnectedWalletName,
+    setAutoConnectionStatus,
     wallets
   ]);
 }
@@ -987,7 +1037,7 @@ function registerUnsafeBurnerWallet(suiClient) {
 // src/hooks/wallet/useWalletPropertiesChanged.ts
 import { useEffect as useEffect3 } from "react";
 function useWalletPropertiesChanged() {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const updateWalletAccounts = useWalletStore((state) => state.updateWalletAccounts);
   useEffect3(() => {
     const unsubscribeFromEvents = currentWallet?.features["standard:events"].on(
@@ -1106,7 +1156,12 @@ var lightTheme = {
 // src/walletStore.ts
 import { createStore } from "zustand";
 import { createJSONStorage, persist } from "zustand/middleware";
-function createWalletStore({ wallets, storage, storageKey }) {
+function createWalletStore({
+  wallets,
+  storage,
+  storageKey,
+  autoConnect
+}) {
   return createStore()(
     persist(
       (set, get) => ({
@@ -1117,13 +1172,25 @@ function createWalletStore({ wallets, storage, storageKey }) {
         lastConnectedAccountAddress: null,
         lastConnectedWalletName: null,
         connectionStatus: "disconnected",
+        autoConnectionStatus: autoConnect ? "idle" : "disabled",
+        setConnectionStatus(connectionStatus2) {
+          set(() => ({
+            connectionStatus: connectionStatus2
+          }));
+        },
+        setAutoConnectionStatus(autoConnectionStatus) {
+          set(() => ({
+            autoConnectionStatus
+          }));
+        },
         setWalletConnected(wallet, connectedAccounts, selectedAccount) {
           set(() => ({
             accounts: connectedAccounts,
             currentWallet: wallet,
             currentAccount: selectedAccount,
             lastConnectedWalletName: wallet.name,
-            lastConnectedAccountAddress: selectedAccount?.address
+            lastConnectedAccountAddress: selectedAccount?.address,
+            connectionStatus: "connected"
           }));
         },
         setWalletDisconnected() {
@@ -1132,7 +1199,8 @@ function createWalletStore({ wallets, storage, storageKey }) {
             currentWallet: null,
             currentAccount: null,
             lastConnectedWalletName: null,
-            lastConnectedAccountAddress: null
+            lastConnectedAccountAddress: null,
+            connectionStatus: "disconnected"
           }));
         },
         setAccountSwitched(selectedAccount) {
@@ -1152,7 +1220,8 @@ function createWalletStore({ wallets, storage, storageKey }) {
               currentWallet: null,
               currentAccount: null,
               lastConnectedWalletName: null,
-              lastConnectedAccountAddress: null
+              lastConnectedAccountAddress: null,
+              connectionStatus: "disconnected"
             }));
           } else {
             set(() => ({ wallets: updatedWallets }));
@@ -1293,7 +1362,8 @@ function WalletProvider({
     createWalletStore({
       wallets: getRegisteredWallets(preferredWallets, requiredFeatures),
       storageKey,
-      storage
+      storage,
+      autoConnect
     })
   );
   return /* @__PURE__ */ jsx22(WalletContext.Provider, { value: storeRef.current, children: /* @__PURE__ */ jsxs9(
@@ -1351,18 +1421,22 @@ function createNetworkConfig(networkConfig) {
 
 // src/hooks/useSuiClientInfiniteQuery.ts
 import { useInfiniteQuery } from "@tanstack/react-query";
-function useSuiClientInfiniteQuery(method, params, { queryKey = [], enabled = !!params, ...options } = {}) {
+function useSuiClientInfiniteQuery(method, params, {
+  queryKey = [],
+  enabled = !!params,
+  ...options
+} = {}) {
   const suiContext = useSuiClientContext();
   return useInfiniteQuery({
     ...options,
+    initialPageParam: null,
     queryKey: [suiContext.network, method, params, ...queryKey],
     enabled,
-    queryFn: async () => {
-      return await suiContext.client[method](params);
-    },
-    getNextPageParam: (lastPage) => {
-      return lastPage.nextCursor ?? null;
-    }
+    queryFn: ({ pageParam }) => suiContext.client[method]({
+      ...params ?? {},
+      cursor: pageParam
+    }),
+    getNextPageParam: ({ nextCursor }) => nextCursor ?? null
   });
 }
 
@@ -1378,6 +1452,11 @@ function useSuiClientMutation(method, options = {}) {
   });
 }
 
+// src/hooks/wallet/useAutoConnectionStatus.ts
+function useAutoConnectionStatus() {
+  return useWalletStore((state) => state.autoConnectionStatus);
+}
+
 // src/hooks/wallet/useSignAndExecuteTransactionBlock.ts
 import { useMutation as useMutation5 } from "@tanstack/react-query";
 function useSignAndExecuteTransactionBlock({
@@ -1385,7 +1464,7 @@ function useSignAndExecuteTransactionBlock({
   executeFromWallet,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
   const client = useSuiClient();
   return useMutation5({
@@ -1443,7 +1522,7 @@ function useSignPersonalMessage({
   mutationKey,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
   return useMutation6({
     mutationKey: walletMutationKeys.signPersonalMessage(mutationKey),
@@ -1478,7 +1557,7 @@ function useSignTransactionBlock({
   mutationKey,
   ...mutationOptions
 } = {}) {
-  const currentWallet = useCurrentWallet();
+  const { currentWallet } = useCurrentWallet();
   const currentAccount = useCurrentAccount();
   return useMutation7({
     mutationKey: walletMutationKeys.signTransactionBlock(mutationKey),
@@ -1516,6 +1595,7 @@ export {
   createNetworkConfig,
   lightTheme,
   useAccounts,
+  useAutoConnectionStatus,
   useConnectWallet,
   useCurrentAccount,
   useCurrentWallet,