@hashicorp/react-components 0.0.0-nightly.6467d67 → 0.0.0-nightly.68ba456

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hashicorp/react-components",
-	"version": "0.0.0-nightly.6467d67",
+	"version": "0.0.0-nightly.68ba456",
 	"main": "src/index.ts",
 	"scripts": {
 		"lint": "next-hashicorp lint",
@@ -8,7 +8,7 @@
 		"test:watch": "vitest watch"
 	},
 	"dependencies": {
-		"@hashicorp/flight-icons": "^2.15.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": "*",
@@ -24,7 +24,7 @@
 		"react-hook-form": "^7.43.5"
 	},
 	"devDependencies": {
-		"@hashicorp/platform-cli": "^2.6.0",
+		"@hashicorp/platform-cli": "^2.8.0",
 		"@hashicorp/platform-types": "^0.4.0",
 		"@testing-library/jest-dom": "^6.4.2",
 		"@vitejs/plugin-react": "^4.2.1",

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>

package/src/components/nav-panel/components/link-list/index.tsx

@@ -1,6 +1,6 @@
 import Link from 'next/link'
 import { parseUrl } from '../../../../lib/parse-url'
-import { v } from '../../../../lib/v'
+import { vercelSplit } from '../../../../lib/v'
 import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
@@ -44,8 +44,9 @@ export default function LinkList({ links, linkClickHandler }: LinkListProps) {
 				let style
 				link.iconGradient
 					? (style = {
-							'--iconGradient': GRADIENT_VALUE_MAP.get(v(link.iconGradient))
-								?.iconGradient,
+							'--iconGradient': GRADIENT_VALUE_MAP.get(
+								vercelSplit(link.iconGradient)
+							)?.iconGradient,
 					  } as React.CSSProperties)
 					: (style = null)
 				return (
@@ -60,12 +61,12 @@ export default function LinkList({ links, linkClickHandler }: LinkListProps) {
 							>
 								{link.iconGradient && link.icon ? (
 									<div className={s.iconBackground} style={style}>
-										<FlightIcon name={v(link.icon)} />
+										<FlightIcon name={vercelSplit(link.icon)} />
 									</div>
 								) : (
 									link.icon && (
 										<FlightIcon
-											name={v(link.icon)}
+											name={vercelSplit(link.icon)}
 											color="var(--token-color-foreground-faint)"
 										/>
 									)

package/src/components/nav-panel/components/panel/column/index.tsx

@@ -4,8 +4,21 @@ import s from './style.module.css'
 export interface NavColumnProps {
 	className?: string
 	children: React.ReactNode
+	hasSidePanel?: boolean
 }
 
-export default function Column({ className, children }: NavColumnProps) {
-	return <div className={classNames(s.column, className)}>{children}</div>
+export default function Column({
+	className,
+	children,
+	hasSidePanel,
+}: NavColumnProps) {
+	return (
+		<div
+			className={classNames(s.column, className, {
+				[s.hasSide]: hasSidePanel,
+			})}
+		>
+			{children}
+		</div>
+	)
 }

package/src/components/nav-panel/components/panel/column/style.module.css

@@ -1,3 +1,5 @@
+@custom-media --dev-dot-viewport (min-width: 924px);
+
 .column {
 	position: relative;
 	display: flex;
@@ -5,10 +7,18 @@
 	justify-content: flex-start;
 	min-width: 190px;
 	padding: 0;
-	margin: 0 var(--hdsplus-spacing-05);
+	margin: 0 var(--hdsplus-spacing-07);
 	border-radius: var(--hdsplus-spacing-03);
 
 	@media (--large) {
-		margin: 0;
+		&:not(.hasSide) {
+			margin: 0;
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		&.hasSide {
+			margin: 0;
+		}
 	}
 }

package/src/components/nav-panel/components/panel/root/index.tsx

@@ -4,8 +4,17 @@ import s from './style.module.css'
 interface RootProps {
 	className?: string
 	children: React.ReactNode
+	hasSidePanel?: boolean
 }
 
-export default function Root({ className, children }: RootProps) {
-	return <div className={classNames(s.root, className)}>{children}</div>
+export default function Root({ className, children, hasSidePanel }: RootProps) {
+	return (
+		<div
+			className={classNames(s.root, className, {
+				[s.hasSide]: hasSidePanel,
+			})}
+		>
+			{children}
+		</div>
+	)
 }

package/src/components/nav-panel/components/panel/root/style.module.css

@@ -1,3 +1,5 @@
+@custom-media --dev-dot-viewport (min-width: 924px);
+
 .root {
 	width: 100%;
 	display: flex;
@@ -7,10 +9,22 @@
 	min-height: calc(100dvh - var(--hdsplus-spacing-12));
 
 	@media (--large) {
-		justify-content: flex-start;
-		height: 100%;
-		min-height: fit-content;
-		padding: var(--hdsplus-spacing-05) var(--hdsplus-spacing-04);
-		gap: var(--hdsplus-spacing-04);
+		&:not(.hasSide) {
+			justify-content: flex-start;
+			height: 100%;
+			min-height: fit-content;
+			padding: var(--hdsplus-spacing-05) var(--hdsplus-spacing-04);
+			gap: var(--hdsplus-spacing-04);
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		&.hasSide {
+			justify-content: flex-start;
+			height: 100%;
+			min-height: fit-content;
+			padding: var(--hdsplus-spacing-05) var(--hdsplus-spacing-04);
+			gap: var(--hdsplus-spacing-04);
+		}
 	}
 }

package/src/components/nav-panel/components/promo/index.tsx

@@ -1,6 +1,6 @@
 import { useCallback } from 'react'
 import classNames from 'classnames'
-import { v } from '../../../../lib/v'
+import { vercelSplit } from '../../../../lib/v'
 import Link from 'next/link'
 import { parseUrl } from '../../../../lib/parse-url'
 import { trackNavClickEvent } from '../../../../lib/track-nav-click-event'
@@ -16,6 +16,7 @@ export interface PromoProps {
 	slug?: string
 	icon?: string
 	theme: string
+	hasSidePanel?: boolean
 }
 
 export default function Promo({
@@ -26,6 +27,7 @@ export default function Promo({
 	slug,
 	icon,
 	theme,
+	hasSidePanel,
 }: PromoProps) {
 	const handleClick = useCallback((title, linkUrl, linkTitle, slug) => {
 		if (window && window.analytics) {
@@ -40,23 +42,28 @@ export default function Promo({
 	}, [])
 
 	return (
-		<div className={s.promo}>
+		<div
+			className={classNames(s.promo, {
+				[s.hasSide]: hasSidePanel,
+				[s.noSide]: !hasSidePanel,
+			})}
+		>
 			{icon && (
 				<div
 					className={classNames(s.icon, {
-						[s.hashidays]: v(theme) === 'hashidays',
-						[s.hashiconf]: v(theme) === 'hashiconf',
+						[s.hashidays]: vercelSplit(theme) === 'hashidays',
+						[s.hashiconf]: vercelSplit(theme) === 'hashiconf',
 					})}
 				>
-					<FlightIcon name={v(icon)} />
+					<FlightIcon name={vercelSplit(icon)} />
 				</div>
 			)}
 			<div className={s.rightContent}>
 				<div>
 					<div
 						className={classNames(s.title, {
-							[s.hashidays]: v(theme) === 'hashidays',
-							[s.hashiconf]: v(theme) === 'hashiconf',
+							[s.hashidays]: vercelSplit(theme) === 'hashidays',
+							[s.hashiconf]: vercelSplit(theme) === 'hashiconf',
 						})}
 					>
 						{title}

package/src/components/nav-panel/components/promo/style.module.css

@@ -1,3 +1,5 @@
+@custom-media --dev-dot-viewport (min-width: 924px);
+
 .promo {
 	display: flex;
 	border-radius: var(--hdsplus-spacing-01);
@@ -7,12 +9,23 @@
 		var(--hdsplus-spacing-06) var(--hdsplus-spacing-08);
 	flex-direction: row;
 	gap: var(--hdsplus-spacing-04);
-	margin: var(--hdsplus-spacing-05);
+	margin: var(--hdsplus-spacing-07);
+	margin-bottom: var(--hdsplus-spacing-09);
 
 	@media (--large) {
-		margin: 0;
-		width: min-content;
-		min-width: 100%;
+		&.noSide {
+			margin: 0;
+			width: min-content;
+			min-width: 100%;
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		&.hasSide {
+			margin: 0;
+			width: min-content;
+			min-width: 100%;
+		}
 	}
 }
 
@@ -38,8 +51,17 @@
 	display: none;
 
 	@media (--large) {
-		display: block;
-		margin-top: 3px;
+		@nest .noSide & {
+			display: block;
+			margin-top: 3px;
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		@nest .hasSide & {
+			display: block;
+			margin-top: 3px;
+		}
 	}
 }
 

package/src/components/nav-panel/product-panel/index.tsx

@@ -1,3 +1,4 @@
+import classNames from 'classnames'
 import Link from 'next/link'
 import * as NavPanel from '../components/panel'
 import Promo, { type PromoProps } from '../components/promo'
@@ -10,7 +11,7 @@ import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
 
 const PRODUCT_LOGO_MAP = new Map([
-	['Terraform', 'terraform-fill-color'],
+	['Terraform', 'terraform-fill'],
 	['Packer', 'packer-fill-color'],
 	['Vault', 'vault-fill-color'],
 	['Boundary', 'boundary-fill-color'],
@@ -23,6 +24,7 @@ const PRODUCT_LOGO_MAP = new Map([
 ])
 
 const PRODUCT_LOGO_EXCEPTION_CLASSNAMES = {
+	Terraform: 'terraform',
 	'HCP Vault Secrets': 'hcpVaultSecrets',
 	'HCP Vault Radar': 'hcpVaultRadar',
 }
@@ -47,9 +49,15 @@ const ProductPanel = ({
 	sidePanel,
 }: ProductsPanelProps) => {
 	return (
-		<NavPanel.Root className={s.productPanel}>
+		<NavPanel.Root
+			className={classNames(s.productPanel, {
+				[s.hasSide]: sidePanel,
+				[s.noSide]: !sidePanel,
+			})}
+			hasSidePanel={Boolean(sidePanel)}
+		>
 			<div className={s.mainPanel}>
-				<NavPanel.Column>
+				<NavPanel.Column hasSidePanel={Boolean(sidePanel)}>
 					<ul className={s.productCategories}>
 						{productCategories.map(({ title, products }) => {
 							return (
@@ -69,7 +77,7 @@ const ProductPanel = ({
 						})}
 					</ul>
 				</NavPanel.Column>
-				{promo ? <Promo {...promo} /> : null}
+				{promo ? <Promo {...promo} hasSidePanel={Boolean(sidePanel)} /> : null}
 			</div>
 
 			{sidePanel ? (
@@ -87,7 +95,11 @@ const ProductPanel = ({
 						{sidePanel.navItems.map(({ icon, title, description, url }) => {
 							return (
 								<li key={title}>
-									<Link href={parseUrl(url).href} className={s.sidePanelItem}>
+									<Link
+										aria-label={`${title} - ${description}`}
+										href={parseUrl(url).href}
+										className={classNames(s.sidePanelItem, s.focusIndicator)}
+									>
 										<div className={s.iconBackground}>
 											<FlightIcon
 												size={16}
@@ -122,6 +134,7 @@ function NavProduct({ url, product, description }: NavProductProps) {
 	return (
 		<NavigationMenu.Link asChild>
 			<Link
+				aria-label={`${product} - ${description}`}
 				href={parseUrl(url).href}
 				onClickCapture={() => {
 					trackNavClickEvent(product, url, 'products')