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

…@0.2.42 Release/@gluestack style/[email protected]
gluestack · Sep 13, 2023 · 118aba4 · 118aba4
2 parents 2f3012e + a87d940
commit 118aba4
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 44 deletions.
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": "0.2.41",
+  "version": "0.2.42",
   "keywords": [
     "React Native",
     "Next.js",

diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx
@@ -723,6 +723,57 @@ export function getVariantProps(
   };
 }
 
+function resolveInlineProps(
+  componentStyleConfig: any,
+  componentExtendedConfig: any,
+  props: any,
+  CONFIG: any
+) {
+  let resolvedInlineProps = {};
+  if (
+    componentStyleConfig.resolveProps &&
+    Object.keys(componentExtendedConfig).length > 0
+  ) {
+    componentStyleConfig.resolveProps.forEach((toBeResovledProp: any) => {
+      if (props[toBeResovledProp]) {
+        let value = props[toBeResovledProp];
+        if (
+          CONFIG.propertyResolver &&
+          CONFIG.propertyResolver.props &&
+          CONFIG.propertyResolver.props[toBeResovledProp]
+        ) {
+          let transformer = CONFIG.propertyResolver.props[toBeResovledProp];
+          let aliasTokenType = CONFIG.propertyTokenMap[toBeResovledProp];
+          let token = transformer(
+            value,
+            (value1: any, scale = aliasTokenType) =>
+              resolveStringToken(
+                value1,
+                CONFIG,
+                CONFIG.propertyTokenMap,
+                toBeResovledProp,
+                scale
+              )
+          );
+          //@ts-ignore
+          resolvedInlineProps[toBeResovledProp] = token;
+        } else {
+          //@ts-ignore
+          resolvedInlineProps[toBeResovledProp] =
+            getResolvedTokenValueFromConfig(
+              componentExtendedConfig,
+              props,
+              toBeResovledProp,
+              props[toBeResovledProp]
+            );
+        }
+        delete props[toBeResovledProp];
+      }
+    });
+  }
+  return resolvedInlineProps;
+}
+
 const getStyleIdsFromMap = (
   CONFIG: any,
   ExtendedConfig: any,
@@ -1253,48 +1304,12 @@ export function verboseStyled<P, Variants, ComCon>(
     // 520ms
 
     // Inline prop based style resolution TODO: Diagram insertion
-    const resolvedInlineProps = {};
-    if (
-      componentStyleConfig.resolveProps &&
-      Object.keys(componentExtendedConfig).length > 0
-    ) {
-      componentStyleConfig.resolveProps.forEach((toBeResovledProp: any) => {
-        if (componentPropsWithoutVariants[toBeResovledProp]) {
-          let value = componentPropsWithoutVariants[toBeResovledProp];
-          if (
-            CONFIG.propertyResolver &&
-            CONFIG.propertyResolver.props &&
-            CONFIG.propertyResolver.props[toBeResovledProp]
-          ) {
-            let transformer = CONFIG.propertyResolver.props[toBeResovledProp];
-            let aliasTokenType = CONFIG.propertyTokenMap[toBeResovledProp];
-            let token = transformer(
-              value,
-              (value1: any, scale = aliasTokenType) =>
-                resolveStringToken(
-                  value1,
-                  CONFIG,
-                  CONFIG.propertyTokenMap,
-                  toBeResovledProp,
-                  scale
-                )
-            );
-            //@ts-ignore
-            resolvedInlineProps[toBeResovledProp] = token;
-          } else {
-            //@ts-ignore
-            resolvedInlineProps[toBeResovledProp] =
-              getResolvedTokenValueFromConfig(
-                componentExtendedConfig,
-                componentPropsWithoutVariants,
-                toBeResovledProp,
-                componentPropsWithoutVariants[toBeResovledProp]
-              );
-          }
-          delete componentPropsWithoutVariants[toBeResovledProp];
-        }
-      });
-    }
+    const resolvedInlineProps = resolveInlineProps(
+      componentStyleConfig,
+      componentExtendedConfig,
+      componentPropsWithoutVariants,
+      CONFIG
+    );
 
     const passingProps = deepMergeObjects(
       applyComponentPassingProps,
@@ -1319,6 +1334,7 @@ export function verboseStyled<P, Variants, ComCon>(
 
     let containsSX = false;
     Object.assign(applyComponentInlineProps, filteredPassingRemainingProps);
+    Object.assign(applyComponentInlineProps, resolvedInlineProps);
     Object.assign(applyComponentInlineProps, filteredComponentRemainingProps);
 
     if (
@@ -1524,11 +1540,22 @@ export function verboseStyled<P, Variants, ComCon>(
 
         injectAndUpdateSXProps(filteredPassingSx);
 
+        const resolvedPassingRemainingProps = resolveInlineProps(
+          componentStyleConfig,
+          componentExtendedConfig,
+          filteredPassingRemainingPropsUpdated,
+          CONFIG
+        );
+
         Object.assign(
           applyComponentInlineProps,
           filteredPassingRemainingPropsUpdated
         );
 
+        Object.assign(applyComponentInlineProps, resolvedPassingRemainingProps);
+
+        Object.assign(applyComponentInlineProps, resolvedInlineProps);
+
         Object.assign(
           applyComponentInlineProps,
           filteredComponentRemainingProps

diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts
@@ -250,7 +250,7 @@ export type GlobalStyles<AliasTypes, TokenTypes, Variants> = GlobalVariantSx<
     AliasTypes,
     TokenTypes
   >;
-  compundVariants?: readonly GlobalCompoundVariant<
+  compoundVariants?: readonly GlobalCompoundVariant<
     'variants' extends keyof Variants ? Variants['variants'] : unknown,
     AliasTypes,
     TokenTypes