From b97a2460d5a10eebcc5005b592df7469b2a876a1 Mon Sep 17 00:00:00 2001
From: Juan Pablo Garcia Ripa <sarabadu@gmail.com>
Date: Mon, 24 Jan 2022 00:44:15 +0100
Subject: [PATCH] removes `ignoreChildEvent`utility

Signed-off-by: Juan Pablo Garcia Ripa <sarabadu@gmail.com>
---
 .changeset/cool-hats-scream.md                 |  5 +++++
 .../core-components/src/layout/Sidebar/Bar.tsx | 18 ++----------------
 2 files changed, 7 insertions(+), 16 deletions(-)
 create mode 100644 .changeset/cool-hats-scream.md

diff --git a/.changeset/cool-hats-scream.md b/.changeset/cool-hats-scream.md
new file mode 100644
index 0000000000..cc81ea05f2
--- /dev/null
+++ b/.changeset/cool-hats-scream.md
@@ -0,0 +1,5 @@
+---
+'@backstage/core-components': patch
+---
+
+Remove the `ignoreChildEvent` utility from the sidebar component to avoid conflicts with popovers
diff --git a/packages/core-components/src/layout/Sidebar/Bar.tsx b/packages/core-components/src/layout/Sidebar/Bar.tsx
index e87f6f7613..74a57ea6ee 100644
--- a/packages/core-components/src/layout/Sidebar/Bar.tsx
+++ b/packages/core-components/src/layout/Sidebar/Bar.tsx
@@ -182,13 +182,9 @@ const DesktopSidebar = (props: SidebarProps) => {
           className={classes.root}
           data-testid="sidebar-root"
           onMouseEnter={disableExpandOnHover ? () => {} : handleOpen}
-          onFocus={
-            disableExpandOnHover ? () => {} : ignoreChildEvent(handleOpen)
-          }
+          onFocus={disableExpandOnHover ? () => {} : handleOpen}
           onMouseLeave={disableExpandOnHover ? () => {} : handleClose}
-          onBlur={
-            disableExpandOnHover ? () => {} : ignoreChildEvent(handleClose)
-          }
+          onBlur={disableExpandOnHover ? () => {} : handleClose}
         >
           <div
             className={classnames(classes.drawer, {
@@ -242,13 +238,3 @@ function A11ySkipSidebar() {
     </Button>
   );
 }
-
-function ignoreChildEvent(handlerFn: (e?: any) => void) {
-  // TODO type the event
-  return (event: any) => {
-    const currentTarget = event?.currentTarget as HTMLElement;
-    if (!currentTarget?.contains(event.relatedTarget as HTMLElement)) {
-      handlerFn(event);
-    }
-  };
-}