@hashicorp/react-components 0.0.0-canary.29ac326 → 0.0.0-canary.32599ff

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hashicorp/react-components",
-	"version": "0.0.0-canary.29ac326",
+	"version": "0.0.0-canary.32599ff",
 	"main": "src/index.ts",
 	"scripts": {
 		"lint": "next-hashicorp lint",
@@ -8,23 +8,24 @@
 		"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": "*",
+		"@hashicorp/react-mds": "*",
 		"@hashicorp/web-mktg-logos": "*",
 		"@radix-ui/react-navigation-menu": "^1.2.0",
 		"@radix-ui/react-visually-hidden": "^1.1.0",
-		"@vercel/analytics": "^1.3.1",
 		"@vercel/fetch": "^7.0.0",
 		"@vercel/stega": "^0.1.2",
 		"classnames": "^2.3.2",
+		"isomorphic-unfetch": "4.0.2",
 		"js-cookie": "^3.0.5",
 		"moize": "^6.1.3",
-		"react-hook-form": "^7.43.5"
+		"react-hook-form": "^7.43.5",
+		"react-player": "2.10.1"
 	},
 	"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/actions/index.tsx

@@ -4,8 +4,8 @@
  */
 
 import classNames from 'classnames'
-import Button from '@hashicorp/react-design-system-components/src/components/button'
-import StandaloneLink from '@hashicorp/react-design-system-components/src/components/standalone-link'
+import { HDSButton } from '@hashicorp/react-mds/src/hds/components/button'
+import { HDSPlusStandaloneLink } from '@hashicorp/react-mds/src/hds-plus/standalone-link'
 import { IconArrowRight16 } from '@hashicorp/flight-icons/svg-react/arrow-right-16'
 import { IconArrowRight24 } from '@hashicorp/flight-icons/svg-react/arrow-right-24'
 import type { ActionsProps } from './types'
