feat: override chain ID generic from options

tien · Jul 5, 2024 · 942348d · 942348d
1 parent 7d92a85
commit 942348d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 19 deletions.
diff --git a/packages/react/src/hooks/types.ts b/packages/react/src/hooks/types.ts
@@ -1,9 +1,9 @@
 import type { ChainId } from "@reactive-dot/core";
 
 // eslint-disable-next-line @typescript-eslint/ban-types
-export type ChainHookOptions<T = {}> = T & {
+export type ChainHookOptions<TChainId extends ChainId = ChainId, T = {}> = T & {
   /**
    * Override default chain ID
    */
-  chainId?: ChainId;
+  chainId?: TChainId;
 };
diff --git a/packages/react/src/hooks/useMutation.ts b/packages/react/src/hooks/useMutation.ts
@@ -38,19 +38,22 @@ export function useMutation<
     >["tx"],
   ) => // eslint-disable-next-line @typescript-eslint/no-explicit-any
   Transaction<any, any, any, any>,
-  TChainId extends ChainId | void = void,
+  TChainId extends ChainId = ChainId,
 >(
   action: TAction,
-  options?: ChainHookOptions<{
-    /**
-     * Override default signer
-     */
-    signer?: PolkadotSigner;
-    /**
-     * Additional transaction options
-     */
-    txOptions?: TxOptions<ReturnType<TAction>>;
-  }>,
+  options?: ChainHookOptions<
+    TChainId,
+    {
+      /**
+       * Override default signer
+       */
+      signer?: PolkadotSigner;
+      /**
+       * Additional transaction options
+       */
+      txOptions?: TxOptions<ReturnType<TAction>>;
+    }
+  >,
 ) {
   const chainId = useChainId(options);
   const contextSigner = useContext(SignerContext);

diff --git a/packages/react/src/hooks/useQuery.ts b/packages/react/src/hooks/useQuery.ts
@@ -83,10 +83,10 @@ export function useLazyLoadQueryWithRefresh<
   TDescriptor extends TChainId extends void
     ? CommonDescriptor
     : Chains[Exclude<TChainId, void>],
-  TChainId extends ChainId | void = void,
+  TChainId extends ChainId = ChainId,
 >(
   builder: TQuery,
-  options?: ChainHookOptions,
+  options?: ChainHookOptions<TChainId>,
 ): [
   data: TQuery extends Falsy
     ? typeof IDLE
@@ -156,10 +156,10 @@ export function useLazyLoadQuery<
   TDescriptor extends TChainId extends void
     ? CommonDescriptor
     : Chains[Exclude<TChainId, void>],
-  TChainId extends ChainId | void = void,
+  TChainId extends ChainId = ChainId,
 >(
   builder: TQuery,
-  options?: ChainHookOptions,
+  options?: ChainHookOptions<TChainId>,
 ): TQuery extends Falsy
   ? typeof IDLE
   : FalsyGuard<

diff --git a/packages/react/src/hooks/useTypedApi.ts b/packages/react/src/hooks/useTypedApi.ts
@@ -11,8 +11,8 @@ import type { TypedApi } from "polkadot-api";
  * @param options - Additional options
  * @returns Polkadot-API typed API
  */
-export function useTypedApi<TChainId extends ChainId | void = void>(
-  options?: ChainHookOptions,
+export function useTypedApi<TChainId extends ChainId>(
+  options?: ChainHookOptions<TChainId>,
 ): TypedApi<
   TChainId extends void ? CommonDescriptor : Chains[Exclude<TChainId, void>]
 > {