@hashicorp/react-components 0.0.0-nightly.2c654ea → 0.0.0-nightly.2e0daaf

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (80) hide show
  1. package/package.json +4 -3
  2. package/src/components/actions/index.tsx +5 -5
  3. package/src/components/call-to-action/index.tsx +7 -7
  4. package/src/components/card/index.test.tsx +1 -1
  5. package/src/components/card/newsroom-card/index.test.tsx +1 -1
  6. package/src/components/card/partner-card/index.tsx +3 -3
  7. package/src/components/card/person-card/index.tsx +1 -1
  8. package/src/components/card/primitives.tsx +16 -15
  9. package/src/components/card/resource-card/index.test.tsx +1 -1
  10. package/src/components/card/resource-card/index.tsx +3 -0
  11. package/src/components/card/types.ts +2 -2
  12. package/src/components/card/unified-card/index.spec.tsx +40 -0
  13. package/src/components/card/unified-card/index.tsx +5 -11
  14. package/src/components/marketo-form/contexts/FormMetadata.ts +2 -0
  15. package/src/components/marketo-form/form/index.tsx +4 -2
  16. package/src/components/marketo-form/partials/fields/checkbox-field/index.tsx +1 -1
  17. package/src/components/marketo-form/partials/fields/email-field/index.tsx +1 -1
  18. package/src/components/marketo-form/partials/fields/form-page-url-field/index.tsx +2 -0
  19. package/src/components/marketo-form/partials/fields/hidden-field/index.tsx +1 -0
  20. package/src/components/marketo-form/partials/fields/radio-buttons-field/index.tsx +1 -1
  21. package/src/components/marketo-form/partials/fields/select-field/index.tsx +1 -1
  22. package/src/components/marketo-form/partials/fields/telephone-field/index.tsx +1 -1
  23. package/src/components/marketo-form/partials/fields/text-field/index.tsx +1 -1
  24. package/src/components/marketo-form/partials/fields/textarea-field/index.tsx +1 -1
  25. package/src/components/marketo-form/types.ts +10 -11
  26. package/src/components/nav-panel/components/link-list/index.tsx +25 -8
  27. package/src/components/nav-panel/components/panel/column/style.module.css +2 -2
  28. package/src/components/nav-panel/components/panel/root/style.module.css +1 -1
  29. package/src/components/nav-panel/components/promo/index.tsx +7 -7
  30. package/src/components/nav-panel/components/promo/style.module.css +3 -2
  31. package/src/components/nav-panel/product-panel/index.tsx +9 -15
  32. package/src/components/nav-panel/product-panel/style.module.css +8 -8
  33. package/src/components/nav-panel/standard-panel/index.tsx +3 -0
  34. package/src/components/nav-panel/standard-panel/style.module.css +1 -1
  35. package/src/components/next-steps/index.tsx +3 -2
  36. package/src/components/product-badge/index.tsx +1 -1
  37. package/src/components/subnav/index.tsx +8 -3
  38. package/src/components/subnav/partials/CtaLinks/github-stars-link/style.module.css +8 -12
  39. package/src/components/subnav/partials/CtaLinks/index.tsx +9 -8
  40. package/src/components/subnav/partials/CtaLinks/style.module.css +4 -4
  41. package/src/components/subnav/partials/DropdownTrigger/index.tsx +2 -2
  42. package/src/components/subnav/partials/DropdownTrigger/style.module.css +7 -4
  43. package/src/components/subnav/partials/MenuItemsDefault/index.tsx +10 -3
  44. package/src/components/subnav/partials/MenuItemsDefault/style.module.css +37 -24
  45. package/src/components/subnav/partials/MenuItemsOverflow/index.tsx +8 -4
  46. package/src/components/subnav/partials/MenuItemsOverflow/style.module.css +22 -16
  47. package/src/components/subnav/partials/TitleLink/index.tsx +2 -2
  48. package/src/components/subnav/partials/TitleLink/mktg-logos/all-community-product-logos_on-dark.ts +2 -1
  49. package/src/components/subnav/partials/TitleLink/mktg-logos/all-community-product-logos_on-light.ts +2 -1
  50. package/src/components/subnav/partials/TitleLink/style.module.css +1 -1
  51. package/src/components/subnav/partials/nav-item-text/style.module.css +2 -4
  52. package/src/components/subnav/style.module.css +4 -6
  53. package/src/lib/parse-url/index.test.ts +40 -1
  54. package/src/lib/parse-url/index.ts +76 -9
  55. package/src/lib/v/index.ts +4 -5
  56. package/src/components/consent-manager/README.md +0 -73
  57. package/src/components/consent-manager/components/banner/banner.module.css +0 -23
  58. package/src/components/consent-manager/components/banner/banner.test.tsx +0 -31
  59. package/src/components/consent-manager/components/banner/banner.tsx +0 -73
  60. package/src/components/consent-manager/components/dialog/dialog.module.css +0 -145
  61. package/src/components/consent-manager/components/dialog/dialog.test.tsx +0 -194
  62. package/src/components/consent-manager/components/dialog/dialog.tsx +0 -339
  63. package/src/components/consent-manager/img/icn_close.tsx +0 -19
  64. package/src/components/consent-manager/index.test.tsx +0 -334
  65. package/src/components/consent-manager/index.tsx +0 -186
  66. package/src/components/consent-manager/loader/README.md +0 -29
  67. package/src/components/consent-manager/loader/categories.ts +0 -22
  68. package/src/components/consent-manager/loader/index.tsx +0 -94
  69. package/src/components/consent-manager/loader/presets/enterprise.ts +0 -12
  70. package/src/components/consent-manager/loader/presets/oss.ts +0 -10
  71. package/src/components/consent-manager/loader/services.ts +0 -45
  72. package/src/components/consent-manager/scripts/custom.tsx +0 -59
  73. package/src/components/consent-manager/scripts/segment.tsx +0 -87
  74. package/src/components/consent-manager/style.module.css +0 -9
  75. package/src/components/consent-manager/types.ts +0 -55
  76. package/src/components/consent-manager/util/cookies.test.ts +0 -75
  77. package/src/components/consent-manager/util/cookies.ts +0 -70
  78. package/src/components/consent-manager/util/integrations.test.ts +0 -115
  79. package/src/components/consent-manager/util/integrations.ts +0 -110
  80. package/src/components/subnav/theme.module.css +0 -50
