@hashicorp/react-components 0.0.0-canary.1fe3c0a → 0.0.0-canary.23632af

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hashicorp/react-components",
-	"version": "0.0.0-canary.1fe3c0a",
+	"version": "0.0.0-canary.23632af",
 	"main": "src/index.ts",
 	"scripts": {
 		"lint": "next-hashicorp lint",
@@ -8,7 +8,7 @@
 		"test:watch": "vitest watch"
 	},
 	"dependencies": {
-		"@hashicorp/flight-icons": "^2.15.0",
+		"@hashicorp/flight-icons": "^3.5.0",
 		"@hashicorp/platform-product-meta": "^0.1.1",
 		"@hashicorp/platform-util": "^0.2.0",
 		"@hashicorp/react-design-system-components": "*",
@@ -24,7 +24,7 @@
 		"react-hook-form": "^7.43.5"
 	},
 	"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/marketo-form/utils.ts

@@ -426,6 +426,10 @@ export const resolverErrors = (
  * @returns MarketoFormField[] with columnSplit property set
  */
 export function setFieldsColumnSplit(fieldsArr: MarketoFormField[]) {
+	if (!fieldsArr) {
+		return []
+	}
+
 	return fieldsArr.map((f) => {
 		const columnSplit = getFieldColumnSplit(fieldsArr, f)
 		return { ...f, columnSplit }

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

@@ -4,8 +4,21 @@ import s from './style.module.css'
 export interface NavColumnProps {
 	className?: string
 	children: React.ReactNode
+	hasSidePanel?: boolean
 }
 
-export default function Column({ className, children }: NavColumnProps) {
-	return <div className={classNames(s.column, className)}>{children}</div>
+export default function Column({
+	className,
+	children,
+	hasSidePanel,
+}: NavColumnProps) {
+	return (
+		<div
+			className={classNames(s.column, className, {
+				[s.hasSide]: hasSidePanel,
+			})}
+		>
+			{children}
+		</div>
+	)
 }

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

@@ -1,3 +1,5 @@
+@custom-media --dev-dot-viewport (min-width: 1230px);
+
 .column {
 	position: relative;
 	display: flex;
@@ -5,10 +7,18 @@
 	justify-content: flex-start;
 	min-width: 190px;
 	padding: 0;
-	margin: 0 var(--hdsplus-spacing-05);
+	margin: 0 var(--hdsplus-spacing-07);
 	border-radius: var(--hdsplus-spacing-03);
 
 	@media (--large) {
-		margin: 0;
+		&:not(.hasSide) {
+			margin: 0;
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		&.hasSide {
+			margin: 0;
+		}
 	}
 }

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

@@ -4,8 +4,17 @@ import s from './style.module.css'
 interface RootProps {
 	className?: string
 	children: React.ReactNode
+	hasSidePanel?: boolean
 }
 
-export default function Root({ className, children }: RootProps) {
-	return <div className={classNames(s.root, className)}>{children}</div>
+export default function Root({ className, children, hasSidePanel }: RootProps) {
+	return (
+		<div
+			className={classNames(s.root, className, {
+				[s.hasSide]: hasSidePanel,
+			})}
+		>
+			{children}
+		</div>
+	)
 }

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

@@ -1,3 +1,5 @@
+@custom-media --dev-dot-viewport (min-width: 1230px);
+
 .root {
 	width: 100%;
 	display: flex;
@@ -7,10 +9,22 @@
 	min-height: calc(100dvh - var(--hdsplus-spacing-12));
 
 	@media (--large) {
-		justify-content: flex-start;
-		height: 100%;
-		min-height: fit-content;
-		padding: var(--hdsplus-spacing-05) var(--hdsplus-spacing-04);
-		gap: var(--hdsplus-spacing-04);
+		&:not(.hasSide) {
+			justify-content: flex-start;
+			height: 100%;
+			min-height: fit-content;
+			padding: var(--hdsplus-spacing-05) var(--hdsplus-spacing-04);
+			gap: var(--hdsplus-spacing-04);
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		&.hasSide {
+			justify-content: flex-start;
+			height: 100%;
+			min-height: fit-content;
+			padding: var(--hdsplus-spacing-05) var(--hdsplus-spacing-04);
+			gap: var(--hdsplus-spacing-04);
+		}
 	}
 }

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

@@ -16,6 +16,7 @@ export interface PromoProps {
 	slug?: string
 	icon?: string
 	theme: string
+	hasSidePanel?: boolean
 }
 
 export default function Promo({
@@ -26,6 +27,7 @@ export default function Promo({
 	slug,
 	icon,
 	theme,
+	hasSidePanel,
 }: PromoProps) {
 	const handleClick = useCallback((title, linkUrl, linkTitle, slug) => {
 		if (window && window.analytics) {
@@ -40,7 +42,12 @@ export default function Promo({
 	}, [])
 
 	return (
-		<div className={s.promo}>
+		<div
+			className={classNames(s.promo, {
+				[s.hasSide]: hasSidePanel,
+				[s.noSide]: !hasSidePanel,
+			})}
+		>
 			{icon && (
 				<div
 					className={classNames(s.icon, {

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

@@ -1,3 +1,5 @@
+@custom-media --dev-dot-viewport (min-width: 1230px);
+
 .promo {
 	display: flex;
 	border-radius: var(--hdsplus-spacing-01);
@@ -7,12 +9,23 @@
 		var(--hdsplus-spacing-06) var(--hdsplus-spacing-08);
 	flex-direction: row;
 	gap: var(--hdsplus-spacing-04);
-	margin: var(--hdsplus-spacing-05);
+	margin: var(--hdsplus-spacing-07);
+	margin-bottom: var(--hdsplus-spacing-09);
 
 	@media (--large) {
-		margin: 0;
-		width: min-content;
-		min-width: 100%;
+		&.noSide {
+			margin: 0;
+			width: min-content;
+			min-width: 100%;
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		&.hasSide {
+			margin: 0;
+			width: min-content;
+			min-width: 100%;
+		}
 	}
 }
 
@@ -38,8 +51,17 @@
 	display: none;
 
 	@media (--large) {
-		display: block;
-		margin-top: 3px;
+		@nest .noSide & {
+			display: block;
+			margin-top: 3px;
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		@nest .hasSide & {
+			display: block;
+			margin-top: 3px;
+		}
 	}
 }
 

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

@@ -1,3 +1,5 @@
+import { CSSProperties } from 'react'
+import classNames from 'classnames'
 import Link from 'next/link'
 import * as NavPanel from '../components/panel'
 import Promo, { type PromoProps } from '../components/promo'
@@ -10,7 +12,7 @@ import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
 
 const PRODUCT_LOGO_MAP = new Map([
-	['Terraform', 'terraform-fill-color'],
+	['Terraform', 'terraform-fill'],
 	['Packer', 'packer-fill-color'],
 	['Vault', 'vault-fill-color'],
 	['Boundary', 'boundary-fill-color'],
@@ -18,8 +20,16 @@ const PRODUCT_LOGO_MAP = new Map([
 	['Nomad', 'nomad-fill-color'],
 	['Waypoint', 'waypoint-fill-color'],
 	['Vagrant', 'vagrant-fill-color'],
+	['HCP Vault Secrets', 'vault-secrets'],
+	['HCP Vault Radar', 'vault-radar'],
 ])
 
+const PRODUCT_LOGO_EXCEPTION_CLASSNAMES = {
+	Terraform: 'terraform',
+	'HCP Vault Secrets': 'hcpVaultSecrets',
+	'HCP Vault Radar': 'hcpVaultRadar',
+}
+
 export interface ProductsPanelProps {
 	productCategories: any
 	promo?: PromoProps
@@ -29,6 +39,7 @@ export interface ProductsPanelProps {
 			icon: string
 			title: string
 			description: string
+			url: string
 		}[]
 	}
 }
@@ -39,15 +50,31 @@ const ProductPanel = ({
 	sidePanel,
 }: ProductsPanelProps) => {
 	return (
-		<NavPanel.Root className={s.productPanel}>
+		<NavPanel.Root
+			className={classNames(s.productPanel, {
+				[s.hasSide]: sidePanel,
+				[s.noSide]: !sidePanel,
+			})}
+			hasSidePanel={Boolean(sidePanel)}
+		>
 			<div className={s.mainPanel}>
-				<NavPanel.Column>
+				<NavPanel.Column hasSidePanel={Boolean(sidePanel)}>
 					<ul className={s.productCategories}>
 						{productCategories.map(({ title, products }) => {
 							return (
 								<li key={title} className={s.productCategory}>
 									<TextPlus.Body className={s.eyebrow}>{title}</TextPlus.Body>
-									<ul className={s.productList}>
+									<ul
+										className={s.productList}
+										// Dynamically calculate row count based on number of items divided by expected columns
+										style={
+											{
+												'--row-count-above-mobile': Math.ceil(
+													products.length / 2
+												),
+											} as CSSProperties
+										}
+									>
 										{products.map((product) => {
 											return (
 												<li key={product.url}>
@@ -61,7 +88,7 @@ const ProductPanel = ({
 						})}
 					</ul>
 				</NavPanel.Column>
-				{promo ? <Promo {...promo} /> : null}
+				{promo ? <Promo {...promo} hasSidePanel={Boolean(sidePanel)} /> : null}
 			</div>
 
 			{sidePanel ? (
@@ -69,23 +96,31 @@ const ProductPanel = ({
 					<TextPlus.Body size="200" weight="semibold">
 						{sidePanel.label}
 					</TextPlus.Body>
+
+					{/* ! TODO Replace the below list with the <LinkList /> component, 
+						That component will require a refactor to support greater customization 
+						Ticket:
+						https://app.asana.com/0/1206176289707208/1208162145034615/f
+						*/}
 					<ul className={s.sidePanelItems}>
-						{sidePanel.navItems.map(({ icon, title, description }) => {
+						{sidePanel.navItems.map(({ icon, title, description, url }) => {
 							return (
-								<li key={title} className={s.sidePanelItem}>
-									<div className={s.iconBackground}>
-										<FlightIcon
-											size={16}
-											name={icon}
-											color="var(--token-color-foreground-faint)"
-										/>
-									</div>
-									<div className={s.sidePanelItemContent}>
-										<TextPlus.Body size="200" weight="semibold" tag="span">
-											{title}
-										</TextPlus.Body>
-										<span className={s.sidePanelItemDesc}>{description}</span>
-									</div>
+								<li key={title}>
+									<Link href={parseUrl(url).href} className={s.sidePanelItem}>
+										<div className={s.iconBackground}>
+											<FlightIcon
+												size={16}
+												name={icon}
+												color="var(--token-color-foreground-faint)"
+											/>
+										</div>
+										<div className={s.sidePanelItemContent}>
+											<TextPlus.Body size="200" weight="semibold" tag="span">
+												{title}
+											</TextPlus.Body>
+											<span className={s.sidePanelItemDesc}>{description}</span>
+										</div>
+									</Link>
 								</li>
 							)
 						})}
@@ -116,6 +151,11 @@ function NavProduct({ url, product, description }: NavProductProps) {
 					<div className={s.productLogo}>
 						<FlightIcon
 							name={PRODUCT_LOGO_MAP.get(product) ?? 'hashicorp-fill-color'}
+							className={
+								PRODUCT_LOGO_EXCEPTION_CLASSNAMES[product]
+									? s[PRODUCT_LOGO_EXCEPTION_CLASSNAMES[product]]
+									: undefined
+							}
 						/>
 					</div>
 					<div className={s.productTextContent}>

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

@@ -1,11 +1,24 @@
+@custom-media --dev-dot-viewport (min-width: 1230px);
+
 .productPanel {
 	height: 100%;
 
 	@media (--large) {
-		display: grid;
-		grid-template-rows: 1fr;
-		grid-template-columns: max-content max-content;
-		padding: 0;
+		&.noSide {
+			display: grid;
+			grid-template-rows: 1fr;
+			grid-template-columns: max-content max-content;
+			padding: 0;
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		&.hasSide {
+			display: grid;
+			grid-template-rows: 1fr;
+			grid-template-columns: max-content max-content;
+			padding: 0;
+		}
 	}
 }
 
@@ -13,10 +26,18 @@
 	list-style: none;
 	padding: 0;
 	display: grid;
-	margin: var(--hdsplus-spacing-06) 0 0;
+	margin: var(--hdsplus-spacing-07) 0 0;
 
 	@media (--large) {
-		margin: 0;
+		@nest .noSide & {
+			margin: 0;
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		@nest .hasSide & {
+			margin: 0;
+		}
 	}
 }
 
@@ -38,7 +59,17 @@
 	font-weight: var(--font-weight-semi-bold);
 
 	@media (--large) {
-		padding: 0 0 var(--hdsplus-spacing-01) var(--hdsplus-spacing-04);
+		@nest .noSide & {
+			padding-bottom: 0;
+			padding-left: var(--hdsplus-spacing-06);
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		@nest .hasSide & {
+			padding-bottom: 0;
+			padding-left: var(--hdsplus-spacing-06);
+		}
 	}
 }
 
@@ -50,10 +81,31 @@
 	padding: 0;
 
 	@media (--large) {
-		grid-auto-flow: row;
-		grid-template-columns: repeat(2, 300px);
-		grid-template-rows: repeat(2, max-content);
-		gap: 0;
+		@nest .noSide & {
+			padding: var(--hdsplus-spacing-06) var(--hdsplus-spacing-05)
+				var(--hdsplus-spacing-04);
+			grid-auto-flow: column;
+			grid-template-columns: repeat(2, 300px);
+			grid-template-rows: repeat(var(--row-count-above-mobile, 1), max-content);
+			gap: 0;
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		@nest .hasSide & {
+			padding: var(--hdsplus-spacing-06) var(--hdsplus-spacing-05)
+				var(--hdsplus-spacing-04);
+			grid-auto-flow: column;
+			grid-template-columns: repeat(2, 300px);
+			grid-template-rows: repeat(var(--row-count-above-mobile, 1), max-content);
+			gap: 0;
+		}
+	}
+
+	& li:last-child {
+		& .productWrapper {
+			margin-bottom: 0;
+		}
 	}
 }
 
@@ -65,12 +117,26 @@
 	gap: var(--hdsplus-spacing-05);
 
 	@media (--large) {
-		padding: var(--hdsplus-spacing-05);
-		margin-bottom: 0;
+		@nest .noSide & {
+			padding: var(--hdsplus-spacing-03) var(--hdsplus-spacing-05);
+			margin-bottom: 0;
 
-		&:hover {
-			background-color: var(--token-color-surface-interactive-hover);
-			border-radius: var(--hdsplus-spacing-01);
+			&:hover {
+				background-color: var(--token-color-surface-interactive-hover);
+				border-radius: var(--hdsplus-spacing-01);
+			}
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		@nest .hasSide & {
+			padding: var(--hdsplus-spacing-03) var(--hdsplus-spacing-05);
+			margin-bottom: 0;
+
+			&:hover {
+				background-color: var(--token-color-surface-interactive-hover);
+				border-radius: var(--hdsplus-spacing-01);
+			}
 		}
 	}
 }
@@ -81,10 +147,23 @@
 	& svg {
 		height: 42px;
 		width: 42px;
+	}
+
+	@nest .noSide & {
+		& svg {
+			@media (--large) {
+				height: var(--hdsplus-spacing-08);
+				width: var(--hdsplus-spacing-08);
+			}
+		}
+	}
 
-		@media (--large) {
-			height: var(--hdsplus-spacing-08);
-			width: var(--hdsplus-spacing-08);
+	@nest .hasSide & {
+		& svg {
+			@media (--dev-dot-viewport) {
+				height: var(--hdsplus-spacing-08);
+				width: var(--hdsplus-spacing-08);
+			}
 		}
 	}
 }
@@ -117,8 +196,17 @@
 	flex-direction: column;
 
 	@media (--large) {
-		padding: var(--hdsplus-spacing-05) 0 var(--hdsplus-spacing-05)
-			var(--hdsplus-spacing-04);
+		@nest .noSide & {
+			padding: var(--hdsplus-spacing-07) 0 var(--hdsplus-spacing-09)
+				var(--hdsplus-spacing-04);
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		@nest .hasSide & {
+			padding: var(--hdsplus-spacing-07) 0 var(--hdsplus-spacing-09)
+				var(--hdsplus-spacing-04);
+		}
 	}
 }
 
@@ -129,7 +217,7 @@
 	flex-direction: column;
 	gap: var(--hdsplus-spacing-05);
 	margin: 0;
-	padding: var(--hdsplus-spacing-05) var(--hdsplus-spacing-07)
+	padding: var(--hdsplus-spacing-07) var(--hdsplus-spacing-04)
 		var(--hdsplus-spacing-09) var(--hdsplus-spacing-07);
 }
 
@@ -141,7 +229,7 @@
 	grid-template-columns: 1fr;
 	gap: var(--hdsplus-spacing-07);
 
-	@media (--large) {
+	@media (--dev-dot-viewport) {
 		gap: var(--hdsplus-spacing-05);
 	}
 }
@@ -149,12 +237,10 @@
 /* Lifted from .productWrapper */
 .sidePanelItem {
 	display: flex;
-	margin-bottom: var(--hdsplus-spacing-05);
 	gap: var(--hdsplus-spacing-05);
 
-	@media (--large) {
+	@media (--dev-dot-viewport) {
 		padding: var(--hdsplus-spacing-03) var(--hdsplus-spacing-05);
-		margin-bottom: 0;
 
 		&:hover {
 			background-color: var(--token-color-surface-interactive-hover);
@@ -164,9 +250,9 @@
 }
 
 /* Lifted from:
-/Users/nquiles/git/web/packages/react-components/src/components/nav-panel/components/link-list/style.module.css  */
+packages/react-components/src/components/nav-panel/components/link-list/style.module.css  */
 .iconBackground {
-	background: var(--token-color-page-primary);
+	background: var(--token-color-foreground-high-contrast);
 	height: var(--hdsplus-spacing-08);
 	width: var(--hdsplus-spacing-08);
 	display: flex;
@@ -175,6 +261,7 @@
 	border-radius: 3px;
 	flex: none;
 	margin-top: 3px;
+	border: 1px solid var(--token-color-border-primary);
 }
 
 /* Lifted from .productTextContent */
@@ -184,9 +271,45 @@
 	color: var(--token-color-foreground-strong);
 }
 
-.sidePanelItem .sidePanelItemDesc {
+.sidePanelItemDesc {
 	font-weight: 400;
 	font-size: 13px;
 	line-height: 18px;
 	color: var(--token-color-foreground-primary);
 }
+
+/* Branding exception classnames */
+
+/* Allows switching to a dark-mode-specific color for Terraform */
+.terraform {
+	& use {
+		fill: var(--token-color-terraform-brand);
+
+		@nest [data-theme='dark'] & {
+			fill: var(--token-color-terraform-foreground);
+		}
+	}
+
+	& path {
+		fill: inherit;
+	}
+}
+
+/* Styles for HCP Vault mimic the spec for `product-square` icons,
+	while allowing the symbol inside the icon border to change color
+	based on the site's theme
+*/
+.hcpVaultSecrets,
+.hcpVaultRadar {
+	padding: var(--hdsplus-spacing-01);
+	border: 2px solid var(--token-color-vault-brand);
+	border-radius: 3px;
+
+	& use {
+		fill: var(--token-color-foreground-strong);
+	}
+
+	& path {
+		fill: inherit;
+	}
+}

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

@@ -2,7 +2,7 @@
 	display: flex;
 	gap: var(--hdsplus-spacing-03);
 	flex-direction: column;
-	margin-top: var(--hdsplus-spacing-06);
+	margin-top: var(--hdsplus-spacing-07);
 
 	@media (--large) {
 		flex-direction: row;

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

@@ -26,5 +26,7 @@ export function parseUrl(url: string | undefined): {
 const isRelative = (url) => url.startsWith('/')
 const isAnchor = (url) => url.startsWith('#')
 
-export const isInternal = (url) =>
-	new URL(url).hostname.includes('hashicorp.com')
+export const isInternal = (url) => {
+	const hostname = new URL(url).hostname
+	return hostname === 'hashicorp.com'
+}