Drawer: remove wrapping div preventing Drawer from scrolling properly (#75823)

remove wrapping div prevent drawer from scrolling properly
This commit is contained in:
Ashley Harrison 2023-10-02 16:01:28 +01:00 committed by GitHub
parent 286dc333c5
commit e9555d727a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 18 deletions

View File

@ -1,5 +1,5 @@
// BETTERER RESULTS V2.
//
//
// If this file contains merge conflicts, use `betterer merge` to automatically resolve them:
// https://phenomnomnominal.github.io/betterer/docs/results-file/#merge
//
@ -1194,9 +1194,6 @@ exports[`better eslint`] = {
"public/app/core/components/AppChrome/News/NewsContainer.tsx:5381": [
[0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"]
],
"public/app/core/components/AppChrome/News/NewsWrapper.tsx:5381": [
[0, 0, 0, "Styles should be written using objects.", "0"]
],
"public/app/core/components/AppChrome/SectionNav/SectionNavItem.tsx:5381": [
[0, 0, 0, "Use data-testid for E2E selectors instead of aria-label", "0"],
[0, 0, 0, "Styles should be written using objects.", "1"],

View File

@ -133,9 +133,7 @@ export function Drawer({
</div>
)}
{typeof title !== 'string' && title}
<div className={styles.contentScroll}>
{!scrollableContent ? content : <CustomScrollbar autoHeightMin="100%">{content}</CustomScrollbar>}
</div>
{!scrollableContent ? content : <CustomScrollbar>{content}</CustomScrollbar>}
</div>
</FocusScope>
</RcDrawer>
@ -301,10 +299,6 @@ const getStyles = (theme: GrafanaTheme2) => {
height: '100%',
flexGrow: 1,
}),
contentScroll: css({
label: 'drawer-content',
flex: 1,
}),
tabsWrapper: css({
label: 'drawer-tabs',
paddingLeft: theme.spacing(2),

View File

@ -49,13 +49,13 @@ export function NewsWrapper({ feedUrl }: NewsWrapperProps) {
const getStyles = (theme: GrafanaTheme2) => {
return {
innerWrapper: css`
width: 100%;
height: 100%;
display: flex;
align-items: center;
justify-content: center;
`,
innerWrapper: css({
width: '100%',
height: '100%',
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
}),
grot: css({
display: `flex`,
alignItems: `center`,