Skip to content
Merged
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
17 changes: 9 additions & 8 deletions src/components/Search/SearchFiltersChatsSelector.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import passthroughPolicyTagListSelector from '@selectors/PolicyTagList';
import React, {useEffect, useState} from 'react';
import {usePersonalDetails} from '@components/OnyxListItemProvider';
import {useOptionsList} from '@components/OptionListContextProvider';
import InviteMemberListItem from '@components/SelectionList/ListItem/InviteMemberListItem';
import SelectionListWithSections from '@components/SelectionList/SelectionListWithSections';
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
import useDebouncedState from '@hooks/useDebouncedState';
import useFilteredOptions from '@hooks/useFilteredOptions';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import usePrivateIsArchivedMap from '@hooks/usePrivateIsArchivedMap';
Expand Down Expand Up @@ -47,8 +47,10 @@ function SearchFiltersChatsSelector({initialReportIDs, onFiltersUpdate, isScreen
const {translate} = useLocalize();
const personalDetails = usePersonalDetails();
const {didScreenTransitionEnd} = useScreenWrapperTransitionStatus();
const {options, areOptionsInitialized} = useOptionsList({
shouldInitialize: didScreenTransitionEnd,
const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
const {options: listOptions, isLoading} = useFilteredOptions({
enabled: didScreenTransitionEnd,
isSearching: !!debouncedSearchTerm.trim(),
});

const [reports] = useOnyx(ONYXKEYS.COLLECTION.REPORT);
Expand All @@ -63,7 +65,6 @@ function SearchFiltersChatsSelector({initialReportIDs, onFiltersUpdate, isScreen
const [isSearchingForReports] = useOnyx(ONYXKEYS.RAM_ONLY_IS_SEARCHING_FOR_REPORTS);
const reportAttributesDerived = useReportAttributes();
const [selectedReportIDs, setSelectedReportIDs] = useState<string[]>(initialReportIDs);
const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState('');
const cleanSearchTerm = searchTerm.trim().toLowerCase();
const [draftComments] = useOnyx(ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT);
const privateIsArchivedMap = usePrivateIsArchivedMap();
Expand All @@ -83,10 +84,10 @@ function SearchFiltersChatsSelector({initialReportIDs, onFiltersUpdate, isScreen
});

const defaultOptions =
!areOptionsInitialized || !isScreenTransitionEnd
isLoading || !isScreenTransitionEnd || !listOptions
? defaultListOptions
: getSearchOptions({
options,
options: listOptions,
draftComments,
nvpDismissedProductTraining,
betas: undefined,
Expand All @@ -108,7 +109,7 @@ function SearchFiltersChatsSelector({initialReportIDs, onFiltersUpdate, isScreen

const sections: SelectionListSections = [];

if (areOptionsInitialized) {
if (!isLoading) {
const formattedResults = formatSectionsFromSearchTerm(
cleanSearchTerm,
selectedOptions,
Expand Down Expand Up @@ -175,7 +176,7 @@ function SearchFiltersChatsSelector({initialReportIDs, onFiltersUpdate, isScreen
);

const isLoadingNewOptions = !!isSearchingForReports;
const shouldShowLoadingPlaceholder = !didScreenTransitionEnd || !areOptionsInitialized || !initialReportIDs || !personalDetails;
const shouldShowLoadingPlaceholder = !didScreenTransitionEnd || isLoading || !initialReportIDs || !personalDetails;

const textInputOptions = {
value: searchTerm,
Expand Down
Loading