Merge branch 'fix/create-style-api' of github.com:gluestack/gluestack…

…-style into fix/create-style-api
gluestack · Oct 6, 2023 · e2410a1 · e2410a1
2 parents de311d1 + 2c3e7a8
commit e2410a1
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/example/storybook/src/api/DescendantsStyles/ContextBasedStyles.tsx b/example/storybook/src/api/DescendantsStyles/ContextBasedStyles.tsx
@@ -6,6 +6,8 @@ import { Wrapper } from '../../components/Wrapper';
 import { AnimatedView } from '@gluestack-style/animation-resolver';
 import { CameraIcon } from 'lucide-react-native';
 
+import Link from 'next/link';
+import { Pressable } from 'react-native';
 export const BaseIcon = styled(
   AsForwarder,
   {
@@ -114,11 +116,27 @@ const Text1 = styled(
   }
 );
 
+const MyLink = styled(Link, {});
 export function ContextBasedStyles() {
   return (
     <Wrapper colorMode="dark">
       {/* <StyledIcon as={CameraIcon} /> */}
-      <Text1 data-style="hell">vdkbkdfbv</Text1>
+      {/* <Text1
+        // data-style="hell"
+        sx={{
+          color: '$red500',
+        }}
+      >
+        vdkbkdfbv
+      </Text1> */}
+      <MyLink
+        href={'/'}
+        sx={{
+          color: '$red500',
+        }}
+      >
+        next link
+      </MyLink>
     </Wrapper>
   );
 }

diff --git 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.0-alpha.0",
+  "version": "1.0.0-alpha.1",
   "keywords": [
     "React Native",
     "Next.js",

diff --git a/packages/react/src/generateStylePropsFromCSSIds.ts b/packages/react/src/generateStylePropsFromCSSIds.ts
@@ -170,11 +170,13 @@ export function generateStylePropsFromCSSIds(
   }
 
   Object.assign(props, {
-    style: propsStyles ? [...styleObj, ...propsStyles] : styleObj,
-    dataSet: {
+    'style': propsStyles ? [...styleObj, ...propsStyles] : styleObj,
+    'dataSet': {
       ...props?.dataSet,
       style: getDataStyle(props, styleCSSIdsString),
     },
+    // DONOT REMOVE THIS LINE, THIS IS FOR SPECIFIC COMPONENTS LIKE next/link
+    'data-style': getDataStyle(props, styleCSSIdsString),
   });
   return props;
 }