@payloadcms/ui 4.0.0-internal.add4c47 → 4.0.0-internal.af6aad0

package/dist/elements/Nav/index.css

@@ -3,6 +3,8 @@
     position: sticky;
     top: 0;
     left: 0;
+    display: flex;
+    flex-direction: column;
     flex-shrink: 0;
     height: 100vh;
     width: var(--nav-width);
@@ -19,35 +21,29 @@
     border-left: var(--stroke-width-small) solid var(--color-border);
   }
 
-  .nav__mobile-close {
-    display: none;
+  .nav__close {
+    display: flex;
+    align-items: center;
     background: none;
     border: 0;
     outline: 0;
-    padding: var(--spacer-3) 0;
   }
 
-  .nav__scroll {
+  .nav__wrap {
+    flex: 1 1 auto;
     height: 100%;
+    width: 100%;
     display: flex;
     flex-direction: column;
-    padding: var(--nav-padding-block-start) var(--nav-padding-inline-end)
-      var(--nav-padding-block-end) var(--nav-padding-inline-start);
+    align-items: flex-start;
     overflow-y: auto;
+    overscroll-behavior: none;
 
     &::-webkit-scrollbar {
       display: none;
     }
   }
 
-  .nav__wrap {
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    flex-grow: 1;
-  }
-
   .nav__label {
     color: var(--color-text-tertiary);
   }
@@ -55,13 +51,6 @@
   .nav__controls {
     display: flex;
     flex-direction: column;
-    gap: var(--spacer-2-5);
-    margin-top: auto;
-    margin-bottom: 0;
-
-    > :first-child {
-      margin-top: var(--spacer-3);
-    }
   }
 
   .nav__log-out {
@@ -72,38 +61,59 @@
     transform: translateX(calc(-1 * var(--spacer-1) * 0.5));
   }
 
-  .nav__link-wrapper {
-    padding-block: var(--spacer-1);
-    width: calc(100% + var(--spacer-1));
-    margin-left: calc(-1 * var(--spacer-1));
-
-    &:first-child {
-      padding-block-start: 0;
-    }
+  .nav__header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-shrink: 0;
+    width: 100%;
+    padding: var(--spacer-2) var(--spacer-2) var(--spacer-2) var(--spacer-2);
+    background-color: var(--color-bg);
+    border-bottom: var(--stroke-width-small) solid var(--color-border);
   }
 
   .nav__link {
     display: flex;
     align-items: center;
     position: relative;
-    padding-block: var(--spacer-1);
-    padding-inline: var(--spacer-2);
+    isolation: isolate;
+    padding-block: var(--spacer-2);
+    padding-inline: var(--spacer-3);
     text-decoration: none;
+
+    &::before {
+      content: '';
+      position: absolute;
+      inset-block: var(--spacer-1);
+      inset-inline: var(--spacer-2);
+      border-radius: var(--button-radius);
+      z-index: -1;
+    }
   }
 
-  a.nav__link {
-    border-radius: var(--button-radius);
+  a.nav__link:not(.nav__link--selected):hover {
+    text-decoration: none;
 
-    &:hover {
+    &::before {
       background: var(--color-bg-secondary);
-      text-decoration: none;
+    }
+  }
+
+  a.nav__link:focus-visible {
+    outline: none;
+
+    &::before {
+      outline: var(--accessibility-outline);
+      outline-offset: var(--accessibility-outline-offset);
     }
   }
 
   .nav__link--selected {
     font-weight: 600;
-    border-radius: var(--button-radius);
-    background: var(--color-bg-selected);
+
+    &::before {
+      background: var(--color-bg-selected);
+    }
   }
 
   @media (max-width: 1024px) {
@@ -118,10 +128,5 @@
       --nav-padding-inline-start: var(--gutter-h);
       --nav-padding-inline-end: var(--gutter-h);
     }
-
-    .nav__mobile-close {
-      display: flex;
-      align-items: center;
-    }
   }
 }

package/dist/elements/Nav/index.d.ts

@@ -1,8 +1,12 @@
 import type { PayloadRequest, ServerProps } from 'payload';
 import React from 'react';
+import type { UserMenuSettingsGroup } from '../UserMenu/SettingsMenu/index.js';
 import './index.css';
 export type NavProps = {
+    CustomAvatar?: React.ReactNode;
+    CustomLogoutButton?: React.ReactNode;
     req?: PayloadRequest;
+    settingsItemGroups?: UserMenuSettingsGroup[];
 } & ServerProps;
 export declare const DefaultNav: React.FC<NavProps>;
 //# sourceMappingURL=index.d.ts.map

package/dist/elements/Nav/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/Nav/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAG1D,OAAO,KAAK,MAAM,OAAO,CAAA;AAWzB,OAAO,aAAa,CAAA;AAMpB,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,CAAC,EAAE,cAAc,CAAA;CACrB,GAAG,WAAW,CAAA;AAEf,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAsMzC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/Nav/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAG1D,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAA;AAe9E,OAAO,aAAa,CAAA;AAMpB,MAAM,MAAM,QAAQ,GAAG;IACrB,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC9B,kBAAkB,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACpC,GAAG,CAAC,EAAE,cAAc,CAAA;IACpB,kBAAkB,CAAC,EAAE,qBAAqB,EAAE,CAAA;CAC7C,GAAG,WAAW,CAAA;AAEf,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAsNzC,CAAA"}

package/dist/elements/Nav/index.js

@@ -2,17 +2,20 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { EntityType } from 'payload';
 import React from 'react';
 /* eslint-disable payload/no-imports-from-exports-dir -- Server component must reference exports dir for proper client boundary */
-import { DefaultNavClient, NavWrapper, SettingsMenuButton } from '../../exports/client/index.js';
+import { DefaultNavClient, NavWrapper, SettingsMenuButton, UserMenu } from '../../exports/client/index.js';
 /* eslint-enable payload/no-imports-from-exports-dir */
 import { AlignJustifiedIcon } from '../../icons/AlignJustified/index.js';
 import { groupNavItems } from '../../utilities/groupNavItems.js';
 import { RenderServerComponent } from '../RenderServerComponent/index.js';
+import { NavSidebarToggle } from './NavSidebarToggle/index.js';
 import { SidebarTabs } from './SidebarTabs/index.js';
 import './index.css';
 const baseClass = 'nav';
 import { getNavPrefs } from './getNavPrefs.js';
 export const DefaultNav = async props => {
   const {
+    CustomAvatar,
+    CustomLogoutButton,
     documentSubViewType,
     i18n,
     locale,
@@ -21,6 +24,7 @@ export const DefaultNav = async props => {
     permissions,
     req,
     searchParams,
+    settingsItemGroups,
     user,
     viewType,
     visibleEntities
@@ -160,6 +164,17 @@ export const DefaultNav = async props => {
   }, ...(payload.config.admin?.components?.sidebar?.tabs?.filter(tab => !tab.disabled) || [])];
   return /*#__PURE__*/_jsxs(NavWrapper, {
     baseClass: baseClass,
+    header: /*#__PURE__*/_jsxs("div", {
+      className: `${baseClass}__header`,
+      children: [/*#__PURE__*/_jsx(UserMenu, {
+        CustomAvatar: CustomAvatar,
+        CustomLogoutButton: CustomLogoutButton,
+        settingsItemGroups: settingsItemGroups,
+        showTitle: true
+      }), /*#__PURE__*/_jsx(NavSidebarToggle, {
+        baseClass: baseClass
+      })]
+    }),
     children: [RenderedBeforeNav, /*#__PURE__*/_jsxs("nav", {
       className: `${baseClass}__wrap`,
       children: [/*#__PURE__*/_jsx(SidebarTabs, {

package/dist/elements/Nav/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["EntityType","React","DefaultNavClient","NavWrapper","SettingsMenuButton","AlignJustifiedIcon","groupNavItems","RenderServerComponent","SidebarTabs","baseClass","getNavPrefs","DefaultNav","props","documentSubViewType","i18n","locale","params","payload","permissions","req","searchParams","user","viewType","visibleEntities","config","admin","components","afterNav","afterNavLinks","beforeNav","beforeNavLinks","settingsMenu","collections","globals","groups","filter","slug","includes","map","collection","type","entity","global","navPreferences","RenderedSettingsMenu","Array","isArray","item","index","clientProps","Component","importMap","key","serverProps","RenderedBeforeNav","RenderedBeforeNavLinks","RenderedAfterNavLinks","RenderedAfterNav","allTabs","Content","_jsxs","_Fragment","_jsx","Icon","size","isDefaultActive","label","t","sidebar","tabs","tab","disabled","className","server"],"sources":["../../../src/elements/Nav/index.tsx"],"sourcesContent":["import type { PayloadRequest, ServerProps } from 'payload'\n\nimport { EntityType } from 'payload'\nimport React from 'react'\n\nimport type { EntityToGroup } from '../../utilities/groupNavItems.js'\n\n/* eslint-disable payload/no-imports-from-exports-dir -- Server component must reference exports dir for proper client boundary */\nimport { DefaultNavClient, NavWrapper, SettingsMenuButton } from '../../exports/client/index.js'\n/* eslint-enable payload/no-imports-from-exports-dir */\nimport { AlignJustifiedIcon } from '../../icons/AlignJustified/index.js'\nimport { groupNavItems } from '../../utilities/groupNavItems.js'\nimport { RenderServerComponent } from '../RenderServerComponent/index.js'\nimport { SidebarTabs } from './SidebarTabs/index.js'\nimport './index.css'\n\nconst baseClass = 'nav'\n\nimport { getNavPrefs } from './getNavPrefs.js'\n\nexport type NavProps = {\n  req?: PayloadRequest\n} & ServerProps\n\nexport const DefaultNav: React.FC<NavProps> = async (props) => {\n  const {\n    documentSubViewType,\n    i18n,\n    locale,\n    params,\n    payload,\n    permissions,\n    req,\n    searchParams,\n    user,\n    viewType,\n    visibleEntities,\n  } = props\n\n  if (!payload?.config) {\n    return null\n  }\n\n  const {\n    admin: {\n      components: { afterNav, afterNavLinks, beforeNav, beforeNavLinks, settingsMenu },\n    },\n    collections,\n    globals,\n  } = payload.config\n\n  // Group collections and globals for nav display\n  // These groups are passed to SidebarTabs -> CollectionsTab to avoid recomputing\n  const groups = groupNavItems(\n    [\n      ...collections\n        .filter(({ slug }) => visibleEntities.collections.includes(slug))\n        .map(\n          (collection) =>\n            ({\n              type: EntityType.collection,\n              entity: collection,\n            }) satisfies EntityToGroup,\n        ),\n      ...globals\n        .filter(({ slug }) => visibleEntities.globals.includes(slug))\n        .map(\n          (global) =>\n            ({\n              type: EntityType.global,\n              entity: global,\n            }) satisfies EntityToGroup,\n        ),\n    ],\n    permissions,\n    i18n,\n  )\n\n  const navPreferences = await getNavPrefs(req)\n\n  const RenderedSettingsMenu =\n    settingsMenu && Array.isArray(settingsMenu)\n      ? settingsMenu.map((item, index) =>\n          RenderServerComponent({\n            clientProps: {\n              documentSubViewType,\n              viewType,\n            },\n            Component: item,\n            importMap: payload.importMap,\n            key: `settings-menu-item-${index}`,\n            serverProps: {\n              i18n,\n              locale,\n              params,\n              payload,\n              permissions,\n              searchParams,\n              user,\n            },\n          }),\n        )\n      : []\n\n  const RenderedBeforeNav = RenderServerComponent({\n    clientProps: {\n      documentSubViewType,\n      viewType,\n    },\n    Component: beforeNav,\n    importMap: payload.importMap,\n    serverProps: {\n      i18n,\n      locale,\n      params,\n      payload,\n      permissions,\n      searchParams,\n      user,\n    },\n  })\n\n  const RenderedBeforeNavLinks = RenderServerComponent({\n    clientProps: {\n      documentSubViewType,\n      viewType,\n    },\n    Component: beforeNavLinks,\n    importMap: payload.importMap,\n    serverProps: {\n      i18n,\n      locale,\n      params,\n      payload,\n      permissions,\n      searchParams,\n      user,\n    },\n  })\n\n  const RenderedAfterNavLinks = RenderServerComponent({\n    clientProps: {\n      documentSubViewType,\n      viewType,\n    },\n    Component: afterNavLinks,\n    importMap: payload.importMap,\n    serverProps: {\n      i18n,\n      locale,\n      params,\n      payload,\n      permissions,\n      searchParams,\n      user,\n    },\n  })\n\n  const RenderedAfterNav = RenderServerComponent({\n    clientProps: {\n      documentSubViewType,\n      viewType,\n    },\n    Component: afterNav,\n    importMap: payload.importMap,\n    serverProps: {\n      i18n,\n      locale,\n      params,\n      payload,\n      permissions,\n      searchParams,\n      user,\n    },\n  })\n\n  // Build the full tabs array, starting with the default nav tab\n  const allTabs = [\n    {\n      slug: 'nav',\n      components: {\n        Content: (\n          <>\n            {RenderedBeforeNavLinks}\n            <DefaultNavClient groups={groups} navPreferences={navPreferences} />\n            {RenderedAfterNavLinks}\n          </>\n        ),\n        Icon: <AlignJustifiedIcon size={24} />,\n      },\n      isDefaultActive: true,\n      label: i18n.t('general:collections'),\n    },\n    ...(payload.config.admin?.components?.sidebar?.tabs?.filter((tab) => !tab.disabled) || []),\n  ]\n\n  return (\n    <NavWrapper baseClass={baseClass}>\n      {RenderedBeforeNav}\n      <nav className={`${baseClass}__wrap`}>\n        <SidebarTabs\n          documentSubViewType={documentSubViewType}\n          i18n={i18n}\n          locale={locale}\n          navPreferences={navPreferences}\n          params={params}\n          payload={payload}\n          permissions={permissions}\n          req={req}\n          searchParams={searchParams}\n          server={req?.server}\n          tabs={allTabs}\n          user={user}\n          viewType={viewType}\n        />\n        <div className={`${baseClass}__controls`}>\n          <SettingsMenuButton settingsMenu={RenderedSettingsMenu} />\n        </div>\n      </nav>\n      {RenderedAfterNav}\n    </NavWrapper>\n  )\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["EntityType","React","DefaultNavClient","NavWrapper","SettingsMenuButton","UserMenu","AlignJustifiedIcon","groupNavItems","RenderServerComponent","NavSidebarToggle","SidebarTabs","baseClass","getNavPrefs","DefaultNav","props","CustomAvatar","CustomLogoutButton","documentSubViewType","i18n","locale","params","payload","permissions","req","searchParams","settingsItemGroups","user","viewType","visibleEntities","config","admin","components","afterNav","afterNavLinks","beforeNav","beforeNavLinks","settingsMenu","collections","globals","groups","filter","slug","includes","map","collection","type","entity","global","navPreferences","RenderedSettingsMenu","Array","isArray","item","index","clientProps","Component","importMap","key","serverProps","RenderedBeforeNav","RenderedBeforeNavLinks","RenderedAfterNavLinks","RenderedAfterNav","allTabs","Content","_jsxs","_Fragment","_jsx","Icon","size","isDefaultActive","label","t","sidebar","tabs","tab","disabled","header","className","showTitle","server"],"sources":["../../../src/elements/Nav/index.tsx"],"sourcesContent":["import type { PayloadRequest, ServerProps } from 'payload'\n\nimport { EntityType } from 'payload'\nimport React from 'react'\n\nimport type { EntityToGroup } from '../../utilities/groupNavItems.js'\nimport type { UserMenuSettingsGroup } from '../UserMenu/SettingsMenu/index.js'\n\n/* eslint-disable payload/no-imports-from-exports-dir -- Server component must reference exports dir for proper client boundary */\nimport {\n  DefaultNavClient,\n  NavWrapper,\n  SettingsMenuButton,\n  UserMenu,\n} from '../../exports/client/index.js'\n/* eslint-enable payload/no-imports-from-exports-dir */\nimport { AlignJustifiedIcon } from '../../icons/AlignJustified/index.js'\nimport { groupNavItems } from '../../utilities/groupNavItems.js'\nimport { RenderServerComponent } from '../RenderServerComponent/index.js'\nimport { NavSidebarToggle } from './NavSidebarToggle/index.js'\nimport { SidebarTabs } from './SidebarTabs/index.js'\nimport './index.css'\n\nconst baseClass = 'nav'\n\nimport { getNavPrefs } from './getNavPrefs.js'\n\nexport type NavProps = {\n  CustomAvatar?: React.ReactNode\n  CustomLogoutButton?: React.ReactNode\n  req?: PayloadRequest\n  settingsItemGroups?: UserMenuSettingsGroup[]\n} & ServerProps\n\nexport const DefaultNav: React.FC<NavProps> = async (props) => {\n  const {\n    CustomAvatar,\n    CustomLogoutButton,\n    documentSubViewType,\n    i18n,\n    locale,\n    params,\n    payload,\n    permissions,\n    req,\n    searchParams,\n    settingsItemGroups,\n    user,\n    viewType,\n    visibleEntities,\n  } = props\n\n  if (!payload?.config) {\n    return null\n  }\n\n  const {\n    admin: {\n      components: { afterNav, afterNavLinks, beforeNav, beforeNavLinks, settingsMenu },\n    },\n    collections,\n    globals,\n  } = payload.config\n\n  // Group collections and globals for nav display\n  // These groups are passed to SidebarTabs -> CollectionsTab to avoid recomputing\n  const groups = groupNavItems(\n    [\n      ...collections\n        .filter(({ slug }) => visibleEntities.collections.includes(slug))\n        .map(\n          (collection) =>\n            ({\n              type: EntityType.collection,\n              entity: collection,\n            }) satisfies EntityToGroup,\n        ),\n      ...globals\n        .filter(({ slug }) => visibleEntities.globals.includes(slug))\n        .map(\n          (global) =>\n            ({\n              type: EntityType.global,\n              entity: global,\n            }) satisfies EntityToGroup,\n        ),\n    ],\n    permissions,\n    i18n,\n  )\n\n  const navPreferences = await getNavPrefs(req)\n\n  const RenderedSettingsMenu =\n    settingsMenu && Array.isArray(settingsMenu)\n      ? settingsMenu.map((item, index) =>\n          RenderServerComponent({\n            clientProps: {\n              documentSubViewType,\n              viewType,\n            },\n            Component: item,\n            importMap: payload.importMap,\n            key: `settings-menu-item-${index}`,\n            serverProps: {\n              i18n,\n              locale,\n              params,\n              payload,\n              permissions,\n              searchParams,\n              user,\n            },\n          }),\n        )\n      : []\n\n  const RenderedBeforeNav = RenderServerComponent({\n    clientProps: {\n      documentSubViewType,\n      viewType,\n    },\n    Component: beforeNav,\n    importMap: payload.importMap,\n    serverProps: {\n      i18n,\n      locale,\n      params,\n      payload,\n      permissions,\n      searchParams,\n      user,\n    },\n  })\n\n  const RenderedBeforeNavLinks = RenderServerComponent({\n    clientProps: {\n      documentSubViewType,\n      viewType,\n    },\n    Component: beforeNavLinks,\n    importMap: payload.importMap,\n    serverProps: {\n      i18n,\n      locale,\n      params,\n      payload,\n      permissions,\n      searchParams,\n      user,\n    },\n  })\n\n  const RenderedAfterNavLinks = RenderServerComponent({\n    clientProps: {\n      documentSubViewType,\n      viewType,\n    },\n    Component: afterNavLinks,\n    importMap: payload.importMap,\n    serverProps: {\n      i18n,\n      locale,\n      params,\n      payload,\n      permissions,\n      searchParams,\n      user,\n    },\n  })\n\n  const RenderedAfterNav = RenderServerComponent({\n    clientProps: {\n      documentSubViewType,\n      viewType,\n    },\n    Component: afterNav,\n    importMap: payload.importMap,\n    serverProps: {\n      i18n,\n      locale,\n      params,\n      payload,\n      permissions,\n      searchParams,\n      user,\n    },\n  })\n\n  // Build the full tabs array, starting with the default nav tab\n  const allTabs = [\n    {\n      slug: 'nav',\n      components: {\n        Content: (\n          <>\n            {RenderedBeforeNavLinks}\n            <DefaultNavClient groups={groups} navPreferences={navPreferences} />\n            {RenderedAfterNavLinks}\n          </>\n        ),\n        Icon: <AlignJustifiedIcon size={24} />,\n      },\n      isDefaultActive: true,\n      label: i18n.t('general:collections'),\n    },\n    ...(payload.config.admin?.components?.sidebar?.tabs?.filter((tab) => !tab.disabled) || []),\n  ]\n\n  return (\n    <NavWrapper\n      baseClass={baseClass}\n      header={\n        <div className={`${baseClass}__header`}>\n          <UserMenu\n            CustomAvatar={CustomAvatar}\n            CustomLogoutButton={CustomLogoutButton}\n            settingsItemGroups={settingsItemGroups}\n            showTitle\n          />\n          <NavSidebarToggle baseClass={baseClass} />\n        </div>\n      }\n    >\n      {RenderedBeforeNav}\n      <nav className={`${baseClass}__wrap`}>\n        <SidebarTabs\n          documentSubViewType={documentSubViewType}\n          i18n={i18n}\n          locale={locale}\n          navPreferences={navPreferences}\n          params={params}\n          payload={payload}\n          permissions={permissions}\n          req={req}\n          searchParams={searchParams}\n          server={req?.server}\n          tabs={allTabs}\n          user={user}\n          viewType={viewType}\n        />\n        <div className={`${baseClass}__controls`}>\n          <SettingsMenuButton settingsMenu={RenderedSettingsMenu} />\n        </div>\n      </nav>\n      {RenderedAfterNav}\n    </NavWrapper>\n  )\n}\n"],"mappings":"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","ignoreList":[]}

package/dist/elements/NavGroup/index.css

@@ -1,34 +1,49 @@
 @layer payload-default {
   .nav-group {
-    width: calc(100% + var(--spacer-2-5) * 2);
-    margin-inline-start: calc(-1 * var(--spacer-2-5));
-    padding-inline: var(--spacer-2-5);
+    width: 100%;
+    padding: var(--spacer-2) 0;
+    border-top: var(--stroke-width-small) solid var(--color-border);
 
-    & + .nav-group {
-      margin-block-start: var(--spacer-2);
-      border-top: var(--stroke-width-small) solid var(--color-border);
-      padding-top: var(--spacer-2-5);
+    &:first-child {
+      border-top: none;
     }
   }
 
   .nav-group__toggle {
     cursor: pointer;
-    color: var(--color-text);
+    color: var(--color-text-secondary);
     background: transparent;
     border: 0;
-    width: calc(100% + var(--spacer-2));
     text-align: left;
     display: flex;
+    width: 100%;
     align-items: center;
     position: relative;
-    padding: var(--spacer-1) var(--spacer-4) var(--spacer-1) var(--spacer-1);
-    width: 100%;
-    margin-bottom: var(--spacer-2);
+    isolation: isolate;
+    padding-block: var(--spacer-2);
+    padding-inline: var(--spacer-3);
     font-family: var(--text-body-medium-strong-font-family);
     font-size: var(--text-body-medium-strong-font-size);
     font-weight: var(--text-body-medium-strong-font-weight);
     line-height: var(--text-body-medium-strong-line-height);
-    border-radius: var(--button-radius);
+
+    &::before {
+      content: '';
+      position: absolute;
+      inset-block: var(--spacer-1);
+      inset-inline: var(--spacer-2);
+      border-radius: var(--button-radius);
+      z-index: -1;
+    }
+
+    &:focus-visible {
+      outline: none;
+
+      &::before {
+        outline: var(--accessibility-outline);
+        outline-offset: var(--accessibility-outline-offset);
+      }
+    }
 
     &:hover,
     &:focus-visible {
@@ -46,7 +61,7 @@
 
   .nav-group__indicator {
     position: absolute;
-    inset-inline-start: 0;
+    inset-inline-start: var(--spacer-2);
     transform: translate(-50%, 0%);
     display: flex;
     align-items: center;
@@ -55,9 +70,7 @@
     width: var(--spacer-3);
     height: var(--spacer-3);
     color: var(--color-icon-tertiary);
-    left: calc(-1 * var(--spacer-1));
     opacity: 0;
-    transition: opacity 150ms ease;
   }
 
   .nav-group--collapsed .collapsible__toggle {

package/dist/elements/Popup/PopupButtonList/index.css

@@ -51,7 +51,7 @@
     font-weight: var(--text-body-medium-font-weight);
     letter-spacing: var(--text-body-medium-letter-spacing);
     line-height: var(--text-body-medium-line-height);
-    padding: var(--spacer-1) var(--spacer-2) var(--spacer-1) var(--spacer-1);
+    padding: var(--spacer-1) var(--spacer-2);
   }
 
   .popup-button-list__button:focus-visible {
@@ -93,10 +93,6 @@
     flex-shrink: 0;
   }
 
-  .popup-button-list__submenu-icon {
-    flex-shrink: 0;
-  }
-
   /* RadioGroup - selected items show only the checkmark, no background fill */
   .popup-button-list--with-icons .popup-button-list__button--selected {
     background-color: transparent;
@@ -148,27 +144,47 @@
     padding: 0 0 0 var(--spacer-1);
   }
 
-  /* Submenu trigger buttons: icon on left, label in middle, chevron pushed right */
-  .popup-button-list__button--submenu-trigger {
-    align-items: center;
-  }
-
-  .popup-button-list__submenu-icon {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding-inline-start: var(--spacer-1);
+  /*
+   * Submenu trigger buttons: rendered inside a PopupList.MenuItem wrapper so their
+   * icon/label spacing (via --with-actions --large) matches other menu items (e.g. Log Out)
+   * exactly. The label grows to push the chevron flush against the trigger's trailing edge.
+   */
+  .popup-button-list__button--submenu-trigger .popup-button-list__label {
+    flex: 1;
   }
 
   .popup-button-list__chevron {
     display: flex;
     align-items: center;
-    margin-left: auto;
     opacity: 0.5;
+    flex-shrink: 0;
+  }
+
+  .popup-button-list__button--submenu-trigger:hover,
+  .popup-button-list__button--submenu-trigger[aria-expanded='true'] {
+    background-color: var(--color-bg-brand);
+    color: var(--color-text-onbrand);
+  }
+
+  /*
+   * The submenu content panel is portaled to document.body, so it isn't a DOM descendant of
+   * its trigger button - a plain descendant selector can't reach it. `:has()` lets us query
+   * from a shared ancestor (body) instead, reflecting real-time :hover state directly rather
+   * than an approximated JS-tracked one, so the trigger only highlights while an item inside
+   * its own submenu is actually being hovered.
+   */
+  body:has(.popup-button-list__submenu-content-theme:hover)
+    .popup-button-list__button--submenu-trigger-theme,
+  body:has(.popup-button-list__submenu-content-language:hover)
+    .popup-button-list__button--submenu-trigger-language,
+  body:has(.popup-button-list__submenu-content-settings:hover)
+    .popup-button-list__button--submenu-trigger-settings {
+    background-color: var(--color-bg-secondary);
+    color: var(--color-text);
   }
 
   .popup-button-list__button--submenu-trigger:hover .popup-button-list__chevron,
-  .popup-button-list__button--selected .popup-button-list__chevron {
+  .popup-button-list__button--submenu-trigger[aria-expanded='true'] .popup-button-list__chevron {
     opacity: 1;
   }
 }

package/dist/elements/Popup/index.css

@@ -14,6 +14,12 @@
     display: contents;
   }
 
+  .popup__scrim {
+    position: fixed;
+    inset: 0;
+    z-index: calc(var(--z-popup) - 1);
+  }
+
   .popup__hidden-content {
     position: absolute;
     top: -9999px;

package/dist/elements/Popup/index.d.ts

@@ -60,6 +60,16 @@ export type PopupProps = {
         onKeyDown: React.KeyboardEventHandler;
     }) => React.ReactNode;
     showOnHover?: boolean;
+    /**
+     * Renders a full-viewport, click-capturing layer beneath the popup content while it is open.
+     * This blocks interaction with the rest of the page until the popup is dismissed, instead of
+     * allowing a click to both close the popup and activate whatever was underneath it.
+     *
+     * Has no effect on nested (child) popups — only the outermost popup in a stack renders it.
+     *
+     * @default false
+     */
+    showScrim?: boolean;
     /**
      * By default, the scrollbar is hidden. If you want to show it, set this to true.
      * In both cases, the container is still scrollable.

package/dist/elements/Popup/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/Popup/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAE1C,OAAO,KAAK,SAAS,MAAM,4BAA4B,CAAA;AAEvD,OAAO,KAAuE,MAAM,OAAO,CAAA;AAK3F,OAAO,aAAa,CAAA;AA4CpB,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,CAAC,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAA;IAClD,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IAC1C,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACxB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAA;IAC/B,UAAU,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IACjC,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;;OAIG;IACH,eAAe,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAA;IAC7C,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;IACxC;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,IAAI,CAAA;KAAE,KAAK,KAAK,CAAC,SAAS,CAAA;IACzD;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE;QACrB,MAAM,EAAE,OAAO,CAAA;QACf,eAAe,EAAE,OAAO,CAAA;QACxB,eAAe,EAAE,IAAI,CAAA;QACrB,OAAO,EAAE,KAAK,CAAC,iBAAiB,CAAA;QAChC,SAAS,EAAE,KAAK,CAAC,oBAAoB,CAAA;KACtC,KAAK,KAAK,CAAC,SAAS,CAAA;IACrB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IACvB,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,GAAG,OAAO,CAAA;IACxC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;IACjC;;;;;;;;OAQG;IACH,aAAa,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAA;CACjC,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CAsftC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/Popup/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAE1C,OAAO,KAAK,SAAS,MAAM,4BAA4B,CAAA;AAEvD,OAAO,KAAuE,MAAM,OAAO,CAAA;AAK3F,OAAO,aAAa,CAAA;AA4CpB,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,CAAC,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAA;IAClD,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IAC1C,MAAM,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IACxB;;;;OAIG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAA;IAC/B,UAAU,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;IACjC,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B;;;OAGG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;;OAIG;IACH,eAAe,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,CAAA;IAC7C,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB,aAAa,CAAC,EAAE,MAAM,IAAI,CAAA;IAC1B,YAAY,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAA;IACxC;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,IAAI,CAAA;KAAE,KAAK,KAAK,CAAC,SAAS,CAAA;IACzD;;;OAGG;IACH,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE;QACrB,MAAM,EAAE,OAAO,CAAA;QACf,eAAe,EAAE,OAAO,CAAA;QACxB,eAAe,EAAE,IAAI,CAAA;QACrB,OAAO,EAAE,KAAK,CAAC,iBAAiB,CAAA;QAChC,SAAS,EAAE,KAAK,CAAC,oBAAoB,CAAA;KACtC,KAAK,KAAK,CAAC,SAAS,CAAA;IACrB,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB;;;;;;;;OAQG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;IACvB,IAAI,CAAC,EAAE,aAAa,GAAG,OAAO,GAAG,OAAO,CAAA;IACxC;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAA;IACjC;;;;;;;;OAQG;IACH,aAAa,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAA;CACjC,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,UAAU,CA4ftC,CAAA"}

package/dist/elements/Popup/index.js

@@ -56,6 +56,7 @@ export const Popup = props => {
     render,
     renderButton,
     showOnHover = false,
+    showScrim = false,
     showScrollbar = false,
     side,
     size = 'fit-content',
@@ -113,9 +114,13 @@ export const Popup = props => {
     const scrollY = useFixed ? 0 : window.scrollY;
     const scrollX = useFixed ? 0 : window.scrollX;
     // Gap between the popup and the trigger/viewport edges (in pixels)
-    const offset = 10;
+    const offset = 8;
     // Additional gap used in side mode so the child popup has breathing room from its parent
     const sideOffset = 4;
+    // `.popup__scroll-container` has this much padding above its first item, so aligning the
+    // popup's top edge with the trigger's top edge would leave the first item sitting this many
+    // pixels lower than the trigger row. Subtract it so the content - not the container - aligns.
+    const contentTopInset = 8;
     let top;
     let left;
     let caretLeft;
@@ -126,8 +131,8 @@ export const Popup = props => {
       // top-aligned with the trigger. Flips to the opposite side if there is not enough
       // viewport space.
       // /////////////////////////////////////
-      // Top: align with trigger top, clamped to viewport
-      top = triggerRect.top + scrollY;
+      // Top: align the popup's first item with the trigger top, clamped to viewport
+      top = triggerRect.top + scrollY - contentTopInset;
       const maxTop = scrollY + window.innerHeight - popupRect.height - offset;
       top = Math.max(scrollY + offset, Math.min(top, maxTop));
       // Use the parent popup's bounding rect as the reference for left/right positioning
@@ -413,11 +418,13 @@ export const Popup = props => {
     // Otherwise, modals opened from the popup will close unexpectedly when clicking within the modal, since
     // that closes the popup due to the click outside handler.
     /*#__PURE__*/
-    createPortal(/*#__PURE__*/_jsx(PopupContext, {
+    createPortal(/*#__PURE__*/_jsxs(PopupContext, {
       value: {
         popupRef
       },
-      children: /*#__PURE__*/_jsxs("div", {
+      children: [active && showScrim && !parentPopup && /*#__PURE__*/_jsx("div", {
+        className: `${baseClass}__scrim`
+      }), /*#__PURE__*/_jsxs("div", {
         className: active ? [`${baseClass}__content`, `${baseClass}--size-${size}`, side ? `${baseClass}--side-${side}` : isOnTop ? `${baseClass}--v-top` : `${baseClass}--v-bottom`, portalClassName].filter(Boolean).join(' ') :
         // tests do not accidentally target inactive popups.
         `${baseClass}__hidden-content`,
@@ -439,7 +446,7 @@ export const Popup = props => {
         }), caret && !side && /*#__PURE__*/_jsx("div", {
           className: `${baseClass}__caret`
         })]
-      })
+      })]
     }), document.body) : null]
   });
 };