From 5a1e5d0c4574dbf18651e50390dbaf7d70d9396d Mon Sep 17 00:00:00 2001
From: Florian Duros <florian.duros@ormaz.fr>
Date: Mon, 26 Feb 2024 15:50:38 +0100
Subject: [PATCH] Fix TAC opening with keyboard

---
 src/components/views/elements/AccessibleButton.tsx     | 10 +++++++++-
 .../ThreadsActivityCentreButton.tsx                    |  2 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/views/elements/AccessibleButton.tsx b/src/components/views/elements/AccessibleButton.tsx
index 1eb03792b8..8513b69eae 100644
--- a/src/components/views/elements/AccessibleButton.tsx
+++ b/src/components/views/elements/AccessibleButton.tsx
@@ -86,6 +86,10 @@ type Props<T extends keyof JSX.IntrinsicElements> = DynamicHtmlElementProps<T> &
      * Event handler for button activation. Should be implemented exactly like a normal `onClick` handler.
      */
     onClick: ((e: ButtonEvent) => void | Promise<void>) | null;
+    /**
+     * Disable keyboard overrides for this button. Defaults to false.
+     */
+    disableKeyboardOverrides?: boolean;
 };
 
 /**
@@ -116,6 +120,7 @@ const AccessibleButton = forwardRef(function <T extends keyof JSX.IntrinsicEleme
         onKeyDown,
         onKeyUp,
         triggerOnMouseDown,
+        disableKeyboardOverrides = false,
         ...restProps
     }: Props<T>,
     ref: Ref<HTMLElement>,
@@ -138,8 +143,9 @@ const AccessibleButton = forwardRef(function <T extends keyof JSX.IntrinsicEleme
         // Browsers handle space and enter key presses differently and we are only adjusting to the
         // inconsistencies here
         newProps.onKeyDown = (e) => {
-            const action = getKeyBindingsManager().getAccessibilityAction(e);
+            if (disableKeyboardOverrides) return onKeyDown?.(e);
 
+            const action = getKeyBindingsManager().getAccessibilityAction(e);
             switch (action) {
                 case KeyBindingAction.Enter:
                     e.stopPropagation();
@@ -154,6 +160,8 @@ const AccessibleButton = forwardRef(function <T extends keyof JSX.IntrinsicEleme
             }
         };
         newProps.onKeyUp = (e) => {
+            if (disableKeyboardOverrides) return onKeyUp?.(e);
+
             const action = getKeyBindingsManager().getAccessibilityAction(e);
 
             switch (action) {
diff --git a/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx b/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx
index 13478c8c5b..4c0d43a108 100644
--- a/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx
+++ b/src/components/views/spaces/threads-activity-centre/ThreadsActivityCentreButton.tsx
@@ -51,6 +51,8 @@ export const ThreadsActivityCentreButton = forwardRef<HTMLDivElement, ThreadsAct
                 ref={ref}
                 forceHide={displayLabel}
                 aria-expanded={displayLabel}
+                // The compound component Menu is already handling the keyboard events
+                disableKeyboardOverrides={true}
                 {...props}
             >
                 <IndicatorIcon