@hashicorp/react-components 0.0.0-nightly.8df4a87 → 0.0.0-nightly.976e6ae

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@hashicorp/react-components",
-	"version": "0.0.0-nightly.8df4a87",
+	"version": "0.0.0-nightly.976e6ae",
 	"main": "src/index.ts",
 	"scripts": {
 		"lint": "next-hashicorp lint",
@@ -12,9 +12,12 @@
 		"@hashicorp/platform-product-meta": "^0.1.1",
 		"@hashicorp/platform-util": "^0.2.0",
 		"@hashicorp/react-design-system-components": "*",
-		"@radix-ui/react-visually-hidden": "^1.0.3",
+		"@hashicorp/web-mktg-logos": "*",
+		"@radix-ui/react-navigation-menu": "^1.2.0",
+		"@radix-ui/react-visually-hidden": "^1.1.0",
+		"@vercel/analytics": "^1.3.1",
 		"@vercel/fetch": "^7.0.0",
-		"@web/mktg-logos": "*",
+		"@vercel/stega": "^0.1.2",
 		"classnames": "^2.3.2",
 		"js-cookie": "^3.0.5",
 		"moize": "^6.1.3",

package/src/components/marketo-form/partials/fields/htmltext-field/style.module.css

@@ -1,6 +1,18 @@
 .htmltext {
-  composes: g-type-body-small from global;
-  color: var(--wpl-neutral-500);
-  margin-top: var(--wpl-spacing-02);
-  margin-bottom: var(--wpl-spacing-05);
+	composes: g-type-body-small from global;
+	margin-top: var(--hdsplus-spacing-04);
+	margin-bottom: var(--hdsplus-spacing-07);
+	color: var(--token-color-foreground-faint);
+
+	& a {
+		color: var(--token-color-foreground-action);
+		text-decoration: underline;
+
+		&:focus-visible {
+			text-decoration: none;
+			border-radius: 2px;
+			outline: 2px solid var(--token-color-focus-action-internal);
+			outline-offset: 1px;
+		}
+	}
 }

package/src/components/nav-panel/components/link-list/index.tsx

@@ -1,9 +1,9 @@
 import Link from 'next/link'
-import { parseUrl } from '../../../../../../../apps/www/lib/parseUrl'
-import s from './style.module.css'
-import { v } from '@web/cms'
+import { parseUrl } from '../../../../lib/parse-url'
+import { v } from '../../../../lib/v'
 import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
+import s from './style.module.css'
 
 export interface LinkListProps {
 	links: {

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

@@ -1,12 +1,12 @@
 import { useCallback } from 'react'
-import { trackNavClickEvent } from '../../../../../../../apps/www/layouts/standard/nav'
-import { v } from '@web/cms'
-import s from './style.module.css'
-import Link from 'next/link'
 import classNames from 'classnames'
-import { parseUrl } from '../../../../../../../apps/www/lib/parseUrl'
+import { v } from '../../../../lib/v'
+import Link from 'next/link'
+import { parseUrl } from '../../../../lib/parse-url'
+import { trackNavClickEvent } from '../../../../lib/track-nav-click-event'
 import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
+import s from './style.module.css'
 
 export interface PromoProps {
 	title: string

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

@@ -4,10 +4,10 @@ import Promo, { type PromoProps } from '../components/promo'
 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 '../../../../../../apps/www/lib/parseUrl'
-import { trackNavClickEvent } from '../../../../../../apps/www/layouts/standard/nav'
-import s from './style.module.css'
+import { parseUrl } from '../../../lib/parse-url'
+import { trackNavClickEvent } from '../../../lib/track-nav-click-event'
 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'],

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

@@ -1,4 +1,4 @@
-import { trackNavClickEvent } from '../../../../../../apps/www/layouts/standard/nav'
+import { trackNavClickEvent } from '../../../lib/track-nav-click-event'
 import * as NavPanel from '../components/panel'
 import LinkList, { type LinkListProps } from '../components/link-list'
 import Promo, { type PromoProps } from '../components/promo'

package/src/components/next-steps/index.tsx

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: MPL-2.0
  */
 
-import * as React from 'react'
+import { useState } from 'react'
 import Badge from '@hashicorp/react-badge'
 import classNames from 'classnames'
 import ExpandableArrow from '@hashicorp/react-expandable-arrow'
@@ -23,16 +23,10 @@ export default function NextSteps({
 	steps,
 	cta,
 }: NextStepsProps) {
-	const { slug, themeClass } = useProductMeta(theme)
-
+	const { themeClass } = useProductMeta(theme)
 	return (
 		<section
-			className={classNames(
-				s.nextSteps,
-				s[appearance],
-				themeClass,
-				slug && s[slug]
-			)}
+			className={classNames(s.nextSteps, s[appearance], themeClass)}
 			data-testid="next-steps"
 		>
 			<div className={s.container}>
@@ -96,7 +90,7 @@ export default function NextSteps({
 }
 
 function Tile({ theme, variant, heading, badge, description, cta }) {
-	const [isHovered, setIsHovered] = React.useState(false)
+	const [isHovered, setIsHovered] = useState(false)
 	return (
 		<Link href={cta.url} legacyBehavior>
 			<a

package/src/components/subnav/index.tsx

@@ -1,17 +1,14 @@
+'use client'
+
 /**
  * Copyright (c) HashiCorp, Inc.
  * SPDX-License-Identifier: MPL-2.0
  */
-
-'use client'
-
 import { useState } from 'react'
 import classNames from 'classnames'
 import useProductMeta, { Products } from '@hashicorp/platform-product-meta'
 import { THEMES } from './subnav-consts'
 import useNavRef from './helpers/useNavRef'
-import s from './style.module.css'
-import themeStyles from './theme.module.css'
 
 import MenuItemsOverflow from './partials/MenuItemsOverflow'
 import TitleLink from './partials/TitleLink'
@@ -20,6 +17,8 @@ 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 = {
 	consul: 'consul',
@@ -76,7 +75,6 @@ function SubnavInner({
 	menuText = 'Menu',
 	activatePanel,
 }: SubnavInnerProps) {
-	const { themeClass } = useProductMeta(product) // overrides --brand css vars
 	// Add _isActiveUrl to menuItems so we can highlight them appropriately
 	const menuItemsWithActive = traverse(menuItems, (_key, value: any) => {
 		const hasUrl = isObject(value) && value.url
@@ -88,6 +86,8 @@ function SubnavInner({
 		return value
 	})
 
+	const { themeClass } = useProductMeta(product)
+
 	/**
 	 * Note on constrainWidth & g-grid-container
 	 *

package/src/components/subnav/partials/CtaLinks/index.tsx

@@ -12,8 +12,8 @@ import type { ToggleButtonProps } from '@hashicorp/react-design-system-component
 import * as Dropdown from '@hashicorp/react-design-system-components/src/components/dropdown'
 import GithubStarsLink from './github-stars-link'
 import classNames from 'classnames'
-import s from './style.module.css'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
+import s from './style.module.css'
 
 type CtaLink = ButtonProps & { href: string; __typename?: string }
 

package/src/components/subnav/partials/DropdownTrigger/index.tsx

@@ -5,8 +5,8 @@
 
 import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
 import NavItemText from '../nav-item-text'
-import s from './style.module.css'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
+import s from './style.module.css'
 
 interface DropdownTriggerProps {
 	text: string

package/src/components/subnav/partials/MenuItemsDefault/index.tsx

@@ -7,8 +7,8 @@ import React from 'react'
 import Link from 'next/link'
 import NavItemText from '../nav-item-text'
 import DropdownTrigger from '../DropdownTrigger'
-import s from './style.module.css'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
+import s from './style.module.css'
 
 interface MenuItemsDefaultProps {
 	menuItems: (

package/src/components/subnav/partials/MenuItemsOverflow/index.tsx

@@ -4,14 +4,14 @@
  */
 
 import React from 'react'
-import { v } from '@web/cms'
+import { v } from '../../../../lib/v'
 import Link from 'next/link'
 import type { Products } from '@hashicorp/platform-product-meta'
 import CtaLinks, { type CtaLinkProps } from '../CtaLinks'
 import DropdownTrigger from '../DropdownTrigger'
-import s from './style.module.css'
 import * as NavigationMenu from '@radix-ui/react-navigation-menu'
 import classNames from 'classnames'
+import s from './style.module.css'
 
 interface MenuItemsOverflowProps {
 	menuItems: (

package/src/components/subnav/partials/TitleLink/index.tsx

@@ -7,20 +7,20 @@ import { forwardRef } from 'react'
 import { camelCase } from 'camel-case'
 import Link from 'next/link'
 import Image from 'next/image'
-import { v } from '@web/cms'
+import { v } 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'
 import * as PrimaryLogosOnDark from './mktg-logos/all-primary-logos_on-dark'
 import * as PrimaryLogosOnLight from './mktg-logos/all-primary-logos_on-light'
-import HashiCorpLogoOnLight from '@web/mktg-logos/src/hashicorp/hashicorp-horizontal_on-light.svg'
-import HashiCorpLogoOnDark from '@web/mktg-logos/src/hashicorp/hashicorp-horizontal_on-dark.svg'
-import HCPLogoOnLight from '@web/mktg-logos/src/hcp/hcp-horizontal_on-light.svg'
-import HCPLogoOnDark from '@web/mktg-logos/src/hcp/hcp-horizontal_on-dark.svg'
-import WaypointLogoAttrOnLight from '@web/mktg-logos/src/waypoint/hashicorp-waypoint-attributed/hashicorp-waypoint_on-light.svg'
-import WaypointLogoAttrOnDark from '@web/mktg-logos/src/waypoint/hashicorp-waypoint-attributed/hashicorp-waypoint_on-dark.svg'
-import HCPTerraformLogoOnLight from '@web/mktg-logos/src/terraform/hcp-terraform/hcp-terraform_on-light.svg'
-import HCPTerraformLogoOnDark from '@web/mktg-logos/src/terraform/hcp-terraform/hcp-terraform_on-dark.svg'
+import HashiCorpLogoOnLight from '@hashicorp/web-mktg-logos/src/hashicorp/hashicorp-horizontal_on-light.svg'
+import HashiCorpLogoOnDark from '@hashicorp/web-mktg-logos/src/hashicorp/hashicorp-horizontal_on-dark.svg'
+import HCPLogoOnLight from '@hashicorp/web-mktg-logos/src/hcp/hcp-horizontal_on-light.svg'
+import HCPLogoOnDark from '@hashicorp/web-mktg-logos/src/hcp/hcp-horizontal_on-dark.svg'
+import WaypointLogoAttrOnLight from '@hashicorp/web-mktg-logos/src/waypoint/hashicorp-waypoint-attributed/hashicorp-waypoint_on-light.svg'
+import WaypointLogoAttrOnDark from '@hashicorp/web-mktg-logos/src/waypoint/hashicorp-waypoint-attributed/hashicorp-waypoint_on-dark.svg'
+import HCPTerraformLogoOnLight from '@hashicorp/web-mktg-logos/src/terraform/hcp-terraform/hcp-terraform_on-light.svg'
+import HCPTerraformLogoOnDark from '@hashicorp/web-mktg-logos/src/terraform/hcp-terraform/hcp-terraform_on-dark.svg'
 import s from './style.module.css'
 
 const logoDict = {

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

@@ -1,9 +1,9 @@
-import boundary from '@web/mktg-logos/src/boundary/boundary-community/boundary-community_on-dark.svg'
-import consul from '@web/mktg-logos/src/consul/consul-community/consul-community_on-dark.svg'
-import nomad from '@web/mktg-logos/src/nomad/nomad-community/nomad-community_on-dark.svg'
-import packer from '@web/mktg-logos/src/packer/packer-community/packer-community_on-dark.svg'
-import terraform from '@web/mktg-logos/src/terraform/terraform-community/terraform-community_on-dark.svg'
-import vagrant from '@web/mktg-logos/src/vagrant/vagrant-community/vagrant-community_on-dark.svg'
-import vault from '@web/mktg-logos/src/vault/vault-community/vault-community_on-dark.svg'
+import boundary from '@hashicorp/web-mktg-logos/src/boundary/boundary-community/boundary-community_on-dark.svg'
+import consul from '@hashicorp/web-mktg-logos/src/consul/consul-community/consul-community_on-dark.svg'
+import nomad from '@hashicorp/web-mktg-logos/src/nomad/nomad-community/nomad-community_on-dark.svg'
+import packer from '@hashicorp/web-mktg-logos/src/packer/packer-community/packer-community_on-dark.svg'
+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'
 
 export { boundary, consul, nomad, packer, terraform, vagrant, vault }

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

@@ -1,9 +1,9 @@
-import boundary from '@web/mktg-logos/src/boundary/boundary-community/boundary-community_on-light.svg'
-import consul from '@web/mktg-logos/src/consul/consul-community/consul-community_on-light.svg'
-import nomad from '@web/mktg-logos/src/nomad/nomad-community/nomad-community_on-light.svg'
-import packer from '@web/mktg-logos/src/packer/packer-community/packer-community_on-light.svg'
-import terraform from '@web/mktg-logos/src/terraform/terraform-community/terraform-community_on-light.svg'
-import vagrant from '@web/mktg-logos/src/vagrant/vagrant-community/vagrant-community_on-light.svg'
-import vault from '@web/mktg-logos/src/vault/vault-community/vault-community_on-light.svg'
+import boundary from '@hashicorp/web-mktg-logos/src/boundary/boundary-community/boundary-community_on-light.svg'
+import consul from '@hashicorp/web-mktg-logos/src/consul/consul-community/consul-community_on-light.svg'
+import nomad from '@hashicorp/web-mktg-logos/src/nomad/nomad-community/nomad-community_on-light.svg'
+import packer from '@hashicorp/web-mktg-logos/src/packer/packer-community/packer-community_on-light.svg'
+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'
 
 export { boundary, consul, nomad, packer, terraform, vagrant, vault }

package/src/components/subnav/partials/TitleLink/mktg-logos/all-primary-logos_on-dark.ts

@@ -1,13 +1,13 @@
-import boundary from '@web/mktg-logos/src/boundary/boundary/boundary_on-dark.svg'
-import consul from '@web/mktg-logos/src/consul/consul/consul_on-dark.svg'
-import nomad from '@web/mktg-logos/src/nomad/nomad/nomad_on-dark.svg'
-import packer from '@web/mktg-logos/src/packer/packer/packer_on-dark.svg'
-import terraform from '@web/mktg-logos/src/terraform/terraform/terraform_on-dark.svg'
-import vagrant from '@web/mktg-logos/src/vagrant/vagrant/vagrant_on-dark.svg'
-import vault from '@web/mktg-logos/src/vault/vault/vault_on-dark.svg'
-import waypoint from '@web/mktg-logos/src/waypoint/waypoint/waypoint_on-dark.svg'
-import hashiconf from '@web/mktg-logos/src/conferences/hashiconf_on-dark.svg'
-import hashidays from '@web/mktg-logos/src/conferences/hashidays_on-dark.svg'
+import boundary from '@hashicorp/web-mktg-logos/src/boundary/boundary/boundary_on-dark.svg'
+import consul from '@hashicorp/web-mktg-logos/src/consul/consul/consul_on-dark.svg'
+import nomad from '@hashicorp/web-mktg-logos/src/nomad/nomad/nomad_on-dark.svg'
+import packer from '@hashicorp/web-mktg-logos/src/packer/packer/packer_on-dark.svg'
+import terraform from '@hashicorp/web-mktg-logos/src/terraform/terraform/terraform_on-dark.svg'
+import vagrant from '@hashicorp/web-mktg-logos/src/vagrant/vagrant/vagrant_on-dark.svg'
+import vault from '@hashicorp/web-mktg-logos/src/vault/vault/vault_on-dark.svg'
+import waypoint from '@hashicorp/web-mktg-logos/src/waypoint/waypoint/waypoint_on-dark.svg'
+import hashiconf from '@hashicorp/web-mktg-logos/src/conferences/hashiconf_on-dark.svg'
+import hashidays from '@hashicorp/web-mktg-logos/src/conferences/hashidays_on-dark.svg'
 
 export {
 	boundary,

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

@@ -1,13 +1,13 @@
-import boundary from '@web/mktg-logos/src/boundary/boundary/boundary_on-light.svg'
-import consul from '@web/mktg-logos/src/consul/consul/consul_on-light.svg'
-import nomad from '@web/mktg-logos/src/nomad/nomad/nomad_on-light.svg'
-import packer from '@web/mktg-logos/src/packer/packer/packer_on-light.svg'
-import terraform from '@web/mktg-logos/src/terraform/terraform/terraform_on-light.svg'
-import vagrant from '@web/mktg-logos/src/vagrant/vagrant/vagrant_on-light.svg'
-import vault from '@web/mktg-logos/src/vault/vault/vault_on-light.svg'
-import waypoint from '@web/mktg-logos/src/waypoint/waypoint/waypoint_on-light.svg'
-import hashiconf from '@web/mktg-logos/src/conferences/hashiconf_on-light.svg'
-import hashidays from '@web/mktg-logos/src/conferences/hashidays_on-light.svg'
+import boundary from '@hashicorp/web-mktg-logos/src/boundary/boundary/boundary_on-light.svg'
+import consul from '@hashicorp/web-mktg-logos/src/consul/consul/consul_on-light.svg'
+import nomad from '@hashicorp/web-mktg-logos/src/nomad/nomad/nomad_on-light.svg'
+import packer from '@hashicorp/web-mktg-logos/src/packer/packer/packer_on-light.svg'
+import terraform from '@hashicorp/web-mktg-logos/src/terraform/terraform/terraform_on-light.svg'
+import vagrant from '@hashicorp/web-mktg-logos/src/vagrant/vagrant/vagrant_on-light.svg'
+import vault from '@hashicorp/web-mktg-logos/src/vault/vault/vault_on-light.svg'
+import waypoint from '@hashicorp/web-mktg-logos/src/waypoint/waypoint/waypoint_on-light.svg'
+import hashiconf from '@hashicorp/web-mktg-logos/src/conferences/hashiconf_on-light.svg'
+import hashidays from '@hashicorp/web-mktg-logos/src/conferences/hashidays_on-light.svg'
 
 export {
 	boundary,

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

@@ -0,0 +1,30 @@
+import { parseUrl } from '.'
+
+describe('parseUrl', () => {
+	it('detects hashicorp.com URLs as internal', () => {
+		const url = parseUrl('https://hashicorp.com/example')
+		expect(url.href).toBe('/example')
+		expect(url.linkType).toBe('inbound')
+	})
+
+	it('detects URLs not containing hashicorp.com as external', () => {
+		const externalUrl = 'https://google.com/example'
+		const url = parseUrl(externalUrl)
+		expect(url.href).toBe(externalUrl)
+		expect(url.linkType).toBe('outbound')
+	})
+
+	it('detects relative URLs as internal', () => {
+		const relativeUrl = '/resources'
+		const url = parseUrl(relativeUrl)
+		expect(url.href).toBe(relativeUrl)
+		expect(url.linkType).toBe('inbound')
+	})
+
+	it('leaves URL search params intact', () => {
+		const url = parseUrl(
+			'https://hashicorp.com/resources?type=case-study&products=terraform'
+		)
+		expect(url.href).toBe('/resources?type=case-study&products=terraform')
+	})
+})

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

@@ -0,0 +1,30 @@
+export function parseUrl(url: string | undefined): {
+	linkType: 'inbound' | 'outbound'
+	href: string
+} {
+	if (!url) {
+		throw new Error('url is required')
+	}
+
+	if (isRelative(url) || isAnchor(url)) {
+		return { linkType: 'inbound', href: url }
+	}
+
+	if (isInternal(url)) {
+		try {
+			const { pathname, search } = new URL(url)
+			const href = pathname + search
+			return { linkType: 'inbound', href }
+		} catch (error) {
+			throw new Error(`Invalid href: ${url}`)
+		}
+	}
+
+	return { linkType: 'outbound', href: url }
+}
+
+const isRelative = (url) => url.startsWith('/')
+const isAnchor = (url) => url.startsWith('#')
+
+export const isInternal = (url) =>
+	new URL(url).hostname.includes('hashicorp.com')

package/src/lib/track-nav-click-event/index.ts

@@ -0,0 +1,22 @@
+import va from '@vercel/analytics'
+
+/**
+ * Pushes a 'Nav link click' custom event to Vercel Analytics.
+ * A wrapper around the Vercel Analytics track method.
+ *
+ * @param {string} name - The name of the nav link
+ * @param {string} href - The href for the nav link
+ * @param {string} [section] - The name of the section of the nav. Top-level links do not have a section.
+ */
+
+export const trackNavClickEvent = (
+	name: string,
+	href: string,
+	section: string
+) => {
+	va.track('Nav link click', {
+		name,
+		href,
+		section,
+	})
+}

package/src/lib/v/index.ts

@@ -0,0 +1,11 @@
+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
+}