From 86d0017fe9970023b61192e9eb55d5eee534558a Mon Sep 17 00:00:00 2001 From: Mikhail Golbakh Date: Tue, 21 Oct 2025 17:38:55 +0200 Subject: [PATCH] fix(AsiderHeader): fix scroll height for panel with header alert --- src/components/AsideHeader/AsideHeader.scss | 8 ++++++-- .../AsideHeader/__stories__/AsideHeaderShowcase.scss | 6 ++++++ .../AsideHeader/__stories__/AsideHeaderShowcase.tsx | 6 +++++- src/components/AsideHeader/components/Panels.tsx | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/components/AsideHeader/AsideHeader.scss b/src/components/AsideHeader/AsideHeader.scss index 24f775a9..40f75b0f 100644 --- a/src/components/AsideHeader/AsideHeader.scss +++ b/src/components/AsideHeader/AsideHeader.scss @@ -204,15 +204,19 @@ $block: '.#{variables.$ns}aside-header'; } &__panels { - z-index: var(--gn-aside-header-panel-z-index, 98); + --gn-drawer-z-index: var(--gn-aside-header-panel-z-index, 98); + position: fixed; inset: var(--gn-top-alert-height, 0) 0 0; overflow: auto; + display: flex; + flex-direction: column; max-height: calc(100vh - var(--gn-top-alert-height, 0)); } &__panel { - height: 100%; + flex-grow: 1; + height: auto; } &__pane-container { diff --git a/src/components/AsideHeader/__stories__/AsideHeaderShowcase.scss b/src/components/AsideHeader/__stories__/AsideHeaderShowcase.scss index 34ce6de2..31075218 100644 --- a/src/components/AsideHeader/__stories__/AsideHeaderShowcase.scss +++ b/src/components/AsideHeader/__stories__/AsideHeaderShowcase.scss @@ -82,11 +82,17 @@ body { width: 300px; height: calc(100% - 40px); padding: 20px; + overflow-y: auto; } &__custom-background { opacity: 70%; } + + &__user-settings-content { + height: 2000px; + background: linear-gradient(to bottom, #fff700, #ff0000); + } } .composite-bar-showcase__tag { diff --git a/src/components/AsideHeader/__stories__/AsideHeaderShowcase.tsx b/src/components/AsideHeader/__stories__/AsideHeaderShowcase.tsx index a74ba547..faa8235f 100644 --- a/src/components/AsideHeader/__stories__/AsideHeaderShowcase.tsx +++ b/src/components/AsideHeader/__stories__/AsideHeaderShowcase.tsx @@ -274,7 +274,11 @@ export const AsideHeaderShowcase: React.FC = ({ }, { id: 'user-settings', - content:
User Settings
, + content: ( +
+
User Settings
+
+ ), visible: visiblePanel === Panel.UserSettings, }, { diff --git a/src/components/AsideHeader/components/Panels.tsx b/src/components/AsideHeader/components/Panels.tsx index 1982f764..4cfa52a9 100644 --- a/src/components/AsideHeader/components/Panels.tsx +++ b/src/components/AsideHeader/components/Panels.tsx @@ -15,7 +15,7 @@ export const Panels = () => { style={{left: size}} > {panelItems.map((item) => ( - + ))} ) : null;