@@ -49,7 +49,7 @@ export default function Actions({
 				// have the `primary` and `secondary` variations respectively.
 
 				const standaloneLinkVariant: ComponentProps<
-					typeof StandaloneLink
+					typeof HDSPlusStandaloneLink
 				>['color'] =
 					index === 0
 						? 'primary'
@@ -60,7 +60,7 @@ export default function Actions({
 
 				if (isStandaloneLink) {
 					return (
-						<StandaloneLink
+						<HDSPlusStandaloneLink
 							// eslint-disable-next-line react/no-array-index-key
 							key={index}
 							text={cta.title}
@@ -89,7 +89,7 @@ export default function Actions({
 					)
 				} else {
 					return (
-						<Button
+						<HDSButton
 							// eslint-disable-next-line react/no-array-index-key
 							key={index}
 							text={cta.title}

package/src/components/call-to-action/index.tsx

@@ -3,10 +3,12 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import type { ComponentProps, ReactNode } from 'react'
-import Button from '@hashicorp/react-design-system-components/src/components/button'
-import ButtonSet from '@hashicorp/react-design-system-components/src/components/button-set'
-import StandaloneLink from '@hashicorp/react-design-system-components/src/components/standalone-link'
+import type { ReactNode } from 'react'
+import {
+	ButtonColor,
+	HDSButton,
+} from '@hashicorp/react-mds/src/hds/components/button'
+import { HDSPlusStandaloneLink } from '@hashicorp/react-mds/src/hds-plus/standalone-link'
 import { IconArrowRight24 } from '@hashicorp/flight-icons/svg-react/arrow-right-24'
 import { IconExternalLink24 } from '@hashicorp/flight-icons/svg-react/external-link-24'
 import { IconDownload24 } from '@hashicorp/flight-icons/svg-react/download-24'
@@ -117,9 +119,9 @@ function CallToAction({
 						</div>
 					)}
 					{links && (
-						<ButtonSet className={s.links} data-testid="links">
+						<div className={s.links} data-testid="links">
 							{links.map((link, stableIdx) => {
-								let color: ComponentProps<typeof Button>['color'] =
+								let color: ButtonColor =
 									variant === 'links'
 										? 'tertiary'
 										: stableIdx === 0
@@ -128,7 +130,7 @@ function CallToAction({
 
 								if (color === 'tertiary') {
 									return (
-										<StandaloneLink
+										<HDSPlusStandaloneLink
 											key={stableIdx}
 											color="secondary"
 											text={link.text}
@@ -158,7 +160,7 @@ function CallToAction({
 									color = 'secondary'
 								} else if (theme === 'brand' && color === 'secondary') {
 									return (
-										<StandaloneLink
+										<HDSPlusStandaloneLink
 											key={stableIdx}
 											color="secondary-inverted"
 											text={link.text}
@@ -177,7 +179,7 @@ function CallToAction({
 								}
 
 								return (
-									<Button
+									<HDSButton
 										// eslint-disable-next-line react/no-array-index-key
 										key={stableIdx}
 										// className={s.button}
@@ -194,7 +196,7 @@ function CallToAction({
 									/>
 								)
 							})}
-						</ButtonSet>
+						</div>
 					)}
 				</div>
 			</div>

package/src/components/call-to-action/styles/variant-centered.module.css

@@ -4,7 +4,7 @@
  */
 
 .root {
-	--background: var(--white);
+	--background: var(--wpl-neutral-0);
 	--text-color-display: var(--gray-1);
 	--text-color-body: var(--gray-2);
 
@@ -23,14 +23,14 @@
 	}
 
 	&.theme-dark {
-		--background: var(--black);
-		--text-color-display: var(--white);
+		--background: var(--wpl-neutral-900);
+		--text-color-display: var(--wpl-neutral-0);
 		--text-color-body: var(--gray-5);
 	}
 
 	&.theme-brand {
 		--background: var(--brand);
-		--text-color-display: var(--white);
+		--text-color-display: var(--wpl-neutral-0);
 		--text-color-body: var(--gray-6);
 	}
 }
@@ -67,6 +67,7 @@
 	display: flex;
 	flex-wrap: wrap;
 	justify-content: center;
+	gap: var(--mds-spacing-05);
 
 	/*
       * Margins here account for extra 8px margin on buttons

package/src/components/call-to-action/styles/variant-compact-grid.module.css

@@ -4,7 +4,7 @@
  */
 
 .root {
-	--background: var(--white);
+	--background: var(--wpl-neutral-0);
 	--text-color-display: var(--gray-1);
 	--text-color-body: var(--gray-2);
 
@@ -23,14 +23,14 @@
 	}
 
 	&.theme-dark {
-		--background: var(--black);
-		--text-color-display: var(--white);
+		--background: var(--wpl-neutral-900);
+		--text-color-display: var(--wpl-neutral-0);
 		--text-color-body: var(--gray-5);
 	}
 
 	&.theme-brand {
 		--background: var(--brand);
-		--text-color-display: var(--white);
+		--text-color-display: var(--wpl-neutral-0);
 		--text-color-body: var(--gray-6);
 	}
 }
@@ -74,6 +74,8 @@
 }
 
 .links {
+	display: flex;
+	gap: var(--mds-spacing-05);
 	margin-top: 32px;
 	margin-bottom: -16px;
 

package/src/components/call-to-action/styles/variant-compact.module.css

@@ -4,7 +4,7 @@
  */
 
 .root {
-	--background: var(--white);
+	--background: var(--wpl-neutral-0);
 	--text-color-display: var(--gray-1);
 	--text-color-body: var(--gray-2);
 
@@ -23,14 +23,14 @@
 	}
 
 	&.theme-dark {
-		--background: var(--black);
-		--text-color-display: var(--white);
+		--background: var(--wpl-neutral-900);
+		--text-color-display: var(--wpl-neutral-0);
 		--text-color-body: var(--gray-5);
 	}
 
 	&.theme-brand {
 		--background: var(--brand);
-		--text-color-display: var(--white);
+		--text-color-display: var(--wpl-neutral-0);
 		--text-color-body: var(--gray-6);
 	}
 }
@@ -77,6 +77,8 @@
 }
 
 .links {
+	display: flex;
+	gap: var(--mds-spacing-05);
 	margin-top: 32px;
 	margin-bottom: -16px;
 

package/src/components/call-to-action/styles/variant-links.module.css

@@ -4,7 +4,7 @@
  */
 
 .root {
-	--background: var(--white);
+	--background: var(--wpl-neutral-0);
 	--text-color-display: var(--gray-1);
 	--text-color-body: var(--gray-2);
 
@@ -23,14 +23,14 @@
 	}
 
 	&.theme-dark {
-		--background: var(--black);
-		--text-color-display: var(--white);
+		--background: var(--wpl-neutral-900);
+		--text-color-display: var(--wpl-neutral-0);
 		--text-color-body: var(--gray-5);
 	}
 
 	&.theme-brand {
 		--background: var(--brand);
-		--text-color-display: var(--white);
+		--text-color-display: var(--wpl-neutral-0);
 		--text-color-body: var(--gray-6);
 	}
 }
@@ -61,18 +61,13 @@
 }
 
 .links {
+	display: flex;
+	gap: var(--mds-spacing-05);
 	margin-top: 32px;
 
 	@media (--large) {
 		margin-top: 40px;
 	}
-
-	&::after {
-		display: block;
-		float: none;
-		content: '';
-		clear: both;
-	}
 }
 
 .button {

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/newsroom-card/style.module.css

@@ -1,6 +1,6 @@
 .newsroomCard {
 	& img {
-		padding: var(--hdsplus-spacing-07);
+		padding: var(--mds-spacing-07);
 		aspect-ratio: 16 / 9;
 
 		/* 

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

@@ -4,9 +4,9 @@
  */
 
 import Image, { type ImageProps } from 'next/image'
-import Badge from '@hashicorp/react-design-system-components/src/components/badge'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
-import { TextPlus } from '@hashicorp/react-design-system-components/src/components/text'
+import { Badge } from '@hashicorp/react-mds/src/components/badge'
+import FlightIcon from '@hashicorp/react-mds/src/hds/components/flight-icon'
+import { Text } from '@hashicorp/react-mds/src/components/text'
 import * as CardPrimitives from '../primitives'
 import type { CardProps } from '../types'
 import s from './style.module.css'
@@ -48,9 +48,9 @@ export function PartnerCard({
 			</div>
 			<CardPrimitives.Content>
 				<CardPrimitives.Meta items={meta} />
-				<TextPlus.Body tag="p" size="200" className={s.description}>
+				<Text.Body tag="p" size="200" className={s.description}>
 					{description}
-				</TextPlus.Body>
+				</Text.Body>
 				{hasProductBadges || hasCompetencyBadges ? (
 					<CardPrimitives.ProductBadges badges={productBadges || []}>
 						{hasCompetencyBadges &&

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

@@ -4,7 +4,7 @@
  */
 
 import { memo, type ReactNode } from 'react'
-import { TextPlus } from '@hashicorp/react-design-system-components/src/components/text'
+import { Text } from '@hashicorp/react-mds/src/components/text'
 import { IconGithub16 } from '@hashicorp/flight-icons/svg-react/github-16'
 import { IconTwitter16 } from '@hashicorp/flight-icons/svg-react/twitter-16'
 import { IconLinkedin16 } from '@hashicorp/flight-icons/svg-react/linkedin-16'
@@ -76,9 +76,9 @@ export function PersonCard({
 				<div>
 					<CardPrimitives.Heading>{name}</CardPrimitives.Heading>
 					{location ? (
-						<TextPlus.Body tag="p" size="200" className={s.location}>
+						<Text.Body tag="p" size="200" className={s.location}>
 							{location}
-						</TextPlus.Body>
+						</Text.Body>
 					) : null}
 				</div>
 				{bio ? (

package/src/components/card/primitives.tsx

@@ -7,8 +7,8 @@ import * as React from 'react'
 import classNames from 'classnames'
 import Image from 'next/image'
 import Link from 'next/link'
-import HDSCard from '@hashicorp/react-design-system-components/src/components/card'
-import { TextPlus } from '@hashicorp/react-design-system-components/src/components/text'
+import HDSCard from '@hashicorp/react-mds/src/hds/components/card'
+import { Text } from '@hashicorp/react-mds/src/components/text'
 import { IconArrowRight24 } from '@hashicorp/flight-icons/svg-react/arrow-right-24'
 import ProductBadge from '../product-badge'
 import type {
@@ -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">
+			<Text.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>
+						</>
+					)
+				})}
+			</Text.Label>
+		</div>
 	)
 }
 
@@ -130,9 +131,9 @@ function Content({ children }: ContentProps) {
 
 function Heading({ as = 'h2', children }: HeadingProps) {
 	return (
-		<TextPlus.DisplayExpressive tag={as} size="200" className={s.heading}>
+		<Text.DisplayExpressive tag={as} size="200" className={s.heading}>
 			{children}
-		</TextPlus.DisplayExpressive>
+		</Text.DisplayExpressive>
 	)
 }
 
@@ -156,9 +157,9 @@ function ProductBadges({ badges, children }: ProductBadgesProps) {
 
 function Description({ children }: DescriptionProps) {
 	return (
-		<TextPlus.Body tag="p" size="200" className={s.description}>
+		<Text.Body tag="p" size="200" className={s.description}>
 			{children}
-		</TextPlus.Body>
+		</Text.Body>
 	)
 }
 

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/resource-card/index.tsx

@@ -13,6 +13,7 @@ export interface ResourceCardProps {
 	link: string
 	productBadges?: CardProps['productBadges']
 	thumbnail: ThumbnailProps
+	isExternal?: CardProps['isExternal']
 }
 
 export function ResourceCard({
@@ -22,6 +23,7 @@ export function ResourceCard({
 	link,
 	productBadges,
 	thumbnail,
+	isExternal,
 }: ResourceCardProps) {
 	const meta: string[] = date ? [date, category] : [category]
 
@@ -32,6 +34,7 @@ export function ResourceCard({
 			meta={meta}
 			productBadges={productBadges}
 			thumbnail={thumbnail}
+			isExternal={isExternal}
 		/>
 	)
 }

package/src/components/card/style.module.css

@@ -71,7 +71,7 @@
 
 .logoThumbnail {
 	composes: thumbnail;
-	padding: var(--hdsplus-spacing-07);
+	padding: var(--mds-spacing-07);
 
 	& .image {
 		aspect-ratio: none;
@@ -109,7 +109,7 @@
 }
 
 .heading {
-	font-weight: var(--token-typography-font-weight-bold);
+	font-weight: var(--mds-typography-font-weight-bold);
 	color: var(--token-color-foreground-strong);
 	margin: 0;
 }

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

@@ -4,20 +4,12 @@
  */
 
 import type { ReactNode } from 'react'
-import Badge from '@hashicorp/react-design-system-components/src/components/badge'
+import { Badge } from '@hashicorp/react-mds/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>