From 06b759bbb4c0cba7e05b7419b596a8bb3f3a434c Mon Sep 17 00:00:00 2001 From: Pierre Michel Date: Mon, 10 Jul 2023 08:59:49 -0600 Subject: [PATCH 1/4] Long press was not working when clicking on "x replies" on android/ios Signed-off-by: Pierre Michel --- src/pages/home/report/ReportActionItem.js | 1 + src/pages/home/report/ReportActionItemThread.js | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index 9c374b130a1b..0b2565f122d7 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -375,6 +375,7 @@ function ReportActionItem(props) { mostRecentReply={`${props.action.childLastVisibleActionCreated}`} isHovered={hovered} icons={ReportUtils.getIconsForParticipants(oldestFourAccountIDs, props.personalDetailsList)} + onSecondaryInteraction={showPopover} /> )} diff --git a/src/pages/home/report/ReportActionItemThread.js b/src/pages/home/report/ReportActionItemThread.js index d4d0b78d4de1..9dcac4e9382b 100644 --- a/src/pages/home/report/ReportActionItemThread.js +++ b/src/pages/home/report/ReportActionItemThread.js @@ -9,7 +9,7 @@ import CONST from '../../../CONST'; import avatarPropTypes from '../../../components/avatarPropTypes'; import MultipleAvatars from '../../../components/MultipleAvatars'; import compose from '../../../libs/compose'; -import PressableWithoutFeedback from '../../../components/Pressable/PressableWithoutFeedback'; +import PressableWithSecondaryInteraction from '../../../components/PressableWithSecondaryInteraction'; const propTypes = { /** List of participant icons for the thread */ @@ -27,6 +27,9 @@ const propTypes = { /** Whether the thread item / message is being hovered */ isHovered: PropTypes.bool.isRequired, + /** The function that is called on secondary interaction, ie: LongPress */ + onSecondaryInteraction: PropTypes.func, + ...withLocalizePropTypes, ...windowDimensionsPropTypes, }; @@ -39,12 +42,13 @@ function ReportActionItemThread(props) { return ( - { Report.navigateToAndOpenChildReport(props.childReportID); }} accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON} accessibilityLabel={`${props.numberOfReplies} ${replyText}`} + onSecondaryInteraction={props.onSecondaryInteraction} > - + ); } From 1b7261896bc2c27272eda8cdf131cb6822f13d73 Mon Sep 17 00:00:00 2001 From: Pierre Michel Date: Tue, 11 Jul 2023 16:02:32 -0600 Subject: [PATCH 2/4] Make the prop required for lint Signed-off-by: Pierre Michel --- src/pages/home/report/ReportActionItemThread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItemThread.js b/src/pages/home/report/ReportActionItemThread.js index 9dcac4e9382b..f2c1d60d9287 100644 --- a/src/pages/home/report/ReportActionItemThread.js +++ b/src/pages/home/report/ReportActionItemThread.js @@ -28,7 +28,7 @@ const propTypes = { isHovered: PropTypes.bool.isRequired, /** The function that is called on secondary interaction, ie: LongPress */ - onSecondaryInteraction: PropTypes.func, + onSecondaryInteraction: PropTypes.func.isRequired, ...withLocalizePropTypes, ...windowDimensionsPropTypes, From 14c95e2ca5ebf9c197ffefd422221fb79f9baeda Mon Sep 17 00:00:00 2001 From: Pierre Michel Date: Tue, 11 Jul 2023 16:46:29 -0600 Subject: [PATCH 3/4] After npm run prettier Signed-off-by: Pierre Michel --- src/pages/home/report/ReportActionItemThread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItemThread.js b/src/pages/home/report/ReportActionItemThread.js index f2c1d60d9287..0fb6e8bf58dc 100644 --- a/src/pages/home/report/ReportActionItemThread.js +++ b/src/pages/home/report/ReportActionItemThread.js @@ -42,7 +42,7 @@ function ReportActionItemThread(props) { return ( - { Report.navigateToAndOpenChildReport(props.childReportID); }} From 23f9c8d3a24afbd0d14a5395805cfd04384e9385 Mon Sep 17 00:00:00 2001 From: Pierre Michel Date: Wed, 12 Jul 2023 10:40:52 -0600 Subject: [PATCH 4/4] Update src/pages/home/report/ReportActionItemThread.js Co-authored-by: Eugene Voloshchak --- src/pages/home/report/ReportActionItemThread.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/home/report/ReportActionItemThread.js b/src/pages/home/report/ReportActionItemThread.js index 0fb6e8bf58dc..ebd965e80daf 100644 --- a/src/pages/home/report/ReportActionItemThread.js +++ b/src/pages/home/report/ReportActionItemThread.js @@ -27,7 +27,7 @@ const propTypes = { /** Whether the thread item / message is being hovered */ isHovered: PropTypes.bool.isRequired, - /** The function that is called on secondary interaction, ie: LongPress */ + /** The function that should be called when the thread is LongPressed or right-clicked */ onSecondaryInteraction: PropTypes.func.isRequired, ...withLocalizePropTypes,