Skip to content
5 changes: 3 additions & 2 deletions src/components/Search/FilterDropdowns/DropdownButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
import type WithSentryLabel from '@src/types/utils/SentryLabel';

type PopoverComponentProps = {
isExpanded: boolean;
closeOverlay: () => void;
};

Expand Down Expand Up @@ -122,8 +123,8 @@ function DropdownButton({label, value, viewportOffsetTop, PopoverComponent, medi
}, [isSmallScreenWidth, styles]);

const popoverContent = useMemo(() => {
return PopoverComponent({closeOverlay: toggleOverlay});
}, [PopoverComponent, toggleOverlay]);
return PopoverComponent({closeOverlay: toggleOverlay, isExpanded: isOverlayVisible});
}, [PopoverComponent, toggleOverlay, isOverlayVisible]);

return (
<View
Expand Down
38 changes: 30 additions & 8 deletions src/components/Search/FilterDropdowns/MultiSelectPopup.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, {useCallback, useMemo, useState} from 'react';
import {View} from 'react-native';
import ActivityIndicator from '@components/ActivityIndicator';
import Button from '@components/Button';
import SelectionList from '@components/SelectionList';
import MultiSelectListItem from '@components/SelectionList/ListItem/MultiSelectListItem';
Expand All @@ -8,8 +9,10 @@ import Text from '@components/Text';
import useDebouncedState from '@hooks/useDebouncedState';
import useLocalize from '@hooks/useLocalize';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
import type {SkeletonSpanReasonAttributes} from '@libs/telemetry/useSkeletonSpan';
import CONST from '@src/CONST';
import type {Icon} from '@src/types/onyx/OnyxCommon';

Expand Down Expand Up @@ -40,11 +43,16 @@ type MultiSelectPopupProps<T> = {

/** Search input placeholder. Defaults to 'common.search' when not provided. */
searchPlaceholder?: string;

/** Whether the data for the popover is loading */
loading?: boolean;
};

function MultiSelectPopup<T extends string>({label, value, items, closeOverlay, onChange, isSearchable, searchPlaceholder}: MultiSelectPopupProps<T>) {
function MultiSelectPopup<T extends string>({label, loading, value, items, closeOverlay, onChange, isSearchable, searchPlaceholder}: MultiSelectPopupProps<T>) {
const theme = useTheme();
const {translate} = useLocalize();
const styles = useThemeStyles();

// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
const {isSmallScreenWidth} = useResponsiveLayout();
const {windowHeight} = useWindowDimensions();
Expand Down Expand Up @@ -99,18 +107,32 @@ function MultiSelectPopup<T extends string>({label, value, items, closeOverlay,
[searchTerm, isSearchable, searchPlaceholder, translate, setSearchTerm, headerMessage],
);

const reasonAttributes: SkeletonSpanReasonAttributes = {context: 'MultiSelectPopupDataLoading'};

return (
<View style={[!isSmallScreenWidth && styles.pv4, styles.gap2]}>
{isSmallScreenWidth && <Text style={[styles.textLabel, styles.textSupporting, styles.ph5, styles.pv1]}>{label}</Text>}

<View style={[styles.getSelectionListPopoverHeight(listData.length || 1, windowHeight, isSearchable ?? false)]}>
<SelectionList
shouldSingleExecuteRowSelect
data={listData}
ListItem={MultiSelectListItem}
onSelectRow={updateSelectedItems}
textInputOptions={textInputOptions}
/>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

{loading ? (
    <View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter]}>
        <ActivityIndicator
            size={CONST.ACTIVITY_INDICATOR_SIZE.SMALL}
            color={theme.spinner}
            reasonAttributes={reasonAttributes}
        />
    </View>
) :(
    <SelectionList
        shouldSingleExecuteRowSelect
        data={listData}
        ListItem={MultiSelectListItem}
        onSelectRow={updateSelectedItems}
        textInputOptions={textInputOptions}
    />
)}

NAB, but this is a bit more readable

{!!loading && (
Comment thread
JS00001 marked this conversation as resolved.
Resolved
<View style={[styles.flex1, styles.justifyContentCenter, styles.alignItemsCenter]}>
<ActivityIndicator
size={CONST.ACTIVITY_INDICATOR_SIZE.SMALL}
color={theme.spinner}
reasonAttributes={reasonAttributes}
/>
</View>
)}

{!loading && (
<SelectionList
shouldSingleExecuteRowSelect
data={listData}
ListItem={MultiSelectListItem}
onSelectRow={updateSelectedItems}
textInputOptions={textInputOptions}
/>
)}
</View>

<View style={[styles.flexRow, styles.gap2, styles.ph5]}>
Expand Down
43 changes: 43 additions & 0 deletions src/components/Search/SearchPageHeader/FeedFilterPopup.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import React, {useEffect} from 'react';
import type {MultiSelectItem} from '@components/Search/FilterDropdowns/MultiSelectPopup';
import useNetwork from '@hooks/useNetwork';
import useOnyx from '@hooks/useOnyx';
import {openSearchCardFiltersPage} from '@libs/actions/Search';
import ONYXKEYS from '@src/ONYXKEYS';
import MultiSelectFilterPopup from './MultiSelectFilterPopup';

type FeedFilterPopupProps = {
isExpanded: boolean;
items: Array<MultiSelectItem<string>>;
value: Array<MultiSelectItem<string>>;
closeOverlay: () => void;
onChangeCallback: (items: Array<MultiSelectItem<string>>) => void;
};

function FeedFilterPopup({closeOverlay, items, value, isExpanded, onChangeCallback}: FeedFilterPopupProps) {
const {isOffline} = useNetwork();
const [areCardsLoaded] = useOnyx(ONYXKEYS.IS_SEARCH_FILTERS_CARD_DATA_LOADED);

useEffect(() => {
if (isOffline || !isExpanded) {
return;
}
openSearchCardFiltersPage();
}, [isOffline, isExpanded]);

const shouldShowLoadingState = !areCardsLoaded && !isOffline;

return (
<MultiSelectFilterPopup
items={items}
value={value}
isExpanded={isExpanded}
loading={shouldShowLoadingState}
translationKey="search.filters.feed"
closeOverlay={closeOverlay}
onChangeCallback={onChangeCallback}
/>
);
}

export default FeedFilterPopup;
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,22 @@ import useLocalize from '@hooks/useLocalize';
import type {TranslationPaths} from '@src/languages/types';

type MultiSelectFilterPopupProps<T extends string> = PopoverComponentProps & {
loading?: boolean;
translationKey: TranslationPaths;
items: Array<MultiSelectItem<T>>;
value: Array<MultiSelectItem<T>>;
onChangeCallback: (selectedItems: Array<MultiSelectItem<T>>) => void;
isSearchable?: boolean;
};

function MultiSelectFilterPopup<T extends string>({closeOverlay, translationKey, items, value, onChangeCallback, isSearchable}: MultiSelectFilterPopupProps<T>) {
function MultiSelectFilterPopup<T extends string>({closeOverlay, loading, translationKey, items, value, onChangeCallback, isSearchable}: MultiSelectFilterPopupProps<T>) {
const {translate} = useLocalize();
return (
<MultiSelectPopup
label={translate(translationKey)}
items={items}
value={value}
loading={loading}
closeOverlay={closeOverlay}
onChange={onChangeCallback}
isSearchable={isSearchable}
Expand Down
32 changes: 27 additions & 5 deletions src/components/Search/SearchPageHeader/useSearchActionsBar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, {useEffect} from 'react';
import type {ReactNode} from 'react';
import type {OnyxCollection} from 'react-native-onyx';
import type {PopoverComponentProps} from '@components/Search/FilterDropdowns/DropdownButton';
Expand All @@ -18,6 +18,7 @@ import useOnyx from '@hooks/useOnyx';
import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useThemeStyles from '@hooks/useThemeStyles';
import {close} from '@libs/actions/Modal';
import {openSearchCardFiltersPage} from '@libs/actions/Search';
import Navigation from '@libs/Navigation/Navigation';
import {buildFilterQueryWithSortDefaults} from '@libs/SearchQueryUtils';
import {filterValidHasValues, getFeedOptions, getGroupCurrencyOptions, getHasOptions, getStatusOptions, getWithdrawalTypeOptions, mapFiltersFormToLabelValueList} from '@libs/SearchUIUtils';
Expand Down Expand Up @@ -104,25 +105,39 @@ function GroupCurrencyPopup({updateFilterForm, closeOverlay}: FilterBarPopupProp
);
}

function FeedPopup({updateFilterForm, closeOverlay}: FilterBarPopupProps) {
function FeedPopup({updateFilterForm, closeOverlay, isExpanded}: FilterBarPopupProps) {
const {isOffline} = useNetwork();
const {translate, localeCompare} = useLocalize();
const feedKeysWithCards = useFeedKeysWithAssignedCards();

const [feed] = useOnyx(ONYXKEYS.FORMS.SEARCH_ADVANCED_FILTERS_FORM, {selector: filterFeedSelector});
const [personalAndWorkspaceCards] = useOnyx(ONYXKEYS.DERIVED.PERSONAL_AND_WORKSPACE_CARD_LIST);
const [allFeeds] = useOnyx(ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER);
const [areCardsLoaded] = useOnyx(ONYXKEYS.IS_SEARCH_FILTERS_CARD_DATA_LOADED);

useEffect(() => {
if (isOffline || !isExpanded) {
return;
}
openSearchCardFiltersPage();
}, [isOffline, isExpanded]);

const updateFeedFilterForm = (items: Array<MultiSelectItem<string>>) => {
updateFilterForm({feed: items.map((item) => item.value)});
};

const feedOptions = getFeedOptions(allFeeds, personalAndWorkspaceCards, translate, localeCompare, feedKeysWithCards);
const feedValue = feed ? feedOptions.filter((option) => feed.includes(option.value)) : [];
const shouldShowLoadingState = !areCardsLoaded && !isOffline;

return (
<MultiSelectFilterPopup
isExpanded={isExpanded}
closeOverlay={closeOverlay}
translationKey="search.filters.feed"
items={feedOptions}
value={feedValue}
loading={shouldShowLoadingState}
onChangeCallback={updateFeedFilterForm}
/>
);
Expand Down Expand Up @@ -177,6 +192,7 @@ function makeDateFilterItem(
return {
PopoverComponent: (props) => (
<DatePickerFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
filterKey={filterKey}
value={value}
Expand Down Expand Up @@ -239,8 +255,9 @@ function useSearchActionsBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn
switch (filterKey) {
case FILTER_KEYS.GROUP_CURRENCY:
return {
PopoverComponent: ({closeOverlay}) => (
PopoverComponent: ({closeOverlay, isExpanded}) => (
<GroupCurrencyPopup
isExpanded={isExpanded}
updateFilterForm={updateFilterForm}
closeOverlay={closeOverlay}
/>
Expand All @@ -256,6 +273,7 @@ function useSearchActionsBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn
};
const hasComponent = (props: PopoverComponentProps) => (
<MultiSelectFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
translationKey="search.has"
items={hasOptions}
Expand All @@ -274,6 +292,7 @@ function useSearchActionsBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn
};
const isComponent = (props: PopoverComponentProps) => (
<MultiSelectFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
translationKey="search.filters.is"
items={isOptions}
Expand All @@ -285,8 +304,9 @@ function useSearchActionsBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn
}
case FILTER_KEYS.FEED: {
return {
PopoverComponent: ({closeOverlay}) => (
PopoverComponent: ({closeOverlay, isExpanded}) => (
<FeedPopup
isExpanded={isExpanded}
updateFilterForm={updateFilterForm}
closeOverlay={closeOverlay}
/>
Expand Down Expand Up @@ -343,6 +363,7 @@ function useSearchActionsBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn
};
const statusComponent = (props: PopoverComponentProps) => (
<MultiSelectFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
translationKey="common.status"
items={statusOptions}
Expand Down Expand Up @@ -377,8 +398,9 @@ function useSearchActionsBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn
}
case FILTER_KEYS.POLICY_ID:
return {
PopoverComponent: ({closeOverlay}) => (
PopoverComponent: ({closeOverlay, isExpanded}) => (
<WorkspacePopup
isExpanded={isExpanded}
policyIDQuery={queryJSON.policyID}
updateFilterForm={updateFilterForm}
closeOverlay={closeOverlay}
Expand Down
11 changes: 9 additions & 2 deletions src/components/Search/SearchPageHeader/useSearchFiltersBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ import {getEmptyObject} from '@src/types/utils/EmptyObject';
import type IconAsset from '@src/types/utils/IconAsset';
import type WithSentryLabel from '@src/types/utils/SentryLabel';
import DatePickerFilterPopup from './DatePickerFilterPopup';
import FeedFilterPopup from './FeedFilterPopup';
import MultiSelectFilterPopup from './MultiSelectFilterPopup';

type FilterItem = WithSentryLabel & {
Expand Down Expand Up @@ -328,9 +329,9 @@ function useSearchFiltersBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn
updateFilterForm({feed: items.map((item) => item.value)});
};
const feedComponent = (props: PopoverComponentProps) => (
<MultiSelectFilterPopup
<FeedFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
translationKey="search.filters.feed"
items={feedOptions}
value={feed}
onChangeCallback={updateFeedFilterForm}
Expand All @@ -339,6 +340,7 @@ function useSearchFiltersBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn

const datePickerComponent = (props: PopoverComponentProps) => (
<DatePickerFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
filterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.DATE}
value={date}
Expand All @@ -349,6 +351,7 @@ function useSearchFiltersBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn

const postedPickerComponent = (props: PopoverComponentProps) => (
<DatePickerFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
filterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.POSTED}
value={posted}
Expand All @@ -359,6 +362,7 @@ function useSearchFiltersBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn

const withdrawnPickerComponent = (props: PopoverComponentProps) => (
<DatePickerFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
filterKey={CONST.SEARCH.SYNTAX_FILTER_KEYS.WITHDRAWN}
value={withdrawn}
Expand All @@ -383,6 +387,7 @@ function useSearchFiltersBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn
};
const statusComponent = (props: PopoverComponentProps) => (
<MultiSelectFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
translationKey="common.status"
items={statusOptions}
Expand All @@ -396,6 +401,7 @@ function useSearchFiltersBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn
};
const hasComponent = (props: PopoverComponentProps) => (
<MultiSelectFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
translationKey="search.has"
items={hasOptions}
Expand All @@ -409,6 +415,7 @@ function useSearchFiltersBar(queryJSON: SearchQueryJSON, isMobileSelectionModeEn
};
const isComponent = (props: PopoverComponentProps) => (
<MultiSelectFilterPopup
isExpanded={props.isExpanded}
closeOverlay={props.closeOverlay}
translationKey="search.filters.is"
items={isOptions}
Expand Down
Loading