@hashicorp/react-components 0.0.0-nightly.a1aa23a → 0.0.0-nightly.a2b7b7e

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hashicorp/react-components",
-	"version": "0.0.0-nightly.a1aa23a",
+	"version": "0.0.0-nightly.a2b7b7e",
 	"main": "src/index.ts",
 	"scripts": {
 		"lint": "next-hashicorp lint",
@@ -8,10 +8,11 @@
 		"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": "*",
+		"@hashicorp/react-hds": "*",
+		"@hashicorp/react-mds": "*",
 		"@hashicorp/web-mktg-logos": "*",
 		"@radix-ui/react-navigation-menu": "^1.2.0",
 		"@radix-ui/react-visually-hidden": "^1.1.0",

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 { HDSPlusButton } from '@hashicorp/react-mds/src/hds-plus/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
+						<HDSPlusButton
 							// eslint-disable-next-line react/no-array-index-key
 							key={index}
 							text={cta.title}

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

@@ -4,9 +4,9 @@
  */
 
 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 { HDSPlusButton } from '@hashicorp/react-mds/src/hds-plus/button'
+import ButtonSet from '@hashicorp/react-hds/src/components/button-set'
+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'
@@ -119,7 +119,7 @@ function CallToAction({
 					{links && (
 						<ButtonSet className={s.links} data-testid="links">
 							{links.map((link, stableIdx) => {
-								let color: ComponentProps<typeof Button>['color'] =
+								let color: ComponentProps<typeof HDSPlusButton>['color'] =
 									variant === 'links'
 										? 'tertiary'
 										: stableIdx === 0
@@ -128,7 +128,7 @@ function CallToAction({
 
 								if (color === 'tertiary') {
 									return (
-										<StandaloneLink
+										<HDSPlusStandaloneLink
 											key={stableIdx}
 											color="secondary"
 											text={link.text}
@@ -158,7 +158,7 @@ function CallToAction({
 									color = 'secondary'
 								} else if (theme === 'brand' && color === 'secondary') {
 									return (
-										<StandaloneLink
+										<HDSPlusStandaloneLink
 											key={stableIdx}
 											color="secondary-inverted"
 											text={link.text}
@@ -177,7 +177,7 @@ function CallToAction({
 								}
 
 								return (
-									<Button
+									<HDSPlusButton
 										// eslint-disable-next-line react/no-array-index-key
 										key={stableIdx}
 										// className={s.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/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-hds/src/components/badge'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
+import { TextPlus } from '@hashicorp/react-hds/src/components/text'
 import * as CardPrimitives from '../primitives'
 import type { CardProps } from '../types'
 import s from './style.module.css'

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 { TextPlus } from '@hashicorp/react-hds/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'

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-hds/src/components/card'
+import { TextPlus } from '@hashicorp/react-hds/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">
+			<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

@@ -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-hds/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/marketo-form/contexts/FormMetadata.ts

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
+'use client'
+
 import { createContext } from 'react'
 import type { MarketoFormMetadata } from '../types'
 

package/src/components/marketo-form/form/index.tsx

@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
+'use client'
+
 import { useEffect, useMemo, useRef } from 'react'
 import { useForm, FormProvider } from 'react-hook-form'
-import Button from '@hashicorp/react-design-system-components/src/components/button'
+import { HDSPlusButton } from '@hashicorp/react-mds/src/hds-plus/button'
 import VisibilityRule from '../partials/visibility-rule'
 import NameField from '../partials/fields/name-field'
 import { FormMetadataContext } from '../contexts/FormMetadata'
@@ -345,7 +347,7 @@ const Form = ({
 							/>
 						)
 					})}
-					<Button
+					<HDSPlusButton
 						type="submit"
 						size="large"
 						disabled={

package/src/components/marketo-form/partials/fields/checkbox-field/index.tsx

@@ -5,7 +5,7 @@
 
 import { useFormContext } from 'react-hook-form'
 // import CheckboxInput from '@hashicorp/react-form-fields/checkbox'
-import Checkbox from '@hashicorp/react-design-system-components/src/components/form/checkbox'
+import Checkbox from '@hashicorp/react-hds/src/components/form/checkbox'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormCheckboxField } from '../../../types'

package/src/components/marketo-form/partials/fields/email-field/index.tsx

@@ -5,7 +5,7 @@
 
 import { useFormContext } from 'react-hook-form'
 // import TextInput from '@hashicorp/react-form-fields/text'
-import TextInput from '@hashicorp/react-design-system-components/src/components/form/text-input'
+import TextInput from '@hashicorp/react-hds/src/components/form/text-input'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormEmailField } from '../../../types'

package/src/components/marketo-form/partials/fields/form-page-url-field/index.tsx

@@ -3,6 +3,8 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
+'use client'
+
 import { useEffect } from 'react'
 import { useFormContext } from 'react-hook-form'
 import type { MarketoFormHiddenField } from '../../../types'

package/src/components/marketo-form/partials/fields/hidden-field/index.tsx

@@ -2,6 +2,7 @@
  * Copyright (c) HashiCorp, Inc.
  * SPDX-License-Identifier: MPL-2.0
  */
+'use client'
 
 import { useEffect } from 'react'
 import { useFormContext } from 'react-hook-form'

package/src/components/marketo-form/partials/fields/radio-buttons-field/index.tsx

@@ -1,7 +1,7 @@
 import { useFormContext } from 'react-hook-form'
 import RadioCard, {
 	RadioCardGroup,
-} from '@hashicorp/react-design-system-components/src/components/form/radio-card'
+} from '@hashicorp/react-hds/src/components/form/radio-card'
 import FieldWrapper from '../../field-wrapper'
 import type { MarketoFormRadioButtonsField } from '../../../types'
 

package/src/components/marketo-form/partials/fields/select-field/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import { useFormContext } from 'react-hook-form'
-import Select from '@hashicorp/react-design-system-components/src/components/form/select'
+import Select from '@hashicorp/react-hds/src/components/form/select'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormSelectField } from '../../../types'

package/src/components/marketo-form/partials/fields/telephone-field/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import { useFormContext } from 'react-hook-form'
-import TextInput from '@hashicorp/react-design-system-components/src/components/form/text-input'
+import TextInput from '@hashicorp/react-hds/src/components/form/text-input'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormTelephoneField } from '../../../types'

package/src/components/marketo-form/partials/fields/text-field/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import { useFormContext } from 'react-hook-form'
-import TextInput from '@hashicorp/react-design-system-components/src/components/form/text-input'
+import TextInput from '@hashicorp/react-hds/src/components/form/text-input'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormTextField } from '../../../types'

package/src/components/marketo-form/partials/fields/textarea-field/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import { useFormContext } from 'react-hook-form'
-import Textarea from '@hashicorp/react-design-system-components/src/components/form/textarea'
+import Textarea from '@hashicorp/react-hds/src/components/form/textarea'
 import FieldWrapper from '../../field-wrapper'
 import { formattedLabel, useErrorMessage } from '../../../utils'
 import type { MarketoFormTextAreaField } from '../../../types'

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

@@ -1,7 +1,7 @@
 import Link from 'next/link'
 import { parseUrl } from '../../../../lib/parse-url'
-import { v } from '../../../../lib/v'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
+import { vercelSplit } from '../../../../lib/v'
+import FlightIcon from '@hashicorp/react-hds/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,10 +1,10 @@
 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'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
 
@@ -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/product-panel/index.tsx

@@ -3,8 +3,8 @@ import Link from 'next/link'
 import * as NavPanel from '../components/panel'
 import Promo, { type PromoProps } from '../components/promo'
 import { Products } from '@hashicorp/platform-product-meta'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
-import { TextPlus } from '@hashicorp/react-design-system-components/src/components/text'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
+import { TextPlus } from '@hashicorp/react-hds/src/components/text'
 import { parseUrl } from '../../../lib/parse-url'
 import { trackNavClickEvent } from '../../../lib/track-nav-click-event'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'

package/src/components/next-steps/index.tsx

@@ -2,6 +2,7 @@
  * Copyright (c) HashiCorp, Inc.
  * SPDX-License-Identifier: MPL-2.0
  */
+'use client'
 
 import { useState } from 'react'
 import Badge from '@hashicorp/react-badge'
@@ -10,7 +11,7 @@ import ExpandableArrow from '@hashicorp/react-expandable-arrow'
 import Intro from '../intro'
 import Link from 'next/link'
 import type { NextStepsProps } from './types'
-import StandaloneLink from '@hashicorp/react-design-system-components/src/components/standalone-link'
+import { HDSPlusStandaloneLink } from '@hashicorp/react-mds/src/hds-plus/standalone-link'
 import { IconArrowRight16 } from '@hashicorp/flight-icons/svg-react/arrow-right-16'
 import useProductMeta from '@hashicorp/platform-product-meta'
 import s from './style.module.css'
@@ -69,7 +70,7 @@ export default function NextSteps({
 					{cta ? (
 						<div className={s.cta}>
 							<p className={s.ctaCopy}>{cta.copy}</p>
-							<StandaloneLink
+							<HDSPlusStandaloneLink
 								href={cta.href}
 								text={cta.ctaText}
 								icon={

package/src/components/product-badge/index.tsx

@@ -4,7 +4,7 @@
  */
 
 import type { Products } from '@hashicorp/platform-product-meta'
-import Badge from '@hashicorp/react-design-system-components/src/components/badge'
+import Badge from '@hashicorp/react-hds/src/components/badge'
 import { IconDot16 } from '@hashicorp/flight-icons/svg-react/dot-16'
 import s from './style.module.css'
 

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 = {
@@ -165,6 +164,10 @@ function Subnav({ className, theme = 'light', ...restProps }: SubnavProps) {
 		setActivePanel(panel)
 	}
 
+	const ariaLabel = restProps?.titleLink?.text
+		? `${restProps.titleLink.text} pages`
+		: 'Subnav pages'
+
 	return (
 		<>
 			{/**
@@ -175,11 +178,12 @@ 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`}
+				aria-label={ariaLabel}
 				onValueChange={activatePanel}
 				value={activePanel}
 				delayDuration={0}