Skip to content
Open
Show file tree
Hide file tree
Changes from 6 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
49 changes: 34 additions & 15 deletions src/components/Search/SearchPageHeader/SearchFiltersBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import type {SearchAdvancedFiltersKey} from '@src/types/form/SearchAdvancedFilte
import type {Icon} from '@src/types/onyx/OnyxCommon';
import {getEmptyObject} from '@src/types/utils/EmptyObject';
import type WithSentryLabel from '@src/types/utils/SentryLabel';
import SearchFiltersBarCreateButton from './SearchFiltersBarCreateButton';

type FilterItem = WithSentryLabel & {
label: string;
Expand Down Expand Up @@ -719,24 +720,42 @@ function SearchFiltersBar({queryJSON, isMobileSelectionModeEnabled}: SearchFilte
}

return (
<View style={[shouldShowSelectedDropdown && styles.ph5, styles.mb2, styles.searchFiltersBarContainer]}>
<View style={[shouldShowSelectedDropdown && styles.ph5, styles.mb2, styles.searchFiltersBarContainer, !shouldUseNarrowLayout && styles.gap5]}>
{shouldShowSelectedDropdown ? (
<SearchBulkActionsButton queryJSON={queryJSON} />
) : (
<FlatList
horizontal
keyboardShouldPersistTaps="always"
style={[styles.flexRow, styles.overflowScroll, styles.flexGrow0]}
contentContainerStyle={[styles.flexRow, styles.flexGrow0, styles.gap2, styles.ph5]}
ref={scrollRef}
showsHorizontalScrollIndicator={false}
data={filters}
keyExtractor={(item) => item.label}
renderItem={renderFilterItem}
ListFooterComponent={renderListFooter}
onEndReached={adjustScroll}
onEndReachedThreshold={0.75}
/>
<>
{shouldUseNarrowLayout ? (
<FlatList
horizontal
keyboardShouldPersistTaps="always"
style={[styles.flexRow, styles.overflowScroll, styles.flexGrow0]}
contentContainerStyle={[styles.flexRow, styles.flexGrow0, styles.gap2, styles.ph5]}
ref={scrollRef}
showsHorizontalScrollIndicator={false}
data={filters}
keyExtractor={(item) => item.label}
renderItem={renderFilterItem}
ListFooterComponent={renderListFooter}
onEndReached={adjustScroll}
onEndReachedThreshold={0.75}
/>
) : (
<View style={[styles.flexRow, styles.flexWrap, styles.flexShrink1, styles.gap2, styles.ph5]}>
{filters.map((item) => (
<DropdownButton
key={item.label}
label={item.label}
value={item.value}
PopoverComponent={item.PopoverComponent}
sentryLabel={item.sentryLabel}
/>
))}
{renderListFooter()}
</View>
)}
{!shouldUseNarrowLayout && <SearchFiltersBarCreateButton />}
</>
)}
</View>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,119 @@
import {emailSelector} from '@selectors/Session';
import React, {useCallback, useMemo, useRef, useState} from 'react';
import {View} from 'react-native';
import type {OnyxCollection} from 'react-native-onyx';
import Button from '@components/Button';
import type {PopoverMenuItem} from '@components/PopoverMenu';
import PopoverMenu from '@components/PopoverMenu';
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
import useLocalize from '@hooks/useLocalize';
import useOnyx from '@hooks/useOnyx';
import usePopoverPosition from '@hooks/usePopoverPosition';
import useThemeStyles from '@hooks/useThemeStyles';
import {startDistanceRequest, startMoneyRequest} from '@libs/actions/IOU';
import getIconForAction from '@libs/getIconForAction';
import interceptAnonymousUser from '@libs/interceptAnonymousUser';
import Navigation from '@libs/Navigation/Navigation';
import {areAllGroupPoliciesExpenseChatDisabled} from '@libs/PolicyUtils';
import {generateReportID} from '@libs/ReportUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
import {groupPaidPoliciesWithExpenseChatEnabledSelector} from '@src/selectors/Policy';
import type * as OnyxTypes from '@src/types/onyx';

function SearchFiltersBarCreateButton() {
const styles = useThemeStyles();
const {translate} = useLocalize();
const expensifyIcons = useMemoizedLazyExpensifyIcons(['Plus', 'Location', 'Document', 'Receipt', 'Coins', 'Cash', 'Transfer', 'MoneyCircle']);

const createButtonRef = useRef<View>(null);
const [isCreateMenuActive, setIsCreateMenuActive] = useState(false);
const [createMenuPosition, setCreateMenuPosition] = useState<{horizontal: number; vertical: number}>({horizontal: 0, vertical: 0});
const {calculatePopoverPosition} = usePopoverPosition();

const [email] = useOnyx(ONYXKEYS.SESSION, {selector: emailSelector});
const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY);

const groupPaidPoliciesWithChatEnabledSelector = useCallback((policies: OnyxCollection<OnyxTypes.Policy>) => groupPaidPoliciesWithExpenseChatEnabledSelector(policies, email), [email]);
const [groupPoliciesWithChatEnabled = CONST.EMPTY_ARRAY] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: groupPaidPoliciesWithChatEnabledSelector}, [email]);
const shouldRedirectToExpensifyClassic = useMemo(() => areAllGroupPoliciesExpenseChatDisabled(allPolicies ?? {}), [allPolicies]);
const shouldShowCreateReportOption = shouldRedirectToExpensifyClassic || groupPoliciesWithChatEnabled.length > 0;

