From c8fdeae6c3ce695ca3e3ce448cbd917124a27646 Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy.davis@sonarsource.com>
Date: Thu, 4 Nov 2021 15:51:13 +0100
Subject: [PATCH] SONAR-15575 Fix keyboard navigation in hotspots page

---
 .../js/apps/security-hotspots/components/HotspotViewer.tsx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewer.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewer.tsx
index 300d2e53178..6751bb68ab7 100644
--- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewer.tsx
+++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewer.tsx
@@ -46,6 +46,8 @@ interface State {
   showStatusUpdateSuccessModal: boolean;
 }
 
+const SCROLL_TO_COMMENT_BOTTOM_OFFSET = 300;
+
 export default class HotspotViewer extends React.PureComponent<Props, State> {
   mounted = false;
   state: State;
@@ -66,9 +68,6 @@ export default class HotspotViewer extends React.PureComponent<Props, State> {
     if (prevProps.hotspotKey !== this.props.hotspotKey) {
       this.fetchHotspot();
     }
-    if (this.commentTextRef.current) {
-      this.commentTextRef.current.focus({ preventScroll: true });
-    }
   }
 
   componentWillUnmount() {
@@ -102,7 +101,7 @@ export default class HotspotViewer extends React.PureComponent<Props, State> {
     if (this.commentTextRef.current) {
       this.commentTextRef.current.focus({ preventScroll: true });
       scrollToElement(this.commentTextRef.current, {
-        bottomOffset: 100
+        bottomOffset: SCROLL_TO_COMMENT_BOTTOM_OFFSET
       });
     }
   };
-- 
2.39.5