diff --git a/packages/fakeyou.com/src/components/common/Accordion/Accordion.tsx b/packages/fakeyou.com/src/components/common/Accordion/Accordion.tsx index 206b841044..f44214a189 100644 --- a/packages/fakeyou.com/src/components/common/Accordion/Accordion.tsx +++ b/packages/fakeyou.com/src/components/common/Accordion/Accordion.tsx @@ -11,6 +11,7 @@ import { faChevronDown } from "@fortawesome/pro-solid-svg-icons"; import { animated, useSpring } from "@react-spring/web"; interface AccordionProps { + className?: string; children: React.ReactNode; } @@ -96,7 +97,7 @@ function AccordionItem({ ); } -function Accordion({ children }: AccordionProps) { +function Accordion({ children, className }: AccordionProps) { // Extract titles of items that should be initially open const defaultOpenTitles = React.Children.toArray(children) .filter((child: any) => child.props.defaultOpen) @@ -115,7 +116,9 @@ function Accordion({ children }: AccordionProps) { return ( -
{children}
+
+ {children} +
); } diff --git a/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx b/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx index 5ff6a88a26..888d49c8df 100644 --- a/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx +++ b/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx @@ -12,8 +12,8 @@ import Button from "components/common/Button"; import useWeightTypeInfo from "hooks/useWeightTypeInfo/useWeightTypeInfo"; import WeightCoverImage from "components/common/WeightCoverImage"; import { BucketConfig } from "@storyteller/components/src/api/BucketConfig"; -import useToken from "hooks/useToken"; import getCardUrl from "../getCardUrl"; +// import getCardUrl from "../getCardUrl"; interface AudioCardProps { bookmarks?: any; @@ -24,8 +24,8 @@ interface AudioCardProps { source?: string; type: "media" | "weights"; inSelectModal?: boolean; - onClick?: (e:any) => any; - onResultSelect?: () => void; + onResultSelect?: (data: { token: string; title: string }) => void; + // onClick?: (e:any) => any; } export default function AudioCard({ @@ -37,11 +37,10 @@ export default function AudioCard({ source = "", type, inSelectModal = false, - onClick: inClick, + // onClick: inClick, onResultSelect, }: AudioCardProps) { - const { setToken, setWeightTitle } = useToken(); - const linkUrl = getCardUrl(data,source,type); + const linkUrl = getCardUrl(data, source, type); const history = useHistory(); const handleInnerClick = (event: any) => { @@ -49,10 +48,11 @@ export default function AudioCard({ }; const handleSelectModalResultSelect = () => { - if (inSelectModal) { - setToken(data.weight_token); - setWeightTitle && setWeightTitle(data.title); - onResultSelect && onResultSelect(); + if (inSelectModal && onResultSelect) { + onResultSelect({ + token: data.weight_token, + title: data.title, + }); } }; @@ -85,10 +85,6 @@ export default function AudioCard({ } } - // const onClick = () => { - // if (inClick) inClick(data); - // }; - const card = ( - {inClick ? ( + {inSelectModal ? (