Skip to content

Commit 12ce89d

Browse files
authored
fix: add container prop and improve flex/layout handling (#4742)
1 parent 1d2a378 commit 12ce89d

File tree

14 files changed

+23
-2
lines changed

14 files changed

+23
-2
lines changed

src/components/Appbar/Appbar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,7 @@ const Appbar = ({
254254
!theme.isV3 && { elevation },
255255
]}
256256
elevation={elevation as MD3Elevation}
257+
container
257258
{...rest}
258259
>
259260
{shouldAddLeftSpacing ? <View style={spacingStyle} /> : null}

src/components/Banner.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,7 @@ const Banner = ({
194194
{...rest}
195195
style={[!theme.isV3 && styles.elevation, { opacity }, style]}
196196
theme={theme}
197+
container
197198
{...(theme.isV3 && { elevation })}
198199
>
199200
<View style={[styles.wrapper, contentStyle]}>

src/components/BottomNavigation/BottomNavigationBar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ const BottomNavigationBar = <Route extends BaseRoute>({
574574
: 'none'
575575
}
576576
onLayout={onLayout}
577+
container
577578
>
578579
<Animated.View
579580
style={[styles.barContent, { backgroundColor }]}

src/components/Button/Button.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,7 @@ const Button = (
350350
] as Animated.WithAnimatedValue<StyleProp<ViewStyle>>
351351
}
352352
{...(isV3 && { elevation: elevation })}
353+
container
353354
>
354355
<TouchableRipple
355356
borderless

src/components/Card/Card.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ const Card = (
304304
elevation: isMode('elevated') ? computedElevation : 0,
305305
})}
306306
testID={`${testID}-container`}
307+
container
307308
{...rest}
308309
>
309310
{isMode('outlined') && (

src/components/Chip/Chip.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ const Chip = ({
316316
{...rest}
317317
testID={`${testID}-container`}
318318
theme={theme}
319+
container
319320
>
320321
<TouchableRipple
321322
borderless

src/components/FAB/AnimatedFAB.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,7 @@ const AnimatedFAB = ({
404404
]}
405405
{...(isV3 && { elevation: md3Elevation })}
406406
theme={theme}
407+
container
407408
>
408409
<Animated.View
409410
style={[

src/components/FAB/FAB.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ const FAB = forwardRef<View, Props>(
289289
pointerEvents={visible ? 'auto' : 'none'}
290290
testID={`${testID}-container`}
291291
{...(isV3 && { elevation: md3Elevation })}
292+
container
292293
>
293294
<TouchableRipple
294295
borderless

src/components/IconButton/IconButton.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ const IconButton = forwardRef<View, Props>(
181181
!isV3 && disabled && styles.disabled,
182182
style,
183183
]}
184+
container
184185
{...(isV3 && { elevation: 0 })}
185186
>
186187
<TouchableRipple

src/components/Menu/Menu.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -675,6 +675,7 @@ const Menu = ({
675675
{...(theme.isV3 && { elevation })}
676676
testID={`${testID}-surface`}
677677
theme={theme}
678+
container
678679
>
679680
{(scrollableMenuHeight && (
680681
<ScrollView

0 commit comments

Comments
 (0)