Merge pull request #15041 from grafana/14752-explore-custom-scrollbar

Use CustomScrollbar in explore
This commit is contained in:
Torkel Ödegaard 2019-01-26 10:57:13 +01:00 committed by GitHub
commit c9d060c0fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,6 +10,7 @@ import { parseUrlState } from 'app/core/utils/explore';
import { initializeExploreSplit } from './state/actions';
import ErrorBoundary from './ErrorBoundary';
import Explore from './Explore';
import { CustomScrollbar } from '@grafana/ui';
interface WrapperProps {
initializeExploreSplit: typeof initializeExploreSplit;
@ -46,6 +47,8 @@ export class Wrapper extends Component<WrapperProps> {
const { leftState, rightState } = this.urlStates;
return (
<div className="page-scrollbar-wrapper">
<CustomScrollbar autoHeightMin={'100%'}>
<div className="explore-wrapper">
<ErrorBoundary>
<Explore exploreId={ExploreId.left} urlState={leftState} />
@ -56,6 +59,8 @@ export class Wrapper extends Component<WrapperProps> {
</ErrorBoundary>
)}
</div>
</CustomScrollbar>
</div>
);
}
}