From c6ab0e7b8a4bd4524bd8e8a8616fc3a38db53418 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Mon, 17 Nov 2025 02:58:29 -0800
Subject: [PATCH] fix appmenu keys

---
 .../features/titlebar/components/app-menu.tsx       | 13 ++++++++-----
 .../components/dropdown-menu/dropdown-menu.tsx      |  6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/renderer/features/titlebar/components/app-menu.tsx b/src/renderer/features/titlebar/components/app-menu.tsx
index 1196acda3..a4f9bdf6d 100644
--- a/src/renderer/features/titlebar/components/app-menu.tsx
+++ b/src/renderer/features/titlebar/components/app-menu.tsx
@@ -8,7 +8,7 @@ import packageJson from '../../../../../package.json';
 import { ServerSelectorItems } from '/@/renderer/features/sidebar/components/server-selector-items';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useAppStore, useAppStoreActions, useSidebarStore } from '/@/renderer/store';
-import { DropdownMenu } from '/@/shared/components/dropdown-menu/dropdown-menu';
+import { DropdownMenu, MenuItemProps } from '/@/shared/components/dropdown-menu/dropdown-menu';
 import { Icon } from '/@/shared/components/icon/icon';
 import { toast } from '/@/shared/components/toast/toast';
 
@@ -264,8 +264,7 @@ export const AppMenu = () => {
                     item.leftSection ||
                     (item.icon && <Icon color={item.iconColor} icon={item.icon} />);
 
-                const props: any = {
-                    key: item.id,
+                const props = {
                     leftSection,
                     ...(item.rightSection && { rightSection: item.rightSection }),
                     ...(item.onClick && { onClick: item.onClick }),
@@ -273,9 +272,13 @@ export const AppMenu = () => {
                     ...(item.to && { to: item.to }),
                     ...(item.href && { href: item.href }),
                     ...(item.target && { target: item.target }),
-                };
+                } as MenuItemProps;
 
-                return <DropdownMenu.Item {...props}>{item.label}</DropdownMenu.Item>;
+                return (
+                    <DropdownMenu.Item key={item.id} {...props}>
+                        {item.label}
+                    </DropdownMenu.Item>
+                );
             }
 
             default:
diff --git a/src/shared/components/dropdown-menu/dropdown-menu.tsx b/src/shared/components/dropdown-menu/dropdown-menu.tsx
index 1d674bd97..814bd26cc 100644
--- a/src/shared/components/dropdown-menu/dropdown-menu.tsx
+++ b/src/shared/components/dropdown-menu/dropdown-menu.tsx
@@ -14,13 +14,13 @@ import styles from './dropdown-menu.module.css';
 
 import { createPolymorphicComponent } from '/@/shared/utils/create-polymorphic-component';
 
-type MenuDividerProps = MantineMenuDividerProps;
-type MenuDropdownProps = MantineMenuDropdownProps;
-interface MenuItemProps extends MantineMenuItemProps {
+export interface MenuItemProps extends MantineMenuItemProps {
     children: ReactNode;
     isDanger?: boolean;
     isSelected?: boolean;
 }
+type MenuDividerProps = MantineMenuDividerProps;
+type MenuDropdownProps = MantineMenuDropdownProps;
 type MenuLabelProps = MantineMenuLabelProps;
 type MenuProps = MantineMenuProps;