@bison-lab/payload-core 3.19.0 → 3.20.0

package/README.md

@@ -347,9 +347,10 @@ the document so the sidebar can paint. Save writes immediately.
 `adminNav()` sets `admin.components.Nav` to the package Nav. A consuming
 site must not write a Nav component. An empty document falls back to
 Payload's first-seen walk (collections, then globals, bucketed by
-`admin.group`). `group: false` stays off the sidebar. `resolveAdminNav`
-is the layout source so a later skin (SPI-10) does not invent a second
-one.
+`admin.group`). Once the document has groups, that list is the sidebar —
+omitted collections and globals stay off it. `group: false` stays off.
+`resolveAdminNav` is the layout source so a later skin (SPI-10) does not
+invent a second one.
 
 ```ts
 import { adminNav, createAdminNav } from "@bison-lab/payload-core";
@@ -389,10 +390,15 @@ globals: [
 const { header, footer } = await getNavigation({ payload, draft });
 ```
 
+`header.items` uses `@bison-lab/payload-blocks/admin#NavItemsField` in
+place of the stock blocks UI. A site that already generates the blocks
+admin map picks it up with `payload generate:importmap`; until it does,
+the field renders as nothing. Bar behaviour (hide on scroll, viewport,
+default panel width) is not this factory.
+
 A site that already stored footer columns on the `nav` document copies
 `footer.columns` onto the new global, then drops the footer fields from
-`nav`. Bar behaviour (hide on scroll, viewport, default panel width) is
-not this factory.
+`nav`.
 
 ## No generated types
 

package/dist/admin.d.mts

