Skip to content

Match Task title row arrow style and placement to the other push rows #100245

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.

Sign up for GitHub

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

Open
MelvinBot wants to merge 4 commits into
base: main
Choose a base branch
from
+69 −68
Open

Match Task title row arrow style and placement to the other push rows #100245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c945ce
Fix: match Task title row arrow style and placement to the other push…
MelvinBot Sep 3, 2026
7702928
Merge remote-tracking branch 'origin/main' into claude-taskViewTitleA…
MelvinBot Sep 11, 2026
dab3f66
Merge remote-tracking branch 'origin/main' into claude-taskViewTitleA…
MelvinBot Sep 11, 2026
6e8e89e
Merge remote-tracking branch 'origin/main' into claude-taskViewTitleA…
MelvinBot Sep 11, 2026
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
131 changes: 66 additions & 65 deletions src/components/ReportActionItem/TaskView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import useParentReportAction from '@hooks/useParentReportAction';
import useReportIsArchived from '@hooks/useReportIsArchived';
import useStyleUtils from '@hooks/useStyleUtils';
import useTaskCheckboxAccessibility from '@hooks/useTaskCheckboxAccessibility';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';

import getButtonState from '@libs/getButtonState';
Expand Down Expand Up @@ -57,6 +58,7 @@ function TaskView({report, parentReport, action}: TaskViewProps) {
const icons = useMemoizedLazyExpensifyIcons(['ArrowRight']);
const {translate, formatPhoneNumber} = useLocalize();
const styles = useThemeStyles();
const theme = useTheme();
const StyleUtils = useStyleUtils();
const currentUserPersonalDetails = useCurrentUserPersonalDetails();
const personalDetails = usePersonalDetails();
Expand Down Expand Up @@ -170,76 +172,75 @@ function TaskView({report, parentReport, action}: TaskViewProps) {
disabled={isDisableInteractive}
sentryLabel={CONST.SENTRY_LABEL.TASK.VIEW_TITLE}
>
{({pressed}) => {
{() => {
const titleContent = (
<>
<View style={[styles.flexRow, styles.flex1, styles.textAlignLeft]}>
<RenderHTML html={taskTitle} />
</View>
{!isDisableInteractive && (
<View style={styles.taskRightIconContainer}>
<Icon
additionalStyles={[styles.alignItemsCenter]}
src={icons.ArrowRight}
fill={StyleUtils.getIconFillColor({
buttonState: getButtonState({isActive: hovered, isPressed: pressed, isDisabled: disableState}),
})}
/>
</View>
)}
</>
<View style={[styles.flexRow, styles.flex1, styles.textAlignLeft]}>
<RenderHTML html={taskTitle} />
</View>
);

return (
<OfflineWithFeedback pendingAction={report?.pendingFields?.reportName}>
<Text style={styles.taskTitleDescription}>{translate('task.title')}</Text>
<View style={[styles.flexRow, styles.flex1]}>
<Checkbox
shouldSelectOnPressEnter
onPress={callFunctionIfActionIsAllowed(() => {
// If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
if (isActiveTaskEditRoute(report?.reportID)) {
return;
}
updateTaskCheckboxStateForAccessibility(isCompleted);
if (isCompleted) {
reopenTask(report, parentReport, currentUserPersonalDetails.accountID, delegateEmail);
} else {
completeTask(
report,
parentReport?.hasOutstandingChildTask ?? false,
hasOutstandingChildTask,
parentReportAction,
delegateEmail,
);
}
})}
isChecked={isCompleted}
style={styles.taskMenuItemCheckbox}
containerSize={24}
containerBorderRadius={8}
caretSize={16}
accessibilityLabel={taskCheckboxAccessibilityLabel}
accessibilityHint={taskCheckboxAccessibilityHint}
disabled={!isTaskActionable}
sentryLabel={CONST.SENTRY_LABEL.TASK.VIEW_CHECKBOX}
/>
{shouldSplitTaskAccessibilityTargets ? (
<PressableWithoutFeedback
accessible
accessibilityRole={CONST.ROLE.BUTTON}
accessibilityLabel={taskAccessibilityLabel}
accessibilityHint={titlePressableAccessibilityHint}
accessibilityState={{disabled: isDisableInteractive}}
disabled={isDisableInteractive}
onPress={callFunctionIfActionIsAllowed(() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.TASK_TITLE.path)))}
style={[styles.flexRow, styles.flex1]}
sentryLabel={CONST.SENTRY_LABEL.TASK.VIEW_TITLE}
>
{titleContent}
</PressableWithoutFeedback>
) : (
titleContent
<View style={styles.flexRow}>
<View style={styles.flex1}>
<Text style={styles.taskTitleDescription}>{translate('task.title')}</Text>
<View style={[styles.flexRow, styles.flex1]}>
<Checkbox
shouldSelectOnPressEnter
onPress={callFunctionIfActionIsAllowed(() => {
// If we're already navigating to these task editing pages, early return not to mark as completed, otherwise we would have not found page.
if (isActiveTaskEditRoute(report?.reportID)) {
return;
}
updateTaskCheckboxStateForAccessibility(isCompleted);
if (isCompleted) {
reopenTask(report, parentReport, currentUserPersonalDetails.accountID, delegateEmail);
} else {
completeTask(
report,
parentReport?.hasOutstandingChildTask ?? false,
hasOutstandingChildTask,
parentReportAction,
delegateEmail,
);
}
})}
isChecked={isCompleted}
style={styles.taskMenuItemCheckbox}
containerSize={24}
containerBorderRadius={8}
caretSize={16}
accessibilityLabel={taskCheckboxAccessibilityLabel}
accessibilityHint={taskCheckboxAccessibilityHint}
disabled={!isTaskActionable}
sentryLabel={CONST.SENTRY_LABEL.TASK.VIEW_CHECKBOX}
/>
{shouldSplitTaskAccessibilityTargets ? (
<PressableWithoutFeedback
accessible
accessibilityRole={CONST.ROLE.BUTTON}
accessibilityLabel={taskAccessibilityLabel}
accessibilityHint={titlePressableAccessibilityHint}
accessibilityState={{disabled: isDisableInteractive}}
disabled={isDisableInteractive}
onPress={callFunctionIfActionIsAllowed(() => Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.TASK_TITLE.path)))}
style={[styles.flexRow, styles.flex1]}
sentryLabel={CONST.SENTRY_LABEL.TASK.VIEW_TITLE}
>
{titleContent}
</PressableWithoutFeedback>
) : (
titleContent
)}
</View>
</View>
{!isDisableInteractive && (
<View style={[styles.taskRightIconContainer, !hovered && styles.opacitySemiTransparent]}>
<Icon
src={icons.ArrowRight}
fill={theme.icon}
/>
</View>
)}
</View>
</OfflineWithFeedback>
Expand Down
6 changes: 3 additions & 3 deletions src/styles/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4758,12 +4758,12 @@ const staticStyles = (theme: ThemeColors) =>
},

taskRightIconContainer: {
width: variables.componentSizeNormal,
width: variables.iconSizeNormal,
marginLeft: 'auto',
...spacing.mt1,
...pointerEventsAuto,
...display.dFlex,
...flex.alignItemsCenter,
...flex.justifyContentCenter,
...flex.alignItemsEnd,
},

shareCodeContainer: {
Expand Down
Loading