Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
52 changes: 52 additions & 0 deletions src/components/ReportActionItem/HoveredDistanceEReceipt.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import React, {useState} from 'react';
import {View} from 'react-native';
import type {LayoutChangeEvent} from 'react-native';
import DistanceEReceipt from '@components/DistanceEReceipt';
import useThemeStyles from '@hooks/useThemeStyles';
import variables from '@styles/variables';
import type {Transaction} from '@src/types/onyx';

// The DistanceEReceipt panel is `variables.eReceiptBGHWidth` wide plus the 20px margin on each side (styles.m5).
const E_RECEIPT_CARD_WIDTH = variables.eReceiptBGHWidth + 40;

type HoveredDistanceEReceiptProps = {
/** The transaction for the distance expense */
transaction: Transaction;
};

function HoveredDistanceEReceipt({transaction}: HoveredDistanceEReceiptProps) {
const styles = useThemeStyles();
const [boxWidth, setBoxWidth] = useState(0);
const [boxHeight, setBoxHeight] = useState(0);
const [cardHeight, setCardHeight] = useState(0);

const scale = boxWidth && boxHeight && cardHeight ? Math.min(boxWidth / E_RECEIPT_CARD_WIDTH, boxHeight / cardHeight) : 0;

const onOverlayLayout = (event: LayoutChangeEvent) => {
setBoxWidth(event.nativeEvent.layout.width);
setBoxHeight(event.nativeEvent.layout.height);
};

const onCardLayout = (event: LayoutChangeEvent) => {
setCardHeight(event.nativeEvent.layout.height);
};

return (
<View
style={[styles.pAbsolute, styles.t0, styles.l0, styles.r0, styles.b0, styles.justifyContentCenter, styles.alignItemsCenter, styles.overflowHidden, styles.eReceiptHoverFill]}
onLayout={onOverlayLayout}
pointerEvents="none"
>
Comment thread
WojtekBoman marked this conversation as resolved.
<View
style={[{width: E_RECEIPT_CARD_WIDTH}, scale ? {transform: [{scale}]} : styles.opacity0]}
onLayout={onCardLayout}
>
<DistanceEReceipt transaction={transaction} />
</View>
</View>
);
}

HoveredDistanceEReceipt.displayName = 'HoveredDistanceEReceipt';
Comment thread
WojtekBoman marked this conversation as resolved.
Outdated

