Merge pull request #60812 from software-mansion-labs/improve-desktop-nav/fix-passing-policy-id

iOS - Expense Reports - Report page cannot be dismissed by swiping to right

Author: luacmartins

src/libs/Navigation/AppNavigator/Navigators/SearchFullscreenNavigator.tsx

@@ -1,10 +1,11 @@
 import React from 'react';
-import type {PlatformStackNavigationOptions, PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
+import useSplitNavigatorScreenOptions from '@libs/Navigation/AppNavigator/useSplitNavigatorScreenOptions';
+import Animations from '@libs/Navigation/PlatformStackNavigation/navigationOptions/animation';
+import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {AuthScreensParamList, SearchFullscreenNavigatorParamList} from '@libs/Navigation/types';
 import * as SearchQueryUtils from '@libs/SearchQueryUtils';
 import createSearchFullscreenNavigator from '@navigation/AppNavigator/createSearchFullscreenNavigator';
 import FreezeWrapper from '@navigation/AppNavigator/FreezeWrapper';
-import useRootNavigatorScreenOptions from '@navigation/AppNavigator/useRootNavigatorScreenOptions';
 import type NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
 import type ReactComponentModule from '@src/types/utils/ReactComponentModule';
@@ -15,25 +16,20 @@ const loadSearchMoneyReportPage = () => require<ReactComponentModule>('@pages/Se
 const Stack = createSearchFullscreenNavigator<SearchFullscreenNavigatorParamList>();
 
 function SearchFullscreenNavigator({route}: PlatformStackScreenProps<AuthScreensParamList, typeof NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR>) {
-    const rootNavigatorScreenOptions = useRootNavigatorScreenOptions();
-    const searchRootScreenOptions: PlatformStackNavigationOptions = {
-        ...rootNavigatorScreenOptions.fullScreen,
-        web: {
-            ...rootNavigatorScreenOptions.fullScreen.web,
-            cardStyleInterpolator: undefined,
-        },
-    };
+    // These options can be used here because the full screen navigator has the same structure as the split navigator in terms of the central screens, but it does not have a sidebar.
+    const {centralScreen: centralScreenOptions} = useSplitNavigatorScreenOptions();
     return (
         <FreezeWrapper>
             <Stack.Navigator
-                screenOptions={searchRootScreenOptions}
+                screenOptions={centralScreenOptions}
                 defaultCentralScreen={SCREENS.SEARCH.ROOT}
                 parentRoute={route}
             >
                 <Stack.Screen
                     name={SCREENS.SEARCH.ROOT}
                     getComponent={loadSearchPage}
                     initialParams={{q: SearchQueryUtils.buildSearchQueryString()}}
+                    options={{animation: Animations.NONE}}
                 />
                 <Stack.Screen
                     name={SCREENS.SEARCH.MONEY_REQUEST_REPORT}

src/libs/Navigation/AppNavigator/useRootNavigatorScreenOptions.ts

@@ -89,7 +89,7 @@ const useRootNavigatorScreenOptions = () => {
                 cardStyle: {
                     height: '100%',
                 },
-                cardStyleInterpolator: (props: StackCardInterpolationProps) => modalCardStyleInterpolator({props, isFullScreenModal: true, shouldAnimateSidePanel: true}),
+                cardStyleInterpolator: (props: StackCardInterpolationProps) => modalCardStyleInterpolator({props, isFullScreenModal: true}),
             },
         },
     } satisfies RootNavigatorScreenOptions;