Merge pull request #63 from gluestack/development

Development

.changeset/config.json

@@ -7,5 +7,9 @@
   "access": "public",
   "baseBranch": "master",
   "updateInternalDependencies": "patch",
-  "ignore": ["@dank-style/storybook"]
+  "ignore": [
+    "@dank-style/storybook",
+    "expo-app",
+    "babel-dank-style-resolver-example"
+  ]
 }

.eslintignore

@@ -14,4 +14,5 @@ packages/**/example
 ui/packages/ui/.ondevice
 babel.config.js
 
-example/storybook
+example/storybook
+example/expo-app

.github/workflows/release.yml

@@ -33,23 +33,23 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.MY_GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
-      - name: Get published package version
-        id: version
-        run: |
-          for row in $(echo "${array}" | jq -r '.[] | @base64'); do
-              _jq() {
-              echo ${row} | base64 --decode | jq -r ${1}
-              }
-            PACKAGENAME=$(echo $(_jq '.name'))
-            PACKAGEVERSION=$(echo $(_jq '.version'))
-            if [ $PACKAGENAME = "@dank-style/storybook" ]
-            then
-              echo "::set-output name=version::$PACKAGEVERSION"
-              echo "::set-output name=updateStorybook::1"
-            fi
-          done
-        env:
-          array: ${{ steps.changesets.outputs.publishedPackages }}
+      # - name: Get published package version
+      #   id: version
+      #   run: |
+      #     for row in $(echo "${array}" | jq -r '.[] | @base64'); do
+      #         _jq() {
+      #         echo ${row} | base64 --decode | jq -r ${1}
+      #         }
+      #       PACKAGENAME=$(echo $(_jq '.name'))
+      #       PACKAGEVERSION=$(echo $(_jq '.version'))
+      #       if [ $PACKAGENAME = "@dank-style/storybook" ]
+      #       then
+      #         echo "::set-output name=version::$PACKAGEVERSION"
+      #         echo "::set-output name=updateStorybook::1"
+      #       fi
+      #     done
+      #   env:
+      #     array: ${{ steps.changesets.outputs.publishedPackages }}
 
       # - name: Emit repository_dispatch
       #   if: steps.version.outputs.updateStorybook == 1
@@ -75,6 +75,6 @@ jobs:
           # You can pass in multiple channels to post to by providing a comma-delimited list of channel IDs.
           channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
           # For posting a simple plain text message
-          slack-message: "A new version of ${{ github.event.repository.name }} was published!\n${{ toJSON(steps.changesets.outputs.publishedPackages) }}"
+          slack-message: "A new package was published in ${{ github.event.repository.name }}!\n${{ toJSON(steps.changesets.outputs.publishedPackages) }}"
         env:
           SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

README.md

@@ -1,6 +1,6 @@
 <h3 align="center">
   <a href="https://github.com/gluestack/dank-style">
-    <img src="https://raw.githubusercontent.com/gluestack/dank-style/development/img/dank-dark-mode.png" alt="dank logo" width="300px">
+    <img src="https://raw.githubusercontent.com/gluestack/dank-style/development/img/dank-logo-readme.png" alt="dank logo" width="300px">
   </a>
   <br>
   <br>

example/babel-plugin-styled-resolver-expo/App.tsx → example/babel-plugin-styled-resolver-expo/App.web.tsx

@@ -3,12 +3,13 @@
 import { Text } from 'react-native';
 // import { useState } from 'react';
 import { styled, StyledProvider } from '@dank-style/react';
-import { config } from './dank.config';
+import { config } from './gluestack-ui.config';
 // import { MyButton1 } from './Button1';
 // import { MyButton2 } from './Button2';
 // import { MyButton3 } from './Button3';
 // import { MyButton4 } from './Button4';
-import ButtonComponents from './Button5';
+// import ButtonComponents from './Button5';
+import { Button } from './Button';
 
 // import { createConfig } from 'dank-style';
 // createConfig(config);
@@ -367,17 +368,13 @@ export default function App() {
 
   return (
     <>
-      <StyledProvider config={config}>
+      <StyledProvider config={config.theme}>
         {/* {Array.from({ length: 1000 }, () => {
           return <MyCustomComponent />;
         })} */}
-        {ButtonComponents.map((ButtonComponent, index) => {
-          return (
-            <ButtonComponent key={index}>
-              <MyButtonText>Hello World </MyButtonText>
-            </ButtonComponent>
-          );
-        })}
+        <Button>
+          <MyButtonText>Hello World </MyButtonText>
+        </Button>
       </StyledProvider>
     </>
   );

example/babel-plugin-styled-resolver-expo/Button.tsx

@@ -0,0 +1,28 @@
+import { Pressable } from 'react-native';
+import { styled } from '@dank-style/react';
+export const Button = styled(
+  Pressable,
+  {
+    'bg': 'aqua',
+    'p': '$3',
+    'm': '$3',
+    '@sm': {
+      'bg': `$red400`,
+      ':hover': {
+        'bg': 'aqua',
+        ':hover': {
+          'bg': '$yellow500',
+          ':focus': {
+            bg: 'red',
+          },
+        },
+      },
+    },
+    '@md': {
+      bg: `$green500`,
+    },
+  },
+  {
+    descendantStyle: ['_text'],
+  }
+);