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

…t@1.0.35 Release/@gluestack style/react@1.0.35
gluestack · Jan 11, 2024 · d5c5eb7 · d5c5eb7
2 parents 21d1d34 + 6cf0640
commit d5c5eb7
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/packages/styled/react/CHANGELOG.md b/packages/styled/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @gluestack-style/react
 
+## 1.0.35
+
+### Patch Changes
+
+- - Fixed nested provider color mode class
+
 ## 1.0.34
 
 ### 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.34",
+  "version": "1.0.35",
   "keywords": [
     "React Native",
     "Next.js",

diff --git a/packages/styled/react/src/StyledProvider.tsx b/packages/styled/react/src/StyledProvider.tsx
@@ -140,10 +140,12 @@ export const StyledProvider: React.FC<{
       if (currentColorMode) {
         if (!isParentProviderExist) {
           document.body.setAttribute('data-theme-id', currentColorMode);
+          documentElement.classList.add(`gs-${currentColorMode}`);
         }
-        documentElement.classList.add(`gs-${currentColorMode}`);
       } else {
-        documentElement.classList.add(`gs-light`);
+        if (!isParentProviderExist) {
+          documentElement.classList.add(`gs-light`);
+        }
       }
     }
 
@@ -165,7 +167,9 @@ export const StyledProvider: React.FC<{
               }
               documentElement.classList.remove(`gs-dark`);
             }
-            documentElement.classList.add(`gs-${currentColor}`);
+            if (!isParentProviderExist) {
+              documentElement.classList.add(`gs-${currentColor}`);
+            }
           }
         }
       }