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

package/package.json

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

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

@@ -1,4 +1,4 @@
-@custom-media --dev-dot-viewport (min-width: 1230px);
+@custom-media --dev-dot-viewport (min-width: 924px);
 
 .column {
 	position: relative;

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

@@ -1,4 +1,4 @@
-@custom-media --dev-dot-viewport (min-width: 1230px);
+@custom-media --dev-dot-viewport (min-width: 924px);
 
 .root {
 	width: 100%;

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/nav-panel/components/promo/style.module.css

@@ -1,4 +1,4 @@
-@custom-media --dev-dot-viewport (min-width: 1230px);
+@custom-media --dev-dot-viewport (min-width: 924px);
 
 .promo {
 	display: flex;

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

@@ -95,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}
@@ -130,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')

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

@@ -1,4 +1,4 @@
-@custom-media --dev-dot-viewport (min-width: 1230px);
+@custom-media --dev-dot-viewport (min-width: 924px);
 
 .productPanel {
 	height: 100%;

package/src/components/subnav/index.tsx

@@ -17,7 +17,6 @@ import CtaLinks, { type CtaLinkProps } from './partials/CtaLinks'
 import traverse, { isObject } from './helpers/traverse'
 import { areBasePathsMatching } from './helpers/areBasePathsMatching'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
-import themeStyles from './theme.module.css'
 import s from './style.module.css'
 
 const productAllowList = {
@@ -175,9 +174,10 @@ function Subnav({ className, theme = 'light', ...restProps }: SubnavProps) {
 			<style>{`:root{--subnav-height:${height}px}`}</style>
 			<NavigationMenu.Root
 				ref={wrapperRef}
-				className={classNames(s.root, themeStyles[theme], className, {
+				className={classNames(s.root, className, {
 					[s.isSticky]: isSticky,
 					[s.hasOverflow]: hasOverflow,
+					'hdsplus-dark-mode': theme === 'dark',
 				})}
 				aria-label={`${product} website navigation`}
 				onValueChange={activatePanel}

package/src/components/subnav/partials/CtaLinks/github-stars-link/style.module.css

@@ -3,15 +3,13 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-/* Note: consumes from theme.module.css, as marked */
-
 .root {
-	--local-scrim-color: transparent;
-	--local-divider-color: var(--border-color); /* from theme.module.css */
+	--local-scrim-opacity: 0;
+	--local-divider-color: var(--token-color-border-primary);
 
 	position: relative;
-	color: var(--gh-stars-icon-color); /* from theme.module.css */
-	border: 1px solid var(--local-divider-color); /* from theme.module.css */
+	color: var(--token-color-foreground-primary);
+	border: 1px solid var(--local-divider-color);
 	border-radius: 5px;
 	background: none;
 	transition: background 0.2s, border-color 0.2s;
@@ -27,17 +25,15 @@
 		right: -1px;
 		bottom: -1px;
 		border-radius: 5px;
-		transition: background 0.25s ease;
+		transition: opacity 0.25s ease;
+		opacity: var(--local-scrim-opacity);
 		z-index: 0;
-		background-color: var(--local-scrim-color);
+		background-color: var(--token-color-foreground-primary);
 	}
 
 	&:hover,
 	&:active {
-		--local-divider-color: transparent;
-		--local-scrim-color: var(
-			--gh-stars-scrim-color
-		); /* from theme.module.css */
+		--local-scrim-opacity: 0.12;
 	}
 }
 

package/src/components/subnav/partials/CtaLinks/style.module.css

@@ -10,26 +10,26 @@
 	list-style: none;
 	padding: 0 0 0 var(--hdsplus-spacing-05);
 	margin: 0;
-	gap: 0 12px;
+	gap: 0 var(--hdsplus-spacing-04);
 	@media (--medium-up) {
 		gap: 0;
 	}
 
 	& > * + * {
 		/* Spaces consecutive buttons horizontally on desktop */
-		margin-left: 16px;
+		margin-left: var(--hdsplus-spacing-05);
 	}
 
 	&.isInDropdown {
 		/* Allows consecutive buttons to wrap */
 		flex-wrap: wrap;
 		white-space: wrap;
-		padding-left: 0;
+		padding-inline: var(--hdsplus-spacing-04);
 
 		& > * {
 			/* Spaces consecutive buttons vertically */
 			margin-left: 0;
-			margin-top: 16px;
+			margin-top: var(--hdsplus-spacing-05);
 
 			&:last-of-type {
 				margin-bottom: var(--hdsplus-spacing-04);

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

@@ -27,7 +27,7 @@ function DropdownTrigger(props: DropdownTriggerProps) {
 			onMouseDown={(e) => e.preventDefault()}
 		>
 			<NavItemText isActive={isActive} text={text} />
-			<FlightIcon name="chevron-down" color="var(--menu-item-text-color)" />
+			<FlightIcon name="chevron-down" />
 		</NavigationMenu.Trigger>
 	)
 }

package/src/components/subnav/partials/DropdownTrigger/style.module.css

@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-/* Note: consumes from theme.module.css, as marked */
-
 .root {
 	composes: hds-typography-body-200 from global;
 	composes: hds-font-weight-medium from global;
@@ -26,11 +24,16 @@
 		width: 12px;
 		height: 12px;
 		transition: transform 0.3s;
-		fill: var(--menu-item-text-color); /* from theme.module.css */
+		fill: var(--token-color-foreground-primary);
 	}
 
 	&:hover {
-		background-color: var(--menu-item-hover-color);
+		background-color: var(--token-color-surface-interactive-hover);
 		border-radius: var(--hdsplus-spacing-01);
 	}
+
+	&:focus {
+		outline: 2px solid var(--token-color-focus-action-internal);
+		outline-style: auto;
+	}
 }

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

@@ -9,13 +9,19 @@ import NavItemText from '../nav-item-text'
 import DropdownTrigger from '../DropdownTrigger'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
+import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
 
 interface MenuItemsDefaultProps {
 	menuItems: (
 		| {
 				text: string
 				url: string
-				submenu: { text: string; url: string; _isActiveUrl: string }[]
+				submenu: {
+					icon: string
+					text: string
+					url: string
+					_isActiveUrl: string
+				}[]
 				_isActiveUrl: boolean
 		  }
 		| 'divider'
@@ -86,7 +92,7 @@ function NavLink(props: NavLinkProps) {
 
 interface NavLinkWithDropdownProps {
 	text: string
-	submenu: { text: string; url: string; _isActiveUrl: string }[]
+	submenu: { icon: string; text: string; url: string; _isActiveUrl: string }[]
 	activatePanel: (panel: string) => void
 }
 
@@ -128,12 +134,13 @@ class NavLinkWithDropdown extends React.Component<
 					<NavigationMenu.Sub>
 						<NavigationMenu.List className={s.dropdownList}>
 							{submenu.map((submenuItem, stableIdx) => {
-								const { text, url } = submenuItem
+								const { icon, text, url } = submenuItem
 								return (
 									// eslint-disable-next-line react/no-array-index-key
 									<NavigationMenu.Item key={stableIdx}>
 										<NavigationMenu.Link asChild>
 											<Link className={s.submenuItem} href={url}>
+												{icon ? <FlightIcon name={icon} /> : null}
 												{text}
 											</Link>
 										</NavigationMenu.Link>

package/src/components/subnav/partials/MenuItemsDefault/style.module.css

@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-/* Note: consumes from theme.module.css, as marked */
-
 .root {
 	display: flex;
 	padding: 0 0 0 var(--hdsplus-spacing-08);
@@ -16,7 +14,6 @@
 
 .listItem {
 	position: relative;
-	white-space: nowrap;
 	margin: 0;
 	padding: 0;
 }
@@ -31,7 +28,7 @@
 	white-space: nowrap;
 
 	&:hover {
-		background-color: var(--menu-item-hover-color);
+		background-color: var(--token-color-surface-interactive-hover);
 		border-radius: var(--hdsplus-spacing-01);
 	}
 
@@ -42,43 +39,58 @@
 }
 
 .submenuItem {
+	--submenu-item-background-color: transparent;
+
+	position: relative;
 	composes: hds-typography-body-200 from global;
 	composes: hds-font-weight-medium from global;
-	display: block;
-	color: var(--menu-item-text-color); /* from theme.module.css */
+	color: var(--token-color-foreground-primary);
+	display: flex;
+	gap: var(--hdsplus-spacing-04);
+	padding: var(--hdsplus-spacing-03);
+	min-width: 190px;
+	align-items: center;
+
+	&::before {
+		content: "";
+		position: absolute;
+		z-index: -1;
+		inset: 2px 0;
+		border-radius: var(--hdsplus-spacing-01);
+		background-color: var(--submenu-item-background-color);
+	}
 
 	&:hover {
-		text-decoration: underline;
+		--submenu-item-background-color: var(--token-color-surface-interactive-hover);
+	}
+
+	@media (--large) {
+		max-width: 416px;
+	}
+
+	&:focus {
+		outline: 2px solid var(--token-color-focus-action-internal);
+		outline-style: auto;
 	}
 }
 
 .submenuModal {
-	border-radius: 4px;
-	box-shadow: var(--token-elevation-high-box-shadow); /* from theme.module.css */
-	background: var(--dropdown-background-color); /* from theme.module.css */
+	border-radius: var(--hdsplus-spacing-03);
+	border: 1px solid var(--token-color-border-primary);
+	box-shadow: var(--token-elevation-high-box-shadow);
+	background: var(--token-color-surface-primary);
 	z-index: 1;
-	display: block;
 	position: absolute;
 	top: 100%;
-	margin: 8px 0 0 0;
-	padding: 24px;
+	margin: var(--hdsplus-spacing-03) 0 0 0;
+	padding: var(--hdsplus-spacing-04);
 	left: 100%;
 	transform: translateX(-100%);
 	list-style: none;
-
-	& li {
-		& a:hover .text {
-			text-decoration: underline;
-		}
-
-		& + li {
-			margin-top: 6px;
-		}
-	}
 }
 
 .verticalDivider {
-	background: var(--border-color); /* from theme.module.css */
+	background: var(--token-color-border-primary);
 	height: 1.75rem;
 	width: 1px;
 	margin: 0 8px;
@@ -86,6 +98,7 @@
 }
 
 .dropdownList {
+	min-width: max-content;
 	list-style: none;
 	padding: 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'
@@ -12,6 +12,7 @@ import DropdownTrigger from '../DropdownTrigger'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import classNames from 'classnames'
 import s from './style.module.css'
+import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
 
 interface MenuItemsOverflowProps {
 	menuItems: (
@@ -19,7 +20,7 @@ interface MenuItemsOverflowProps {
 		| {
 				text: string
 				url: string
-				submenu: { url: string; text: string }[]
+				submenu: { icon: string; url: string; text: string }[]
 		  }
 	)[]
 	ctaLinks: CtaLinkProps
@@ -89,6 +90,7 @@ class MenuItemsOverflow extends React.Component<
 													key={subStableIdx}
 													url={subItem.url}
 													text={subItem.text}
+													icon={subItem.icon}
 												/>
 											))}
 											<hr className={s.divider} />
@@ -120,15 +122,17 @@ class MenuItemsOverflow extends React.Component<
 }
 
 interface SubmenuItemProps {
+	icon?: string
 	url: string
 	text: string
 }
 
-function SubmenuItem({ url, text }: SubmenuItemProps) {
+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>
 			</NavigationMenu.Link>

package/src/components/subnav/partials/MenuItemsOverflow/style.module.css

@@ -3,8 +3,6 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-/* Note: consumes from theme.module.css, as marked */
-
 .root {
 	position: relative;
 	display: flex;
@@ -12,14 +10,14 @@
 }
 
 .dropdown {
-	background: var(--dropdown-background-color); /* from theme.module.css */
-	border-radius: 4px;
+	background: var(--token-color-surface-primary);
+	border-radius: var(--hdsplus-spacing-03);
 	box-shadow: var(--token-elevation-high-box-shadow);
-	border: 1px solid var(--border-color);
+	border: 1px solid var(--token-color-border-primary);
 	margin-top: 8px;
 	max-height: calc(100vh - 300%);
 	overflow-y: auto;
-	padding: var(--hdsplus-spacing-04) var(--hdsplus-spacing-07);
+	padding: var(--hdsplus-spacing-04);
 	position: absolute;
 	right: 0;
 	top: 100%;
@@ -52,27 +50,35 @@
 
 .submenuTitle {
 	composes: g-type-label from global;
-	margin: 12px 0 8px 0;
-	color: var(--menu-item-heading-text-color); /* from theme.module.css */
+	margin: var(--hdsplus-spacing-04) var(--hdsplus-spacing-03) 8px;
+	color: var(--token-color-foreground-faint);
 }
 
 .divider {
-	margin: 12px 0;
+	margin: var(--hdsplus-spacing-04) var(--hdsplus-spacing-03);
 	border: 0;
 	padding: 0;
 	height: 1px;
-	background: var(--border-color); /* from theme.module.css */
+	background: var(--token-color-border-primary);
 }
 
 .submenuItem {
-	display: block;
-	padding: 4px 0;
-	color: var(--menu-item-text-color); /* from theme.module.css */
-	font-weight: var(--font-weight-semi-bold);
-	font-size: var(--token-typography-body-300-font-size);
+	composes: hds-typography-body-300 from global;
+	composes: hds-font-weight-semibold from global;
+	display: flex;
+	gap: var(--hdsplus-spacing-04);
+	padding: var(--hdsplus-spacing-02) var(--hdsplus-spacing-03);
+	color: var(--token-color-foreground-primary);
+	border-radius: var(--hdsplus-spacing-01);
+	align-items: center;
 
 	&:hover {
-		text-decoration: underline;
+		background-color: var(--token-color-surface-interactive-hover);
+	}
+
+	&:focus {
+		outline: 2px solid var(--token-color-focus-action-internal);
+		outline-style: auto;
 	}
 }
 

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/components/subnav/partials/TitleLink/mktg-logos/all-community-product-logos_on-dark.ts

@@ -5,5 +5,6 @@ import packer from '@hashicorp/web-mktg-logos/src/packer/packer-community/packer
 import terraform from '@hashicorp/web-mktg-logos/src/terraform/terraform-community/terraform-community_on-dark.svg'
 import vagrant from '@hashicorp/web-mktg-logos/src/vagrant/vagrant-community/vagrant-community_on-dark.svg'
 import vault from '@hashicorp/web-mktg-logos/src/vault/vault-community/vault-community_on-dark.svg'
+import waypoint from '@hashicorp/web-mktg-logos/src/waypoint/hashicorp-waypoint-attributed/hashicorp-waypoint_on-dark.svg'
 
-export { boundary, consul, nomad, packer, terraform, vagrant, vault }
+export { boundary, consul, nomad, packer, terraform, vagrant, vault, waypoint }

package/src/components/subnav/partials/TitleLink/mktg-logos/all-community-product-logos_on-light.ts

@@ -5,5 +5,6 @@ import packer from '@hashicorp/web-mktg-logos/src/packer/packer-community/packer
 import terraform from '@hashicorp/web-mktg-logos/src/terraform/terraform-community/terraform-community_on-light.svg'
 import vagrant from '@hashicorp/web-mktg-logos/src/vagrant/vagrant-community/vagrant-community_on-light.svg'
 import vault from '@hashicorp/web-mktg-logos/src/vault/vault-community/vault-community_on-light.svg'
+import waypoint from '@hashicorp/web-mktg-logos/src/waypoint/hashicorp-waypoint-attributed/hashicorp-waypoint_on-light.svg'
 
-export { boundary, consul, nomad, packer, terraform, vagrant, vault }
+export { boundary, consul, nomad, packer, terraform, vagrant, vault, waypoint }

package/src/components/subnav/partials/TitleLink/style.module.css

@@ -10,7 +10,7 @@
 	display: inline-flex;
 	padding-block: var(--hdsplus-spacing-04);
 	font-weight: var(--font-weight-bold);
-	color: var(--title-text-color); /* from theme.module.css */
+	color: var(--token-color-foreground-primary); /* from theme.module.css */
 	font-size: 1.25rem;
 	line-height: 1.35rem;
 

package/src/components/subnav/partials/nav-item-text/style.module.css

@@ -3,13 +3,11 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-/* Note: consumes from theme.module.css, as marked */
-
 .root {
-	color: var(--menu-item-text-color); /* from theme.module.css */
+	color: var(--token-color-foreground-primary);
 	position: relative;
 
 	&.isActive {
-		color: var(--menu-item-text-color-active);
+		color: var(--token-color-foreground-strong);
 	}
 }

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

@@ -3,19 +3,17 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-/* Note: consumes from theme.module.css, as marked */
-
 .root {
 	position: sticky;
 	top: -1px;
 	z-index: 900;
-	background: var(--background-color); /* from theme.module.css */
-	border-top: 1px solid var(--border-color); /* from theme.module.css */
+	background: var(--token-color-surface-primary);
+	border-top: 1px solid var(--token-color-border-faint);
 	border-bottom: 1px solid transparent;
 	transition: border-bottom-color 0.8s;
 
 	&.isSticky {
-		border-bottom-color: var(--border-color); /* from theme.module.css */
+		border-bottom-color: var(--token-color-border-faint);
 	}
 
 	/*

package/src/lib/parse-url/index.test.ts

@@ -27,4 +27,9 @@ describe('parseUrl', () => {
 		)
 		expect(url.href).toBe('/resources?type=case-study&products=terraform')
 	})
+
+	it('leaves HashiCorp subdomain URLs intact', () => {
+		const url = parseUrl('https://developer.hashicorp.com/terraform')
+		expect(url.href).toBe('https://developer.hashicorp.com/terraform')
+	})
 })

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/subnav/theme.module.css

@@ -1,50 +0,0 @@
-/**
- * Copyright (c) HashiCorp, Inc.
- * SPDX-License-Identifier: MPL-2.0
- */
-
-/*
-Theme settings.
-Consumed in nearly all CSS files in this component,
-including in /partials.
-*/
-
-.light {
-	/* main */
-	--background-color: var(--white);
-	--border-color: var(--gray-5);
-	--dropdown-background-color: var(--white);
-
-	/* title or logo link */
-	--title-text-color: var(--gray-1);
-
-	/* github-stars-link */
-	--gh-stars-icon-color: var(--black);
-	--gh-stars-scrim-color: rgba(0, 0, 0, 0.1);
-
-	/* menu items */
-	--menu-item-text-color: #3B3D45;
-	--menu-item-text-color-active: #0C0C0E;
-	--menu-item-heading-text-color: var(--gray-3);
-	--menu-item-hover-color: #F1F2F3;
-}
-
-.dark {
-	/* main */
-	--background-color: var(--black);
-	--border-color: var(--gray-2);
-	--dropdown-background-color: var(--gray-1);
-
-	/* title or logo link */
-	--title-text-color: var(--white);
-
-	/* github-stars-link */
-	--gh-stars-icon-color: var(--white);
-	--gh-stars-scrim-color: rgba(255, 255, 255, 0.15);
-
-	/* menu items */
-	--menu-item-text-color: #D5D7DB;
-	--menu-item-text-color-active: #EFEFF1;
-	--menu-item-heading-text-color: var(--gray-4);
-	--menu-item-hover-color: #1E222A;
-}