diff --git a/app/scripts/components/common/card/index.tsx b/app/scripts/components/common/card/index.tsx index a1a7e3d19..e0fde1bb6 100644 --- a/app/scripts/components/common/card/index.tsx +++ b/app/scripts/components/common/card/index.tsx @@ -263,15 +263,14 @@ function CardComponent(props: CardComponentProps) { return ( - // - <> + { cardType !== 'horizontal-info' && ( <> @@ -325,8 +324,7 @@ function CardComponent(props: CardComponentProps) { /> ) } - {/* */} - + ); } diff --git a/app/scripts/components/common/catalog/catalog-card.tsx b/app/scripts/components/common/catalog/catalog-card.tsx index 10f0380b2..3e45378b4 100644 --- a/app/scripts/components/common/catalog/catalog-card.tsx +++ b/app/scripts/components/common/catalog/catalog-card.tsx @@ -120,9 +120,9 @@ export const CatalogCard = (props: CatalogCardProps) => { } - // linkTo={getDatasetPath(dataset)} + linkTo={getDatasetPath(dataset)} linkLabel='View dataset' - // onLinkClick={handleClick} + onLinkClick={handleClick} title={ {title} @@ -135,24 +135,24 @@ export const CatalogCard = (props: CatalogCardProps) => { } imgSrc={imgSrc} imgAlt={imgAlt} - // footerContent={ - // <> - // {topics?.length ? ( - // - //
Topics
- // {topics.map((t) => ( - //
- // - // - // {t.name} - // - // - //
- // ))} - //
- // ) : null} - // - // } + footerContent={ + <> + {topics?.length ? ( + +
Topics
+ {topics.map((t) => ( +
+ + + {t.name} + + +
+ ))} +
+ ) : null} + + } /> ); }; diff --git a/app/scripts/components/common/element-interactive.js b/app/scripts/components/common/element-interactive.js index ffa346a75..d52b74879 100644 --- a/app/scripts/components/common/element-interactive.js +++ b/app/scripts/components/common/element-interactive.js @@ -2,14 +2,14 @@ import React, { useCallback, useState } from 'react'; import T from 'prop-types'; import styled from 'styled-components'; -const InteractiveLink = styled.a` - position: absolute; - inset: 0; - z-index: -1; - pointer-events: auto; - font-size: 0; - margin: 0; -`; +// const InteractiveLink = styled.a` +// position: absolute; +// inset: 0; +// z-index: -1; +// pointer-events: auto; +// font-size: 0; +// margin: 0; +// `; export const Wrapper = styled.div` position: relative; @@ -77,7 +77,7 @@ export const ElementInteractive = React.forwardRef( const [isStateOver, setStateOver] = useState(false); const [isStateActive, setStateActive] = useState(false); const [isStateFocus, setStateFocus] = useState(false); - + console.log(`linkLabel: `, linkLabel) return ( {children} - setStateActive(true), [])} + onMouseUp={useCallback(() => setStateActive(false), [])} + onFocus={useCallback(() => setStateFocus(true), [])} + onBlur={useCallback(() => setStateFocus(false), [])} + > + {linkLabel} + */} + setStateActive(true), [])} onMouseUp={useCallback(() => setStateActive(false), [])} @@ -102,7 +111,7 @@ export const ElementInteractive = React.forwardRef( onBlur={useCallback(() => setStateFocus(false), [])} > {linkLabel} - + ); }