Merge pull request Expensify#63865 from daledah/fix/63417

fix: handle navigation back for button with dropdown menu

Author: thienlnam

src/components/ButtonWithDropdownMenu/index.tsx

@@ -223,6 +223,7 @@ function ButtonWithDropdownMenu<IValueType>({
                         setIsMenuVisible(false);
                         onOptionsMenuHide?.();
                     }}
+                    shouldHandleNavigationBack
                     onModalShow={onOptionsMenuShow}
                     onItemSelected={(selectedSubitem, index, event) => {
                         onSubItemSelected?.(selectedSubitem, index, event);

src/components/PopoverMenu.tsx

@@ -158,6 +158,9 @@ type PopoverMenuProps = Partial<PopoverModalProps> & {
 
     /** Used to locate the component in the tests */
     testID?: string;
+
+    /** Whether handle navigation back when modal show. */
+    shouldHandleNavigationBack?: boolean;
 };
 
 const renderWithConditionalWrapper = (shouldUseScrollView: boolean, contentContainerStyle: StyleProp<ViewStyle>, children: ReactNode): React.JSX.Element => {
@@ -209,6 +212,7 @@ function PopoverMenu({
     shouldUseModalPaddingStyle,
     shouldAvoidSafariException = false,
     testID,
+    shouldHandleNavigationBack,
 }: PopoverMenuProps) {
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -405,6 +409,7 @@ function PopoverMenu({
                 setEnteredSubMenuIndexes(CONST.EMPTY_ARRAY);
                 onClose();
             }}
+            shouldHandleNavigationBack={shouldHandleNavigationBack}
             isVisible={isVisible}
             onModalHide={handleModalHide}
             onModalShow={onModalShow}