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

Copy email url #8195

Merged
merged 8 commits into from
Mar 23, 2022
Merged

Copy email url #8195

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
989d283
fix: show Copy e-mail instead of Copy URL when anchor is an e-mail
mateusbra Mar 16, 2022
3670301
add import Str to native applications
mateusbra Mar 16, 2022
29b0701
Fix ESlint problems
mateusbra Mar 17, 2022
8956ffa
add EMAIL type to @param
mateusbra Mar 17, 2022
4076f1b
rename fileName to displayName
mateusbra Mar 17, 2022
0b75ee7
change e-mail to email on translations
mateusbra Mar 17, 2022
b6a4fd3
revert displayName -> fileName in processDownload function
mateusbra Mar 18, 2022
6018858
Change comment
mateusbra Mar 18, 2022
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
13 changes: 7 additions & 6 deletions src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import _ from 'underscore';
import React from 'react';
import {Pressable, StyleSheet} from 'react-native';
import lodashGet from 'lodash/get';
import Str from 'expensify-common/lib/str';
import Text from '../../Text';
import {propTypes, defaultProps} from '../anchorForCommentsOnlyPropTypes';
import PressableWithSecondaryInteraction from '../../PressableWithSecondaryInteraction';
Expand All @@ -27,11 +28,11 @@ class BaseAnchorForCommentsOnly extends React.Component {
* Initiate file downloading and update downloading flags
*
* @param {String} href
* @param {String} fileName
* @param {String} displayName
*/
processDownload(href, fileName) {
processDownload(href, displayName) {
this.setState({isDownloading: true});
fileDownload(href, fileName).then(() => this.setState({isDownloading: false}));
fileDownload(href, displayName).then(() => this.setState({isDownloading: false}));
}

render() {
Expand All @@ -44,12 +45,12 @@ class BaseAnchorForCommentsOnly extends React.Component {
if (this.state.isDownloading) {
return;
}
this.processDownload(this.props.href, this.props.fileName);
this.processDownload(this.props.href, this.props.displayName);
}}
>
<AttachmentView
sourceURL={this.props.href}
file={{name: this.props.fileName}}
file={{name: this.props.displayName}}
shouldShowDownloadIcon
shouldShowLoadingSpinnerIcon={this.state.isDownloading}
/>
Expand All @@ -61,7 +62,7 @@ class BaseAnchorForCommentsOnly extends React.Component {
onSecondaryInteraction={
(event) => {
ReportActionContextMenu.showContextMenu(
ContextMenuActions.CONTEXT_MENU_TYPES.LINK,
Str.isValidEmail(this.props.displayName) ? ContextMenuActions.CONTEXT_MENU_TYPES.EMAIL : ContextMenuActions.CONTEXT_MENU_TYPES.LINK,
Copy link
Contributor

Choose a reason for hiding this comment

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

This line introduced a regression in #18912 , When an email is linked to a url link. The message display "Copy Email to Clipboard" however the copied text is the url link.

event,
this.props.href,
lodashGet(linkRef, 'current'),
Expand Down
13 changes: 7 additions & 6 deletions src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly/index.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import _ from 'underscore';
import React from 'react';
import lodashGet from 'lodash/get';
import {Linking, StyleSheet, Pressable} from 'react-native';
import Str from 'expensify-common/lib/str';
import {propTypes, defaultProps} from '../anchorForCommentsOnlyPropTypes';
import fileDownload from '../../../libs/fileDownload';
import Text from '../../Text';
Expand All @@ -28,11 +29,11 @@ class BaseAnchorForCommentsOnly extends React.Component {
* Initiate file downloading and update downloading flags
*
* @param {String} href
* @param {String} fileName
* @param {String} displayName
*/
processDownload(href, fileName) {
processDownload(href, displayName) {
this.setState({isDownloading: true});
fileDownload(href, fileName).then(() => this.setState({isDownloading: false}));
fileDownload(href, displayName).then(() => this.setState({isDownloading: false}));
}

render() {
Expand All @@ -47,12 +48,12 @@ class BaseAnchorForCommentsOnly extends React.Component {
if (this.state.isDownloading) {
return;
}
this.processDownload(this.props.href, this.props.fileName);
this.processDownload(this.props.href, this.props.displayName);
}}
>
<AttachmentView
sourceURL={this.props.href}
file={{name: this.props.fileName}}
file={{name: this.props.displayName}}
shouldShowDownloadIcon
shouldShowLoadingSpinnerIcon={this.state.isDownloading}
/>
Expand All @@ -64,7 +65,7 @@ class BaseAnchorForCommentsOnly extends React.Component {
onSecondaryInteraction={
(event) => {
ReportActionContextMenu.showContextMenu(
ContextMenuActions.CONTEXT_MENU_TYPES.LINK,
Str.isValidEmail(this.props.displayName) ? ContextMenuActions.CONTEXT_MENU_TYPES.EMAIL : ContextMenuActions.CONTEXT_MENU_TYPES.LINK,
event,
this.props.href,
lodashGet(linkRef, 'current'),
Expand Down
6 changes: 3 additions & 3 deletions src/components/AnchorForCommentsOnly/anchorForCommentsOnlyPropTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const propTypes = {
/** Any children to display */
children: PropTypes.node,

/** Display label in case of attachments */
fileName: PropTypes.string,
/** Display label in case of attachments. Text to display in case of anchors */
displayName: PropTypes.string,

/** Any additional styles to apply */
// eslint-disable-next-line react/forbid-prop-types
Expand All @@ -37,7 +37,7 @@ const defaultProps = {
isAttachment: false,
children: null,
style: {},
fileName: '',
displayName: '',
};

export {propTypes, defaultProps};
4 changes: 2 additions & 2 deletions src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const AnchorRenderer = (props) => {

// An auth token is needed to download Expensify chat attachments
const isAttachment = Boolean(htmlAttribs['data-expensify-source']);
const fileName = lodashGet(props.tnode, 'domNode.children[0].data', '');
const displayName = lodashGet(props.tnode, 'domNode.children[0].data', '');
const parentStyle = lodashGet(props.tnode, 'parent.styles.nativeTextRet', {});
const attrHref = htmlAttribs.href || '';
const internalExpensifyPath = (attrHref.startsWith(CONST.NEW_EXPENSIFY_URL) && attrHref.replace(CONST.NEW_EXPENSIFY_URL, ''))
Expand Down Expand Up @@ -64,7 +64,7 @@ const AnchorRenderer = (props) => {
rel={htmlAttribs.rel || 'noopener noreferrer'}
style={{...props.style, ...parentStyle}}
key={props.key}
fileName={fileName}
displayName={displayName}
>
<TNodeChildrenRenderer tnode={props.tnode} />
</AnchorForCommentsOnly>
Expand Down
1 change: 1 addition & 0 deletions src/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ export default {
copied: 'Copied!',
copyLink: 'Copy link',
copyURLToClipboard: 'Copy URL to clipboard',
copyEmailToClipboard: 'Copy email to clipboard',
markAsUnread: 'Mark as unread',
editComment: 'Edit comment',
deleteComment: 'Delete comment',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ export default {
copied: '¡Copiado!',
copyLink: 'Copiar enlace',
copyURLToClipboard: 'Copiar URL al portapapeles',
copyEmailToClipboard: 'Copiar email al portapapeles',
markAsUnread: 'Marcar como no leído',
editComment: 'Editar commentario',
deleteComment: 'Eliminar comentario',
Expand Down
12 changes: 12 additions & 0 deletions src/pages/home/report/ContextMenu/ContextMenuActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ function getActionText(reportAction) {
const CONTEXT_MENU_TYPES = {
LINK: 'LINK',
REPORT_ACTION: 'REPORT_ACTION',
EMAIL: 'EMAIL',
};

// A list of all the context actions in this menu.
Expand All @@ -37,6 +38,17 @@ export default [
hideContextMenu(true, ReportActionComposeFocusManager.focus);
},
},
{
textTranslateKey: 'reportActionContextMenu.copyEmailToClipboard',
icon: Expensicons.Clipboard,
successTextTranslateKey: 'reportActionContextMenu.copied',
successIcon: Expensicons.Checkmark,
shouldShow: type => type === CONTEXT_MENU_TYPES.EMAIL,
onPress: (closePopover, {selection}) => {
Clipboard.setString(selection.replace('mailto:', ''));
hideContextMenu(true, ReportActionComposeFocusManager.focus);
},
},
{
textTranslateKey: 'reportActionContextMenu.copyToClipboard',
icon: Expensicons.Clipboard,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/report/ContextMenu/PopoverReportActionContextMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class PopoverReportActionContextMenu extends React.Component {
/**
* Show the ReportActionContextMenu modal popover.
*
* @param {string} type - context menu type [LINK, REPORT_ACTION]
* @param {string} type - context menu type [EMAIL, LINK, REPORT_ACTION]
* @param {Object} [event] - A press event.
* @param {string} [selection] - A copy text.
* @param {Element} contextMenuAnchor - popoverAnchor
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/report/ContextMenu/ReportActionContextMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const contextMenuRef = React.createRef();
/**
* Show the ReportActionContextMenu modal popover.
*
* @param {string} type - the context menu type to display [LINK, REPORT_ACTION]
* @param {string} type - the context menu type to display [EMAIL, LINK, REPORT_ACTION]
* @param {Object} [event] - A press event.
* @param {string} [selection] - A copy text.
* @param {Element} contextMenuAnchor - popoverAnchor
Expand Down