@hashicorp/react-components 0.0.0-nightly.f7d3c1e → 0.0.0-nightly.fa9fc02

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/mktg-logos/all-community-product-logos_on-dark.ts

@@ -5,5 +5,6 @@ import packer from '@hashicorp/web-mktg-logos/src/packer/packer-community/packer
 import terraform from '@hashicorp/web-mktg-logos/src/terraform/terraform-community/terraform-community_on-dark.svg'
 import vagrant from '@hashicorp/web-mktg-logos/src/vagrant/vagrant-community/vagrant-community_on-dark.svg'
 import vault from '@hashicorp/web-mktg-logos/src/vault/vault-community/vault-community_on-dark.svg'
+import waypoint from '@hashicorp/web-mktg-logos/src/waypoint/hashicorp-waypoint-attributed/hashicorp-waypoint_on-dark.svg'
 
-export { boundary, consul, nomad, packer, terraform, vagrant, vault }
+export { boundary, consul, nomad, packer, terraform, vagrant, vault, waypoint }

package/src/components/subnav/partials/TitleLink/mktg-logos/all-community-product-logos_on-light.ts

@@ -5,5 +5,6 @@ import packer from '@hashicorp/web-mktg-logos/src/packer/packer-community/packer
 import terraform from '@hashicorp/web-mktg-logos/src/terraform/terraform-community/terraform-community_on-light.svg'
 import vagrant from '@hashicorp/web-mktg-logos/src/vagrant/vagrant-community/vagrant-community_on-light.svg'
 import vault from '@hashicorp/web-mktg-logos/src/vault/vault-community/vault-community_on-light.svg'
+import waypoint from '@hashicorp/web-mktg-logos/src/waypoint/hashicorp-waypoint-attributed/hashicorp-waypoint_on-light.svg'
 
-export { boundary, consul, nomad, packer, terraform, vagrant, vault }
+export { boundary, consul, nomad, packer, terraform, vagrant, vault, waypoint }

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

@@ -27,4 +27,14 @@ 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')
+	})
 })

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

