@payloadcms/next 3.0.0-canary.a0b06af → 3.0.0-canary.a192632

package/dist/elements/DocumentHeader/Tabs/tabs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../src/elements/DocumentHeader/Tabs/tabs/index.tsx"],"sourcesContent":["import type { DocumentTabConfig } from 'payload'\n\nimport { VersionsPill } from './VersionsPill/index.js'\n\nexport const documentViewKeys = [\n  'API',\n  'Default',\n  'LivePreview',\n  'References',\n  'Relationships',\n  'Version',\n  'Versions',\n]\n\nexport type DocumentViewKey = (typeof documentViewKeys)[number]\n\nexport const tabs: Record<\n  DocumentViewKey,\n  DocumentTabConfig & {\n    order?: number // TODO: expose this to the globalConfig config\n  }\n> = {\n  API: {\n    condition: ({ collectionConfig, globalConfig }) =>\n      (collectionConfig && !collectionConfig?.admin?.hideAPIURL) ||\n      (globalConfig && !globalConfig?.admin?.hideAPIURL),\n    href: '/api',\n    label: 'API',\n    order: 1000,\n  },\n  Default: {\n    href: '',\n    // isActive: ({ href, location }) =>\n    // location.pathname === href || location.pathname === `${href}/create`,\n    label: ({ t }) => t('general:edit'),\n    order: 0,\n  },\n  LivePreview: {\n    condition: ({ collectionConfig, config, globalConfig }) => {\n      if (collectionConfig) {\n        return Boolean(\n          config?.admin?.livePreview?.collections?.includes(collectionConfig.slug) ||\n            collectionConfig?.admin?.livePreview,\n        )\n      }\n\n      if (globalConfig) {\n        return Boolean(\n          config?.admin?.livePreview?.globals?.includes(globalConfig.slug) ||\n            globalConfig?.admin?.livePreview,\n        )\n      }\n\n      return false\n    },\n    href: '/preview',\n    label: ({ t }) => t('general:livePreview'),\n    order: 100,\n  },\n  References: {\n    condition: () => false,\n  },\n  Relationships: {\n    condition: () => false,\n  },\n  Version: {\n    condition: () => false,\n  },\n  Versions: {\n    Pill: VersionsPill,\n    condition: ({ collectionConfig, globalConfig, permissions }) =>\n      Boolean(\n        (collectionConfig?.versions &&\n          permissions?.collections?.[collectionConfig?.slug]?.readVersions?.permission) ||\n          (globalConfig?.versions &&\n            permissions?.globals?.[globalConfig?.slug]?.readVersions?.permission),\n      ),\n    href: '/versions',\n    label: ({ t }) => t('version:versions'),\n    order: 200,\n  },\n}\n"],"names":["VersionsPill","documentViewKeys","tabs","API","condition","collectionConfig","globalConfig","admin","hideAPIURL","href","label","order","Default","t","LivePreview","config","Boolean","livePreview","collections","includes","slug","globals","References","Relationships","Version","Versions","Pill","permissions","versions","readVersions","permission"],"mappings":"AAEA,SAASA,YAAY,QAAQ,0BAAyB;AAEtD,OAAO,MAAMC,mBAAmB;IAC9B;IACA;IACA;IACA;IACA;IACA;IACA;CACD,CAAA;AAID,OAAO,MAAMC,OAKT;IACFC,KAAK;QACHC,WAAW,CAAC,EAAEC,gBAAgB,EAAEC,YAAY,EAAE,GAC5C,AAACD,oBAAoB,CAACA,kBAAkBE,OAAOC,cAC9CF,gBAAgB,CAACA,cAAcC,OAAOC;QACzCC,MAAM;QACNC,OAAO;QACPC,OAAO;IACT;IACAC,SAAS;QACPH,MAAM;QACN,oCAAoC;QACpC,wEAAwE;QACxEC,OAAO,CAAC,EAAEG,CAAC,EAAE,GAAKA,EAAE;QACpBF,OAAO;IACT;IACAG,aAAa;QACXV,WAAW,CAAC,EAAEC,gBAAgB,EAAEU,MAAM,EAAET,YAAY,EAAE;YACpD,IAAID,kBAAkB;gBACpB,OAAOW,QACLD,QAAQR,OAAOU,aAAaC,aAAaC,SAASd,iBAAiBe,IAAI,KACrEf,kBAAkBE,OAAOU;YAE/B;YAEA,IAAIX,cAAc;gBAChB,OAAOU,QACLD,QAAQR,OAAOU,aAAaI,SAASF,SAASb,aAAac,IAAI,KAC7Dd,cAAcC,OAAOU;YAE3B;YAEA,OAAO;QACT;QACAR,MAAM;QACNC,OAAO,CAAC,EAAEG,CAAC,EAAE,GAAKA,EAAE;QACpBF,OAAO;IACT;IACAW,YAAY;QACVlB,WAAW,IAAM;IACnB;IACAmB,eAAe;QACbnB,WAAW,IAAM;IACnB;IACAoB,SAAS;QACPpB,WAAW,IAAM;IACnB;IACAqB,UAAU;QACRC,MAAM1B;QACNI,WAAW,CAAC,EAAEC,gBAAgB,EAAEC,YAAY,EAAEqB,WAAW,EAAE,GACzDX,QACE,AAACX,kBAAkBuB,YACjBD,aAAaT,aAAa,CAACb,kBAAkBe,KAAK,EAAES,cAAcC,cACjExB,cAAcsB,YACbD,aAAaN,SAAS,CAACf,cAAcc,KAAK,EAAES,cAAcC;QAElErB,MAAM;QACNC,OAAO,CAAC,EAAEG,CAAC,EAAE,GAAKA,EAAE;QACpBF,OAAO;IACT;AACF,EAAC"}
+{"version":3,"sources":["../../../../../src/elements/DocumentHeader/Tabs/tabs/index.tsx"],"sourcesContent":["import type { DocumentTabConfig } from 'payload'\nimport type React from 'react'\n\nimport { VersionsPill } from './VersionsPill/index.js'\n\nexport const documentViewKeys = [\n  'api',\n  'default',\n  'livePreview',\n  'references',\n  'relationships',\n  'version',\n  'versions',\n]\n\nexport type DocumentViewKey = (typeof documentViewKeys)[number]\n\nexport const tabs: Record<\n  DocumentViewKey,\n  {\n    Pill_Component?: React.FC\n    order?: number // TODO: expose this to the globalConfig config\n  } & DocumentTabConfig\n> = {\n  api: {\n    condition: ({ collectionConfig, globalConfig }) =>\n      (collectionConfig && !collectionConfig?.admin?.hideAPIURL) ||\n      (globalConfig && !globalConfig?.admin?.hideAPIURL),\n    href: '/api',\n    label: 'API',\n    order: 1000,\n  },\n  default: {\n    href: '',\n    // isActive: ({ href, location }) =>\n    // location.pathname === href || location.pathname === `${href}/create`,\n    label: ({ t }) => t('general:edit'),\n    order: 0,\n  },\n  livePreview: {\n    condition: ({ collectionConfig, config, globalConfig }) => {\n      if (collectionConfig) {\n        return Boolean(\n          config?.admin?.livePreview?.collections?.includes(collectionConfig.slug) ||\n            collectionConfig?.admin?.livePreview,\n        )\n      }\n\n      if (globalConfig) {\n        return Boolean(\n          config?.admin?.livePreview?.globals?.includes(globalConfig.slug) ||\n            globalConfig?.admin?.livePreview,\n        )\n      }\n\n      return false\n    },\n    href: '/preview',\n    label: ({ t }) => t('general:livePreview'),\n    order: 100,\n  },\n  references: {\n    condition: () => false,\n  },\n  relationships: {\n    condition: () => false,\n  },\n  version: {\n    condition: () => false,\n  },\n  versions: {\n    Pill_Component: VersionsPill,\n    condition: ({ collectionConfig, globalConfig, permissions }) =>\n      Boolean(\n        (collectionConfig?.versions &&\n          permissions?.collections?.[collectionConfig?.slug]?.readVersions?.permission) ||\n          (globalConfig?.versions &&\n            permissions?.globals?.[globalConfig?.slug]?.readVersions?.permission),\n      ),\n    href: '/versions',\n    label: ({ t }) => t('version:versions'),\n    order: 200,\n  },\n}\n"],"names":["VersionsPill","documentViewKeys","tabs","api","condition","collectionConfig","globalConfig","admin","hideAPIURL","href","label","order","default","t","livePreview","config","Boolean","collections","includes","slug","globals","references","relationships","version","versions","Pill_Component","permissions","readVersions","permission"],"mappings":"AAGA,SAASA,YAAY,QAAQ,0BAAyB;AAEtD,OAAO,MAAMC,mBAAmB;IAC9B;IACA;IACA;IACA;IACA;IACA;IACA;CACD,CAAA;AAID,OAAO,MAAMC,OAMT;IACFC,KAAK;QACHC,WAAW,CAAC,EAAEC,gBAAgB,EAAEC,YAAY,EAAE,GAC5C,AAACD,oBAAoB,CAACA,kBAAkBE,OAAOC,cAC9CF,gBAAgB,CAACA,cAAcC,OAAOC;QACzCC,MAAM;QACNC,OAAO;QACPC,OAAO;IACT;IACAC,SAAS;QACPH,MAAM;QACN,oCAAoC;QACpC,wEAAwE;QACxEC,OAAO,CAAC,EAAEG,CAAC,EAAE,GAAKA,EAAE;QACpBF,OAAO;IACT;IACAG,aAAa;QACXV,WAAW,CAAC,EAAEC,gBAAgB,EAAEU,MAAM,EAAET,YAAY,EAAE;YACpD,IAAID,kBAAkB;gBACpB,OAAOW,QACLD,QAAQR,OAAOO,aAAaG,aAAaC,SAASb,iBAAiBc,IAAI,KACrEd,kBAAkBE,OAAOO;YAE/B;YAEA,IAAIR,cAAc;gBAChB,OAAOU,QACLD,QAAQR,OAAOO,aAAaM,SAASF,SAASZ,aAAaa,IAAI,KAC7Db,cAAcC,OAAOO;YAE3B;YAEA,OAAO;QACT;QACAL,MAAM;QACNC,OAAO,CAAC,EAAEG,CAAC,EAAE,GAAKA,EAAE;QACpBF,OAAO;IACT;IACAU,YAAY;QACVjB,WAAW,IAAM;IACnB;IACAkB,eAAe;QACblB,WAAW,IAAM;IACnB;IACAmB,SAAS;QACPnB,WAAW,IAAM;IACnB;IACAoB,UAAU;QACRC,gBAAgBzB;QAChBI,WAAW,CAAC,EAAEC,gBAAgB,EAAEC,YAAY,EAAEoB,WAAW,EAAE,GACzDV,QACE,AAACX,kBAAkBmB,YACjBE,aAAaT,aAAa,CAACZ,kBAAkBc,KAAK,EAAEQ,cAAcC,cACjEtB,cAAckB,YACbE,aAAaN,SAAS,CAACd,cAAca,KAAK,EAAEQ,cAAcC;QAElEnB,MAAM;QACNC,OAAO,CAAC,EAAEG,CAAC,EAAE,GAAKA,EAAE;QACpBF,OAAO;IACT;AACF,EAAC"}

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

@@ -1,14 +1,14 @@
 import type { I18n } from '@payloadcms/translations';
-import type { Permissions, SanitizedCollectionConfig, SanitizedConfig, SanitizedGlobalConfig } from 'payload';
+import type { Payload, Permissions, SanitizedCollectionConfig, SanitizedGlobalConfig } from 'payload';
 import React from 'react';
 import './index.scss';
 export declare const DocumentHeader: React.FC<{
     collectionConfig?: SanitizedCollectionConfig;
-    config: SanitizedConfig;
     customHeader?: React.ReactNode;
     globalConfig?: SanitizedGlobalConfig;
     hideTabs?: boolean;
     i18n: I18n;
+    payload: Payload;
     permissions: Permissions;
 }>;
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/DocumentHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EACV,WAAW,EACX,yBAAyB,EACzB,eAAe,EACf,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAGhB,OAAO,KAAmB,MAAM,OAAO,CAAA;AAGvC,OAAO,cAAc,CAAA;AAIrB,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC;IACpC,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,MAAM,EAAE,eAAe,CAAA;IACvB,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC9B,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,IAAI,CAAA;IACV,WAAW,EAAE,WAAW,CAAA;CACzB,CAuBA,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/DocumentHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AACpD,OAAO,KAAK,EACV,OAAO,EACP,WAAW,EACX,yBAAyB,EACzB,qBAAqB,EACtB,MAAM,SAAS,CAAA;AAGhB,OAAO,KAAmB,MAAM,OAAO,CAAA;AAGvC,OAAO,cAAc,CAAA;AAIrB,eAAO,MAAM,cAAc,EAAE,KAAK,CAAC,EAAE,CAAC;IACpC,gBAAgB,CAAC,EAAE,yBAAyB,CAAA;IAC5C,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC9B,YAAY,CAAC,EAAE,qBAAqB,CAAA;IACpC,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,IAAI,EAAE,IAAI,CAAA;IACV,OAAO,EAAE,OAAO,CAAA;IAChB,WAAW,EAAE,WAAW,CAAA;CACzB,CAuBA,CAAA"}

package/dist/elements/DocumentHeader/index.js

@@ -4,7 +4,7 @@ import React, { Fragment } from 'react';
 import { DocumentTabs } from './Tabs/index.js';
 const baseClass = `doc-header`;
 export const DocumentHeader = (props)=>{
-    const { collectionConfig, config, customHeader, globalConfig, hideTabs, i18n, permissions } = props;
+    const { collectionConfig, customHeader, globalConfig, hideTabs, i18n, payload, permissions } = props;
     return /*#__PURE__*/ _jsxs(Gutter, {
         className: baseClass,
         children: [
@@ -16,9 +16,9 @@ export const DocumentHeader = (props)=>{
                     }),
                     !hideTabs && /*#__PURE__*/ _jsx(DocumentTabs, {
                         collectionConfig: collectionConfig,
-                        config: config,
                         globalConfig: globalConfig,
                         i18n: i18n,
+                        payload: payload,
                         permissions: permissions
                     })
                 ]

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/DocumentHeader/index.tsx"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type {\n  Permissions,\n  SanitizedCollectionConfig,\n  SanitizedConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { Gutter, RenderTitle } from '@payloadcms/ui'\nimport React, { Fragment } from 'react'\n\nimport { DocumentTabs } from './Tabs/index.js'\nimport './index.scss'\n\nconst baseClass = `doc-header`\n\nexport const DocumentHeader: React.FC<{\n  collectionConfig?: SanitizedCollectionConfig\n  config: SanitizedConfig\n  customHeader?: React.ReactNode\n  globalConfig?: SanitizedGlobalConfig\n  hideTabs?: boolean\n  i18n: I18n\n  permissions: Permissions\n}> = (props) => {\n  const { collectionConfig, config, customHeader, globalConfig, hideTabs, i18n, permissions } =\n    props\n\n  return (\n    <Gutter className={baseClass}>\n      {customHeader && customHeader}\n      {!customHeader && (\n        <Fragment>\n          <RenderTitle className={`${baseClass}__title`} />\n          {!hideTabs && (\n            <DocumentTabs\n              collectionConfig={collectionConfig}\n              config={config}\n              globalConfig={globalConfig}\n              i18n={i18n}\n              permissions={permissions}\n            />\n          )}\n        </Fragment>\n      )}\n    </Gutter>\n  )\n}\n"],"names":["Gutter","RenderTitle","React","Fragment","DocumentTabs","baseClass","DocumentHeader","props","collectionConfig","config","customHeader","globalConfig","hideTabs","i18n","permissions","className"],"mappings":";AAQA,SAASA,MAAM,EAAEC,WAAW,QAAQ,iBAAgB;AACpD,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,YAAY,QAAQ,kBAAiB;AAG9C,MAAMC,YAAY,CAAC,UAAU,CAAC;AAE9B,OAAO,MAAMC,iBAQR,CAACC;IACJ,MAAM,EAAEC,gBAAgB,EAAEC,MAAM,EAAEC,YAAY,EAAEC,YAAY,EAAEC,QAAQ,EAAEC,IAAI,EAAEC,WAAW,EAAE,GACzFP;IAEF,qBACE,MAACP;QAAOe,WAAWV;;YAChBK,gBAAgBA;YAChB,CAACA,8BACA,MAACP;;kCACC,KAACF;wBAAYc,WAAW,CAAC,EAAEV,UAAU,OAAO,CAAC;;oBAC5C,CAACO,0BACA,KAACR;wBACCI,kBAAkBA;wBAClBC,QAAQA;wBACRE,cAAcA;wBACdE,MAAMA;wBACNC,aAAaA;;;;;;AAO3B,EAAC"}
+{"version":3,"sources":["../../../src/elements/DocumentHeader/index.tsx"],"sourcesContent":["import type { I18n } from '@payloadcms/translations'\nimport type {\n  Payload,\n  Permissions,\n  SanitizedCollectionConfig,\n  SanitizedGlobalConfig,\n} from 'payload'\n\nimport { Gutter, RenderTitle } from '@payloadcms/ui'\nimport React, { Fragment } from 'react'\n\nimport { DocumentTabs } from './Tabs/index.js'\nimport './index.scss'\n\nconst baseClass = `doc-header`\n\nexport const DocumentHeader: React.FC<{\n  collectionConfig?: SanitizedCollectionConfig\n  customHeader?: React.ReactNode\n  globalConfig?: SanitizedGlobalConfig\n  hideTabs?: boolean\n  i18n: I18n\n  payload: Payload\n  permissions: Permissions\n}> = (props) => {\n  const { collectionConfig, customHeader, globalConfig, hideTabs, i18n, payload, permissions } =\n    props\n\n  return (\n    <Gutter className={baseClass}>\n      {customHeader && customHeader}\n      {!customHeader && (\n        <Fragment>\n          <RenderTitle className={`${baseClass}__title`} />\n          {!hideTabs && (\n            <DocumentTabs\n              collectionConfig={collectionConfig}\n              globalConfig={globalConfig}\n              i18n={i18n}\n              payload={payload}\n              permissions={permissions}\n            />\n          )}\n        </Fragment>\n      )}\n    </Gutter>\n  )\n}\n"],"names":["Gutter","RenderTitle","React","Fragment","DocumentTabs","baseClass","DocumentHeader","props","collectionConfig","customHeader","globalConfig","hideTabs","i18n","payload","permissions","className"],"mappings":";AAQA,SAASA,MAAM,EAAEC,WAAW,QAAQ,iBAAgB;AACpD,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,SAASC,YAAY,QAAQ,kBAAiB;AAG9C,MAAMC,YAAY,CAAC,UAAU,CAAC;AAE9B,OAAO,MAAMC,iBAQR,CAACC;IACJ,MAAM,EAAEC,gBAAgB,EAAEC,YAAY,EAAEC,YAAY,EAAEC,QAAQ,EAAEC,IAAI,EAAEC,OAAO,EAAEC,WAAW,EAAE,GAC1FP;IAEF,qBACE,MAACP;QAAOe,WAAWV;;YAChBI,gBAAgBA;YAChB,CAACA,8BACA,MAACN;;kCACC,KAACF;wBAAYc,WAAW,CAAC,EAAEV,UAAU,OAAO,CAAC;;oBAC5C,CAACM,0BACA,KAACP;wBACCI,kBAAkBA;wBAClBE,cAAcA;wBACdE,MAAMA;wBACNC,SAASA;wBACTC,aAAaA;;;;;;AAO3B,EAAC"}

package/dist/elements/DocumentHeader/index.scss

@@ -40,8 +40,6 @@
 
     &__title {
       width: 100%;
-      padding-left: var(--gutter-h);
-      padding-right: var(--gutter-h);
     }
   }
 

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

