From 28f7ff76a4d7cb756d63f1cb6224965ce26cd6f8 Mon Sep 17 00:00:00 2001 From: Ansh Date: Tue, 9 May 2023 13:01:42 -0400 Subject: [PATCH] add target="_blank" prop to LinkText for safari (#606) --- src/lib/strings/url-helpers.ts | 4 ++++ src/view/com/util/Link.tsx | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/lib/strings/url-helpers.ts b/src/lib/strings/url-helpers.ts index 17a49fb2..549587f7 100644 --- a/src/lib/strings/url-helpers.ts +++ b/src/lib/strings/url-helpers.ts @@ -66,6 +66,10 @@ export function isBskyAppUrl(url: string): boolean { return url.startsWith('https://bsky.app/') } +export function isExternalUrl(url: string): boolean { + return !isBskyAppUrl(url) && url.startsWith('http') +} + export function isBskyPostUrl(url: string): boolean { if (isBskyAppUrl(url)) { try { diff --git a/src/view/com/util/Link.tsx b/src/view/com/util/Link.tsx index 253f80bd..f753f01c 100644 --- a/src/view/com/util/Link.tsx +++ b/src/view/com/util/Link.tsx @@ -1,4 +1,4 @@ -import React, {ComponentProps} from 'react' +import React, {ComponentProps, useMemo} from 'react' import {observer} from 'mobx-react-lite' import { Linking, @@ -21,7 +21,7 @@ import {TypographyVariant} from 'lib/ThemeContext' import {NavigationProp} from 'lib/routes/types' import {router} from '../../../routes' import {useStores, RootStoreModel} from 'state/index' -import {convertBskyAppUrlIfNeeded} from 'lib/strings/url-helpers' +import {convertBskyAppUrlIfNeeded, isExternalUrl} from 'lib/strings/url-helpers' import {isDesktopWeb} from 'platform/detection' import {sanitizeUrl} from '@braintree/sanitize-url' @@ -132,6 +132,16 @@ export const TextLink = observer(function TextLink({ }, [store, navigation, href], ) + const hrefAttrs = useMemo(() => { + const isExternal = isExternalUrl(href) + if (isExternal) { + return { + target: '_blank', + // rel: 'noopener noreferrer', + } + } + return {} + }, [href]) return ( {text}