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

…[email protected] Release/@gluestack style/[email protected]
gluestack · Dec 14, 2023 · a170962 · a170962
2 parents 8bd3630 + c1efb3d
commit a170962
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 14 deletions.
diff --git a/packages/styled/react/CHANGELOG.md b/packages/styled/react/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @gluestack-style/react
 
+## 1.0.29
+
+### Patch Changes
+
+- Fixed config reference issue
+- Fixed inline resolved stylesheet value
+
 ## 1.0.28
 
 ### 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.28",
+  "version": "1.0.29",
   "keywords": [
     "React Native",
     "Next.js",

diff --git a/packages/styled/react/src/StyledProvider.tsx b/packages/styled/react/src/StyledProvider.tsx
@@ -6,7 +6,6 @@ import type { COLORMODES } from './types';
 import { platformSpecificSpaceUnits } from './utils';
 import { createGlobalStylesWeb } from './createGlobalStylesWeb';
 import { createGlobalStyles } from './createGlobalStyles';
-import { deepClone } from './utils/cssify/utils/common';
 
 type Config = any;
 let colorModeSet = false;
@@ -58,20 +57,11 @@ export const StyledProvider: React.FC<{
   inlineStyleMap.current.initialStyleInjected = false;
 
   const currentConfig: any = React.useMemo(() => {
-    // Removing plugins since its array and deepClone is not working
-    const plugins = config?.plugins;
-    delete config?.plugins;
-
-    const clonedConfig = deepClone(config);
     const configWithPlatformSpecificUnits: any = platformSpecificSpaceUnits(
-      clonedConfig,
+      config,
       Platform.OS
     );
 
-    // Re-assign plugins to both the configs
-    configWithPlatformSpecificUnits.plugins = plugins;
-    config.plugins = plugins;
-
     return configWithPlatformSpecificUnits;
   }, [config]);
 

diff --git a/packages/styled/react/src/styled.tsx b/packages/styled/react/src/styled.tsx
@@ -991,7 +991,7 @@ export function verboseStyled<P, Variants, ComCon>(
     INTERNAL_updateCSSStyleInOrderedResolved(
       orderedSXResolved,
       sxHash,
-      false,
+      true,
       'gs'
     );
 
@@ -2055,6 +2055,8 @@ export function verboseStyled<P, Variants, ComCon>(
                 theme,
                 componentStyleConfig,
                 ExtendedConfig,
+                styleCSSIds,
+                GluestackStyleSheet,
               });
 
               //@ts-ignore

diff --git a/packages/styled/react/src/utils.ts b/packages/styled/react/src/utils.ts
@@ -333,7 +333,7 @@ export const platformSpecificSpaceUnits = (theme: Config, platform: string) => {
     'letterSpacings',
   ];
 
-  const newTheme = { ...theme };
+  let newTheme = { ...theme };
 
   const isWeb = platform === 'web';
   scales.forEach((key) => {
@@ -372,6 +372,12 @@ export const platformSpecificSpaceUnits = (theme: Config, platform: string) => {
       }
     }
     if (newTheme.tokens) {
+      newTheme = {
+        ...newTheme,
+        tokens: {
+          ...newTheme?.tokens,
+        },
+      };
       //@ts-ignore
       newTheme.tokens[key] = newScale;
     }