Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
c748b53f
Commit
c748b53f
authored
Jan 26, 2019
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added missing props not being passed to scrollbar component, fixes #15058
parent
ecbda1af
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
10 deletions
+24
-10
packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx
+23
-9
packages/grafana-ui/src/components/Select/Select.tsx
+1
-1
No files found.
packages/grafana-ui/src/components/CustomScrollbar/CustomScrollbar.tsx
View file @
c748b53f
...
...
@@ -7,10 +7,10 @@ interface Props {
autoHide
?:
boolean
;
autoHideTimeout
?:
number
;
autoHideDuration
?:
number
;
auto
MaxHeight
?:
string
;
auto
HeightMax
?:
string
;
hideTracksWhenNotNeeded
?:
boolean
;
scrollTop
?:
number
;
setScrollTop
:
(
value
:
React
.
MouseEvent
<
HTMLElement
>
)
=>
void
;
setScrollTop
:
(
event
:
any
)
=>
void
;
autoHeightMin
?:
number
|
string
;
}
...
...
@@ -20,13 +20,13 @@ interface Props {
export
class
CustomScrollbar
extends
PureComponent
<
Props
>
{
static
defaultProps
:
Partial
<
Props
>
=
{
customClassName
:
'custom-scrollbars'
,
autoHide
:
tru
e
,
autoHide
:
fals
e
,
autoHideTimeout
:
200
,
autoHideDuration
:
200
,
autoMaxHeight
:
'100%'
,
hideTracksWhenNotNeeded
:
false
,
setScrollTop
:
()
=>
{},
autoHeightMin
:
'0'
hideTracksWhenNotNeeded
:
false
,
autoHeightMin
:
'0'
,
autoHeightMax
:
'100%'
,
};
private
ref
:
React
.
RefObject
<
Scrollbars
>
;
...
...
@@ -45,7 +45,7 @@ export class CustomScrollbar extends PureComponent<Props> {
}
else
{
ref
.
scrollTop
(
this
.
props
.
scrollTop
);
}
}
}
}
componentDidMount
()
{
...
...
@@ -57,16 +57,30 @@ export class CustomScrollbar extends PureComponent<Props> {
}
render
()
{
const
{
customClassName
,
children
,
autoMaxHeight
}
=
this
.
props
;
const
{
customClassName
,
children
,
autoHeightMax
,
autoHeightMin
,
setScrollTop
,
autoHide
,
autoHideTimeout
,
hideTracksWhenNotNeeded
,
}
=
this
.
props
;
return
(
<
Scrollbars
ref=
{
this
.
ref
}
className=
{
customClassName
}
onScroll=
{
setScrollTop
}
autoHeight=
{
true
}
autoHide=
{
autoHide
}
autoHideTimeout=
{
autoHideTimeout
}
hideTracksWhenNotNeeded=
{
hideTracksWhenNotNeeded
}
// These autoHeightMin & autoHeightMax options affect firefox and chrome differently.
// Before these where set to inhert but that caused problems with cut of legends in firefox
autoHeightMax=
{
autoMaxHeight
}
autoHeightMax=
{
autoHeightMax
}
autoHeightMin=
{
autoHeightMin
}
renderTrackHorizontal=
{
props
=>
<
div
{
...
props
}
className=
"track-horizontal"
/>
}
renderTrackVertical=
{
props
=>
<
div
{
...
props
}
className=
"track-vertical"
/>
}
renderThumbHorizontal=
{
props
=>
<
div
{
...
props
}
className=
"thumb-horizontal"
/>
}
...
...
packages/grafana-ui/src/components/Select/Select.tsx
View file @
c748b53f
...
...
@@ -61,7 +61,7 @@ interface AsyncProps {
export
const
MenuList
=
(
props
:
any
)
=>
{
return
(
<
components
.
MenuList
{
...
props
}
>
<
CustomScrollbar
autoHide=
{
false
}
auto
MaxHeight
=
"inherit"
>
{
props
.
children
}
</
CustomScrollbar
>
<
CustomScrollbar
autoHide=
{
false
}
auto
HeightMax
=
"inherit"
>
{
props
.
children
}
</
CustomScrollbar
>
</
components
.
MenuList
>
);
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment