Merge pull request #1635 from gluestack/release/@gluestack-style/reac…

…[email protected] Release/@gluestack style/[email protected]
gluestack · Jan 15, 2024 · 360840e · 360840e
2 parents e743b34 + 8cb7692
commit 360840e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/packages/styled/react/CHANGELOG.md b/packages/styled/react/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @gluestack-style/react
 
+## 1.0.39
+
+### Patch Changes
+
+- - Fixed useToken hook with theme support [PR](https://github.com/gluestack/gluestack-ui/pull/1634)
+  - Fixed resolved props tokenization for mobile [PR](https://github.com/gluestack/gluestack-ui/pull/1632)
+
 ## 1.0.38
 
 ### Patch Changes

diff --git a/packages/styled/react/package.json b/packages/styled/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.38",
+  "version": "1.0.39",
   "keywords": [
     "React Native",
     "Next.js",

diff --git a/packages/styled/react/src/hooks/useToken.ts b/packages/styled/react/src/hooks/useToken.ts
@@ -21,7 +21,7 @@ export const useToken = <T extends keyof Tokens>(
 
   for (const key in activeThemes?.reverse()) {
     const currentTheme = activeThemes[key];
-    if (theme.config.themes.hasOwnProperty(currentTheme)) {
+    if (theme?.config?.themes?.hasOwnProperty(currentTheme)) {
       const currentThemeTokens = theme?.config?.themes[currentTheme];
 
       if (currentThemeTokens?.[tokenScale]?.[token]) {

diff --git a/packages/styled/react/src/styled.tsx b/packages/styled/react/src/styled.tsx
@@ -738,6 +738,7 @@ function resolveInlineProps(
   CONFIG: any
 ) {
   let resolvedInlineProps = {};
+
   if (
     componentStyleConfig.resolveProps &&
     Object.keys(componentExtendedConfig).length > 0
@@ -760,9 +761,11 @@ function resolveInlineProps(
                 CONFIG,
                 CONFIG.propertyTokenMap,
                 toBeResovledProp,
-                scale
+                scale,
+                Platform.OS !== 'web'
               )
           );
+
           //@ts-ignore
           resolvedInlineProps[toBeResovledProp] = token;
         } else {
@@ -772,7 +775,8 @@ function resolveInlineProps(
               componentExtendedConfig,
               props,
               toBeResovledProp,
-              props[toBeResovledProp]
+              props[toBeResovledProp],
+              Platform.OS !== 'web'
             );
         }
         delete props[toBeResovledProp];