@emdash-cms/admin 0.23.0 → 0.24.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { c as fetchAuthMode, d as throwResponseError, i as fetchPlugins, l as fetchManifest, n as enablePlugin, o as API_BASE, r as fetchPlugin, s as apiFetch, t as disablePlugin, u as parseApiResponse } from "./plugins-G9Z9NQ7n.js";
-import { a as SUPPORTED_LOCALES, i as DEFAULT_LOCALE, l as resolveLocale, n as useLocale, o as SUPPORTED_LOCALE_CODES, t as LocaleDirectionProvider } from "./LocaleDirectionProvider-fOl7kU93.js";
+import { a as SUPPORTED_LOCALES, i as DEFAULT_LOCALE, l as resolveLocale, n as useLocale, o as SUPPORTED_LOCALE_CODES, s as getLocaleDir, t as LocaleDirectionProvider } from "./LocaleDirectionProvider-CK7aJ2Lb.js";
 import "./locales/index.js";
-import { Autocomplete, Badge, Button, Checkbox, ClipboardText, CommandPalette, Dialog, Input, InputArea, Label, LinkButton, Loader, Popover, Select, Sidebar as KumoSidebar, Switch, Tabs, Toast, Toasty, Tooltip, buttonVariants, useSidebar } from "@cloudflare/kumo";
+import { Autocomplete, Badge, Button, Checkbox, ClipboardText, CommandPalette, Dialog, Input, InputArea, Label, LinkButton, LinkProvider, Loader, Popover, Select, Sidebar as KumoSidebar, Switch, Tabs, Toast, Toasty, Tooltip, buttonVariants, useSidebar } from "@cloudflare/kumo";
 import { i18n } from "@lingui/core";
 import { I18nProvider, Trans, useLingui } from "@lingui/react";
 import { QueryClient, QueryClientProvider, keepPreviousData, useInfiniteQuery, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
@@ -30267,41 +30267,37 @@ function resolveNavIcon(name) {
 	return icon;
 }
 /**
-* Navigation item rendered as a TanStack Router <Link> inside kumo's
-* Sidebar.MenuItem. Styled to match kumo MenuButton appearance.
-* This approach guarantees client-side navigation works correctly.
+* Navigation item rendered with Kumo's native Sidebar.MenuButton. Kumo's
+* LinkProvider maps the href to TanStack Router for client-side navigation.
 */
 function NavMenuLink({ item, isActive }) {
 	const { state } = useSidebar();
 	const Icon = item.icon;
-	const iconClassName = cn("emdash-nav-icon size-[18px] shrink-0 transition-colors duration-200", isActive ? "text-white" : "text-white/60 group-hover/menu-button:text-white/90");
-	const link = /* @__PURE__ */ jsxs(Link$1, {
-		to: item.to,
-		params: item.params,
-		"aria-current": isActive ? "page" : void 0,
-		"data-active": isActive || void 0,
-		"data-sidebar": "menu-button",
-		className: cn("emdash-nav-link group/menu-button flex w-full min-w-0 items-center gap-2.5 rounded-md no-underline outline-none cursor-pointer", "min-h-[36px] px-3 py-1.5 text-[13px]", "transition-all duration-200 ease-out", isActive ? "bg-kumo-brand text-white" : "text-white/70 hover:text-white hover:bg-white/8", "focus-visible:ring-2 focus-visible:ring-kumo-brand/50"),
-		children: [/* @__PURE__ */ jsx(React$1.Suspense, {
-			fallback: /* @__PURE__ */ jsx(PuzzlePiece, {
-				className: iconClassName,
-				"aria-hidden": "true"
-			}),
-			children: /* @__PURE__ */ jsx(Icon, {
-				className: iconClassName,
-				"aria-hidden": "true"
-			})
-		}), /* @__PURE__ */ jsxs("span", {
-			className: "emdash-nav-label flex flex-1 items-center min-w-0 text-start overflow-hidden",
-			children: [item.label, item.badge != null && item.badge > 0 && /* @__PURE__ */ jsx(KumoSidebar.MenuBadge, { children: item.badge })]
-		})]
+	function IconComponent({ className }) {
+		return /* @__PURE__ */ jsx(NavIcon, {
+			icon: Icon,
+			className
+		});
+	}
+	return /* @__PURE__ */ jsxs(KumoSidebar.MenuButton, {
+		href: resolveItemPath(item),
+		active: isActive,
+		tooltip: state === "collapsed" ? item.label : void 0,
+		icon: IconComponent,
+		children: [item.label, item.badge != null && item.badge > 0 && /* @__PURE__ */ jsx(KumoSidebar.MenuBadge, { children: item.badge })]
+	});
+}
+function NavIcon({ icon: Icon, className }) {
+	return /* @__PURE__ */ jsx(React$1.Suspense, {
+		fallback: /* @__PURE__ */ jsx(PuzzlePiece, {
+			className,
+			"aria-hidden": "true"
+		}),
+		children: /* @__PURE__ */ jsx(Icon, {
+			className,
+			"aria-hidden": "true"
+		})
 	});
-	return /* @__PURE__ */ jsx(KumoSidebar.MenuItem, { children: state === "collapsed" ? /* @__PURE__ */ jsx(Tooltip, {
-		content: item.label,
-		side: "right",
-		asChild: true,
-		children: link
-	}) : link });
 }
 /** Resolves a nav item's route path by substituting $param placeholders. */
 function resolveItemPath(item) {
@@ -30425,6 +30421,14 @@ function SidebarNav({ manifest }) {
 			icon: Database,
 			minRole: ROLE_ADMIN$2
 		},
+		{
+			...BYLINE_SCHEMA_NAV_ITEM,
+			label: _t({
+				id: "EWaYRd",
+				message: "Byline Schema"
+			}),
+			icon: FileText
+		},
 		{
 			to: "/users",
 			label: _t({
@@ -30517,103 +30521,7 @@ function SidebarNav({ manifest }) {
 			}, `${item.to}-${index}`);
 		});
 	}
-	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx("style", { dangerouslySetInnerHTML: { __html: `
-			/* Classic dark chrome — override kumo tokens within the sidebar */
-			.emdash-sidebar {
-				--color-kumo-base: #1d2327;
-				/* Kumo 2.4 paints the surface via bg-(--sidebar-bg) on an inner
-				   container, resolved from the wrapper's light --color-kumo-base. */
-				--sidebar-bg: #1d2327;
-				--color-kumo-tint: rgba(255,255,255,0.1);
-				--color-kumo-line: rgba(255,255,255,0.08);
-				--color-kumo-brand: #2271b1;
-				--text-color-kumo-default: #fff;
-				--text-color-kumo-subtle: rgba(255,255,255,0.7);
-				--text-color-kumo-strong: #fff;
-				background-color: #1d2327 !important;
-				color: #fff !important;
-				border-color: rgba(255,255,255,0.08) !important;
-			}
-			/* Group labels — uppercase muted style */
-			.emdash-sidebar [data-sidebar="group-label"] {
-				color: rgba(255,255,255,0.45) !important;
-				font-size: 11px !important;
-				text-transform: uppercase;
-				letter-spacing: 0.06em;
-				font-weight: 600;
-				padding-left: 0.75rem;
-				padding-right: 0.75rem;
-			}
-			.emdash-sidebar [data-sidebar="group-label"] svg {
-				color: rgba(255,255,255,0.3);
-			}
-			.emdash-sidebar [data-sidebar="group-label"]:hover svg {
-				color: rgba(255,255,255,0.6);
-			}
-			/* Separators */
-			.emdash-sidebar [data-sidebar="separator"] {
-				border-color: rgba(255,255,255,0.06) !important;
-				margin: 0.5rem 0.75rem;
-			}
-			/* Header/footer borders */
-			.emdash-sidebar [data-sidebar="header"] {
-				border-bottom: 1px solid rgba(255,255,255,0.08);
-			}
-			.emdash-sidebar [data-sidebar="footer"] {
-				border-top: 1px solid rgba(255,255,255,0.08);
-			}
-
-			/* Collapsed separators — thin centered line */
-			.emdash-sidebar[data-state="collapsed"] [data-sidebar="separator"] {
-				margin: 0.375rem 0.625rem;
-			}
-			/* Collapsed: tighten group spacing */
-			.emdash-sidebar[data-state="collapsed"] [data-sidebar="group"] {
-				gap: 0.125rem;
-			}
-			.emdash-sidebar[data-state="collapsed"] [data-sidebar="menu"] {
-				gap: 0.125rem;
-			}
-
-			/* Collapsed: nav links — center icon, hide text */
-			.emdash-sidebar[data-state="collapsed"] .emdash-nav-link {
-				justify-content: center;
-				padding: 0.5rem 0;
-				gap: 0;
-				min-height: 36px;
-			}
-			.emdash-sidebar[data-state="collapsed"] .emdash-nav-label {
-				display: none !important;
-			}
-			/* Collapsed: brand link */
-			.emdash-sidebar[data-state="collapsed"] .emdash-brand-link {
-				justify-content: center;
-				padding-left: 0;
-				padding-right: 0;
-			}
-			.emdash-sidebar[data-state="collapsed"] .emdash-brand-text {
-				display: none !important;
-			}
-
-			/* Mobile drawer slide animation from left (LTR) */
-			[data-starting-style]:has(> .emdash-sidebar[data-mobile="true"]),
-			[data-ending-style]:has(> .emdash-sidebar[data-mobile="true"]) {
-				transform: translateX(-100%);
-			}
-
-			/* Mobile drawer slide animation from right (RTL) */
-			[dir="rtl"] [data-starting-style]:has(> .emdash-sidebar[data-mobile="true"]),
-			[dir="rtl"] [data-ending-style]:has(> .emdash-sidebar[data-mobile="true"]) {
-				transform: translateX(100%);
-				--tw-translate-x: 100%;
-			}
-
-			/* RTL: Position drawer on right side */
-			[dir="rtl"] :has(> .emdash-sidebar[data-mobile="true"]) {
-				left: auto;
-				right: 0;
-			}
-		` } }), /* @__PURE__ */ jsxs(KumoSidebar, {
+	return /* @__PURE__ */ jsxs(KumoSidebar, {
 		className: "emdash-sidebar",
 		"aria-label": _t({
 			id: "M0SYyg",
@@ -30622,63 +30530,51 @@ function SidebarNav({ manifest }) {
 		children: [
 			/* @__PURE__ */ jsx(KumoSidebar.Header, { children: /* @__PURE__ */ jsxs(Link$1, {
 				to: "/",
-				className: "emdash-brand-link flex w-full min-w-0 items-center gap-2 px-3 py-1",
+				className: "flex w-full min-w-0 items-center gap-2 px-3 py-1 group-data-[state=collapsed]/sidebar:justify-center group-data-[state=collapsed]/sidebar:px-0",
 				children: [/* @__PURE__ */ jsx(BrandIcon, {
 					logoUrl: manifest.admin?.logo,
 					siteName: manifest.admin?.siteName,
 					className: "size-5 shrink-0",
 					"aria-hidden": "true"
 				}), /* @__PURE__ */ jsx("span", {
-					className: "emdash-brand-text font-semibold truncate",
+					className: "font-semibold truncate group-data-[state=collapsed]/sidebar:hidden",
 					children: manifest.admin?.siteName || "EmDash"
 				})]
 			}) }),
 			/* @__PURE__ */ jsxs(KumoSidebar.Content, { children: [
-				/* @__PURE__ */ jsx(KumoSidebar.Group, { children: /* @__PURE__ */ jsx(KumoSidebar.Menu, { children: /* @__PURE__ */ jsx(NavMenuLink, {
-					item: {
-						to: "/",
-						label: _t({
-							id: "7p5kLi",
-							message: "Dashboard"
-						}),
-						icon: SquaresFour
-					},
-					isActive: isItemActive("/", currentPath)
-				}) }) }),
-				/* @__PURE__ */ jsx(KumoSidebar.Separator, {}),
-				visibleContent.length > 1 && /* @__PURE__ */ jsxs(KumoSidebar.Group, { children: [/* @__PURE__ */ jsx(KumoSidebar.GroupLabel, {
-					className: "[&>span]:text-start [&_svg]:rtl:-scale-x-100 [&_svg]:rtl:-scale-y-100",
-					children: _t({
-						id: "4b3oEV",
-						message: "Content"
-					})
-				}), /* @__PURE__ */ jsx(KumoSidebar.Menu, { children: renderNavItems(visibleContent.filter((i) => i.to !== "/")) })] }),
-				/* @__PURE__ */ jsx(KumoSidebar.Separator, {}),
-				visibleManage.length > 0 && /* @__PURE__ */ jsxs(KumoSidebar.Group, { children: [/* @__PURE__ */ jsx(KumoSidebar.GroupLabel, {
-					className: "[&>span]:text-start [&_svg]:rtl:-scale-x-100 [&_svg]:rtl:-scale-y-100",
-					children: _t({
-						id: "wckWOP",
-						message: "Manage"
-					})
-				}), /* @__PURE__ */ jsx(KumoSidebar.Menu, { children: renderNavItems(visibleManage) })] }),
-				/* @__PURE__ */ jsx(KumoSidebar.Separator, {}),
-				visibleAdmin.length > 0 && /* @__PURE__ */ jsxs(KumoSidebar.Group, { children: [/* @__PURE__ */ jsx(KumoSidebar.GroupLabel, {
-					className: "[&>span]:text-start [&_svg]:rtl:-scale-x-100 [&_svg]:rtl:-scale-y-100",
-					children: _t({
-						id: "U3pytU",
-						message: "Admin"
-					})
-				}), /* @__PURE__ */ jsx(KumoSidebar.Menu, { children: renderNavItems(visibleAdmin) })] }),
-				visiblePlugins.length > 0 && /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(KumoSidebar.Separator, {}), /* @__PURE__ */ jsxs(KumoSidebar.Group, { children: [/* @__PURE__ */ jsx(KumoSidebar.GroupLabel, {
-					className: "[&>span]:text-start [&_svg]:rtl:-scale-x-100 [&_svg]:rtl:-scale-y-100",
-					children: _t({
-						id: "ohUJJM",
-						message: "Plugins"
-					})
-				}), /* @__PURE__ */ jsx(KumoSidebar.Menu, { children: renderNavItems(visiblePlugins) })] })] })
+				/* @__PURE__ */ jsx(KumoSidebar.Group, {
+					className: "mt-2 md:mt-1.5",
+					children: /* @__PURE__ */ jsx(KumoSidebar.Menu, { children: /* @__PURE__ */ jsx(NavMenuLink, {
+						item: {
+							to: "/",
+							label: _t({
+								id: "7p5kLi",
+								message: "Dashboard"
+							}),
+							icon: SquaresFour
+						},
+						isActive: isItemActive("/", currentPath)
+					}) })
+				}),
+				visibleContent.length > 1 && /* @__PURE__ */ jsxs(KumoSidebar.Group, { children: [/* @__PURE__ */ jsx(KumoSidebar.GroupLabel, { children: _t({
+					id: "4b3oEV",
+					message: "Content"
+				}) }), /* @__PURE__ */ jsx(KumoSidebar.Menu, { children: renderNavItems(visibleContent.filter((i) => i.to !== "/")) })] }),
+				visibleManage.length > 0 && /* @__PURE__ */ jsxs(KumoSidebar.Group, { children: [/* @__PURE__ */ jsx(KumoSidebar.GroupLabel, { children: _t({
+					id: "wckWOP",
+					message: "Manage"
+				}) }), /* @__PURE__ */ jsx(KumoSidebar.Menu, { children: renderNavItems(visibleManage) })] }),
+				visibleAdmin.length > 0 && /* @__PURE__ */ jsxs(KumoSidebar.Group, { children: [/* @__PURE__ */ jsx(KumoSidebar.GroupLabel, { children: _t({
+					id: "U3pytU",
+					message: "Admin"
+				}) }), /* @__PURE__ */ jsx(KumoSidebar.Menu, { children: renderNavItems(visibleAdmin) })] }),
+				visiblePlugins.length > 0 && /* @__PURE__ */ jsxs(KumoSidebar.Group, { children: [/* @__PURE__ */ jsx(KumoSidebar.GroupLabel, { children: _t({
+					id: "ohUJJM",
+					message: "Plugins"
+				}) }), /* @__PURE__ */ jsx(KumoSidebar.Menu, { children: renderNavItems(visiblePlugins) })] })
 			] }),
 			/* @__PURE__ */ jsx(KumoSidebar.Footer, { children: /* @__PURE__ */ jsxs("p", {
-				className: "emdash-nav-label px-3 py-2 text-[11px] text-white/30",
+				className: "px-3 py-2 text-[11px] text-kumo-subtle group-data-[state=collapsed]/sidebar:hidden",
 				children: [
 					manifest.admin?.siteName || "EmDash CMS",
 					" v",
@@ -30687,7 +30583,7 @@ function SidebarNav({ manifest }) {
 				]
 			}) })
 		]
-	})] });
+	});
 }
 
 //#endregion
