zudoku 0.47.2 → 0.48.1

package/dist/lib/components/MobileTopNavigation.js

@@ -7,16 +7,16 @@ import { Drawer, DrawerContent, DrawerTitle, DrawerTrigger, } from "../ui/Drawer
 import { useZudoku } from "./context/ZudokuContext.js";
 import { PoweredByZudoku } from "./navigation/PoweredByZudoku.js";
 import { isHiddenItem } from "./navigation/utils.js";
+import { PageProgress } from "./PageProgress.js";
 import { Search } from "./Search.js";
 import { Slot } from "./Slot.js";
 import { ThemeSwitch } from "./ThemeSwitch.js";
-import { PageProgress, TopNavItem } from "./TopNavigation.js";
+import { TopNavItem } from "./TopNavigation.js";
 export const MobileTopNavigation = () => {
-    const { topNavigation, options } = useZudoku();
+    const { navigation, options } = useZudoku();
     const { isAuthenticated } = useAuth();
     const [drawerOpen, setDrawerOpen] = useState(false);
-    return (_jsxs(Drawer, { direction: options.page?.dir === "rtl" ? "left" : "right", open: drawerOpen, onOpenChange: (open) => setDrawerOpen(open), children: [_jsxs("div", { className: "flex lg:hidden justify-self-end", children: [_jsx(DrawerTrigger, { className: "lg:hidden", children: _jsx(MenuIcon, { size: 22 }) }), _jsx(PageProgress, {})] }), _jsx(DrawerContent, { className: "lg:hidden h-[100dvh] end-0 start-auto w-[320px] rounded-none", "aria-describedby": undefined, children: _jsxs("div", { className: "p-4 overflow-y-auto overscroll-none h-full flex flex-col justify-between", children: [_jsxs("div", { children: [_jsx(VisuallyHidden, { children: _jsx(DrawerTitle, { children: "Navigation" }) }), _jsx(Search, { className: "flex p-4" }), _jsxs("ul", { className: "flex flex-col items-center gap-4 p-4", children: [_jsx("li", { className: "empty:hidden", children: _jsx(Slot.Target, { name: "top-navigation-side" }) }), _jsx("li", { children: _jsx(ThemeSwitch, {}) }), topNavigation
-                                            .filter(isHiddenItem(isAuthenticated))
-                                            .map((item) => (_jsx("li", { children: _jsx("button", { type: "button", onClick: () => setDrawerOpen(false), children: _jsx(TopNavItem, { ...item }) }) }, item.label)))] })] }), options.page?.showPoweredBy !== false && (_jsx(PoweredByZudoku, { className: "grow-0 justify-center gap-1" }))] }) })] }));
+    const filteredItems = navigation.filter(isHiddenItem(isAuthenticated));
+    return (_jsxs(Drawer, { direction: options.page?.dir === "rtl" ? "left" : "right", open: drawerOpen, onOpenChange: (open) => setDrawerOpen(open), children: [_jsxs("div", { className: "flex lg:hidden justify-self-end", children: [_jsx(DrawerTrigger, { className: "lg:hidden", children: _jsx(MenuIcon, { size: 22 }) }), _jsx(PageProgress, {})] }), _jsx(DrawerContent, { className: "lg:hidden h-[100dvh] end-0 start-auto w-[320px] rounded-none", "aria-describedby": undefined, children: _jsxs("div", { className: "p-4 overflow-y-auto overscroll-none h-full flex flex-col justify-between", children: [_jsxs("div", { children: [_jsx(VisuallyHidden, { children: _jsx(DrawerTitle, { children: "Navigation" }) }), _jsx(Search, { className: "flex p-4" }), _jsxs("ul", { className: "flex flex-col items-center gap-4 p-4", children: [_jsx("li", { className: "empty:hidden", children: _jsx(Slot.Target, { name: "top-navigation-side" }) }), _jsx("li", { children: _jsx(ThemeSwitch, {}) }), filteredItems.map((item) => (_jsx("li", { children: _jsx("button", { type: "button", onClick: () => setDrawerOpen(false), children: _jsx(TopNavItem, { ...item }) }) }, item.label)))] })] }), options.page?.showPoweredBy !== false && (_jsx(PoweredByZudoku, { className: "grow-0 justify-center gap-1" }))] }) })] }));
 };
 //# sourceMappingURL=MobileTopNavigation.js.map

