Compare commits

..

No commits in common. "b80a52460a675a74bce718733fd4f94c3ff1ca45" and "663d88c80db8fd954affaf88c9cef464925871c0" have entirely different histories.

View File

@ -1,6 +1,5 @@
"use client" "use client"
import { usePage } from "@inertiajs/react"
import { import {
SidebarGroup, SidebarGroup,
SidebarGroupLabel, SidebarGroupLabel,
@ -25,11 +24,10 @@ export function NavMain({
}: { }: {
items: (NavGroup | NavItem)[] items: (NavGroup | NavItem)[]
}) { }) {
const { url } = usePage()
return ( return (
<> <>
{items.map((item) => { {items.map((item, index) => {
if ("label" in item) { if ("label" in item) {
return ( return (
<SidebarGroup key={item.label} className="group-data-[collapsible=icon]:hidden"> <SidebarGroup key={item.label} className="group-data-[collapsible=icon]:hidden">
@ -37,7 +35,7 @@ export function NavMain({
<SidebarMenu> <SidebarMenu>
{item.items.map((child) => ( {item.items.map((child) => (
<SidebarMenuItem key={child.name}> <SidebarMenuItem key={child.name}>
<SidebarMenuButton asChild isActive={url === child.url}> <SidebarMenuButton asChild>
<a href={child.url}> <a href={child.url}>
<child.icon className="h-4 w-4" /> <child.icon className="h-4 w-4" />
<span>{child.name}</span> <span>{child.name}</span>
@ -54,7 +52,7 @@ export function NavMain({
<SidebarGroup key={item.name} className="group-data-[collapsible=icon]:hidden"> <SidebarGroup key={item.name} className="group-data-[collapsible=icon]:hidden">
<SidebarMenu> <SidebarMenu>
<SidebarMenuItem> <SidebarMenuItem>
<SidebarMenuButton asChild isActive={url === item.url}> <SidebarMenuButton asChild>
<a href={item.url}> <a href={item.url}>
<item.icon className="h-4 w-4" /> <item.icon className="h-4 w-4" />
<span>{item.name}</span> <span>{item.name}</span>