Skip to content

Commit a9b6d36

Browse files
authored
Merge pull request #60875 from bernhardoj/fix/60741-skeleton-overlaps
Fix skeleton overlaps with next button
2 parents 8d489e4 + 0b07ae9 commit a9b6d36

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

src/components/OptionsListSkeletonView.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ function OptionsListSkeletonView({shouldAnimate = true, shouldStyleAsTable = fal
3232
fixedNumItems={fixedNumItems}
3333
speed={speed}
3434
shouldAnimate={shouldAnimate}
35+
style={[styles.overflowHidden]}
3536
itemViewStyle={shouldStyleAsTable && [styles.highlightBG, styles.mb2, styles.ml5, styles.br2]}
3637
gradientOpacityEnabled={gradientOpacityEnabled}
3738
renderSkeletonItem={({itemIndex}) => {

src/components/Skeletons/ItemListSkeletonView.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ type ListItemSkeletonProps = {
1414
itemViewStyle?: StyleProp<ViewStyle>;
1515
itemViewHeight?: number;
1616
speed?: number;
17+
style?: StyleProp<ViewStyle>;
1718
};
1819

1920
const getVerticalMargin = (style: StyleProp<ViewStyle>): number => {
@@ -37,6 +38,7 @@ function ItemListSkeletonView({
3738
itemViewStyle = {},
3839
itemViewHeight = CONST.LHN_SKELETON_VIEW_ITEM_HEIGHT,
3940
speed,
41+
style,
4042
}: ListItemSkeletonProps) {
4143
const theme = useTheme();
4244
const themeStyles = useThemeStyles();
@@ -83,7 +85,7 @@ function ItemListSkeletonView({
8385

8486
return (
8587
<View
86-
style={[themeStyles.flex1]}
88+
style={[themeStyles.flex1, style]}
8789
onLayout={handleLayout}
8890
>
8991
{skeletonViewItems}

0 commit comments

Comments
 (0)