package/dist/lib/components/MobileTopNavigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"MobileTopNavigation.js","sourceRoot":"","sources":["../../../src/lib/components/MobileTopNavigation.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EACL,MAAM,EACN,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAE9D,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC;IAC/C,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,EAAE,CAAC;IACtC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEpD,OAAO,CACL,MAAC,MAAM,IACL,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EACzD,IAAI,EAAE,UAAU,EAChB,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,aAE3C,eAAK,SAAS,EAAC,iCAAiC,aAC9C,KAAC,aAAa,IAAC,SAAS,EAAC,WAAW,YAClC,KAAC,QAAQ,IAAC,IAAI,EAAE,EAAE,GAAI,GACR,EAChB,KAAC,YAAY,KAAG,IACZ,EACN,KAAC,aAAa,IACZ,SAAS,EAAC,8DAA8D,sBACtD,SAAS,YAE3B,eAAK,SAAS,EAAC,0EAA0E,aACvF,0BACE,KAAC,cAAc,cACb,KAAC,WAAW,6BAAyB,GACtB,EACjB,KAAC,MAAM,IAAC,SAAS,EAAC,UAAU,GAAG,EAC/B,cAAI,SAAS,EAAC,sCAAsC,aAClD,aAAI,SAAS,EAAC,cAAc,YAC1B,KAAC,IAAI,CAAC,MAAM,IAAC,IAAI,EAAC,qBAAqB,GAAG,GACvC,EACL,uBACE,KAAC,WAAW,KAAG,GACZ,EACJ,aAAa;6CACX,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;6CACrC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACb,uBACE,iBAAQ,IAAI,EAAC,QAAQ,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,YACvD,KAAC,UAAU,OAAK,IAAI,GAAI,GACjB,IAHF,IAAI,CAAC,KAAK,CAId,CACN,CAAC,IACD,IACD,EACL,OAAO,CAAC,IAAI,EAAE,aAAa,KAAK,KAAK,IAAI,CACxC,KAAC,eAAe,IAAC,SAAS,EAAC,6BAA6B,GAAG,CAC5D,IACG,GACQ,IACT,CACV,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"MobileTopNavigation.js","sourceRoot":"","sources":["../../../src/lib/components/MobileTopNavigation.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACpD,OAAO,EACL,MAAM,EACN,aAAa,EACb,WAAW,EACX,aAAa,GACd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC;IAC5C,MAAM,EAAE,eAAe,EAAE,GAAG,OAAO,EAAE,CAAC;IACtC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEpD,MAAM,aAAa,GAAG,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,CAAC;IAEvE,OAAO,CACL,MAAC,MAAM,IACL,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EACzD,IAAI,EAAE,UAAU,EAChB,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,aAE3C,eAAK,SAAS,EAAC,iCAAiC,aAC9C,KAAC,aAAa,IAAC,SAAS,EAAC,WAAW,YAClC,KAAC,QAAQ,IAAC,IAAI,EAAE,EAAE,GAAI,GACR,EAChB,KAAC,YAAY,KAAG,IACZ,EACN,KAAC,aAAa,IACZ,SAAS,EAAC,8DAA8D,sBACtD,SAAS,YAE3B,eAAK,SAAS,EAAC,0EAA0E,aACvF,0BACE,KAAC,cAAc,cACb,KAAC,WAAW,6BAAyB,GACtB,EACjB,KAAC,MAAM,IAAC,SAAS,EAAC,UAAU,GAAG,EAC/B,cAAI,SAAS,EAAC,sCAAsC,aAClD,aAAI,SAAS,EAAC,cAAc,YAC1B,KAAC,IAAI,CAAC,MAAM,IAAC,IAAI,EAAC,qBAAqB,GAAG,GACvC,EACL,uBACE,KAAC,WAAW,KAAG,GACZ,EACJ,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAC3B,uBACE,iBAAQ,IAAI,EAAC,QAAQ,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,YACvD,KAAC,UAAU,OAAK,IAAI,GAAI,GACjB,IAHF,IAAI,CAAC,KAAK,CAId,CACN,CAAC,IACC,IACD,EACL,OAAO,CAAC,IAAI,EAAE,aAAa,KAAK,KAAK,IAAI,CACxC,KAAC,eAAe,IAAC,SAAS,EAAC,6BAA6B,GAAG,CAC5D,IACG,GACQ,IACT,CACV,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/components/PageProgress.d.ts

@@ -0,0 +1 @@
+export declare const PageProgress: () => import("react/jsx-runtime").JSX.Element;

package/dist/lib/components/PageProgress.js

@@ -0,0 +1,20 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useNProgress } from "@tanem/react-nprogress";
+import { useEffect, useState } from "react";
+import { useNavigation } from "react-router";
+export const PageProgress = () => {
+    const navigation = useNavigation();
+    const isNavigating = navigation.state === "loading";
+    // delay the animation to avoid flickering
+    const [isAnimating, setIsAnimating] = useState(false);
+    useEffect(() => {
+        const timer = setTimeout(() => setIsAnimating(isNavigating), 200);
+        return () => clearTimeout(timer);
+    }, [isNavigating]);
+    const { isFinished, progress } = useNProgress({ isAnimating });
+    return (_jsx("div", { className: "absolute w-0 left-0 right-0 bottom-[-1px] h-[2px] bg-primary transition-all duration-300 ease-in-out", style: {
+            opacity: isFinished ? 0 : 1,
+            width: isFinished ? 0 : `${progress * 100}%`,
+        } }));
+};
+//# sourceMappingURL=PageProgress.js.map

package/dist/lib/components/PageProgress.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"PageProgress.js","sourceRoot":"","sources":["../../../src/lib/components/PageProgress.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,UAAU,CAAC,KAAK,KAAK,SAAS,CAAC;IACpD,0CAA0C;IAC1C,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEtD,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,YAAY,CAAC,EAAE,GAAG,CAAC,CAAC;QAElE,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC;IAEnB,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;IAE/D,OAAO,CACL,cACE,SAAS,EAAC,sGAAsG,EAChH,KAAK,EAAE;YACL,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3B,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,GAAG,GAAG,GAAG;SAC7C,GACD,CACH,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/components/TopNavigation.d.ts

@@ -1,4 +1,3 @@
-import type { TopNavigationItem } from "../../config/validators/validate.js";
-export declare const PageProgress: () => import("react/jsx-runtime").JSX.Element;
+import { type NavigationItem } from "../../config/validators/NavigationSchema.js";
 export declare const TopNavigation: () => import("react/jsx-runtime").JSX.Element;
-export declare const TopNavItem: ({ id, label, default: defaultLink, }: TopNavigationItem) => import("react/jsx-runtime").JSX.Element;
+export declare const TopNavItem: (item: NavigationItem) => import("react/jsx-runtime").JSX.Element;

package/dist/lib/components/TopNavigation.js

@@ -1,60 +1,61 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useNProgress } from "@tanem/react-nprogress";
 import { cx } from "class-variance-authority";
-import { Suspense, useEffect, useState } from "react";
-import { NavLink, useNavigation } from "react-router";
+import { deepEqual } from "fast-equals";
+import { Suspense } from "react";
+import { NavLink } from "react-router";
 import { useAuth } from "../authentication/hook.js";
 import { joinUrl } from "../util/joinUrl.js";
 import { useCurrentNavigation, useZudoku } from "./context/ZudokuContext.js";
