@@ -509,6 +509,19 @@ 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 = {
520+ paddingTop : paddingTop ?? containerPaddingTop ?? menuContainerPaddingTop ,
521+ paddingBottom : paddingBottom ?? containerPaddingBottom ?? menuContainerPaddingBottom ,
522+ paddingVertical : paddingVertical ?? containerPaddingVertical ?? menuContainerPaddingVertical ?? 0 ,
523+ } ;
524+
512525 return (
513526 < PopoverWithMeasuredContent
514527 anchorPosition = { anchorPosition }
@@ -543,18 +556,11 @@ function BasePopoverMenu({
543556 >
544557 < View
545558 onLayout = { onLayout }
546- style = { [ containerStyles , restMenuContainerStyle , { ...( isWebOrDesktop ? styles . flex1 : styles . flexGrow1 ) } ] }
559+ style = { [ restMenuContainerStyle , restContainerStyles , { ...( isWebOrDesktop ? styles . flex1 : styles . flexGrow1 ) } ] }
547560 >
548561 { renderWithConditionalWrapper (
549562 shouldUseScrollView ,
550- [
551- {
552- paddingTop : menuContainerPaddingTop ?? paddingTop ,
553- paddingBottom : menuContainerPaddingBottom ?? paddingBottom ,
554- paddingVertical : paddingVertical ?? menuContainerPaddingVertical ?? 0 ,
555- } ,
556- restScrollContainerStyle ,
557- ] ,
563+ [ scrollViewPaddingStyles , restScrollContainerStyle ] ,
558564 [ renderHeaderText ( ) , enteredSubMenuIndexes . length > 0 && renderBackButtonItem ( ) , renderedMenuItems ] ,
559565 ) }
560566 </ View >
0 commit comments