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

Open old dot links with openOldDotLink() function #8769

Merged
merged 4 commits into from
May 3, 2022
Merged

Open old dot links with openOldDotLink() function #8769

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7465c12
open old dot links with openOldDotLink() function
mateusbra Apr 25, 2022
56a72e3
Merge branch 'Expensify:main' into openOldDotLinks
mateusbra Apr 27, 2022
3a41612
change variable names
mateusbra Apr 27, 2022
d3fa8e0
move internalExpensifyPath to it's own branch statement
mateusbra Apr 27, 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
9 changes: 6 additions & 3 deletions src/components/HTMLEngineProvider/HTMLRenderers/AnchorRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import htmlRendererPropTypes from './htmlRendererPropTypes';
import * as HTMLEngineUtils from '../htmlEngineUtils';
import Text from '../../Text';
import CONST from '../../../CONST';
import CONFIG from '../../../CONFIG';
import styles from '../../../styles/styles';
import Navigation from '../../../libs/Navigation/Navigation';
import AnchorForCommentsOnly from '../../AnchorForCommentsOnly';
import * as Link from '../../../libs/actions/Link';

const AnchorRenderer = (props) => {
const htmlAttribs = props.tnode.attributes;
Expand All @@ -20,16 +22,17 @@ const AnchorRenderer = (props) => {
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, ''))
const internalNewExpensifyPath = (attrHref.startsWith(CONST.NEW_EXPENSIFY_URL) && attrHref.replace(CONST.NEW_EXPENSIFY_URL, ''))
|| (attrHref.startsWith(CONST.STAGING_NEW_EXPENSIFY_URL) && attrHref.replace(CONST.STAGING_NEW_EXPENSIFY_URL, ''));
const internalExpensifyPath = attrHref.startsWith(CONFIG.EXPENSIFY.EXPENSIFY_URL) && attrHref.replace(CONFIG.EXPENSIFY.EXPENSIFY_URL, '');

// If we are handling a New Expensify link then we will assume this should be opened by the app internally. This ensures that the links are opened internally via react-navigation
// instead of in a new tab or with a page refresh (which is the default behavior of an anchor tag)
if (internalExpensifyPath) {
if (internalNewExpensifyPath || internalExpensifyPath) {
Copy link
Member

@rushatgabhane rushatgabhane Apr 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

but it doesn't assign the function to the variable link, it execs the function instead.

@mateusbra my bad, we can't do that.
Let's move internalExpensifyPath to it's own branch statement for some readability.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

commited!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let me know what you think of the comments I added

Copy link
Member

Choose a reason for hiding this comment

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

I like the comment

return (
<Text
style={styles.link}
onPress={() => Navigation.navigate(internalExpensifyPath)}
onPress={() => (internalNewExpensifyPath ? Navigation.navigate(internalNewExpensifyPath) : Link.openOldDotLink(internalExpensifyPath))}
>
<TNodeChildrenRenderer tnode={props.tnode} />
</Text>
Expand Down