diff --git a/src/nextGenComponents/shared/Sidebar/SidebarCollapseItem/SidebarCollapseItem.jsx b/src/nextGenComponents/shared/Sidebar/SidebarCollapseItem/SidebarCollapseItem.jsx index 7441ee41d..64d853241 100644 --- a/src/nextGenComponents/shared/Sidebar/SidebarCollapseItem/SidebarCollapseItem.jsx +++ b/src/nextGenComponents/shared/Sidebar/SidebarCollapseItem/SidebarCollapseItem.jsx @@ -38,9 +38,14 @@ const SidebarCollapseItem = ({ icon, label, nestedLinks }) => { const [open, setOpen] = useState(false) const { open: sidebarOpen } = useSidebar() - const isAnyChildActive = nestedLinks.some(nested => - nested.link ? pathname.includes(nested.link.toLowerCase()) : false - ) + const isAnyChildActive = nestedLinks.some(nested => { + if (!nested.link) return false + try { + return pathname.toLowerCase().startsWith(new URL(nested.link).pathname.toLowerCase()) + } catch { + return pathname.toLowerCase().startsWith(nested.link.toLowerCase()) + } + }) return ( { + if (!link) return null + try { + return new URL(link).pathname + } catch { + return link + } + }, [link]) + + const match = useMatch(linkPath ? `${linkPath}/*` : null) const isActive = Boolean(match) useEffect(() => {