Skip to content

Commit 0bf0af4

Browse files
authored
fix(AsiderHeader): fix scroll height for panel with header alert (#478)
1 parent 5927b1a commit 0bf0af4

File tree

4 files changed

+18
-4
lines changed

4 files changed

+18
-4
lines changed

src/components/AsideHeader/AsideHeader.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,15 +204,19 @@ $block: '.#{variables.$ns}aside-header';
204204
}
205205

206206
&__panels {
207-
z-index: var(--gn-aside-header-panel-z-index, 98);
207+
--gn-drawer-z-index: var(--gn-aside-header-panel-z-index, 98);
208+
208209
position: fixed;
209210
inset: var(--gn-top-alert-height, 0) 0 0;
210211
overflow: auto;
212+
display: flex;
213+
flex-direction: column;
211214
max-height: calc(100vh - var(--gn-top-alert-height, 0));
212215
}
213216

214217
&__panel {
215-
height: 100%;
218+
flex-grow: 1;
219+
height: auto;
216220
}
217221

218222
&__pane-container {

src/components/AsideHeader/__stories__/AsideHeaderShowcase.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,17 @@ body {
8282
width: 300px;
8383
height: calc(100% - 40px);
8484
padding: 20px;
85+
overflow-y: auto;
8586
}
8687

8788
&__custom-background {
8889
opacity: 70%;
8990
}
91+
92+
&__user-settings-content {
93+
height: 2000px;
94+
background: linear-gradient(to bottom, #fff700, #ff0000);
95+
}
9096
}
9197

9298
.composite-bar-showcase__tag {

src/components/AsideHeader/__stories__/AsideHeaderShowcase.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,11 @@ export const AsideHeaderShowcase: React.FC<AsideHeaderShowcaseProps> = ({
274274
},
275275
{
276276
id: 'user-settings',
277-
content: <div className={b('settings-panel')}>User Settings</div>,
277+
content: (
278+
<div className={b('settings-panel')}>
279+
<div className={b('user-settings-content')}>User Settings</div>
280+
</div>
281+
),
278282
visible: visiblePanel === Panel.UserSettings,
279283
},
280284
{

src/components/AsideHeader/components/Panels.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export const Panels = () => {
1515
style={{left: size}}
1616
>
1717
{panelItems.map((item) => (
18-
<DrawerItem key={item.id} {...item} />
18+
<DrawerItem key={item.id} className={b('panel')} {...item} />
1919
))}
2020
</Drawer>
2121
) : null;

0 commit comments

Comments
 (0)