fix: create style typings

gluestack · Sep 25, 2023 · 4c5df7e · 4c5df7e
1 parent 0d5e7e3
commit 4c5df7e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/packages/react/src/createStyle.ts b/packages/react/src/createStyle.ts
@@ -1,8 +1,12 @@
 import type { ViewProps, ImageProps, TextProps } from 'react-native';
-import type { IComponentStyleConfig, ITheme } from './types';
+import type {
+  IComponentStyleConfig,
+  ITheme,
+  UnionToIntersection,
+} from './types';
 
 export const createStyle = <T, Variants>(
-  theme: T & ITheme<Variants, ViewProps | ImageProps | TextProps>,
+  theme: T | ITheme<Variants, ViewProps | ImageProps | TextProps>,
   componentConfig?: Omit<IComponentStyleConfig, 'componentName'>,
   BUILD_TIME_PARAMS?: any
 ) => {
@@ -13,7 +17,9 @@ export const createStyle = <T, Variants>(
   };
 
   return createdStyles as {
-    theme: T & ITheme<Variants, ViewProps | ImageProps | TextProps>;
+    theme: UnionToIntersection<
+      T | ITheme<Variants, ViewProps | ImageProps | TextProps>
+    >;
     componentConfig?: Omit<IComponentStyleConfig, 'componentName'>;
   };
 };
diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts
@@ -767,9 +767,9 @@ export type RNStyles<GenericComponentStyles> = TokenizedRNStyleProps<
   >
 >;
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
-  k: infer I
-) => void
+export type UnionToIntersection<U> = (
+  U extends any ? (k: U) => void : never
+) extends (k: infer I) => void
   ? I
   : never;