From 667ea69befcbc3969c1a4819fb24bf7e27e2f483 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Thu, 29 Aug 2024 15:42:51 +0800
Subject: [PATCH] fix: only show scrollbar when expanded (#7874) (#7905)

(cherry picked from commit a857941a44bf190b199b222a135274ed98d803ae)

Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .../__snapshots__/collapsible_nav_group_enabled.test.tsx.snap   | 2 +-
 .../public/chrome/ui/header/collapsible_nav_group_enabled.tsx   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav_group_enabled.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav_group_enabled.test.tsx.snap
index 55554ffabf70..11b66bd6d5ae 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav_group_enabled.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav_group_enabled.test.tsx.snap
@@ -260,7 +260,7 @@ exports[`<CollapsibleNavGroupEnabled /> should render correctly 2`] = `
         class="euiHorizontalRule euiHorizontalRule--full"
       />
       <div
-        class="bottom-container eui-xScroll bottom-container-collapsed"
+        class="bottom-container bottom-container-collapsed"
       />
     </div>
   </div>
diff --git a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
index d8867d973d7d..21ff68f879e2 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav_group_enabled.tsx
@@ -350,7 +350,7 @@ export function CollapsibleNavGroupEnabled({
         <div
           className={classNames({
             'bottom-container': true,
-            'eui-xScroll': true,
+            'eui-xScroll': isNavOpen,
             'bottom-container-collapsed': !isNavOpen,
             'bottom-container-expanded': isNavOpen,
           })}