Commit 84b2c044 by Torkel Ödegaard

Fixed right side scrollbar margin on dashboard page

parent 1478f38d
import React, { PureComponent } from 'react';
import React, { Component } from 'react';
import isNil from 'lodash/isNil';
import classNames from 'classnames';
import Scrollbars from 'react-custom-scrollbars';
......@@ -20,7 +20,7 @@ interface Props {
/**
* Wraps component into <Scrollbars> component from `react-custom-scrollbars`
*/
export class CustomScrollbar extends PureComponent<Props> {
export class CustomScrollbar extends Component<Props> {
static defaultProps: Partial<Props> = {
autoHide: false,
autoHideTimeout: 200,
......
......@@ -268,7 +268,12 @@ export class DashboardPage extends PureComponent<Props, State> {
onAddPanel={this.onAddPanel}
/>
<div className="scroll-canvas scroll-canvas--dashboard">
<CustomScrollbar autoHeightMin={'100%'} setScrollTop={this.setScrollTop} scrollTop={scrollTop}>
<CustomScrollbar
autoHeightMin={'100%'}
setScrollTop={this.setScrollTop}
scrollTop={scrollTop}
className="custom-scrollbar--page"
>
{editview && <DashboardSettings dashboard={dashboard} />}
{initError && this.renderInitFailedState()}
......
......@@ -109,6 +109,7 @@ exports[`DashboardPage Dashboard init completed Should render dashboard grid 1`
autoHide={false}
autoHideDuration={200}
autoHideTimeout={200}
className="custom-scrollbar--page"
hideTracksWhenNotNeeded={false}
scrollTop={0}
setScrollTop={[Function]}
......@@ -344,6 +345,7 @@ exports[`DashboardPage When dashboard has editview url state should render setti
autoHide={false}
autoHideDuration={200}
autoHideTimeout={200}
className="custom-scrollbar--page"
hideTracksWhenNotNeeded={false}
scrollTop={0}
setScrollTop={[Function]}
......
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