@hashicorp/react-components 0.0.0-canary.88aaf8d → 0.0.0-canary.8f01c36

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hashicorp/react-components",
-	"version": "0.0.0-canary.88aaf8d",
+	"version": "0.0.0-canary.8f01c36",
 	"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/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;
@@ -9,6 +11,14 @@
 	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);
@@ -10,9 +12,19 @@
 	margin: var(--hdsplus-spacing-05);
 
 	@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 +50,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'
@@ -47,15 +49,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}>
@@ -69,7 +87,7 @@ const ProductPanel = ({
 						})}
 					</ul>
 				</NavPanel.Column>
-				{promo ? <Promo {...promo} /> : null}
+				{promo ? <Promo {...promo} hasSidePanel={Boolean(sidePanel)} /> : null}
 			</div>
 
 			{sidePanel ? (
@@ -131,13 +149,10 @@ function NavProduct({ url, product, description }: NavProductProps) {
 				<div className={s.productWrapper}>
 					<div className={s.productLogo}>
 						<FlightIcon
-							name={
-								PRODUCT_LOGO_MAP.get('HCP Vault Secrets') ??
-								'hashicorp-fill-color'
-							}
+							name={PRODUCT_LOGO_MAP.get(product) ?? 'hashicorp-fill-color'}
 							className={
-								PRODUCT_LOGO_EXCEPTION_CLASSNAMES['HCP Vault Secrets']
-									? s[PRODUCT_LOGO_EXCEPTION_CLASSNAMES['HCP Vault Secrets']]
+								PRODUCT_LOGO_EXCEPTION_CLASSNAMES[product]
+									? s[PRODUCT_LOGO_EXCEPTION_CLASSNAMES[product]]
 									: undefined
 							}
 						/>

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;
+		}
 	}
 }
 
@@ -16,7 +29,15 @@
 	margin: var(--hdsplus-spacing-06) 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-05)
+				var(--hdsplus-spacing-04);
+		}
+	}
+
+	@media (--dev-dot-viewport) {
+		@nest .hasSide & {
+			padding: var(--hdsplus-spacing-07) 0 var(--hdsplus-spacing-05)
+				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);

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'
+}