Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Android-Accounting-Export button with dropdown goes out of preview component while loading #54852

Merged
merged 9 commits into from
Jan 7, 2025
Merged

Fix: Android-Accounting-Export button with dropdown goes out of preview component while loading #54852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b777a07
Fix export dropdown overlap
wildan-m Nov 18, 2024
3cbe4aa
Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…
wildan-m Nov 20, 2024
88e9e8b
Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…
wildan-m Dec 2, 2024
709d108
Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…
wildan-m Jan 6, 2025
be6364c
Merge branch 'wildan/fix/51763-drop-down-export-overlap' of https://g…
wildan-m Jan 6, 2025
5a05afe
Fix lint
wildan-m Jan 6, 2025
a2e6ce2
Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…
wildan-m Jan 7, 2025
948a393
flatten wrapper style
wildan-m Jan 7, 2025
fe486bb
Update src/components/ReportActionItem/ExportWithDropdownMenu.tsx
wildan-m Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/components/ReportActionItem/ExportWithDropdownMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import React, {useCallback, useMemo, useState} from 'react';
import {StyleSheet} from 'react-native';
import type {StyleProp, ViewStyle} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import type {OnyxEntry} from 'react-native-onyx';
import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu';
Expand Down Expand Up @@ -27,6 +29,8 @@ type ExportWithDropdownMenuProps = {
connectionName: ConnectionName;

dropdownAnchorAlignment?: AnchorAlignment;

wrapperStyle?: StyleProp<ViewStyle>;
};

function ExportWithDropdownMenu({
Expand All @@ -37,6 +41,7 @@ function ExportWithDropdownMenu({
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
},
wrapperStyle,
}: ExportWithDropdownMenuProps) {
const reportID = report?.reportID;
const styles = useThemeStyles();
Expand All @@ -50,6 +55,7 @@ function ExportWithDropdownMenu({
const canBeExported = ReportUtils.canBeExported(report);
const isExported = ReportUtils.isExported(reportActions);
const hasIntegrationAutoSync = PolicyUtils.hasIntegrationAutoSync(policy, connectionName);
const flattenedWrapperStyle = StyleSheet.flatten([styles.flex1, wrapperStyle]);

const dropdownOptions: Array<DropdownOption<ReportExportType>> = useMemo(() => {
const optionTemplate = {
Expand All @@ -72,7 +78,7 @@ function ExportWithDropdownMenu({
...optionTemplate,
},
];
const exportMethod = exportMethods?.[report?.policyID ?? ''] ?? null;
const exportMethod = report?.policyID ? exportMethods?.[report.policyID] : null;
if (exportMethod) {
options.sort((method) => (method.value === exportMethod ? -1 : 0));
}
Expand Down Expand Up @@ -124,7 +130,7 @@ function ExportWithDropdownMenu({
onOptionSelected={({value}) => savePreferredExportMethod(value)}
options={dropdownOptions}
style={[shouldUseNarrowLayout && styles.flexGrow1]}
wrapperStyle={styles.flex1}
wrapperStyle={flattenedWrapperStyle}
buttonSize={CONST.DROPDOWN_BUTTON_SIZE.MEDIUM}
/>
<ConfirmModal
Expand Down
1 change: 1 addition & 0 deletions src/components/ReportActionItem/ReportPreview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,7 @@ function ReportPreview({
policy={policy}
report={iouReport}
connectionName={connectedIntegration}
wrapperStyle={styles.flexReset}
dropdownAnchorAlignment={{
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
Expand Down
Loading