diff --git a/src/components/Search/SearchAutocompleteList.tsx b/src/components/Search/SearchAutocompleteList.tsx index e504a7b08b6d..b01cb59d7a6a 100644 --- a/src/components/Search/SearchAutocompleteList.tsx +++ b/src/components/Search/SearchAutocompleteList.tsx @@ -1,7 +1,6 @@ import type {ForwardedRef, RefObject} from 'react'; -import React, {useContext, useEffect, useMemo, useRef, useState} from 'react'; +import React, {useEffect, useMemo, useRef, useState} from 'react'; import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; -import {OptionsListStateContext, useOptionsList} from '@components/OptionListContextProvider'; import OptionsListSkeletonView from '@components/OptionsListSkeletonView'; import type {AnimatedTextInputRef} from '@components/RNTextInput'; import type {ListItem as NewListItem, UserListItemProps} from '@components/SelectionList/ListItem/types'; @@ -13,6 +12,7 @@ import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails' import useDebounce from '@hooks/useDebounce'; import useDebouncedAccessibilityAnnouncement from '@hooks/useDebouncedAccessibilityAnnouncement'; import useFeedKeysWithAssignedCards from '@hooks/useFeedKeysWithAssignedCards'; +import useFilteredOptions from '@hooks/useFilteredOptions'; import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; @@ -94,6 +94,11 @@ const defaultListOptions = { categoryOptions: [], }; +const emptyOptionList = { + reports: [], + personalDetails: [], +}; + const setPerformanceTimersEnd = () => { endSpan(CONST.TELEMETRY.SPAN_OPEN_SEARCH_ROUTER); }; @@ -165,7 +170,7 @@ function SearchAutocompleteList({ const expensifyIcons = useMemoizedLazyExpensifyIcons(['History', 'MagnifyingGlass']); const taxRates = getAllTaxRates(policies); - const {options, areOptionsInitialized} = useOptionsList(); + const {options: listOptions, isLoading: isLoadingOptions} = useFilteredOptions({enabled: true, isSearching: !!autocompleteQueryValue.trim(), betas: betas ?? []}); const isRecentSearchesDataLoaded = !isLoadingOnyxValue(recentSearchesMetadata); @@ -175,7 +180,6 @@ function SearchAutocompleteList({ }; }, []); - const {areOptionsInitialized: contextAreOptionsInitialized} = useContext(OptionsListStateContext); const coldStartAttributeSet = useRef(false); useEffect(() => { if (coldStartAttributeSet.current) { @@ -183,17 +187,17 @@ function SearchAutocompleteList({ } const parentSpan = getSpan(CONST.TELEMETRY.SPAN_OPEN_SEARCH_ROUTER); if (parentSpan) { - parentSpan.setAttribute(CONST.TELEMETRY.ATTRIBUTE_COLD_START, !contextAreOptionsInitialized); + parentSpan.setAttribute(CONST.TELEMETRY.ATTRIBUTE_COLD_START, isLoadingOptions); coldStartAttributeSet.current = true; } - }, [contextAreOptionsInitialized]); + }, [isLoadingOptions]); const searchOptions = (() => { - if (!areOptionsInitialized) { + if (listOptions === null) { return defaultListOptions; } return getSearchOptions({ - options, + options: listOptions, draftComments, nvpDismissedProductTraining, betas: betas ?? [], @@ -277,7 +281,7 @@ function SearchAutocompleteList({ autocompleteQueryValue, allCards, allFeeds, - options, + options: listOptions ?? emptyOptionList, draftComments, nvpDismissedProductTraining, betas, @@ -357,7 +361,7 @@ function SearchAutocompleteList({ const reasonAttributes: SkeletonSpanReasonAttributes = { context: 'SearchAutocompleteList', isRecentSearchesDataLoaded, - areOptionsInitialized, + isLoadingOptions, }; /* Sections generation */ @@ -404,7 +408,7 @@ function SearchAutocompleteList({ } as AutocompleteListItem; }); - if (areOptionsInitialized) { + if (!isLoadingOptions) { pushSection({ title: autocompleteQueryValue.trim() === '' ? translate('search.recentChats') : undefined, data: nextStyledRecentReports, @@ -423,7 +427,7 @@ function SearchAutocompleteList({ reasonAttributes={{ context: 'SearchAutocompleteList', isRecentSearchesDataLoaded, - areOptionsInitialized, + isLoadingOptions, }} /> ), @@ -458,7 +462,7 @@ function SearchAutocompleteList({ searchQueryItem, styles, translate, - areOptionsInitialized, + isLoadingOptions, isRecentSearchesDataLoaded, ]); @@ -500,13 +504,13 @@ function SearchAutocompleteList({ // because useState(initialFocusedIndex) in useArrowKeyFocusManager only reads the initial value. // Imperatively focus the first recent report once options become available (desktop only). useEffect(() => { - if (shouldUseNarrowLayout || !areOptionsInitialized || hasSetInitialFocusRef.current || firstRecentReportFlatIndex === -1) { + if (shouldUseNarrowLayout || isLoadingOptions || hasSetInitialFocusRef.current || firstRecentReportFlatIndex === -1) { return; } hasSetInitialFocusRef.current = true; innerListRef.current?.updateAndScrollToFocusedIndex(firstRecentReportFlatIndex, false); - }, [areOptionsInitialized, firstRecentReportFlatIndex, shouldUseNarrowLayout]); + }, [isLoadingOptions, firstRecentReportFlatIndex, shouldUseNarrowLayout]); useEffect(() => { const targetText = autocompleteQueryValue; diff --git a/src/hooks/useFilteredOptions.ts b/src/hooks/useFilteredOptions.ts index 13b7c92b929a..a8d30765cfbe 100644 --- a/src/hooks/useFilteredOptions.ts +++ b/src/hooks/useFilteredOptions.ts @@ -19,8 +19,8 @@ type UseFilteredOptionsConfig = { batchSize?: number; /** Whether to enable dynamic loading/pagination (default: true) */ enablePagination?: boolean; - /** Search term for filtering - when present, builds full report map for personal details (default: '') */ - searchTerm?: string; + /** Whether search mode is active - when true, builds full report map for personal details (default: false) */ + isSearching?: boolean; /** Beta features the user has access to */ betas?: OnyxEntry; }; @@ -66,7 +66,7 @@ type UseFilteredOptionsResult = { * /> */ function useFilteredOptions(config: UseFilteredOptionsConfig = {}): UseFilteredOptionsResult { - const {maxRecentReports = 500, enabled = true, includeP2P = true, batchSize = 100, searchTerm = '', betas} = config; + const {maxRecentReports = 500, enabled = true, includeP2P = true, batchSize = 100, isSearching = false, betas} = config; const [reportsLimit, setReportsLimit] = useState(maxRecentReports); @@ -86,11 +86,11 @@ function useFilteredOptions(config: UseFilteredOptionsConfig = {}): UseFilteredO ? createFilteredOptionList(allPersonalDetails, allReports, reportAttributesDerived, privateIsArchivedMap, allPolicies, { maxRecentReports: reportsLimit, includeP2P, - searchTerm, + isSearching, betas, }) : null, - [enabled, allReports, allPersonalDetails, reportAttributesDerived, privateIsArchivedMap, allPolicies, reportsLimit, includeP2P, searchTerm, betas], + [enabled, allReports, allPersonalDetails, reportAttributesDerived, privateIsArchivedMap, allPolicies, reportsLimit, includeP2P, isSearching, betas], ); const hasMore = options ? reportsLimit < totalReports : false; diff --git a/src/libs/OptionsListUtils/index.ts b/src/libs/OptionsListUtils/index.ts index a73d04680fb2..8e48fb20648b 100644 --- a/src/libs/OptionsListUtils/index.ts +++ b/src/libs/OptionsListUtils/index.ts @@ -1536,14 +1536,13 @@ function createFilteredOptionList( options: { maxRecentReports?: number; includeP2P?: boolean; - searchTerm?: string; + isSearching?: boolean; betas?: OnyxEntry; } = {}, policyTags?: OnyxCollection, visibleReportActionsData: VisibleReportActionsDerivedValue = {}, ) { - const {maxRecentReports = 500, includeP2P = true, searchTerm = ''} = options; - const isSearching = !!searchTerm?.trim(); + const {maxRecentReports = 500, includeP2P = true, isSearching = false} = options; const reportMapForAccountIDs: Record = {}; // Step 1: Pre-filter reports to avoid processing thousands diff --git a/src/pages/NewChatPage.tsx b/src/pages/NewChatPage.tsx index d80ab7d7d46b..270c35e66dd3 100755 --- a/src/pages/NewChatPage.tsx +++ b/src/pages/NewChatPage.tsx @@ -90,7 +90,7 @@ function useOptions(reportAttributesDerived: ReportAttributesDerivedValue['repor includeP2P: true, batchSize: 100, enablePagination: true, - searchTerm: debouncedSearchTerm, + isSearching: !!debouncedSearchTerm.trim(), betas, }); diff --git a/src/pages/Share/ShareTab.tsx b/src/pages/Share/ShareTab.tsx index 36190a39fdfe..3fcdefe3955c 100644 --- a/src/pages/Share/ShareTab.tsx +++ b/src/pages/Share/ShareTab.tsx @@ -66,7 +66,7 @@ function ShareTab({ref}: ShareTabProps) { const {options: listOptions, isLoading} = useFilteredOptions({ enabled: didScreenTransitionEnd, betas: betas ?? [], - searchTerm: debouncedTextInputValue, + isSearching: !!debouncedTextInputValue.trim(), }); const areOptionsInitialized = !isLoading; const [isSearchingForReports] = useOnyx(ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS); diff --git a/tests/perf-test/OptionsListUtils.perf-test.ts b/tests/perf-test/OptionsListUtils.perf-test.ts index 07e9c0cb3f96..6d86ce2abf2a 100644 --- a/tests/perf-test/OptionsListUtils.perf-test.ts +++ b/tests/perf-test/OptionsListUtils.perf-test.ts @@ -274,26 +274,26 @@ describe('OptionsListUtils', () => { await measureFunction(() => createFilteredOptionList(personalDetails, mockedReportsMap, undefined, EMPTY_PRIVATE_IS_ARCHIVED_MAP, undefined, { maxRecentReports: 500, - searchTerm: '', + isSearching: false, }), ); }); - test('[OptionsListUtils] createFilteredOptionList with searchTerm', async () => { + test('[OptionsListUtils] createFilteredOptionList with isSearching is true', async () => { await waitForBatchedUpdates(); await measureFunction(() => createFilteredOptionList(personalDetails, mockedReportsMap, undefined, EMPTY_PRIVATE_IS_ARCHIVED_MAP, undefined, { maxRecentReports: 500, - searchTerm: SEARCH_VALUE, + isSearching: true, }), ); }); - test('[OptionsListUtils] getSearchOptions with searchTerm', async () => { + test('[OptionsListUtils] getSearchOptions with isSearching is true', async () => { await waitForBatchedUpdates(); const optionLists = createFilteredOptionList(personalDetails, mockedReportsMap, undefined, EMPTY_PRIVATE_IS_ARCHIVED_MAP, undefined, { maxRecentReports: 500, - searchTerm: SEARCH_VALUE, + isSearching: true, }); await measureFunction(() => diff --git a/tests/ui/components/SearchAutocompleteListTest.tsx b/tests/ui/components/SearchAutocompleteListTest.tsx index 0d8463c5b9dc..59f3dd186e3f 100644 --- a/tests/ui/components/SearchAutocompleteListTest.tsx +++ b/tests/ui/components/SearchAutocompleteListTest.tsx @@ -34,18 +34,20 @@ jest.mock('@hooks/useResponsiveLayout', () => ({ })), })); -jest.mock('@components/OptionListContextProvider', () => { - const ActualReact = jest.requireActual('react'); - return { - useOptionsList: jest.fn(() => ({ - options: {}, - areOptionsInitialized: true, - })), - OptionsListStateContext: ActualReact.createContext({ - areOptionsInitialized: true, - }), - }; -}); +jest.mock('@hooks/useFilteredOptions', () => ({ + // eslint-disable-next-line @typescript-eslint/naming-convention + __esModule: true, + default: jest.fn(() => ({ + options: { + reports: [], + personalDetails: [], + }, + isLoading: false, + loadMore: jest.fn(), + hasMore: false, + isLoadingMore: false, + })), +})); jest.mock('@libs/OptionsListUtils', () => ({ getSearchOptions: jest.fn(() => ({ diff --git a/tests/unit/OptionsListUtilsTest.tsx b/tests/unit/OptionsListUtilsTest.tsx index 79a7807d2506..1a297953ea69 100644 --- a/tests/unit/OptionsListUtilsTest.tsx +++ b/tests/unit/OptionsListUtilsTest.tsx @@ -7045,14 +7045,14 @@ describe('OptionsListUtils', () => { expect(result).toBeDefined(); }); - it('should handle searchTerm filtering', () => { - const result = createFilteredOptionList(PERSONAL_DETAILS, REPORTS, undefined, {}, undefined, {searchTerm: 'Spider'}); + it('should handle isSearching filtering', () => { + const result = createFilteredOptionList(PERSONAL_DETAILS, REPORTS, undefined, {}, undefined, {isSearching: true}); expect(result).toBeDefined(); expect(result.reports.length).toBe(Object.keys(REPORTS).length); }); - it('should return all reports when searchTerm is provided (isSearching is true)', () => { + it('should return all reports when isSearching is true', () => { const result = createFilteredOptionList( PERSONAL_DETAILS, REPORTS, @@ -7060,7 +7060,7 @@ describe('OptionsListUtils', () => { {}, {}, { - searchTerm: 'Report', + isSearching: true, maxRecentReports: 2, }, );