export default HoveredDistanceEReceipt;
57 changes: 32 additions & 25 deletions src/components/ReportActionItem/MoneyRequestReceiptView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ import {
import trackExpenseCreationError from '@libs/telemetry/trackExpenseCreationError';
import {
didReceiptScanSucceed as didReceiptScanSucceedTransactionUtils,
getWaypoints,
hasEReceipt,
hasReceiptSource,
hasReceipt as hasReceiptTransactionUtils,
Expand All @@ -79,6 +80,7 @@ import type * as OnyxTypes from '@src/types/onyx';
import type {TransactionPendingFieldsKey} from '@src/types/onyx/Transaction';
import type {FileObject} from '@src/types/utils/Attachment';
import {isEmptyObject} from '@src/types/utils/EmptyObject';
import HoveredDistanceEReceipt from './HoveredDistanceEReceipt';
import {isElementHovered, resetButtonHoverState} from './receiptHoverUtils';
import ReportActionItemImage from './ReportActionItemImage';

Expand Down Expand Up @@ -171,9 +173,14 @@ function MoneyRequestReceiptView({
const transactionViolations = useTransactionViolations(transaction?.transactionID);
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${moneyRequestReport?.policyID}`);

const isDistanceRequest = isDistanceRequestTransactionUtils(transaction);
const hasReceipt = hasReceiptTransactionUtils(updatedTransaction ?? transaction);
const isTransactionScanning = isScanning(updatedTransaction ?? transaction);
const displayedTransaction = updatedTransaction ?? transaction;
const isDistanceRequest = isDistanceRequestTransactionUtils(displayedTransaction);
// A merged distance expense can be typed `distance-manual` while still carrying the map waypoints/route from the
Comment thread
WojtekBoman marked this conversation as resolved.
// expense it was merged with, so fall back to the presence of waypoints to still surface the distance e-receipt.
const hasDistanceWaypoints = Object.keys(getWaypoints(displayedTransaction) ?? {}).length > 0;
const isMapDistanceRequest = !!displayedTransaction && isDistanceRequest && (!isManualDistanceRequest(displayedTransaction) || hasDistanceWaypoints);
const hasReceipt = hasReceiptTransactionUtils(displayedTransaction);
const isTransactionScanning = isScanning(displayedTransaction);
const didReceiptScanSucceed = hasReceipt && didReceiptScanSucceedTransactionUtils(transaction);
const isInvoice = isInvoiceReport(moneyRequestReport);
const isChatReportArchived = useReportIsArchived(moneyRequestReport?.chatReportID);
Expand Down Expand Up @@ -255,10 +262,9 @@ function MoneyRequestReceiptView({

let receiptURIs;
if (hasReceipt) {
receiptURIs = getThumbnailAndImageURIs(updatedTransaction ?? transaction);
receiptURIs = getThumbnailAndImageURIs(displayedTransaction);
}
const transactionForReceipt = updatedTransaction ?? transaction;
const isEReceiptTransaction = !!transactionForReceipt && !hasReceiptSource(transactionForReceipt) && hasEReceipt(transactionForReceipt);
const isEReceiptTransaction = !!displayedTransaction && !hasReceiptSource(displayedTransaction) && hasEReceipt(displayedTransaction);
const canZoomReceipt = hasReceipt && !isLoading && !isTransactionScanning && !isEReceiptTransaction && !!receiptURIs?.image;
const pendingAction = transaction?.pendingAction;
// Need to return undefined when we have pendingAction to avoid the duplicate pending action
Expand Down Expand Up @@ -504,8 +510,6 @@ function MoneyRequestReceiptView({

const showBorderlessLoading = isLoading && fillSpace;

const isMapDistanceRequest = !!transaction && isDistanceRequest && !isManualDistanceRequest(transaction);

const canShowReceiptActions = hasReceipt && !isLoading && isEditable && !isMapDistanceRequest && !mergeTransactionID;
const receiptPendingAction = isDistanceRequest ? getPendingFieldAction('waypoints') : getPendingFieldAction('receipt');
const isReceiptOfflinePending = isOffline && !!receiptPendingAction;
Expand Down Expand Up @@ -623,23 +627,26 @@ function MoneyRequestReceiptView({
isEnabled={canZoomReceipt}

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

E-receipts zoom on hover is intended

hoverContainerRef={receiptContainerRef}
>
<ReportActionItemImage
shouldUseThumbnailImage={!fillSpace}
shouldUseFullHeight={fillSpace}
thumbnail={receiptURIs?.thumbnail}
fileExtension={receiptURIs?.fileExtension}
isThumbnail={receiptURIs?.isThumbnail}
image={receiptURIs?.image}
isLocalFile={receiptURIs?.isLocalFile}
filename={receiptURIs?.filename}
transaction={updatedTransaction ?? transaction}
enablePreviewModal
readonly={readonly || !canEditReceipt}
mergeTransactionID={mergeTransactionID}
report={report}
onLoad={() => setIsLoading(false)}
onLoadFailure={() => setIsLoading(false)}
/>
<>
<ReportActionItemImage
shouldUseThumbnailImage={!fillSpace}
shouldUseFullHeight={fillSpace}
thumbnail={receiptURIs?.thumbnail}
fileExtension={receiptURIs?.fileExtension}
isThumbnail={receiptURIs?.isThumbnail}
image={receiptURIs?.image}
isLocalFile={receiptURIs?.isLocalFile}
filename={receiptURIs?.filename}
transaction={updatedTransaction ?? transaction}
enablePreviewModal
readonly={readonly || !canEditReceipt}
mergeTransactionID={mergeTransactionID}
report={report}
onLoad={() => setIsLoading(false)}
onLoadFailure={() => setIsLoading(false)}
/>
{isMapDistanceRequest && hovered && !!displayedTransaction && <HoveredDistanceEReceipt transaction={displayedTransaction} />}
</>
</ReceiptHoverZoom>
</View>
{canShowReceiptActions && (
Expand Down
4 changes: 4 additions & 0 deletions src/styles/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4225,6 +4225,10 @@ const staticStyles = (theme: ThemeColors) =>
overflow: 'hidden',
},

eReceiptHoverFill: {
backgroundColor: colors.green800,
},

eReceiptBackgroundThumbnail: {
...sizing.w100,
position: 'absolute',
Expand Down
Loading