@@ -12,8 +12,8 @@ export function parseUrl(url: string | undefined): {
 
 	if (isInternal(url)) {
 		try {
-			const { pathname, search } = new URL(url)
-			const href = pathname + search
+			const { pathname, search, hash } = new URL(url)
+			const href = pathname + search + hash
 			return { linkType: 'inbound', href }
 		} catch (error) {
 			throw new Error(`Invalid href: ${url}`)

package/src/lib/v/index.ts

@@ -3,9 +3,8 @@ import { vercelStegaSplit } from '@vercel/stega'
 /**
  * Takes in a Vercel Visual Editing string and returns the string without
  * hidden data.
+ *
  */
-export function v<VercelVEString extends string>(
-	s: VercelVEString
-): VercelVEString {
-	return vercelStegaSplit(s).cleaned as VercelVEString
-}
+export const vercelSplit = <VercelString>(
+	original: VercelString
+): VercelString => vercelStegaSplit(original as string).cleaned as VercelString

package/src/components/consent-manager/README.md

@@ -1,73 +0,0 @@
-# Consent Manager
-
-A GDPR-compliant consent manager.
-
-### Props
-
-- `version` (integer) - version number, bump up to override previous consent preferences
-- `container` (string) - id of container where the consent manager should live
-- `companyName` (string) - your company name to be inserted in various copy
-- `privacyPolicyLink` (string) - link to your company's privacy policy
-- `segmentWriteKey` (string) - your production segment write key
-- `segmentServices` (array of objects) - use this to override the category or description of a service provided by Segment
-  - `name` - name of the Segment integration, must match the integration you are overriding
-  - `category` _[optional]_ - new category name
-  - `description` _[optional]_ - new description
-- `categories` (array) - State of toggle
-  - `name` - name of category
-  - `description` - description for the category
-- `additionalServices` (array of objects) - additional integrations outside of Segment that you wish to include in the consent manager
-  - `name` - name of service
-  - `description` - description of service
-  - `category` - category of service
-  - `body` _[optional]_ - javascript body associated with service _If present, overrides `url` below_
-  - `url` _[optional]_ - url of js file associated with service
-  - `async` (bool) _[optional]_ - add `async` property to script element
-  - `addToBody` (bool) _[optional]_ - inject script before closing `<body>` tag
-  - `dataAttrs` (arr) _[optional]_ - array of `data-` attributes to add to script tag
-    - `name` (str) - name of data attribute (`data-name`)
-    - `value` (str) - value of `data` attribute to set
-- `showDialog` (bool) - whether or not the dialog `open` attribute is true
-
-
-## `SegmentPreloadScript`
-
-In `v9.0.0`, ConsentManager now exports a `SegmentPreloadScript` component. Why? ConsentManager uses a very similar Segment script to the current preloading script that we use in our `_document.tsx/js` files.
-
-Now that we're updating both with a custom Segment AJS URL and CDN hostname, it makes sense for the two to be co-located.
-
-Expect the new change to look like the following:
-
-```diff
-// pages/_document.tsx
-
-
-  import Document, { Html, Head, Main, NextScript } from 'next/document'
-  import HashiHead from '@hashicorp/react-head'
-+ import { SegmentPreloadScript } from '@web/react-components/src/components/consent-manager/scripts/segment'
-  // other imports
-
-  export default class MyDocument extends Document {
-    static async getInitialProps(ctx) {
-      const initialProps = await Document.getInitialProps(ctx)
-      return { ...initialProps }
-    }
-
-    render() {
-      return (
-        <Html lang="en">
-          <Head>
-            <HashiHead />
-          </Head>
-          <body>
--           <script
--             dangerouslySetInnerHTML={{
--               __html: `!function(){var analytics=window... ... ...`
--             }}
--           />
-+           <SegmentPreloadScript />
-
-// etc...
-```
-
-No additional updates are necessary!

package/src/components/consent-manager/components/banner/banner.module.css

@@ -1,23 +0,0 @@
-.root {
-	background-color: var(--token-color-surface-strong);
-	width: 100%;
-	padding: 10px 15px;
-	position: fixed;
-	bottom: 0;
-	left: 0;
-	z-index: 10;
-	font-size: 0.9rem;
-}
-
-.innerContainer {
-	composes: g-grid-container from global;
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	gap: var(--hdsplus-spacing-01);
-	flex-direction: column;
-
-	@media (min-width: 1350px) {
-		flex-direction: row;
-	}
-}

package/src/components/consent-manager/components/banner/banner.test.tsx

@@ -1,31 +0,0 @@
-import { render, screen, fireEvent } from '@testing-library/react'
-import ConsentBanner from './banner'
-
-test('should display the correct privacy policy url', () => {
-	const testValue = 'test'
-	render(<ConsentBanner privacyPolicyLink={testValue} />)
-	expect(screen.getByTestId('privacy-policy')).toHaveAttribute(
-		'href',
-		testValue
-	)
-})
-
-test('should display the correct cookie policy url', () => {
-	const testValue = 'test'
-	render(<ConsentBanner cookiePolicyLink={testValue} />)
-	expect(screen.getByTestId('cookie-policy')).toHaveAttribute('href', testValue)
-})
-
-test('should run the onManagePreferences function when the correct button is clicked', () => {
-	const mock = vi.fn()
-	render(<ConsentBanner onManagePreferences={mock} />)
-	fireEvent.click(screen.getByTestId('manage-preferences'))
-	expect(mock).toHaveBeenCalled()
-})
-
-test('should run the onAccept function when the correct button is clicked', () => {
-	const mock = vi.fn()
-	render(<ConsentBanner onAccept={mock} />)
-	fireEvent.click(screen.getByTestId('accept'))
-	expect(mock).toHaveBeenCalled()
-})

package/src/components/consent-manager/components/banner/banner.tsx

@@ -1,73 +0,0 @@
-import Link from 'next/link'
-import Button from '@hashicorp/react-design-system-components/src/components/button'
-import ButtonSet from '@hashicorp/react-design-system-components/src/components/button-set'
-import Text from '@hashicorp/react-design-system-components/src/components/text'
-import s from './banner.module.css'
-
-interface ConsentBannerProps {
-	preferences?: { loadAll?: boolean }
-	privacyPolicyLink?: string
-	cookiePolicyLink?: string
-	onManagePreferences?: () => void
-	onAccept?: () => void
-}
-
-export default function ConsentBanner({
-	preferences,
-	privacyPolicyLink,
-	cookiePolicyLink,
-	onManagePreferences,
-	onAccept,
-}: ConsentBannerProps) {
-	return (
-		<div className={s.root} data-testid="consent-banner">
-			<div className={s.innerContainer}>
-				<Text.Body color="primary">
-					We use cookies & other similar technology to collect data to improve
-					your experience on our site, as described in our{' '}
-					<Link
-						href={
-							privacyPolicyLink ?? 'https://www.hashicorp.com/trust/privacy'
-						}
-						className={s.link}
-						target="_blank"
-						rel="noopener noreferrer"
-						data-testid="privacy-policy"
-					>
-						Privacy Policy
-					</Link>{' '}
-					and{' '}
-					<Link
-						href={
-							cookiePolicyLink ??
-							'https://www.hashicorp.com/trust/privacy/cookies'
-						}
-						className={s.link}
-						target="_blank"
-						rel="noopener noreferrer"
-						data-testid="cookie-policy"
-					>
-						Cookie Policy
-					</Link>
-					.
-				</Text.Body>
-				<div>
-					<ButtonSet>
-						<Button
-							onClick={onManagePreferences}
-							color="secondary"
-							data-testid="manage-preferences"
-							text="Manage Preferences"
-						/>
-						<Button
-							onClick={onAccept}
-							color="primary"
-							data-testid="accept"
-							text={preferences?.loadAll ? 'Dismiss' : 'Accept'}
-						/>
-					</ButtonSet>
-				</div>
-			</div>
-		</div>
-	)
-}