Backmerge: main

README.md

@@ -10,7 +10,7 @@
 
 ## Documentation
 
-You can find detailed documentation for each component, including a list of props and examples, in https://gluestack.io/style/docs website.
+You can find detailed documentation for each component, including a list of props and examples, in https://gluestack.io/style/docs/getting-started/installation website.
 
 ## Features
 

example/storybook/package.json

@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@expo/html-elements": "^0.4.2",
-    "@gluestack-style/react": "1.0.7",
+    "@gluestack-style/react": "1.0.8",
     "@gluestack-ui/actionsheet": "^0.2.16",
     "@gluestack-ui/alert-dialog": "^0.1.14",
     "@gluestack-ui/button": "^0.1.23",

example/storybook/src/advanced/BabelPlugins/index.stories.mdx

@@ -40,7 +40,7 @@ import { Box, AppProvider } from '@gluestack/design-system';
 
 3. Just make sure your `babel.config.js` and `gluestack-style.config.js/ts` are in the same directory. We suggest you keep both of them at the root of your app codebase.
 
-### **Let us see how this Babel plugin works.**
+### Let us see how this Babel plugin works.
 
 - First, it traverses your files and tries to find `styled` imported from `@gluestack-style/react`.
 - Once it finds a declaration of `styled` it then looks for its function call.
@@ -196,7 +196,7 @@ module.exports = function (api) {
 
 - `components`: The `components` option allows you to specify the library/import_path name & file path of components created using `@gluestack-style/react`. This option is useful in scenarios where you are creating a custom component with the styled function and using it with inline styles. If you want to resolve those inline styles on build time just define this option with the library name and file path of the components folder or library.
 
-> **Note**: Even using this option if you have extended your config, added aliases, tokens or propertyResolver to a StyledComponent then it will not be resolved on build time. It will be resolved on runtime.
+> Note: Even using this option if you have extended your config, added aliases, tokens or propertyResolver to a StyledComponent then it will not be resolved on build time. It will be resolved on runtime.
 
 ```js
 // babel.config.js

example/storybook/src/api/Typescript/index.stories.mdx

@@ -1,3 +1,8 @@
+---
+title: Typescript | gluestack-style
+description: Typing for gluestack
+---
+
 import { Canvas, Meta, Story, Source } from '@storybook/addon-docs';
 
 <Meta title="api/Typescript" />

example/storybook/src/overview/Introduction/index.stories.mdx

@@ -19,8 +19,8 @@ gluestack-style is different from other styling libraries like Glamour, Emotion,
 
 gluestack-style originally started as part of NativeBase, a universal component library for both React and React Native. However, we realized that not everyone needs all the components from NativeBase, so we broke it down into two separate libraries:
 
-- [gluestack-style](https://gluestack.io/style/docs) - The high-performing and universal styling library.
-- [gluestack-ui](https://gluestack.io/ui/docs) - A set of ready-to-use universal components that can be added to any project and styled to fit your needs. You can even customize the components as desired.
+- [gluestack-style](https://gluestack.io/style) - The high-performing and universal styling library.
+- [gluestack-ui](https://gluestack.io/ui/docs/overview/introduction) (Alpha) - A set of ready-to-use universal components that can be added to any project and styled to fit your needs. You can even customize the components as desired.
 
 ## But aren’t React Native and React Native Web sufficient?
 

packages/benchmark-next/package.json

@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@gluestack-style/babel-plugin-styled-resolver": "1.0.0",
-    "@gluestack-style/react": "1.0.7",
+    "@gluestack-style/react": "1.0.8",
     "@emotion/styled": "^11.3.0",
     "@expo/next-adapter": "^4.0.13",
     "@types/react": "17.0.1",

packages/react/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @gluestack-style/react
 
+## 1.0.8
+
+### Patch Changes
+
+- - Fixed global style platform based resolution
+  - Fixed useToken to return default value as fallback
+  - Fixed theme passing props resolution
+
 ## 1.0.7
 
 ### Patch Changes

packages/react/README.md

@@ -10,7 +10,7 @@
 
 ## Documentation
 
-You can find detailed documentation for each component, including a list of props and examples, in https://gluestack.io/style/docs website.
+You can find detailed documentation for each component, including a list of props and examples, in https://gluestack.io/style/docs/getting-started/installation website.
 
 ## Installation
 

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

packages/react/src/createGlobalStyles.ts

@@ -3,7 +3,7 @@ import { stableHash } from './stableHash';
 import { resolvePlatformTheme } from './styled';
 import { updateOrderUnResolvedMap } from './updateOrderUnResolvedMap';
 
-export const createGlobalStyles = (globalStyle: object, Platform) => {
+export const createGlobalStyles = (globalStyle: object, Platform: any) => {
   const versboseComponentTheme = convertStyledToStyledVerbosed(globalStyle);
   resolvePlatformTheme(versboseComponentTheme, Platform.OS);
   const componentHash = stableHash({