Show animation when opening SCREENS.SEARCH.MONEY_REQUEST_REPORT from RHP

Author: WojtekBoman

src/hooks/useSearchTypeMenu.tsx

@@ -1,4 +1,4 @@
-import {useCallback, useEffect, useMemo, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {InteractionManager} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import {usePersonalDetails} from '@components/OnyxProvider';

src/libs/Navigation/AppNavigator/AuthScreens.tsx

@@ -59,8 +59,14 @@ import type * as OnyxTypes from '@src/types/onyx';
 import type {SelectedTimezone, Timezone} from '@src/types/onyx/PersonalDetails';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import type ReactComponentModule from '@src/types/utils/ReactComponentModule';
+import type {PlatformStackNavigationOptions} from '@libs/Navigation/PlatformStackNavigation/types';
 import createRootStackNavigator from './createRootStackNavigator';
-import {reportsSplitsWithEnteringAnimation, settingsSplitWithEnteringAnimation, workspaceSplitsWithoutEnteringAnimation} from './createRootStackNavigator/GetStateForActionHandlers';
+import {
+    reportsSplitsWithEnteringAnimation,
+    searchFullscreenWithEnteringAnimation,
+    settingsSplitWithEnteringAnimation,
+    workspaceSplitsWithoutEnteringAnimation,
+} from './createRootStackNavigator/GetStateForActionHandlers';
 import defaultScreenOptions from './defaultScreenOptions';
 import {ShareModalStackNavigator} from './ModalStackNavigators';
 import ExplanationModalNavigator from './Navigators/ExplanationModalNavigator';
@@ -448,27 +454,30 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
         };
     };
 
-    const getSplitNavigatorOptions =
-        (routesWithEnteringAnimation: Set<string>) =>
+    const getFullScreenNavigatorOptions =
+        (routesWithEnteringAnimation: Set<string>, defaultOptions: PlatformStackNavigationOptions) =>
         ({route}: {route: RouteProp<AuthScreensParamList>}) => {
             // We don't need to do anything special for the wide screen.
             if (!shouldUseNarrowLayout) {
-                return rootNavigatorScreenOptions.splitNavigator;
+                return defaultOptions;
             }
             // On the narrow screen, we want to animate this navigator if pushed SplitNavigator includes desired screen
             const animationEnabled = routesWithEnteringAnimation.has(route.key);
 
             return {
-                ...rootNavigatorScreenOptions.splitNavigator,
+                ...defaultOptions,
                 animation: animationEnabled ? Animations.SLIDE_FROM_RIGHT : Animations.NONE,
             };
         };
 
     // Animation is enabled when navigating to the report screen
-    const getReportsSplitNavigatorOptions = getSplitNavigatorOptions(reportsSplitsWithEnteringAnimation);
+    const getReportsSplitNavigatorOptions = getFullScreenNavigatorOptions(reportsSplitsWithEnteringAnimation, rootNavigatorScreenOptions.splitNavigator);
 
     // Animation is enabled when navigating to any screen different than SCREENS.SETTINGS.ROOT
