fix: merge conflict resolved

gluestack · Sep 18, 2023 · 61b8568 · 61b8568
2 parents a6ca7ff + e308874
commit 61b8568
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 81 deletions.
diff --git a/example/storybook/src/api/DescendantsStyles/ContextBasedStyles.tsx b/example/storybook/src/api/DescendantsStyles/ContextBasedStyles.tsx
@@ -17,7 +17,6 @@ import {
   AsForwarder,
   createStyled,
   styled,
-  styled1,
   Theme,
   useBreakpointValue,
   useColorMode,
@@ -42,6 +41,16 @@ const Pressable = styled(
   {
     bg: '$red200',
     p: '$2',
+    props: {
+      variant: 'solid',
+    },
+    variants: {
+      variant: {
+        solid: {
+          bg: '$red400',
+        },
+      },
+    },
   },
   {
     componentName: 'Pressable',
@@ -315,6 +324,12 @@ export function ContextBasedStylesContent() {
 const renderItem = (item: any) => (
   <Pressable
     key={item}
+    variant="solid"
+    sx={{
+      props: {
+        variant: 'solid',
+      },
+    }}
     // sx={{
     //   bg: '$amber400',
     // }}

diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx
@@ -823,7 +823,7 @@ const getStyleIdsFromMap = (
   return componentStyleObject;
 };
 
-export function verboseStyled<P, Variants, ComCon, PluginType = unknown>(
+export function verboseStyled<P, Variants, ComCon>(
   Component: React.ComponentType<P>,
   theme: Partial<IVerbosedTheme<Variants, P>>,
   componentStyleConfig: IComponentStyleConfig<ComCon> = {},
@@ -991,9 +991,7 @@ export function verboseStyled<P, Variants, ComCon, PluginType = unknown>(
       // sxHash: BUILD_TIME_sxHash = '',
       ...componentProps
     }: Omit<P, keyof Variants> &
-      Partial<
-        ComponentProps<ITypeReactNativeStyles, Variants, P, ComCon, PluginType>
-      > &
+      Partial<ComponentProps<ITypeReactNativeStyles, Variants, P, ComCon>> &
       Partial<UtilityProps<ITypeReactNativeStyles>> & {
         as?: any;
         children?: any;
@@ -1862,7 +1860,7 @@ export function verboseStyled<P, Variants, ComCon, PluginType = unknown>(
 
 export function styled<P, Variants, ComCon, PluginType = unknown>(
   Component: React.ComponentType<P>,
-  theme: ITheme<Variants, P, PluginType>,
+  theme: ITheme<Variants, P>,
   componentStyleConfig?: IComponentStyleConfig<ComCon>,
   ExtendedConfig?: ExtendedConfigType<PluginType>,
   BUILD_TIME_PARAMS?: {
@@ -1894,7 +1892,7 @@ export function styled<P, Variants, ComCon, PluginType = unknown>(
   theme = styledObj;
   const sxConvertedObject = convertStyledToStyledVerbosed(theme);
 
-  let StyledComponent = verboseStyled<P, Variants, ComCon, PluginType>(
+  let StyledComponent = verboseStyled<P, Variants, ComCon>(
     Component,
     sxConvertedObject,
     componentStyleConfig,

diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts
@@ -88,7 +88,7 @@ export type GlueStackConfig<
   components?: {
     [key: string]: {
       theme: Partial<GlobalStyles<IGlobalAliases, IToken, IGlobalStyle>>;
-      componentConfig?: IConfigProps;
+      componentConfig?: IComponentStyleConfig;
     };
   };
 };
@@ -121,18 +121,10 @@ export type IMediaQueries = keyof GSConfig['tokens']['mediaQueries'];
 export type SxStyleProps<
   GenericComponentStyles,
   Variants,
-  GenericComponentProps,
-  PluginType
+  GenericComponentProps
 > = {
   sx?: Partial<
-    SxProps<
-      GenericComponentStyles,
-      Variants,
-      GenericComponentProps,
-      '',
-      '',
-      PluginType
-    > & {
+    SxProps<GenericComponentStyles, Variants, GenericComponentProps, '', ''> & {
       [Key in `@${IMediaQueries}`]?: SxProps<
         GenericComponentStyles,
         Variants,
@@ -147,13 +139,6 @@ export type SxStyleProps<
 //@ts-ignore
 type GlobalVariants = GSConfig['globalStyle']['variants'];
 
-export interface IConfigProps {
-  descendantStyle: Array<string>;
-  ancestorStyle: Array<string>;
-  resolveProps: Array<string>;
-  componentName: string;
-}
-
 export type IComponentStyleConfig<ComCon = unknown> = Partial<
   {
     descendantStyle: any;
@@ -162,7 +147,6 @@ export type IComponentStyleConfig<ComCon = unknown> = Partial<
     componentName: ComCon;
   } & { [key: string]: any }
 >;
-export type ConfigType = Partial<IConfigProps> & { [key: string]: any };
 
 export type Config = {
   alias: { [K: string]: any };
@@ -276,23 +260,21 @@ export type GlobalStyles<AliasTypes, TokenTypes, Variants> = GlobalVariantSx<
 
 /*********************** USER THEME / SX TYPES ****************************************/
 
-export type ITheme<Variants, P, PluginType> = Partial<
+export type ITheme<Variants, P> = Partial<
   //@ts-ignore
-  StyledThemeProps<Variants, P['style'], P, PluginType>
+  StyledThemeProps<Variants, P['style'], P>
 >;
 
 export type StyledThemeProps<
   Variants,
   GenericComponentStyles,
-  GenericComponentProps,
-  PluginType
+  GenericComponentProps
 > = SxProps<
   GenericComponentStyles,
   Variants & GlobalVariants,
   GenericComponentProps,
   '',
-  '',
-  PluginType
+  ''
 > & {
   [Key in `@${IMediaQueries}`]: SxProps<
     GenericComponentStyles,
@@ -405,8 +387,7 @@ export type SxProps<
   Variants = unknown,
   GenericComponentProps = unknown,
   PLATFORM = '',
-  MediaQuery = '',
-  _PluginType = []
+  MediaQuery = ''
 > = Partial<
   StylePropsType<GenericComponentStyles, PLATFORM> &
     PassingPropsType<
@@ -673,53 +654,48 @@ export interface GSConfig
 
 /********************* COMPONENT PROPS TYPE *****************************************/
 
-export type ComponentProps<
-  GenericComponentStyles,
-  Variants,
-  P,
-  ComCon,
-  PluginType
-> = SxStyleProps<GenericComponentStyles, Variants, P, PluginType> & {
-  states?: {
-    [K in IState]?: boolean;
-  };
-} & (GSConfig['globalStyle'] extends object
-    ? {
-        [Key in keyof MergeNestedThree<
-          GlobalVariants,
-          Variants,
-          // @ts-ignore
-          Components[`${ComCon}`]['theme']['variants']
-        >]?: keyof MergeNestedThree<
-          GlobalVariants,
-          Variants,
-          // @ts-ignore
-          Components[`${ComCon}`]['theme']['variants']
-        >[Key] extends 'true' | 'false'
-          ? boolean
-          : keyof MergeNestedThree<
-              GlobalVariants,
-              Variants,
-              // @ts-ignore
-              Components[`${ComCon}`]['theme']['variants']
-            >[Key];
-      } & Omit<P, keyof Variants>
-    : {
-        [Key in keyof MergeNested<
-          Variants,
-          // @ts-ignore
-          Components[`${ComCon}`]['theme']['variants']
-        >]?: keyof MergeNested<
-          Variants, // @ts-ignore
-          Components[`${ComCon}`]['theme']['variants']
-        >[Key] extends 'true' | 'false'
-          ? boolean
-          : keyof MergeNested<
-              Variants,
-              // @ts-ignore
-              Components[`${ComCon}`]['theme']['variants']
-            >[Key];
-      });
+export type ComponentProps<GenericComponentStyles, Variants, P, ComCon> =
+  SxStyleProps<GenericComponentStyles, Variants, P> & {
+    states?: {
+      [K in IState]?: boolean;
+    };
+  } & (GSConfig['globalStyle'] extends object
+      ? {
+          [Key in keyof MergeNestedThree<
+            GlobalVariants,
+            Variants,
+            // @ts-ignore
+            Components[`${ComCon}`]['theme']['variants']
+          >]?: keyof MergeNestedThree<
+            GlobalVariants,
+            Variants,
+            // @ts-ignore
+            Components[`${ComCon}`]['theme']['variants']
+          >[Key] extends 'true' | 'false'
+            ? boolean
+            : keyof MergeNestedThree<
+                GlobalVariants,
+                Variants,
+                // @ts-ignore
+                Components[`${ComCon}`]['theme']['variants']
+              >[Key];
+        } & Omit<P, keyof Variants>
+      : {
+          [Key in keyof MergeNested<
+            Variants,
+            // @ts-ignore
+            Components[`${ComCon}`]['theme']['variants']
+          >]?: keyof MergeNested<
+            Variants, // @ts-ignore
+            Components[`${ComCon}`]['theme']['variants']
+          >[Key] extends 'true' | 'false'
+            ? boolean
+            : keyof MergeNested<
+                Variants,
+                // @ts-ignore
+                Components[`${ComCon}`]['theme']['variants']
+              >[Key];
+        });
 
 export type UtilityProps<GenericComponentStyles> = TokenizedRNStyleProps<
   GetRNStyles<GenericComponentStyles>