@@ -1,10 +1,10 @@
1
1
  import { useCallback } from 'react'
2
2
  import classNames from 'classnames'
3
- import { v } from '../../../../lib/v'
3
+ import { vercelSplit } from '../../../../lib/v'
4
4
  import Link from 'next/link'
5
5
  import { parseUrl } from '../../../../lib/parse-url'
6
6
  import { trackNavClickEvent } from '../../../../lib/track-nav-click-event'
7
- import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
7
+ import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
8
8
  import * as NavigationMenu from '@radix-ui/react-navigation-menu'
9
9
  import s from './style.module.css'
10
10
 
@@ -51,19 +51,19 @@ export default function Promo({
51
51
  {icon && (
52
52
  <div
53
53
  className={classNames(s.icon, {
54
- [s.hashidays]: v(theme) === 'hashidays',
55
- [s.hashiconf]: v(theme) === 'hashiconf',
54
+ [s.hashidays]: vercelSplit(theme) === 'hashidays',
55
+ [s.hashiconf]: vercelSplit(theme) === 'hashiconf',
56
56
  })}
57
57
  >
58
- <FlightIcon name={v(icon)} />
58
+ <FlightIcon name={vercelSplit(icon)} />
59
59
  </div>
60
60
  )}
61
61
  <div className={s.rightContent}>
62
62
  <div>
63
63
  <div
64
64
  className={classNames(s.title, {
65
- [s.hashidays]: v(theme) === 'hashidays',
66
- [s.hashiconf]: v(theme) === 'hashiconf',
65
+ [s.hashidays]: vercelSplit(theme) === 'hashidays',
66
+ [s.hashiconf]: vercelSplit(theme) === 'hashiconf',
67
67
  })}
68
68
  >
69
69
  {title}
@@ -1,4 +1,4 @@
1
- @custom-media --dev-dot-viewport (min-width: 1230px);
1
+ @custom-media --dev-dot-viewport (min-width: 924px);
2
2
 
3
3
  .promo {
4
4
  display: flex;
@@ -9,7 +9,8 @@
9
9
  var(--hdsplus-spacing-06) var(--hdsplus-spacing-08);
10
10
  flex-direction: row;
11
11
  gap: var(--hdsplus-spacing-04);
12
- margin: var(--hdsplus-spacing-05);
12
+ margin: var(--hdsplus-spacing-07);
13
+ margin-bottom: var(--hdsplus-spacing-09);
13
14
 
14
15
  @media (--large) {
15
16
  &.noSide {
@@ -1,11 +1,10 @@
1
- import { CSSProperties } from 'react'
2
1
  import classNames from 'classnames'
3
2
  import Link from 'next/link'
4
3
  import * as NavPanel from '../components/panel'
5
4
  import Promo, { type PromoProps } from '../components/promo'
6
5
  import { Products } from '@hashicorp/platform-product-meta'
7
- import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
8
- import { TextPlus } from '@hashicorp/react-design-system-components/src/components/text'
6
+ import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
7
+ import { TextPlus } from '@hashicorp/react-hds/src/components/text'
9
8
  import { parseUrl } from '../../../lib/parse-url'
10
9
  import { trackNavClickEvent } from '../../../lib/track-nav-click-event'
11
10
  import * as NavigationMenu from '@radix-ui/react-navigation-menu'
@@ -64,17 +63,7 @@ const ProductPanel = ({
64
63
  return (
65
64
  <li key={title} className={s.productCategory}>
66
65
  <TextPlus.Body className={s.eyebrow}>{title}</TextPlus.Body>
67
- <ul
68
- className={s.productList}
69
- // Dynamically calculate row count based on number of items divided by expected columns
70
- style={
71
- {
72
- '--row-count-above-mobile': Math.ceil(
73
- products.length / 2
74
- ),
75
- } as CSSProperties
76
- }
77
- >
66
+ <ul className={s.productList}>
78
67
  {products.map((product) => {
79
68
  return (
80
69
  <li key={product.url}>
@@ -106,7 +95,11 @@ const ProductPanel = ({
106
95
  {sidePanel.navItems.map(({ icon, title, description, url }) => {
107
96
  return (
108
97
  <li key={title}>
109
- <Link href={parseUrl(url).href} className={s.sidePanelItem}>
98
+ <Link
99
+ aria-label={`${title} - ${description}`}
100
+ href={parseUrl(url).href}
101
+ className={classNames(s.sidePanelItem, s.focusIndicator)}
102
+ >
110
103
  <div className={s.iconBackground}>
111
104
  <FlightIcon
112
105
  size={16}
@@ -141,6 +134,7 @@ function NavProduct({ url, product, description }: NavProductProps) {
141
134
  return (
142
135
  <NavigationMenu.Link asChild>
143
136
  <Link
137
+ aria-label={`${product} - ${description}`}
144
138
  href={parseUrl(url).href}
145
139
  onClickCapture={() => {
146
140
  trackNavClickEvent(product, url, 'products')
@@ -1,4 +1,4 @@
1
- @custom-media --dev-dot-viewport (min-width: 1230px);
1
+ @custom-media --dev-dot-viewport (min-width: 924px);
2
2
 
3
3
  .productPanel {
4
4
  height: 100%;
@@ -26,7 +26,7 @@
26
26
  list-style: none;
27
27
  padding: 0;
28
28
  display: grid;
29
- margin: var(--hdsplus-spacing-06) 0 0;
29
+ margin: var(--hdsplus-spacing-07) 0 0;
30
30
 
31
31
  @media (--large) {
32
32
  @nest .noSide & {
@@ -84,9 +84,9 @@
84
84
  @nest .noSide & {
85
85
  padding: var(--hdsplus-spacing-06) var(--hdsplus-spacing-05)
86
86
  var(--hdsplus-spacing-04);
87
- grid-auto-flow: column;
87
+ grid-auto-flow: row;
88
88
  grid-template-columns: repeat(2, 300px);
89
- grid-template-rows: repeat(var(--row-count-above-mobile, 1), max-content);
89
+ grid-template-rows: repeat(2, max-content);
90
90
  gap: 0;
91
91
  }
92
92
  }
@@ -95,9 +95,9 @@
95
95
  @nest .hasSide & {
96
96
  padding: var(--hdsplus-spacing-06) var(--hdsplus-spacing-05)
97
97
  var(--hdsplus-spacing-04);
98
- grid-auto-flow: column;
98
+ grid-auto-flow: row;
99
99
  grid-template-columns: repeat(2, 300px);
100
- grid-template-rows: repeat(var(--row-count-above-mobile, 1), max-content);
100
+ grid-template-rows: repeat(2, max-content);
101
101
  gap: 0;
102
102
  }
103
103
  }
@@ -197,14 +197,14 @@
197
197
 
198
198
  @media (--large) {
199
199
  @nest .noSide & {
200
- padding: var(--hdsplus-spacing-07) 0 var(--hdsplus-spacing-05)
200
+ padding: var(--hdsplus-spacing-07) 0 var(--hdsplus-spacing-09)
201
201
  var(--hdsplus-spacing-04);
202
202
  }
203
203
  }
204
204
 
205
205
  @media (--dev-dot-viewport) {
206
206
  @nest .hasSide & {
207
- padding: var(--hdsplus-spacing-07) 0 var(--hdsplus-spacing-05)
207
+ padding: var(--hdsplus-spacing-07) 0 var(--hdsplus-spacing-09)
208
208
  var(--hdsplus-spacing-04);
209
209
  }
210
210
  }
@@ -12,12 +12,14 @@ interface StandardPanelProps {
12
12
  navData: NavItem[]
13
13
  promo?: PromoProps
14
14
  sectionName?: string
15
+ locale?: any
15
16
  }
16
17
 
17
18
  const StandardPanel = ({
18
19
  navData,
19
20
  promo,
20
21
  sectionName = '',
22
+ locale,
21
23
  }: StandardPanelProps) => {
22
24
  return (
23
25
  <NavPanel.Root>
@@ -26,6 +28,7 @@ const StandardPanel = ({
26
28
  return (
27
29
  <NavPanel.Column key={stableIdx}>
28
30
  <LinkList
31
+ locale={locale}
29
32
  links={navItems}
30
33
  linkClickHandler={(text, href) => {
31
34
  trackNavClickEvent(text, href, sectionName)
@@ -2,7 +2,7 @@
2
2
  display: flex;
3
3
  gap: var(--hdsplus-spacing-03);
4
4
  flex-direction: column;
5
- margin-top: var(--hdsplus-spacing-06);
5
+ margin-top: var(--hdsplus-spacing-07);
6
6
 
7
7
  @media (--large) {
8
8
  flex-direction: row;
@@ -2,6 +2,7 @@
2
2
  * Copyright (c) HashiCorp, Inc.
3
3
  * SPDX-License-Identifier: MPL-2.0
4
4
  */
5
+ 'use client'
5
6
 
6
7
  import { useState } from 'react'
7
8
  import Badge from '@hashicorp/react-badge'
@@ -10,7 +11,7 @@ import ExpandableArrow from '@hashicorp/react-expandable-arrow'
10
11
  import Intro from '../intro'
11
12
  import Link from 'next/link'
12
13
  import type { NextStepsProps } from './types'
13
- import StandaloneLink from '@hashicorp/react-design-system-components/src/components/standalone-link'
14
+ import { HDSPlusStandaloneLink } from '@hashicorp/react-mds/src/hds-plus/standalone-link'
14
15
  import { IconArrowRight16 } from '@hashicorp/flight-icons/svg-react/arrow-right-16'
15
16
  import useProductMeta from '@hashicorp/platform-product-meta'
16
17
  import s from './style.module.css'
@@ -69,7 +70,7 @@ export default function NextSteps({
69
70
  {cta ? (
70
71
  <div className={s.cta}>
71
72
  <p className={s.ctaCopy}>{cta.copy}</p>
72
- <StandaloneLink
73
+ <HDSPlusStandaloneLink
73
74
  href={cta.href}
74
75
  text={cta.ctaText}
75
76
  icon={
@@ -4,7 +4,7 @@
4
4
  */
5
5
 
6
6
  import type { Products } from '@hashicorp/platform-product-meta'
7
- import Badge from '@hashicorp/react-design-system-components/src/components/badge'
7
+ import Badge from '@hashicorp/react-hds/src/components/badge'
8
8
  import { IconDot16 } from '@hashicorp/flight-icons/svg-react/dot-16'
9
9
  import s from './style.module.css'
10
10
 
@@ -17,7 +17,6 @@ import CtaLinks, { type CtaLinkProps } from './partials/CtaLinks'
17
17
  import traverse, { isObject } from './helpers/traverse'
18
18
  import { areBasePathsMatching } from './helpers/areBasePathsMatching'
19
19
  import * as NavigationMenu from '@radix-ui/react-navigation-menu'
20
- import themeStyles from './theme.module.css'
21
20
  import s from './style.module.css'
22
21
 
23
22
  const productAllowList = {
@@ -116,6 +115,7 @@ function SubnavInner({
116
115
  theme={theme}
117
116
  />
118
117
  </NavigationMenu.Link>
118
+
119
119
  {!hasOverflow && (
120
120
  <div className={s.subNavRight}>
121
121
  <MenuItemsDefault
@@ -165,6 +165,10 @@ function Subnav({ className, theme = 'light', ...restProps }: SubnavProps) {
165
165
  setActivePanel(panel)
166
166
  }
167
167
 
168
+ const ariaLabel = restProps?.titleLink?.text
169
+ ? `${restProps.titleLink.text} pages`
170
+ : 'Subnav pages'
171
+
168
172
  return (
169
173
  <>
170
174
  {/**
@@ -175,11 +179,12 @@ function Subnav({ className, theme = 'light', ...restProps }: SubnavProps) {
175
179
  <style>{`:root{--subnav-height:${height}px}`}</style>
176
180
  <NavigationMenu.Root
177
181
  ref={wrapperRef}
178
- className={classNames(s.root, themeStyles[theme], className, {
182
+ className={classNames(s.root, className, {
179
183
  [s.isSticky]: isSticky,
180
184
  [s.hasOverflow]: hasOverflow,
185
+ 'hdsplus-dark-mode': theme === 'dark',
181
186
  })}
182
- aria-label={`${product} website navigation`}
187
+ aria-label={ariaLabel}
183
188
  onValueChange={activatePanel}
184
189
  value={activePanel}
185
190
  delayDuration={0}
@@ -3,15 +3,13 @@
3
3
  * SPDX-License-Identifier: MPL-2.0
4
4
  */
5
5
 
6
- /* Note: consumes from theme.module.css, as marked */
7
-
8
6
  .root {
9
- --local-scrim-color: transparent;
10
- --local-divider-color: var(--border-color); /* from theme.module.css */
7
+ --local-scrim-opacity: 0;
8
+ --local-divider-color: var(--token-color-border-primary);
11
9
 
12
10
  position: relative;
13
- color: var(--gh-stars-icon-color); /* from theme.module.css */
14
- border: 1px solid var(--local-divider-color); /* from theme.module.css */
11
+ color: var(--token-color-foreground-primary);
12
+ border: 1px solid var(--local-divider-color);
15
13
  border-radius: 5px;
16
14
  background: none;
17
15
  transition: background 0.2s, border-color 0.2s;
@@ -27,17 +25,15 @@
27
25
  right: -1px;
28
26
  bottom: -1px;
29
27
  border-radius: 5px;
30
- transition: background 0.25s ease;
28
+ transition: opacity 0.25s ease;
29
+ opacity: var(--local-scrim-opacity);
31
30
  z-index: 0;
32
- background-color: var(--local-scrim-color);
31
+ background-color: var(--token-color-foreground-primary);
33
32
  }
34
33
 
35
34
  &:hover,
36
35
  &:active {
37
- --local-divider-color: transparent;
38
- --local-scrim-color: var(
39
- --gh-stars-scrim-color
40
- ); /* from theme.module.css */
36
+ --local-scrim-opacity: 0.12;
41
37
  }
42
38
  }
43
39
 
@@ -3,19 +3,20 @@
3
3
  * SPDX-License-Identifier: MPL-2.0
4
4
  */
5
5
 
6
- import Button, {
7
- type ButtonProps,
8
- } from '@hashicorp/react-design-system-components/src/components/button'
9
- import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
6
+ import {
7
+ HDSPlusButton,
8
+ type HDSPlusButtonProps,
9
+ } from '@hashicorp/react-mds/src/hds-plus/button'
10
+ import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
10
11
  import type { Products } from '@hashicorp/platform-product-meta'
11
- import type { ToggleButtonProps } from '@hashicorp/react-design-system-components/src/components/dropdown/toggle/button'
12
- import * as Dropdown from '@hashicorp/react-design-system-components/src/components/dropdown'
12
+ import type { ToggleButtonProps } from '@hashicorp/react-hds/src/components/dropdown/toggle/button'
13
+ import * as Dropdown from '@hashicorp/react-hds/src/components/dropdown'
13
14
  import GithubStarsLink from './github-stars-link'
14
15
  import classNames from 'classnames'
15
16
  import * as NavigationMenu from '@radix-ui/react-navigation-menu'
16
17
  import s from './style.module.css'
17
18
 
18
- type CtaLink = ButtonProps & { href: string; __typename?: string }
19
+ type CtaLink = HDSPlusButtonProps & { href: string; __typename?: string }
19
20
 
20
21
  type CtaDropdown = {
21
22
  __typename?: string
@@ -83,7 +84,7 @@ function CtaLinks({
83
84
  const isLastButton = stableIdx === links.length - 1
84
85
 
85
86
  return (
86
- <Button
87
+ <HDSPlusButton
87
88
  key={href}
88
89
  text={text}
89
90
  href={href}
@@ -10,26 +10,26 @@
10
10
  list-style: none;
11
11
  padding: 0 0 0 var(--hdsplus-spacing-05);
12
12
  margin: 0;
13
- gap: 0 12px;
13
+ gap: 0 var(--hdsplus-spacing-04);
14
14
  @media (--medium-up) {
15
15
  gap: 0;
16
16
  }
17
17
 
18
18
  & > * + * {
19
19
  /* Spaces consecutive buttons horizontally on desktop */
20
- margin-left: 16px;
20
+ margin-left: var(--hdsplus-spacing-05);
21
21
  }
22
22
 
23
23
  &.isInDropdown {
24
24
  /* Allows consecutive buttons to wrap */
25
25
  flex-wrap: wrap;
26
26
  white-space: wrap;
27
- padding-left: 0;
27
+ padding-inline: var(--hdsplus-spacing-04);
28
28
 
29
29
  & > * {
30
30
  /* Spaces consecutive buttons vertically */
31
31
  margin-left: 0;
32
- margin-top: 16px;
32
+ margin-top: var(--hdsplus-spacing-05);
33
33
 
34
34
  &:last-of-type {
35
35
  margin-bottom: var(--hdsplus-spacing-04);
@@ -3,7 +3,7 @@
3
3
  * SPDX-License-Identifier: MPL-2.0
4
4
  */
5
5
 
6
- import FlightIcon from '@hashicorp/react-design-system-components/src/components/flight-icon'
6
+ import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
7
7
  import NavItemText from '../nav-item-text'
8
8
  import * as NavigationMenu from '@radix-ui/react-navigation-menu'
9
9
  import s from './style.module.css'
@@ -27,7 +27,7 @@ function DropdownTrigger(props: DropdownTriggerProps) {
27
27
  onMouseDown={(e) => e.preventDefault()}
28
28
  >
29
29
  <NavItemText isActive={isActive} text={text} />
30
- <FlightIcon name="chevron-down" color="var(--menu-item-text-color)" />
30
+ <FlightIcon name="chevron-down" />
31
31
  </NavigationMenu.Trigger>
32
32
  )
33
33
  }
@@ -3,8 +3,6 @@
3
3
  * SPDX-License-Identifier: MPL-2.0
4
4
  */
5
5
 
6
- /* Note: consumes from theme.module.css, as marked */
7
-
8
6
  .root {
9
7
  composes: hds-typography-body-200 from global;
10
8
  composes: hds-font-weight-medium from global;
@@ -26,11 +24,16 @@
26
24
  width: 12px;
27
25
  height: 12px;
28
26
  transition: transform 0.3s;
29
- fill: var(--menu-item-text-color); /* from theme.module.css */
27
+ fill: var(--token-color-foreground-primary);
30
28
  }
31
29
 
32
30
  &:hover {
33
- background-color: var(--menu-item-hover-color);
31
+ background-color: var(--token-color-surface-interactive-hover);
34
32
  border-radius: var(--hdsplus-spacing-01);
35
33
  }
34
+
35
+ &:focus {
36
+ outline: 2px solid var(--token-color-focus-action-internal);
37
+ outline-style: auto;
38
+ }
36
39
  }
@@ -9,13 +9,19 @@ import NavItemText from '../nav-item-text'
9
9
  import DropdownTrigger from '../DropdownTrigger'
10
10
  import * as NavigationMenu from '@radix-ui/react-navigation-menu'
11
11
  import s from './style.module.css'
12
+ import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
12
13
 
13
14
  interface MenuItemsDefaultProps {
14
15
  menuItems: (
15
16
  | {
16
17
  text: string
17
18
  url: string
18
- submenu: { text: string; url: string; _isActiveUrl: string }[]
19
+ submenu: {
20
+ icon: string
21
+ text: string
22
+ url: string
23
+ _isActiveUrl: string
24
+ }[]
19
25
  _isActiveUrl: boolean
20
26
  }
21
27
  | 'divider'
@@ -86,7 +92,7 @@ function NavLink(props: NavLinkProps) {
86
92
 
87
93
  interface NavLinkWithDropdownProps {
88
94
  text: string
89
- submenu: { text: string; url: string; _isActiveUrl: string }[]
95
+ submenu: { icon: string; text: string; url: string; _isActiveUrl: string }[]
90
96
  activatePanel: (panel: string) => void
91
97
  }
92
98
 
@@ -128,12 +134,13 @@ class NavLinkWithDropdown extends React.Component<
128
134
  <NavigationMenu.Sub>
129
135
  <NavigationMenu.List className={s.dropdownList}>
130
136
  {submenu.map((submenuItem, stableIdx) => {
131
- const { text, url } = submenuItem
137
+ const { icon, text, url } = submenuItem
132
138
  return (
133
139
  // eslint-disable-next-line react/no-array-index-key
134
140
  <NavigationMenu.Item key={stableIdx}>
135
141
  <NavigationMenu.Link asChild>
136
142
  <Link className={s.submenuItem} href={url}>
143
+ {icon ? <FlightIcon name={icon} /> : null}
137
144
  {text}
138
145
  </Link>
139
146
  </NavigationMenu.Link>
@@ -3,8 +3,6 @@
3
3
  * SPDX-License-Identifier: MPL-2.0
4
4
  */
5
5
 
6
- /* Note: consumes from theme.module.css, as marked */
7
-
8
6
  .root {
9
7
  display: flex;
10
8
  padding: 0 0 0 var(--hdsplus-spacing-08);
@@ -16,7 +14,6 @@
16
14
 
17
15
  .listItem {
18
16
  position: relative;
19
- white-space: nowrap;
20
17
  margin: 0;
21
18
  padding: 0;
22
19
  }
@@ -31,7 +28,7 @@
31
28
  white-space: nowrap;
32
29
 
33
30
  &:hover {
34
- background-color: var(--menu-item-hover-color);
31
+ background-color: var(--token-color-surface-interactive-hover);
35
32
  border-radius: var(--hdsplus-spacing-01);
36
33
  }
37
34
 
@@ -42,43 +39,58 @@
42
39
  }
43
40
 
44
41
  .submenuItem {
42
+ --submenu-item-background-color: transparent;
43
+
44
+ position: relative;
45
45
  composes: hds-typography-body-200 from global;
46
46
  composes: hds-font-weight-medium from global;
47
- display: block;
48
- color: var(--menu-item-text-color); /* from theme.module.css */
47
+ color: var(--token-color-foreground-primary);
48
+ display: flex;
49
+ gap: var(--hdsplus-spacing-04);
50
+ padding: var(--hdsplus-spacing-03);
51
+ min-width: 190px;
52
+ align-items: center;
53
+
54
+ &::before {
55
+ content: "";
56
+ position: absolute;
57
+ z-index: -1;
58
+ inset: 2px 0;
59
+ border-radius: var(--hdsplus-spacing-01);
60
+ background-color: var(--submenu-item-background-color);
61
+ }
49
62
 
50
63
  &:hover {
51
- text-decoration: underline;
64
+ --submenu-item-background-color: var(--token-color-surface-interactive-hover);
65
+ }
66
+
67
+ @media (--large) {
68
+ max-width: 416px;
69
+ }
70
+
71
+ &:focus {
72
+ outline: 2px solid var(--token-color-focus-action-internal);
73
+ outline-style: auto;
52
74
  }
53
75
  }
54
76
 
55
77
  .submenuModal {
56
- border-radius: 4px;
57
- box-shadow: var(--token-elevation-high-box-shadow); /* from theme.module.css */
58
- background: var(--dropdown-background-color); /* from theme.module.css */
78
+ border-radius: var(--hdsplus-spacing-03);
79
+ border: 1px solid var(--token-color-border-primary);
80
+ box-shadow: var(--token-elevation-high-box-shadow);
81
+ background: var(--token-color-surface-primary);
59
82
  z-index: 1;
60
- display: block;
61
83
  position: absolute;
62
84
  top: 100%;
63
- margin: 8px 0 0 0;
64
- padding: 24px;
85
+ margin: var(--hdsplus-spacing-03) 0 0 0;
86
+ padding: var(--hdsplus-spacing-04);
65
87
  left: 100%;
66
88
  transform: translateX(-100%);
67
89
  list-style: none;
68
-
69
- & li {
70
- & a:hover .text {
71
- text-decoration: underline;
72
- }
73
-
74
- & + li {
75
- margin-top: 6px;
76
- }
77
- }
78
90
  }
79
91
 
80
92
  .verticalDivider {
81
- background: var(--border-color); /* from theme.module.css */
93
+ background: var(--token-color-border-primary);
82
94
  height: 1.75rem;
83
95
  width: 1px;
84
96
  margin: 0 8px;
@@ -86,6 +98,7 @@
86
98
  }
87
99
 
88
100
  .dropdownList {
101
+ min-width: max-content;
89
102
  list-style: none;
90
103
  padding: 0;
91
104
  }
@@ -4,7 +4,7 @@
4
4
  */
5
5
 
6
6
  import React from 'react'
7
- import { v } from '../../../../lib/v'
7
+ import { vercelSplit } from '../../../../lib/v'
8
8
  import Link from 'next/link'
9
9
  import type { Products } from '@hashicorp/platform-product-meta'
10
10
  import CtaLinks, { type CtaLinkProps } from '../CtaLinks'
@@ -12,6 +12,7 @@ import DropdownTrigger from '../DropdownTrigger'
12
12
  import * as NavigationMenu from '@radix-ui/react-navigation-menu'
13
13
  import classNames from 'classnames'
14
14
  import s from './style.module.css'
15
+ import FlightIcon from '@hashicorp/react-hds/src/components/flight-icon'
15
16
 
16
17
  interface MenuItemsOverflowProps {
17
18
  menuItems: (
@@ -19,7 +20,7 @@ interface MenuItemsOverflowProps {
19
20
  | {
20
21
  text: string
21
22
  url: string
22
- submenu: { url: string; text: string }[]
23
+ submenu: { icon: string; url: string; text: string }[]
23
24
  }
24
25
  )[]
25
26
  ctaLinks: CtaLinkProps
@@ -89,6 +90,7 @@ class MenuItemsOverflow extends React.Component<
89
90
  key={subStableIdx}
90
91
  url={subItem.url}
91
92
  text={subItem.text}
93
+ icon={subItem.icon}
92
94
  />
93
95
  ))}
94
96
  <hr className={s.divider} />
@@ -120,15 +122,17 @@ class MenuItemsOverflow extends React.Component<
120
122
  }
121
123
 
122
124
  interface SubmenuItemProps {
125
+ icon?: string
123
126
  url: string
124
127
  text: string
125
128
  }
126
129
 
127
- function SubmenuItem({ url, text }: SubmenuItemProps) {
130
+ function SubmenuItem({ icon, url, text }: SubmenuItemProps) {
128
131
  return (
129
132
  <li>
130
133
  <NavigationMenu.Link asChild>
131
- <Link className={s.submenuItem} href={url} title={v(text)}>
134
+ <Link className={s.submenuItem} href={url} title={vercelSplit(text)}>
135
+ {icon ? <FlightIcon name={icon} /> : null}
132
136
  {text}
133
137
  </Link>
134
138
  </NavigationMenu.Link>