@@ -30773,7 +30669,7 @@ function Header() {
 	});
 	const initials = ((user?.name || user?.email || "U")[0] ?? "U").toUpperCase();
 	return /* @__PURE__ */ jsxs("header", {
-		className: "sticky top-0 z-10 flex h-16 items-center justify-between border-b bg-kumo-base px-4",
+		className: "sticky top-0 z-10 flex h-[58px] items-center justify-between border-b bg-kumo-elevated px-4",
 		children: [/* @__PURE__ */ jsx(KumoSidebar.Trigger, { className: "cursor-pointer rtl:rotate-180" }), /* @__PURE__ */ jsxs("div", {
 			className: "flex items-center gap-2",
 			children: [
@@ -31073,16 +30969,19 @@ function WelcomeModal({ open, onClose, userName, userRole }) {
 function Shell({ children, manifest }) {
 	const [welcomeModalOpen, setWelcomeModalOpen] = React$1.useState(false);
 	const { data: user } = useCurrentUser();
+	const { locale } = useLocale();
+	const sidebarSide = getLocaleDir(locale) === "rtl" ? "right" : "left";
 	React$1.useEffect(() => {
 		if (user?.isFirstLogin) setWelcomeModalOpen(true);
 	}, [user?.isFirstLogin]);
 	return /* @__PURE__ */ jsxs(KumoSidebar.Provider, {
 		defaultOpen: true,
+		side: sidebarSide,
 		style: {
+			"--sidebar-bg": "var(--color-kumo-elevated)",
 			height: "100svh",
 			minHeight: "0",
-			overflow: "hidden",
-			"--sidebar-width-icon": "53px"
+			overflow: "hidden"
 		},
 		children: [
 			/* @__PURE__ */ jsx(SidebarNav, { manifest }),
@@ -39926,8 +39825,7 @@ function ContentEditPage() {
 			queryClient.invalidateQueries({ queryKey: [
 				"content",
 				collection,
-				id,
-				{ locale: rawItem?.locale ?? activeLocale }
+				id
 			] });
 			queryClient.invalidateQueries({ queryKey: [
 				"revisions",
@@ -39989,8 +39887,7 @@ function ContentEditPage() {
 			queryClient.invalidateQueries({ queryKey: [
 				"content",
 				collection,
-				id,
-				{ locale: rawItem?.locale ?? activeLocale }
+				id
 			] });
 			queryClient.invalidateQueries({ queryKey: [
 				"revisions",
@@ -40028,8 +39925,7 @@ function ContentEditPage() {
 			queryClient.invalidateQueries({ queryKey: [
 				"content",
 				collection,
-				id,
-				{ locale: rawItem?.locale ?? activeLocale }
+				id
 			] });
 			queryClient.invalidateQueries({ queryKey: [
 				"revisions",
@@ -40067,8 +39963,7 @@ function ContentEditPage() {
 			queryClient.invalidateQueries({ queryKey: [
 				"content",
 				collection,
-				id,
-				{ locale: rawItem?.locale ?? activeLocale }
+				id
 			] });
 			queryClient.invalidateQueries({ queryKey: [
 				"revisions",
@@ -40106,8 +40001,7 @@ function ContentEditPage() {
 			queryClient.invalidateQueries({ queryKey: [
 				"content",
 				collection,
-				id,
-				{ locale: rawItem?.locale ?? activeLocale }
+				id
 			] });
 			toastManager.add({
 				title: _t3({
@@ -40140,8 +40034,7 @@ function ContentEditPage() {
 			queryClient.invalidateQueries({ queryKey: [
 				"content",
 				collection,
-				id,
-				{ locale: rawItem?.locale ?? activeLocale }
+				id
 			] });
 			toastManager.add({
 				title: _t3({
@@ -41079,6 +40972,44 @@ const queryClient = new QueryClient({ defaultOptions: { queries: {
 	retry: 1
 } } });
 const router = createAdminRouter(queryClient);
+const ADMIN_BASEPATH = "/_emdash/admin";
+function normalizeAdminHref(href) {
+	if (href === ADMIN_BASEPATH) return "/";
+	if (href.startsWith(`${ADMIN_BASEPATH}/`)) return href.slice(14);
+	if (href.startsWith(`${ADMIN_BASEPATH}?`) || href.startsWith(`${ADMIN_BASEPATH}#`)) return `/${href.slice(14)}`;
+	return href;
+}
+function getAnchorHref(destination, routerDestination) {
+	if (routerDestination.startsWith("/") && !routerDestination.startsWith("//")) {
+		if (routerDestination === "/" || routerDestination.startsWith("/?") || routerDestination.startsWith("/#")) return `${ADMIN_BASEPATH}${routerDestination.slice(1)}`;
+		return `${ADMIN_BASEPATH}${routerDestination}`;
+	}
+	return destination;
+}
+const KumoRouterLink = React$1.forwardRef(({ href, to, target, download, children, ...props }, ref) => {
+	const destination = href ?? to ?? "";
+	const hasSearchOrHash = destination.includes("?") || destination.includes("#");
+	const routerDestination = normalizeAdminHref(destination);
+	const shouldUseAnchor = !(routerDestination.startsWith("/") && !routerDestination.startsWith("//")) || hasSearchOrHash || target || download != null;
+	const linkProps = props;
+	const ariaCurrent = linkProps["aria-current"] ?? (linkProps["data-active"] ? "page" : void 0);
+	if (shouldUseAnchor) return /* @__PURE__ */ jsx("a", {
+		ref,
+		href: hasSearchOrHash && !target && download == null ? getAnchorHref(destination, routerDestination) : destination,
+		target,
+		download,
+		...props,
+		children
+	});
+	return /* @__PURE__ */ jsx(Link$1, {
+		...props,
+		ref,
+		to: routerDestination,
+		"aria-current": ariaCurrent,
+		children
+	});
+});
+KumoRouterLink.displayName = "KumoRouterLink";
 /**
 * Main Admin Application
 */
@@ -41104,7 +41035,10 @@ function AdminApp({ pluginAdmins = EMPTY_PLUGINS, authProviders = EMPTY_AUTH_PRO
 				pluginAdmins,
 				children: /* @__PURE__ */ jsx(QueryClientProvider, {
 					client: queryClient,
-					children: /* @__PURE__ */ jsx(RouterProvider, { router })
+					children: /* @__PURE__ */ jsx(LinkProvider, {
+						component: KumoRouterLink,
+						children: /* @__PURE__ */ jsx(RouterProvider, { router })
+					})
 				})
 			})
 		}) }) })