feat: use ConditionalLink -refs #263347

eea · May 7, 2024 · 843d101 · 843d101
1 parent 636719c
commit 843d101
Showing 1 changed file with 11 additions and 14 deletions.
diff --git a/src/Tags/Tags.jsx b/src/Tags/Tags.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import cx from 'classnames';
 import { Icon } from 'semantic-ui-react';
-import { UniversalLink } from '@plone/volto/components';
+import { ConditionalLink } from '@plone/volto/components';
 import { getFieldURL } from '@eeacms/volto-tags-block/helpers';
 
 function TagList({ children, position }) {
@@ -17,19 +17,16 @@ TagList.Content = ({ children }) => (
 );
 
 TagList.Tag = ({ children, href, openLinkInNewTab, showTagIcon }) => {
-  return href ? (
-    <UniversalLink
-      className="tag link"
-      href={getFieldURL(href)}
-      openLinkInNewTab={openLinkInNewTab}
-    >
-      {showTagIcon && <Icon className={`icon`} name="hashtag" />}
-      <span className="name">{children}</span>
-    </UniversalLink>
-  ) : (
-    <div className="tag">
-      {showTagIcon && <Icon className={`icon`} name="hashtag" />}
-      <span className="name">{children}</span>
+  return (
+    <div className={`tag ${href ? 'link' : ''}`}>
+      <ConditionalLink
+        condition={href}
+        to={href ? getFieldURL(href) : null}
+        openLinkInNewTab={openLinkInNewTab}
+      >
+        {showTagIcon && <Icon className={`icon`} name="hashtag" />}
+        <span className="name">{children}</span>
+      </ConditionalLink>
     </div>
   );
 };