Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions src/components/AsideHeader/AsideHeader.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
const openModalCount = data?.meta?.layers?.filter(
({type}) => type === 'modal',
).length;
callback(openModalCount !== 0);

Check warning on line 75 in src/components/AsideHeader/__stories__/AsideHeaderShowcase.tsx

View workflow job for this annotation

GitHub Actions / Verify Files

Expected return with your callback function
}
});
};
Expand Down Expand Up @@ -155,7 +155,7 @@
multipleTooltip={multipleTooltip}
openModalSubscriber={openModalSubscriber}
topAlert={topAlert}
renderFooter={({compact, asideRef}) => (

Check warning on line 158 in src/components/AsideHeader/__stories__/AsideHeaderShowcase.tsx

View workflow job for this annotation

GitHub Actions / Verify Files

'compact' is already declared in the upper scope on line 62 column 12
<React.Fragment>
<FooterItem
compact={compact}
Expand Down Expand Up @@ -274,7 +274,11 @@
},
{
id: 'user-settings',
content: <div className={b('settings-panel')}>User Settings</div>,
content: (
<div className={b('settings-panel')}>
<div className={b('user-settings-content')}>User Settings</div>
</div>
),
visible: visiblePanel === Panel.UserSettings,
},
{
Expand All @@ -287,8 +291,8 @@
onChangeCompact={(v) => {
setCompact(v);
}}
onMenuMoreClick={() => console.log('onMenuMoreClick')}

Check warning on line 294 in src/components/AsideHeader/__stories__/AsideHeaderShowcase.tsx

View workflow job for this annotation

GitHub Actions / Verify Files

Unexpected console statement
onAllPagesClick={() => console.log('onAllPagesClick')}

Check warning on line 295 in src/components/AsideHeader/__stories__/AsideHeaderShowcase.tsx

View workflow job for this annotation

GitHub Actions / Verify Files

Unexpected console statement
editMenuProps={{
enableSorting: true,
}}
Expand Down
2 changes: 1 addition & 1 deletion src/components/AsideHeader/components/Panels.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const Panels = () => {
style={{left: size}}
>
{panelItems.map((item) => (
<DrawerItem key={item.id} {...item} />
<DrawerItem key={item.id} className={b('panel')} {...item} />
))}
</Drawer>
) : null;
Expand Down
Loading