From 45d6a30cc9dbd3935ffe265ed50b0369b48dee86 Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy.davis@sonarsource.com>
Date: Mon, 26 Jun 2023 10:48:58 +0200
Subject: [PATCH] SONAR-19604 Fix scrolling in Activity Page

---
 .../components/ProjectActivityAnalysesList.tsx         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx
index 7d043a09ea0..6ea2f6bf60a 100644
--- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx
+++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx
@@ -55,7 +55,15 @@ export default class ProjectActivityAnalysesList extends React.PureComponent<Pro
   scrollContainer?: HTMLUListElement | null;
 
   componentDidUpdate(prevProps: Props) {
-    if (this.scrollContainer && activityQueryChanged(prevProps.query, this.props.query)) {
+    const selectedDate = this.props.query.selectedDate
+      ? this.props.query.selectedDate.valueOf()
+      : null;
+
+    if (
+      this.scrollContainer &&
+      activityQueryChanged(prevProps.query, this.props.query) &&
+      !this.props.analyses.some(({ date }) => date.valueOf() === selectedDate)
+    ) {
       this.scrollContainer.scrollTop = 0;
     }
   }
-- 
2.39.5