Skip to content

Commit ecc0cfe

Browse files
committed
Fix: Exports list is not scrollable when export options exceed viewport height
1 parent d49f9b0 commit ecc0cfe

2 files changed

Lines changed: 11 additions & 0 deletions

File tree

src/components/MoneyReportHeader.tsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1932,6 +1932,9 @@ function MoneyReportHeader({
19321932
}, [originalSelectedTransactionsOptions, showDeleteModal, dismissedRejectUseExplanation, isDelegateAccessRestricted, showDelegateNoAccessModal]);
19331933

19341934
const shouldShowSelectedTransactionsButton = !!selectedTransactionsOptions.length && !transactionThreadReportID;
1935+
const shouldPopoverUseScrollView =
1936+
selectedTransactionsOptions.length >= CONST.DROPDOWN_SCROLL_THRESHOLD ||
1937+
selectedTransactionsOptions.some((option) => (option.subMenuItems?.length ?? 0) >= CONST.DROPDOWN_SCROLL_THRESHOLD);
19351938

19361939
if (isMobileSelectionModeEnabled && shouldUseNarrowLayout) {
19371940
// If mobile selection mode is enabled but only one or no transactions remain, turn it off
@@ -2023,6 +2026,8 @@ function MoneyReportHeader({
20232026
})}
20242027
isSplitButton={false}
20252028
shouldAlwaysShowDropdownMenu
2029+
shouldPopoverUseScrollView={shouldPopoverUseScrollView}
2030+
wrapperStyle={styles.w100}
20262031
/>
20272032
</View>
20282033
)}
@@ -2040,6 +2045,7 @@ function MoneyReportHeader({
20402045
})}
20412046
isSplitButton={false}
20422047
shouldAlwaysShowDropdownMenu
2048+
shouldPopoverUseScrollView={shouldPopoverUseScrollView}
20432049
wrapperStyle={styles.w100}
20442050
/>
20452051
</View>

src/components/MoneyRequestReportView/MoneyRequestReportActionsList.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,10 @@ function MoneyRequestReportActionsList({
306306
});
307307
}, [originalSelectedTransactionsOptions, dismissedRejectUseExplanation, isDelegateAccessRestricted, showDelegateNoAccessModal]);
308308

309+
const shouldPopoverUseScrollView =
310+
selectedTransactionsOptions.length >= CONST.DROPDOWN_SCROLL_THRESHOLD ||
311+
selectedTransactionsOptions.some((option) => (option.subMenuItems?.length ?? 0) >= CONST.DROPDOWN_SCROLL_THRESHOLD);
312+
309313
const dismissRejectModalBasedOnAction = useCallback(() => {
310314
if (rejectModalAction === CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.REJECT_BULK) {
311315
dismissRejectUseExplanation();
@@ -800,6 +804,7 @@ function MoneyRequestReportActionsList({
800804
customText={translate('workspace.common.selected', {count: selectedTransactionIDs.length})}
801805
isSplitButton={false}
802806
shouldAlwaysShowDropdownMenu
807+
shouldPopoverUseScrollView={shouldPopoverUseScrollView}
803808
wrapperStyle={[styles.w100, styles.ph5]}
804809
/>
805810
<View style={[styles.alignItemsCenter, styles.userSelectNone, styles.flexRow, styles.pt6, styles.ph8, styles.pb3]}>

0 commit comments

Comments
 (0)