Skip to content
Merged
Show file tree
Hide file tree
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
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,15 @@ type MoneyRequestReportTransactionItemProps = {
shouldScrollHorizontally?: boolean;
};

function MoneyRequestReportTransactionItem({
type MoneyRequestReportTransactionItemBodyProps = MoneyRequestReportTransactionItemProps & {
/** Inline-edit values from `useTransactionInlineEdit`. Undefined on narrow layouts where the hook is skipped. */
inlineEdit?: InlineEditValues;

/** Highlight animation style, computed by the parent so its state survives the narrow↔wide swap on resize. */
animatedHighlightStyle: ReturnType<typeof useAnimatedHighlightStyle>;
};

function MoneyRequestReportTransactionItemBody({
transaction,
report,
policy,
Expand All @@ -100,7 +108,9 @@ function MoneyRequestReportTransactionItem({
nonPersonalAndWorkspaceCards,
isLastItem = false,
shouldScrollHorizontally = false,
}: MoneyRequestReportTransactionItemProps) {
inlineEdit,
animatedHighlightStyle,
}: MoneyRequestReportTransactionItemBodyProps) {
const {translate} = useLocalize();
const styles = useThemeStyles();
const StyleUtils = useStyleUtils();
Expand All @@ -109,27 +119,15 @@ function MoneyRequestReportTransactionItem({
// eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
const {isSmallScreenWidth, isMediumScreenWidth} = useResponsiveLayout();
const {shouldUseNarrowLayout} = useResponsiveLayoutOnWideRHP();
const theme = useTheme();
const isPendingDelete = isTransactionPendingDelete(transaction);
const pendingAction = getTransactionPendingAction(transaction);
// Filter violations based on user visibility and dismissal state at the row level.
const filteredViolations = useTransactionViolations(transaction.transactionID);

const {
canEditDate,
canEditMerchant,
canEditDescription,
canEditCategory,
canEditAmount,
canEditTag,
onEditDate,
onEditMerchant,
onEditDescription,
onEditCategory,
onEditAmount,
onEditTag,
wasEditingOnMouseDownRef,
} = useTransactionInlineEdit({transactionID: transaction.transactionID});
// On narrow layouts `inlineEdit` is undefined (the parent skips the hook). The fallback ref
// keeps the press handler shape identical without ever being mutated on narrow.
const fallbackEditingOnMouseDownRef = useRef(false);
const wasEditingOnMouseDownRef = inlineEdit?.wasEditingOnMouseDownRef ?? fallbackEditingOnMouseDownRef;

const viewRef = useRef<View>(null);

Expand All @@ -143,14 +141,6 @@ function MoneyRequestReportTransactionItem({
});
}, [scrollToNewTransaction, shouldBeHighlighted]);

const animatedHighlightStyle = useAnimatedHighlightStyle({
borderRadius: shouldUseNarrowLayout ? variables.componentBorderRadius : 0,
shouldHighlight: shouldBeHighlighted,
highlightColor: theme.messageHighlightBG,
backgroundColor: theme.highlightBG,
shouldApplyOtherStyles: !shouldUseNarrowLayout,
});

return (
<OfflineWithFeedback
pendingAction={pendingAction}
Expand Down Expand Up @@ -218,23 +208,70 @@ function MoneyRequestReportTransactionItem({
isHover={hovered}
nonPersonalAndWorkspaceCards={nonPersonalAndWorkspaceCards}
shouldRemoveTotalColumnFlex={hasFlexColumn(columns)}
canEditDate={canEditDate}
canEditMerchant={canEditMerchant}
canEditDescription={canEditDescription}
canEditCategory={canEditCategory}
canEditAmount={canEditAmount}
canEditTag={canEditTag}
onEditDate={onEditDate}
onEditMerchant={onEditMerchant}
onEditDescription={onEditDescription}
onEditCategory={onEditCategory}
onEditAmount={onEditAmount}
onEditTag={onEditTag}
canEditDate={inlineEdit?.canEditDate}
canEditMerchant={inlineEdit?.canEditMerchant}
canEditDescription={inlineEdit?.canEditDescription}
canEditCategory={inlineEdit?.canEditCategory}
canEditAmount={inlineEdit?.canEditAmount}
canEditTag={inlineEdit?.canEditTag}
onEditDate={inlineEdit?.onEditDate}
onEditMerchant={inlineEdit?.onEditMerchant}
onEditDescription={inlineEdit?.onEditDescription}
onEditCategory={inlineEdit?.onEditCategory}
onEditAmount={inlineEdit?.onEditAmount}
onEditTag={inlineEdit?.onEditTag}
/>
)}
</PressableWithFeedback>
</OfflineWithFeedback>
);
}

type InlineEditValues = ReturnType<typeof useTransactionInlineEdit>;

function MoneyRequestReportTransactionItemWithInlineEdit(props: Omit<MoneyRequestReportTransactionItemBodyProps, 'inlineEdit'>) {
const inlineEdit = useTransactionInlineEdit({transactionID: props.transaction.transactionID});

return (
<MoneyRequestReportTransactionItemBody
{...props}
inlineEdit={inlineEdit}
/>
);
}

function MoneyRequestReportTransactionItem(props: MoneyRequestReportTransactionItemProps) {
const {isMediumScreenWidth} = useResponsiveLayout();
const {shouldUseNarrowLayout} = useResponsiveLayoutOnWideRHP();
const theme = useTheme();
// Mirrors the layout check inside TransactionItemRow so the narrow body never pays for useTransactionInlineEdit.
const isNarrowLayout = shouldUseNarrowLayout || (isMediumScreenWidth && !props.shouldScrollHorizontally);

// Hoisted out of the body so the highlight animation timeline survives the narrow↔wide
// component-type swap caused by browser resize.
const animatedHighlightStyle = useAnimatedHighlightStyle({
borderRadius: shouldUseNarrowLayout ? variables.componentBorderRadius : 0,
shouldHighlight: props.shouldBeHighlighted,
highlightColor: theme.messageHighlightBG,
backgroundColor: theme.highlightBG,
shouldApplyOtherStyles: !shouldUseNarrowLayout,
});

if (isNarrowLayout) {
return (
<MoneyRequestReportTransactionItemBody
{...props}
animatedHighlightStyle={animatedHighlightStyle}
/>
);
}

return (
<MoneyRequestReportTransactionItemWithInlineEdit
{...props}
animatedHighlightStyle={animatedHighlightStyle}
/>
);
}

export default MoneyRequestReportTransactionItem;
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,6 @@ function TransactionListItemNarrow<TItem extends ListItem>({
exportedReportActions,
nonPersonalAndWorkspaceCards,
isAttendeesEnabledForMovingPolicy,
shouldDisableHoverStyle,
onPressRow,
onMouseDownRow,
onHoverInRow,
onEditDate,
onEditMerchant,
onEditDescription,
onEditCategory,
onEditAmount,
onEditTag,
canEditDate,
canEditMerchant,
canEditDescription,
canEditCategory,
canEditAmount,
canEditTag,
}: TransactionListItemNarrowProps<TItem>) {
const styles = useThemeStyles();
const theme = useTheme();
Expand All @@ -63,6 +47,15 @@ function TransactionListItemNarrow<TItem extends ListItem>({

const transactionItem = item as unknown as TransactionListItemType;

// Narrow rows don't support inline cell editing, so the press handler can skip the
// editing-dismissal logic that the wide variant needs.
const handleOnPress: React.ComponentProps<typeof PressableWithFeedback>['onPress'] = (event) => {
if (isDeletedTransaction && !canSelectMultiple) {
return;
}
onSelectRow(item, transactionPreviewData, event);
};

const pressableStyle = [
styles.transactionListItemStyle,
styles.p4,
Expand All @@ -84,14 +77,12 @@ function TransactionListItemNarrow<TItem extends ListItem>({
<PressableWithFeedback
ref={pressableRef}
onLongPress={() => onLongPressRow?.(item)}
onPress={onPressRow}
onPress={handleOnPress}
disabled={isDisabled && !item.isSelected}
accessibilityLabel={item.text ?? ''}
role={!isDeletedTransaction ? getButtonRole(true) : 'none'}
isNested
onMouseDown={onMouseDownRow}
onHoverIn={onHoverInRow}
hoverStyle={[!item.isDisabled && !shouldDisableHoverStyle && styles.hoveredComponentBG, item.isSelected && styles.activeComponentBG]}
hoverStyle={[!item.isDisabled && styles.hoveredComponentBG, item.isSelected && styles.activeComponentBG]}
dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
id={item.keyForList ?? ''}
sentryLabel={CONST.SENTRY_LABEL.SEARCH.TRANSACTION_LIST_ITEM}
Expand Down Expand Up @@ -145,18 +136,6 @@ function TransactionListItemNarrow<TItem extends ListItem>({
nonPersonalAndWorkspaceCards={nonPersonalAndWorkspaceCards}
reportActions={exportedReportActions}
isAttendeesEnabledForMovingPolicy={isAttendeesEnabledForMovingPolicy}
onEditDate={onEditDate}
onEditMerchant={onEditMerchant}
onEditDescription={onEditDescription}
onEditCategory={onEditCategory}
onEditAmount={onEditAmount}
onEditTag={onEditTag}
canEditDate={canEditDate}
canEditMerchant={canEditMerchant}
canEditDescription={canEditDescription}
canEditCategory={canEditCategory}
canEditAmount={canEditAmount}
canEditTag={canEditTag}
/>
</>
)}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import React, {useRef} from 'react';
import React, {useEffect, useRef, useState} from 'react';
import type {View} from 'react-native';
import {getButtonRole} from '@components/Button/utils';
import OfflineWithFeedback from '@components/OfflineWithFeedback';
import PressableWithFeedback from '@components/Pressable/PressableWithFeedback';
import type {TransactionListItemType} from '@components/Search/SearchList/ListItem/types';
import type {ListItem} from '@components/SelectionList/types';
import TransactionItemRow from '@components/TransactionItemRow';
import {useEditingCellState} from '@components/TransactionItemRow/EditableCell';
import useAnimatedHighlightStyle from '@hooks/useAnimatedHighlightStyle';
import useStyleUtils from '@hooks/useStyleUtils';
import useSyncFocus from '@hooks/useSyncFocus';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import useTransactionInlineEdit from '@hooks/useTransactionInlineEdit';
import CONST from '@src/CONST';
import type {TransactionListItemWideProps} from './types';

Expand All @@ -36,22 +38,7 @@ function TransactionListItemWide<TItem extends ListItem>({
exportedReportActions,
nonPersonalAndWorkspaceCards,
isAttendeesEnabledForMovingPolicy,
shouldDisableHoverStyle,
onPressRow,
onMouseDownRow,
onHoverInRow,
onEditDate,
onEditMerchant,
onEditDescription,
onEditCategory,
onEditAmount,
onEditTag,
canEditDate,
canEditMerchant,
canEditDescription,
canEditCategory,
canEditAmount,
canEditTag,
currentSearchHash,
}: TransactionListItemWideProps<TItem>) {
const styles = useThemeStyles();
const theme = useTheme();
Expand All @@ -61,6 +48,67 @@ function TransactionListItemWide<TItem extends ListItem>({

const transactionItem = item as unknown as TransactionListItemType;

const {isEditingCell, wasRecentlyEditingCell} = useEditingCellState();
const [shouldDisableHoverStyle, setShouldDisableHoverStyle] = useState(false);

// When a popover is opened during inline editing, onHoverOut never fires after editing ends, leaving the hover style stuck.
// Disable it until the next intentional hover (onHoverIn).
// See: https://github.com/Expensify/App/pull/83127#issuecomment-4114490080
useEffect(() => {
if (!wasRecentlyEditingCell) {
return;
}
queueMicrotask(() => setShouldDisableHoverStyle(true));
}, [wasRecentlyEditingCell]);

const {
canEditDate,
canEditMerchant,
canEditDescription,
canEditCategory,
canEditAmount,
canEditTag,
onEditDate,
onEditMerchant,
onEditDescription,
onEditCategory,
onEditAmount,
onEditTag,
wasEditingOnMouseDownRef,
} = useTransactionInlineEdit({
transactionID: transactionItem.transactionID,
hash: currentSearchHash,
linkedReportAction: transactionItem.reportAction,
});

const handleOnPress: React.ComponentProps<typeof PressableWithFeedback>['onPress'] = (event) => {
// Consume the tap that dismissed an editing cell — a second tap will open the row.
// We check the ref rather than isEditingCell because blur fires before onPress and resets the state.
if (wasEditingOnMouseDownRef.current) {
wasEditingOnMouseDownRef.current = false;
return;
}
// react-native-web fires onPress on Space for role="button" elements; suppress it while a cell is being edited.
if (isEditingCell) {
return;
}
if (isDeletedTransaction && !canSelectMultiple) {
return;
}
onSelectRow(item, transactionPreviewData, event);
};

const handleOnMouseDown = (e?: React.MouseEvent) => {
wasEditingOnMouseDownRef.current = isEditingCell;

// Skip preventDefault when editing so the browser naturally blurs the input (triggering save/cancel).
if (!isEditingCell) {
e?.preventDefault();
}
};

const handleOnHoverIn = () => setShouldDisableHoverStyle(false);

const amountColumnSize = transactionItem.isAmountColumnWide ? CONST.SEARCH.TABLE_COLUMN_SIZES.WIDE : CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL;
const taxAmountColumnSize = transactionItem.isTaxAmountColumnWide ? CONST.SEARCH.TABLE_COLUMN_SIZES.WIDE : CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL;
const dateColumnSize = transactionItem.shouldShowYear ? CONST.SEARCH.TABLE_COLUMN_SIZES.WIDE : CONST.SEARCH.TABLE_COLUMN_SIZES.NORMAL;
Expand Down Expand Up @@ -93,13 +141,13 @@ function TransactionListItemWide<TItem extends ListItem>({
<PressableWithFeedback
ref={pressableRef}
onLongPress={() => onLongPressRow?.(item)}
onPress={onPressRow}
onPress={handleOnPress}
disabled={isDisabled && !item.isSelected}
accessibilityLabel={item.text ?? ''}
role={!isDeletedTransaction ? getButtonRole(true) : 'none'}
isNested
onMouseDown={onMouseDownRow}
onHoverIn={onHoverInRow}
onMouseDown={handleOnMouseDown}
onHoverIn={handleOnHoverIn}
hoverStyle={[!item.isDisabled && !shouldDisableHoverStyle && styles.hoveredComponentBG, item.isSelected && styles.activeComponentBG]}
dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: false}}
id={item.keyForList ?? ''}
Expand Down
Loading
Loading