diff --git a/resources/js/lib/utils.ts b/resources/js/lib/utils.ts index d40abd11..bc01e189 100644 --- a/resources/js/lib/utils.ts +++ b/resources/js/lib/utils.ts @@ -7,7 +7,17 @@ export function cn(...inputs: ClassValue[]) { } export function urlIsActive(urlToCheck: NonNullable, currentUrl: string) { - return toUrl(urlToCheck) === currentUrl; + const checkUrl = toUrl(urlToCheck); + + if (checkUrl === '/' && currentUrl === '/') { + return true; + } + + if (checkUrl !== '/' && currentUrl.startsWith(checkUrl)) { + return true; + } + + return false; } export function toUrl(href: NonNullable) {