fix: variant and macro types

front-of-house · Apr 13, 2023 · d0bca91 · d0bca91
1 parent 079b468
commit d0bca91
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.changeset/gorgeous-plums-tan.md b/.changeset/gorgeous-plums-tan.md
@@ -0,0 +1,6 @@
+---
+"@svbstrate/react-native": patch
+"@svbstrate/core": patch
+---
+
+Fix variant and macro types
diff --git a/packages/core/lib/types.ts b/packages/core/lib/types.ts
@@ -116,7 +116,9 @@ export type SvbstrateCSSStyleObject = {
  paddingLeft?: MapShorthandToToken<"paddingLeft", "space">;
  paddingRight?: MapShorthandToToken<"paddingRight", "space">;
 } & Partial<Shorthands> &
- Partial<CustomProperties>;
+ Partial<CustomProperties> &
+ Partial<Macros> &
+ Partial<Variants>;
 
 export type SvbstratePsuedoStyleObject = {
  // psuedo selector blocks
@@ -135,8 +137,6 @@ export type SvbstrateMiscStyleObject = {
 export type SvbstrateStyleObject = SvbstrateCSSStyleObject &
  SvbstratePsuedoStyleObject &
  SvbstrateHTMLStyleObject &
- Partial<Macros> &
- Partial<Variants> &
  SvbstrateMiscStyleObject;
 
 export interface ThemeConfig {

diff --git a/packages/react-native/lib/__tests__/test b/packages/react-native/lib/__tests__/test
@@ -27,12 +27,15 @@ function App() {
  space: [],
  },
  variants: {
- shadow(value, theme) {
- return value
+ shadow: {
+ large: {
+ },
+ small: {
+ },
  }
  }
  }}>
- <Box as={Box}>Hello</Box>
+ <Box as={Box} color='primary' shadow='large'>Hello</Box>
  </ThemeProvider>
  </>
  )