From 7c503dad6837de21a651a6373dcaea346598a90b Mon Sep 17 00:00:00 2001
From: Alexander Zinchuk <alx.zinchuk@gmail.com>
Date: Mon, 27 Apr 2026 14:29:05 +0200
Subject: [PATCH] Bot Menu: Disable click for bot command button (#6884)

---
 src/components/common/Composer.tsx                 | 1 +
 src/components/middle/composer/BotKeyboardMenu.tsx | 1 +
 src/components/ui/ResponsiveHoverButton.tsx        | 5 +++--
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/common/Composer.tsx b/src/components/common/Composer.tsx
index 5d9819b15..6bca516aa 100644
--- a/src/components/common/Composer.tsx
+++ b/src/components/common/Composer.tsx
@@ -2461,6 +2461,7 @@ const Composer = ({
                         className={buildClassName('composer-action-button', isBotKeyboardOpen && 'activated')}
                         round
                         color="translucent"
+                        noClickActivation
                         onActivate={openBotKeyboard}
                         ariaLabel={lang('AriaComposerBotKeyboard')}
                       >
diff --git a/src/components/middle/composer/BotKeyboardMenu.tsx b/src/components/middle/composer/BotKeyboardMenu.tsx
index 9f7486d02..eaa5507a2 100644
--- a/src/components/middle/composer/BotKeyboardMenu.tsx
+++ b/src/components/middle/composer/BotKeyboardMenu.tsx
@@ -66,6 +66,7 @@ const BotKeyboardMenu = ({
       onCloseAnimationEnd={onClose}
       onMouseEnter={!IS_TOUCH_ENV ? handleMouseEnter : undefined}
       onMouseLeave={!IS_TOUCH_ENV ? handleMouseLeave : undefined}
+      noCloseOnBackdrop={!IS_TOUCH_ENV}
       noCompact
     >
       <div className={buildClassName(styles.content, 'custom-scroll')}>
diff --git a/src/components/ui/ResponsiveHoverButton.tsx b/src/components/ui/ResponsiveHoverButton.tsx
index 8ccaa8bd5..59574c316 100644
--- a/src/components/ui/ResponsiveHoverButton.tsx
+++ b/src/components/ui/ResponsiveHoverButton.tsx
@@ -12,6 +12,7 @@ import Button from './Button';
 
 type OwnProps = {
   onActivate: (e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void;
+  noClickActivation?: boolean;
 } & Omit<ButtonProps, (
   'onClick' | 'onMouseDown' |
   'onMouseEnter' | 'onMouseLeave' |
@@ -22,7 +23,7 @@ const BUTTON_ACTIVATE_DELAY = 200;
 let openTimeout: number | undefined;
 let isFirstTimeActivation = true;
 
-const ResponsiveHoverButton: FC<OwnProps> = ({ onActivate, ...buttonProps }) => {
+const ResponsiveHoverButton: FC<OwnProps> = ({ onActivate, noClickActivation, ...buttonProps }) => {
   const isMouseInsideRef = useRef(false);
 
   const handleMouseEnter = useLastCallback((e: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
@@ -60,7 +61,7 @@ const ResponsiveHoverButton: FC<OwnProps> = ({ onActivate, ...buttonProps }) =>
       {...buttonProps}
       onMouseEnter={!IS_TOUCH_ENV ? handleMouseEnter : undefined}
       onMouseLeave={!IS_TOUCH_ENV ? handleMouseLeave : undefined}
-      onClick={!IS_TOUCH_ENV ? onActivate : handleClick}
+      onClick={!IS_TOUCH_ENV ? (noClickActivation ? undefined : onActivate) : handleClick}
     />
   );
 };