@hashicorp/react-components 0.0.0-nightly.546d10f → 0.0.0-nightly.57c5289

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hashicorp/react-components",
-	"version": "0.0.0-nightly.546d10f",
+	"version": "0.0.0-nightly.57c5289",
 	"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>

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/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'
@@ -51,19 +51,19 @@ export default function Promo({
 			{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/subnav/index.tsx

@@ -164,6 +164,10 @@ function Subnav({ className, theme = 'light', ...restProps }: SubnavProps) {
 		setActivePanel(panel)
 	}
 
+	const ariaLabel = restProps?.titleLink?.text
+		? `${restProps.titleLink.text} pages`
+		: 'Subnav pages'
+
 	return (
 		<>
 			{/**
@@ -179,7 +183,7 @@ function Subnav({ className, theme = 'light', ...restProps }: SubnavProps) {
 					[s.hasOverflow]: hasOverflow,
 					'hdsplus-dark-mode': theme === 'dark',
 				})}
-				aria-label={`${product} website navigation`}
+				aria-label={ariaLabel}
 				onValueChange={activatePanel}
 				value={activePanel}
 				delayDuration={0}

package/src/components/subnav/partials/MenuItemsOverflow/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import React from 'react'
-import { v } from '../../../../lib/v'
+import { vercelSplit } from '../../../../lib/v'
 import Link from 'next/link'
 import type { Products } from '@hashicorp/platform-product-meta'
 import CtaLinks, { type CtaLinkProps } from '../CtaLinks'
@@ -131,7 +131,7 @@ function SubmenuItem({ icon, url, text }: SubmenuItemProps) {
 	return (
 		<li>
 			<NavigationMenu.Link asChild>
-				<Link className={s.submenuItem} href={url} title={v(text)}>
+				<Link className={s.submenuItem} href={url} title={vercelSplit(text)}>
 					{icon ? <FlightIcon name={icon} /> : null}
 					{text}
 				</Link>

package/src/components/subnav/partials/TitleLink/index.tsx

@@ -7,7 +7,7 @@ import { forwardRef } from 'react'
 import { camelCase } from 'camel-case'
 import Link from 'next/link'
 import Image from 'next/image'
-import { v } from '../../../../lib/v'
+import { vercelSplit } from '../../../../lib/v'
 import classNames from 'classnames'
 import * as CommunityProductLogosOnDark from './mktg-logos/all-community-product-logos_on-dark'
 import * as CommunityProductLogosOnLight from './mktg-logos/all-community-product-logos_on-light'
@@ -81,7 +81,7 @@ function getLogo(
 
 const TitleLink = forwardRef<HTMLAnchorElement, TitleLinkProps>(
 	({ text, url, product, theme }, ref) => {
-		const parsedText = v(text)
+		const parsedText = vercelSplit(text)
 		const Logo = getLogo(parsedText, theme)
 
 		return (

package/src/lib/v/index.ts

@@ -3,9 +3,8 @@ import { vercelStegaSplit } from '@vercel/stega'
 /**
  * Takes in a Vercel Visual Editing string and returns the string without
  * hidden data.
+ *
  */
-export function v<VercelVEString extends string>(
-	s: VercelVEString
-): VercelVEString {
-	return vercelStegaSplit(s).cleaned as VercelVEString
-}
+export const vercelSplit = <VercelString>(
+	original: VercelString
+): VercelString => vercelStegaSplit(original as string).cleaned as VercelString

package/src/components/consent-manager/README.md

@@ -1,73 +0,0 @@
-# Consent Manager
-
-A GDPR-compliant consent manager.
-
-### Props
-
-- `version` (integer) - version number, bump up to override previous consent preferences
-- `container` (string) - id of container where the consent manager should live
-- `companyName` (string) - your company name to be inserted in various copy
-- `privacyPolicyLink` (string) - link to your company's privacy policy
-- `segmentWriteKey` (string) - your production segment write key
-- `segmentServices` (array of objects) - use this to override the category or description of a service provided by Segment
-  - `name` - name of the Segment integration, must match the integration you are overriding
-  - `category` _[optional]_ - new category name
-  - `description` _[optional]_ - new description
-- `categories` (array) - State of toggle
-  - `name` - name of category
-  - `description` - description for the category
-- `additionalServices` (array of objects) - additional integrations outside of Segment that you wish to include in the consent manager
-  - `name` - name of service
-  - `description` - description of service
-  - `category` - category of service
-  - `body` _[optional]_ - javascript body associated with service _If present, overrides `url` below_
-  - `url` _[optional]_ - url of js file associated with service
-  - `async` (bool) _[optional]_ - add `async` property to script element
-  - `addToBody` (bool) _[optional]_ - inject script before closing `<body>` tag
-  - `dataAttrs` (arr) _[optional]_ - array of `data-` attributes to add to script tag
-    - `name` (str) - name of data attribute (`data-name`)
-    - `value` (str) - value of `data` attribute to set
-- `showDialog` (bool) - whether or not the dialog `open` attribute is true
-
-
-## `SegmentPreloadScript`
-
-In `v9.0.0`, ConsentManager now exports a `SegmentPreloadScript` component. Why? ConsentManager uses a very similar Segment script to the current preloading script that we use in our `_document.tsx/js` files.
-
-Now that we're updating both with a custom Segment AJS URL and CDN hostname, it makes sense for the two to be co-located.
-
-Expect the new change to look like the following:
-
-```diff
-// pages/_document.tsx
-
-
-  import Document, { Html, Head, Main, NextScript } from 'next/document'
-  import HashiHead from '@hashicorp/react-head'
-+ import { SegmentPreloadScript } from '@web/react-components/src/components/consent-manager/scripts/segment'
-  // other imports
-
-  export default class MyDocument extends Document {
-    static async getInitialProps(ctx) {
-      const initialProps = await Document.getInitialProps(ctx)
-      return { ...initialProps }
-    }
-
-    render() {
-      return (
-        <Html lang="en">
-          <Head>
-            <HashiHead />
-          </Head>
-          <body>
--           <script
--             dangerouslySetInnerHTML={{
--               __html: `!function(){var analytics=window... ... ...`
--             }}
--           />
-+           <SegmentPreloadScript />
-
-// etc...
-```
-
-No additional updates are necessary!

package/src/components/consent-manager/components/banner/banner.module.css

@@ -1,23 +0,0 @@
-.root {
-	background-color: var(--token-color-surface-strong);
-	width: 100%;
-	padding: 10px 15px;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	z-index: 10;
-	font-size: 0.9rem;
-}
-
-.innerContainer {
-	composes: g-grid-container from global;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	gap: var(--hdsplus-spacing-01);
-	flex-direction: column;
-
-	@media (min-width: 1350px) {
-		flex-direction: row;
-	}
-}

package/src/components/consent-manager/components/banner/banner.test.tsx

@@ -1,31 +0,0 @@
-import { render, screen, fireEvent } from '@testing-library/react'
-import ConsentBanner from './banner'
-
-test('should display the correct privacy policy url', () => {
-	const testValue = 'test'
-	render(<ConsentBanner privacyPolicyLink={testValue} />)
-	expect(screen.getByTestId('privacy-policy')).toHaveAttribute(
-		'href',
-		testValue
-	)
-})
-
-test('should display the correct cookie policy url', () => {
-	const testValue = 'test'
-	render(<ConsentBanner cookiePolicyLink={testValue} />)
-	expect(screen.getByTestId('cookie-policy')).toHaveAttribute('href', testValue)
-})
-
-test('should run the onManagePreferences function when the correct button is clicked', () => {
-	const mock = vi.fn()
-	render(<ConsentBanner onManagePreferences={mock} />)
-	fireEvent.click(screen.getByTestId('manage-preferences'))
-	expect(mock).toHaveBeenCalled()
-})
-
-test('should run the onAccept function when the correct button is clicked', () => {
-	const mock = vi.fn()
-	render(<ConsentBanner onAccept={mock} />)
-	fireEvent.click(screen.getByTestId('accept'))
-	expect(mock).toHaveBeenCalled()
-})

package/src/components/consent-manager/components/banner/banner.tsx

@@ -1,73 +0,0 @@
-import Link from 'next/link'
-import Button from '@hashicorp/react-design-system-components/src/components/button'
-import ButtonSet from '@hashicorp/react-design-system-components/src/components/button-set'
-import Text from '@hashicorp/react-design-system-components/src/components/text'
-import s from './banner.module.css'
-
-interface ConsentBannerProps {
-	preferences?: { loadAll?: boolean }
-	privacyPolicyLink?: string
-	cookiePolicyLink?: string
-	onManagePreferences?: () => void
-	onAccept?: () => void
-}
-
-export default function ConsentBanner({
-	preferences,
-	privacyPolicyLink,
-	cookiePolicyLink,
-	onManagePreferences,
-	onAccept,
-}: ConsentBannerProps) {
-	return (
-		<div className={s.root} data-testid="consent-banner">
-			<div className={s.innerContainer}>
-				<Text.Body color="primary">
-					We use cookies & other similar technology to collect data to improve
-					your experience on our site, as described in our{' '}
-					<Link
-						href={
-							privacyPolicyLink ?? 'https://www.hashicorp.com/trust/privacy'
-						}
-						className={s.link}
-						target="_blank"
-						rel="noopener noreferrer"
-						data-testid="privacy-policy"
-					>
-						Privacy Policy
-					</Link>{' '}
-					and{' '}
-					<Link
-						href={
-							cookiePolicyLink ??
-							'https://www.hashicorp.com/trust/privacy/cookies'
-						}
-						className={s.link}
-						target="_blank"
-						rel="noopener noreferrer"
-						data-testid="cookie-policy"
-					>
-						Cookie Policy
-					</Link>
-					.
-				</Text.Body>
-				<div>
-					<ButtonSet>
-						<Button
-							onClick={onManagePreferences}
-							color="secondary"
-							data-testid="manage-preferences"
-							text="Manage Preferences"
-						/>
-						<Button
-							onClick={onAccept}
-							color="primary"
-							data-testid="accept"
-							text={preferences?.loadAll ? 'Dismiss' : 'Accept'}
-						/>
-					</ButtonSet>
-				</div>
-			</div>
-		</div>
-	)
-}