Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions src/components/Search/SearchWithNavigationDeferredMount.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import type {ComponentProps} from 'react';
import React from 'react';
import NavigationDeferredMount from '@components/NavigationDeferredMount';
import SearchRowSkeleton from '@components/Skeletons/SearchRowSkeleton';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import {endSpanWithAttributes} from '@libs/telemetry/activeSpans';
import CONST from '@src/CONST';
import Search from './index';

const REASON_ATTRIBUTES = {context: 'SearchPage.NavigationDeferred'} as const;

function SearchWithNavigationDeferredMount(props: ComponentProps<typeof Search>) {
const styles = useThemeStyles();
const {shouldUseNarrowLayout} = useResponsiveLayout();
const containerStyle = shouldUseNarrowLayout ? styles.searchListContentContainerStyles(!!props.hasFilterBars) : styles.mt3;

return (
<NavigationDeferredMount
waitForUpcomingTransition={false}
placeholder={
<SearchRowSkeleton
shouldAnimate
onLayout={() => endSpanWithAttributes(CONST.TELEMETRY.SPAN_NAVIGATE_TO_REPORTS, {[CONST.TELEMETRY.ATTRIBUTE_IS_WARM]: true})}
containerStyle={containerStyle}
reasonAttributes={REASON_ATTRIBUTES}
/>
}
>
<Search {...props} />
</NavigationDeferredMount>
);
}

export default SearchWithNavigationDeferredMount;
3 changes: 2 additions & 1 deletion src/pages/Search/SearchPageNarrow/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import {useSearchResultsContext, useSearchSelectionActions} from '@components/Se
import SearchLoadingSkeleton from '@components/Search/SearchLoadingSkeleton';
import SearchPageFooter from '@components/Search/SearchPageFooter';
import SearchPageHeaderNarrow from '@components/Search/SearchPageHeader/SearchPageHeaderNarrow';
import SearchWithNavigationDeferredMount from '@components/Search/SearchWithNavigationDeferredMount';
import type {SearchParams, SearchQueryJSON} from '@components/Search/types';
import useAndroidBackButtonHandler from '@hooks/useAndroidBackButtonHandler';
import useEndSubmitNavigationSpans from '@hooks/useEndSubmitNavigationSpans';
Expand Down Expand Up @@ -398,7 +399,7 @@ function SearchPageNarrow({
}}
/>
) : (
<Search
<SearchWithNavigationDeferredMount
searchResults={searchResults}
queryJSON={queryJSON}
key={queryJSON.hash}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Search/SearchPageWide.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
import ReceiptScanDropZone from '@components/ReceiptScanDropZone';
import ScreenWrapper from '@components/ScreenWrapper';
import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
import Search from '@components/Search';
import {useSearchResultsContext} from '@components/Search/SearchContext';
import SearchLoadingSkeleton from '@components/Search/SearchLoadingSkeleton';
import SearchPageFooter from '@components/Search/SearchPageFooter';
import SearchActionsBarWide from '@components/Search/SearchPageHeader/SearchActionsBarWide';
import SearchPageHeaderWide from '@components/Search/SearchPageHeader/SearchPageHeaderWide';
import SearchWithNavigationDeferredMount from '@components/Search/SearchWithNavigationDeferredMount';
import type {SearchParams, SearchQueryJSON} from '@components/Search/types';
import useEndSubmitNavigationSpans from '@hooks/useEndSubmitNavigationSpans';
import useNetwork from '@hooks/useNetwork';
Expand Down Expand Up @@ -131,7 +131,7 @@ function SearchPageWide({
}}
/>
) : (
<Search
<SearchWithNavigationDeferredMount
key={queryJSON.hash}
queryJSON={queryJSON}
searchResults={searchResults}
Expand Down
Loading