From cafd4d9184bb1794f30d566fddae217acbb60ff4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sedat=20=C3=96zt=C3=BCrk?= <sedat.ozturk@sozsoft.com>
Date: Sun, 8 Feb 2026 20:54:51 +0300
Subject: [PATCH] =?UTF-8?q?SubMenu=20item=20se=C3=A7ilince=20kaybolmas?=
 =?UTF-8?q?=C4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/ui/Dropdown/DropdownItem.tsx | 4 +++-
 ui/src/components/ui/Dropdown/DropdownMenu.tsx | 5 +++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/ui/Dropdown/DropdownItem.tsx b/ui/src/components/ui/Dropdown/DropdownItem.tsx
index 6cdf988f..75fa59b6 100644
--- a/ui/src/components/ui/Dropdown/DropdownItem.tsx
+++ b/ui/src/components/ui/Dropdown/DropdownItem.tsx
@@ -106,9 +106,11 @@ const DropdownItem = forwardRef<HTMLElement, DropdownItemProps>(
                     openSubmenuIfExists()
                 } else {
                     activate(e)
+                    // Close the current menu after activation
+                    menuControl?.closeMenu()
                 }
             },
-            [disabled, submenu, openSubmenuIfExists, activate]
+            [disabled, submenu, openSubmenuIfExists, activate, menuControl]
         )
 
         const handleMouseOver = useCallback(() => {
diff --git a/ui/src/components/ui/Dropdown/DropdownMenu.tsx b/ui/src/components/ui/Dropdown/DropdownMenu.tsx
index 7ec3e8dd..d33f7d90 100644
--- a/ui/src/components/ui/Dropdown/DropdownMenu.tsx
+++ b/ui/src/components/ui/Dropdown/DropdownMenu.tsx
@@ -38,6 +38,11 @@ const DropdownMenu = forwardRef<HTMLElement, DropdownMenuProps>(
                 className={dropdownSubmenuClass}
                 placement={placement}
                 {...rest}
+                onSelect={(eventKey, e) => {
+                    // Call both parent and current onSelect
+                    rest.onSelect?.(eventKey, e)
+                    parentMenu?.onSelect?.(eventKey, e)
+                }}
             />
         )