@@ -0,0 +1,14 @@
+import type { FieldPermissions, LoginWithUsernameOptions } from 'payload';
+import React from 'react';
+type RenderEmailAndUsernameFieldsProps = {
+    className?: string;
+    loginWithUsername?: LoginWithUsernameOptions | false;
+    operation?: 'create' | 'update';
+    permissions?: {
+        [fieldName: string]: FieldPermissions;
+    };
+    readOnly: boolean;
+};
+export declare function RenderEmailAndUsernameFields(props: RenderEmailAndUsernameFieldsProps): React.JSX.Element;
+export {};
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/EmailAndUsername/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAIzE,OAAO,KAAK,MAAM,OAAO,CAAA;AAqDzB,KAAK,iCAAiC,GAAG;IACvC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,iBAAiB,CAAC,EAAE,wBAAwB,GAAG,KAAK,CAAA;IACpD,SAAS,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAA;IAC/B,WAAW,CAAC,EAAE;QACZ,CAAC,SAAS,EAAE,MAAM,GAAG,gBAAgB,CAAA;KACtC,CAAA;IACD,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AACD,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,iCAAiC,qBA6CpF"}

package/dist/elements/EmailAndUsername/index.js

@@ -0,0 +1,89 @@
+'use client';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { EmailField, RenderFields, TextField, useTranslation } from '@payloadcms/ui';
+import { email, username } from 'payload/shared';
+import React from 'react';
+function EmailFieldComponent(props) {
+    const { loginWithUsername } = props;
+    const { t } = useTranslation();
+    const requireEmail = !loginWithUsername || loginWithUsername && loginWithUsername.requireEmail;
+    const showEmailField = !loginWithUsername || loginWithUsername?.requireEmail || loginWithUsername?.allowEmailLogin;
+    if (showEmailField) {
+        return /*#__PURE__*/ _jsx(EmailField, {
+            autoComplete: "off",
+            field: {
+                name: 'email',
+                label: t('general:email'),
+                required: requireEmail
+            },
+            validate: email
+        });
+    }
+    return null;
+}
+function UsernameFieldComponent(props) {
+    const { loginWithUsername } = props;
+    const { t } = useTranslation();
+    const requireUsername = loginWithUsername && loginWithUsername.requireUsername;
+    const showUsernameField = Boolean(loginWithUsername);
+    if (showUsernameField) {
+        return /*#__PURE__*/ _jsx(TextField, {
+            field: {
+                name: 'username',
+                label: t('authentication:username'),
+                required: requireUsername
+            },
+            validate: username
+        });
+    }
+    return null;
+}
+export function RenderEmailAndUsernameFields(props) {
+    const { className, loginWithUsername, operation, permissions, readOnly } = props;
+    return /*#__PURE__*/ _jsx(RenderFields, {
+        className: className,
+        fields: [
+            {
+                name: 'email',
+                type: 'text',
+                admin: {
+                    autoComplete: 'off',
+                    components: {
+                        Field: {
+                            type: 'client',
+                            Component: null,
+                            RenderedComponent: /*#__PURE__*/ _jsx(EmailFieldComponent, {
+                                loginWithUsername: loginWithUsername
+                            })
+                        }
+                    }
+                },
+                localized: false
+            },
+            {
+                name: 'username',
+                type: 'text',
+                admin: {
+                    components: {
+                        Field: {
+                            type: 'client',
+                            Component: null,
+                            RenderedComponent: /*#__PURE__*/ _jsx(UsernameFieldComponent, {
+                                loginWithUsername: loginWithUsername
+                            })
+                        }
+                    }
+                },
+                localized: false
+            }
+        ],
+        forceRender: true,
+        operation: operation,
+        path: "",
+        permissions: permissions,
+        readOnly: readOnly,
+        schemaPath: ""
+    });
+}
+
+//# sourceMappingURL=index.js.map

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

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/elements/EmailAndUsername/index.tsx"],"sourcesContent":["'use client'\n\nimport type { FieldPermissions, LoginWithUsernameOptions } from 'payload'\n\nimport { EmailField, RenderFields, TextField, useTranslation } from '@payloadcms/ui'\nimport { email, username } from 'payload/shared'\nimport React from 'react'\n\ntype Props = {\n  readonly loginWithUsername?: LoginWithUsernameOptions | false\n}\nfunction EmailFieldComponent(props: Props) {\n  const { loginWithUsername } = props\n  const { t } = useTranslation()\n\n  const requireEmail = !loginWithUsername || (loginWithUsername && loginWithUsername.requireEmail)\n  const showEmailField =\n    !loginWithUsername || loginWithUsername?.requireEmail || loginWithUsername?.allowEmailLogin\n\n  if (showEmailField) {\n    return (\n      <EmailField\n        autoComplete=\"off\"\n        field={{\n          name: 'email',\n          label: t('general:email'),\n          required: requireEmail,\n        }}\n        validate={email}\n      />\n    )\n  }\n\n  return null\n}\n\nfunction UsernameFieldComponent(props: Props) {\n  const { loginWithUsername } = props\n  const { t } = useTranslation()\n\n  const requireUsername = loginWithUsername && loginWithUsername.requireUsername\n  const showUsernameField = Boolean(loginWithUsername)\n\n  if (showUsernameField) {\n    return (\n      <TextField\n        field={{\n          name: 'username',\n          label: t('authentication:username'),\n          required: requireUsername,\n        }}\n        validate={username}\n      />\n    )\n  }\n\n  return null\n}\n\ntype RenderEmailAndUsernameFieldsProps = {\n  className?: string\n  loginWithUsername?: LoginWithUsernameOptions | false\n  operation?: 'create' | 'update'\n  permissions?: {\n    [fieldName: string]: FieldPermissions\n  }\n  readOnly: boolean\n}\nexport function RenderEmailAndUsernameFields(props: RenderEmailAndUsernameFieldsProps) {\n  const { className, loginWithUsername, operation, permissions, readOnly } = props\n\n  return (\n    <RenderFields\n      className={className}\n      fields={[\n        {\n          name: 'email',\n          type: 'text',\n          admin: {\n            autoComplete: 'off',\n            components: {\n              Field: {\n                type: 'client',\n                Component: null,\n                RenderedComponent: <EmailFieldComponent loginWithUsername={loginWithUsername} />,\n              },\n            },\n          },\n          localized: false,\n        },\n        {\n          name: 'username',\n          type: 'text',\n          admin: {\n            components: {\n              Field: {\n                type: 'client',\n                Component: null,\n                RenderedComponent: <UsernameFieldComponent loginWithUsername={loginWithUsername} />,\n              },\n            },\n          },\n          localized: false,\n        },\n      ]}\n      forceRender\n      operation={operation}\n      path=\"\"\n      permissions={permissions}\n      readOnly={readOnly}\n      schemaPath=\"\"\n    />\n  )\n}\n"],"names":["EmailField","RenderFields","TextField","useTranslation","email","username","React","EmailFieldComponent","props","loginWithUsername","t","requireEmail","showEmailField","allowEmailLogin","autoComplete","field","name","label","required","validate","UsernameFieldComponent","requireUsername","showUsernameField","Boolean","RenderEmailAndUsernameFields","className","operation","permissions","readOnly","fields","type","admin","components","Field","Component","RenderedComponent","localized","forceRender","path","schemaPath"],"mappings":"AAAA;;AAIA,SAASA,UAAU,EAAEC,YAAY,EAAEC,SAAS,EAAEC,cAAc,QAAQ,iBAAgB;AACpF,SAASC,KAAK,EAAEC,QAAQ,QAAQ,iBAAgB;AAChD,OAAOC,WAAW,QAAO;AAKzB,SAASC,oBAAoBC,KAAY;IACvC,MAAM,EAAEC,iBAAiB,EAAE,GAAGD;IAC9B,MAAM,EAAEE,CAAC,EAAE,GAAGP;IAEd,MAAMQ,eAAe,CAACF,qBAAsBA,qBAAqBA,kBAAkBE,YAAY;IAC/F,MAAMC,iBACJ,CAACH,qBAAqBA,mBAAmBE,gBAAgBF,mBAAmBI;IAE9E,IAAID,gBAAgB;QAClB,qBACE,KAACZ;YACCc,cAAa;YACbC,OAAO;gBACLC,MAAM;gBACNC,OAAOP,EAAE;gBACTQ,UAAUP;YACZ;YACAQ,UAAUf;;IAGhB;IAEA,OAAO;AACT;AAEA,SAASgB,uBAAuBZ,KAAY;IAC1C,MAAM,EAAEC,iBAAiB,EAAE,GAAGD;IAC9B,MAAM,EAAEE,CAAC,EAAE,GAAGP;IAEd,MAAMkB,kBAAkBZ,qBAAqBA,kBAAkBY,eAAe;IAC9E,MAAMC,oBAAoBC,QAAQd;IAElC,IAAIa,mBAAmB;QACrB,qBACE,KAACpB;YACCa,OAAO;gBACLC,MAAM;gBACNC,OAAOP,EAAE;gBACTQ,UAAUG;YACZ;YACAF,UAAUd;;IAGhB;IAEA,OAAO;AACT;AAWA,OAAO,SAASmB,6BAA6BhB,KAAwC;IACnF,MAAM,EAAEiB,SAAS,EAAEhB,iBAAiB,EAAEiB,SAAS,EAAEC,WAAW,EAAEC,QAAQ,EAAE,GAAGpB;IAE3E,qBACE,KAACP;QACCwB,WAAWA;QACXI,QAAQ;YACN;gBACEb,MAAM;gBACNc,MAAM;gBACNC,OAAO;oBACLjB,cAAc;oBACdkB,YAAY;wBACVC,OAAO;4BACLH,MAAM;4BACNI,WAAW;4BACXC,iCAAmB,KAAC5B;gCAAoBE,mBAAmBA;;wBAC7D;oBACF;gBACF;gBACA2B,WAAW;YACb;YACA;gBACEpB,MAAM;gBACNc,MAAM;gBACNC,OAAO;oBACLC,YAAY;wBACVC,OAAO;4BACLH,MAAM;4BACNI,WAAW;4BACXC,iCAAmB,KAACf;gCAAuBX,mBAAmBA;;wBAChE;oBACF;gBACF;gBACA2B,WAAW;YACb;SACD;QACDC,WAAW;QACXX,WAAWA;QACXY,MAAK;QACLX,aAAaA;QACbC,UAAUA;QACVW,YAAW;;AAGjB"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/LeaveWithoutSaving/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAiC,MAAM,OAAO,CAAA;AAErD,OAAO,cAAc,CAAA;AA6CrB,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAyBtC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/LeaveWithoutSaving/index.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAiC,MAAM,OAAO,CAAA;AAErD,OAAO,cAAc,CAAA;AA+CrB,eAAO,MAAM,kBAAkB,EAAE,KAAK,CAAC,EAyBtC,CAAA"}

package/dist/elements/LeaveWithoutSaving/index.js

@@ -46,10 +46,12 @@ const Component = ({ isActive, onCancel, onConfirm })=>{
                         /*#__PURE__*/ _jsx(Button, {
                             buttonStyle: "secondary",
                             onClick: onCancel,
+                            size: "large",
                             children: t('general:stayOnThisPage')
                         }),
                         /*#__PURE__*/ _jsx(Button, {
                             onClick: onConfirm,
+                            size: "large",
                             children: t('general:leaveAnyway')
                         })
                     ]

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/LeaveWithoutSaving/index.tsx"],"sourcesContent":["'use client'\nimport { Button, Modal, useAuth, useFormModified, useModal, useTranslation } from '@payloadcms/ui'\nimport React, { useCallback, useEffect } from 'react'\n\nimport './index.scss'\nimport { usePreventLeave } from './usePreventLeave.js'\n\nconst modalSlug = 'leave-without-saving'\n\nconst baseClass = 'leave-without-saving'\n\nconst Component: React.FC<{\n  isActive: boolean\n  onCancel: () => void\n  onConfirm: () => void\n}> = ({ isActive, onCancel, onConfirm }) => {\n  const { closeModal, modalState, openModal } = useModal()\n  const { t } = useTranslation()\n\n  // Manually check for modal state as 'esc' key will not trigger the nav inactivity\n  // useEffect(() => {\n  //   if (!modalState?.[modalSlug]?.isOpen && isActive) {\n  //     onCancel()\n  //   }\n  // }, [modalState, isActive, onCancel])\n\n  useEffect(() => {\n    if (isActive) openModal(modalSlug)\n    else closeModal(modalSlug)\n  }, [isActive, openModal, closeModal])\n\n  return (\n    <Modal className={baseClass} onClose={onCancel} slug={modalSlug}>\n      <div className={`${baseClass}__wrapper`}>\n        <div className={`${baseClass}__content`}>\n          <h1>{t('general:leaveWithoutSaving')}</h1>\n          <p>{t('general:changesNotSaved')}</p>\n        </div>\n        <div className={`${baseClass}__controls`}>\n          <Button buttonStyle=\"secondary\" onClick={onCancel}>\n            {t('general:stayOnThisPage')}\n          </Button>\n          <Button onClick={onConfirm}>{t('general:leaveAnyway')}</Button>\n        </div>\n      </div>\n    </Modal>\n  )\n}\n\nexport const LeaveWithoutSaving: React.FC = () => {\n  const modified = useFormModified()\n  const { user } = useAuth()\n  const [show, setShow] = React.useState(false)\n  const [hasAccepted, setHasAccepted] = React.useState(false)\n\n  const prevent = Boolean(modified && user)\n\n  const onPrevent = useCallback(() => {\n    setShow(true)\n  }, [])\n\n  usePreventLeave({ hasAccepted, onPrevent, prevent })\n\n  return (\n    <Component\n      isActive={show}\n      onCancel={() => {\n        setShow(false)\n      }}\n      onConfirm={() => {\n        setHasAccepted(true)\n      }}\n    />\n  )\n}\n"],"names":["Button","Modal","useAuth","useFormModified","useModal","useTranslation","React","useCallback","useEffect","usePreventLeave","modalSlug","baseClass","Component","isActive","onCancel","onConfirm","closeModal","modalState","openModal","t","className","onClose","slug","div","h1","p","buttonStyle","onClick","LeaveWithoutSaving","modified","user","show","setShow","useState","hasAccepted","setHasAccepted","prevent","Boolean","onPrevent"],"mappings":"AAAA;;AACA,SAASA,MAAM,EAAEC,KAAK,EAAEC,OAAO,EAAEC,eAAe,EAAEC,QAAQ,EAAEC,cAAc,QAAQ,iBAAgB;AAClG,OAAOC,SAASC,WAAW,EAAEC,SAAS,QAAQ,QAAO;AAGrD,SAASC,eAAe,QAAQ,uBAAsB;AAEtD,MAAMC,YAAY;AAElB,MAAMC,YAAY;AAElB,MAAMC,YAID,CAAC,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,SAAS,EAAE;IACrC,MAAM,EAAEC,UAAU,EAAEC,UAAU,EAAEC,SAAS,EAAE,GAAGd;IAC9C,MAAM,EAAEe,CAAC,EAAE,GAAGd;IAEd,kFAAkF;IAClF,oBAAoB;IACpB,wDAAwD;IACxD,iBAAiB;IACjB,MAAM;IACN,uCAAuC;IAEvCG,UAAU;QACR,IAAIK,UAAUK,UAAUR;aACnBM,WAAWN;IAClB,GAAG;QAACG;QAAUK;QAAWF;KAAW;IAEpC,qBACE,KAACf;QAAMmB,WAAWT;QAAWU,SAASP;QAAUQ,MAAMZ;kBACpD,cAAA,MAACa;YAAIH,WAAW,CAAC,EAAET,UAAU,SAAS,CAAC;;8BACrC,MAACY;oBAAIH,WAAW,CAAC,EAAET,UAAU,SAAS,CAAC;;sCACrC,KAACa;sCAAIL,EAAE;;sCACP,KAACM;sCAAGN,EAAE;;;;8BAER,MAACI;oBAAIH,WAAW,CAAC,EAAET,UAAU,UAAU,CAAC;;sCACtC,KAACX;4BAAO0B,aAAY;4BAAYC,SAASb;sCACtCK,EAAE;;sCAEL,KAACnB;4BAAO2B,SAASZ;sCAAYI,EAAE;;;;;;;AAKzC;AAEA,OAAO,MAAMS,qBAA+B;IAC1C,MAAMC,WAAW1B;IACjB,MAAM,EAAE2B,IAAI,EAAE,GAAG5B;IACjB,MAAM,CAAC6B,MAAMC,QAAQ,GAAG1B,MAAM2B,QAAQ,CAAC;IACvC,MAAM,CAACC,aAAaC,eAAe,GAAG7B,MAAM2B,QAAQ,CAAC;IAErD,MAAMG,UAAUC,QAAQR,YAAYC;IAEpC,MAAMQ,YAAY/B,YAAY;QAC5ByB,QAAQ;IACV,GAAG,EAAE;IAELvB,gBAAgB;QAAEyB;QAAaI;QAAWF;IAAQ;IAElD,qBACE,KAACxB;QACCC,UAAUkB;QACVjB,UAAU;YACRkB,QAAQ;QACV;QACAjB,WAAW;YACToB,eAAe;QACjB;;AAGN,EAAC"}
+{"version":3,"sources":["../../../src/elements/LeaveWithoutSaving/index.tsx"],"sourcesContent":["'use client'\nimport { Button, Modal, useAuth, useFormModified, useModal, useTranslation } from '@payloadcms/ui'\nimport React, { useCallback, useEffect } from 'react'\n\nimport './index.scss'\nimport { usePreventLeave } from './usePreventLeave.js'\n\nconst modalSlug = 'leave-without-saving'\n\nconst baseClass = 'leave-without-saving'\n\nconst Component: React.FC<{\n  isActive: boolean\n  onCancel: () => void\n  onConfirm: () => void\n}> = ({ isActive, onCancel, onConfirm }) => {\n  const { closeModal, modalState, openModal } = useModal()\n  const { t } = useTranslation()\n\n  // Manually check for modal state as 'esc' key will not trigger the nav inactivity\n  // useEffect(() => {\n  //   if (!modalState?.[modalSlug]?.isOpen && isActive) {\n  //     onCancel()\n  //   }\n  // }, [modalState, isActive, onCancel])\n\n  useEffect(() => {\n    if (isActive) openModal(modalSlug)\n    else closeModal(modalSlug)\n  }, [isActive, openModal, closeModal])\n\n  return (\n    <Modal className={baseClass} onClose={onCancel} slug={modalSlug}>\n      <div className={`${baseClass}__wrapper`}>\n        <div className={`${baseClass}__content`}>\n          <h1>{t('general:leaveWithoutSaving')}</h1>\n          <p>{t('general:changesNotSaved')}</p>\n        </div>\n        <div className={`${baseClass}__controls`}>\n          <Button buttonStyle=\"secondary\" onClick={onCancel} size=\"large\">\n            {t('general:stayOnThisPage')}\n          </Button>\n          <Button onClick={onConfirm} size=\"large\">\n            {t('general:leaveAnyway')}\n          </Button>\n        </div>\n      </div>\n    </Modal>\n  )\n}\n\nexport const LeaveWithoutSaving: React.FC = () => {\n  const modified = useFormModified()\n  const { user } = useAuth()\n  const [show, setShow] = React.useState(false)\n  const [hasAccepted, setHasAccepted] = React.useState(false)\n\n  const prevent = Boolean(modified && user)\n\n  const onPrevent = useCallback(() => {\n    setShow(true)\n  }, [])\n\n  usePreventLeave({ hasAccepted, onPrevent, prevent })\n\n  return (\n    <Component\n      isActive={show}\n      onCancel={() => {\n        setShow(false)\n      }}\n      onConfirm={() => {\n        setHasAccepted(true)\n      }}\n    />\n  )\n}\n"],"names":["Button","Modal","useAuth","useFormModified","useModal","useTranslation","React","useCallback","useEffect","usePreventLeave","modalSlug","baseClass","Component","isActive","onCancel","onConfirm","closeModal","modalState","openModal","t","className","onClose","slug","div","h1","p","buttonStyle","onClick","size","LeaveWithoutSaving","modified","user","show","setShow","useState","hasAccepted","setHasAccepted","prevent","Boolean","onPrevent"],"mappings":"AAAA;;AACA,SAASA,MAAM,EAAEC,KAAK,EAAEC,OAAO,EAAEC,eAAe,EAAEC,QAAQ,EAAEC,cAAc,QAAQ,iBAAgB;AAClG,OAAOC,SAASC,WAAW,EAAEC,SAAS,QAAQ,QAAO;AAGrD,SAASC,eAAe,QAAQ,uBAAsB;AAEtD,MAAMC,YAAY;AAElB,MAAMC,YAAY;AAElB,MAAMC,YAID,CAAC,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,SAAS,EAAE;IACrC,MAAM,EAAEC,UAAU,EAAEC,UAAU,EAAEC,SAAS,EAAE,GAAGd;IAC9C,MAAM,EAAEe,CAAC,EAAE,GAAGd;IAEd,kFAAkF;IAClF,oBAAoB;IACpB,wDAAwD;IACxD,iBAAiB;IACjB,MAAM;IACN,uCAAuC;IAEvCG,UAAU;QACR,IAAIK,UAAUK,UAAUR;aACnBM,WAAWN;IAClB,GAAG;QAACG;QAAUK;QAAWF;KAAW;IAEpC,qBACE,KAACf;QAAMmB,WAAWT;QAAWU,SAASP;QAAUQ,MAAMZ;kBACpD,cAAA,MAACa;YAAIH,WAAW,CAAC,EAAET,UAAU,SAAS,CAAC;;8BACrC,MAACY;oBAAIH,WAAW,CAAC,EAAET,UAAU,SAAS,CAAC;;sCACrC,KAACa;sCAAIL,EAAE;;sCACP,KAACM;sCAAGN,EAAE;;;;8BAER,MAACI;oBAAIH,WAAW,CAAC,EAAET,UAAU,UAAU,CAAC;;sCACtC,KAACX;4BAAO0B,aAAY;4BAAYC,SAASb;4BAAUc,MAAK;sCACrDT,EAAE;;sCAEL,KAACnB;4BAAO2B,SAASZ;4BAAWa,MAAK;sCAC9BT,EAAE;;;;;;;AAMf;AAEA,OAAO,MAAMU,qBAA+B;IAC1C,MAAMC,WAAW3B;IACjB,MAAM,EAAE4B,IAAI,EAAE,GAAG7B;IACjB,MAAM,CAAC8B,MAAMC,QAAQ,GAAG3B,MAAM4B,QAAQ,CAAC;IACvC,MAAM,CAACC,aAAaC,eAAe,GAAG9B,MAAM4B,QAAQ,CAAC;IAErD,MAAMG,UAAUC,QAAQR,YAAYC;IAEpC,MAAMQ,YAAYhC,YAAY;QAC5B0B,QAAQ;IACV,GAAG,EAAE;IAELxB,gBAAgB;QAAE0B;QAAaI;QAAWF;IAAQ;IAElD,qBACE,KAACzB;QACCC,UAAUmB;QACVlB,UAAU;YACRmB,QAAQ;QACV;QACAlB,WAAW;YACTqB,eAAe;QACjB;;AAGN,EAAC"}

package/dist/elements/LeaveWithoutSaving/index.scss

@@ -13,6 +13,7 @@
     display: flex;
     flex-direction: column;
     gap: var(--base);
+    padding: base(2);
   }
 
   &__content {

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/Logo/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAG1C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,eAAO,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA4BtC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/Logo/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAG1C,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,eAAO,MAAM,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA6BtC,CAAA"}

package/dist/elements/Logo/index.js

@@ -1,15 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { PayloadLogo, RenderCustomComponent } from '@payloadcms/ui/shared';
+import { PayloadLogo, RenderComponent, getCreateMappedComponent } from '@payloadcms/ui/shared';
 import React from 'react';
 export const Logo = (props)=>{
     const { i18n, locale, params, payload, permissions, searchParams, user } = props;
     const { admin: { components: { graphics: { Logo: CustomLogo } = {
         Logo: undefined
     } } = {} } = {} } = payload.config;
-    return /*#__PURE__*/ _jsx(RenderCustomComponent, {
-        CustomComponent: CustomLogo,
-        DefaultComponent: PayloadLogo,
-        serverOnlyProps: {
+    const createMappedComponent = getCreateMappedComponent({
+        importMap: payload.importMap,
+        serverProps: {
             i18n,
             locale,
             params,
@@ -19,6 +18,10 @@ export const Logo = (props)=>{
             user
         }
     });
+    const mappedCustomLogo = createMappedComponent(CustomLogo, undefined, PayloadLogo, 'CustomLogo');
+    return /*#__PURE__*/ _jsx(RenderComponent, {
+        mappedComponent: mappedCustomLogo
+    });
 };
 
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/Logo/index.tsx"],"sourcesContent":["import type { ServerProps } from 'payload'\n\nimport { PayloadLogo, RenderCustomComponent } from '@payloadcms/ui/shared'\nimport React from 'react'\n\nexport const Logo: React.FC<ServerProps> = (props) => {\n  const { i18n, locale, params, payload, permissions, searchParams, user } = props\n\n  const {\n    admin: {\n      components: {\n        graphics: { Logo: CustomLogo } = {\n          Logo: undefined,\n        },\n      } = {},\n    } = {},\n  } = payload.config\n\n  return (\n    <RenderCustomComponent\n      CustomComponent={CustomLogo}\n      DefaultComponent={PayloadLogo}\n      serverOnlyProps={{\n        i18n,\n        locale,\n        params,\n        payload,\n        permissions,\n        searchParams,\n        user,\n      }}\n    />\n  )\n}\n"],"names":["PayloadLogo","RenderCustomComponent","React","Logo","props","i18n","locale","params","payload","permissions","searchParams","user","admin","components","graphics","CustomLogo","undefined","config","CustomComponent","DefaultComponent","serverOnlyProps"],"mappings":";AAEA,SAASA,WAAW,EAAEC,qBAAqB,QAAQ,wBAAuB;AAC1E,OAAOC,WAAW,QAAO;AAEzB,OAAO,MAAMC,OAA8B,CAACC;IAC1C,MAAM,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAEC,WAAW,EAAEC,YAAY,EAAEC,IAAI,EAAE,GAAGP;IAE3E,MAAM,EACJQ,OAAO,EACLC,YAAY,EACVC,UAAU,EAAEX,MAAMY,UAAU,EAAE,GAAG;QAC/BZ,MAAMa;IACR,CAAC,EACF,GAAG,CAAC,CAAC,EACP,GAAG,CAAC,CAAC,EACP,GAAGR,QAAQS,MAAM;IAElB,qBACE,KAAChB;QACCiB,iBAAiBH;QACjBI,kBAAkBnB;QAClBoB,iBAAiB;YACff;YACAC;YACAC;YACAC;YACAC;YACAC;YACAC;QACF;;AAGN,EAAC"}
+{"version":3,"sources":["../../../src/elements/Logo/index.tsx"],"sourcesContent":["import type { ServerProps } from 'payload'\n\nimport { PayloadLogo, RenderComponent, getCreateMappedComponent } from '@payloadcms/ui/shared'\nimport React from 'react'\n\nexport const Logo: React.FC<ServerProps> = (props) => {\n  const { i18n, locale, params, payload, permissions, searchParams, user } = props\n\n  const {\n    admin: {\n      components: {\n        graphics: { Logo: CustomLogo } = {\n          Logo: undefined,\n        },\n      } = {},\n    } = {},\n  } = payload.config\n\n  const createMappedComponent = getCreateMappedComponent({\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 mappedCustomLogo = createMappedComponent(CustomLogo, undefined, PayloadLogo, 'CustomLogo')\n\n  return <RenderComponent mappedComponent={mappedCustomLogo} />\n}\n"],"names":["PayloadLogo","RenderComponent","getCreateMappedComponent","React","Logo","props","i18n","locale","params","payload","permissions","searchParams","user","admin","components","graphics","CustomLogo","undefined","config","createMappedComponent","importMap","serverProps","mappedCustomLogo","mappedComponent"],"mappings":";AAEA,SAASA,WAAW,EAAEC,eAAe,EAAEC,wBAAwB,QAAQ,wBAAuB;AAC9F,OAAOC,WAAW,QAAO;AAEzB,OAAO,MAAMC,OAA8B,CAACC;IAC1C,MAAM,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAEC,WAAW,EAAEC,YAAY,EAAEC,IAAI,EAAE,GAAGP;IAE3E,MAAM,EACJQ,OAAO,EACLC,YAAY,EACVC,UAAU,EAAEX,MAAMY,UAAU,EAAE,GAAG;QAC/BZ,MAAMa;IACR,CAAC,EACF,GAAG,CAAC,CAAC,EACP,GAAG,CAAC,CAAC,EACP,GAAGR,QAAQS,MAAM;IAElB,MAAMC,wBAAwBjB,yBAAyB;QACrDkB,WAAWX,QAAQW,SAAS;QAC5BC,aAAa;YACXf;YACAC;YACAC;YACAC;YACAC;YACAC;YACAC;QACF;IACF;IAEA,MAAMU,mBAAmBH,sBAAsBH,YAAYC,WAAWjB,aAAa;IAEnF,qBAAO,KAACC;QAAgBsB,iBAAiBD;;AAC3C,EAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/elements/Nav/index.client.tsx"],"names":[],"mappings":"AAgBA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAIvC,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EAuFpC,CAAA"}
+{"version":3,"file":"index.client.d.ts","sourceRoot":"","sources":["../../../src/elements/Nav/index.client.tsx"],"names":[],"mappings":"AAiBA,OAAO,KAAmB,MAAM,OAAO,CAAA;AAIvC,eAAO,MAAM,gBAAgB,EAAE,KAAK,CAAC,EA2FpC,CAAA"}

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

@@ -1,15 +1,17 @@
 'use client';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { getTranslation } from '@payloadcms/translations';
-import { ChevronIcon, NavGroup, useAuth, useConfig, useEntityVisibility, useNav, useTranslation } from '@payloadcms/ui';
-import { EntityType, groupNavItems } from '@payloadcms/ui/shared';
+import { NavGroup, useAuth, useConfig, useEntityVisibility, useNav, useTranslation } from '@payloadcms/ui';
+import { EntityType, formatAdminURL, groupNavItems } from '@payloadcms/ui/shared';
 import LinkWithDefault from 'next/link.js';
+import { usePathname } from 'next/navigation.js';
 import React, { Fragment } from 'react';
 const baseClass = 'nav';
 export const DefaultNavClient = ()=>{
     const { permissions } = useAuth();
     const { isEntityVisible } = useEntityVisibility();
-    const { collections, globals, routes: { admin } } = useConfig();
+    const pathname = usePathname();
+    const { config: { collections, globals, routes: { admin: adminRoute } } } = useConfig();
     const { i18n } = useTranslation();
     const { navOpen } = useNav();
     const groups = groupNavItems([
@@ -41,28 +43,35 @@ export const DefaultNavClient = ()=>{
                     let href;
                     let id;
                     if (type === EntityType.collection) {
-                        href = `${admin}/collections/${entity.slug}`;
+                        href = formatAdminURL({
+                            adminRoute,
+                            path: `/collections/${entity.slug}`
+                        });
                         entityLabel = getTranslation(entity.labels.plural, i18n);
                         id = `nav-${entity.slug}`;
                     }
                     if (type === EntityType.global) {
-                        href = `${admin}/globals/${entity.slug}`;
+                        href = formatAdminURL({
+                            adminRoute,
+                            path: `/globals/${entity.slug}`
+                        });
                         entityLabel = getTranslation(entity.label, i18n);
                         id = `nav-global-${entity.slug}`;
                     }
                     const Link = LinkWithDefault.default || LinkWithDefault;
                     const LinkElement = Link || 'a';
+                    const activeCollection = pathname.endsWith(href);
                     return /*#__PURE__*/ _jsxs(LinkElement, {
-                        className: `${baseClass}__link`,
+                        className: [
+                            `${baseClass}__link`,
+                            activeCollection && `active`
+                        ].filter(Boolean).join(' '),
                         href: href,
                         id: id,
                         tabIndex: !navOpen ? -1 : undefined,
                         children: [
-                            /*#__PURE__*/ _jsx("span", {
-                                className: `${baseClass}__link-icon`,
-                                children: /*#__PURE__*/ _jsx(ChevronIcon, {
-                                    direction: "right"
-                                })
+                            activeCollection && /*#__PURE__*/ _jsx("div", {
+                                className: `${baseClass}__link-indicator`
                             }),
                             /*#__PURE__*/ _jsx("span", {
                                 className: `${baseClass}__link-label`,

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/Nav/index.client.tsx"],"sourcesContent":["'use client'\n\nimport type { EntityToGroup } from '@payloadcms/ui/shared'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport {\n  ChevronIcon,\n  NavGroup,\n  useAuth,\n  useConfig,\n  useEntityVisibility,\n  useNav,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { EntityType, groupNavItems } from '@payloadcms/ui/shared'\nimport LinkWithDefault from 'next/link.js'\nimport React, { Fragment } from 'react'\n\nconst baseClass = 'nav'\n\nexport const DefaultNavClient: React.FC = () => {\n  const { permissions } = useAuth()\n  const { isEntityVisible } = useEntityVisibility()\n\n  const {\n    collections,\n    globals,\n    routes: { admin },\n  } = useConfig()\n\n  const { i18n } = useTranslation()\n  const { navOpen } = useNav()\n\n  const groups = groupNavItems(\n    [\n      ...collections\n        .filter(({ slug }) => isEntityVisible({ collectionSlug: slug }))\n        .map((collection) => {\n          const entityToGroup: EntityToGroup = {\n            type: EntityType.collection,\n            entity: collection,\n          }\n\n          return entityToGroup\n        }),\n      ...globals\n        .filter(({ slug }) => isEntityVisible({ globalSlug: slug }))\n        .map((global) => {\n          const entityToGroup: EntityToGroup = {\n            type: EntityType.global,\n            entity: global,\n          }\n\n          return entityToGroup\n        }),\n    ],\n    permissions,\n    i18n,\n  )\n\n  return (\n    <Fragment>\n      {groups.map(({ entities, label }, key) => {\n        return (\n          <NavGroup key={key} label={label}>\n            {entities.map(({ type, entity }, i) => {\n              let entityLabel: string\n              let href: string\n              let id: string\n\n              if (type === EntityType.collection) {\n                href = `${admin}/collections/${entity.slug}`\n                entityLabel = getTranslation(entity.labels.plural, i18n)\n                id = `nav-${entity.slug}`\n              }\n\n              if (type === EntityType.global) {\n                href = `${admin}/globals/${entity.slug}`\n                entityLabel = getTranslation(entity.label, i18n)\n                id = `nav-global-${entity.slug}`\n              }\n\n              const Link = (LinkWithDefault.default ||\n                LinkWithDefault) as typeof LinkWithDefault.default\n\n              const LinkElement = Link || 'a'\n\n              return (\n                <LinkElement\n                  className={`${baseClass}__link`}\n                  href={href}\n                  id={id}\n                  key={i}\n                  tabIndex={!navOpen ? -1 : undefined}\n                >\n                  <span className={`${baseClass}__link-icon`}>\n                    <ChevronIcon direction=\"right\" />\n                  </span>\n                  <span className={`${baseClass}__link-label`}>{entityLabel}</span>\n                </LinkElement>\n              )\n            })}\n          </NavGroup>\n        )\n      })}\n    </Fragment>\n  )\n}\n"],"names":["getTranslation","ChevronIcon","NavGroup","useAuth","useConfig","useEntityVisibility","useNav","useTranslation","EntityType","groupNavItems","LinkWithDefault","React","Fragment","baseClass","DefaultNavClient","permissions","isEntityVisible","collections","globals","routes","admin","i18n","navOpen","groups","filter","slug","collectionSlug","map","collection","entityToGroup","type","entity","globalSlug","global","entities","label","key","i","entityLabel","href","id","labels","plural","Link","default","LinkElement","className","tabIndex","undefined","span","direction"],"mappings":"AAAA;;AAIA,SAASA,cAAc,QAAQ,2BAA0B;AACzD,SACEC,WAAW,EACXC,QAAQ,EACRC,OAAO,EACPC,SAAS,EACTC,mBAAmB,EACnBC,MAAM,EACNC,cAAc,QACT,iBAAgB;AACvB,SAASC,UAAU,EAAEC,aAAa,QAAQ,wBAAuB;AACjE,OAAOC,qBAAqB,eAAc;AAC1C,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,MAAMC,YAAY;AAElB,OAAO,MAAMC,mBAA6B;IACxC,MAAM,EAAEC,WAAW,EAAE,GAAGZ;IACxB,MAAM,EAAEa,eAAe,EAAE,GAAGX;IAE5B,MAAM,EACJY,WAAW,EACXC,OAAO,EACPC,QAAQ,EAAEC,KAAK,EAAE,EAClB,GAAGhB;IAEJ,MAAM,EAAEiB,IAAI,EAAE,GAAGd;IACjB,MAAM,EAAEe,OAAO,EAAE,GAAGhB;IAEpB,MAAMiB,SAASd,cACb;WACKQ,YACAO,MAAM,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKT,gBAAgB;gBAAEU,gBAAgBD;YAAK,IAC5DE,GAAG,CAAC,CAACC;YACJ,MAAMC,gBAA+B;gBACnCC,MAAMtB,WAAWoB,UAAU;gBAC3BG,QAAQH;YACV;YAEA,OAAOC;QACT;WACCX,QACAM,MAAM,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKT,gBAAgB;gBAAEgB,YAAYP;YAAK,IACxDE,GAAG,CAAC,CAACM;YACJ,MAAMJ,gBAA+B;gBACnCC,MAAMtB,WAAWyB,MAAM;gBACvBF,QAAQE;YACV;YAEA,OAAOJ;QACT;KACH,EACDd,aACAM;IAGF,qBACE,KAACT;kBACEW,OAAOI,GAAG,CAAC,CAAC,EAAEO,QAAQ,EAAEC,KAAK,EAAE,EAAEC;YAChC,qBACE,KAAClC;gBAAmBiC,OAAOA;0BACxBD,SAASP,GAAG,CAAC,CAAC,EAAEG,IAAI,EAAEC,MAAM,EAAE,EAAEM;oBAC/B,IAAIC;oBACJ,IAAIC;oBACJ,IAAIC;oBAEJ,IAAIV,SAAStB,WAAWoB,UAAU,EAAE;wBAClCW,OAAO,CAAC,EAAEnB,MAAM,aAAa,EAAEW,OAAON,IAAI,CAAC,CAAC;wBAC5Ca,cAActC,eAAe+B,OAAOU,MAAM,CAACC,MAAM,EAAErB;wBACnDmB,KAAK,CAAC,IAAI,EAAET,OAAON,IAAI,CAAC,CAAC;oBAC3B;oBAEA,IAAIK,SAAStB,WAAWyB,MAAM,EAAE;wBAC9BM,OAAO,CAAC,EAAEnB,MAAM,SAAS,EAAEW,OAAON,IAAI,CAAC,CAAC;wBACxCa,cAActC,eAAe+B,OAAOI,KAAK,EAAEd;wBAC3CmB,KAAK,CAAC,WAAW,EAAET,OAAON,IAAI,CAAC,CAAC;oBAClC;oBAEA,MAAMkB,OAAQjC,gBAAgBkC,OAAO,IACnClC;oBAEF,MAAMmC,cAAcF,QAAQ;oBAE5B,qBACE,MAACE;wBACCC,WAAW,CAAC,EAAEjC,UAAU,MAAM,CAAC;wBAC/B0B,MAAMA;wBACNC,IAAIA;wBAEJO,UAAU,CAACzB,UAAU,CAAC,IAAI0B;;0CAE1B,KAACC;gCAAKH,WAAW,CAAC,EAAEjC,UAAU,WAAW,CAAC;0CACxC,cAAA,KAACZ;oCAAYiD,WAAU;;;0CAEzB,KAACD;gCAAKH,WAAW,CAAC,EAAEjC,UAAU,YAAY,CAAC;0CAAGyB;;;uBANzCD;gBASX;eArCaD;QAwCnB;;AAGN,EAAC"}
+{"version":3,"sources":["../../../src/elements/Nav/index.client.tsx"],"sourcesContent":["'use client'\n\nimport type { EntityToGroup } from '@payloadcms/ui/shared'\n\nimport { getTranslation } from '@payloadcms/translations'\nimport {\n  ChevronIcon,\n  NavGroup,\n  useAuth,\n  useConfig,\n  useEntityVisibility,\n  useNav,\n  useTranslation,\n} from '@payloadcms/ui'\nimport { EntityType, formatAdminURL, groupNavItems } from '@payloadcms/ui/shared'\nimport LinkWithDefault from 'next/link.js'\nimport { usePathname } from 'next/navigation.js'\nimport React, { Fragment } from 'react'\n\nconst baseClass = 'nav'\n\nexport const DefaultNavClient: React.FC = () => {\n  const { permissions } = useAuth()\n  const { isEntityVisible } = useEntityVisibility()\n  const pathname = usePathname()\n\n  const {\n    config: {\n      collections,\n      globals,\n      routes: { admin: adminRoute },\n    },\n  } = useConfig()\n\n  const { i18n } = useTranslation()\n  const { navOpen } = useNav()\n\n  const groups = groupNavItems(\n    [\n      ...collections\n        .filter(({ slug }) => isEntityVisible({ collectionSlug: slug }))\n        .map((collection) => {\n          const entityToGroup: EntityToGroup = {\n            type: EntityType.collection,\n            entity: collection,\n          }\n\n          return entityToGroup\n        }),\n      ...globals\n        .filter(({ slug }) => isEntityVisible({ globalSlug: slug }))\n        .map((global) => {\n          const entityToGroup: EntityToGroup = {\n            type: EntityType.global,\n            entity: global,\n          }\n\n          return entityToGroup\n        }),\n    ],\n    permissions,\n    i18n,\n  )\n\n  return (\n    <Fragment>\n      {groups.map(({ entities, label }, key) => {\n        return (\n          <NavGroup key={key} label={label}>\n            {entities.map(({ type, entity }, i) => {\n              let entityLabel: string\n              let href: string\n              let id: string\n\n              if (type === EntityType.collection) {\n                href = formatAdminURL({ adminRoute, path: `/collections/${entity.slug}` })\n                entityLabel = getTranslation(entity.labels.plural, i18n)\n                id = `nav-${entity.slug}`\n              }\n\n              if (type === EntityType.global) {\n                href = formatAdminURL({ adminRoute, path: `/globals/${entity.slug}` })\n                entityLabel = getTranslation(entity.label, i18n)\n                id = `nav-global-${entity.slug}`\n              }\n\n              const Link = (LinkWithDefault.default ||\n                LinkWithDefault) as typeof LinkWithDefault.default\n\n              const LinkElement = Link || 'a'\n              const activeCollection = pathname.endsWith(href)\n\n              return (\n                <LinkElement\n                  className={[`${baseClass}__link`, activeCollection && `active`]\n                    .filter(Boolean)\n                    .join(' ')}\n                  href={href}\n                  id={id}\n                  key={i}\n                  tabIndex={!navOpen ? -1 : undefined}\n                >\n                  {activeCollection && <div className={`${baseClass}__link-indicator`} />}\n                  <span className={`${baseClass}__link-label`}>{entityLabel}</span>\n                </LinkElement>\n              )\n            })}\n          </NavGroup>\n        )\n      })}\n    </Fragment>\n  )\n}\n"],"names":["getTranslation","NavGroup","useAuth","useConfig","useEntityVisibility","useNav","useTranslation","EntityType","formatAdminURL","groupNavItems","LinkWithDefault","usePathname","React","Fragment","baseClass","DefaultNavClient","permissions","isEntityVisible","pathname","config","collections","globals","routes","admin","adminRoute","i18n","navOpen","groups","filter","slug","collectionSlug","map","collection","entityToGroup","type","entity","globalSlug","global","entities","label","key","i","entityLabel","href","id","path","labels","plural","Link","default","LinkElement","activeCollection","endsWith","className","Boolean","join","tabIndex","undefined","div","span"],"mappings":"AAAA;;AAIA,SAASA,cAAc,QAAQ,2BAA0B;AACzD,SAEEC,QAAQ,EACRC,OAAO,EACPC,SAAS,EACTC,mBAAmB,EACnBC,MAAM,EACNC,cAAc,QACT,iBAAgB;AACvB,SAASC,UAAU,EAAEC,cAAc,EAAEC,aAAa,QAAQ,wBAAuB;AACjF,OAAOC,qBAAqB,eAAc;AAC1C,SAASC,WAAW,QAAQ,qBAAoB;AAChD,OAAOC,SAASC,QAAQ,QAAQ,QAAO;AAEvC,MAAMC,YAAY;AAElB,OAAO,MAAMC,mBAA6B;IACxC,MAAM,EAAEC,WAAW,EAAE,GAAGd;IACxB,MAAM,EAAEe,eAAe,EAAE,GAAGb;IAC5B,MAAMc,WAAWP;IAEjB,MAAM,EACJQ,QAAQ,EACNC,WAAW,EACXC,OAAO,EACPC,QAAQ,EAAEC,OAAOC,UAAU,EAAE,EAC9B,EACF,GAAGrB;IAEJ,MAAM,EAAEsB,IAAI,EAAE,GAAGnB;IACjB,MAAM,EAAEoB,OAAO,EAAE,GAAGrB;IAEpB,MAAMsB,SAASlB,cACb;WACKW,YACAQ,MAAM,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKZ,gBAAgB;gBAAEa,gBAAgBD;YAAK,IAC5DE,GAAG,CAAC,CAACC;YACJ,MAAMC,gBAA+B;gBACnCC,MAAM3B,WAAWyB,UAAU;gBAC3BG,QAAQH;YACV;YAEA,OAAOC;QACT;WACCZ,QACAO,MAAM,CAAC,CAAC,EAAEC,IAAI,EAAE,GAAKZ,gBAAgB;gBAAEmB,YAAYP;YAAK,IACxDE,GAAG,CAAC,CAACM;YACJ,MAAMJ,gBAA+B;gBACnCC,MAAM3B,WAAW8B,MAAM;gBACvBF,QAAQE;YACV;YAEA,OAAOJ;QACT;KACH,EACDjB,aACAS;IAGF,qBACE,KAACZ;kBACEc,OAAOI,GAAG,CAAC,CAAC,EAAEO,QAAQ,EAAEC,KAAK,EAAE,EAAEC;YAChC,qBACE,KAACvC;gBAAmBsC,OAAOA;0BACxBD,SAASP,GAAG,CAAC,CAAC,EAAEG,IAAI,EAAEC,MAAM,EAAE,EAAEM;oBAC/B,IAAIC;oBACJ,IAAIC;oBACJ,IAAIC;oBAEJ,IAAIV,SAAS3B,WAAWyB,UAAU,EAAE;wBAClCW,OAAOnC,eAAe;4BAAEgB;4BAAYqB,MAAM,CAAC,aAAa,EAAEV,OAAON,IAAI,CAAC,CAAC;wBAAC;wBACxEa,cAAc1C,eAAemC,OAAOW,MAAM,CAACC,MAAM,EAAEtB;wBACnDmB,KAAK,CAAC,IAAI,EAAET,OAAON,IAAI,CAAC,CAAC;oBAC3B;oBAEA,IAAIK,SAAS3B,WAAW8B,MAAM,EAAE;wBAC9BM,OAAOnC,eAAe;4BAAEgB;4BAAYqB,MAAM,CAAC,SAAS,EAAEV,OAAON,IAAI,CAAC,CAAC;wBAAC;wBACpEa,cAAc1C,eAAemC,OAAOI,KAAK,EAAEd;wBAC3CmB,KAAK,CAAC,WAAW,EAAET,OAAON,IAAI,CAAC,CAAC;oBAClC;oBAEA,MAAMmB,OAAQtC,gBAAgBuC,OAAO,IACnCvC;oBAEF,MAAMwC,cAAcF,QAAQ;oBAC5B,MAAMG,mBAAmBjC,SAASkC,QAAQ,CAACT;oBAE3C,qBACE,MAACO;wBACCG,WAAW;4BAAC,CAAC,EAAEvC,UAAU,MAAM,CAAC;4BAAEqC,oBAAoB,CAAC,MAAM,CAAC;yBAAC,CAC5DvB,MAAM,CAAC0B,SACPC,IAAI,CAAC;wBACRZ,MAAMA;wBACNC,IAAIA;wBAEJY,UAAU,CAAC9B,UAAU,CAAC,IAAI+B;;4BAEzBN,kCAAoB,KAACO;gCAAIL,WAAW,CAAC,EAAEvC,UAAU,gBAAgB,CAAC;;0CACnE,KAAC6C;gCAAKN,WAAW,CAAC,EAAEvC,UAAU,YAAY,CAAC;0CAAG4B;;;uBAJzCD;gBAOX;eAtCaD;QAyCnB;;AAGN,EAAC"}

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,WAAW,EAAE,MAAM,SAAS,CAAA;AAG1C,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,cAAc,CAAA;AAQrB,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAA;AAElC,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAkEzC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/elements/Nav/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAI1C,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,cAAc,CAAA;AAMrB,MAAM,MAAM,QAAQ,GAAG,WAAW,CAAA;AAElC,eAAO,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,QAAQ,CAwDzC,CAAA"}

package/dist/elements/Nav/index.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { Logout } from '@payloadcms/ui';
+import { RenderComponent, getCreateMappedComponent } from '@payloadcms/ui/shared';
 import React from 'react';
 import { NavHamburger } from './NavHamburger/index.js';
 import { NavWrapper } from './NavWrapper/index.js';
 const baseClass = 'nav';
-import { WithServerSideProps } from '@payloadcms/ui/shared';
 import { DefaultNavClient } from './index.client.js';
 export const DefaultNav = (props)=>{
     const { i18n, locale, params, payload, permissions, searchParams, user } = props;
@@ -12,39 +12,33 @@ export const DefaultNav = (props)=>{
         return null;
     }
     const { admin: { components: { afterNavLinks, beforeNavLinks } } } = payload.config;
-    const BeforeNavLinks = Array.isArray(beforeNavLinks) ? beforeNavLinks.map((Component, i)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
-            Component: Component,
-            serverOnlyProps: {
-                i18n,
-                locale,
-                params,
-                payload,
-                permissions,
-                searchParams,
-                user
-            }
-        }, i)) : null;
-    const AfterNavLinks = Array.isArray(afterNavLinks) ? afterNavLinks.map((Component, i)=>/*#__PURE__*/ _jsx(WithServerSideProps, {
-            Component: Component,
-            serverOnlyProps: {
-                i18n,
-                locale,
-                params,
-                payload,
-                permissions,
-                searchParams,
-                user
-            }
-        }, i)) : null;
+    const createMappedComponent = getCreateMappedComponent({
+        importMap: payload.importMap,
+        serverProps: {
+            i18n,
+            locale,
+            params,
+            payload,
+            permissions,
+            searchParams,
+            user
+        }
+    });
+    const mappedBeforeNavLinks = createMappedComponent(beforeNavLinks, undefined, undefined, 'beforeNavLinks');
+    const mappedAfterNavLinks = createMappedComponent(afterNavLinks, undefined, undefined, 'afterNavLinks');
     return /*#__PURE__*/ _jsxs(NavWrapper, {
         baseClass: baseClass,
         children: [
             /*#__PURE__*/ _jsxs("nav", {
                 className: `${baseClass}__wrap`,
                 children: [
-                    Array.isArray(BeforeNavLinks) && BeforeNavLinks.map((Component)=>Component),
+                    /*#__PURE__*/ _jsx(RenderComponent, {
+                        mappedComponent: mappedBeforeNavLinks
+                    }),
                     /*#__PURE__*/ _jsx(DefaultNavClient, {}),
-                    Array.isArray(AfterNavLinks) && AfterNavLinks.map((Component)=>Component),
+                    /*#__PURE__*/ _jsx(RenderComponent, {
+                        mappedComponent: mappedAfterNavLinks
+                    }),
                     /*#__PURE__*/ _jsx("div", {
                         className: `${baseClass}__controls`,
                         children: /*#__PURE__*/ _jsx(Logout, {})

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/elements/Nav/index.tsx"],"sourcesContent":["import type { ServerProps } from 'payload'\n\nimport { Logout } from '@payloadcms/ui'\nimport React from 'react'\n\nimport { NavHamburger } from './NavHamburger/index.js'\nimport { NavWrapper } from './NavWrapper/index.js'\nimport './index.scss'\n\nconst baseClass = 'nav'\n\nimport { WithServerSideProps } from '@payloadcms/ui/shared'\n\nimport { DefaultNavClient } from './index.client.js'\n\nexport type NavProps = ServerProps\n\nexport const DefaultNav: React.FC<NavProps> = (props) => {\n  const { i18n, locale, params, payload, permissions, searchParams, user } = props\n\n  if (!payload?.config) {\n    return null\n  }\n\n  const {\n    admin: {\n      components: { afterNavLinks, beforeNavLinks },\n    },\n  } = payload.config\n\n  const BeforeNavLinks = Array.isArray(beforeNavLinks)\n    ? beforeNavLinks.map((Component, i) => (\n        <WithServerSideProps\n          Component={Component}\n          key={i}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      ))\n    : null\n\n  const AfterNavLinks = Array.isArray(afterNavLinks)\n    ? afterNavLinks.map((Component, i) => (\n        <WithServerSideProps\n          Component={Component}\n          key={i}\n          serverOnlyProps={{\n            i18n,\n            locale,\n            params,\n            payload,\n            permissions,\n            searchParams,\n            user,\n          }}\n        />\n      ))\n    : null\n\n  return (\n    <NavWrapper baseClass={baseClass}>\n      <nav className={`${baseClass}__wrap`}>\n        {Array.isArray(BeforeNavLinks) && BeforeNavLinks.map((Component) => Component)}\n        <DefaultNavClient />\n        {Array.isArray(AfterNavLinks) && AfterNavLinks.map((Component) => Component)}\n        <div className={`${baseClass}__controls`}>\n          <Logout />\n        </div>\n      </nav>\n      <div className={`${baseClass}__header`}>\n        <div className={`${baseClass}__header-content`}>\n          <NavHamburger baseClass={baseClass} />\n        </div>\n      </div>\n    </NavWrapper>\n  )\n}\n"],"names":["Logout","React","NavHamburger","NavWrapper","baseClass","WithServerSideProps","DefaultNavClient","DefaultNav","props","i18n","locale","params","payload","permissions","searchParams","user","config","admin","components","afterNavLinks","beforeNavLinks","BeforeNavLinks","Array","isArray","map","Component","i","serverOnlyProps","AfterNavLinks","nav","className","div"],"mappings":";AAEA,SAASA,MAAM,QAAQ,iBAAgB;AACvC,OAAOC,WAAW,QAAO;AAEzB,SAASC,YAAY,QAAQ,0BAAyB;AACtD,SAASC,UAAU,QAAQ,wBAAuB;AAGlD,MAAMC,YAAY;AAElB,SAASC,mBAAmB,QAAQ,wBAAuB;AAE3D,SAASC,gBAAgB,QAAQ,oBAAmB;AAIpD,OAAO,MAAMC,aAAiC,CAACC;IAC7C,MAAM,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAEC,WAAW,EAAEC,YAAY,EAAEC,IAAI,EAAE,GAAGP;IAE3E,IAAI,CAACI,SAASI,QAAQ;QACpB,OAAO;IACT;IAEA,MAAM,EACJC,OAAO,EACLC,YAAY,EAAEC,aAAa,EAAEC,cAAc,EAAE,EAC9C,EACF,GAAGR,QAAQI,MAAM;IAElB,MAAMK,iBAAiBC,MAAMC,OAAO,CAACH,kBACjCA,eAAeI,GAAG,CAAC,CAACC,WAAWC,kBAC7B,KAACrB;YACCoB,WAAWA;YAEXE,iBAAiB;gBACflB;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC;YACF;WATKW,MAYT;IAEJ,MAAME,gBAAgBN,MAAMC,OAAO,CAACJ,iBAChCA,cAAcK,GAAG,CAAC,CAACC,WAAWC,kBAC5B,KAACrB;YACCoB,WAAWA;YAEXE,iBAAiB;gBACflB;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC;gBACAC;YACF;WATKW,MAYT;IAEJ,qBACE,MAACvB;QAAWC,WAAWA;;0BACrB,MAACyB;gBAAIC,WAAW,CAAC,EAAE1B,UAAU,MAAM,CAAC;;oBACjCkB,MAAMC,OAAO,CAACF,mBAAmBA,eAAeG,GAAG,CAAC,CAACC,YAAcA;kCACpE,KAACnB;oBACAgB,MAAMC,OAAO,CAACK,kBAAkBA,cAAcJ,GAAG,CAAC,CAACC,YAAcA;kCAClE,KAACM;wBAAID,WAAW,CAAC,EAAE1B,UAAU,UAAU,CAAC;kCACtC,cAAA,KAACJ;;;;0BAGL,KAAC+B;gBAAID,WAAW,CAAC,EAAE1B,UAAU,QAAQ,CAAC;0BACpC,cAAA,KAAC2B;oBAAID,WAAW,CAAC,EAAE1B,UAAU,gBAAgB,CAAC;8BAC5C,cAAA,KAACF;wBAAaE,WAAWA;;;;;;AAKnC,EAAC"}
+{"version":3,"sources":["../../../src/elements/Nav/index.tsx"],"sourcesContent":["import type { ServerProps } from 'payload'\n\nimport { Logout } from '@payloadcms/ui'\nimport { RenderComponent, getCreateMappedComponent } from '@payloadcms/ui/shared'\nimport React from 'react'\n\nimport { NavHamburger } from './NavHamburger/index.js'\nimport { NavWrapper } from './NavWrapper/index.js'\nimport './index.scss'\n\nconst baseClass = 'nav'\n\nimport { DefaultNavClient } from './index.client.js'\n\nexport type NavProps = ServerProps\n\nexport const DefaultNav: React.FC<NavProps> = (props) => {\n  const { i18n, locale, params, payload, permissions, searchParams, user } = props\n\n  if (!payload?.config) {\n    return null\n  }\n\n  const {\n    admin: {\n      components: { afterNavLinks, beforeNavLinks },\n    },\n  } = payload.config\n\n  const createMappedComponent = getCreateMappedComponent({\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 mappedBeforeNavLinks = createMappedComponent(\n    beforeNavLinks,\n    undefined,\n    undefined,\n    'beforeNavLinks',\n  )\n  const mappedAfterNavLinks = createMappedComponent(\n    afterNavLinks,\n    undefined,\n    undefined,\n    'afterNavLinks',\n  )\n\n  return (\n    <NavWrapper baseClass={baseClass}>\n      <nav className={`${baseClass}__wrap`}>\n        <RenderComponent mappedComponent={mappedBeforeNavLinks} />\n        <DefaultNavClient />\n        <RenderComponent mappedComponent={mappedAfterNavLinks} />\n        <div className={`${baseClass}__controls`}>\n          <Logout />\n        </div>\n      </nav>\n      <div className={`${baseClass}__header`}>\n        <div className={`${baseClass}__header-content`}>\n          <NavHamburger baseClass={baseClass} />\n        </div>\n      </div>\n    </NavWrapper>\n  )\n}\n"],"names":["Logout","RenderComponent","getCreateMappedComponent","React","NavHamburger","NavWrapper","baseClass","DefaultNavClient","DefaultNav","props","i18n","locale","params","payload","permissions","searchParams","user","config","admin","components","afterNavLinks","beforeNavLinks","createMappedComponent","importMap","serverProps","mappedBeforeNavLinks","undefined","mappedAfterNavLinks","nav","className","mappedComponent","div"],"mappings":";AAEA,SAASA,MAAM,QAAQ,iBAAgB;AACvC,SAASC,eAAe,EAAEC,wBAAwB,QAAQ,wBAAuB;AACjF,OAAOC,WAAW,QAAO;AAEzB,SAASC,YAAY,QAAQ,0BAAyB;AACtD,SAASC,UAAU,QAAQ,wBAAuB;AAGlD,MAAMC,YAAY;AAElB,SAASC,gBAAgB,QAAQ,oBAAmB;AAIpD,OAAO,MAAMC,aAAiC,CAACC;IAC7C,MAAM,EAAEC,IAAI,EAAEC,MAAM,EAAEC,MAAM,EAAEC,OAAO,EAAEC,WAAW,EAAEC,YAAY,EAAEC,IAAI,EAAE,GAAGP;IAE3E,IAAI,CAACI,SAASI,QAAQ;QACpB,OAAO;IACT;IAEA,MAAM,EACJC,OAAO,EACLC,YAAY,EAAEC,aAAa,EAAEC,cAAc,EAAE,EAC9C,EACF,GAAGR,QAAQI,MAAM;IAElB,MAAMK,wBAAwBpB,yBAAyB;QACrDqB,WAAWV,QAAQU,SAAS;QAC5BC,aAAa;YACXd;YACAC;YACAC;YACAC;YACAC;YACAC;YACAC;QACF;IACF;IAEA,MAAMS,uBAAuBH,sBAC3BD,gBACAK,WACAA,WACA;IAEF,MAAMC,sBAAsBL,sBAC1BF,eACAM,WACAA,WACA;IAGF,qBACE,MAACrB;QAAWC,WAAWA;;0BACrB,MAACsB;gBAAIC,WAAW,CAAC,EAAEvB,UAAU,MAAM,CAAC;;kCAClC,KAACL;wBAAgB6B,iBAAiBL;;kCAClC,KAAClB;kCACD,KAACN;wBAAgB6B,iBAAiBH;;kCAClC,KAACI;wBAAIF,WAAW,CAAC,EAAEvB,UAAU,UAAU,CAAC;kCACtC,cAAA,KAACN;;;;0BAGL,KAAC+B;gBAAIF,WAAW,CAAC,EAAEvB,UAAU,QAAQ,CAAC;0BACpC,cAAA,KAACyB;oBAAIF,WAAW,CAAC,EAAEvB,UAAU,gBAAgB,CAAC;8BAC5C,cAAA,KAACF;wBAAaE,WAAWA;;;;;;AAKnC,EAAC"}

package/dist/elements/Nav/index.scss

@@ -10,6 +10,7 @@
   border-right: 1px solid var(--theme-elevation-100);
   opacity: 0;
   transition: opacity var(--nav-trans-time) ease-in-out;
+  overflow: hidden;
 
   &--nav-open {
     opacity: 1;
@@ -18,7 +19,7 @@
   &__header {
     position: absolute;
     top: 0;
-    width: 100%;
+    width: 100vw;
     height: var(--app-header-height);
   }
 
@@ -26,6 +27,7 @@
     z-index: 1;
     position: relative;
     height: 100%;
+    width: 100%;
   }
 
   &__mobile-close {
@@ -33,7 +35,7 @@
     background: none;
     border: 0;
     outline: 0;
-    padding: calc(var(--base) * 0.75) var(--gutter-h);
+    padding: base(0.8) 0;
   }
 
   &__scroll {
@@ -85,7 +87,9 @@
   nav {
     a {
       position: relative;
-      padding: base(0.125) base(1.5) base(0.125) 0;
+      padding-block: base(0.125);
+      padding-inline-start: 0;
+      padding-inline-end: base(1.5);
       display: flex;
       text-decoration: none;
 
@@ -110,19 +114,18 @@
   &__link {
     display: flex;
     align-items: center;
-
-    &.active {
-      .nav__link-icon {
-        display: block;
-      }
-    }
   }
 
-  &__link-icon {
-    display: none;
-    margin-right: calc(var(--base) * 0.25);
-    top: -1px;
-    position: relative;
+  &__link-indicator {
+    position: absolute;
+    display: block;
+    // top: 0;
+    inset-inline-start: base(-1);
+    width: 2px;
+    height: 16px;
+    border-start-end-radius: 2px;
+    border-end-end-radius: 2px;
+    background: var(--theme-text);
   }
 
   @include mid-break {