From d12cb117fecc6f0753e2a8598f9843cfc8ff0ee2 Mon Sep 17 00:00:00 2001
From: ChanDarong <chandarong333@gmail.com>
Date: Mon, 8 Sep 2025 11:41:54 +0700
Subject: [PATCH] Refactor urlIsActive function to improve URL matching logic

---
 resources/js/lib/utils.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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<InertiaLinkProps['href']>, 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<InertiaLinkProps['href']>) {