Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix visual feedback on To field #57375

Merged
merged 3 commits into from
Feb 25, 2025
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
4 changes: 2 additions & 2 deletions src/components/Button/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import HapticFeedback from '@libs/HapticFeedback';
import CONST from '@src/CONST';
import type ChildrenProps from '@src/types/utils/ChildrenProps';
import type IconAsset from '@src/types/utils/IconAsset';
import {getButtonRole, getButtonStyle} from './utils';
import {getButtonRole} from './utils';
import validateSubmitShortcut from './validateSubmitShortcut';

type ButtonProps = Partial<ChildrenProps> & {
Expand Down Expand Up @@ -422,8 +422,8 @@ function Button(
text && shouldShowRightIcon ? styles.alignItemsStretch : undefined,
innerStyles,
link && styles.bgTransparent,
getButtonStyle(styles, isNested),
]}
isNested={isNested}
hoverStyle={[
shouldUseDefaultHover && !isDisabled ? styles.buttonDefaultHovered : undefined,
success && !isDisabled ? styles.buttonSuccessHovered : undefined,
Expand Down
7 changes: 4 additions & 3 deletions src/components/Button/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import CONST from '@src/CONST';
import type {GetButtonRole, GetButtonStyle} from './types';
import type {GetButtonRole} from './types';

const getButtonStyle: GetButtonStyle = () => undefined;
const getButtonRole: GetButtonRole = () => CONST.ROLE.BUTTON;
export {getButtonStyle, getButtonRole};

// eslint-disable-next-line import/prefer-default-export
export {getButtonRole};
6 changes: 3 additions & 3 deletions src/components/Button/utils/index.web.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import CONST from '@src/CONST';
import type {GetButtonRole, GetButtonStyle} from './types';
import type {GetButtonRole} from './types';

const getButtonStyle: GetButtonStyle = (styles, isNested) => (isNested ? styles.cursorPointer : undefined);
const getButtonRole: GetButtonRole = (isNested) => (isNested ? CONST.ROLE.PRESENTATION : CONST.ROLE.BUTTON);

export {getButtonStyle, getButtonRole};
// eslint-disable-next-line import/prefer-default-export
export {getButtonRole};
7 changes: 3 additions & 4 deletions src/components/Button/utils/types.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import type {Role, StyleProp, ViewStyle} from 'react-native';

type GetButtonStyle = (styles: {cursorPointer: ViewStyle}, isNested: boolean) => StyleProp<ViewStyle> | undefined;
import type {Role} from 'react-native';

type GetButtonRole = (isNested: boolean) => Role | undefined;

export type {GetButtonStyle, GetButtonRole};
// eslint-disable-next-line import/prefer-default-export
export type {GetButtonRole};
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {useOnyx} from 'react-native-onyx';
import type {OnyxEntry} from 'react-native-onyx';
import type {CustomRendererProps, TBlock} from 'react-native-render-html';
import {AttachmentContext} from '@components/AttachmentContext';
import {getButtonRole, getButtonStyle} from '@components/Button/utils';
import {getButtonRole} from '@components/Button/utils';
import {isDeletedNode} from '@components/HTMLEngineProvider/htmlEngineUtils';
import * as Expensicons from '@components/Icon/Expensicons';
import PressableWithoutFocus from '@components/Pressable/PressableWithoutFocus';
Expand Down Expand Up @@ -104,7 +104,7 @@ function ImageRenderer({tnode}: ImageRendererProps) {
<AttachmentContext.Consumer>
{({reportID, accountID, type}) => (
<PressableWithoutFocus
style={[styles.noOutline, getButtonStyle(styles, true)]}
style={[styles.noOutline]}
onPress={() => {
if (!source || !type) {
return;
Expand All @@ -120,6 +120,7 @@ function ImageRenderer({tnode}: ImageRendererProps) {
}
showContextMenuForReport(event, anchor, report?.reportID, action, checkIfContextMenuActive, isArchivedNonExpenseReport(report, reportNameValuePairs));
}}
isNested
shouldUseHapticsOnLongPress
role={getButtonRole(true)}
accessibilityLabel={translate('accessibilityHints.viewAttachment')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function GenericPressable(
accessible = true,
fullDisabled = false,
interactive = true,
isNested = false,
...rest
}: PressableProps,
ref: PressableRef,
Expand Down Expand Up @@ -74,11 +75,11 @@ function GenericPressable(
if (shouldUseDisabledCursor) {
return styles.cursorDisabled;
}
if ([rest.accessibilityRole, rest.role].includes(CONST.ROLE.PRESENTATION)) {
if ([rest.accessibilityRole, rest.role].includes(CONST.ROLE.PRESENTATION) && !isNested) {
return styles.cursorText;
}
return styles.cursorPointer;
}, [styles, shouldUseDisabledCursor, rest.accessibilityRole, rest.role, interactive]);
}, [interactive, shouldUseDisabledCursor, rest.accessibilityRole, rest.role, isNested, styles.cursorPointer, styles.cursorDefault, styles.cursorDisabled, styles.cursorText]);

const onLongPressHandler = useCallback(
(event: GestureResponderEvent) => {
Expand Down
5 changes: 5 additions & 0 deletions src/components/Pressable/GenericPressable/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,11 @@ type PressableProps = RNPressableProps &
* e.g., show disabled cursor when disabled
*/
interactive?: boolean;

/**
* Whether the pressable is nested in another one.
*/
isNested?: boolean;
};

type PressableRef = ForwardedRef<HTMLDivElement | View | RNText | undefined>;
Expand Down
15 changes: 3 additions & 12 deletions src/components/ReferralProgramCTA.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
import CONST from '@src/CONST';
import Navigation from '@src/libs/Navigation/Navigation';
import ROUTES from '@src/ROUTES';
import {getButtonRole, getButtonStyle} from './Button/utils';
import {getButtonRole} from './Button/utils';
import Icon from './Icon';
import {Close} from './Icon/Expensicons';
import {PressableWithoutFeedback} from './Pressable';
Expand Down Expand Up @@ -53,17 +53,8 @@ function ReferralProgramCTA({referralContentType, style, onDismiss}: ReferralPro
onPress={() => {
Navigation.navigate(ROUTES.REFERRAL_DETAILS_MODAL.getRoute(referralContentType, Navigation.getActiveRouteWithoutParams()));
}}
style={[
styles.br2,
styles.highlightBG,
styles.flexRow,
styles.justifyContentBetween,
styles.alignItemsCenter,
{gap: 10, padding: 10},
styles.pl5,
getButtonStyle(styles, true),
style,
]}
style={[styles.br2, styles.highlightBG, styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter, {gap: 10, padding: 10}, styles.pl5, style]}
isNested
accessibilityLabel="referral"
role={getButtonRole(true)}
>
Expand Down
5 changes: 3 additions & 2 deletions src/components/ReportActionItem/ReportPreview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import Animated, {useAnimatedStyle, useSharedValue, withDelay, withSpring, withTiming} from 'react-native-reanimated';
import Button from '@components/Button';
import {getButtonRole, getButtonStyle} from '@components/Button/utils';
import {getButtonRole} from '@components/Button/utils';
import DelegateNoAccessModal from '@components/DelegateNoAccessModal';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
Expand Down Expand Up @@ -539,8 +539,9 @@ function ReportPreview({
onLongPress={(event) => showContextMenuForReport(event, contextMenuAnchor, chatReportID, action, checkIfContextMenuActive)}
shouldUseHapticsOnLongPress
// This is added to omit console error about nested buttons as its forbidden on web platform
style={[styles.flexRow, styles.justifyContentBetween, styles.reportPreviewBox, getButtonStyle(styles, true)]}
style={[styles.flexRow, styles.justifyContentBetween, styles.reportPreviewBox]}
role={getButtonRole(true)}
isNested
accessibilityLabel={translate('iou.viewDetails')}
>
<View style={[styles.reportPreviewBox, isHovered || isScanning || isWhisper ? styles.reportPreviewBoxHoverBorder : undefined]}>
Expand Down
6 changes: 4 additions & 2 deletions src/components/SelectionList/BaseListItem.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {useRef} from 'react';
import {View} from 'react-native';
import {getButtonRole, getButtonStyle} from '@components/Button/utils';
import {getButtonRole} from '@components/Button/utils';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import OfflineWithFeedback from '@components/OfflineWithFeedback';
Expand All @@ -11,6 +11,7 @@ import useStyleUtils from '@hooks/useStyleUtils';
import useSyncFocus from '@hooks/useSyncFocus';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import variables from '@styles/variables';
import CONST from '@src/CONST';
import type {BaseListItemProps, ListItem} from './types';

Expand Down Expand Up @@ -96,15 +97,16 @@ function BaseListItem<TItem extends ListItem>({
interactive={item.isInteractive}
accessibilityLabel={item.text ?? ''}
role={getButtonRole(true)}
isNested
hoverDimmingValue={1}
pressDimmingValue={item.isInteractive === false ? 1 : variables.pressDimValue}
hoverStyle={[!item.isDisabled && item.isInteractive !== false && styles.hoveredComponentBG, hoverStyle]}
dataSet={{[CONST.SELECTION_SCRAPER_HIDDEN_ELEMENT]: true, [CONST.INNER_BOX_SHADOW_ELEMENT]: shouldShowBlueBorderOnFocus}}
onMouseDown={(e) => e.preventDefault()}
id={keyForList ?? ''}
style={[
pressableStyle,
isFocused && StyleUtils.getItemBackgroundColorStyle(!!item.isSelected, !!isFocused, !!item.isDisabled, theme.activeComponentBG, theme.hoverComponentBG),
getButtonStyle(styles, true),
]}
onFocus={onFocus}
onMouseLeave={handleMouseLeave}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {Str} from 'expensify-common';
import React from 'react';
import type {StyleProp, ViewStyle} from 'react-native';
import {View} from 'react-native';
import {getButtonRole, getButtonStyle} from '@components/Button/utils';
import {getButtonRole} from '@components/Button/utils';
import Checkbox from '@components/Checkbox';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
Expand Down Expand Up @@ -302,7 +302,8 @@ function TransactionListItemRow({
role={getButtonRole(true)}
disabled={isDisabled}
onPress={onCheckboxPress}
style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled, styles.mr1, getButtonStyle(styles, true)]}
isNested
style={[styles.cursorUnset, StyleUtils.getCheckboxPressableStyle(), item.isDisabledCheckbox && styles.cursorDisabled, styles.mr1]}
>
<View style={[StyleUtils.getCheckboxContainerStyle(20), StyleUtils.getMultiselectListStyles(!!item.isSelected, !!isDisabled)]}>
{!!item.isSelected && (
Expand Down
5 changes: 3 additions & 2 deletions src/components/ThreeDotsMenu/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {useEffect, useRef, useState} from 'react';
import {View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
import {getButtonRole, getButtonStyle} from '@components/Button/utils';
import {getButtonRole} from '@components/Button/utils';
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import PopoverMenu from '@components/PopoverMenu';
Expand Down Expand Up @@ -106,8 +106,9 @@ function ThreeDotsMenu({
e.preventDefault();
}}
ref={buttonRef}
style={[styles.touchableButtonImage, iconStyles, getButtonStyle(styles, isNested)]}
style={[styles.touchableButtonImage, iconStyles]}
role={getButtonRole(isNested)}
isNested={isNested}
accessibilityLabel={translate(iconTooltip)}
>
<Icon
Expand Down