fix: move launch icon logic to Anchor

dnbexperience · Nov 28, 2023 · 127c242 · 127c242
1 parent fd42b41
commit 127c242
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/packages/dnb-eufemia/src/components/anchor/Anchor.tsx b/packages/dnb-eufemia/src/components/anchor/Anchor.tsx
@@ -84,8 +84,7 @@ export function AnchorInstance(localProps: AnchorAllProps) {
   let suffix: React.ReactNode
 
   const href = allProps.href || allProps.to
-  const showLaunchIcon =
-    allProps.target === '_blank' && !/^(mailto|tel|sms)/.test(href)
+  const showLaunchIcon = opensNewTab(allProps.target, href)
   const showTooltip = (tooltip || showLaunchIcon) && !allProps.title
 
   // WCAG guide: https://www.w3.org/TR/WCAG20-TECHS/G201.html
@@ -205,3 +204,6 @@ export function pickIcon(icon) {
       })
     : null
 }
+
+export const opensNewTab = (target: string, href: string): boolean =>
+  target === '_blank' && !/^(mailto|tel|sms)/.test(href)
diff --git a/packages/dnb-eufemia/src/components/button/Button.js b/packages/dnb-eufemia/src/components/button/Button.js
@@ -28,7 +28,7 @@ import {
 import { pickFormElementProps } from '../../shared/helpers/filterValidProps'
 import IconPrimary from '../icon-primary/IconPrimary'
 import FormStatus from '../form-status/FormStatus'
-import Anchor, { pickIcon } from '../anchor/Anchor'
+import Anchor, { pickIcon, opensNewTab } from '../anchor/Anchor'
 import { launch } from '../../icons'
 import Tooltip from '../tooltip/Tooltip'
 
@@ -182,11 +182,7 @@ export default class Button extends React.PureComponent {
       : 'button'
     if (Element === Anchor) {
       attributes.omitClass = true
-      if (
-        props.target === '_blank' &&
-        !/^(mailto|tel|sms)/.test(props.href) &&
-        !icon
-      ) {
+      if (opensNewTab(props.target, props.href) && !icon) {
         icon = launch
       }
     }