From c594bbd7cabf49215b5beeade1e186c644d831f7 Mon Sep 17 00:00:00 2001
From: Ludwig <luixlive@gmail.com>
Date: Mon, 3 Jun 2024 14:19:34 -0600
Subject: [PATCH] ERA-9660: Fix sidebar autofocus issue

---
 src/SideBar/index.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/SideBar/index.js b/src/SideBar/index.js
index ca0357627..96086d7f4 100644
--- a/src/SideBar/index.js
+++ b/src/SideBar/index.js
@@ -161,12 +161,13 @@ const SideBar = () => {
     return () => document.removeEventListener('keydown', onKeydown, false);
   }, [isPatrolDetailsViewActive, isReportDetailsViewActive, location.pathname, navigate]);
 
+  useEffect(() => {
+    sideBarRef.current.focus();
+  }, [itemId]);
+
   return <aside
       className={`${styles.sideBar} ${sideBar.showSideBar ? '' : 'hidden'}`}
-      ref={(ref) => {
-        sideBarRef.current = ref;
-        ref?.focus();
-      }}
+      ref={sideBarRef}
       tabIndex={0}
     >
     <div className={`${styles.verticalNav} ${sidebarOpen ? 'open' : ''}`}>