From a2a7c687e6686efce476b04a7aef196753d48d1d Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Mon, 20 Nov 2023 15:40:56 +0530 Subject: [PATCH 1/9] v1.0.17-alpha.0 --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index 910908c9..07e202e9 100644 --- a/packages/react/package.json +++ b/packages/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.16", + "version": "1.0.17-alpha.0", "keywords": [ "React Native", "Next.js", From 188be37eefed137c2f22172e8dc05a115bf81e1a Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Wed, 22 Nov 2023 12:20:57 +0530 Subject: [PATCH 2/9] fix: children types --- packages/react/src/styled.tsx | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx index 2c948fb7..1f2a87ce 100644 --- a/packages/react/src/styled.tsx +++ b/packages/react/src/styled.tsx @@ -994,7 +994,6 @@ export function verboseStyled( const StyledComponent = ( { - children, //@ts-ignore orderedResolved: BUILD_TIME_ORDERED_RESOLVED = [], //@ts-ignore @@ -1009,7 +1008,6 @@ export function verboseStyled( Partial> & Partial> & { as?: any; - children?: any; }, 'animationComponentGluestack' >, @@ -2019,15 +2017,11 @@ export function verboseStyled( style={resolvedStyleMemo} as={AsComp} ref={ref} - > - {children} - + /> ); } else { component = ( - - {children} - + ); } } else { @@ -2040,18 +2034,14 @@ export function verboseStyled( states={states} style={resolvedStyleMemo} ref={ref} - > - {children} - + /> ) : ( - {children} - + /> ); } if (containsDescendant) { From aa84d387e2c459645f5af55eca2db1cec3f1da15 Mon Sep 17 00:00:00 2001 From: Vidhi Kataria Date: Wed, 22 Nov 2023 15:07:20 +0530 Subject: [PATCH 3/9] fix: typescript --- packages/react/src/types.ts | 5 ++++- yarn.lock | 8 ++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts index 1f13e541..0ad2cdfe 100644 --- a/packages/react/src/types.ts +++ b/packages/react/src/types.ts @@ -963,7 +963,10 @@ export type UnionToIntersection = ( export type GetRNStyles = UnionToIntersection< Partial< - Exclude + Exclude< + GenericComponentStyles, + undefined | null | false | string | number | any[] + > > >; diff --git a/yarn.lock b/yarn.lock index 6344fb3d..feeaaff5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2606,6 +2606,14 @@ "@babel/traverse" "^7.20.5" lodash.merge "^4.6.2" +"@gluestack-style/react@1.0.8": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-1.0.8.tgz#9f8b1d287e7403d7e1d5b6ffb6c51bd7254177b2" + integrity sha512-dmOOBnk+0UtIrYPOcLShF1QNk01VZGBXtQvgBMnDYBKJikf93tOfcAmObZxy2xSxN5BXDl9xvZgtRGbwkkfquQ== + dependencies: + inline-style-prefixer "^6.0.1" + normalize-css-color "^1.0.2" + "@gluestack-style/react@^0.2.16", "@gluestack-style/react@^0.2.21": version "0.2.51" resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-0.2.51.tgz#0cfcca4f97f908ed3a352bd7e2336d436cc22415" From 06955d5c156bacc410e275b27f1df6676ba27224 Mon Sep 17 00:00:00 2001 From: Meenu Makkar Date: Wed, 22 Nov 2023 19:27:45 +0530 Subject: [PATCH 4/9] fix: config warning --- packages/react/src/utils.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/react/src/utils.ts b/packages/react/src/utils.ts index 5d91159c..ba46e1fe 100644 --- a/packages/react/src/utils.ts +++ b/packages/react/src/utils.ts @@ -360,11 +360,12 @@ export const platformSpecificSpaceUnits = (theme: Config, platform: string) => { if (newTheme.tokens) { //@ts-ignore newTheme.tokens[key] = newScale; - } else { - console.warn( - 'No tokens found in config! Please pass config in Provider to resolve styles!' - ); } + // else { + // console.warn( + // 'No tokens found in config! Please pass config in Provider to resolve styles!' + // ); + // } }); return newTheme; }; From 20506b94f0a9c76a641c539271762e2c92a5abfc Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Mon, 20 Nov 2023 15:40:56 +0530 Subject: [PATCH 5/9] v1.0.17-alpha.0 --- packages/react/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react/package.json b/packages/react/package.json index 910908c9..07e202e9 100644 --- a/packages/react/package.json +++ b/packages/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.16", + "version": "1.0.17-alpha.0", "keywords": [ "React Native", "Next.js", From 3cb8381f36250a93fc65ecfd284419ed8e52a8c3 Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Wed, 22 Nov 2023 12:20:57 +0530 Subject: [PATCH 6/9] fix: children types --- packages/react/src/styled.tsx | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/packages/react/src/styled.tsx b/packages/react/src/styled.tsx index 2c948fb7..1f2a87ce 100644 --- a/packages/react/src/styled.tsx +++ b/packages/react/src/styled.tsx @@ -994,7 +994,6 @@ export function verboseStyled( const StyledComponent = ( { - children, //@ts-ignore orderedResolved: BUILD_TIME_ORDERED_RESOLVED = [], //@ts-ignore @@ -1009,7 +1008,6 @@ export function verboseStyled( Partial> & Partial> & { as?: any; - children?: any; }, 'animationComponentGluestack' >, @@ -2019,15 +2017,11 @@ export function verboseStyled( style={resolvedStyleMemo} as={AsComp} ref={ref} - > - {children} - + /> ); } else { component = ( - - {children} - + ); } } else { @@ -2040,18 +2034,14 @@ export function verboseStyled( states={states} style={resolvedStyleMemo} ref={ref} - > - {children} - + /> ) : ( - {children} - + /> ); } if (containsDescendant) { From 45dbed1d322cf45e872515cdf0f5dadd7575893d Mon Sep 17 00:00:00 2001 From: Meenu Makkar Date: Wed, 22 Nov 2023 19:27:45 +0530 Subject: [PATCH 7/9] fix: config warning --- packages/react/src/utils.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/react/src/utils.ts b/packages/react/src/utils.ts index 5d91159c..ba46e1fe 100644 --- a/packages/react/src/utils.ts +++ b/packages/react/src/utils.ts @@ -360,11 +360,12 @@ export const platformSpecificSpaceUnits = (theme: Config, platform: string) => { if (newTheme.tokens) { //@ts-ignore newTheme.tokens[key] = newScale; - } else { - console.warn( - 'No tokens found in config! Please pass config in Provider to resolve styles!' - ); } + // else { + // console.warn( + // 'No tokens found in config! Please pass config in Provider to resolve styles!' + // ); + // } }); return newTheme; }; From 974f21e710d7df0905828ac26e35a09c279b94e4 Mon Sep 17 00:00:00 2001 From: Vidhi Kataria Date: Wed, 22 Nov 2023 19:37:08 +0530 Subject: [PATCH 8/9] fix: yarn lock --- yarn.lock | 8 -------- 1 file changed, 8 deletions(-) diff --git a/yarn.lock b/yarn.lock index feeaaff5..6344fb3d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2606,14 +2606,6 @@ "@babel/traverse" "^7.20.5" lodash.merge "^4.6.2" -"@gluestack-style/react@1.0.8": - version "1.0.8" - resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-1.0.8.tgz#9f8b1d287e7403d7e1d5b6ffb6c51bd7254177b2" - integrity sha512-dmOOBnk+0UtIrYPOcLShF1QNk01VZGBXtQvgBMnDYBKJikf93tOfcAmObZxy2xSxN5BXDl9xvZgtRGbwkkfquQ== - dependencies: - inline-style-prefixer "^6.0.1" - normalize-css-color "^1.0.2" - "@gluestack-style/react@^0.2.16", "@gluestack-style/react@^0.2.21": version "0.2.51" resolved "https://registry.yarnpkg.com/@gluestack-style/react/-/react-0.2.51.tgz#0cfcca4f97f908ed3a352bd7e2336d436cc22415" From 1bd13aa6afb6c49e9eba3ec83f00d81ff6a50fe5 Mon Sep 17 00:00:00 2001 From: ankit-tailor Date: Thu, 23 Nov 2023 17:34:21 +0530 Subject: [PATCH 9/9] chore: v1.0.17 --- packages/react/CHANGELOG.md | 10 ++++++++++ packages/react/package.json | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md index 0ef9a792..d98ef13c 100644 --- a/packages/react/CHANGELOG.md +++ b/packages/react/CHANGELOG.md @@ -1,5 +1,15 @@ # @gluestack-style/react +## 1.0.17 + +### Patch Changes + +### Fixes + +- Fixed children typings [PR](https://github.com/gluestack/gluestack-style/pull/538) +- Fixed react-native style typings [PR](https://github.com/gluestack/gluestack-style/pull/539) +- Fixed config warning [PR](https://github.com/gluestack/gluestack-style/pull/540) + ## 1.0.16 ### Patch Changes diff --git a/packages/react/package.json b/packages/react/package.json index 07e202e9..afd0108c 100644 --- a/packages/react/package.json +++ b/packages/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.17-alpha.0", + "version": "1.0.17", "keywords": [ "React Native", "Next.js",