From a8a761eea85e22888cd94dd5aa2ad5b1e35c81a3 Mon Sep 17 00:00:00 2001
From: Andrey Yamanov <tenphi@gmail.com>
Date: Sat, 10 May 2025 16:48:23 +0200
Subject: [PATCH 1/2] fix(Menu): item styles

---
 .changeset/big-suns-complain.md              |  5 +++
 src/components/pickers/Menu/Menu.stories.tsx | 36 ++++++++++++++++++++
 src/components/pickers/Menu/Menu.tsx         |  6 ++--
 src/components/pickers/Menu/MenuButton.tsx   | 17 +++++----
 4 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 .changeset/big-suns-complain.md

diff --git a/.changeset/big-suns-complain.md b/.changeset/big-suns-complain.md
new file mode 100644
index 000000000..963c46797
--- /dev/null
+++ b/.changeset/big-suns-complain.md
@@ -0,0 +1,5 @@
+---
+"@cube-dev/ui-kit": patch
+---
+
+Fixes Menu Item disabled styles.
diff --git a/src/components/pickers/Menu/Menu.stories.tsx b/src/components/pickers/Menu/Menu.stories.tsx
index e27c3c7cc..12d96a8b4 100644
--- a/src/components/pickers/Menu/Menu.stories.tsx
+++ b/src/components/pickers/Menu/Menu.stories.tsx
@@ -83,6 +83,42 @@ export const Default = ({ ...props }) => {
   );
 };
 
+export const DisabledKeys = ({ ...props }) => {
+  const menu = (
+    <Menu id="menu" disabledKeys={['red', 'yellow']} {...props} width="220px">
+      <Menu.Item key="red" postfix="Ctr+C">
+        Copy
+      </Menu.Item>
+      <Menu.Item key="orange" postfix="Ctr+V">
+        Paste
+      </Menu.Item>
+      <Menu.Item key="yellow" postfix="Ctr+X">
+        Cut
+      </Menu.Item>
+    </Menu>
+  );
+
+  return (
+    <Space
+      gap="10x"
+      placeContent="start start"
+      placeItems="start"
+      height="400px"
+    >
+      {menu}
+
+      <MenuTrigger>
+        <Button
+          size="small"
+          icon={<MoreIcon />}
+          aria-label="Open Context Menu"
+        />
+        {menu}
+      </MenuTrigger>
+    </Space>
+  );
+};
+
 export const InsideModal = () => {
   return (
     <DialogContainer>
diff --git a/src/components/pickers/Menu/Menu.tsx b/src/components/pickers/Menu/Menu.tsx
index 62e36b798..909507bfa 100644
--- a/src/components/pickers/Menu/Menu.tsx
+++ b/src/components/pickers/Menu/Menu.tsx
@@ -26,7 +26,8 @@ import { MenuSection } from './MenuSection';
 import { StyledMenu, StyledMenuHeader } from './styled';
 
 export interface CubeMenuProps<T>
-  extends ContainerStyleProps,
+  extends BaseProps,
+    ContainerStyleProps,
     AriaMenuProps<T> {
   selectionIcon?: MenuSelectionType;
   // @deprecated
@@ -51,10 +52,11 @@ function Menu<T extends object>(
     sectionHeadingStyles,
     selectionIcon,
     qa,
+    ...rest
   } = props;
   const domRef = useDOMRef(ref);
   const contextProps = useMenuContext();
-  const completeProps = mergeProps(contextProps, props);
+  const completeProps = mergeProps(contextProps, rest);
 
   const state = useTreeState(completeProps);
   const items = [...state.collection];
diff --git a/src/components/pickers/Menu/MenuButton.tsx b/src/components/pickers/Menu/MenuButton.tsx
index c4bfb9de7..bf1da66c7 100644
--- a/src/components/pickers/Menu/MenuButton.tsx
+++ b/src/components/pickers/Menu/MenuButton.tsx
@@ -23,7 +23,13 @@ const StyledButton = tasty(Block, {
       '': '#clear',
       hovered: '#dark.03',
       'pressed | selected': '#dark.06',
-      '[disabled] & ![data-type="link"]': '#dark.04',
+      disabled: '#dark.04',
+    },
+    color: {
+      '': '#dark-02',
+      hovered: '#dark-02',
+      pressed: '#dark',
+      disabled: '#dark-04',
     },
     cursor: {
       '': 'pointer',
@@ -54,14 +60,7 @@ const StyledButton = tasty(Block, {
       placeItems: 'center',
     },
 
-    Postfix: {
-      color: {
-        '': '#dark-03',
-        'hovered | focused': '#dark-03',
-        'pressed | selected': '#purple-text',
-        disabled: '#dark-04',
-      },
-    },
+    Postfix: {},
   },
 });
 

From 70467e39a12f833b4c6534bd17bfa23a3e518d3c Mon Sep 17 00:00:00 2001
From: Andrey Yamanov <tenphi@gmail.com>
Date: Sat, 10 May 2025 17:22:44 +0200
Subject: [PATCH 2/2] fix(Menu): item styles * 2

---
 src/components/pickers/Menu/MenuButton.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/pickers/Menu/MenuButton.tsx b/src/components/pickers/Menu/MenuButton.tsx
index bf1da66c7..81bec74f6 100644
--- a/src/components/pickers/Menu/MenuButton.tsx
+++ b/src/components/pickers/Menu/MenuButton.tsx
@@ -60,7 +60,13 @@ const StyledButton = tasty(Block, {
       placeItems: 'center',
     },
 
-    Postfix: {},
+    Postfix: {
+      color: {
+        '': '#dark-03',
+        pressed: '#dark-02',
+        disabled: '#dark-04',
+      },
+    },
   },
 });