-    const getSettingsSplitNavigatorOptions = getSplitNavigatorOptions(settingsSplitWithEnteringAnimation);
+    const getSettingsSplitNavigatorOptions = getFullScreenNavigatorOptions(settingsSplitWithEnteringAnimation, rootNavigatorScreenOptions.splitNavigator);
+
+    // Animation is enabled when navigating to SCREENS.SEARCH.MONEY_REQUEST_REPORT
+    const getSearchFullscreenNavigatorOptions = getFullScreenNavigatorOptions(searchFullscreenWithEnteringAnimation, rootNavigatorScreenOptions.fullScreen);
 
     const clearStatus = () => {
         User.clearCustomStatus();
@@ -519,7 +528,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                 />
                 <RootStack.Screen
                     name={NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR}
-                    options={rootNavigatorScreenOptions.fullScreen}
+                    options={getSearchFullscreenNavigatorOptions}
                     getComponent={loadSearchNavigator}
                 />
                 <RootStack.Screen

src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts

@@ -2,8 +2,7 @@ import type {CommonActions, RouterConfigOptions, StackActionType, StackNavigatio
 import {StackActions} from '@react-navigation/native';
 import type {ParamListBase, Router} from '@react-navigation/routers';
 import Log from '@libs/Log';
-import getPolicyIDFromState from '@libs/Navigation/helpers/getPolicyIDFromState';
-import type {RootNavigatorParamList, State} from '@libs/Navigation/types';
+import type {RootNavigatorParamList} from '@libs/Navigation/types';
 import * as SearchQueryUtils from '@libs/SearchQueryUtils';
 import NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
@@ -29,7 +28,7 @@ const MODAL_ROUTES_TO_DISMISS: string[] = [
 const workspaceSplitsWithoutEnteringAnimation = new Set<string>();
 const reportsSplitsWithEnteringAnimation = new Set<string>();
 const settingsSplitWithEnteringAnimation = new Set<string>();
-
+const searchFullscreenWithEnteringAnimation = new Set<string>();
 /**
  * Handles the OPEN_WORKSPACE_SPLIT action.
  * If the user is on other tab than settings and the workspace split is "remembered", this action will be called after pressing the settings tab.
@@ -202,44 +201,23 @@ function handlePushSearchPageAction(
     action: PushActionType,
     configOptions: RouterConfigOptions,
     stackRouter: Router<StackNavigationState<ParamListBase>, CommonActions.Action | StackActionType>,
-    setActiveWorkspaceID: (workspaceID: string | undefined) => void,
 ) {
-    let updatedAction = action;
-    const currentParams = action.payload.params as RootNavigatorParamList[typeof NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR];
-    if (currentParams?.screen === SCREENS.SEARCH.ROOT) {
-        const searchParams = currentParams?.params;
-        const queryJSON = SearchQueryUtils.buildSearchQueryJSON(searchParams.q);
-        if (!queryJSON) {
-            return null;
-        }
+    const stateWithSearchFullscreenNavigator = stackRouter.getStateForAction(state, action, configOptions);
 
-        if (!queryJSON.policyID) {
-            const policyID = getPolicyIDFromState(state as State<RootNavigatorParamList>);
+    if (!stateWithSearchFullscreenNavigator) {
+        Log.hmmm('[handlePushSettingsAction] SearchFullscreenNavigator has not been found in the navigation state.');
+        return null;
+    }
 
-            if (policyID) {
-                queryJSON.policyID = policyID;
-            } else {
-                delete queryJSON.policyID;
-            }
-        } else {
-            setActiveWorkspaceID(queryJSON.policyID);
-        }
+    const lastFullScreenRoute = stateWithSearchFullscreenNavigator.routes.at(-1);
+    const actionPayloadScreen = action.payload?.params && 'screen' in action.payload.params ? action.payload?.params?.screen : undefined;
 
-        updatedAction = {
-            ...action,
-            payload: {
-                ...action.payload,
-                params: {
-                    ...action.payload.params,
-                    params: {
-                        q: SearchQueryUtils.buildSearchQueryString(queryJSON),
-                    },
-                },
-            },
-        };
+    // Transitioning to SCREENS.SEARCH.MONEY_REQUEST_REPORT should be animated
+    if (actionPayloadScreen === SCREENS.SEARCH.MONEY_REQUEST_REPORT && lastFullScreenRoute?.key) {
+        searchFullscreenWithEnteringAnimation.add(lastFullScreenRoute.key);
     }
 
-    return stackRouter.getStateForAction(state, updatedAction, configOptions);
+    return stateWithSearchFullscreenNavigator;
 }
 
 function handleReplaceReportsSplitNavigatorAction(
@@ -309,6 +287,7 @@ export {
     handleSwitchPolicyIDAction,
     handleSwitchPolicyIDFromSearchAction,
     reportsSplitsWithEnteringAnimation,
+    searchFullscreenWithEnteringAnimation,
     settingsSplitWithEnteringAnimation,
     workspaceSplitsWithoutEnteringAnimation,
 };

src/libs/Navigation/AppNavigator/createRootStackNavigator/RootStackRouter.ts

@@ -111,7 +111,7 @@ function RootStackRouter(options: RootStackNavigatorRouterOptions) {
                 }
 
                 if (action.payload.name === NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR) {
-                    return handlePushSearchPageAction(state, action, configOptions, stackRouter, setActiveWorkspaceID);
+                    return handlePushSearchPageAction(state, action, configOptions, stackRouter);
                 }
 
                 if (action.payload.name === NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR) {