wip-fix: actionables type (#227)

covalenthq · Oct 23, 2024 · 27a15d0 · 27a15d0
1 parent f473998
commit 27a15d0
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 19 deletions.
diff --git a/src/utils/functions/actionable-wrapper.ts b/src/utils/functions/actionable-wrapper.ts
@@ -1,9 +1,7 @@
 import { type ActionableType } from "../types/shared.types";
-import { createElement } from "react";
+import { createElement, type ElementType } from "react";
 
-export const actionableWrapper = <
-    T extends keyof JSX.IntrinsicElements | React.ComponentType<any>,
->(
+export const actionableWrapper = <T extends ElementType>(
     actionable: ActionableType<T> | null,
     children: React.ReactNode,
 ): React.ReactNode => {

diff --git a/src/utils/types/shared.types.ts b/src/utils/types/shared.types.ts
@@ -1,15 +1,17 @@
 import { type Option } from "@/utils/option";
 import type {
     NftApprovalsItem,
+    Pagination,
     TokensApprovalItem,
+    Transaction,
 } from "@covalenthq/client-sdk";
-import { type Pagination, type Transaction } from "@covalenthq/client-sdk";
-import {
-    type Column,
-    type ColumnDef,
-    type Row,
-    type SortingState,
+import type {
+    Column,
+    ColumnDef,
+    Row,
+    SortingState,
 } from "@tanstack/react-table";
+import type { ComponentType } from "react";
 
 export interface BalancePriceDeltaProps {
     numerator: number;
@@ -99,12 +101,13 @@ export interface HeadingProps
     size: 1 | 2 | 3 | 4;
 }
 
-export type ActionableType<
-    T extends
-        | keyof JSX.IntrinsicElements
-        | React.ComponentType<any> = keyof JSX.IntrinsicElements,
-> =
-    | (T extends keyof JSX.IntrinsicElements
-          ? { parent: T; parentProps: JSX.IntrinsicElements[T] }
-          : { parent: T; parentProps: React.ComponentProps<T> })
-    | null;
+export type ElementType = keyof JSX.IntrinsicElements | ComponentType<any>;
+
+export type ActionableType<T extends ElementType = ElementType> = {
+    parent: T;
+    parentProps: T extends keyof JSX.IntrinsicElements
+        ? JSX.IntrinsicElements[T]
+        : T extends ComponentType<infer P>
+          ? P
+          : never;
+} | null;