IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
public/app/features/explore/Wrapper.tsx
View File

@ -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> {
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>
); );
} }