@hashicorp/react-components 0.0.0-nightly.ed6ac6e → 0.0.0-nightly.edea2ba

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hashicorp/react-components",
-	"version": "0.0.0-nightly.ed6ac6e",
+	"version": "0.0.0-nightly.edea2ba",
 	"main": "src/index.ts",
 	"scripts": {
 		"lint": "next-hashicorp lint",
@@ -8,7 +8,7 @@
 		"test:watch": "vitest watch"
 	},
 	"dependencies": {
-		"@hashicorp/flight-icons": "^3.5.0",
+		"@hashicorp/flight-icons": "^3.7.0",
 		"@hashicorp/platform-product-meta": "^0.1.1",
 		"@hashicorp/platform-util": "^0.2.0",
 		"@hashicorp/react-design-system-components": "*",

package/src/components/card/index.test.tsx

@@ -56,7 +56,7 @@ describe('<Card />', () => {
 		const metaElement = screen.getByTestId('wpl-card-meta')
 
 		cardMeta.forEach((item) => {
-			expect(metaElement).toContainElement(screen.getByText(item))
+			expect(metaElement).toHaveTextContent(item)
 		})
 		expect(metaElement).toContainElement(screen.getByText('|'))
 	})

package/src/components/card/newsroom-card/index.test.tsx

@@ -26,7 +26,7 @@ describe('<NewsroomCard />', () => {
 		const metaElement = screen.getByTestId('wpl-card-meta')
 
 		expectedMeta.forEach((item) => {
-			expect(metaElement).toContainElement(screen.getByText(item))
+			expect(metaElement).toHaveTextContent(item)
 		})
 
 		expect(metaElement).toContainElement(screen.queryByText('|'))

package/src/components/card/primitives.tsx

@@ -33,6 +33,7 @@ const Card = React.forwardRef<HTMLAnchorElement, CardPrimitiveProps>(
 			hasBorder = true,
 			children,
 			className,
+			'aria-label': ariaLabel,
 		} = props
 
 		const linkProps = isExternal
@@ -58,7 +59,7 @@ const Card = React.forwardRef<HTMLAnchorElement, CardPrimitiveProps>(
 						href={link}
 						ref={ref}
 						className={s.link}
-						aria-label={heading}
+						aria-label={ariaLabel ?? heading}
 						onClickCapture={clickHandler}
 						{...linkProps}
 					/>
@@ -100,23 +101,23 @@ function LogoThumbnail({ src, alt }: ThumbnailProps) {
 
 function Meta({ items }: MetaProps) {
 	return (
-		<ul className={s.meta} data-testid="wpl-card-meta">
-			{items.map((item, stableIdx) => {
-				return (
-					// eslint-disable-next-line react/no-array-index-key
-					<li key={stableIdx}>
-						<TextPlus.Label>
+		<div className={s.meta} data-testid="wpl-card-meta">
+			<TextPlus.Label>
+				{items.map((item, stableIdx) => {
+					const isLastItem = stableIdx === items.length - 1
+					return (
+						<>
 							{item}
-							{stableIdx < items.length - 1 ? (
+							{!isLastItem ? (
 								<span className={s.metaSeparator} aria-hidden={true}>
 									|
 								</span>
 							) : null}
-						</TextPlus.Label>
-					</li>
-				)
-			})}
-		</ul>
+						</>
+					)
+				})}
+			</TextPlus.Label>
+		</div>
 	)
 }
 

package/src/components/card/resource-card/index.test.tsx

@@ -26,7 +26,7 @@ describe('<ResourceCard />', () => {
 		const metaElement = screen.getByTestId('wpl-card-meta')
 
 		expectedMeta.forEach((item) => {
-			expect(metaElement).toContainElement(screen.getByText(item))
+			expect(metaElement).toHaveTextContent(item)
 		})
 
 		expect(metaElement).toContainElement(screen.getByText('|'))

package/src/components/card/types.ts

@@ -10,14 +10,14 @@ import type { PersonCardProps } from './person-card'
 import type { ResourceCardProps } from './resource-card'
 import type { UnifiedCardProps } from './unified-card'
 
-export interface BaseCardProps {
+export interface BaseCardProps
+	extends React.AnchorHTMLAttributes<HTMLAnchorElement> {
 	withArrow?: boolean
 	heading: string
 	link: string
 	clickHandler?: () => void
 	isExternal?: boolean
 	hasBorder?: boolean
-	className?: string
 }
 
 export interface CardPrimitiveProps extends BaseCardProps {

package/src/components/card/unified-card/index.spec.tsx

@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) HashiCorp, Inc.
+ * SPDX-License-Identifier: MPL-2.0
+ */
+
+import { render, screen } from '@testing-library/react'
+import { UnifiedCard, UnifiedCardProps } from '.'
+
+const defaultProps: UnifiedCardProps = {
+	link: 'https://hashicorp.com',
+	heading: 'Example heading',
+	thumbnail: {
+		src: 'https://www.datocms-assets.com/19447/1648680074-screenshot-2022-03-31-at-00-40-47.png',
+		alt: 'HashiConf Europe 2022 Recap',
+	},
+} as const
+
+describe(`<UnifiedCard />`, () => {
+	it('should render the provided meta with a separator if n > 1', () => {
+		const expectedMeta = ['Category', 'Hello']
+		render(<UnifiedCard {...defaultProps} meta={expectedMeta} />)
+
+		const metaElement = screen.getByTestId('wpl-card-meta')
+
+		expectedMeta.forEach((item) => {
+			expect(metaElement).toHaveTextContent(item)
+		})
+
+		expect(metaElement).toContainElement(screen.getByText('|'))
+	})
+
+	it('it should not render a separator if n === 1', () => {
+		render(<UnifiedCard {...defaultProps} meta={['Category']} />)
+		const metaElement = screen.getByTestId('wpl-card-meta')
+
+		expect(metaElement).toContainElement(screen.getByText('Category'))
+
+		expect(metaElement).not.toContainElement(screen.queryByText('|'))
+	})
+})

package/src/components/card/unified-card/index.tsx

@@ -6,18 +6,10 @@
 import type { ReactNode } from 'react'
 import Badge from '@hashicorp/react-design-system-components/src/components/badge'
 import * as CardPrimitives from '../primitives'
-import type { CardProps, ThumbnailProps } from '../types'
+import type { CardProps } from '../types'
 
-export interface UnifiedCardProps {
-	heading: string
-	meta?: string[]
-	link: string
-	productBadges?: CardProps['productBadges']
+export interface UnifiedCardProps extends CardProps {
 	badges?: (string | [ReactNode, string])[]
-	thumbnail?: ThumbnailProps
-	withArrow?: boolean
-	isExternal?: boolean
-	className?: string
 }
 
 export function UnifiedCard({
@@ -30,6 +22,7 @@ export function UnifiedCard({
 	withArrow = false,
 	isExternal = false,
 	className,
+	'aria-label': ariaLabel,
 }: UnifiedCardProps) {
 	return (
 		<CardPrimitives.Card
@@ -38,6 +31,7 @@ export function UnifiedCard({
 			withArrow={withArrow}
 			isExternal={isExternal}
 			className={className}
+			aria-label={ariaLabel ?? heading}
 		>
 			{thumbnail ? <CardPrimitives.Thumbnail {...thumbnail} /> : null}
 			<CardPrimitives.Content>