-import { isHiddenItem, traverseSidebar } from "./navigation/utils.js";
+import { isHiddenItem, traverseNavigationItem } from "./navigation/utils.js";
 import { Slot } from "./Slot.js";
-export const PageProgress = () => {
-    const navigation = useNavigation();
-    const isNavigating = navigation.state === "loading";
-    // delay the animation to avoid flickering
-    const [isAnimating, setIsAnimating] = useState(false);
-    useEffect(() => {
-        const timer = setTimeout(() => setIsAnimating(isNavigating), 100);
-        return () => clearTimeout(timer);
-    }, [isNavigating]);
-    const { isFinished, progress } = useNProgress({ isAnimating });
-    return (_jsx("div", { className: "absolute w-0 left-0 right-0 bottom-[-1px] h-[2px] bg-primary transition-all duration-300 ease-in-out", style: {
-            opacity: isFinished ? 0 : 1,
-            width: isFinished ? 0 : `${progress * 100}%`,
-        } }));
-};
 export const TopNavigation = () => {
-    const { topNavigation } = useZudoku();
+    const { navigation } = useZudoku();
     const { isAuthenticated } = useAuth();
-    const filteredItems = topNavigation.filter(isHiddenItem(isAuthenticated));
+    const filteredItems = navigation.filter(isHiddenItem(isAuthenticated));
     if (filteredItems.length === 0 || import.meta.env.MODE === "standalone") {
         return _jsx("style", { children: `:root { --top-nav-height: 0px; }` });
     }
-    return (_jsxs(Suspense, { children: [_jsxs("div", { className: "items-center justify-between px-8 h-(--top-nav-height) hidden lg:flex text-sm relative", children: [_jsx("nav", { className: "text-sm", children: _jsx("ul", { className: "flex flex-row items-center gap-8", children: filteredItems.map((item) => (_jsx("li", { children: _jsx(TopNavItem, { ...item }) }, item.id))) }) }), _jsx(Slot.Target, { name: "top-navigation-side" })] }), _jsx(PageProgress, {})] }));
+    return (_jsx(Suspense, { children: _jsxs("div", { className: "items-center justify-between px-8 h-(--top-nav-height) hidden lg:flex text-sm relative", children: [_jsx("nav", { className: "text-sm", children: _jsx("ul", { className: "flex flex-row items-center gap-8", children: filteredItems.map((item) => (_jsx("li", { children: _jsx(TopNavItem, { ...item }) }, item.label + item.type))) }) }), _jsx(Slot.Target, { name: "top-navigation-side" })] }) }));
+};
+const getPathForItem = (item) => {
+    switch (item.type) {
+        case "doc":
+            return joinUrl(item.path);
+        case "link":
+            return item.to;
+        case "category": {
+            if (item.link?.path) {
+                return joinUrl(item.link.path);
+            }
+            return (traverseNavigationItem(item, (child) => {
+                if (child.type !== "category") {
+                    return getPathForItem(child);
+                }
+            }) ?? "");
+        }
+        case "custom-page":
+            return item.path;
+    }
 };
-export const TopNavItem = ({ id, label, default: defaultLink, }) => {
-    const { sidebars } = useZudoku();
-    const currentSidebar = sidebars[id];
+export const TopNavItem = (item) => {
     const currentNav = useCurrentNavigation();
-    const isNavigating = Boolean(useNavigation().location);
-    const isActive = currentNav.topNavItem?.id === id && !isNavigating;
-    // TODO: This is a bit of a hack to get the first link in the sidebar
-    // We should really process this when we load the config so we can validate
-    // that the sidebar is actually set. In this case we just fall back to linking
-    // to the id if we can't resolve a sidebar.
-    const first = defaultLink ??
-        (currentSidebar
-            ? traverseSidebar(currentSidebar, (item) => {
-                if (item.type === "doc")
-                    return joinUrl(item.id);
-            })
-            : joinUrl(id)) ??
-        joinUrl(id);
+    const isActiveTopNavItem = deepEqual(currentNav.topNavItem, item);
+    const path = getPathForItem(item);
     return (
-    // We don't use isActive here because it has to be inside the sidebar,
-    // the top nav id doesn't necessarily start with the sidebar id
-    _jsx(NavLink, { className: ({ isPending }) => cx("block lg:py-3.5 font-medium -mb-px", isActive || isPending
-            ? "border-primary text-foreground"
-            : "border-transparent text-foreground/75 hover:text-foreground hover:border-accent-foreground/25"), to: first, children: label }));
+    // We don't use isActive here because it has to be inside the navigation,
+    // the top nav id doesn't necessarily start with the navigation id
+    _jsxs(NavLink, { viewTransition: true, to: path, className: ({ isActive: isActiveNavLink, isPending }) => {
+            const isActive = isActiveNavLink || isActiveTopNavItem;
+            return cx("flex items-center gap-2 lg:py-3.5 font-medium -mb-px transition duration-150 delay-75 relative", isActive || isPending
+                ? [
+                    "text-foreground",
+                    // underline with view transition animation
+                    "after:content-[''] after:absolute after:bottom-0 after:left-0 after:right-0",
+                    "after:h-0.5 after:bg-primary",
+                    isActive && "after:[view-transition-name:top-nav-underline]",
+                    isPending && "after:bg-primary/25",
+                ]
+                : "text-foreground/75 hover:text-foreground");
+        }, children: [item.icon && _jsx(item.icon, { size: 16, className: "align-[-0.125em]" }), item.label] }));
 };
 //# sourceMappingURL=TopNavigation.js.map

package/dist/lib/components/TopNavigation.js.map

