@hashicorp/react-components 0.0.0-nightly.4224c7b → 0.0.0-nightly.43a717d

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

@@ -1,14 +1,15 @@
 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 { getLocalizedLinkProps } from '../../../../lib/get-localized-link-props'
 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'
 
 export interface PromoProps {
+	locale?: string
 	title: string
 	description: string
 	linkUrl: string
@@ -20,6 +21,7 @@ export interface PromoProps {
 }
 
 export default function Promo({
+	locale,
 	title,
 	description,
 	linkUrl,
@@ -51,19 +53,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}
@@ -72,7 +74,8 @@ export default function Promo({
 				</div>
 				<NavigationMenu.Link asChild>
 					<Link
-						href={parseUrl(linkUrl).href}
+						locale={locale ? locale : undefined}
+						{...getLocalizedLinkProps(linkUrl, locale)}
 						className={s.link}
 						onClickCapture={() => handleClick(title, linkUrl, linkTitle, slug)}
 					>

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

@@ -2,10 +2,10 @@ import classNames from 'classnames'
 import Link from 'next/link'
 import * as NavPanel from '../components/panel'
 import Promo, { type PromoProps } from '../components/promo'
+import { getLocalizedLinkProps } from '../../../lib/get-localized-link-props'
 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 FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
+import { TextPlus } from '@hashicorp/react-hds/src/components/text'
 import { trackNavClickEvent } from '../../../lib/track-nav-click-event'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import s from './style.module.css'
@@ -30,6 +30,7 @@ const PRODUCT_LOGO_EXCEPTION_CLASSNAMES = {
 }
 
 export interface ProductsPanelProps {
+	locale: string
 	productCategories: any
 	promo?: PromoProps
 	sidePanel?: {
@@ -44,6 +45,7 @@ export interface ProductsPanelProps {
 }
 
 const ProductPanel = ({
+	locale,
 	productCategories,
 	promo,
 	sidePanel,
@@ -67,7 +69,7 @@ const ProductPanel = ({
 										{products.map((product) => {
 											return (
 												<li key={product.url}>
-													<NavProduct {...product} />
+													<NavProduct locale={locale} {...product} />
 												</li>
 											)
 										})}
@@ -97,7 +99,8 @@ 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}>
@@ -125,17 +128,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')
 				}}

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

@@ -12,12 +12,14 @@ interface StandardPanelProps {
 	navData: NavItem[]
 	promo?: PromoProps
 	sectionName?: string
+	locale?: any
 }
 
 const StandardPanel = ({
 	navData,
 	promo,
 	sectionName = '',
+	locale,
 }: StandardPanelProps) => {
 	return (
 		<NavPanel.Root>
@@ -26,6 +28,7 @@ const StandardPanel = ({
 					return (
 						<NavPanel.Column key={stableIdx}>
 							<LinkList
+								locale={locale}
 								links={navItems}
 								linkClickHandler={(text, href) => {
 									trackNavClickEvent(text, href, sectionName)

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 = {
@@ -47,6 +46,7 @@ type SubnavDropdown = {
 type MenuItem = SubnavLink | SubnavDropdown | 'divider'
 
 export interface SubnavInnerProps {
+	locale?: string
 	hasOverflow?: boolean
 	titleLink: { text: string; url: string }
 	product?: Products
@@ -62,6 +62,7 @@ export interface SubnavInnerProps {
 }
 
 function SubnavInner({
+	locale,
 	hasOverflow,
 	titleLink,
 	product,
@@ -110,17 +111,20 @@ function SubnavInner({
 			>
 				<NavigationMenu.Link asChild>
 					<TitleLink
+						locale={locale}
 						text={titleLink.text}
 						url={titleLink.url}
 						product={product}
 						theme={theme}
 					/>
 				</NavigationMenu.Link>
+
 				{!hasOverflow && (
 					<div className={s.subNavRight}>
 						<MenuItemsDefault
 							menuItems={menuItemsWithActive}
 							activatePanel={activatePanel}
+							locale={locale}
 						/>
 						{ctaLinks?.length > 0 && (
 							<CtaLinks
@@ -165,6 +169,10 @@ function Subnav({ className, theme = 'light', ...restProps }: SubnavProps) {
 		setActivePanel(panel)
 	}
 
+	const ariaLabel = restProps?.titleLink?.text
+		? `${restProps.titleLink.text} pages`
+		: 'Subnav pages'
+
 	return (
 		<>
 			{/**
@@ -175,11 +183,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,22 +9,30 @@ 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'
+import { getLocalizedLinkProps } from '../../../../lib/get-localized-link-props'
 
 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'
 	)[]
 	activatePanel: (panel: string) => void
+	locale?: string
 }
 
 function MenuItemsDefault(props: MenuItemsDefaultProps) {
-	const { menuItems, activatePanel } = props
+	const { menuItems, activatePanel, locale } = props
 	return (
 		<NavigationMenu.List className={s.root}>
 			{menuItems.map((menuItem, stableIdx) => {
@@ -41,6 +49,7 @@ function MenuItemsDefault(props: MenuItemsDefaultProps) {
 						text={text}
 						submenu={submenu}
 						activatePanel={activatePanel}
+						locale={locale}
 					/>
 				) : (
 					<NavLink
@@ -50,6 +59,7 @@ function MenuItemsDefault(props: MenuItemsDefaultProps) {
 						text={text}
 						url={url}
 						isActive={_isActiveUrl}
+						locale={locale}
 					/>
 				)
 			})}
@@ -69,14 +79,15 @@ interface NavLinkProps {
 	text: string
 	url: string
 	isActive: boolean
+	locale?: string
 }
 
 function NavLink(props: NavLinkProps) {
-	const { text, url, isActive } = props
+	const { text, url, isActive, locale } = props
 	return (
 		<NavigationMenu.Item className={s.listItem}>
 			<NavigationMenu.Link asChild>
-				<Link className={s.navLink} href={url}>
+				<Link className={s.navLink} {...getLocalizedLinkProps(url, locale)}>
 					<NavItemText isActive={isActive} text={text} />
 				</Link>
 			</NavigationMenu.Link>
@@ -86,8 +97,9 @@ 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
+	locale?: string
 }
 
 interface NavLinkWithDropdownState {
@@ -99,7 +111,7 @@ class NavLinkWithDropdown extends React.Component<
 	NavLinkWithDropdownState
 > {
 	render() {
-		const { text, submenu, activatePanel } = this.props
+		const { text, submenu, activatePanel, locale } = this.props
 		const hasActiveChild = submenu.some((s) => s._isActiveUrl)
 
 		const handleFocusOutside = () => {
@@ -128,12 +140,16 @@ 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}>
+											<Link
+												className={s.submenuItem}
+												{...getLocalizedLinkProps(url, locale)}
+											>
+												{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;
 }