fix: fixed instance Stack

openkitrun · Dec 6, 2023 · c8fec69 · c8fec69
1 parent 8f6a991
commit c8fec69
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 99 deletions.
diff --git a/.changeset/strange-rabbits-remember.md b/.changeset/strange-rabbits-remember.md
@@ -0,0 +1,14 @@
+---
+"@design-blocks/primitives": patch
+"@design-blocks/system": patch
+"@design-blocks/colors": patch
+"@design-blocks/theme": patch
+"@design-blocks/types": patch
+"@design-blocks/unstyled": patch
+"@design-blocks/utils": patch
+"@design-blocks/block": patch
+"@design-blocks/native": patch
+"tsconfig": patch
+---
+
+Fixed stacks
diff --git a/packages/@blocks-primitives/src/Stack/Stack.tsx b/packages/@blocks-primitives/src/Stack/Stack.tsx
@@ -5,8 +5,9 @@ import { __DEV__ } from '@design-blocks/utils';
 import type { StackProps } from './Stack.types';
 
 import { createStack } from './createStack';
+
+const StackBlock = createStack();
 function Stack({ ...props }: StackProps) {
-  const StackBlock = createStack();
   return <StackBlock {...props} />;
 }
 if (__DEV__) {

diff --git a/packages/@blocks-primitives/src/Stack/createStack.tsx b/packages/@blocks-primitives/src/Stack/createStack.tsx
@@ -2,7 +2,7 @@ import * as React from 'react';
 
 import block from '@design-blocks/block';
 
-import { styleFunctionProps, styleFunctionSx } from '@design-blocks/system';
+import { StyleFunctionMode, styleFunction } from '@design-blocks/system';
 import { __DEV__, camelCase } from '@design-blocks/utils';
 
 import { Box } from '../Box';
@@ -45,8 +45,8 @@ export function createStack<AdditionalProps extends StackProps = StackProps>() {
         alignItems,
         justifyContent,
         flexWrap,
-        ...styleFunctionProps('Box', theme, { ...styleProps }),
-        ...styleFunctionSx('Box', theme, sx),
+        ...styleFunction('Box', theme, { ...styleProps }, StyleFunctionMode.PROPS),
+        ...styleFunction('Box', theme, sx, StyleFunctionMode.SX),
       };
     },
   );

diff --git a/packages/@blocks-primitives/src/XStack/XStack.tsx b/packages/@blocks-primitives/src/XStack/XStack.tsx
@@ -6,8 +6,9 @@ import { createStack } from '../Stack';
 
 import type { StackProps } from '../Stack';
 
+const Stack = createStack();
+
 function XStack({ ...props }: StackProps) {
-  const Stack = createStack();
   return <Stack direction='row' {...props} />;
 }
 

diff --git a/packages/@blocks-primitives/src/YStack/YStack.tsx b/packages/@blocks-primitives/src/YStack/YStack.tsx
@@ -6,8 +6,8 @@ import { createStack } from '../Stack';
 
 import type { StackProps } from '../Stack';
 
+const Stack = createStack();
 function YStack({ ...props }: StackProps) {
-  const Stack = createStack();
   return <Stack direction='column' {...props} />;
 }
 

diff --git a/packages/@blocks-system/src/styleFunction/index.ts b/packages/@blocks-system/src/styleFunction/index.ts
@@ -1,5 +1,3 @@
 export * from './getValuesTokens';
 export * from './styleFunction';
 export * from './validateProperties';
-export * from './styleFunctionProps';
-export * from './styleFunctionSx';
diff --git a/packages/@blocks-system/src/styleFunction/styleFunctionProps.ts b/packages/@blocks-system/src/styleFunction/styleFunctionProps.ts
diff --git a/packages/@blocks-system/src/styleFunction/styleFunctionSx.ts b/packages/@blocks-system/src/styleFunction/styleFunctionSx.ts