Skip to content

Commit 2802bed

Browse files
authored
Unwrap icon from fragment on external link icon component (#9290)
1 parent a174c6c commit 2802bed

File tree

1 file changed

+29
-31
lines changed

1 file changed

+29
-31
lines changed

packages/eui/src/components/link/external_link_icon.tsx

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -39,39 +39,37 @@ export const EuiExternalLinkIcon: FunctionComponent<
3939
const showExternalLinkIcon =
4040
(target === '_blank' && external !== false) || external === true;
4141

42+
if (!showExternalLinkIcon) {
43+
return null;
44+
}
45+
4246
return (
4347
<>
44-
{showExternalLinkIcon && (
45-
<>
46-
<EuiIcon
47-
css={iconCssStyle}
48-
size="s"
49-
type="popout"
50-
role="presentation"
51-
{...rest}
52-
/>
53-
{target === '_blank' ? (
54-
<EuiScreenReaderOnly>
55-
<span>
56-
<EuiI18n
57-
token="euiExternalLinkIcon.newTarget.screenReaderOnlyText"
58-
default="(external, opens in a new tab or window)"
59-
/>
60-
</span>
61-
</EuiScreenReaderOnly>
62-
) : (
63-
<>
64-
<EuiScreenReaderOnly>
65-
<span>
66-
<EuiI18n
67-
token="euiExternalLinkIcon.externalTarget.screenReaderOnlyText"
68-
default="(external)"
69-
/>
70-
</span>
71-
</EuiScreenReaderOnly>
72-
</>
73-
)}
74-
</>
48+
<EuiIcon
49+
css={iconCssStyle}
50+
size="s"
51+
type="popout"
52+
role="presentation"
53+
{...rest}
54+
/>
55+
{target === '_blank' ? (
56+
<EuiScreenReaderOnly>
57+
<span>
58+
<EuiI18n
59+
token="euiExternalLinkIcon.newTarget.screenReaderOnlyText"
60+
default="(external, opens in a new tab or window)"
61+
/>
62+
</span>
63+
</EuiScreenReaderOnly>
64+
) : (
65+
<EuiScreenReaderOnly>
66+
<span>
67+
<EuiI18n
68+
token="euiExternalLinkIcon.externalTarget.screenReaderOnlyText"
69+
default="(external)"
70+
/>
71+
</span>
72+
</EuiScreenReaderOnly>
7573
)}
7674
</>
7775
);

0 commit comments

Comments
 (0)