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.

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

Jump to bottom

Fix can't interact with deleted parent action after deleting it for a while #42341

Merged
merged 3 commits into from
Jun 11, 2024
Merged

Fix can't interact with deleted parent action after deleting it for a while #42341

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b33432
don't set pointer events to none for deleted parent action
bernhardoj May 17, 2024
ba1b41b
Merge branch 'main' into fix/42194-dont-disable-deleted-parent-action…
bernhardoj May 30, 2024
bd69493
Merge branch 'main' into fix/42194-dont-disable-deleted-parent-action…
bernhardoj Jun 11, 2024
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
2 changes: 1 addition & 1 deletion src/pages/home/report/ReportActionItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -956,7 +956,7 @@ function ReportActionItem({
<PressableWithSecondaryInteraction
ref={popoverAnchorRef}
onPress={draftMessage === undefined ? onPress : undefined}
style={[action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE ? styles.pointerEventsNone : styles.pointerEventsAuto]}
style={[action.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && !isDeletedParentAction ? styles.pointerEventsNone : styles.pointerEventsAuto]}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see that we also have isDeletedParentAction

App/src/libs/ReportActionsUtils.ts

Lines 115 to 117 in e8ae3c5

function isDeletedParentAction(reportAction: OnyxEntry<ReportAction>): boolean {
return (reportAction?.message?.[0]?.isDeletedParentAction ?? false) && (reportAction?.childVisibleActionCount ?? 0) > 0;
}

which is very similar to isMessageDeleted.

App/src/libs/ReportActionsUtils.ts

Lines 804 to 806 in e8ae3c5

function isMessageDeleted(reportAction: OnyxEntry<ReportAction>): boolean {
return reportAction?.message?.[0]?.isDeletedParentAction ?? false;
}

I decided to use isDeletedParentAction instead which is already defined at the top of the component.

onPressIn={() => isSmallScreenWidth && DeviceCapabilities.canUseTouchScreen() && ControlSelection.block()}
onPressOut={() => ControlSelection.unblock()}
onSecondaryInteraction={showPopover}
Expand Down
Loading