fix: error generic types on methofd (#78)

OsmiCSX · Feb 29, 2024 · ac6c856 · ac6c856
1 parent 57467bf
commit ac6c856
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/core/hoc.tsx b/src/core/hoc.tsx
@@ -31,9 +31,7 @@ export const withStyles =
 
     const colors = useMemo(
       () =>
-        <T extends string | string[]>(
-          ...args: (string | boolean | undefined)[]
-        ): T => {
+        <T,>(...args: (string | boolean | undefined)[]): T => {
           if (args.length === 1) {
             return colorHelper(args[0] as string)(themeContext) as T;
           } else if (args.length === 2) {

diff --git a/src/core/hooks.tsx b/src/core/hooks.tsx
@@ -22,20 +22,21 @@ export const useStyles = (): ApplyInstance => {
 
   const colors = useMemo(
     () =>
-      <T extends string | string[]>(...args: (string | boolean | undefined)[]): T => {
+      <T,>(...args: (string | boolean | undefined)[]): T => {
         if (args.length === 1) {
           return colorHelper(args[0] as string)(themeContext) as T;
         } else if (args.length === 2) {
           return args.map((syntax) =>
             colorHelper(syntax as string)(themeContext)
-          ) as T;
+          ) as unknown as T;
         } else {
           throw Error("Invalid color syntax");
         }
       },
     [themeContext]
   );
 
+
   return {
     apply,
     colors,

diff --git a/src/types/osmi.types.ts b/src/types/osmi.types.ts
@@ -22,7 +22,7 @@ export interface ApplyInstance {
   apply: <T extends NamedStyles<T> | NamedStyles<any>>(
     ...args: (string | boolean | undefined)[]
   ) => any;
-  colors: (...args: (string | boolean | undefined)[]) => string | string[];
+  colors: <T,>(...args: (string | boolean | undefined)[]) => T;
   switchTheme: (newMode: keyof typeof ThemeMode) => void;
   scaleWidth: (width: number) => number;
   scaleHeight: (height: number) => number;