From 72a4665c76bcbfab089e75246eb5f69f51a1cc79 Mon Sep 17 00:00:00 2001 From: ankit-tailor <tailorankit3345@gmail.com> Date: Mon, 15 Jan 2024 12:01:36 +0530 Subject: [PATCH 1/3] fix: resolved props tokenization for mobile --- packages/styled/react/src/styled.tsx | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/styled/react/src/styled.tsx b/packages/styled/react/src/styled.tsx index 411a8ca6e1..ea92541f76 100644 --- 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]; From a188a80fc38e0e1151a86be143d412730400ec8f Mon Sep 17 00:00:00 2001 From: ankit-tailor <tailorankit3345@gmail.com> Date: Mon, 15 Jan 2024 14:53:41 +0530 Subject: [PATCH 2/3] fix: use token theme --- packages/styled/react/src/hooks/useToken.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/styled/react/src/hooks/useToken.ts b/packages/styled/react/src/hooks/useToken.ts index 618e92f48e..e8e8160f2e 100644 --- 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]) { From 8cb7692b00763ff6599fe56e3e3b39f7e4f8803e Mon Sep 17 00:00:00 2001 From: ankit-tailor <tailorankit3345@gmail.com> Date: Mon, 15 Jan 2024 15:18:10 +0530 Subject: [PATCH 3/3] v1.0.39 --- packages/styled/react/CHANGELOG.md | 7 +++++++ packages/styled/react/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/styled/react/CHANGELOG.md b/packages/styled/react/CHANGELOG.md index 2039581790..2ea4c56c20 100644 --- 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 index 7b7d9d32e5..151f05f37a 100644 --- 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",