Merge pull request #525 from gluestack/release/@gluestack-style/react…

…@1.0.14 Release/@gluestack style/[email protected]
gluestack · Nov 7, 2023 · 2d1d4d3 · 2d1d4d3
2 parents a5c7cc0 + b9556a9
commit 2d1d4d3
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 36 deletions.
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @gluestack-style/react
 
+## 1.0.14
+
+### Patch Changes
+
+- Fixed utility props typings [PR](https://github.com/gluestack/gluestack-style/pull/524)
+
 ## 1.0.13
 
 ### Patch Changes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@gluestack-style/react",
   "description": "A universal & performant styling library for React Native, Next.js & React",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "keywords": [
     "React Native",
     "Next.js",

diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts
@@ -840,8 +840,7 @@ export type PropsCombinations =
 export type UtilityProps<
   GenericComponentStyles,
   Variants,
-  GenericComponentProps,
-  Tokens = GSConfig['tokens']
+  GenericComponentProps
 > = Omit<
   TokenizedRNStyleProps<GetRNStyles<GenericComponentStyles>>,
   keyof GenericComponentProps
@@ -851,41 +850,41 @@ export type UtilityProps<
     keyof GenericComponentProps
   > &
   Partial<{
-    //@ts-ignore
-    [key in PropsCombinations]?: Aliases[LastPart<key>] extends keyof GetRNStyles<GenericComponentStyles>
-      ? //@ts-ignore
-        PropertyTokenType[Aliases[LastPart<key>]] extends 'sizes'
-        ?
-            | WithSizeNegativeValue<Tokens>
-            //@ts-ignore
-            | ExtendRNStyle<GenericComponentStyles, Aliases[LastPart<key>]>
-        : //@ts-ignore
-        PropertyTokenType[Aliases[LastPart<key>]] extends 'space'
-        ?
-            | WithNegativeValue<
-                StringifyToken<
-                  //@ts-expect-error
-                  keyof Tokens[PropertyTokenType[Aliases[LastPart<key>]]]
+    [key in PropsCombinations]?: LastPart<key> extends keyof Aliases
+      ? Aliases[LastPart<key>] extends keyof GetRNStyles<GenericComponentStyles>
+        ? PropertyTokenType[Aliases[LastPart<key>]] extends 'sizes'
+          ?
+              | WithSizeNegativeValue<GSConfig['tokens']>
+              | ExtendRNStyle<GenericComponentStyles, Aliases[LastPart<key>]>
+          : PropertyTokenType[Aliases[LastPart<key>]] extends 'space'
+          ?
+              | WithNegativeValue<
+                  StringifyToken<
+                    keyof GSConfig['tokens'][PropertyTokenType[Aliases[LastPart<key>]]]
+                  >
+                >
+              | ExtendRNStyle<
+                  GetRNStyles<GenericComponentStyles>,
+                  Aliases[LastPart<key>]
+                >
+          :
+              | StringifyToken<
+                  keyof GSConfig['tokens'][PropertyTokenType[Aliases[LastPart<key>]]]
+                >
+              | ExtendRNStyle<
+                  GetRNStyles<GenericComponentStyles>,
+                  Aliases[LastPart<key>]
                 >
-              >
-            | ExtendRNStyle<
-                GetRNStyles<GenericComponentStyles>,
-                //@ts-ignore
-                Aliases[LastPart<key>]
-              >
-        :
-            | StringifyToken<
-                //@ts-ignore
-                keyof Tokens[PropertyTokenType[Aliases[LastPart<key>]]]
-              >
-            | ExtendRNStyle<
-                GetRNStyles<GenericComponentStyles>,
-                //@ts-ignore
-                Aliases[LastPart<key>]
-              >
-      : never;
+        : never
+      : any;
   }> &
-  VerbosedUtilityProps<GenericComponentStyles, Variants, GenericComponentProps>;
+  Partial<
+    VerbosedUtilityProps<
+      GenericComponentStyles,
+      Variants,
+      GenericComponentProps
+    >
+  >;
 // &
 // Partial<{
 //   [key in `$${IState | PLATFORMS | IMediaQueries}-${string}`]?: any;