@hashicorp/react-components 0.0.0-nightly.a3c2b71 → 0.0.0-nightly.a830c6d

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}

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/index.tsx

@@ -3,19 +3,20 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import Button, {
-	type ButtonProps,
-} from '@hashicorp/react-design-system-components/src/components/button'
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
+import {
+	HDSPlusButton,
+	type HDSPlusButtonProps,
+} from '@hashicorp/react-mds/src/hds-plus/button'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
 import type { Products } from '@hashicorp/platform-product-meta'
-import type { ToggleButtonProps } from '@hashicorp/react-design-system-components/src/components/dropdown/toggle/button'
-import * as Dropdown from '@hashicorp/react-design-system-components/src/components/dropdown'
+import type { ToggleButtonProps } from '@hashicorp/react-hds/src/components/dropdown/toggle/button'
+import * as Dropdown from '@hashicorp/react-hds/src/components/dropdown'
 import GithubStarsLink from './github-stars-link'
 import classNames from 'classnames'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
 
-type CtaLink = ButtonProps & { href: string; __typename?: string }
+type CtaLink = HDSPlusButtonProps & { href: string; __typename?: string }
 
 type CtaDropdown = {
 	__typename?: string
@@ -83,7 +84,7 @@ function CtaLinks({
 						const isLastButton = stableIdx === links.length - 1
 
 						return (
-							<Button
+							<HDSPlusButton
 								key={href}
 								text={text}
 								href={href}

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
+import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
 import NavItemText from '../nav-item-text'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
@@ -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-hds/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-hds/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/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

@@ -1,4 +1,4 @@
-import { parseUrl } from '.'
+import { parseUrl, hasHashiCorpDestination } from '.'
 
 describe('parseUrl', () => {
 	it('detects hashicorp.com URLs as internal', () => {
@@ -7,6 +7,12 @@ describe('parseUrl', () => {
 		expect(url.linkType).toBe('inbound')
 	})
 
+	it('detects www.hashicorp.com URLs as internal', () => {
+		const url = parseUrl('https://hashicorp.com/foo')
+		expect(url.href).toBe('/foo')
+		expect(url.linkType).toBe('inbound')
+	})
+
 	it('detects URLs not containing hashicorp.com as external', () => {
 		const externalUrl = 'https://google.com/example'
 		const url = parseUrl(externalUrl)
@@ -28,8 +34,36 @@ describe('parseUrl', () => {
 		expect(url.href).toBe('/resources?type=case-study&products=terraform')
 	})
 
+	it('leaves URL hash intact', () => {
+		const url = parseUrl('https://hashicorp.com/about#leadership')
+		expect(url.href).toBe('/about#leadership')
+	})
+
 	it('leaves HashiCorp subdomain URLs intact', () => {
 		const url = parseUrl('https://developer.hashicorp.com/terraform')
 		expect(url.href).toBe('https://developer.hashicorp.com/terraform')
 	})
 })
+
+describe('hasHashiCorpDestination', () => {
+	it('returns true for supported hashicorp domains', () => {
+		const isHashiCorpDestination = hasHashiCorpDestination(
+			'https://portal.cloud.hashicorp.com/foo'
+		)
+		expect(isHashiCorpDestination).toBe(true)
+	})
+	it('returns false for external domains', () => {
+		const isHashiCorpDestination = hasHashiCorpDestination(
+			'https://foo.com/bar'
+		)
+		expect(isHashiCorpDestination).toBe(false)
+	})
+	it('returns true for relative links', () => {
+		const isHashiCorpDestination = hasHashiCorpDestination('/bar')
+		expect(isHashiCorpDestination).toBe(true)
+	})
+	it('returns true for hashes', () => {
+		const isHashiCorpDestination = hasHashiCorpDestination('#someHash')
+		expect(isHashiCorpDestination).toBe(true)
+	})
+})