const hideCreateMenu = useCallback(() => setIsCreateMenuActive(false), []);
const showCreateMenu = useCallback(() => {
if (!createButtonRef.current) {
return;
}
calculatePopoverPosition(createButtonRef, {
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
}).then((position) => {
setCreateMenuPosition(position);
setIsCreateMenuActive(true);
});
}, [calculatePopoverPosition]);

const createMenuItems = useMemo(
(): PopoverMenuItem[] => [
{
icon: getIconForAction(CONST.IOU.TYPE.CREATE, expensifyIcons),
text: translate('iou.createExpense'),
onSelected: () =>
interceptAnonymousUser(() => {
startMoneyRequest(CONST.IOU.TYPE.CREATE, generateReportID());
}),
},
{
icon: expensifyIcons.Location,
text: translate('iou.trackDistance'),
onSelected: () =>
interceptAnonymousUser(() => {
startDistanceRequest(CONST.IOU.TYPE.CREATE, generateReportID());
}),
},
...(shouldShowCreateReportOption
? [
{
icon: expensifyIcons.Document,
text: translate('report.newReport.createReport'),
onSelected: () =>
interceptAnonymousUser(() => {
Navigation.navigate(ROUTES.NEW_REPORT_WORKSPACE_SELECTION.getRoute());
}),
},
]
: []),
],
[translate, expensifyIcons, shouldShowCreateReportOption],
);

return (
<View style={[styles.pr5, styles.searchFiltersBarCreateButton]}>
<PopoverMenu
onClose={hideCreateMenu}
isVisible={isCreateMenuActive}
menuItems={createMenuItems}
onItemSelected={hideCreateMenu}
anchorRef={createButtonRef}
anchorPosition={createMenuPosition}
anchorAlignment={{
horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
}}
/>
<Button
ref={createButtonRef}
success
small
icon={expensifyIcons.Plus}
text={translate('common.create')}
onPress={showCreateMenu}
/>
</View>
);
}

SearchFiltersBarCreateButton.displayName = 'SearchFiltersBarCreateButton';

export default SearchFiltersBarCreateButton;
5 changes: 5 additions & 0 deletions src/styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4830,6 +4830,11 @@ const staticStyles = (theme: ThemeColors) =>
alignItems: 'center',
},

searchFiltersBarCreateButton: {
marginLeft: 'auto',
alignSelf: 'flex-start',
},

walletStaticIllustration: {
width: 262,
height: 152,
Expand Down
Loading