Skip to content

Commit 7d430e9

Browse files
authored
Merge pull request Expensify#64399 from daledah/revert-63865-fix/63417
[CP Staging] Revert "fix: handle navigation back for button with dropdown menu"
2 parents 0686278 + dffcbe3 commit 7d430e9

2 files changed

Lines changed: 0 additions & 6 deletions

File tree

src/components/ButtonWithDropdownMenu/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ function ButtonWithDropdownMenu<IValueType>({
223223
setIsMenuVisible(false);
224224
onOptionsMenuHide?.();
225225
}}
226-
shouldHandleNavigationBack
227226
onModalShow={onOptionsMenuShow}
228227
onItemSelected={(selectedSubitem, index, event) => {
229228
onSubItemSelected?.(selectedSubitem, index, event);

src/components/PopoverMenu.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,6 @@ type PopoverMenuProps = Partial<PopoverModalProps> & {
158158

159159
/** Used to locate the component in the tests */
160160
testID?: string;
161-
162-
/** Whether handle navigation back when modal show. */
163-
shouldHandleNavigationBack?: boolean;
164161
};
165162

166163
const renderWithConditionalWrapper = (shouldUseScrollView: boolean, contentContainerStyle: StyleProp<ViewStyle>, children: ReactNode): React.JSX.Element => {
@@ -212,7 +209,6 @@ function PopoverMenu({
212209
shouldUseModalPaddingStyle,
213210
shouldAvoidSafariException = false,
214211
testID,
215-
shouldHandleNavigationBack,
216212
}: PopoverMenuProps) {
217213
const styles = useThemeStyles();
218214
const theme = useTheme();
@@ -409,7 +405,6 @@ function PopoverMenu({
409405
setEnteredSubMenuIndexes(CONST.EMPTY_ARRAY);
410406
onClose();
411407
}}
412-
shouldHandleNavigationBack={shouldHandleNavigationBack}
413408
isVisible={isVisible}
414409
onModalHide={handleModalHide}
415410
onModalShow={onModalShow}

0 commit comments

Comments
 (0)