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

…[email protected] Release/@gluestack style/[email protected]
gluestack · Jan 10, 2024 · 07f174a · 07f174a
2 parents 0911f0b + 1da47c0
commit 07f174a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 7 deletions.
diff --git a/packages/styled/react/CHANGELOG.md b/packages/styled/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @gluestack-style/react
 
+## 1.0.33
+
+### Patch Changes
+
+- - Theme token resolution inside StyledProvider
+
 ## 1.0.32
 
 ### Features

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.32",
+  "version": "1.0.33",
   "keywords": [
     "React Native",
     "Next.js",

diff --git a/packages/styled/react/src/StyledProvider.tsx b/packages/styled/react/src/StyledProvider.tsx
@@ -12,6 +12,7 @@ import { createGlobalStyles } from './createGlobalStyles';
 import { injectGlobalCssStyle } from './injectInStyle';
 import { ThemeContext, useTheme } from './Theme';
 import { useSafeLayoutEffect } from './hooks/useSafeLayoutEffect';
+import { resolveThemes } from './createConfig';
 
 type Config = any;
 let colorModeSet = false;
@@ -75,7 +76,7 @@ export const StyledProvider: React.FC<{
   inlineStyleMap.current.initialStyleInjected = false;
   // const id = React.useId();
   const currentConfig: any = React.useMemo(() => {
-    const configWithPlatformSpecificUnits: any = platformSpecificSpaceUnits(
+    let configWithPlatformSpecificUnits: any = platformSpecificSpaceUnits(
       config,
       Platform.OS
     );
@@ -89,6 +90,10 @@ export const StyledProvider: React.FC<{
             Platform.OS
           ).tokens;
       });
+
+      configWithPlatformSpecificUnits = resolveThemes(
+        configWithPlatformSpecificUnits
+      );
     }
 
     return configWithPlatformSpecificUnits;

diff --git a/packages/styled/react/src/createConfig.ts b/packages/styled/react/src/createConfig.ts
@@ -85,14 +85,14 @@ export const createConfig = <
   //   newConfig = resolveComponentThemes(config);
   // }
 
-  if (config.themes) {
-    const newConfigWithThemesResolved = resolveThemes(config);
-    return newConfigWithThemesResolved as any;
-  }
+  // if (config.themes) {
+  //   const newConfigWithThemesResolved = resolveThemes(config);
+  //   return newConfigWithThemesResolved as any;
+  // }
   return config as any;
 };
 
-const resolveThemes = (config: any) => {
+export const resolveThemes = (config: any) => {
   function removeDollarSign(obj: any) {
     const newObj: any = {};
     for (const key in obj) {