forked from Expensify/App
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request Expensify#42410 from software-mansion-labs/search-…
…v1-p2/report-list-item [No QA][Search v1] Create ReportListItem
- Loading branch information
Showing
17 changed files
with
861 additions
and
486 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
54 changes: 54 additions & 0 deletions
54
src/components/SelectionList/Search/ExpenseItemHeaderNarrow.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
import React, {memo} from 'react'; | ||
import {View} from 'react-native'; | ||
import Button from '@components/Button'; | ||
import Icon from '@components/Icon'; | ||
import * as Expensicons from '@components/Icon/Expensicons'; | ||
import useStyleUtils from '@hooks/useStyleUtils'; | ||
import useTheme from '@hooks/useTheme'; | ||
import useThemeStyles from '@hooks/useThemeStyles'; | ||
import variables from '@styles/variables'; | ||
import type {SearchAccountDetails} from '@src/types/onyx/SearchResults'; | ||
import UserInfoCell from './UserInfoCell'; | ||
|
||
type ExpenseItemHeaderNarrowProps = { | ||
participantFrom: SearchAccountDetails; | ||
participantTo: SearchAccountDetails; | ||
buttonText: string; | ||
onButtonPress: () => void; | ||
}; | ||
|
||
function ExpenseItemHeaderNarrow({participantFrom, participantTo, buttonText, onButtonPress}: ExpenseItemHeaderNarrowProps) { | ||
const styles = useThemeStyles(); | ||
const StyleUtils = useStyleUtils(); | ||
const theme = useTheme(); | ||
|
||
return ( | ||
<View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.justifyContentBetween, styles.mb2, styles.gap2]}> | ||
<View style={[styles.flexRow, styles.alignItemsCenter, styles.gap1, styles.flex1]}> | ||
<View style={[styles.mw50]}> | ||
<UserInfoCell participant={participantFrom} /> | ||
</View> | ||
<Icon | ||
src={Expensicons.ArrowRightLong} | ||
width={variables.iconSizeXXSmall} | ||
height={variables.iconSizeXXSmall} | ||
fill={theme.icon} | ||
/> | ||
<View style={[styles.flex1, styles.mw50]}> | ||
<UserInfoCell participant={participantTo} /> | ||
</View> | ||
</View> | ||
<View style={[StyleUtils.getWidthStyle(variables.w80)]}> | ||
<Button | ||
text={buttonText} | ||
onPress={onButtonPress} | ||
small | ||
pressOnEnter | ||
style={[styles.p0]} | ||
/> | ||
</View> | ||
</View> | ||
); | ||
} | ||
|
||
export default memo(ExpenseItemHeaderNarrow); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,159 @@ | ||
import React from 'react'; | ||
import {View} from 'react-native'; | ||
import Button from '@components/Button'; | ||
import BaseListItem from '@components/SelectionList/BaseListItem'; | ||
import type {ListItem, ReportListItemProps, ReportListItemType, TransactionListItemType} from '@components/SelectionList/types'; | ||
import Text from '@components/Text'; | ||
import TextWithTooltip from '@components/TextWithTooltip'; | ||
import useLocalize from '@hooks/useLocalize'; | ||
import useStyleUtils from '@hooks/useStyleUtils'; | ||
import useThemeStyles from '@hooks/useThemeStyles'; | ||
import useWindowDimensions from '@hooks/useWindowDimensions'; | ||
import * as CurrencyUtils from '@libs/CurrencyUtils'; | ||
import Navigation from '@libs/Navigation/Navigation'; | ||
import {getSearchParams} from '@libs/SearchUtils'; | ||
import CONST from '@src/CONST'; | ||
import ROUTES from '@src/ROUTES'; | ||
import ExpenseItemHeaderNarrow from './ExpenseItemHeaderNarrow'; | ||
import TransactionListItem from './TransactionListItem'; | ||
import TransactionListItemRow from './TransactionListItemRow'; | ||
|
||
function ReportListItem<TItem extends ListItem>({ | ||
item, | ||
isFocused, | ||
showTooltip, | ||
isDisabled, | ||
canSelectMultiple, | ||
onSelectRow, | ||
onDismissError, | ||
shouldPreventDefaultFocusOnSelectRow, | ||
onFocus, | ||
shouldSyncFocus, | ||
}: ReportListItemProps<TItem>) { | ||
const reportItem = item as unknown as ReportListItemType; | ||
|
||
const styles = useThemeStyles(); | ||
const {translate} = useLocalize(); | ||
const {isLargeScreenWidth} = useWindowDimensions(); | ||
const StyleUtils = useStyleUtils(); | ||
|
||
const listItemPressableStyle = [styles.selectionListPressableItemWrapper, styles.pv3, item.isSelected && styles.activeComponentBG, isFocused && styles.sidebarLinkActive]; | ||
|
||
const handleOnButtonPress = () => { | ||
onSelectRow(item); | ||
}; | ||
|
||
const openReportInRHP = (transactionItem: TransactionListItemType) => { | ||
const searchParams = getSearchParams(); | ||
const currentQuery = searchParams && `query` in searchParams ? (searchParams?.query as string) : CONST.TAB_SEARCH.ALL; | ||
Navigation.navigate(ROUTES.SEARCH_REPORT.getRoute(currentQuery, transactionItem.transactionThreadReportID)); | ||
}; | ||
|
||
const totalCell = ( | ||
<TextWithTooltip | ||
shouldShowTooltip={showTooltip} | ||
text={CurrencyUtils.convertToDisplayString(reportItem?.total, reportItem?.currency)} | ||
style={[styles.optionDisplayName, styles.textNewKansasNormal, styles.pre, styles.justifyContentCenter, isLargeScreenWidth ? undefined : styles.textAlignRight]} | ||
/> | ||
); | ||
|
||
const actionCell = ( | ||
<Button | ||
text={translate('common.view')} | ||
onPress={handleOnButtonPress} | ||
small | ||
pressOnEnter | ||
style={[styles.p0]} | ||
/> | ||
); | ||
|
||
if (!reportItem?.reportName && reportItem.transactions.length > 1) { | ||
return null; | ||
} | ||
|
||
const participantFrom = reportItem.transactions[0].from; | ||
const participantTo = reportItem.transactions[0].to; | ||
|
||
if (reportItem.transactions.length === 1) { | ||
const transactionItem = reportItem.transactions[0]; | ||
|
||
return ( | ||
<TransactionListItem | ||
item={transactionItem as unknown as TItem} | ||
isFocused={isFocused} | ||
showTooltip={showTooltip} | ||
isDisabled={isDisabled} | ||
canSelectMultiple={canSelectMultiple} | ||
onSelectRow={() => openReportInRHP(transactionItem)} | ||
onDismissError={onDismissError} | ||
shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow} | ||
onFocus={onFocus} | ||
shouldSyncFocus={shouldSyncFocus} | ||
/> | ||
); | ||
} | ||
|
||
return ( | ||
<BaseListItem | ||
item={item} | ||
pressableStyle={listItemPressableStyle} | ||
wrapperStyle={[styles.flexRow, styles.flex1, styles.justifyContentBetween, styles.userSelectNone, styles.alignItemsCenter]} | ||
containerStyle={[styles.mb3]} | ||
isFocused={isFocused} | ||
isDisabled={isDisabled} | ||
showTooltip={showTooltip} | ||
canSelectMultiple={canSelectMultiple} | ||
onSelectRow={onSelectRow} | ||
onDismissError={onDismissError} | ||
shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow} | ||
errors={item.errors} | ||
pendingAction={item.pendingAction} | ||
keyForList={item.keyForList} | ||
onFocus={onFocus} | ||
shouldSyncFocus={shouldSyncFocus} | ||
hoverStyle={item.isSelected && styles.activeComponentBG} | ||
> | ||
<View style={styles.flex1}> | ||
{!isLargeScreenWidth && ( | ||
<ExpenseItemHeaderNarrow | ||
participantFrom={participantFrom} | ||
participantTo={participantTo} | ||
buttonText={translate('common.view')} | ||
onButtonPress={handleOnButtonPress} | ||
/> | ||
)} | ||
<View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}> | ||
<View style={[styles.flexRow, styles.flex1, styles.alignItemsCenter, styles.justifyContentBetween]}> | ||
<View style={[styles.flexRow, styles.alignItemsCenter, styles.flex2]}> | ||
<View style={[styles.flexShrink1]}> | ||
<Text style={[styles.reportListItemTitle]}>{reportItem?.reportName}</Text> | ||
<Text style={[styles.textMicroSupporting]}>{`${reportItem.transactions.length} ${translate('search.groupedExpenses')}`}</Text> | ||
</View> | ||
</View> | ||
<View style={[styles.flexRow, styles.flex1, styles.justifyContentEnd]}>{totalCell}</View> | ||
</View> | ||
{/** styles.reportListItemActionButtonMargin added here to move the action button by the type column distance */} | ||
{isLargeScreenWidth && ( | ||
<View style={[StyleUtils.getSearchTableColumnStyles(CONST.SEARCH_TABLE_COLUMNS.ACTION), styles.reportListItemActionButtonMargin]}>{actionCell}</View> | ||
)} | ||
</View> | ||
<View style={[styles.mt3, styles.reportListItemSeparator]} /> | ||
{reportItem.transactions.map((transaction) => ( | ||
<TransactionListItemRow | ||
item={transaction} | ||
showTooltip={showTooltip} | ||
onButtonPress={() => { | ||
openReportInRHP(transaction); | ||
}} | ||
showItemHeaderOnNarrowLayout={false} | ||
containerStyle={styles.mt3} | ||
/> | ||
))} | ||
</View> | ||
</BaseListItem> | ||
); | ||
} | ||
|
||
ReportListItem.displayName = 'ReportListItem'; | ||
|
||
export default ReportListItem; |
File renamed without changes.
68 changes: 68 additions & 0 deletions
68
src/components/SelectionList/Search/TransactionListItem.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
import React from 'react'; | ||
import BaseListItem from '@components/SelectionList/BaseListItem'; | ||
import type {ListItem, TransactionListItemProps, TransactionListItemType} from '@components/SelectionList/types'; | ||
import useThemeStyles from '@hooks/useThemeStyles'; | ||
import useWindowDimensions from '@hooks/useWindowDimensions'; | ||
import TransactionListItemRow from './TransactionListItemRow'; | ||
|
||
function TransactionListItem<TItem extends ListItem>({ | ||
item, | ||
isFocused, | ||
showTooltip, | ||
isDisabled, | ||
canSelectMultiple, | ||
onSelectRow, | ||
onDismissError, | ||
shouldPreventDefaultFocusOnSelectRow, | ||
onFocus, | ||
shouldSyncFocus, | ||
}: TransactionListItemProps<TItem>) { | ||
const transactionItem = item as unknown as TransactionListItemType; | ||
const styles = useThemeStyles(); | ||
|
||
const {isLargeScreenWidth} = useWindowDimensions(); | ||
|
||
const listItemPressableStyle = [styles.selectionListPressableItemWrapper, styles.pv3, item.isSelected && styles.activeComponentBG, isFocused && styles.sidebarLinkActive]; | ||
|
||
const listItemWrapperStyle = [ | ||
styles.flex1, | ||
styles.userSelectNone, | ||
isLargeScreenWidth ? {...styles.flexRow, ...styles.justifyContentBetween, ...styles.alignItemsCenter} : {...styles.flexColumn, ...styles.alignItemsStretch}, | ||
]; | ||
|
||
return ( | ||
<BaseListItem | ||
item={item} | ||
pressableStyle={listItemPressableStyle} | ||
wrapperStyle={listItemWrapperStyle} | ||
containerStyle={[styles.mb3]} | ||
isFocused={isFocused} | ||
isDisabled={isDisabled} | ||
showTooltip={showTooltip} | ||
canSelectMultiple={canSelectMultiple} | ||
onSelectRow={onSelectRow} | ||
onDismissError={onDismissError} | ||
shouldPreventDefaultFocusOnSelectRow={shouldPreventDefaultFocusOnSelectRow} | ||
errors={item.errors} | ||
pendingAction={item.pendingAction} | ||
keyForList={item.keyForList} | ||
onFocus={onFocus} | ||
shouldSyncFocus={shouldSyncFocus} | ||
hoverStyle={item.isSelected && styles.activeComponentBG} | ||
> | ||
{() => ( | ||
<TransactionListItemRow | ||
item={transactionItem} | ||
showTooltip={showTooltip} | ||
onButtonPress={() => { | ||
onSelectRow(item); | ||
}} | ||
/> | ||
)} | ||
</BaseListItem> | ||
); | ||
} | ||
|
||
TransactionListItem.displayName = 'TransactionListItem'; | ||
|
||
export default TransactionListItem; |
Oops, something went wrong.