From 47fb6fc9c243d0c69961cfff2578de71774d4691 Mon Sep 17 00:00:00 2001
From: Batmandakh <emb.mandakh@gmail.com>
Date: Tue, 30 Sep 2025 02:28:16 +0800
Subject: [PATCH 1/2] Update app-header.tsx

Fixed active element mark on the navigation bar.
replaced the div element (which were outside and nav ling) by border
---
 resources/js/components/app-header.tsx | 48 ++++++++++++++------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/resources/js/components/app-header.tsx b/resources/js/components/app-header.tsx
index 6f3ab8fb..b25575bd 100644
--- a/resources/js/components/app-header.tsx
+++ b/resources/js/components/app-header.tsx
@@ -161,30 +161,32 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
                                         key={index}
                                         className="relative flex h-full items-center"
                                     >
-                                        <Link
-                                            href={item.href}
-                                            className={cn(
-                                                navigationMenuTriggerStyle(),
-                                                page.url ===
-                                                    (typeof item.href ===
-                                                    'string'
-                                                        ? item.href
-                                                        : item.href.url) &&
-                                                    activeItemStyles,
-                                                'h-9 cursor-pointer px-3',
-                                            )}
+                                        <div className={
+                                            page.url === item.href.url && ("h-full flex items-center border-b border-black dark:border-white")
+                                        }
                                         >
-                                            {item.icon && (
-                                                <Icon
-                                                    iconNode={item.icon}
-                                                    className="mr-2 h-4 w-4"
-                                                />
-                                            )}
-                                            {item.title}
-                                        </Link>
-                                        {page.url === item.href && (
-                                            <div className="absolute bottom-0 left-0 h-0.5 w-full translate-y-px bg-black dark:bg-white"></div>
-                                        )}
+                                            <Link
+                                                href={item.href}
+                                                className={cn(
+                                                    navigationMenuTriggerStyle(),
+                                                    page.url ===
+                                                        (typeof item.href ===
+                                                        'string'
+                                                            ? item.href
+                                                            : item.href.url) &&
+                                                        activeItemStyles,
+                                                    'h-9 cursor-pointer px-3',
+                                                )}
+                                            >
+                                                {item.icon && (
+                                                    <Icon
+                                                        iconNode={item.icon}
+                                                        className="mr-2 h-4 w-4"
+                                                    />
+                                                )}
+                                                {item.title}
+                                            </Link>
+                                        </div>
                                     </NavigationMenuItem>
                                 ))}
                             </NavigationMenuList>

From 255b9d4bd96d36a72274e5ffc878f8730fad5822 Mon Sep 17 00:00:00 2001
From: Batmandakh <emb.mandakh@gmail.com>
Date: Wed, 1 Oct 2025 04:59:37 +0800
Subject: [PATCH 2/2] Update app-header.tsx

fixed error which created by logical AND operator in className.
left side of && operator returned 0 (false) which is not acceptable by class (or className) of a tag...
---
 resources/js/components/app-header.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/components/app-header.tsx b/resources/js/components/app-header.tsx
index b25575bd..39041a3a 100644
--- a/resources/js/components/app-header.tsx
+++ b/resources/js/components/app-header.tsx
@@ -162,7 +162,7 @@ export function AppHeader({ breadcrumbs = [] }: AppHeaderProps) {
                                         className="relative flex h-full items-center"
                                     >
                                         <div className={
-                                            page.url === item.href.url && ("h-full flex items-center border-b border-black dark:border-white")
+                                            page.url === item.href.url ? ("h-full flex items-center border-b border-black dark:border-white") : null
                                         }
                                         >
                                             <Link