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

Table: Fixing scrolling draging the vertical handle (#23311)

Browse Source 
* Table: Fixing scrolling draging the vertical handle

* updated snapshots
This commit is contained in:
Torkel Ödegaard 2020-04-03 10:21:15 +02:00 committed by GitHub
parent 2e58a65e8f
commit 54ddaecea1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx
View File

@ -2,7 +2,6 @@ import React, { Component } from 'react';
import isNil from 'lodash/isNil';
import classNames from 'classnames';
import Scrollbars from 'react-custom-scrollbars';
import { cx, css } from 'emotion';
interface Props {
className?: string;
@ -72,17 +71,11 @@ export class CustomScrollbar extends Component<Props> {
}
renderTrack = (track: 'track-vertical' | 'track-horizontal', hideTrack: boolean | undefined, passedProps: any) => {
return (
<div
{...passedProps}
className={cx(
css`
visibility: ${hideTrack ? 'hidden' : 'visible'};
`,
track
)}
/>
);
if (passedProps.style && hideTrack) {
passedProps.style.display = 'none';
}
return <div {...passedProps} className={track} />;
};
renderThumb = (thumb: 'thumb-horizontal' | 'thumb-vertical', passedProps: any) => {

4
packages/grafana-ui/src/components/CustomScrollbar/__snapshots__/CustomScrollbar.test.tsx.snap
View File

@ -37,7 +37,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
</p>
</div>
<div
className="css-52gpmd track-horizontal"
className="track-horizontal"
style={
Object {
"display": "none",
@ -58,7 +58,7 @@ exports[`CustomScrollbar renders correctly 1`] = `
/>
</div>
<div
className="css-52gpmd track-vertical"
className="track-vertical"
style={
Object {
"display": "none",

2
packages/grafana-ui/src/components/Table/Table.tsx
View File

@ -68,7 +68,7 @@ export const Table: FC<Props> = memo(({ data, height, onCellClick, width, column
return (
<div {...getTableProps()} className={tableStyles.table}>
<CustomScrollbar>
<CustomScrollbar hideVerticalTrack={true}>
{!noHeader && (
<div>
{headerGroups.map((headerGroup: HeaderGroup) => (

4
public/app/features/admin/__snapshots__/ServerStats.test.tsx.snap
View File

@ -220,7 +220,7 @@ exports[`ServerStats Should render table with stats 1`] = `
</div>
</div>
<div
className="css-52gpmd track-horizontal"
className="track-horizontal"
style={
Object {
"display": "none",
@ -241,7 +241,7 @@ exports[`ServerStats Should render table with stats 1`] = `
/>
</div>
<div
className="css-52gpmd track-vertical"
className="track-vertical"
style={
Object {
"display": "none",

2
public/app/features/dashboard/components/Inspector/PanelInspector.tsx
View File

@ -353,8 +353,8 @@ export class PanelInspector extends PureComponent<Props, State> {
return (
<Drawer title={this.drawerHeader} width={drawerWidth} onClose={this.onDismiss}>
<TabContent className={styles.tabContent}>
{tab === InspectTab.Data && this.renderDataTab()}
<CustomScrollbar autoHeightMin="100%">
{tab === InspectTab.Data && this.renderDataTab()}
{tab === InspectTab.Meta && this.renderMetadataInspector()}
{tab === InspectTab.Request && this.renderRequestTab()}
{tab === InspectTab.Error && this.renderErrorTab(error)}