@@ -1 +1 @@
-{"version":3,"file":"TopNavigation.js","sourceRoot":"","sources":["../../../src/lib/components/TopNavigation.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"TopNavigation.js","sourceRoot":"","sources":["../../../src/lib/components/TopNavigation.tsx"],"names":[],"mappings":"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"}

package/dist/lib/components/context/ZudokuContext.d.ts

@@ -1,13 +1,9 @@
+import { type NavigationItem } from "../../../config/validators/NavigationSchema.js";
 import type { ZudokuContext } from "../../core/ZudokuContext.js";
 export declare const ZudokuReactContext: import("react").Context<ZudokuContext | undefined>;
 export declare const useZudoku: () => ZudokuContext;
 export declare const useApiIdentities: () => import("@tanstack/react-query").UseQueryResult<import("../../core/ZudokuContext.js").ApiIdentity[], Error>;
 export declare const useCurrentNavigation: () => {
-    sidebar: import("../../../config/validators/SidebarSchema.js").SidebarItem[];
-    topNavItem: {
-        id: string;
-        label: string;
-        default?: string | undefined;
-        display?: "auth" | "anon" | "always" | "hide" | undefined;
-    } | undefined;
+    navigation: NavigationItem[];
+    topNavItem: import("../../../config/validators/NavigationSchema.js").NavigationDoc | import("../../../config/validators/NavigationSchema.js").NavigationLink | import("../../../config/validators/NavigationSchema.js").NavigationCategory | import("../../../config/validators/NavigationSchema.js").NavigationCustomPage | undefined;
 };

package/dist/lib/components/context/ZudokuContext.js

@@ -4,7 +4,7 @@ import { matchPath, useLocation } from "react-router";
 import { useAuth } from "../../authentication/hook.js";
 import { joinUrl } from "../../util/joinUrl.js";
 import { CACHE_KEYS } from "../cache.js";
-import { traverseSidebar } from "../navigation/utils.js";
+import { traverseNavigation } from "../navigation/utils.js";
 export const ZudokuReactContext = createContext(undefined);
 export const useZudoku = () => {
     const context = useContext(ZudokuReactContext);
@@ -20,40 +20,58 @@ export const useApiIdentities = () => {
         queryKey: CACHE_KEYS.API_IDENTITIES,
     });
 };
+const getItemPath = (item) => {
+    switch (item.type) {
+        case "doc":
+            return joinUrl(item.path);
+        case "category":
+            return item.link ? joinUrl(item.link.path) : undefined;
+        case "link":
+            return item.to;
+        case "custom-page":
+            return item.path;
+        default:
+            return undefined;
+    }
+};
 export const useCurrentNavigation = () => {
-    const { getPluginSidebar, sidebars, topNavigation, options } = useZudoku();
+    const { getPluginNavigation, navigation, options } = useZudoku();
     const location = useLocation();
     const auth = useAuth();
     const isProtectedRoute = options.protectedRoutes?.some((route) => matchPath(route, location.pathname));
-    let currentSidebarItem = Object.entries(sidebars).find(([, sidebar]) => {
-        return traverseSidebar(sidebar, (item) => {
-            const itemId = item.type === "doc"
-                ? joinUrl(item.id)
-                : item.type === "category" && item.link
-                    ? joinUrl(item.link.id)
-                    : undefined;
-            if (itemId === location.pathname) {
-                return item;
-            }
-        });
+    const navItem = traverseNavigation(navigation, (item, parentCategories) => {
+        if (getItemPath(item) === location.pathname) {
+            return parentCategories.at(0) ?? item;
+        }
     });
-    const currentTopNavItem = topNavigation.find((t) => t.id === currentSidebarItem?.[0]) ??
-        topNavigation.find((item) => matchPath(item.id, location.pathname));
-    if (currentTopNavItem &&
-        !currentSidebarItem &&
-        currentTopNavItem.id in sidebars) {
-        currentSidebarItem = ["", sidebars[currentTopNavItem.id]];
-    }
     const { data } = useSuspenseQuery({
-        queryFn: () => getPluginSidebar(location.pathname),
-        queryKey: ["plugin-sidebar", location.pathname],
+        queryFn: () => getPluginNavigation(location.pathname),
+        queryKey: ["plugin-navigation", location.pathname],
     });
-    const hideSidebar = auth.isAuthEnabled && !auth.isAuthenticated && isProtectedRoute;
+    let topNavItem = navItem;
+    if (!navItem && data.length > 0) {
+        // Extract base paths from plugin navigation items
+        const pluginBasePaths = data.flatMap((item) => {
+            return getItemPath(item)?.split("?").at(0)?.split("#").at(0) ?? [];
+        });
+        // Find top-level nav item that matches any plugin base path
+        topNavItem = navigation
+            .flatMap((item) => {
+            const itemPath = getItemPath(item);
+            return itemPath ? [{ item, path: itemPath }] : [];
+        })
+            .sort((a, b) => b.path.length - a.path.length)
+            .find(({ path }) => {
+            return pluginBasePaths.some((basePath) => matchPath({ path, end: false }, basePath) ??
+                matchPath({ path: basePath, end: false }, path));
+        })?.item;
+    }
+    const hasNavigation = auth.isAuthEnabled && !auth.isAuthenticated && isProtectedRoute;
     return {
-        sidebar: hideSidebar
+        navigation: hasNavigation
             ? []
-            : [...(currentSidebarItem ? currentSidebarItem[1] : []), ...data],
-        topNavItem: currentTopNavItem,
+            : [...(navItem?.type === "category" ? navItem.items : []), ...data],
+        topNavItem,
     };
 };
 //# sourceMappingURL=ZudokuContext.js.map

package/dist/lib/components/context/ZudokuContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"ZudokuContext.js","sourceRoot":"","sources":["../../../../src/lib/components/context/ZudokuContext.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ZudokuContext.js","sourceRoot":"","sources":["../../../../src/lib/components/context/ZudokuContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEtD,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,CAC7C,SAAS,CACV,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,EAAE;IAC5B,MAAM,OAAO,GAAG,UAAU,CAAC,kBAAkB,CAAC,CAAC;IAE/C,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,EAAE,gBAAgB,EAAE,GAAG,SAAS,EAAE,CAAC;IAEzC,OAAO,QAAQ,CAAC;QACd,OAAO,EAAE,gBAAgB;QACzB,QAAQ,EAAE,UAAU,CAAC,cAAc;KACpC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAAC,IAAoB,EAAE,EAAE;IAC3C,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,KAAK;YACR,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,KAAK,UAAU;YACb,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACzD,KAAK,MAAM;YACT,OAAO,IAAI,CAAC,EAAE,CAAC;QACjB,KAAK,aAAa;YAChB,OAAO,IAAI,CAAC,IAAI,CAAC;QACnB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC,CAAC;AACF,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAG,EAAE;IACvC,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC;IACjE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IAEvB,MAAM,gBAAgB,GAAG,OAAO,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAC/D,SAAS,CAAC,KAAK,EAAE,QAAQ,CAAC,QAAQ,CAAC,CACpC,CAAC;IAEF,MAAM,OAAO,GAAG,kBAAkB,CAAC,UAAU,EAAE,CAAC,IAAI,EAAE,gBAAgB,EAAE,EAAE;QACxE,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC5C,OAAO,gBAAgB,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;QACxC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,EAAE,IAAI,EAAE,GAAG,gBAAgB,CAAC;QAChC,OAAO,EAAE,GAAG,EAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC;QACrD,QAAQ,EAAE,CAAC,mBAAmB,EAAE,QAAQ,CAAC,QAAQ,CAAC;KACnD,CAAC,CAAC;IAEH,IAAI,UAAU,GAAG,OAAO,CAAC;IACzB,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChC,kDAAkD;QAClD,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC5C,OAAO,WAAW,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,4DAA4D;QAC5D,UAAU,GAAG,UAAU;aACpB,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAChB,MAAM,QAAQ,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;YACnC,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;aAC7C,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE;YACjB,OAAO,eAAe,CAAC,IAAI,CACzB,CAAC,QAAQ,EAAE,EAAE,CACX,SAAS,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,QAAQ,CAAC;gBACzC,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,IAAI,CAAC,CAClD,CAAC;QACJ,CAAC,CAAC,EAAE,IAAI,CAAC;IACb,CAAC;IAED,MAAM,aAAa,GACjB,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,eAAe,IAAI,gBAAgB,CAAC;IAElE,OAAO;QACL,UAAU,EAAE,aAAa;YACvB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,IAAI,CAAC;QACrE,UAAU;KACX,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/components/navigation/Navigation.d.ts

@@ -0,0 +1,5 @@
+import type { NavigationItem as NavigationItemType } from "../../../config/validators/NavigationSchema.js";
+export declare const Navigation: ({ onRequestClose, navigation, }: {
+    onRequestClose?: () => void;
+    navigation: NavigationItemType[];
+}) => import("react/jsx-runtime").JSX.Element;

package/dist/lib/components/navigation/Navigation.js

@@ -0,0 +1,12 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { VisuallyHidden } from "@radix-ui/react-visually-hidden";
+import { DrawerContent, DrawerTitle } from "../../ui/Drawer.js";
+import { Slot } from "../Slot.js";
+import { NavigationItem } from "./NavigationItem.js";
+import { NavigationWrapper } from "./NavigationWrapper.js";
+export const Navigation = ({ onRequestClose, navigation, }) => (_jsxs(_Fragment, { children: [_jsxs(NavigationWrapper, { children: [_jsx(Slot.Target, { name: "navigation-before" }), navigation.map((item) => (_jsx(NavigationItem, { item: item }, item.type +
+                    (item.label ?? "") +
+                    ("path" in item ? item.path : "") +
+                    ("file" in item ? item.file : "") +
+                    ("to" in item ? item.to : "")))), _jsx(Slot.Target, { name: "navigation-after" })] }), _jsx(DrawerContent, { className: "lg:hidden h-[100dvh] start-0 w-[320px] rounded-none", "aria-describedby": undefined, children: _jsxs("div", { className: "p-4 overflow-y-auto overscroll-none", children: [_jsx(VisuallyHidden, { children: _jsx(DrawerTitle, { children: "Navigation" }) }), navigation.map((item) => (_jsx(NavigationItem, { item: item, onRequestClose: onRequestClose }, item.label)))] }) })] }));
+//# sourceMappingURL=Navigation.js.map

package/dist/lib/components/navigation/Navigation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Navigation.js","sourceRoot":"","sources":["../../../../src/lib/components/navigation/Navigation.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEjE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,EACzB,cAAc,EACd,UAAU,GAIX,EAAE,EAAE,CAAC,CACJ,8BACE,MAAC,iBAAiB,eAChB,KAAC,IAAI,CAAC,MAAM,IAAC,IAAI,EAAC,mBAAmB,GAAG,EACvC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACxB,KAAC,cAAc,IAQb,IAAI,EAAE,IAAI,IANR,IAAI,CAAC,IAAI;oBACT,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;oBAClB,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBACjC,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;oBACjC,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAG/B,CACH,CAAC,EACF,KAAC,IAAI,CAAC,MAAM,IAAC,IAAI,EAAC,kBAAkB,GAAG,IACrB,EACpB,KAAC,aAAa,IACZ,SAAS,EAAC,qDAAqD,sBAC7C,SAAS,YAE3B,eAAK,SAAS,EAAC,qCAAqC,aAClD,KAAC,cAAc,cACb,KAAC,WAAW,6BAAyB,GACtB,EAChB,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACxB,KAAC,cAAc,IAEb,IAAI,EAAE,IAAI,EACV,cAAc,EAAE,cAAc,IAFzB,IAAI,CAAC,KAAK,CAGf,CACH,CAAC,IACE,GACQ,IACf,CACJ,CAAC"}

package/dist/lib/components/navigation/{SidebarBadge.d.ts → NavigationBadge.d.ts}

@@ -18,7 +18,7 @@ export declare const ColorMapInvert: {
     gray: string;
     outline: string;
 };
-export declare const SidebarBadge: ({ color, label, className, invert, }: {
+export declare const NavigationBadge: ({ color, label, className, invert, }: {
     color: keyof typeof ColorMap;
     label: string;
     className?: string;

package/dist/lib/components/navigation/{SidebarBadge.js → NavigationBadge.js}

@@ -20,7 +20,7 @@ export const ColorMapInvert = {
     gray: "text-gray-400 dark:text-gray-600",
     outline: "",
 };
-export const SidebarBadge = ({ color, label, className, invert, }) => {
+export const NavigationBadge = ({ color, label, className, invert, }) => {
     return (_jsx("span", { className: cn("flex items-center duration-200 transition-opacity text-center uppercase text-[0.65rem] leading-5 font-bold rounded-sm text-background dark:text-zinc-50 h-full", color === "outline" ? "px-3" : "mt-0.5 px-1", invert ? ColorMapInvert[color] : ColorMap[color], className), children: label }));
 };
-//# sourceMappingURL=SidebarBadge.js.map
+//# sourceMappingURL=NavigationBadge.js.map

package/dist/lib/components/navigation/NavigationBadge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NavigationBadge.js","sourceRoot":"","sources":["../../../../src/lib/components/navigation/NavigationBadge.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,KAAK,EAAE,gCAAgC;IACvC,IAAI,EAAE,4BAA4B;IAClC,MAAM,EAAE,kCAAkC;IAC1C,GAAG,EAAE,4BAA4B;IACjC,MAAM,EAAE,kCAAkC;IAC1C,MAAM,EAAE,kCAAkC;IAC1C,IAAI,EAAE,8BAA8B;IACpC,OAAO,EAAE,iDAAiD;CAC3D,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,KAAK,EAAE,oCAAoC;IAC3C,IAAI,EAAE,gCAAgC;IACtC,MAAM,EAAE,sCAAsC;IAC9C,GAAG,EAAE,gCAAgC;IACrC,MAAM,EAAE,sCAAsC;IAC9C,MAAM,EAAE,sCAAsC;IAC9C,IAAI,EAAE,kCAAkC;IACxC,OAAO,EAAE,EAAE;CACZ,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC9B,KAAK,EACL,KAAK,EACL,SAAS,EACT,MAAM,GAMP,EAAE,EAAE;IACH,OAAO,CACL,eACE,SAAS,EAAE,EAAE,CACX,gKAAgK,EAChK,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,EAC5C,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAChD,SAAS,CACV,YAEA,KAAK,GACD,CACR,CAAC;AACJ,CAAC,CAAC"}

package/dist/lib/components/navigation/NavigationCategory.d.ts

@@ -0,0 +1,5 @@
+import type { NavigationCategory as NavigationCategoryType } from "../../../config/validators/NavigationSchema.js";
+export declare const NavigationCategory: import("react").MemoExoticComponent<({ category, onRequestClose, }: {
+    category: NavigationCategoryType;
+    onRequestClose?: () => void;
+}) => import("react/jsx-runtime").JSX.Element>;

package/dist/lib/components/navigation/{SidebarCategory.js → NavigationCategory.js}

@@ -7,9 +7,9 @@ import { NavLink, useLocation, useMatch } from "react-router";
 import { Button } from "zudoku/ui/Button.js";
 import { cn } from "../../util/cn.js";
 import { joinUrl } from "../../util/joinUrl.js";
-import { SidebarItem } from "./SidebarItem.js";
+import { NavigationItem } from "./NavigationItem.js";
 import { navigationListItem, useIsCategoryOpen } from "./utils.js";
-const SidebarCategoryInner = ({ category, onRequestClose, }) => {
+const NavigationCategoryInner = ({ category, onRequestClose, }) => {
     const isCategoryOpen = useIsCategoryOpen(category);
     const [hasInteracted, setHasInteracted] = useState(false);
     const location = useLocation();
@@ -17,10 +17,10 @@ const SidebarCategoryInner = ({ category, onRequestClose, }) => {
     const isCollapsed = category.collapsed ?? true;
     const isDefaultOpen = Boolean(!isCollapsible || !isCollapsed || isCategoryOpen);
     const [open, setOpen] = useState(isDefaultOpen);
-    const isActive = useMatch(category.link?.id ?? "");
+    const isActive = useMatch(category.link?.path ?? "");
     useEffect(() => {
-        // this is triggered when an item from the sidebar is clicked
-        // and the sidebar, enclosing this item, is not opened
+        // this is triggered when an item from the navigation is clicked
+        // and the navigation, enclosing this item, is not opened
         if (isCategoryOpen) {
             setOpen(true);
         }
@@ -40,7 +40,7 @@ const SidebarCategoryInner = ({ category, onRequestClose, }) => {
         ],
     });
     return (_jsxs(Collapsible.Root, { className: "flex flex-col", defaultOpen: isDefaultOpen, open: open, onOpenChange: () => setOpen(true), children: [_jsx(Collapsible.Trigger, { className: "group", asChild: true, disabled: !isCollapsible, children: category.link?.type === "doc" ? (_jsxs(NavLink, { to: {
-                        pathname: joinUrl(category.link.id),
+                        pathname: joinUrl(category.link.path),
                         search: location.search,
                     }, className: styles, onClick: () => {
                         setHasInteracted(true);
@@ -50,10 +50,12 @@ const SidebarCategoryInner = ({ category, onRequestClose, }) => {
                         }
                     }, children: [icon, _jsxs("div", { className: "flex items-center gap-2 justify-between w-full text-foreground/80 group-aria-[current='page']:text-primary", children: [_jsx("div", { className: "truncate", children: category.label }), ToggleButton] })] })) : (_jsxs("div", { onClick: () => setHasInteracted(true), className: styles, children: [icon, _jsxs("div", { className: "flex items-center justify-between w-full", children: [_jsx("div", { className: "flex gap-2 truncate w-full", children: category.label }), ToggleButton] })] })) }), _jsx(Collapsible.Content, { className: cn(
                 // CollapsibleContent class is used to animate and it should only be applied when the user has triggered the toggle
-                hasInteracted && "CollapsibleContent", category.items.length === 0 && "hidden", "ms-6 my-1"), children: _jsx("ul", { className: "relative after:absolute after:-start-(--padding-nav-item) after:translate-x-[1.5px] after:top-0 after:bottom-0 after:w-px after:bg-border", children: category.items.map((item) => (_jsx(SidebarItem, { onRequestClose: onRequestClose, item: item }, ("id" in item ? item.id : "") +
-                        ("href" in item ? item.href : "") +
-                        item.label))) }) })] }));
+                hasInteracted && "CollapsibleContent", category.items.length === 0 && "hidden", "ms-6 my-1"), children: _jsx("ul", { className: "relative after:absolute after:-start-(--padding-nav-item) after:translate-x-[1.5px] after:top-0 after:bottom-0 after:w-px after:bg-border", children: category.items.map((item) => (_jsx(NavigationItem, { onRequestClose: onRequestClose, item: item }, item.type +
+                        (item.label ?? "") +
+                        ("path" in item ? item.path : "") +
+                        ("file" in item ? item.file : "") +
+                        ("to" in item ? item.to : "")))) }) })] }));
 };
-export const SidebarCategory = memo(SidebarCategoryInner, deepEqual);
-SidebarCategory.displayName = "SidebarCategory";
-//# sourceMappingURL=SidebarCategory.js.map
+export const NavigationCategory = memo(NavigationCategoryInner, deepEqual);
+NavigationCategory.displayName = "NavigationCategory";
+//# sourceMappingURL=NavigationCategory.js.map

package/dist/lib/components/navigation/NavigationCategory.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NavigationCategory.js","sourceRoot":"","sources":["../../../../src/lib/components/navigation/NavigationCategory.tsx"],"names":[],"mappings":"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"}

package/dist/lib/components/navigation/NavigationItem.d.ts

@@ -0,0 +1,6 @@
+import type { NavigationItem as NavigationItemType } from "../../../config/validators/NavigationSchema.js";
+export declare const DATA_ANCHOR_ATTR = "data-anchor";
+export declare const NavigationItem: ({ item, onRequestClose, }: {
+    item: NavigationItemType;
+    onRequestClose?: () => void;
+}) => import("react/jsx-runtime").JSX.Element;

package/dist/lib/components/navigation/NavigationItem.js

@@ -0,0 +1,47 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import { ExternalLinkIcon } from "lucide-react";
+import { useEffect, useRef, useState } from "react";
+import { NavLink, useLocation } from "react-router";
+import { Tooltip, TooltipArrow, TooltipContent, TooltipProvider, TooltipTrigger, } from "zudoku/ui/Tooltip.js";
+import { cn } from "../../util/cn.js";
+import { joinUrl } from "../../util/joinUrl.js";
+import { AnchorLink } from "../AnchorLink.js";
+import { useViewportAnchor } from "../context/ViewportAnchorContext.js";
+import { NavigationBadge } from "./NavigationBadge.js";
+import { NavigationCategory } from "./NavigationCategory.js";
+import { navigationListItem } from "./utils.js";
+const TruncatedLabel = ({ label, className, }) => {
+    const ref = useRef(null);
+    const [isTruncated, setIsTruncated] = useState(false);
+    useEffect(() => {
+        if (!ref.current)
+            return;
+        if (ref.current.offsetWidth < ref.current.scrollWidth) {
+            setIsTruncated(true);
+        }
+    }, []);
+    return (_jsxs(_Fragment, { children: [_jsx("span", { className: cn("truncate flex-1", className), title: label, ref: ref, children: label }), isTruncated && (_jsx(TooltipProvider, { delayDuration: 500, children: _jsxs(Tooltip, { disableHoverableContent: true, children: [_jsx(TooltipTrigger, { className: "absolute inset-0 z-10" }), _jsxs(TooltipContent, { className: "max-w-64 rounded-lg", side: "bottom", align: "center", children: [_jsx(TooltipArrow, {}), label] })] }) }))] }));
+};
+export const DATA_ANCHOR_ATTR = "data-anchor";
+export const NavigationItem = ({ item, onRequestClose, }) => {
+    const location = useLocation();
+    const { activeAnchor } = useViewportAnchor();
+    switch (item.type) {
+        case "category":
+            return (_jsx(NavigationCategory, { category: item, onRequestClose: onRequestClose }));
+        case "doc":
+            return (_jsxs(NavLink, { viewTransition: true, className: ({ isActive, isPending }) => navigationListItem({ isActive, isPending }), to: joinUrl(item.path), onClick: onRequestClose, end: true, children: [item.icon && _jsx(item.icon, { size: 16, className: "align-[-0.125em]" }), item.badge ? (_jsxs(_Fragment, { children: [item.label && (_jsx(TruncatedLabel, { label: item.label, className: "flex-1" })), _jsx(NavigationBadge, { ...item.badge })] })) : (item.label)] }));
+        case "link":
+        case "custom-page": {
+            const href = item.type === "link" ? item.to : item.path;
+            return !href.startsWith("http") ? (_jsxs(AnchorLink, { to: {
+                    pathname: href.split("#")[0],
+                    hash: href.split("#")[1],
+                    search: location.search,
+                }, [DATA_ANCHOR_ATTR]: href.split("#")[1], className: navigationListItem({
+                    isActive: href === [location.pathname, activeAnchor].join("#"),
+                }), onClick: onRequestClose, children: [item.icon && _jsx(item.icon, { size: 16, className: "align-[-0.125em]" }), item.badge ? (_jsxs(_Fragment, { children: [item.label && _jsx(TruncatedLabel, { label: item.label }), _jsx(NavigationBadge, { ...item.badge })] })) : (_jsx("span", { className: "break-all", children: item.label }))] })) : (_jsxs("a", { className: navigationListItem(), href: href, target: "_blank", rel: "noopener noreferrer", onClick: onRequestClose, children: [item.icon && _jsx(item.icon, { size: 16, className: "align-[-0.125em]" }), _jsx("span", { className: "whitespace-normal", children: item.label }), _jsx("span", { className: "whitespace-nowrap", children: _jsx(ExternalLinkIcon, { className: "inline -translate-y-0.5", size: 12 }) })] }));
+        }
+    }
+};
+//# sourceMappingURL=NavigationItem.js.map

package/dist/lib/components/navigation/NavigationItem.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NavigationItem.js","sourceRoot":"","sources":["../../../../src/lib/components/navigation/NavigationItem.tsx"],"names":[],"mappings":"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"}

package/dist/lib/components/navigation/{SidebarWrapper.d.ts → NavigationWrapper.d.ts}

@@ -1,5 +1,5 @@
 import { type PropsWithChildren } from "react";
-export declare const SidebarWrapper: {
+export declare const NavigationWrapper: {
     ({ children, className, }: PropsWithChildren<{
         className?: string;
     }>): import("react/jsx-runtime").JSX.Element;

package/dist/lib/components/navigation/{SidebarWrapper.js → NavigationWrapper.js}

@@ -4,7 +4,7 @@ import { cn } from "../../util/cn.js";
 import { scrollIntoViewIfNeeded } from "../../util/scrollIntoViewIfNeeded.js";
 import { useZudoku } from "../context/ZudokuContext.js";
 import { PoweredByZudoku } from "./PoweredByZudoku.js";
-export const SidebarWrapper = ({ children, className, }) => {
+export const NavigationWrapper = ({ children, className, }) => {
     const { options } = useZudoku();
     const navRef = useRef(null);
     useEffect(() => {
@@ -17,5 +17,5 @@ export const SidebarWrapper = ({ children, className, }) => {
                     maskImage: `linear-gradient(180deg, transparent 1%, rgba(0, 0, 0, 1) 20px, rgba(0, 0, 0, 1) 90%, transparent 99%)`,
                 }, children: children }), _jsx("div", { className: "bg-background border-t p-2 mx-5  gap-2 items-center mt-2 drop-shadow-[0_-3px_1px_rgba(0,0,0,0.015)] hidden lg:[&:has(>_:nth-child(1):last-child)]:flex", children: options.page?.showPoweredBy !== false && _jsx(PoweredByZudoku, {}) })] }));
 };
-SidebarWrapper.displayName = "SidebarWrapper";
-//# sourceMappingURL=SidebarWrapper.js.map
+NavigationWrapper.displayName = "NavigationWrapper";
+//# sourceMappingURL=NavigationWrapper.js.map

package/dist/lib/components/navigation/NavigationWrapper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"NavigationWrapper.js","sourceRoot":"","sources":["../../../../src/lib/components/navigation/NavigationWrapper.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAA0B,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAChC,QAAQ,EACR,SAAS,GAGT,EAAE,EAAE;IACJ,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IAE5C,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,EAAE,aAAa,CAAC,uBAAuB,CAAC,CAAC;QACtE,sBAAsB,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC;IACzC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL,eAAK,SAAS,EAAC,gHAAgH,aAC7H,cACE,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,EAAE,CACX,kJAAkJ,EAClJ,gFAAgF;gBAChF,+CAA+C;gBAC/C,SAAS,EACT,SAAS,CACV,EACD,KAAK,EAAE;oBACL,SAAS,EAAE,uGAAuG;iBACnH,YAEA,QAAQ,GACL,EAEN,cAAK,SAAS,EAAC,wJAAwJ,YACpK,OAAO,CAAC,IAAI,EAAE,aAAa,KAAK,KAAK,IAAI,KAAC,eAAe,KAAG,GACzD,IACF,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,iBAAiB,CAAC,WAAW,GAAG,mBAAmB,CAAC"}

package/dist/lib/components/navigation/utils.d.ts

@@ -1,9 +1,9 @@
-import type { SidebarItem, SidebarItemCategory } from "../../../config/validators/SidebarSchema.js";
-export type TraverseCallback<T> = (item: SidebarItem, parentCategories: SidebarItem[]) => T | void;
-export declare const traverseSidebar: <T>(sidebar: SidebarItem[], callback: TraverseCallback<T>) => T | undefined;
-export declare const traverseSidebarItem: <T>(item: SidebarItem, callback: TraverseCallback<T>, parentCategories?: SidebarItem[]) => T | undefined;
-export declare const useCurrentItem: () => import("../../../config/validators/SidebarSchema.js").SidebarItemDoc | undefined;
-export declare const useIsCategoryOpen: (category: SidebarItemCategory) => true | undefined;
+import type { NavigationCategory, NavigationItem } from "../../../config/validators/NavigationSchema.js";
+export type TraverseCallback<T> = (item: NavigationItem, parentCategories: NavigationItem[]) => T | void;
+export declare const traverseNavigation: <T>(navigation: NavigationItem[], callback: TraverseCallback<T>) => T | undefined;
+export declare const traverseNavigationItem: <T>(item: NavigationItem, callback: TraverseCallback<T>, parentCategories?: NavigationItem[]) => T | undefined;
+export declare const useCurrentItem: () => import("../../../config/validators/NavigationSchema.js").NavigationDoc | undefined;
+export declare const useIsCategoryOpen: (category: NavigationCategory) => true | undefined;
 export declare const usePrevNext: () => {
     prev?: {
         label: string;
@@ -19,6 +19,4 @@ export declare const navigationListItem: (props?: ({
     isMuted?: boolean | null | undefined;
     isPending?: boolean | null | undefined;
 } & import("class-variance-authority/types").ClassProp) | undefined) => string;
-export declare const isHiddenItem: (isAuthenticated?: boolean) => (item: {
-    display?: "auth" | "anon" | "always" | "hide";
-}) => boolean;
+export declare const isHiddenItem: (isAuthenticated?: boolean) => (item: NavigationItem) => boolean;