@@ -195,17 +195,20 @@ declare function AdminNav({
  */
 declare function AdminNavRowLabel(): react_jsx_runtime0.JSX.Element;
 //#endregion
+//#region src/admin/admin-nav-item-row-label.d.ts
+/**
+ * Item accordion title. Shows the chosen collection or global name
+ * (Pages), or “Item” when the row is still empty.
+ */
+declare function AdminNavItemRowLabel(): react_jsx_runtime0.JSX.Element;
+//#endregion
 //#region src/admin/admin-nav-entity-field.d.ts
 /**
- * A select of collections or globals from this site's config. Type on the
- * sibling row decides which list. `group: false` stays off — those entities
- * are not on the sidebar.
+ * Payload's select of collections or globals. Subscribes to sibling Type
+ * with `useField` so the list updates when Type changes — `getDataByPath`
+ * does not re-render this field.
  */
-declare function AdminNavEntityField({
-  path
-}: {
-  path: string;
-}): react_jsx_runtime0.JSX.Element;
+declare const AdminNavEntityField: TextFieldClientComponent;
 //#endregion
-export { AdminNav, AdminNavEntityField, AdminNavRowLabel, AppearanceField, ColorField, ColorScaleField, ContrastReport, DocumentCreateNew, DocumentTitleActions, FeaturesMatrixField, FontField, GreyScaleField, HiddenSaveButton, IdentityFallback, LibraryField, LookField, PairingField, PublishChild, RoleNameField, RoleSlugField, RolesField, RolesGrantsField, RolesMatrixField, RolesRowLabel, SectionHeading, ThemeDocumentControls, ThemeSaveButton };
+export { AdminNav, AdminNavEntityField, AdminNavItemRowLabel, AdminNavRowLabel, AppearanceField, ColorField, ColorScaleField, ContrastReport, DocumentCreateNew, DocumentTitleActions, FeaturesMatrixField, FontField, GreyScaleField, HiddenSaveButton, IdentityFallback, LibraryField, LookField, PairingField, PublishChild, RoleNameField, RoleSlugField, RolesField, RolesGrantsField, RolesMatrixField, RolesRowLabel, SectionHeading, ThemeDocumentControls, ThemeSaveButton };
 //# sourceMappingURL=admin.d.mts.map

package/dist/admin.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"admin.d.mts","names":[],"sources":["../src/admin/color-field.tsx","../src/admin/color-scale-field.tsx","../src/admin/library-field.tsx","../src/admin/font-field.tsx","../src/admin/pairing-field.tsx","../src/admin/appearance-field.tsx","../src/admin/grey-scale-field.tsx","../src/admin/contrast-report.tsx","../src/admin/section-heading.tsx","../src/admin/publish-child.tsx","../src/admin/save-button.tsx","../src/admin/identity-fallback.tsx","../src/admin/look-field.tsx","../src/admin/roles-matrix-field.tsx","../src/admin/roles-row-label.tsx","../src/admin/role-slug-field.tsx","../src/admin/role-name-field.tsx","../src/admin/roles-field.tsx","../src/admin/roles-grants-field.tsx","../src/admin/features-matrix-field.tsx","../src/admin/document-title-actions.tsx","../src/admin/document-create-new.tsx","../src/admin-nav/types.ts","../src/admin/admin-nav.tsx","../src/admin/admin-nav-row-label.tsx","../src/admin/admin-nav-entity-field.tsx"],"mappings":";;;;;;;;;;;cAWa,UAAA,EAAY,wBAAA;;;;;;;cCsBZ,eAAA,EAAiB,yBAAA;;;;;;;;;cCNjB,YAAA,EAAc,yBAAA;;;;;;;;;cCTd,SAAA,EAAW,0BAAA;;;;;;;cCNX,YAAA,EAAc,sBAAA;;;;;;;cCCd,eAAA,EAAiB,yBAAA;;;ALF9B;;;;AAAA,cMyDa,cAAA,EAAgB,0BAAA;;;;;;;cChDhB,cAAA,EAAgB,sBAAA;;;;;;cCbhB,cAAA,EAAgB,sBAAA;;;cCgJhB,YAAA,EAAc,sBAAA;;;;;;;;iBC3IX,qBAAA,CAAA,GAAqB,kBAAA,CAAA,GAAA,CAAA,OAAA;;AVDrC;;;iBUgBgB,eAAA,CAAA,GAAe,kBAAA,CAAA,GAAA,CAAA,OAAA;;iBA0Bf,gBAAA,CAAA,GAAgB,kBAAA,CAAA,GAAA,CAAA,OAAA;;;;;;;cC7CnB,gBAAA,EAAkB,sBAAA;;;;;;;cCIlB,SAAA,EAAW,wBAAA;;;;;;;;cCqBX,gBAAA,EAAkB,yBAAA;;;;;;iBC1Bf,aAAA,CAAA,GAAa,kBAAA,CAAA,GAAA,CAAA,OAAA;;;;;;cCChB,aAAA,EAAe,wBAAA;;;;;;;cCCf,aAAA,EAAe,wBAAA;;;;;;;;cC8Cf,UAAA,EAAY,0BAAA;;;;;;;;cChCZ,gBAAA,EAAkB,wBAAA;;;;;;;;;AlBZ/B;;cmB0Ca,mBAAA,EAAqB,yBAAA;;;iBCjBlB,oBAAA,CAAA;EAAuB;AAAA;EAAc,QAAA,GAAW,SAAA;AAAA,IAAW,kBAAA,CAAA,GAAA,CAAA,OAAA;;;iBCtB3D,iBAAA,CAAA;EAAoB;AAAA;EAAU,IAAA;AAAA,IAAc,kBAAA,CAAA,GAAA,CAAA,OAAA;;;UCmB3C,uBAAA;EACf,WAAA;EACA,OAAA;AAAA;;;UC5Be,aAAA;EACf,eAAA,GAAkB,uBAAA;AAAA;;;;AvBGpB;;iBuBsCgB,QAAA,CAAA;EAAW;AAAA,GAAmB,aAAA,GAAa,kBAAA,CAAA,GAAA,CAAA,OAAA;;;;;;iBC5C3C,gBAAA,CAAA,GAAgB,kBAAA,CAAA,GAAA,CAAA,OAAA;;;;;;;;iBCEhB,mBAAA,CAAA;EAAsB;AAAA;EAAU,IAAA;AAAA,IAAc,kBAAA,CAAA,GAAA,CAAA,OAAA"}
+{"version":3,"file":"admin.d.mts","names":[],"sources":["../src/admin/color-field.tsx","../src/admin/color-scale-field.tsx","../src/admin/library-field.tsx","../src/admin/font-field.tsx","../src/admin/pairing-field.tsx","../src/admin/appearance-field.tsx","../src/admin/grey-scale-field.tsx","../src/admin/contrast-report.tsx","../src/admin/section-heading.tsx","../src/admin/publish-child.tsx","../src/admin/save-button.tsx","../src/admin/identity-fallback.tsx","../src/admin/look-field.tsx","../src/admin/roles-matrix-field.tsx","../src/admin/roles-row-label.tsx","../src/admin/role-slug-field.tsx","../src/admin/role-name-field.tsx","../src/admin/roles-field.tsx","../src/admin/roles-grants-field.tsx","../src/admin/features-matrix-field.tsx","../src/admin/document-title-actions.tsx","../src/admin/document-create-new.tsx","../src/admin-nav/types.ts","../src/admin/admin-nav.tsx","../src/admin/admin-nav-row-label.tsx","../src/admin/admin-nav-item-row-label.tsx","../src/admin/admin-nav-entity-field.tsx"],"mappings":";;;;;;;;;;;cAWa,UAAA,EAAY,wBAAA;;;;;;;cCsBZ,eAAA,EAAiB,yBAAA;;;;;;;;;cCNjB,YAAA,EAAc,yBAAA;;;;;;;;;cCTd,SAAA,EAAW,0BAAA;;;;;;;cCNX,YAAA,EAAc,sBAAA;;;;;;;cCCd,eAAA,EAAiB,yBAAA;;;ALF9B;;;;AAAA,cMyDa,cAAA,EAAgB,0BAAA;;;;;;;cChDhB,cAAA,EAAgB,sBAAA;;;;;;cCbhB,cAAA,EAAgB,sBAAA;;;cCgJhB,YAAA,EAAc,sBAAA;;;;;;;;iBC3IX,qBAAA,CAAA,GAAqB,kBAAA,CAAA,GAAA,CAAA,OAAA;;AVDrC;;;iBUgBgB,eAAA,CAAA,GAAe,kBAAA,CAAA,GAAA,CAAA,OAAA;;iBA0Bf,gBAAA,CAAA,GAAgB,kBAAA,CAAA,GAAA,CAAA,OAAA;;;;;;;cC7CnB,gBAAA,EAAkB,sBAAA;;;;;;;cCIlB,SAAA,EAAW,wBAAA;;;;;;;;cCqBX,gBAAA,EAAkB,yBAAA;;;;;;iBC1Bf,aAAA,CAAA,GAAa,kBAAA,CAAA,GAAA,CAAA,OAAA;;;;;;cCChB,aAAA,EAAe,wBAAA;;;;;;;cCCf,aAAA,EAAe,wBAAA;;;;;;;;cC8Cf,UAAA,EAAY,0BAAA;;;;;;;;cChCZ,gBAAA,EAAkB,wBAAA;;;;;;;;;AlBZ/B;;cmB0Ca,mBAAA,EAAqB,yBAAA;;;iBCjBlB,oBAAA,CAAA;EAAuB;AAAA;EAAc,QAAA,GAAW,SAAA;AAAA,IAAW,kBAAA,CAAA,GAAA,CAAA,OAAA;;;iBCtB3D,iBAAA,CAAA;EAAoB;AAAA;EAAU,IAAA;AAAA,IAAc,kBAAA,CAAA,GAAA,CAAA,OAAA;;;UCmB3C,uBAAA;EACf,WAAA;EACA,OAAA;AAAA;;;UC5Be,aAAA;EACf,eAAA,GAAkB,uBAAA;AAAA;;;;AvBGpB;;iBuBsCgB,QAAA,CAAA;EAAW;AAAA,GAAmB,aAAA,GAAa,kBAAA,CAAA,GAAA,CAAA,OAAA;;;;;;iBC5C3C,gBAAA,CAAA,GAAgB,kBAAA,CAAA,GAAA,CAAA,OAAA;;;;;;;iBCGhB,oBAAA,CAAA,GAAoB,kBAAA,CAAA,GAAA,CAAA,OAAA;;;;;;;;cCEvB,mBAAA,EAAqB,wBAAA"}

package/dist/admin.mjs

@@ -1,6 +1,6 @@
 "use client";
 import { a as colorDocFromState, i as SYSTEM_COLOR_KEYS, n as pageEditorLooks, r as pageEditorTokens, s as stateFromColorDoc } from "./looks-BbL309kO.mjs";
-import { ArrayField, Button, CheckboxInput, FieldDescription, FieldError, FieldLabel, Link, Logout, NavGroup, NavToggler, fieldBaseClass, useAuth, useConfig, useField, useForm, useFormFields, useNav, useRowLabel } from "@payloadcms/ui";
+import { ArrayField, Button, CheckboxInput, FieldDescription, FieldError, FieldLabel, Link, Logout, NavGroup, NavToggler, SelectField, fieldBaseClass, useAuth, useConfig, useField, useForm, useFormFields, useNav, useRowLabel } from "@payloadcms/ui";
 import { GREY_SCALES, SHADE_STEPS, contrastForeground, contrastRatio, createColorScale, deriveDarkPalette, deriveLightPalette, hexToHSL, hslToString, includedShadeSteps, isThemeHex, presetHints, setColorScaleInclude } from "@bison-lab/tokens";
 import { useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
@@ -3468,34 +3468,13 @@ function itemFromSaved(item, byKey) {
 }
 function fromDocument(doc, entities) {
 	const byKey = new Map(entities.map((entity) => [keyOf(entity.type, entity.slug), entity]));
-	const groups = (doc.groups ?? []).map((row) => ({
+	return (doc.groups ?? []).map((row) => ({
 		label: typeof row.label === "string" ? row.label : "",
 		items: (row.items ?? []).flatMap((item) => {
 			const resolved = itemFromSaved(item ?? {}, byKey);
 			return resolved ? [resolved] : [];
 		})
 	}));
-	const seen = new Set(groups.flatMap((group) => group.items.map((item) => keyOf(item.type, item.slug))));
-	for (const entity of entities) {
-		if (entity.group === false) continue;
-		const key = keyOf(entity.type, entity.slug);
-		if (seen.has(key)) continue;
-		let group = groups.find((entry) => entry.label === entity.group);
-		if (!group) {
-			group = {
-				label: entity.group,
-				items: []
-			};
-			groups.push(group);
-		}
-		group.items.push({
-			type: entity.type,
-			slug: entity.slug,
-			label: entity.label
-		});
-		seen.add(key);
-	}
-	return groups;
 }
 /**
 * Layout for the package Nav (and later SPI-10). Permissions are
@@ -3584,10 +3563,15 @@ function AdminNav({ visibleEntities }) {
 			className: `${BASE}__links`,
 			children: groups.map((group, index) => {
 				const items = group.items.map((item) => {
+					const href = item.type === "collection" ? `${adminRoute}/collections/${item.slug}` : `${adminRoute}/globals/${item.slug}`;
 					return /* @__PURE__ */ jsx(Link, {
-						href: item.type === "collection" ? `${adminRoute}/collections/${item.slug}` : `${adminRoute}/globals/${item.slug}`,
 						className: `${BASE}__link`,
-						children: item.label
+						href,
+						prefetch: false,
+						children: /* @__PURE__ */ jsx("span", {
+							className: `${BASE}__link-label`,
+							children: item.label
+						})
 					}, `${item.type}:${item.slug}`);
 				});
 				if (!group.label) return /* @__PURE__ */ jsx("div", {
@@ -3621,37 +3605,70 @@ function AdminNavRowLabel() {
 	return /* @__PURE__ */ jsx("span", { children: typeof data.label === "string" && data.label.trim() ? data.label.trim() : "Group" });
 }
 //#endregion
-//#region src/admin/admin-nav-entity-field.tsx
+//#region src/admin-nav/entity-options.ts
+function entityType(type) {
+	return type === "global" ? "global" : "collection";
+}
 /**
-* A select of collections or globals from this site's config. Type on the
-* sibling row decides which list. `group: false` stays off — those entities
-* are not on the sidebar.
+* Collections or globals a Developer may pin. Sibling Type decides which
+* list. `group: false` stays off — those entities are not on the sidebar.
 */
-function AdminNavEntityField({ path }) {
-	const { value, setValue } = useField({ path });
-	const { getDataByPath } = useForm();
-	const type = getDataByPath(path.replace(/\.slug$/, ".type"));
-	const { config } = useConfig();
-	const options = type === "global" ? (config.globals ?? []).filter((entity) => entity.admin?.group !== false).map((entity) => ({
-		value: entity.slug,
-		label: typeof entity.label === "string" ? entity.label : entity.slug
-	})) : (config.collections ?? []).filter((entity) => entity.admin?.group !== false).map((entity) => ({
+function adminNavEntityOptions(config, type) {
+	const kind = entityType(type);
+	return (kind === "global" ? config.globals ?? [] : config.collections ?? []).filter((entity) => entity.admin?.group !== false).map((entity) => ({
 		value: entity.slug,
-		label: typeof entity.labels?.plural === "string" ? entity.labels.plural : entity.slug
+		label: kind === "global" ? typeof entity.label === "string" && entity.label ? entity.label : entity.slug : typeof entity.labels?.plural === "string" && entity.labels.plural ? entity.labels.plural : entity.slug
 	}));
-	return /* @__PURE__ */ jsxs("label", { children: ["Slug", /* @__PURE__ */ jsxs("select", {
-		value: typeof value === "string" ? value : "",
-		onChange: (event) => setValue(event.target.value),
-		children: [/* @__PURE__ */ jsx("option", {
-			value: "",
-			children: "Select…"
-		}), options.map((option) => /* @__PURE__ */ jsx("option", {
-			value: option.value,
-			children: option.label
-		}, option.value))]
-	})] });
 }
+/** Array row title. Empty slug falls back to “Item”, never “Item 01”. */
+function adminNavEntityLabel(config, type, slug) {
+	if (typeof slug !== "string" || !slug) return "Item";
+	return adminNavEntityOptions(config, type).find((option) => option.value === slug)?.label ?? slug;
+}
+//#endregion
+//#region src/admin/admin-nav-item-row-label.tsx
+/**
+* Item accordion title. Shows the chosen collection or global name
+* (Pages), or “Item” when the row is still empty.
+*/
+function AdminNavItemRowLabel() {
+	const { data } = useRowLabel();
+	const { config } = useConfig();
+	return /* @__PURE__ */ jsx("span", { children: adminNavEntityLabel(config, data.type, data.slug) });
+}
+//#endregion
+//#region src/admin/admin-nav-entity-field.tsx
+/**
+* Payload's select of collections or globals. Subscribes to sibling Type
+* with `useField` so the list updates when Type changes — `getDataByPath`
+* does not re-render this field.
+*/
+const AdminNavEntityField = ({ field, path, permissions, readOnly, schemaPath }) => {
+	const { value: type } = useField({ path: path.replace(/\.slug$/, ".type") });
+	const { config } = useConfig();
+	const options = adminNavEntityOptions(config, type);
+	return /* @__PURE__ */ jsx(SelectField, {
+		field: {
+			name: field.name,
+			label: field.label,
+			required: field.required,
+			admin: {
+				...field.admin,
+				isClearable: false,
+				isSortable: false,
+				placeholder: "Select…"
+			},
+			type: "select",
+			hasMany: false,
+			options
+		},
+		path,
+		permissions,
+		readOnly,
+		schemaPath
+	});
+};
 //#endregion
-export { AdminNav, AdminNavEntityField, AdminNavRowLabel, AppearanceField, ColorField, ColorScaleField, ContrastReport, DocumentCreateNew, DocumentTitleActions, FeaturesMatrixField, FontField, GreyScaleField, HiddenSaveButton, IdentityFallback, LibraryField, LookField, PairingField, PublishChild, RoleNameField, RoleSlugField, RolesField, RolesGrantsField, RolesMatrixField, RolesRowLabel, SectionHeading, ThemeDocumentControls, ThemeSaveButton };
+export { AdminNav, AdminNavEntityField, AdminNavItemRowLabel, AdminNavRowLabel, AppearanceField, ColorField, ColorScaleField, ContrastReport, DocumentCreateNew, DocumentTitleActions, FeaturesMatrixField, FontField, GreyScaleField, HiddenSaveButton, IdentityFallback, LibraryField, LookField, PairingField, PublishChild, RoleNameField, RoleSlugField, RolesField, RolesGrantsField, RolesMatrixField, RolesRowLabel, SectionHeading, ThemeDocumentControls, ThemeSaveButton };
 
 //# sourceMappingURL=admin.mjs.map