Skip to content

Commit d1a462f

Browse files
authored
Merge pull request Expensify#74057 from Krishna2323/krishna2323/issue/74014
[CP Staging] fix: Copilot - Copilot selector doesn't have right padding.
2 parents 187fe4b + 649ff16 commit d1a462f

1 file changed

Lines changed: 28 additions & 9 deletions

File tree

src/components/PopoverMenu.tsx

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -509,6 +509,32 @@ function BasePopoverMenu({
509509
...restMenuContainerStyle
510510
} = StyleSheet.flatten(menuContainerStyle) ?? {};
511511

512+
const {
513+
paddingVertical: containerPaddingVertical,
514+
paddingTop: containerPaddingTop,
515+
paddingBottom: containerPaddingBottom,
516+
...restContainerStyles
517+
} = StyleSheet.flatten(containerStyles) ?? {};
518+
519+
const scrollViewPaddingStyles = useMemo(
520+
() => ({
521+
paddingTop: paddingTop ?? containerPaddingTop ?? menuContainerPaddingTop,
522+
paddingBottom: paddingBottom ?? containerPaddingBottom ?? menuContainerPaddingBottom,
523+
paddingVertical: paddingVertical ?? containerPaddingVertical ?? menuContainerPaddingVertical ?? 0,
524+
}),
525+
[
526+
paddingTop,
527+
containerPaddingTop,
528+
menuContainerPaddingTop,
529+
paddingBottom,
530+
containerPaddingBottom,
531+
menuContainerPaddingBottom,
532+
paddingVertical,
533+
containerPaddingVertical,
534+
menuContainerPaddingVertical,
535+
],
536+
);
537+
512538
return (
513539
<PopoverWithMeasuredContent
514540
anchorPosition={anchorPosition}
@@ -543,18 +569,11 @@ function BasePopoverMenu({
543569
>
544570
<View
545571
onLayout={onLayout}
546-
style={[containerStyles, restMenuContainerStyle, {...(isWebOrDesktop ? styles.flex1 : styles.flexGrow1)}]}
572+
style={[restMenuContainerStyle, restContainerStyles, isWebOrDesktop ? styles.flex1 : styles.flexGrow1]}
547573
>
548574
{renderWithConditionalWrapper(
549575
shouldUseScrollView,
550-
[
551-
{
552-
paddingTop: menuContainerPaddingTop ?? paddingTop,
553-
paddingBottom: menuContainerPaddingBottom ?? paddingBottom,
554-
paddingVertical: paddingVertical ?? menuContainerPaddingVertical ?? 0,
555-
},
556-
restScrollContainerStyle,
557-
],
576+
[scrollViewPaddingStyles, restScrollContainerStyle],
558577
[renderHeaderText(), enteredSubMenuIndexes.length > 0 && renderBackButtonItem(), renderedMenuItems],
559578
)}
560579
</View>

0 commit comments

Comments
 (0)