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

package/dist/elements/Nav/context.js

@@ -1,9 +1,10 @@
 'use client';
 
+import { c as _c } from "react/compiler-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useWindowInfo } from '@faceless-ui/window-info';
 import { PREFERENCE_KEYS } from 'payload/shared';
-import React, { useEffect, useRef } from 'react';
+import React, { useEffect } from 'react';
 import { usePreferences } from '../../providers/Preferences/index.js';
 import { usePathname } from '../../providers/RouterAdapter/index.js';
 /**
@@ -12,7 +13,6 @@ import { usePathname } from '../../providers/RouterAdapter/index.js';
 export const NavContext = /*#__PURE__*/React.createContext({
   hydrated: false,
   navOpen: true,
-  navRef: null,
   setNavOpen: () => {}
 });
 export const useNav = () => React.use(NavContext);
@@ -28,81 +28,106 @@ const getNavPreference = async getPreference => {
 /**
  * @internal
  */
-export const NavProvider = ({
-  children,
-  initialIsOpen
-}) => {
+export const NavProvider = t0 => {
+  const $ = _c(17);
   const {
-    breakpoints: {
-      l: largeBreak,
-      m: midBreak,
-      s: smallBreak
-    }
+    children,
+    initialIsOpen
+  } = t0;
+  const {
+    breakpoints: t1
   } = useWindowInfo();
+  const {
+    l: largeBreak,
+    m: midBreak,
+    s: smallBreak
+  } = t1;
   const pathname = usePathname();
   const {
     getPreference
   } = usePreferences();
-  const navRef = useRef(null);
-  // initialize the nav to be closed
-  // this is because getting the preference is async
-  // so instead of closing it after the preference is loaded
-  // we will open it after the preference is loaded
   const [navOpen, setNavOpen] = React.useState(initialIsOpen);
   const [hydrated, setHydrated] = React.useState(false);
-  // on load check the user's preference and set "initial" state
-  useEffect(() => {
-    if (largeBreak === false) {
-      const setNavFromPreferences = async () => {
-        const preferredState = await getNavPreference(getPreference);
-        setNavOpen(preferredState);
-      };
-      void setNavFromPreferences();
-    }
-  }, [largeBreak, getPreference, setNavOpen]);
-  // on smaller screens where the nav is a modal
-  // close the nav when the user navigates away
-  useEffect(() => {
-    if (smallBreak === true) {
-      setNavOpen(false);
-    }
-  }, [pathname]);
-  // on open and close, lock the body scroll
-  // do not do this on desktop, the sidebar is not a modal
-  useEffect(() => {
-    if (navRef.current) {
-      if (navOpen && midBreak) {
-        navRef.current.style.overscrollBehavior = 'contain';
-      } else {
-        navRef.current.style.overscrollBehavior = 'auto';
+  let t2;
+  let t3;
+  if ($[0] !== getPreference || $[1] !== largeBreak) {
+    t2 = () => {
+      if (largeBreak === false) {
+        const setNavFromPreferences = async () => {
+          const preferredState = await getNavPreference(getPreference);
+          setNavOpen(preferredState);
+        };
+        setNavFromPreferences();
       }
-    }
-  }, [navOpen, midBreak]);
-  // on smaller screens where the nav is a modal
-  // close the nav when the user resizes down to mobile
-  // the sidebar is a modal on mobile
-  useEffect(() => {
-    if (largeBreak === true || midBreak === true || smallBreak === true) {
-      setNavOpen(false);
-    }
-    setHydrated(true);
-  }, [largeBreak, midBreak, smallBreak]);
-  // when the component unmounts, clear all body scroll locks
-  useEffect(() => {
-    return () => {
-      if (navRef.current) {
-        navRef.current.style.overscrollBehavior = 'auto';
+    };
+    t3 = [largeBreak, getPreference, setNavOpen];
+    $[0] = getPreference;
+    $[1] = largeBreak;
+    $[2] = t2;
+    $[3] = t3;
+  } else {
+    t2 = $[2];
+    t3 = $[3];
+  }
+  useEffect(t2, t3);
+  let t4;
+  if ($[4] !== smallBreak) {
+    t4 = () => {
+      if (smallBreak === true) {
+        setNavOpen(false);
       }
     };
-  }, []);
-  return /*#__PURE__*/_jsx(NavContext, {
-    value: {
-      hydrated,
-      navOpen,
-      navRef,
-      setNavOpen
-    },
-    children: children
-  });
+    $[4] = smallBreak;
+    $[5] = t4;
+  } else {
+    t4 = $[5];
+  }
+  let t5;
+  if ($[6] !== pathname) {
+    t5 = [pathname];
+    $[6] = pathname;
+    $[7] = t5;
+  } else {
+    t5 = $[7];
+  }
+  useEffect(t4, t5);
+  let t6;
+  let t7;
+  if ($[8] !== largeBreak || $[9] !== midBreak || $[10] !== smallBreak) {
+    t6 = () => {
+      if (largeBreak === true || midBreak === true || smallBreak === true) {
+        setNavOpen(false);
+      }
+      setHydrated(true);
+    };
+    t7 = [largeBreak, midBreak, smallBreak];
+    $[8] = largeBreak;
+    $[9] = midBreak;
+    $[10] = smallBreak;
+    $[11] = t6;
+    $[12] = t7;
+  } else {
+    t6 = $[11];
+    t7 = $[12];
+  }
+  useEffect(t6, t7);
+  let t8;
+  if ($[13] !== children || $[14] !== hydrated || $[15] !== navOpen) {
+    t8 = _jsx(NavContext, {
+      value: {
+        hydrated,
+        navOpen,
+        setNavOpen
+      },
+      children
+    });
+    $[13] = children;
+    $[14] = hydrated;
+    $[15] = navOpen;
+    $[16] = t8;
+  } else {
+    t8 = $[16];
+  }
+  return t8;
 };
 //# sourceMappingURL=context.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"context.js","names":["useWindowInfo","PREFERENCE_KEYS","React","useEffect","useRef","usePreferences","usePathname","NavContext","createContext","hydrated","navOpen","navRef","setNavOpen","useNav","use","getNavPreference","getPreference","navPrefs","NAV","preferredState","open","NavProvider","children","initialIsOpen","breakpoints","l","largeBreak","m","midBreak","s","smallBreak","pathname","useState","setHydrated","setNavFromPreferences","current","style","overscrollBehavior","_jsx","value"],"sources":["../../../src/elements/Nav/context.tsx"],"sourcesContent":["'use client'\nimport { useWindowInfo } from '@faceless-ui/window-info'\nimport { PREFERENCE_KEYS } from 'payload/shared'\nimport React, { useEffect, useRef } from 'react'\n\nimport { usePreferences } from '../../providers/Preferences/index.js'\nimport { usePathname } from '../../providers/RouterAdapter/index.js'\n\ntype NavContextType = {\n  hydrated: boolean\n  navOpen: boolean\n  navRef: React.RefObject<HTMLDivElement | null>\n  setNavOpen: (value: boolean) => void\n}\n\n/**\n * @internal\n */\nexport const NavContext = React.createContext<NavContextType>({\n  hydrated: false,\n  navOpen: true,\n  navRef: null,\n  setNavOpen: () => {},\n})\n\nexport const useNav = () => React.use(NavContext)\n\nconst getNavPreference = async (getPreference): Promise<boolean> => {\n  const navPrefs = await getPreference(PREFERENCE_KEYS.NAV)\n  const preferredState = navPrefs?.open\n  if (typeof preferredState === 'boolean') {\n    return preferredState\n  } else {\n    return true\n  }\n}\n\n/**\n * @internal\n */\nexport const NavProvider: React.FC<{\n  children: React.ReactNode\n  initialIsOpen?: boolean\n}> = ({ children, initialIsOpen }) => {\n  const {\n    breakpoints: { l: largeBreak, m: midBreak, s: smallBreak },\n  } = useWindowInfo()\n\n  const pathname = usePathname()\n\n  const { getPreference } = usePreferences()\n  const navRef = useRef(null)\n\n  // initialize the nav to be closed\n  // this is because getting the preference is async\n  // so instead of closing it after the preference is loaded\n  // we will open it after the preference is loaded\n  const [navOpen, setNavOpen] = React.useState(initialIsOpen)\n\n  const [hydrated, setHydrated] = React.useState(false)\n\n  // on load check the user's preference and set \"initial\" state\n  useEffect(() => {\n    if (largeBreak === false) {\n      const setNavFromPreferences = async () => {\n        const preferredState = await getNavPreference(getPreference)\n        setNavOpen(preferredState)\n      }\n\n      void setNavFromPreferences()\n    }\n  }, [largeBreak, getPreference, setNavOpen])\n\n  // on smaller screens where the nav is a modal\n  // close the nav when the user navigates away\n  useEffect(() => {\n    if (smallBreak === true) {\n      setNavOpen(false)\n    }\n  }, [pathname])\n\n  // on open and close, lock the body scroll\n  // do not do this on desktop, the sidebar is not a modal\n  useEffect(() => {\n    if (navRef.current) {\n      if (navOpen && midBreak) {\n        navRef.current.style.overscrollBehavior = 'contain'\n      } else {\n        navRef.current.style.overscrollBehavior = 'auto'\n      }\n    }\n  }, [navOpen, midBreak])\n\n  // on smaller screens where the nav is a modal\n  // close the nav when the user resizes down to mobile\n  // the sidebar is a modal on mobile\n  useEffect(() => {\n    if (largeBreak === true || midBreak === true || smallBreak === true) {\n      setNavOpen(false)\n    }\n    setHydrated(true)\n  }, [largeBreak, midBreak, smallBreak])\n\n  // when the component unmounts, clear all body scroll locks\n  useEffect(() => {\n    return () => {\n      if (navRef.current) {\n        navRef.current.style.overscrollBehavior = 'auto'\n      }\n    }\n  }, [])\n\n  return <NavContext value={{ hydrated, navOpen, navRef, setNavOpen }}>{children}</NavContext>\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"context.js","names":["c","_c","useWindowInfo","PREFERENCE_KEYS","React","useEffect","usePreferences","usePathname","NavContext","createContext","hydrated","navOpen","setNavOpen","useNav","use","getNavPreference","getPreference","navPrefs","NAV","preferredState","open","NavProvider","t0","$","children","initialIsOpen","breakpoints","t1","l","largeBreak","m","midBreak","s","smallBreak","pathname","useState","setHydrated","t2","t3","setNavFromPreferences","t4","t5","t6","t7","t8","_jsx","value"],"sources":["../../../src/elements/Nav/context.tsx"],"sourcesContent":["'use client'\nimport { useWindowInfo } from '@faceless-ui/window-info'\nimport { PREFERENCE_KEYS } from 'payload/shared'\nimport React, { useEffect } from 'react'\n\nimport { usePreferences } from '../../providers/Preferences/index.js'\nimport { usePathname } from '../../providers/RouterAdapter/index.js'\n\ntype NavContextType = {\n  hydrated: boolean\n  navOpen: boolean\n  setNavOpen: (value: boolean) => void\n}\n\n/**\n * @internal\n */\nexport const NavContext = React.createContext<NavContextType>({\n  hydrated: false,\n  navOpen: true,\n  setNavOpen: () => {},\n})\n\nexport const useNav = () => React.use(NavContext)\n\nconst getNavPreference = async (getPreference): Promise<boolean> => {\n  const navPrefs = await getPreference(PREFERENCE_KEYS.NAV)\n  const preferredState = navPrefs?.open\n  if (typeof preferredState === 'boolean') {\n    return preferredState\n  } else {\n    return true\n  }\n}\n\n/**\n * @internal\n */\nexport const NavProvider: React.FC<{\n  children: React.ReactNode\n  initialIsOpen?: boolean\n}> = ({ children, initialIsOpen }) => {\n  const {\n    breakpoints: { l: largeBreak, m: midBreak, s: smallBreak },\n  } = useWindowInfo()\n\n  const pathname = usePathname()\n\n  const { getPreference } = usePreferences()\n\n  // initialize the nav to be closed\n  // this is because getting the preference is async\n  // so instead of closing it after the preference is loaded\n  // we will open it after the preference is loaded\n  const [navOpen, setNavOpen] = React.useState(initialIsOpen)\n\n  const [hydrated, setHydrated] = React.useState(false)\n\n  // on load check the user's preference and set \"initial\" state\n  useEffect(() => {\n    if (largeBreak === false) {\n      const setNavFromPreferences = async () => {\n        const preferredState = await getNavPreference(getPreference)\n        setNavOpen(preferredState)\n      }\n\n      void setNavFromPreferences()\n    }\n  }, [largeBreak, getPreference, setNavOpen])\n\n  // on smaller screens where the nav is a modal\n  // close the nav when the user navigates away\n  useEffect(() => {\n    if (smallBreak === true) {\n      setNavOpen(false)\n    }\n  }, [pathname])\n\n  // on smaller screens where the nav is a modal\n  // close the nav when the user resizes down to mobile\n  // the sidebar is a modal on mobile\n  useEffect(() => {\n    if (largeBreak === true || midBreak === true || smallBreak === true) {\n      setNavOpen(false)\n    }\n    setHydrated(true)\n  }, [largeBreak, midBreak, smallBreak])\n\n  return <NavContext value={{ hydrated, navOpen, setNavOpen }}>{children}</NavContext>\n}\n"],"mappings":"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","ignoreList":[]}

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,7 +70,6 @@
     width: var(--spacer-3);
     height: var(--spacer-3);
     color: var(--color-icon-tertiary);
-    left: calc(-1 * var(--spacer-1));
     opacity: 0;
   }