From e099ebd9ecb965186b85b59dd2c6b221981673f6 Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Tue, 17 May 2022 10:28:19 -0400
Subject: [PATCH] Fix click behavior of notification badges on spaces (#8627)

* Fix click behavior of notification badges on spaces

* Fix import
---
 src/components/views/spaces/SpaceTreeLevel.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/views/spaces/SpaceTreeLevel.tsx b/src/components/views/spaces/SpaceTreeLevel.tsx
index d966415061..b038dbb7e4 100644
--- a/src/components/views/spaces/SpaceTreeLevel.tsx
+++ b/src/components/views/spaces/SpaceTreeLevel.tsx
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { ComponentProps, ComponentType, createRef, InputHTMLAttributes, LegacyRef } from "react";
+import React, { MouseEvent, ComponentProps, ComponentType, createRef, InputHTMLAttributes, LegacyRef } from "react";
 import classNames from "classnames";
 import { Room, RoomEvent } from "matrix-js-sdk/src/models/room";
 import { DraggableProvidedDragHandleProps } from "react-beautiful-dnd";
@@ -84,9 +84,15 @@ export const SpaceButton: React.FC<IButtonProps> = ({
             ariaLabel = _t("Jump to first invite.");
         }
 
+        const jumpToNotification = (ev: MouseEvent) => {
+            ev.stopPropagation();
+            ev.preventDefault();
+            SpaceStore.instance.setActiveRoomInSpace(spaceKey ?? space.roomId);
+        };
+
         notifBadge = <div className="mx_SpacePanel_badgeContainer">
             <NotificationBadge
-                onClick={() => SpaceStore.instance.setActiveRoomInSpace(spaceKey ?? space.roomId)}
+                onClick={jumpToNotification}
                 forceCount={false}
                 notification={notificationState}
                 aria-label={ariaLabel}