Skip to content

N
nexpie-grafana-theme
Commit c9d060c0 by Torkel Ödegaard Committed by GitHub
Options

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

Use CustomScrollbar in explore
parents 5e1a3c9e 2706f09d
Showing with 14 additions and 9 deletions
public/app/features/explore/Wrapper.tsx
...@@ -10,6 +10,7 @@ import { parseUrlState } from 'app/core/utils/explore'; ...@@ -10,6 +10,7 @@ import { parseUrlState } from 'app/core/utils/explore';
import { initializeExploreSplit } from './state/actions'; import { initializeExploreSplit } from './state/actions';
import ErrorBoundary from './ErrorBoundary'; import ErrorBoundary from './ErrorBoundary';
import Explore from './Explore'; import Explore from './Explore';
import { CustomScrollbar } from '@grafana/ui';
interface WrapperProps { interface WrapperProps {
initializeExploreSplit: typeof initializeExploreSplit; initializeExploreSplit: typeof initializeExploreSplit;
...@@ -46,15 +47,19 @@ export class Wrapper extends Component<WrapperProps> { ...@@ -46,15 +47,19 @@ export class Wrapper extends Component<WrapperProps> {
const { leftState, rightState } = this.urlStates; const { leftState, rightState } = this.urlStates;
return ( return (
<div className="explore-wrapper"> <div className="page-scrollbar-wrapper">
<ErrorBoundary> <CustomScrollbar autoHeightMin={'100%'}>
<Explore exploreId={ExploreId.left} urlState={leftState} /> <div className="explore-wrapper">
</ErrorBoundary> <ErrorBoundary>
{split && ( <Explore exploreId={ExploreId.left} urlState={leftState} />
<ErrorBoundary> </ErrorBoundary>
<Explore exploreId={ExploreId.right} urlState={rightState} /> {split && (
</ErrorBoundary> <ErrorBoundary>
)} <Explore exploreId={ExploreId.right} urlState={rightState} />
</ErrorBoundary>
)}
</div>
</CustomScrollbar>
</div> </div>
); );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment