@hashicorp/react-components 1.1.10 → 1.2.0

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

@@ -2,17 +2,19 @@
 
 .promo {
 	display: flex;
-	border-radius: var(--hdsplus-spacing-01);
-	border: 1px solid var(--token-color-border-faint);
-	background-color: var(--token-color-surface-faint);
-	padding: var(--hdsplus-spacing-05) var(--hdsplus-spacing-08)
-		var(--hdsplus-spacing-06) var(--hdsplus-spacing-08);
+	border-radius: var(--mds-spacing-01);
+	border: 1px solid var(--mds-color-border-faint);
+	background-color: var(--mds-color-surface-faint);
+	padding: var(--mds-spacing-05) var(--mds-spacing-08) var(--mds-spacing-06) var(--mds-spacing-08);
 	flex-direction: row;
-	gap: var(--hdsplus-spacing-04);
-	margin: var(--hdsplus-spacing-07);
-	margin-bottom: var(--hdsplus-spacing-09);
+	gap: var(--mds-spacing-04);
+	margin: var(--mds-spacing-07);
+	margin-bottom: var(--mds-spacing-09);
 
 	@media (--large) {
+		&.topPromo {
+			margin-bottom: var(--mds-spacing-05);
+		}
 		&.noSide {
 			margin: 0;
 			width: min-content;
@@ -21,7 +23,14 @@
 	}
 
 	@media (--dev-dot-viewport) {
+		&.topPromo {
+			margin-bottom: var(--mds-spacing-05);
+		}
 		&.hasSide {
+			&.topPromo {
+				margin-bottom: var(--mds-spacing-05);
+			}
+
 			margin: 0;
 			width: min-content;
 			min-width: 100%;
@@ -29,22 +38,26 @@
 	}
 }
 
+.topPromo {
+	margin-bottom: 0;
+}
+
 .rightContent {
 	display: flex;
 	flex-wrap: wrap;
-	gap: var(--hdsplus-spacing-03);
+	gap: var(--mds-spacing-03);
 	width: 100%;
 	justify-content: space-between;
 }
 
 .title {
-	font-weight: var(--font-weight-semi-bold);
+	font-weight: var(--mds-typography-font-weight-semibold);
 }
 
 .description {
-	font-size: var(--hdsplus-typography-body-200-font-size);
-	font-weight: var(--token-typography-font-weight-regular);
-	margin-top: var(--hdsplus-spacing-01);
+	font-size: var(--mds-typography-body-200-font-size);
+	font-weight: var(--mds-typography-font-weight-regular);
+	margin-top: var(--mds-spacing-01);
 }
 
 .icon {
@@ -66,29 +79,24 @@
 }
 
 .link {
-	color: var(--token-color-foreground-strong);
+	color: var(--mds-color-foreground-strong);
 	display: flex;
 	flex-direction: row;
 	align-items: center;
-	gap: var(--hdsplus-spacing-02);
+	gap: var(--mds-spacing-02);
 
 	&:hover {
 		text-decoration: underline;
 	}
 
 	&:focus {
-		outline: 2px solid var(--token-color-focus-action-internal);
+		outline: 2px solid var(--mds-color-focus-action-internal);
 		outline-style: auto;
 	}
 }
 
 .hashidays {
-	background: linear-gradient(
-		90deg,
-		#7b54b6 0%,
-		#4c69d8 74.77%,
-		#60d0dc 115.93%
-	);
+	background: linear-gradient(90deg, #7b54b6 0%, #4c69d8 74.77%, #60d0dc 115.93%);
 	-webkit-background-clip: text;
 	-webkit-text-fill-color: transparent;
 	max-width: fit-content;
@@ -99,16 +107,12 @@
 }
 
 .hashiconf {
-	background: linear-gradient(
-		to right,
-		var(--token-color-terraform-foreground),
-		var(--token-color-vagrant-foreground)
-	);
+	background: linear-gradient(to right, var(--mds-color-terraform-foreground), var(--mds-color-vagrant-foreground));
 	-webkit-background-clip: text;
 	-webkit-text-fill-color: transparent;
 	max-width: fit-content;
 
 	& svg {
-		color: var(--token-color-terraform-foreground);
+		color: var(--mds-color-terraform-foreground);
 	}
 }

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

@@ -0,0 +1,34 @@
+import classNames from 'classnames'
+import { type ReactNode, type HTMLAttributes } from 'react'
+
+type TextSize = '200' | '300' | '400'
+type TextWeight = 'regular' | 'medium' | 'semibold' | 'bold'
+
+interface TextProps extends HTMLAttributes<HTMLSpanElement> {
+	size?: TextSize
+	weight?: TextWeight
+	children: ReactNode
+}
+
+const Text = ({
+	size = '300',
+	weight,
+	children,
+	className,
+	...rest
+}: TextProps) => {
+	return (
+		<span
+			className={classNames(
+				`mds-typography-body-${size}`,
+				weight && `mds-typography-font-weight-${weight}`,
+				className,
+			)}
+			{...rest}
+		>
+			{children}
+		</span>
+	)
+}
+
+export { Text }

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

@@ -2,18 +2,21 @@ import classNames from 'classnames'
 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 { parseUrl } from '../../../lib/parse-url'
+import { getLocalizedLinkProps } from '../../../lib/get-localized-link-props'
+import { Products } from '@web/product-meta'
+import FlightIcon from '../components/flight-icon'
+import { Text } from '../components/text'
 import { trackNavClickEvent } from '../../../lib/track-nav-click-event'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
+import { LinkListProps } from '../components/link-list'
+import NavLink from '../components/link'
 import s from './style.module.css'
 
 const PRODUCT_LOGO_MAP = new Map([
 	['Terraform', 'terraform-fill'],
 	['Packer', 'packer-fill-color'],
 	['Vault', 'vault-fill-color'],
+	['Vault Radar', 'vault-fill-color'],
 	['Boundary', 'boundary-fill-color'],
 	['Consul', 'consul-fill-color'],
 	['Nomad', 'nomad-fill-color'],
@@ -29,8 +32,15 @@ const PRODUCT_LOGO_EXCEPTION_CLASSNAMES = {
 	'HCP Vault Radar': 'hcpVaultRadar',
 }
 
+export type ProductCategoriesProps = Array<{
+	title: string
+	group?: LinkListProps['links'][0]
+	products: NavProductProps[]
+}>
+
 export interface ProductsPanelProps {
-	productCategories: any
+	locale?: string
+	productCategories: ProductCategoriesProps
 	promo?: PromoProps
 	sidePanel?: {
 		label: string
@@ -41,33 +51,53 @@ export interface ProductsPanelProps {
 			url: string
 		}[]
 	}
+	isPromoOnTop?: boolean
 }
 
 const ProductPanel = ({
+	locale,
 	productCategories,
 	promo,
 	sidePanel,
+	isPromoOnTop = false,
 }: ProductsPanelProps) => {
 	return (
 		<NavPanel.Root
 			className={classNames(s.productPanel, {
 				[s.hasSide]: sidePanel,
 				[s.noSide]: !sidePanel,
+				[s.topPromo]: isPromoOnTop,
 			})}
 			hasSidePanel={Boolean(sidePanel)}
 		>
 			<div className={s.mainPanel}>
+				{promo && isPromoOnTop ? (
+					<Promo
+						{...promo}
+						hasSidePanel={Boolean(sidePanel)}
+						isPromoOnTop={isPromoOnTop}
+					/>
+				) : null}
 				<NavPanel.Column hasSidePanel={Boolean(sidePanel)}>
 					<ul className={s.productCategories}>
-						{productCategories.map(({ title, products }) => {
+						{productCategories.map(({ group, title, products }) => {
 							return (
-								<li key={title} className={s.productCategory}>
-									<TextPlus.Body className={s.eyebrow}>{title}</TextPlus.Body>
+								<li
+									key={title}
+									className={classNames(s.productCategory, {
+										[s.productCategoryHasGroup]: group,
+									})}
+								>
+									{group ? (
+										<NavLink {...group} className={s.productGroupLink} />
+									) : (
+										<Text className={s.eyebrow}>{title}</Text>
+									)}
 									<ul className={s.productList}>
 										{products.map((product) => {
 											return (
 												<li key={product.url}>
-													<NavProduct {...product} />
+													<NavProduct locale={locale} {...product} />
 												</li>
 											)
 										})}
@@ -77,14 +107,16 @@ const ProductPanel = ({
 						})}
 					</ul>
 				</NavPanel.Column>
-				{promo ? <Promo {...promo} hasSidePanel={Boolean(sidePanel)} /> : null}
+				{promo && !isPromoOnTop ? (
+					<Promo {...promo} hasSidePanel={Boolean(sidePanel)} />
+				) : null}
 			</div>
 
 			{sidePanel ? (
 				<NavPanel.Column className={s.sidePanel}>
-					<TextPlus.Body size="200" weight="semibold">
+					<Text size="200" weight="semibold" className={s.sidePanelText}>
 						{sidePanel.label}
-					</TextPlus.Body>
+					</Text>
 
 					{/* ! TODO Replace the below list with the <LinkList /> component, 
 						That component will require a refactor to support greater customization 
@@ -97,20 +129,24 @@ const ProductPanel = ({
 								<li key={title}>
 									<Link
 										aria-label={`${title} - ${description}`}
-										href={parseUrl(url).href}
+										{...getLocalizedLinkProps(url, locale)}
+										locale={locale ? locale : undefined}
 										className={classNames(s.sidePanelItem, s.focusIndicator)}
 									>
 										<div className={s.iconBackground}>
 											<FlightIcon
-												size={16}
 												name={icon}
-												color="var(--token-color-foreground-faint)"
+												color="var(--mds-color-foreground-faint)"
 											/>
 										</div>
 										<div className={s.sidePanelItemContent}>
-											<TextPlus.Body size="200" weight="semibold" tag="span">
+											<Text
+												size="200"
+												weight="semibold"
+												className={s.sidePanelText}
+											>
 												{title}
-											</TextPlus.Body>
+											</Text>
 											<span className={s.sidePanelItemDesc}>{description}</span>
 										</div>
 									</Link>
@@ -125,17 +161,19 @@ const ProductPanel = ({
 }
 
 export interface NavProductProps {
+	locale?: string
 	url: string
 	product: Products | string
 	description: string
 }
 
-function NavProduct({ url, product, description }: NavProductProps) {
+function NavProduct({ locale, url, product, description }: NavProductProps) {
 	return (
 		<NavigationMenu.Link asChild>
 			<Link
 				aria-label={`${product} - ${description}`}
-				href={parseUrl(url).href}
+				{...getLocalizedLinkProps(url, locale)}
+				locale={locale ? locale : undefined}
 				onClickCapture={() => {
 					trackNavClickEvent(product, url, 'products')
 				}}
@@ -153,7 +191,20 @@ function NavProduct({ url, product, description }: NavProductProps) {
 						/>
 					</div>
 					<div className={s.productTextContent}>
-						<span>{product}</span>
+						{product === 'Vault Radar' ? (
+							<div>
+								<Text size="200" weight="semibold">
+									Vault&nbsp;
+								</Text>
+								<Text size="200" weight="regular">
+									Radar
+								</Text>
+							</div>
+						) : (
+							<Text size="200" weight="semibold">
+								{product}
+							</Text>
+						)}
 						<span className={s.productDesc}>{description}</span>
 					</div>
 				</div>

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

@@ -26,7 +26,11 @@
 	list-style: none;
 	padding: 0;
 	display: grid;
-	margin: var(--hdsplus-spacing-07) 0 0;
+	margin: var(--mds-spacing-07) 0 0;
+
+	@nest .topPromo & {
+		margin-bottom: var(--mds-spacing-07);
+	}
 
 	@media (--large) {
 		@nest .noSide & {
@@ -47,28 +51,28 @@
 	min-width: 160px;
 
 	&:first-child {
-		border-bottom: 1px solid var(--token-color-border-primary);
-		margin-bottom: var(--hdsplus-spacing-05);
-		padding-bottom: var(--hdsplus-spacing-05);
+		border-bottom: 1px solid var(--mds-color-border-primary);
+		margin-bottom: var(--mds-spacing-05);
+		padding-bottom: var(--mds-spacing-05);
 	}
 }
 
 .eyebrow {
-	padding-bottom: var(--hdsplus-spacing-04);
-	color: var(--token-color-foreground-strong);
-	font-weight: var(--font-weight-semi-bold);
+	padding-bottom: var(--mds-spacing-04);
+	color: var(--mds-color-foreground-strong);
+	font-weight: var(--mds-typography-font-weight-semibold);
 
 	@media (--large) {
 		@nest .noSide & {
 			padding-bottom: 0;
-			padding-left: var(--hdsplus-spacing-06);
+			padding-left: var(--mds-spacing-06);
 		}
 	}
 
 	@media (--dev-dot-viewport) {
 		@nest .hasSide & {
 			padding-bottom: 0;
-			padding-left: var(--hdsplus-spacing-06);
+			padding-left: var(--mds-spacing-06);
 		}
 	}
 }
@@ -82,8 +86,7 @@
 
 	@media (--large) {
 		@nest .noSide & {
-			padding: var(--hdsplus-spacing-06) var(--hdsplus-spacing-05)
-				var(--hdsplus-spacing-04);
+			padding: var(--mds-spacing-06) var(--mds-spacing-05) var(--mds-spacing-04);
 			grid-auto-flow: row;
 			grid-template-columns: repeat(2, 300px);
 			grid-template-rows: repeat(2, max-content);
@@ -93,8 +96,7 @@
 
 	@media (--dev-dot-viewport) {
 		@nest .hasSide & {
-			padding: var(--hdsplus-spacing-06) var(--hdsplus-spacing-05)
-				var(--hdsplus-spacing-04);
+			padding: var(--mds-spacing-06) var(--mds-spacing-05) var(--mds-spacing-04);
 			grid-auto-flow: row;
 			grid-template-columns: repeat(2, 300px);
 			grid-template-rows: repeat(2, max-content);
@@ -113,29 +115,29 @@
 
 .productWrapper {
 	display: flex;
-	margin-bottom: var(--hdsplus-spacing-05);
-	gap: var(--hdsplus-spacing-05);
+	margin-bottom: var(--mds-spacing-05);
+	gap: var(--mds-spacing-05);
 
 	@media (--large) {
 		@nest .noSide & {
-			padding: var(--hdsplus-spacing-03) var(--hdsplus-spacing-05);
+			padding: var(--mds-spacing-03) var(--mds-spacing-05);
 			margin-bottom: 0;
 
 			&:hover {
-				background-color: var(--token-color-surface-interactive-hover);
-				border-radius: var(--hdsplus-spacing-01);
+				background-color: var(--mds-color-surface-interactive-hover);
+				border-radius: var(--mds-spacing-01);
 			}
 		}
 	}
 
 	@media (--dev-dot-viewport) {
 		@nest .hasSide & {
-			padding: var(--hdsplus-spacing-03) var(--hdsplus-spacing-05);
+			padding: var(--mds-spacing-03) var(--mds-spacing-05);
 			margin-bottom: 0;
 
 			&:hover {
-				background-color: var(--token-color-surface-interactive-hover);
-				border-radius: var(--hdsplus-spacing-01);
+				background-color: var(--mds-color-surface-interactive-hover);
+				border-radius: var(--mds-spacing-01);
 			}
 		}
 	}
@@ -152,8 +154,8 @@
 	@nest .noSide & {
 		& svg {
 			@media (--large) {
-				height: var(--hdsplus-spacing-08);
-				width: var(--hdsplus-spacing-08);
+				height: var(--mds-spacing-08);
+				width: var(--mds-spacing-08);
 			}
 		}
 	}
@@ -161,8 +163,8 @@
 	@nest .hasSide & {
 		& svg {
 			@media (--dev-dot-viewport) {
-				height: var(--hdsplus-spacing-08);
-				width: var(--hdsplus-spacing-08);
+				height: var(--mds-spacing-08);
+				width: var(--mds-spacing-08);
 			}
 		}
 	}
@@ -171,7 +173,7 @@
 .productTextContent {
 	display: flex;
 	flex-direction: column;
-	color: var(--token-color-foreground-strong);
+	color: var(--mds-color-foreground-strong);
 }
 
 .productDesc {
@@ -179,12 +181,12 @@
 	font-size: 14px;
 	line-height: 20px;
 	letter-spacing: 0.0125em;
-	color: var(--token-color-foreground-faint);
+	color: var(--mds-color-foreground-faint);
 }
 
 .focusIndicator {
 	&:focus {
-		outline: 2px solid var(--token-color-focus-action-internal);
+		outline: 2px solid var(--mds-color-focus-action-internal);
 		outline-style: auto;
 	}
 }
@@ -195,30 +197,39 @@
 	justify-content: space-between;
 	flex-direction: column;
 
+	@nest .topPromo & {
+		justify-content: flex-start;
+	}
+
 	@media (--large) {
 		@nest .noSide & {
-			padding: var(--hdsplus-spacing-07) 0 var(--hdsplus-spacing-09)
-				var(--hdsplus-spacing-04);
+			padding: var(--mds-spacing-05) 0 var(--mds-spacing-05) var(--mds-spacing-04);
+		}
+
+		@nest .topPromo & {
+			padding-bottom: var(--mds-spacing-04);
 		}
 	}
 
 	@media (--dev-dot-viewport) {
 		@nest .hasSide & {
-			padding: var(--hdsplus-spacing-07) 0 var(--hdsplus-spacing-09)
-				var(--hdsplus-spacing-04);
+			padding: var(--mds-spacing-07) 0 var(--mds-spacing-09) var(--mds-spacing-04);
+		}
+
+		@nest .topPromo & {
+			padding-bottom: var(--mds-spacing-04);
 		}
 	}
 }
 
 .sidePanel {
 	height: 100%;
-	background: var(--token-color-surface-faint);
+	background: var(--mds-color-surface-faint);
 	display: flex;
 	flex-direction: column;
-	gap: var(--hdsplus-spacing-05);
+	gap: var(--mds-spacing-05);
 	margin: 0;
-	padding: var(--hdsplus-spacing-07) var(--hdsplus-spacing-04)
-		var(--hdsplus-spacing-09) var(--hdsplus-spacing-07);
+	padding: var(--mds-spacing-07) var(--mds-spacing-04) var(--mds-spacing-09) var(--mds-spacing-07);
 }
 
 .sidePanelItems {
@@ -227,24 +238,24 @@
 	padding: 0;
 	display: grid;
 	grid-template-columns: 1fr;
-	gap: var(--hdsplus-spacing-07);
+	gap: var(--mds-spacing-07);
 
 	@media (--dev-dot-viewport) {
-		gap: var(--hdsplus-spacing-05);
+		gap: var(--mds-spacing-05);
 	}
 }
 
 /* Lifted from .productWrapper */
 .sidePanelItem {
 	display: flex;
-	gap: var(--hdsplus-spacing-05);
+	gap: var(--mds-spacing-05);
 
 	@media (--dev-dot-viewport) {
-		padding: var(--hdsplus-spacing-03) var(--hdsplus-spacing-05);
+		padding: var(--mds-spacing-03) var(--mds-spacing-05);
 
 		&:hover {
-			background-color: var(--token-color-surface-interactive-hover);
-			border-radius: var(--hdsplus-spacing-01);
+			background-color: var(--mds-color-surface-interactive-hover);
+			border-radius: var(--mds-spacing-01);
 		}
 	}
 }
@@ -252,30 +263,30 @@
 /* Lifted from:
 packages/react-components/src/components/nav-panel/components/link-list/style.module.css  */
 .iconBackground {
-	background: var(--token-color-foreground-high-contrast);
-	height: var(--hdsplus-spacing-08);
-	width: var(--hdsplus-spacing-08);
+	background: var(--mds-color-foreground-high-contrast);
+	height: var(--mds-spacing-08);
+	width: var(--mds-spacing-08);
 	display: flex;
 	align-items: center;
 	justify-content: center;
 	border-radius: 3px;
 	flex: none;
 	margin-top: 3px;
-	border: 1px solid var(--token-color-border-primary);
+	border: 1px solid var(--mds-color-border-primary);
 }
 
 /* Lifted from .productTextContent */
 .sidePanelItemContent {
 	display: flex;
 	flex-direction: column;
-	color: var(--token-color-foreground-strong);
+	color: var(--mds-color-foreground-strong);
 }
 
 .sidePanelItemDesc {
 	font-weight: 400;
 	font-size: 13px;
 	line-height: 18px;
-	color: var(--token-color-foreground-primary);
+	color: var(--mds-color-foreground-primary);
 }
 
 /* Branding exception classnames */
@@ -283,10 +294,10 @@ packages/react-components/src/components/nav-panel/components/link-list/style.mo
 /* Allows switching to a dark-mode-specific color for Terraform */
 .terraform {
 	& use {
-		fill: var(--token-color-terraform-brand);
+		fill: var(--mds-color-terraform-brand);
 
 		@nest [data-theme='dark'] & {
-			fill: var(--token-color-terraform-foreground);
+			fill: var(--mds-color-terraform-foreground);
 		}
 	}
 
@@ -301,15 +312,62 @@ packages/react-components/src/components/nav-panel/components/link-list/style.mo
 */
 .hcpVaultSecrets,
 .hcpVaultRadar {
-	padding: var(--hdsplus-spacing-01);
-	border: 2px solid var(--token-color-vault-brand);
+	padding: var(--mds-spacing-01);
+	border: 2px solid var(--mds-color-vault-brand);
 	border-radius: 3px;
 
 	& use {
-		fill: var(--token-color-foreground-strong);
+		fill: var(--mds-color-foreground-strong);
 	}
 
 	& path {
 		fill: inherit;
 	}
 }
+
+.sidePanelText {
+	font-weight: var(--mds-typography-font-weight-semibold);
+}
+
+.productCategoryHasGroup {
+	& .productList {
+		padding-left: 0;
+		padding-right: 0;
+		padding-top: 0;
+	}
+
+	& .productWrapper {
+		gap: var(--mds-spacing-04);
+
+		@media (--small) {
+			padding: var(--mds-spacing-03) var(--mds-spacing-05);
+		}
+	}
+
+	& .productLogo {
+		margin-top: 3px;
+		height: 32px;
+		width: 32px;
+		min-width: 32px;
+
+		& svg {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	& .terraform {
+		width: 100%;
+		height: 100%;
+	}
+}
+
+.productGroupLink {
+	min-width: 100%;
+	max-width: 100%;
+	margin-bottom: var(--mds-spacing-03);
+	color: var(--mds-color-foreground-strong);
+	font-family: var(--mds-typography-font-stack-text);
+	font-size: var(--mds-typography-body-200-font-size);
+	line-height: var(--mds-typography-body-200-line-height);
+}