66 resolveAlign ,
77 resolveJustify ,
88 resolveWrap ,
9+ resolveAlignSelf ,
910 AxisX ,
1011 AxisY ,
1112 Space ,
@@ -46,21 +47,22 @@ type StyleProps = ResponsiveProps<
4647
4748export interface Props < T extends Direction > extends StyleProps , ViewProps {
4849 children ?: React . ReactNode
49- flex ?: Flex
50+ flex ?: ResponsiveProps < Flex >
5051 direction ?: ResponsiveProp < T >
5152 paddingX ?: ResponsiveProp < number >
5253 paddingY ?: ResponsiveProp < number >
5354 marginX ?: ResponsiveProp < number >
5455 marginY ?: ResponsiveProp < number >
5556 alignX ?: ResponsiveProp < ExtractAlignX < T > >
5657 alignY ?: ResponsiveProp < ExtractAlignY < T > >
58+ alignSelf ?: ResponsiveProp < ExtractAlignY < T > >
5759 wrap ?: Wrap
5860}
5961
6062export const Box = < T extends Direction > ( props : Props < T > ) => {
6163 const {
6264 children,
63- flex = 'content' ,
65+ flex : responsiveFlex = 'content' ,
6466 direction : responsiveDirection = 'column' ,
6567 padding,
6668 paddingX,
@@ -82,6 +84,7 @@ export const Box = <T extends Direction>(props: Props<T>) => {
8284 marginStart,
8385 alignX : responsiveAlignX ,
8486 alignY : responsiveAlignY ,
87+ alignSelf : responsiveAlignSelf ,
8588 style,
8689 wrap,
8790 ...rest
@@ -116,6 +119,9 @@ export const Box = <T extends Direction>(props: Props<T>) => {
116119 const direction = resolveResponsiveProp ( responsiveDirection )
117120 const alignX = resolveResponsiveProp ( responsiveAlignX )
118121 const alignY = resolveResponsiveProp ( responsiveAlignY )
122+ const alignSelf = resolveResponsiveProp ( responsiveAlignSelf )
123+ const flex = resolveResponsiveProp ( responsiveFlex )
124+
119125 const alignments =
120126 direction === 'column' || direction === 'column-reverse'
121127 ? [ resolveAlign ( alignX as AxisX ) , resolveJustify ( alignY ) ]
@@ -129,6 +135,7 @@ export const Box = <T extends Direction>(props: Props<T>) => {
129135 resolveFlex ( flex ) ,
130136 resolveDirection ( direction as Direction ) ,
131137 resolveWrap ( wrap ) ,
138+ resolveAlignSelf ( alignSelf ) ,
132139 debugStyle ,
133140 ...alignments ,
134141 ] }
0 commit comments