From 03c9ef8f134e0d6d04efd257db9dde77344fd324 Mon Sep 17 00:00:00 2001 From: Parshvi16 <91120214+Parshvi16@users.noreply.github.com> Date: Thu, 27 Jul 2023 06:27:24 +0530 Subject: [PATCH 1/3] fix: Select and copy does not copy New Expensify link in link format --- .../AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js index 9e1ceaad593e..da118b8a7552 100644 --- a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js +++ b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js @@ -77,9 +77,9 @@ function BaseAnchorForCommentsOnly(props) { accessibilityRole={CONST.ACCESSIBILITY_ROLE.LINK} hrefAttrs={{ rel: props.rel, - target: isEmail ? '_self' : props.target, + target: isEmail || !linkProps.href ? '_self' : props.target, }} - href={linkProps.href} + href={linkProps.href || props.href} // Add testID so it gets selected as an anchor tag by SelectionScraper testID="a" // eslint-disable-next-line react/jsx-props-no-spreading From 5d299e679e798f66be73b1c3d5479cb92b876d65 Mon Sep 17 00:00:00 2001 From: Parshvi16 <91120214+Parshvi16@users.noreply.github.com> Date: Mon, 31 Jul 2023 09:51:28 +0530 Subject: [PATCH 2/3] added onPress to avoid refreshing of page --- .../AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js index da118b8a7552..5f34f5cefbd6 100644 --- a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js +++ b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js @@ -80,6 +80,14 @@ function BaseAnchorForCommentsOnly(props) { target: isEmail || !linkProps.href ? '_self' : props.target, }} href={linkProps.href || props.href} + onPress={(event) => { + if (!linkProps.onPress) { + return; + } + + event.preventDefault(); + linkProps.onPress(); + }} // Add testID so it gets selected as an anchor tag by SelectionScraper testID="a" // eslint-disable-next-line react/jsx-props-no-spreading From 520f09f0262f0f746c034227f004abc9f6e69e12 Mon Sep 17 00:00:00 2001 From: Parshvi16 <91120214+Parshvi16@users.noreply.github.com> Date: Tue, 1 Aug 2023 22:03:03 +0530 Subject: [PATCH 3/3] fix: prettier whitespace issue --- .../AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js index 5f34f5cefbd6..46a213e163eb 100644 --- a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js +++ b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js @@ -82,9 +82,9 @@ function BaseAnchorForCommentsOnly(props) { href={linkProps.href || props.href} onPress={(event) => { if (!linkProps.onPress) { - return; + return; } - + event.preventDefault(); linkProps.onPress(); }}