Merge pull request #58878 from daledah/fix/57293-regressions

fix: Tapping an item from recent list directs blank page and fix regressions

Author: luacmartins

src/components/Search/SearchRouter/SearchRouter.tsx

@@ -37,7 +37,6 @@ import ROUTES from '@src/ROUTES';
 import SCREENS from '@src/SCREENS';
 import type Report from '@src/types/onyx/Report';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
-import KeyboardUtils from '@src/utils/keyboard';
 import {getQueryWithSubstitutions} from './getQueryWithSubstitutions';
 import type {SubstitutionMap} from './getQueryWithSubstitutions';
 import {getUpdatedSubstitutionsMap} from './getUpdatedSubstitutionsMap';
@@ -74,9 +73,10 @@ function getContextualSearchQuery(item: SearchQueryItem) {
 type SearchRouterProps = {
     onRouterClose: () => void;
     shouldHideInputCaret?: TextInputProps['caretHidden'];
+    isSearchRouterDisplayed?: boolean;
 };
 
-function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps, ref: React.Ref<View>) {
+function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDisplayed}: SearchRouterProps, ref: React.Ref<View>) {
     const {translate} = useLocalize();
     const styles = useThemeStyles();
     const [, recentSearchesMetadata] = useOnyx(ONYXKEYS.RECENT_SEARCHES);
@@ -113,6 +113,10 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps,
                 return undefined;
             }
 
+            if (!isSearchRouterDisplayed) {
+                return undefined;
+            }
+
             const reportForContextualSearch = recentReports.find((option) => option.reportID === contextualReportID);
             if (!reportForContextualSearch) {
                 return undefined;
@@ -159,7 +163,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps,
                 },
             ];
         },
-        [contextualReportID, styles.activeComponentBG, textInputValue, translate],
+        [contextualReportID, styles.activeComponentBG, textInputValue, translate, isSearchRouterDisplayed],
     );
 
     const searchQueryItem = textInputValue
@@ -270,14 +274,11 @@ function SearchRouter({onRouterClose, shouldHideInputCaret}: SearchRouterProps,
                 }
             } else {
                 onRouterClose();
-
-                KeyboardUtils.dismiss().then(() => {
-                    if (item?.reportID) {
-                        Navigation.navigateToReportWithPolicyCheck({reportID: item?.reportID});
-                    } else if ('login' in item) {
-                        navigateToAndOpenReport(item.login ? [item.login] : [], false);
-                    }
-                });
+                if (item?.reportID) {
+                    Navigation.navigateToReportWithPolicyCheck({reportID: item?.reportID});
+                } else if ('login' in item) {
+                    navigateToAndOpenReport(item.login ? [item.login] : [], false);
+                }
             }
         },
         [autocompleteSubstitutions, onRouterClose, onSearchQueryChange, submitSearch, textInputValue],

src/components/Search/SearchRouter/SearchRouterModal.tsx

@@ -46,14 +46,13 @@ function SearchRouterModal() {
                 behavior="padding"
                 style={[styles.flex1, {maxHeight: windowHeight}]}
             >
-                {isSearchRouterDisplayed && (
-                    <FocusTrapForModal active={isSearchRouterDisplayed}>
-                        <SearchRouter
-                            onRouterClose={closeSearchRouter}
-                            shouldHideInputCaret={shouldHideInputCaret}
-                        />
-                    </FocusTrapForModal>
-                )}
+                <FocusTrapForModal active={isSearchRouterDisplayed}>
+                    <SearchRouter
+                        onRouterClose={closeSearchRouter}
+                        shouldHideInputCaret={shouldHideInputCaret}
+                        isSearchRouterDisplayed={isSearchRouterDisplayed}
+                    />
+                </FocusTrapForModal>
             </KeyboardAvoidingView>
         </Modal>
     );